From 1a1f9ac0792d0d78f8d39cb8d8ed0d9cd4866ea1 Mon Sep 17 00:00:00 2001
From: Borja Aranda <borja.aranda@smartcontract.com>
Date: Thu, 30 Nov 2023 15:41:35 +0100
Subject: [PATCH 001/130] include add and remove to/from watchlist

---
 .../upkeeps/LinkAvailableBalanceMonitor.sol   | 49 ++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/contracts/src/v0.8/automation/upkeeps/LinkAvailableBalanceMonitor.sol b/contracts/src/v0.8/automation/upkeeps/LinkAvailableBalanceMonitor.sol
index 9b9dc2d6b7d..9533d7d1430 100644
--- a/contracts/src/v0.8/automation/upkeeps/LinkAvailableBalanceMonitor.sol
+++ b/contracts/src/v0.8/automation/upkeeps/LinkAvailableBalanceMonitor.sol
@@ -70,6 +70,7 @@ contract LinkAvailableBalanceMonitor is ConfirmedOwner, Pausable, AutomationComp
   uint8 private s_upkeepInterval;
   address[] private s_watchList;
   mapping(address targetAddress => MonitoredAddress targetProperties) internal s_targets;
+  mapping(uint64 dstChainSelector => address onRamp) internal s_onRampAddresses;
 
   /// @param linkTokenAddress the LINK token address
   constructor(
@@ -118,6 +119,50 @@ contract LinkAvailableBalanceMonitor is ConfirmedOwner, Pausable, AutomationComp
     emit WatchlistUpdated();
   }
 
+  /// @notice Adds a new address to the watchlist
+  /// @param targetAddress the address to be added to the watchlist
+  /// @param dstChainSelector carries the chainId in case the targetAddress is an onRamp, otherwise it carries a 0
+  /// @dev this function has to be compatible with the event onRampSet(address, dstChainSelector) emitted by
+  /// the CCIP router. Important detail to know is this event is also emitted when an onRamp is decomissioned,
+  /// in which case it will carry the proper dstChainSelector along with the 0x0 address
+  function addToWatchList(address targetAddress, uint64 dstChainSelector) public onlyOwner {
+    if (s_targets[targetAddress].isActive) revert DuplicateAddress(targetAddress);
+    address oldAddress = s_onRampAddresses[dstChainSelector];
+    // if targetAddress is an existing onRamp, there's a need of cleaning the previous onRamp associated to this dstChainSelector
+    // there's no need to remove any other address that's not an onRamp
+    if (dstChainSelector > 0 && abi.encodePacked(oldAddress).length > 0) {
+      removeFromWatchList(oldAddress);
+    }
+    // only add the new address if it's not 0x0
+    if (targetAddress != address(0)) {
+      s_onRampAddresses[dstChainSelector] = targetAddress;
+      s_targets[targetAddress] = MonitoredAddress({
+        isActive: true,
+        minBalance: 1,
+        topUpAmount: 9,
+        lastTopUpTimestamp: 0
+      });
+      s_watchList.push(targetAddress);
+    } else {
+      // if the address is 0x0, it means the onRamp has ben decomissioned and has to be cleaned
+      delete s_onRampAddresses[dstChainSelector];
+    }
+  }
+
+  /// @notice Delete an address from the watchlist and sets the target to inactive
+  /// @param targetAddress the address to be deleted
+  function removeFromWatchList(address targetAddress) public onlyOwner returns (bool) {
+    s_targets[targetAddress].isActive = false;
+    for (uint i; i < s_watchList.length; i++) {
+      if (s_watchList[i] == targetAddress) {
+        s_watchList[i] = s_watchList[s_watchList.length - 1];
+        s_watchList.pop();
+        return true;
+      }
+    }
+    return false;
+  }
+
   /// @notice Gets a list of proxies that are underfunded, up to the s_maxPerform size
   /// @dev the function starts at a random index in the list to avoid biasing the first
   /// addresses in the list over latter ones.
@@ -201,7 +246,9 @@ contract LinkAvailableBalanceMonitor is ConfirmedOwner, Pausable, AutomationComp
     }
     try target.linkAvailableForPayment() returns (int256 balance) {
       if (
-        balance < int256(minBalance) && addressToCheck.lastTopUpTimestamp + s_minWaitPeriodSeconds <= block.timestamp
+        balance < int256(minBalance) &&
+        addressToCheck.lastTopUpTimestamp + s_minWaitPeriodSeconds <= block.timestamp &&
+        addressToCheck.isActive
       ) {
         return true;
       }

From 9ffe94aacee6e87931e2f2a77c08f6ba504f5aa8 Mon Sep 17 00:00:00 2001
From: Borja Aranda <borja.aranda@smartcontract.com>
Date: Fri, 1 Dec 2023 18:44:14 +0100
Subject: [PATCH 002/130] add RBAC to LinkMon

---
 .../upkeeps/LinkAvailableBalanceMonitor.sol   | 72 ++++++++++++-------
 .../LinkAvailableBalanceMonitor.test.ts       | 49 +------------
 2 files changed, 48 insertions(+), 73 deletions(-)

diff --git a/contracts/src/v0.8/automation/upkeeps/LinkAvailableBalanceMonitor.sol b/contracts/src/v0.8/automation/upkeeps/LinkAvailableBalanceMonitor.sol
index 9533d7d1430..db002bd977f 100644
--- a/contracts/src/v0.8/automation/upkeeps/LinkAvailableBalanceMonitor.sol
+++ b/contracts/src/v0.8/automation/upkeeps/LinkAvailableBalanceMonitor.sol
@@ -2,10 +2,9 @@
 
 pragma solidity 0.8.19;
 
+import "@openzeppelin/contracts/access/AccessControlEnumerable.sol";
 import {AutomationCompatibleInterface} from "../interfaces/AutomationCompatibleInterface.sol";
-import {ConfirmedOwner} from "../../shared/access/ConfirmedOwner.sol";
 import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
-import {Pausable} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/security/Pausable.sol";
 
 interface IAggregatorProxy {
   function aggregator() external view returns (address);
@@ -33,7 +32,10 @@ interface ILinkAvailable {
 ///  this is a "trusless" upkeep, meaning it does not trust the caller of performUpkeep;
 /// we could save a fair amount of gas and re-write this upkeep for use with Automation v2.0+,
 /// which has significantly different trust assumptions
-contract LinkAvailableBalanceMonitor is ConfirmedOwner, Pausable, AutomationCompatibleInterface {
+contract LinkAvailableBalanceMonitor is AccessControlEnumerable, AutomationCompatibleInterface {
+  bytes32 public constant ADMIN_ROLE = keccak256("ADMIN_ROLE");
+  bytes32 public constant EXECUTOR_ROLE = keccak256("EXECUTOR_ROLE");
+
   event BalanceUpdated(address indexed addr, uint256 oldBalance, uint256 newBalance);
   event FundsWithdrawn(uint256 amountWithdrawn, address payee);
   event UpkeepIntervalSet(uint256 oldUpkeepInterval, uint256 newUpkeepInterval);
@@ -74,13 +76,17 @@ contract LinkAvailableBalanceMonitor is ConfirmedOwner, Pausable, AutomationComp
 
   /// @param linkTokenAddress the LINK token address
   constructor(
+    address admin,
     address linkTokenAddress,
     uint256 minWaitPeriodSeconds,
     uint16 maxPerform,
     uint16 maxCheck,
     uint8 upkeepInterval
-  ) ConfirmedOwner(msg.sender) {
+  ) {
     if (linkTokenAddress == address(0)) revert InvalidLinkTokenAddress(linkTokenAddress);
+    _setRoleAdmin(ADMIN_ROLE, ADMIN_ROLE);
+    _setRoleAdmin(EXECUTOR_ROLE, ADMIN_ROLE);
+    _setupRole(ADMIN_ROLE, admin);
     LINK_TOKEN = IERC20(linkTokenAddress);
     setMinWaitPeriodSeconds(minWaitPeriodSeconds);
     setMaxPerform(maxPerform);
@@ -88,6 +94,20 @@ contract LinkAvailableBalanceMonitor is ConfirmedOwner, Pausable, AutomationComp
     setUpkeepInterval(upkeepInterval);
   }
 
+  /// @notice Grants an address an executor role
+  /// @param executor address to grant executor role to
+  function granExecutorRole(address executor) public onlyRole(ADMIN_ROLE) {
+    if (executor == address(0)) revert InvalidAddress(executor);
+    _setupRole(EXECUTOR_ROLE, executor);
+  }
+
+  /// @notice Revokes the executor role from an address
+  /// @param executor address to revoke executor role from
+  function revokeExecutorRole(address executor) public onlyRole(ADMIN_ROLE) {
+    if (executor == address(0)) revert InvalidAddress(executor);
+    _revokeRole(EXECUTOR_ROLE, executor);
+  }
+
   /// @notice Sets the list of subscriptions to watch and their funding parameters
   /// @param addresses the list of target addresses to watch (could be direct target or IAggregatorProxy)
   /// @param minBalances the list of corresponding minBalance for the target address
@@ -96,7 +116,7 @@ contract LinkAvailableBalanceMonitor is ConfirmedOwner, Pausable, AutomationComp
     address[] calldata addresses,
     uint96[] calldata minBalances,
     uint96[] calldata topUpAmounts
-  ) external onlyOwner {
+  ) external onlyRoleOrAdminRole(EXECUTOR_ROLE) {
     if (addresses.length != minBalances.length || addresses.length != topUpAmounts.length) {
       revert InvalidWatchList();
     }
@@ -125,12 +145,12 @@ contract LinkAvailableBalanceMonitor is ConfirmedOwner, Pausable, AutomationComp
   /// @dev this function has to be compatible with the event onRampSet(address, dstChainSelector) emitted by
   /// the CCIP router. Important detail to know is this event is also emitted when an onRamp is decomissioned,
   /// in which case it will carry the proper dstChainSelector along with the 0x0 address
-  function addToWatchList(address targetAddress, uint64 dstChainSelector) public onlyOwner {
+  function addToWatchList(address targetAddress, uint64 dstChainSelector) public onlyRoleOrAdminRole(EXECUTOR_ROLE) {
     if (s_targets[targetAddress].isActive) revert DuplicateAddress(targetAddress);
     address oldAddress = s_onRampAddresses[dstChainSelector];
     // if targetAddress is an existing onRamp, there's a need of cleaning the previous onRamp associated to this dstChainSelector
     // there's no need to remove any other address that's not an onRamp
-    if (dstChainSelector > 0 && abi.encodePacked(oldAddress).length > 0) {
+    if (dstChainSelector > 0 && bytes(abi.encodePacked(oldAddress)).length > 0) {
       removeFromWatchList(oldAddress);
     }
     // only add the new address if it's not 0x0
@@ -151,7 +171,7 @@ contract LinkAvailableBalanceMonitor is ConfirmedOwner, Pausable, AutomationComp
 
   /// @notice Delete an address from the watchlist and sets the target to inactive
   /// @param targetAddress the address to be deleted
-  function removeFromWatchList(address targetAddress) public onlyOwner returns (bool) {
+  function removeFromWatchList(address targetAddress) public onlyRoleOrAdminRole(EXECUTOR_ROLE) returns (bool) {
     s_targets[targetAddress].isActive = false;
     for (uint i; i < s_watchList.length; i++) {
       if (s_watchList[i] == targetAddress) {
@@ -201,7 +221,7 @@ contract LinkAvailableBalanceMonitor is ConfirmedOwner, Pausable, AutomationComp
     return targetsToFund;
   }
 
-  function topUp(address[] memory targetAddresses) public whenNotPaused {
+  function topUp(address[] memory targetAddresses) public {
     MonitoredAddress memory target;
     uint256 localBalance = LINK_TOKEN.balanceOf(address(this));
     for (uint256 idx = 0; idx < targetAddresses.length; idx++) {
@@ -259,9 +279,7 @@ contract LinkAvailableBalanceMonitor is ConfirmedOwner, Pausable, AutomationComp
   /// @notice Gets list of subscription ids that are underfunded and returns a keeper-compatible payload.
   /// @return upkeepNeeded signals if upkeep is needed
   /// @return performData is an abi encoded list of subscription ids that need funds
-  function checkUpkeep(
-    bytes calldata
-  ) external view override whenNotPaused returns (bool upkeepNeeded, bytes memory performData) {
+  function checkUpkeep(bytes calldata) external view override returns (bool upkeepNeeded, bytes memory performData) {
     address[] memory needsFunding = sampleUnderfundedAddresses();
     upkeepNeeded = needsFunding.length > 0;
     performData = abi.encode(needsFunding);
@@ -278,14 +296,14 @@ contract LinkAvailableBalanceMonitor is ConfirmedOwner, Pausable, AutomationComp
   /// @notice Withdraws the contract balance in the LINK token.
   /// @param amount the amount of the LINK to withdraw
   /// @param payee the address to pay
-  function withdraw(uint256 amount, address payable payee) external onlyOwner {
+  function withdraw(uint256 amount, address payable payee) external onlyRoleOrAdminRole(EXECUTOR_ROLE) {
     if (payee == address(0)) revert InvalidAddress(payee);
     LINK_TOKEN.transfer(payee, amount);
     emit FundsWithdrawn(amount, payee);
   }
 
   /// @notice Sets the minimum balance for the given target address
-  function setMinBalance(address target, uint96 minBalance) external onlyOwner {
+  function setMinBalance(address target, uint96 minBalance) external onlyRoleOrAdminRole(EXECUTOR_ROLE) {
     if (target == address(0)) revert InvalidAddress(target);
     if (minBalance == 0) revert InvalidMinBalance(minBalance);
     if (!s_targets[target].isActive) revert InvalidWatchList();
@@ -295,7 +313,7 @@ contract LinkAvailableBalanceMonitor is ConfirmedOwner, Pausable, AutomationComp
   }
 
   /// @notice Sets the minimum balance for the given target address
-  function setTopUpAmount(address target, uint96 topUpAmount) external onlyOwner {
+  function setTopUpAmount(address target, uint96 topUpAmount) external onlyRoleOrAdminRole(EXECUTOR_ROLE) {
     if (target == address(0)) revert InvalidAddress(target);
     if (topUpAmount == 0) revert InvalidTopUpAmount(topUpAmount);
     if (!s_targets[target].isActive) revert InvalidWatchList();
@@ -305,25 +323,25 @@ contract LinkAvailableBalanceMonitor is ConfirmedOwner, Pausable, AutomationComp
   }
 
   /// @notice Update s_maxPerform
-  function setMaxPerform(uint16 maxPerform) public onlyOwner {
+  function setMaxPerform(uint16 maxPerform) public onlyRoleOrAdminRole(EXECUTOR_ROLE) {
     s_maxPerform = maxPerform;
     emit MaxPerformSet(s_maxPerform, maxPerform);
   }
 
   /// @notice Update s_maxCheck
-  function setMaxCheck(uint16 maxCheck) public onlyOwner {
+  function setMaxCheck(uint16 maxCheck) public onlyRoleOrAdminRole(EXECUTOR_ROLE) {
     s_maxCheck = maxCheck;
     emit MaxCheckSet(s_maxCheck, maxCheck);
   }
 
   /// @notice Sets the minimum wait period (in seconds) for addresses between funding
-  function setMinWaitPeriodSeconds(uint256 minWaitPeriodSeconds) public onlyOwner {
+  function setMinWaitPeriodSeconds(uint256 minWaitPeriodSeconds) public onlyRoleOrAdminRole(EXECUTOR_ROLE) {
     s_minWaitPeriodSeconds = minWaitPeriodSeconds;
     emit MinWaitPeriodSet(s_minWaitPeriodSeconds, minWaitPeriodSeconds);
   }
 
   /// @notice Update s_upkeepInterval
-  function setUpkeepInterval(uint8 upkeepInterval) public onlyOwner {
+  function setUpkeepInterval(uint8 upkeepInterval) public onlyRoleOrAdminRole(EXECUTOR_ROLE) {
     if (upkeepInterval > 255) revert InvalidUpkeepInterval(upkeepInterval);
     s_upkeepInterval = upkeepInterval;
     emit UpkeepIntervalSet(s_upkeepInterval, upkeepInterval);
@@ -362,13 +380,13 @@ contract LinkAvailableBalanceMonitor is ConfirmedOwner, Pausable, AutomationComp
     return (target.isActive, target.minBalance, target.topUpAmount);
   }
 
-  /// @notice Pause the contract, which prevents executing performUpkeep
-  function pause() external onlyOwner {
-    _pause();
-  }
-
-  /// @notice Unpause the contract
-  function unpause() external onlyOwner {
-    _unpause();
+  /// @dev Modifier to make a function callable only by a certain role or the
+  /// admin role.
+  modifier onlyRoleOrAdminRole(bytes32 role) {
+    address sender = _msgSender();
+    if (!hasRole(ADMIN_ROLE, sender)) {
+      _checkRole(role, sender);
+    }
+    _;
   }
 }
diff --git a/contracts/test/v0.8/automation/LinkAvailableBalanceMonitor.test.ts b/contracts/test/v0.8/automation/LinkAvailableBalanceMonitor.test.ts
index 76a3dcfff1b..dafb76e7cca 100644
--- a/contracts/test/v0.8/automation/LinkAvailableBalanceMonitor.test.ts
+++ b/contracts/test/v0.8/automation/LinkAvailableBalanceMonitor.test.ts
@@ -29,7 +29,6 @@ const TARGET_CHECK_GAS_LIMIT = 3_500_000
 
 const OWNABLE_ERR = 'Only callable by owner'
 const INVALID_WATCHLIST_ERR = `InvalidWatchList()`
-const PAUSED_ERR = 'Pausable: paused'
 
 const zeroLINK = ethers.utils.parseEther('0')
 const oneLINK = ethers.utils.parseEther('1')
@@ -152,6 +151,7 @@ const setup = async () => {
 
   lt = (await ltFactory.deploy()) as LinkToken
   labm = await labmFactory.deploy(
+    owner.address,
     lt.address,
     minWaitPeriodSeconds,
     maxPerform,
@@ -260,25 +260,7 @@ describe('LinkAvailableBalanceMonitor', () => {
 
     it('Should not allow strangers to withdraw', async () => {
       const tx = labm.connect(stranger).withdraw(oneLINK, owner.address)
-      await expect(tx).to.be.revertedWith(OWNABLE_ERR)
-    })
-  })
-
-  describe('pause() / unpause()', () => {
-    it('Should allow owner to pause / unpause', async () => {
-      const pauseTx = await labm.connect(owner).pause()
-      await pauseTx.wait()
-      const unpauseTx = await labm.connect(owner).unpause()
-      await unpauseTx.wait()
-    })
-
-    it('Should not allow strangers to pause / unpause', async () => {
-      const pauseTxStranger = labm.connect(stranger).pause()
-      await expect(pauseTxStranger).to.be.revertedWith(OWNABLE_ERR)
-      const pauseTxOwner = await labm.connect(owner).pause()
-      await pauseTxOwner.wait()
-      const unpauseTxStranger = labm.connect(stranger).unpause()
-      await expect(unpauseTxStranger).to.be.revertedWith(OWNABLE_ERR)
+      await expect(tx).to.be.reverted
     })
   })
 
@@ -342,7 +324,7 @@ describe('LinkAvailableBalanceMonitor', () => {
       const setTxStranger = labm
         .connect(stranger)
         .setWatchList([watchAddress1], [oneLINK], [oneLINK])
-      await expect(setTxStranger).to.be.revertedWith(OWNABLE_ERR)
+      await expect(setTxStranger).to.be.reverted
     })
 
     it('Should revert if any of the addresses are empty', async () => {
@@ -425,13 +407,6 @@ describe('LinkAvailableBalanceMonitor', () => {
       expect(addresses).to.deep.equalInAnyOrder([])
     })
 
-    it('Should revert when paused', async () => {
-      const tx = await labm.connect(owner).pause()
-      await tx.wait()
-      const ethCall = labm.checkUpkeep('0x')
-      await expect(ethCall).to.be.revertedWith(PAUSED_ERR)
-    })
-
     context('with a large set of proxies', async () => {
       // in this test, we cheat a little bit and point each proxy to the same aggregator,
       // which helps cut down on test time
@@ -524,12 +499,6 @@ describe('LinkAvailableBalanceMonitor', () => {
         )
     })
 
-    it('Should revert when paused', async () => {
-      await labm.connect(owner).pause()
-      const performTx = labm.connect(keeperRegistry).performUpkeep(validPayload)
-      await expect(performTx).to.be.revertedWith(PAUSED_ERR)
-    })
-
     it('Should fund the appropriate addresses', async () => {
       await aggregator1.mock.linkAvailableForPayment.returns(zeroLINK)
       await aggregator2.mock.linkAvailableForPayment.returns(zeroLINK)
@@ -622,18 +591,6 @@ describe('LinkAvailableBalanceMonitor', () => {
       })
     })
 
-    context('when paused', () => {
-      it('Should be callable by no one', async () => {
-        await labm.connect(owner).pause()
-        const users = [owner, keeperRegistry, stranger]
-        for (let idx = 0; idx < users.length; idx++) {
-          const user = users[idx]
-          const tx = labm.connect(user).topUp([])
-          await expect(tx).to.be.revertedWith(PAUSED_ERR)
-        }
-      })
-    })
-
     context('when fully funded', () => {
       beforeEach(async () => {
         await lt.connect(owner).transfer(labm.address, tenLINK)

From 64f4753c1e2875e64a17ee5ab61de2a07ba1f9a9 Mon Sep 17 00:00:00 2001
From: Borja Aranda <borja.aranda@smartcontract.com>
Date: Mon, 4 Dec 2023 18:01:40 +0100
Subject: [PATCH 003/130] add imported contracts

---
 .../upkeeps/LinkAvailableBalanceMonitor.sol   |  18 +-
 .../v4.8.3/contracts/access/AccessControl.sol | 247 ++++++++++++++++++
 .../contracts/access/IAccessControl.sol       |  88 +++++++
 .../contracts/utils/introspection/ERC165.sol  |  29 ++
 4 files changed, 374 insertions(+), 8 deletions(-)
 create mode 100644 contracts/src/v0.8/vendor/openzeppelin-solidity/v4.8.3/contracts/access/AccessControl.sol
 create mode 100644 contracts/src/v0.8/vendor/openzeppelin-solidity/v4.8.3/contracts/access/IAccessControl.sol
 create mode 100644 contracts/src/v0.8/vendor/openzeppelin-solidity/v4.8.3/contracts/utils/introspection/ERC165.sol

diff --git a/contracts/src/v0.8/automation/upkeeps/LinkAvailableBalanceMonitor.sol b/contracts/src/v0.8/automation/upkeeps/LinkAvailableBalanceMonitor.sol
index db002bd977f..c6e5d1d94a5 100644
--- a/contracts/src/v0.8/automation/upkeeps/LinkAvailableBalanceMonitor.sol
+++ b/contracts/src/v0.8/automation/upkeeps/LinkAvailableBalanceMonitor.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.19;
 
-import "@openzeppelin/contracts/access/AccessControlEnumerable.sol";
+import {AccessControl} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/access/AccessControl.sol";
 import {AutomationCompatibleInterface} from "../interfaces/AutomationCompatibleInterface.sol";
 import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
 
@@ -32,10 +32,7 @@ interface ILinkAvailable {
 ///  this is a "trusless" upkeep, meaning it does not trust the caller of performUpkeep;
 /// we could save a fair amount of gas and re-write this upkeep for use with Automation v2.0+,
 /// which has significantly different trust assumptions
-contract LinkAvailableBalanceMonitor is AccessControlEnumerable, AutomationCompatibleInterface {
-  bytes32 public constant ADMIN_ROLE = keccak256("ADMIN_ROLE");
-  bytes32 public constant EXECUTOR_ROLE = keccak256("EXECUTOR_ROLE");
-
+contract LinkAvailableBalanceMonitor is AccessControl, AutomationCompatibleInterface {
   event BalanceUpdated(address indexed addr, uint256 oldBalance, uint256 newBalance);
   event FundsWithdrawn(uint256 amountWithdrawn, address payee);
   event UpkeepIntervalSet(uint256 oldUpkeepInterval, uint256 newUpkeepInterval);
@@ -65,7 +62,12 @@ contract LinkAvailableBalanceMonitor is AccessControlEnumerable, AutomationCompa
     bool isActive;
   }
 
+  bytes32 public constant ADMIN_ROLE = keccak256("ADMIN_ROLE");
+  bytes32 public constant EXECUTOR_ROLE = keccak256("EXECUTOR_ROLE");
+  uint96 private constant DEFAULT_TOP_UP_AMOUNT = 9;
+  uint96 private constant DEFAULT_MIN_BALANCE = 1;
   IERC20 private immutable LINK_TOKEN;
+
   uint256 private s_minWaitPeriodSeconds;
   uint16 private s_maxPerform;
   uint16 private s_maxCheck;
@@ -141,7 +143,7 @@ contract LinkAvailableBalanceMonitor is AccessControlEnumerable, AutomationCompa
 
   /// @notice Adds a new address to the watchlist
   /// @param targetAddress the address to be added to the watchlist
-  /// @param dstChainSelector carries the chainId in case the targetAddress is an onRamp, otherwise it carries a 0
+  /// @param dstChainSelector carries a non-zero value in case the targetAddress is an onRamp, otherwise it carries a 0
   /// @dev this function has to be compatible with the event onRampSet(address, dstChainSelector) emitted by
   /// the CCIP router. Important detail to know is this event is also emitted when an onRamp is decomissioned,
   /// in which case it will carry the proper dstChainSelector along with the 0x0 address
@@ -158,8 +160,8 @@ contract LinkAvailableBalanceMonitor is AccessControlEnumerable, AutomationCompa
       s_onRampAddresses[dstChainSelector] = targetAddress;
       s_targets[targetAddress] = MonitoredAddress({
         isActive: true,
-        minBalance: 1,
-        topUpAmount: 9,
+        minBalance: DEFAULT_MIN_BALANCE,
+        topUpAmount: DEFAULT_TOP_UP_AMOUNT,
         lastTopUpTimestamp: 0
       });
       s_watchList.push(targetAddress);
diff --git a/contracts/src/v0.8/vendor/openzeppelin-solidity/v4.8.3/contracts/access/AccessControl.sol b/contracts/src/v0.8/vendor/openzeppelin-solidity/v4.8.3/contracts/access/AccessControl.sol
new file mode 100644
index 00000000000..4e388f9d83d
--- /dev/null
+++ b/contracts/src/v0.8/vendor/openzeppelin-solidity/v4.8.3/contracts/access/AccessControl.sol
@@ -0,0 +1,247 @@
+// SPDX-License-Identifier: MIT
+// OpenZeppelin Contracts (last updated v4.8.0) (access/AccessControl.sol)
+
+pragma solidity ^0.8.0;
+
+import "./IAccessControl.sol";
+import "../utils/Context.sol";
+import "../utils/Strings.sol";
+import "../utils/introspection/ERC165.sol";
+
+/**
+ * @dev Contract module that allows children to implement role-based access
+ * control mechanisms. This is a lightweight version that doesn't allow enumerating role
+ * members except through off-chain means by accessing the contract event logs. Some
+ * applications may benefit from on-chain enumerability, for those cases see
+ * {AccessControlEnumerable}.
+ *
+ * Roles are referred to by their `bytes32` identifier. These should be exposed
+ * in the external API and be unique. The best way to achieve this is by
+ * using `public constant` hash digests:
+ *
+ * ```
+ * bytes32 public constant MY_ROLE = keccak256("MY_ROLE");
+ * ```
+ *
+ * Roles can be used to represent a set of permissions. To restrict access to a
+ * function call, use {hasRole}:
+ *
+ * ```
+ * function foo() public {
+ *     require(hasRole(MY_ROLE, msg.sender));
+ *     ...
+ * }
+ * ```
+ *
+ * Roles can be granted and revoked dynamically via the {grantRole} and
+ * {revokeRole} functions. Each role has an associated admin role, and only
+ * accounts that have a role's admin role can call {grantRole} and {revokeRole}.
+ *
+ * By default, the admin role for all roles is `DEFAULT_ADMIN_ROLE`, which means
+ * that only accounts with this role will be able to grant or revoke other
+ * roles. More complex role relationships can be created by using
+ * {_setRoleAdmin}.
+ *
+ * WARNING: The `DEFAULT_ADMIN_ROLE` is also its own admin: it has permission to
+ * grant and revoke this role. Extra precautions should be taken to secure
+ * accounts that have been granted it.
+ */
+abstract contract AccessControl is Context, IAccessControl, ERC165 {
+    struct RoleData {
+        mapping(address => bool) members;
+        bytes32 adminRole;
+    }
+
+    mapping(bytes32 => RoleData) private _roles;
+
+    bytes32 public constant DEFAULT_ADMIN_ROLE = 0x00;
+
+    /**
+     * @dev Modifier that checks that an account has a specific role. Reverts
+     * with a standardized message including the required role.
+     *
+     * The format of the revert reason is given by the following regular expression:
+     *
+     *  /^AccessControl: account (0x[0-9a-f]{40}) is missing role (0x[0-9a-f]{64})$/
+     *
+     * _Available since v4.1._
+     */
+    modifier onlyRole(bytes32 role) {
+        _checkRole(role);
+        _;
+    }
+
+    /**
+     * @dev See {IERC165-supportsInterface}.
+     */
+    function supportsInterface(bytes4 interfaceId) public view virtual override returns (bool) {
+        return interfaceId == type(IAccessControl).interfaceId || super.supportsInterface(interfaceId);
+    }
+
+    /**
+     * @dev Returns `true` if `account` has been granted `role`.
+     */
+    function hasRole(bytes32 role, address account) public view virtual override returns (bool) {
+        return _roles[role].members[account];
+    }
+
+    /**
+     * @dev Revert with a standard message if `_msgSender()` is missing `role`.
+     * Overriding this function changes the behavior of the {onlyRole} modifier.
+     *
+     * Format of the revert message is described in {_checkRole}.
+     *
+     * _Available since v4.6._
+     */
+    function _checkRole(bytes32 role) internal view virtual {
+        _checkRole(role, _msgSender());
+    }
+
+    /**
+     * @dev Revert with a standard message if `account` is missing `role`.
+     *
+     * The format of the revert reason is given by the following regular expression:
+     *
+     *  /^AccessControl: account (0x[0-9a-f]{40}) is missing role (0x[0-9a-f]{64})$/
+     */
+    function _checkRole(bytes32 role, address account) internal view virtual {
+        if (!hasRole(role, account)) {
+            revert(
+                string(
+                    abi.encodePacked(
+                        "AccessControl: account ",
+                        Strings.toHexString(account),
+                        " is missing role ",
+                        Strings.toHexString(uint256(role), 32)
+                    )
+                )
+            );
+        }
+    }
+
+    /**
+     * @dev Returns the admin role that controls `role`. See {grantRole} and
+     * {revokeRole}.
+     *
+     * To change a role's admin, use {_setRoleAdmin}.
+     */
+    function getRoleAdmin(bytes32 role) public view virtual override returns (bytes32) {
+        return _roles[role].adminRole;
+    }
+
+    /**
+     * @dev Grants `role` to `account`.
+     *
+     * If `account` had not been already granted `role`, emits a {RoleGranted}
+     * event.
+     *
+     * Requirements:
+     *
+     * - the caller must have ``role``'s admin role.
+     *
+     * May emit a {RoleGranted} event.
+     */
+    function grantRole(bytes32 role, address account) public virtual override onlyRole(getRoleAdmin(role)) {
+        _grantRole(role, account);
+    }
+
+    /**
+     * @dev Revokes `role` from `account`.
+     *
+     * If `account` had been granted `role`, emits a {RoleRevoked} event.
+     *
+     * Requirements:
+     *
+     * - the caller must have ``role``'s admin role.
+     *
+     * May emit a {RoleRevoked} event.
+     */
+    function revokeRole(bytes32 role, address account) public virtual override onlyRole(getRoleAdmin(role)) {
+        _revokeRole(role, account);
+    }
+
+    /**
+     * @dev Revokes `role` from the calling account.
+     *
+     * Roles are often managed via {grantRole} and {revokeRole}: this function's
+     * purpose is to provide a mechanism for accounts to lose their privileges
+     * if they are compromised (such as when a trusted device is misplaced).
+     *
+     * If the calling account had been revoked `role`, emits a {RoleRevoked}
+     * event.
+     *
+     * Requirements:
+     *
+     * - the caller must be `account`.
+     *
+     * May emit a {RoleRevoked} event.
+     */
+    function renounceRole(bytes32 role, address account) public virtual override {
+        require(account == _msgSender(), "AccessControl: can only renounce roles for self");
+
+        _revokeRole(role, account);
+    }
+
+    /**
+     * @dev Grants `role` to `account`.
+     *
+     * If `account` had not been already granted `role`, emits a {RoleGranted}
+     * event. Note that unlike {grantRole}, this function doesn't perform any
+     * checks on the calling account.
+     *
+     * May emit a {RoleGranted} event.
+     *
+     * [WARNING]
+     * ====
+     * This function should only be called from the constructor when setting
+     * up the initial roles for the system.
+     *
+     * Using this function in any other way is effectively circumventing the admin
+     * system imposed by {AccessControl}.
+     * ====
+     *
+     * NOTE: This function is deprecated in favor of {_grantRole}.
+     */
+    function _setupRole(bytes32 role, address account) internal virtual {
+        _grantRole(role, account);
+    }
+
+    /**
+     * @dev Sets `adminRole` as ``role``'s admin role.
+     *
+     * Emits a {RoleAdminChanged} event.
+     */
+    function _setRoleAdmin(bytes32 role, bytes32 adminRole) internal virtual {
+        bytes32 previousAdminRole = getRoleAdmin(role);
+        _roles[role].adminRole = adminRole;
+        emit RoleAdminChanged(role, previousAdminRole, adminRole);
+    }
+
+    /**
+     * @dev Grants `role` to `account`.
+     *
+     * Internal function without access restriction.
+     *
+     * May emit a {RoleGranted} event.
+     */
+    function _grantRole(bytes32 role, address account) internal virtual {
+        if (!hasRole(role, account)) {
+            _roles[role].members[account] = true;
+            emit RoleGranted(role, account, _msgSender());
+        }
+    }
+
+    /**
+     * @dev Revokes `role` from `account`.
+     *
+     * Internal function without access restriction.
+     *
+     * May emit a {RoleRevoked} event.
+     */
+    function _revokeRole(bytes32 role, address account) internal virtual {
+        if (hasRole(role, account)) {
+            _roles[role].members[account] = false;
+            emit RoleRevoked(role, account, _msgSender());
+        }
+    }
+}
\ No newline at end of file
diff --git a/contracts/src/v0.8/vendor/openzeppelin-solidity/v4.8.3/contracts/access/IAccessControl.sol b/contracts/src/v0.8/vendor/openzeppelin-solidity/v4.8.3/contracts/access/IAccessControl.sol
new file mode 100644
index 00000000000..efb82a3cb5e
--- /dev/null
+++ b/contracts/src/v0.8/vendor/openzeppelin-solidity/v4.8.3/contracts/access/IAccessControl.sol
@@ -0,0 +1,88 @@
+// SPDX-License-Identifier: MIT
+// OpenZeppelin Contracts v4.4.1 (access/IAccessControl.sol)
+
+pragma solidity ^0.8.0;
+
+/**
+ * @dev External interface of AccessControl declared to support ERC165 detection.
+ */
+interface IAccessControl {
+    /**
+     * @dev Emitted when `newAdminRole` is set as ``role``'s admin role, replacing `previousAdminRole`
+     *
+     * `DEFAULT_ADMIN_ROLE` is the starting admin for all roles, despite
+     * {RoleAdminChanged} not being emitted signaling this.
+     *
+     * _Available since v3.1._
+     */
+    event RoleAdminChanged(bytes32 indexed role, bytes32 indexed previousAdminRole, bytes32 indexed newAdminRole);
+
+    /**
+     * @dev Emitted when `account` is granted `role`.
+     *
+     * `sender` is the account that originated the contract call, an admin role
+     * bearer except when using {AccessControl-_setupRole}.
+     */
+    event RoleGranted(bytes32 indexed role, address indexed account, address indexed sender);
+
+    /**
+     * @dev Emitted when `account` is revoked `role`.
+     *
+     * `sender` is the account that originated the contract call:
+     *   - if using `revokeRole`, it is the admin role bearer
+     *   - if using `renounceRole`, it is the role bearer (i.e. `account`)
+     */
+    event RoleRevoked(bytes32 indexed role, address indexed account, address indexed sender);
+
+    /**
+     * @dev Returns `true` if `account` has been granted `role`.
+     */
+    function hasRole(bytes32 role, address account) external view returns (bool);
+
+    /**
+     * @dev Returns the admin role that controls `role`. See {grantRole} and
+     * {revokeRole}.
+     *
+     * To change a role's admin, use {AccessControl-_setRoleAdmin}.
+     */
+    function getRoleAdmin(bytes32 role) external view returns (bytes32);
+
+    /**
+     * @dev Grants `role` to `account`.
+     *
+     * If `account` had not been already granted `role`, emits a {RoleGranted}
+     * event.
+     *
+     * Requirements:
+     *
+     * - the caller must have ``role``'s admin role.
+     */
+    function grantRole(bytes32 role, address account) external;
+
+    /**
+     * @dev Revokes `role` from `account`.
+     *
+     * If `account` had been granted `role`, emits a {RoleRevoked} event.
+     *
+     * Requirements:
+     *
+     * - the caller must have ``role``'s admin role.
+     */
+    function revokeRole(bytes32 role, address account) external;
+
+    /**
+     * @dev Revokes `role` from the calling account.
+     *
+     * Roles are often managed via {grantRole} and {revokeRole}: this function's
+     * purpose is to provide a mechanism for accounts to lose their privileges
+     * if they are compromised (such as when a trusted device is misplaced).
+     *
+     * If the calling account had been granted `role`, emits a {RoleRevoked}
+     * event.
+     *
+     * Requirements:
+     *
+     * - the caller must be `account`.
+     */
+    function renounceRole(bytes32 role, address account) external;
+}
\ No newline at end of file
diff --git a/contracts/src/v0.8/vendor/openzeppelin-solidity/v4.8.3/contracts/utils/introspection/ERC165.sol b/contracts/src/v0.8/vendor/openzeppelin-solidity/v4.8.3/contracts/utils/introspection/ERC165.sol
new file mode 100644
index 00000000000..c682b07a65b
--- /dev/null
+++ b/contracts/src/v0.8/vendor/openzeppelin-solidity/v4.8.3/contracts/utils/introspection/ERC165.sol
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: MIT
+// OpenZeppelin Contracts v4.4.1 (utils/introspection/ERC165.sol)
+
+pragma solidity ^0.8.0;
+
+import "./IERC165.sol";
+
+/**
+ * @dev Implementation of the {IERC165} interface.
+ *
+ * Contracts that want to implement ERC165 should inherit from this contract and override {supportsInterface} to check
+ * for the additional interface id that will be supported. For example:
+ *
+ * ```solidity
+ * function supportsInterface(bytes4 interfaceId) public view virtual override returns (bool) {
+ *     return interfaceId == type(MyInterface).interfaceId || super.supportsInterface(interfaceId);
+ * }
+ * ```
+ *
+ * Alternatively, {ERC165Storage} provides an easier to use but more expensive implementation.
+ */
+abstract contract ERC165 is IERC165 {
+    /**
+     * @dev See {IERC165-supportsInterface}.
+     */
+    function supportsInterface(bytes4 interfaceId) public view virtual override returns (bool) {
+        return interfaceId == type(IERC165).interfaceId;
+    }
+}
\ No newline at end of file

From c7fd9d0adf6108d86deb07671ea7909d38a7599b Mon Sep 17 00:00:00 2001
From: Borja Aranda <borja.aranda@smartcontract.com>
Date: Tue, 5 Dec 2023 11:58:00 +0100
Subject: [PATCH 004/130] first batch of fixes

---
 .../native_solc_compile_all_automation        |  8 ++++
 .../upkeeps/LinkAvailableBalanceMonitor.sol   | 41 ++++++++--------
 .../LinkAvailableBalanceMonitor.test.ts       | 48 +++++++++++++++++--
 3 files changed, 73 insertions(+), 24 deletions(-)

diff --git a/contracts/scripts/native_solc_compile_all_automation b/contracts/scripts/native_solc_compile_all_automation
index ddf6c2c8bfa..e7058d243f9 100755
--- a/contracts/scripts/native_solc_compile_all_automation
+++ b/contracts/scripts/native_solc_compile_all_automation
@@ -77,3 +77,11 @@ 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
+
+compileContract automation/upkeeps/LinkAvailableBalanceMonitor.sol
diff --git a/contracts/src/v0.8/automation/upkeeps/LinkAvailableBalanceMonitor.sol b/contracts/src/v0.8/automation/upkeeps/LinkAvailableBalanceMonitor.sol
index c6e5d1d94a5..c9d184958e5 100644
--- a/contracts/src/v0.8/automation/upkeeps/LinkAvailableBalanceMonitor.sol
+++ b/contracts/src/v0.8/automation/upkeeps/LinkAvailableBalanceMonitor.sol
@@ -2,9 +2,10 @@
 
 pragma solidity 0.8.19;
 
-import {AccessControl} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/access/AccessControl.sol";
 import {AutomationCompatibleInterface} from "../interfaces/AutomationCompatibleInterface.sol";
+import {AccessControl} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/access/AccessControl.sol";
 import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
+import {Pausable} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/security/Pausable.sol";
 
 interface IAggregatorProxy {
   function aggregator() external view returns (address);
@@ -32,7 +33,7 @@ interface ILinkAvailable {
 ///  this is a "trusless" upkeep, meaning it does not trust the caller of performUpkeep;
 /// we could save a fair amount of gas and re-write this upkeep for use with Automation v2.0+,
 /// which has significantly different trust assumptions
-contract LinkAvailableBalanceMonitor is AccessControl, AutomationCompatibleInterface {
+contract LinkAvailableBalanceMonitor is Pausable, AccessControl, AutomationCompatibleInterface {
   event BalanceUpdated(address indexed addr, uint256 oldBalance, uint256 newBalance);
   event FundsWithdrawn(uint256 amountWithdrawn, address payee);
   event UpkeepIntervalSet(uint256 oldUpkeepInterval, uint256 newUpkeepInterval);
@@ -64,8 +65,8 @@ contract LinkAvailableBalanceMonitor is AccessControl, AutomationCompatibleInter
 
   bytes32 public constant ADMIN_ROLE = keccak256("ADMIN_ROLE");
   bytes32 public constant EXECUTOR_ROLE = keccak256("EXECUTOR_ROLE");
-  uint96 private constant DEFAULT_TOP_UP_AMOUNT = 9;
-  uint96 private constant DEFAULT_MIN_BALANCE = 1;
+  uint96 private constant DEFAULT_TOP_UP_AMOUNT = 9000000000000000000;
+  uint96 private constant DEFAULT_MIN_BALANCE = 1000000000000000000;
   IERC20 private immutable LINK_TOKEN;
 
   uint256 private s_minWaitPeriodSeconds;
@@ -88,7 +89,7 @@ contract LinkAvailableBalanceMonitor is AccessControl, AutomationCompatibleInter
     if (linkTokenAddress == address(0)) revert InvalidLinkTokenAddress(linkTokenAddress);
     _setRoleAdmin(ADMIN_ROLE, ADMIN_ROLE);
     _setRoleAdmin(EXECUTOR_ROLE, ADMIN_ROLE);
-    _setupRole(ADMIN_ROLE, admin);
+    _grantRole(ADMIN_ROLE, admin);
     LINK_TOKEN = IERC20(linkTokenAddress);
     setMinWaitPeriodSeconds(minWaitPeriodSeconds);
     setMaxPerform(maxPerform);
@@ -96,20 +97,6 @@ contract LinkAvailableBalanceMonitor is AccessControl, AutomationCompatibleInter
     setUpkeepInterval(upkeepInterval);
   }
 
-  /// @notice Grants an address an executor role
-  /// @param executor address to grant executor role to
-  function granExecutorRole(address executor) public onlyRole(ADMIN_ROLE) {
-    if (executor == address(0)) revert InvalidAddress(executor);
-    _setupRole(EXECUTOR_ROLE, executor);
-  }
-
-  /// @notice Revokes the executor role from an address
-  /// @param executor address to revoke executor role from
-  function revokeExecutorRole(address executor) public onlyRole(ADMIN_ROLE) {
-    if (executor == address(0)) revert InvalidAddress(executor);
-    _revokeRole(EXECUTOR_ROLE, executor);
-  }
-
   /// @notice Sets the list of subscriptions to watch and their funding parameters
   /// @param addresses the list of target addresses to watch (could be direct target or IAggregatorProxy)
   /// @param minBalances the list of corresponding minBalance for the target address
@@ -223,7 +210,7 @@ contract LinkAvailableBalanceMonitor is AccessControl, AutomationCompatibleInter
     return targetsToFund;
   }
 
-  function topUp(address[] memory targetAddresses) public {
+  function topUp(address[] memory targetAddresses) public whenNotPaused {
     MonitoredAddress memory target;
     uint256 localBalance = LINK_TOKEN.balanceOf(address(this));
     for (uint256 idx = 0; idx < targetAddresses.length; idx++) {
@@ -281,7 +268,9 @@ contract LinkAvailableBalanceMonitor is AccessControl, AutomationCompatibleInter
   /// @notice Gets list of subscription ids that are underfunded and returns a keeper-compatible payload.
   /// @return upkeepNeeded signals if upkeep is needed
   /// @return performData is an abi encoded list of subscription ids that need funds
-  function checkUpkeep(bytes calldata) external view override returns (bool upkeepNeeded, bytes memory performData) {
+  function checkUpkeep(
+    bytes calldata
+  ) external view override whenNotPaused returns (bool upkeepNeeded, bytes memory performData) {
     address[] memory needsFunding = sampleUnderfundedAddresses();
     upkeepNeeded = needsFunding.length > 0;
     performData = abi.encode(needsFunding);
@@ -391,4 +380,14 @@ contract LinkAvailableBalanceMonitor is AccessControl, AutomationCompatibleInter
     }
     _;
   }
+
+  /// @notice Pause the contract, which prevents executing performUpkeep
+  function pause() external onlyRole(ADMIN_ROLE) {
+    _pause();
+  }
+
+  /// @notice Unpause the contract
+  function unpause() external onlyRole(ADMIN_ROLE) {
+    _unpause();
+  }
 }
diff --git a/contracts/test/v0.8/automation/LinkAvailableBalanceMonitor.test.ts b/contracts/test/v0.8/automation/LinkAvailableBalanceMonitor.test.ts
index dafb76e7cca..781721dc4ec 100644
--- a/contracts/test/v0.8/automation/LinkAvailableBalanceMonitor.test.ts
+++ b/contracts/test/v0.8/automation/LinkAvailableBalanceMonitor.test.ts
@@ -26,15 +26,13 @@ const TARGET_PERFORM_GAS_LIMIT = 2_000_000
 const TARGET_CHECK_GAS_LIMIT = 3_500_000
 //                                                                                              //
 //////////////////////////////////////////////////////////////////////////////////////////////////
-
-const OWNABLE_ERR = 'Only callable by owner'
 const INVALID_WATCHLIST_ERR = `InvalidWatchList()`
+const PAUSED_ERR = 'Pausable: paused'
 
 const zeroLINK = ethers.utils.parseEther('0')
 const oneLINK = ethers.utils.parseEther('1')
 const twoLINK = ethers.utils.parseEther('2')
 const fourLINK = ethers.utils.parseEther('4')
-const fiveLINK = ethers.utils.parseEther('5')
 const tenLINK = ethers.utils.parseEther('10')
 const oneHundredLINK = ethers.utils.parseEther('100')
 
@@ -264,6 +262,24 @@ describe('LinkAvailableBalanceMonitor', () => {
     })
   })
 
+  describe('pause() / unpause()', () => {
+    it('Should allow owner to pause / unpause', async () => {
+      const pauseTx = await labm.connect(owner).pause()
+      await pauseTx.wait()
+      const unpauseTx = await labm.connect(owner).unpause()
+      await unpauseTx.wait()
+    })
+
+    it('Should not allow strangers to pause / unpause', async () => {
+      const pauseTxStranger = labm.connect(stranger).pause()
+      await expect(pauseTxStranger).to.be.reverted
+      const pauseTxOwner = await labm.connect(owner).pause()
+      await pauseTxOwner.wait()
+      const unpauseTxStranger = labm.connect(stranger).unpause()
+      await expect(unpauseTxStranger).to.be.reverted
+    })
+  })
+
   describe('setWatchList() / addToWatchList() / removeFromWatchlist() / getWatchList()', () => {
     const watchAddress1 = randAddr()
     const watchAddress2 = randAddr()
@@ -407,6 +423,13 @@ describe('LinkAvailableBalanceMonitor', () => {
       expect(addresses).to.deep.equalInAnyOrder([])
     })
 
+    it('Should revert when paused', async () => {
+      const tx = await labm.connect(owner).pause()
+      await tx.wait()
+      const ethCall = labm.checkUpkeep('0x')
+      await expect(ethCall).to.be.revertedWith(PAUSED_ERR)
+    })
+
     context('with a large set of proxies', async () => {
       // in this test, we cheat a little bit and point each proxy to the same aggregator,
       // which helps cut down on test time
@@ -499,6 +522,13 @@ describe('LinkAvailableBalanceMonitor', () => {
         )
     })
 
+    it('Should revert when paused', async () => {
+      await labm.connect(owner).pause()
+      const performTx = labm.connect(keeperRegistry).performUpkeep(validPayload)
+      await expect(performTx).to.be.revertedWith(PAUSED_ERR)
+      console.log(performTx)
+    })
+
     it('Should fund the appropriate addresses', async () => {
       await aggregator1.mock.linkAvailableForPayment.returns(zeroLINK)
       await aggregator2.mock.linkAvailableForPayment.returns(zeroLINK)
@@ -591,6 +621,18 @@ describe('LinkAvailableBalanceMonitor', () => {
       })
     })
 
+    context('when paused', () => {
+      it('Should be callable by no one', async () => {
+        await labm.connect(owner).pause()
+        const users = [owner, keeperRegistry, stranger]
+        for (let idx = 0; idx < users.length; idx++) {
+          const user = users[idx]
+          const tx = labm.connect(user).topUp([])
+          await expect(tx).to.be.revertedWith(PAUSED_ERR)
+        }
+      })
+    })
+
     context('when fully funded', () => {
       beforeEach(async () => {
         await lt.connect(owner).transfer(labm.address, tenLINK)

From 228f5596e47eaab1f6f4af17553bbadd1dc1cbc4 Mon Sep 17 00:00:00 2001
From: Borja Aranda <borja.aranda@smartcontract.com>
Date: Tue, 5 Dec 2023 14:32:32 +0100
Subject: [PATCH 005/130] add tests

---
 .../upkeeps/LinkAvailableBalanceMonitor.sol   |  19 +--
 .../LinkAvailableBalanceMonitor.test.ts       | 150 ++++++++++++++++++
 2 files changed, 160 insertions(+), 9 deletions(-)

diff --git a/contracts/src/v0.8/automation/upkeeps/LinkAvailableBalanceMonitor.sol b/contracts/src/v0.8/automation/upkeeps/LinkAvailableBalanceMonitor.sol
index c9d184958e5..3e2c7ec41a5 100644
--- a/contracts/src/v0.8/automation/upkeeps/LinkAvailableBalanceMonitor.sol
+++ b/contracts/src/v0.8/automation/upkeeps/LinkAvailableBalanceMonitor.sol
@@ -4,6 +4,7 @@ pragma solidity 0.8.19;
 
 import {AutomationCompatibleInterface} from "../interfaces/AutomationCompatibleInterface.sol";
 import {AccessControl} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/access/AccessControl.sol";
+import {ConfirmedOwner} from "../../shared/access/ConfirmedOwner.sol";
 import {IERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/IERC20.sol";
 import {Pausable} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/security/Pausable.sol";
 
@@ -33,7 +34,7 @@ interface ILinkAvailable {
 ///  this is a "trusless" upkeep, meaning it does not trust the caller of performUpkeep;
 /// we could save a fair amount of gas and re-write this upkeep for use with Automation v2.0+,
 /// which has significantly different trust assumptions
-contract LinkAvailableBalanceMonitor is Pausable, AccessControl, AutomationCompatibleInterface {
+contract LinkAvailableBalanceMonitor is ConfirmedOwner, Pausable, AccessControl, AutomationCompatibleInterface {
   event BalanceUpdated(address indexed addr, uint256 oldBalance, uint256 newBalance);
   event FundsWithdrawn(uint256 amountWithdrawn, address payee);
   event UpkeepIntervalSet(uint256 oldUpkeepInterval, uint256 newUpkeepInterval);
@@ -85,7 +86,7 @@ contract LinkAvailableBalanceMonitor is Pausable, AccessControl, AutomationCompa
     uint16 maxPerform,
     uint16 maxCheck,
     uint8 upkeepInterval
-  ) {
+  ) ConfirmedOwner(msg.sender) {
     if (linkTokenAddress == address(0)) revert InvalidLinkTokenAddress(linkTokenAddress);
     _setRoleAdmin(ADMIN_ROLE, ADMIN_ROLE);
     _setRoleAdmin(EXECUTOR_ROLE, ADMIN_ROLE);
@@ -162,7 +163,7 @@ contract LinkAvailableBalanceMonitor is Pausable, AccessControl, AutomationCompa
   /// @param targetAddress the address to be deleted
   function removeFromWatchList(address targetAddress) public onlyRoleOrAdminRole(EXECUTOR_ROLE) returns (bool) {
     s_targets[targetAddress].isActive = false;
-    for (uint i; i < s_watchList.length; i++) {
+    for (uint256 i; i < s_watchList.length; i++) {
       if (s_watchList[i] == targetAddress) {
         s_watchList[i] = s_watchList[s_watchList.length - 1];
         s_watchList.pop();
@@ -294,7 +295,7 @@ contract LinkAvailableBalanceMonitor is Pausable, AccessControl, AutomationCompa
   }
 
   /// @notice Sets the minimum balance for the given target address
-  function setMinBalance(address target, uint96 minBalance) external onlyRoleOrAdminRole(EXECUTOR_ROLE) {
+  function setMinBalance(address target, uint96 minBalance) external onlyRole(ADMIN_ROLE) {
     if (target == address(0)) revert InvalidAddress(target);
     if (minBalance == 0) revert InvalidMinBalance(minBalance);
     if (!s_targets[target].isActive) revert InvalidWatchList();
@@ -304,7 +305,7 @@ contract LinkAvailableBalanceMonitor is Pausable, AccessControl, AutomationCompa
   }
 
   /// @notice Sets the minimum balance for the given target address
-  function setTopUpAmount(address target, uint96 topUpAmount) external onlyRoleOrAdminRole(EXECUTOR_ROLE) {
+  function setTopUpAmount(address target, uint96 topUpAmount) external onlyRole(ADMIN_ROLE) {
     if (target == address(0)) revert InvalidAddress(target);
     if (topUpAmount == 0) revert InvalidTopUpAmount(topUpAmount);
     if (!s_targets[target].isActive) revert InvalidWatchList();
@@ -314,25 +315,25 @@ contract LinkAvailableBalanceMonitor is Pausable, AccessControl, AutomationCompa
   }
 
   /// @notice Update s_maxPerform
-  function setMaxPerform(uint16 maxPerform) public onlyRoleOrAdminRole(EXECUTOR_ROLE) {
+  function setMaxPerform(uint16 maxPerform) public onlyRole(ADMIN_ROLE) {
     s_maxPerform = maxPerform;
     emit MaxPerformSet(s_maxPerform, maxPerform);
   }
 
   /// @notice Update s_maxCheck
-  function setMaxCheck(uint16 maxCheck) public onlyRoleOrAdminRole(EXECUTOR_ROLE) {
+  function setMaxCheck(uint16 maxCheck) public onlyRole(ADMIN_ROLE) {
     s_maxCheck = maxCheck;
     emit MaxCheckSet(s_maxCheck, maxCheck);
   }
 
   /// @notice Sets the minimum wait period (in seconds) for addresses between funding
-  function setMinWaitPeriodSeconds(uint256 minWaitPeriodSeconds) public onlyRoleOrAdminRole(EXECUTOR_ROLE) {
+  function setMinWaitPeriodSeconds(uint256 minWaitPeriodSeconds) public onlyRole(ADMIN_ROLE) {
     s_minWaitPeriodSeconds = minWaitPeriodSeconds;
     emit MinWaitPeriodSet(s_minWaitPeriodSeconds, minWaitPeriodSeconds);
   }
 
   /// @notice Update s_upkeepInterval
-  function setUpkeepInterval(uint8 upkeepInterval) public onlyRoleOrAdminRole(EXECUTOR_ROLE) {
+  function setUpkeepInterval(uint8 upkeepInterval) public onlyRole(ADMIN_ROLE) {
     if (upkeepInterval > 255) revert InvalidUpkeepInterval(upkeepInterval);
     s_upkeepInterval = upkeepInterval;
     emit UpkeepIntervalSet(s_upkeepInterval, upkeepInterval);
diff --git a/contracts/test/v0.8/automation/LinkAvailableBalanceMonitor.test.ts b/contracts/test/v0.8/automation/LinkAvailableBalanceMonitor.test.ts
index 781721dc4ec..c87f5a8c99d 100644
--- a/contracts/test/v0.8/automation/LinkAvailableBalanceMonitor.test.ts
+++ b/contracts/test/v0.8/automation/LinkAvailableBalanceMonitor.test.ts
@@ -221,6 +221,42 @@ describe('LinkAvailableBalanceMonitor', () => {
     })
   })
 
+  describe('setMaxPerform()', () => {
+    it('configures the MaxPerform', async () => {
+      await labm.connect(owner).setMaxPerform(BigNumber.from(100))
+      const report = await labm.getMaxPerform()
+      assert.equal(report.toString(), '100')
+    })
+
+    it('is only callable by the owner', async () => {
+      await expect(labm.connect(stranger).setMaxPerform(100)).to.be.reverted
+    })
+  })
+
+  describe('setMaxCheck()', () => {
+    it('configures the MaxCheck', async () => {
+      await labm.connect(owner).setMaxCheck(BigNumber.from(100))
+      const report = await labm.getMaxCheck()
+      assert.equal(report.toString(), '100')
+    })
+
+    it('is only callable by the owner', async () => {
+      await expect(labm.connect(stranger).setMaxCheck(100)).to.be.reverted
+    })
+  })
+
+  describe('setUpkeepInterval()', () => {
+    it('configures the UpkeepInterval', async () => {
+      await labm.connect(owner).setUpkeepInterval(BigNumber.from(100))
+      const report = await labm.getUpkeepInterval()
+      assert.equal(report.toString(), '100')
+    })
+
+    it('is only callable by the owner', async () => {
+      await expect(labm.connect(stranger).setUpkeepInterval(100)).to.be.reverted
+    })
+  })
+
   describe('withdraw()', () => {
     beforeEach(async () => {
       const tx = await lt.connect(owner).transfer(labm.address, oneLINK)
@@ -353,6 +389,120 @@ describe('LinkAvailableBalanceMonitor', () => {
         )
       await expect(tx).to.be.revertedWith(INVALID_WATCHLIST_ERR)
     })
+
+    it('Should allow owner to add multiple addresses with dstChainSelector 0 to the watchlist', async () => {
+      let tx = await labm.connect(owner).addToWatchList(watchAddress1, 0)
+      await tx.wait
+      let watchList = await labm.getWatchList()
+      assert.deepEqual(watchList[0], watchAddress1)
+
+      tx = await labm.connect(owner).addToWatchList(watchAddress2, 0)
+      await tx.wait
+      watchList = await labm.getWatchList()
+      assert.deepEqual(watchList[0], watchAddress1)
+      assert.deepEqual(watchList[1], watchAddress2)
+
+      tx = await labm.connect(owner).addToWatchList(watchAddress3, 0)
+      await tx.wait
+      watchList = await labm.getWatchList()
+      assert.deepEqual(watchList[0], watchAddress1)
+      assert.deepEqual(watchList[1], watchAddress2)
+      assert.deepEqual(watchList[2], watchAddress3)
+    })
+
+    it('Should allow owner to add only one address with an unique non-zero dstChainSelector 0 to the watchlist', async () => {
+      let tx = await labm.connect(owner).addToWatchList(watchAddress1, 1)
+      await tx.wait
+      let watchList = await labm.getWatchList()
+      assert.deepEqual(watchList[0], watchAddress1)
+
+      // 1 is active
+      let report = await labm.getAccountInfo(watchAddress1)
+      assert.isTrue(report.isActive)
+
+      tx = await labm.connect(owner).addToWatchList(watchAddress2, 1)
+      await tx.wait
+      watchList = await labm.getWatchList()
+      assert.deepEqual(watchList[0], watchAddress2)
+
+      // 2 is active, 1 should be false
+      report = await labm.getAccountInfo(watchAddress2)
+      assert.isTrue(report.isActive)
+      report = await labm.getAccountInfo(watchAddress1)
+      assert.isFalse(report.isActive)
+
+      tx = await labm.connect(owner).addToWatchList(watchAddress3, 1)
+      await tx.wait
+      watchList = await labm.getWatchList()
+      assert.deepEqual(watchList[0], watchAddress3)
+
+      // 3 is active, 1 and 2 should be false
+      report = await labm.getAccountInfo(watchAddress3)
+      assert.isTrue(report.isActive)
+      report = await labm.getAccountInfo(watchAddress2)
+      assert.isFalse(report.isActive)
+      report = await labm.getAccountInfo(watchAddress1)
+      assert.isFalse(report.isActive)
+    })
+
+    it('Should not add address 0 to the watchlist', async () => {
+      await labm.connect(owner).addToWatchList(ethers.constants.AddressZero, 1)
+      expect(await labm.getWatchList()).to.not.contain(
+        ethers.constants.AddressZero,
+      )
+    })
+
+    it('Should not allow stangers to add addresses to the watchlist', async () => {
+      await expect(labm.connect(stranger).addToWatchList(watchAddress1, 1)).to
+        .be.reverted
+    })
+
+    it('Should allow owner to remove addresses from the watchlist', async () => {
+      let tx = await labm.connect(owner).addToWatchList(watchAddress1, 1)
+      await tx.wait
+      let watchList = await labm.getWatchList()
+      assert.deepEqual(watchList[0], watchAddress1)
+      let report = await labm.getAccountInfo(watchAddress1)
+      assert.isTrue(report.isActive)
+
+      // remove address
+      tx = await labm.connect(owner).removeFromWatchList(watchAddress1)
+
+      // address should be false
+      report = await labm.getAccountInfo(watchAddress1)
+      assert.isFalse(report.isActive)
+
+      watchList = await labm.getWatchList()
+      assert.deepEqual(watchList, [])
+    })
+
+    it('Should allow only one address per dstChainSelector', async () => {
+      // add address1
+      await labm.connect(owner).addToWatchList(watchAddress1, 1)
+      expect(await labm.getWatchList()).to.contain(watchAddress1)
+
+      // add address2
+      await labm.connect(owner).addToWatchList(watchAddress2, 1)
+
+      // only address2 has to be in the watchlist
+      const watchlist = await labm.getWatchList()
+      expect(watchlist).to.not.contain(watchAddress1)
+      expect(watchlist).to.contain(watchAddress2)
+    })
+
+    it('Should delete the onRamp address on a zero-address with same dstChainSelector', async () => {
+      // add address1
+      await labm.connect(owner).addToWatchList(watchAddress1, 1)
+      expect(await labm.getWatchList()).to.contain(watchAddress1)
+
+      // simulates an onRampSet(zeroAddress, same dstChainSelector)
+      await labm.connect(owner).addToWatchList(ethers.constants.AddressZero, 1)
+
+      // address1 should be cleaned
+      const watchlist = await labm.getWatchList()
+      expect(watchlist).to.not.contain(watchAddress1)
+      assert.deepEqual(watchlist, [])
+    })
   })
 
   describe('checkUpkeep() / sampleUnderfundedAddresses() [ @skip-coverage ]', () => {

From e0ab2dcdc32ce97682c95a261af55963885c6e4a Mon Sep 17 00:00:00 2001
From: Borja Aranda <borja.aranda@smartcontract.com>
Date: Thu, 14 Dec 2023 10:20:12 +0100
Subject: [PATCH 006/130] minor reviews

---
 .../native_solc_compile_all_automation        |  8 ---
 .../upkeeps/LinkAvailableBalanceMonitor.sol   | 15 +++---
 .../LinkAvailableBalanceMonitor.test.ts       | 49 +++++++++++++------
 3 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/contracts/scripts/native_solc_compile_all_automation b/contracts/scripts/native_solc_compile_all_automation
index e7058d243f9..ddf6c2c8bfa 100755
--- a/contracts/scripts/native_solc_compile_all_automation
+++ b/contracts/scripts/native_solc_compile_all_automation
@@ -77,11 +77,3 @@ 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
-
-compileContract automation/upkeeps/LinkAvailableBalanceMonitor.sol
diff --git a/contracts/src/v0.8/automation/upkeeps/LinkAvailableBalanceMonitor.sol b/contracts/src/v0.8/automation/upkeeps/LinkAvailableBalanceMonitor.sol
index 3e2c7ec41a5..ddfdb923238 100644
--- a/contracts/src/v0.8/automation/upkeeps/LinkAvailableBalanceMonitor.sol
+++ b/contracts/src/v0.8/automation/upkeeps/LinkAvailableBalanceMonitor.sol
@@ -66,8 +66,8 @@ contract LinkAvailableBalanceMonitor is ConfirmedOwner, Pausable, AccessControl,
 
   bytes32 public constant ADMIN_ROLE = keccak256("ADMIN_ROLE");
   bytes32 public constant EXECUTOR_ROLE = keccak256("EXECUTOR_ROLE");
-  uint96 private constant DEFAULT_TOP_UP_AMOUNT = 9000000000000000000;
-  uint96 private constant DEFAULT_MIN_BALANCE = 1000000000000000000;
+  uint96 private constant DEFAULT_TOP_UP_AMOUNT_JULES = 9000000000000000000;
+  uint96 private constant DEFAULT_MIN_BALANCE_JULES = 1000000000000000000;
   IERC20 private immutable LINK_TOKEN;
 
   uint256 private s_minWaitPeriodSeconds;
@@ -135,12 +135,15 @@ contract LinkAvailableBalanceMonitor is ConfirmedOwner, Pausable, AccessControl,
   /// @dev this function has to be compatible with the event onRampSet(address, dstChainSelector) emitted by
   /// the CCIP router. Important detail to know is this event is also emitted when an onRamp is decomissioned,
   /// in which case it will carry the proper dstChainSelector along with the 0x0 address
-  function addToWatchList(address targetAddress, uint64 dstChainSelector) public onlyRoleOrAdminRole(EXECUTOR_ROLE) {
+  function addToWatchListOrDecomission(
+    address targetAddress,
+    uint64 dstChainSelector
+  ) public onlyRoleOrAdminRole(EXECUTOR_ROLE) {
     if (s_targets[targetAddress].isActive) revert DuplicateAddress(targetAddress);
     address oldAddress = s_onRampAddresses[dstChainSelector];
     // if targetAddress is an existing onRamp, there's a need of cleaning the previous onRamp associated to this dstChainSelector
     // there's no need to remove any other address that's not an onRamp
-    if (dstChainSelector > 0 && bytes(abi.encodePacked(oldAddress)).length > 0) {
+    if (dstChainSelector > 0 && oldAddress != address(0)) {
       removeFromWatchList(oldAddress);
     }
     // only add the new address if it's not 0x0
@@ -148,8 +151,8 @@ contract LinkAvailableBalanceMonitor is ConfirmedOwner, Pausable, AccessControl,
       s_onRampAddresses[dstChainSelector] = targetAddress;
       s_targets[targetAddress] = MonitoredAddress({
         isActive: true,
-        minBalance: DEFAULT_MIN_BALANCE,
-        topUpAmount: DEFAULT_TOP_UP_AMOUNT,
+        minBalance: DEFAULT_MIN_BALANCE_JULES,
+        topUpAmount: DEFAULT_TOP_UP_AMOUNT_JULES,
         lastTopUpTimestamp: 0
       });
       s_watchList.push(targetAddress);
diff --git a/contracts/test/v0.8/automation/LinkAvailableBalanceMonitor.test.ts b/contracts/test/v0.8/automation/LinkAvailableBalanceMonitor.test.ts
index c87f5a8c99d..847acd70f2f 100644
--- a/contracts/test/v0.8/automation/LinkAvailableBalanceMonitor.test.ts
+++ b/contracts/test/v0.8/automation/LinkAvailableBalanceMonitor.test.ts
@@ -316,7 +316,7 @@ describe('LinkAvailableBalanceMonitor', () => {
     })
   })
 
-  describe('setWatchList() / addToWatchList() / removeFromWatchlist() / getWatchList()', () => {
+  describe('setWatchList() / addToWatchListOrDecomissionOrDecomission() / removeFromWatchlist() / getWatchList()', () => {
     const watchAddress1 = randAddr()
     const watchAddress2 = randAddr()
     const watchAddress3 = randAddr()
@@ -391,18 +391,24 @@ describe('LinkAvailableBalanceMonitor', () => {
     })
 
     it('Should allow owner to add multiple addresses with dstChainSelector 0 to the watchlist', async () => {
-      let tx = await labm.connect(owner).addToWatchList(watchAddress1, 0)
+      let tx = await labm
+        .connect(owner)
+        .addToWatchListOrDecomission(watchAddress1, 0)
       await tx.wait
       let watchList = await labm.getWatchList()
       assert.deepEqual(watchList[0], watchAddress1)
 
-      tx = await labm.connect(owner).addToWatchList(watchAddress2, 0)
+      tx = await labm
+        .connect(owner)
+        .addToWatchListOrDecomission(watchAddress2, 0)
       await tx.wait
       watchList = await labm.getWatchList()
       assert.deepEqual(watchList[0], watchAddress1)
       assert.deepEqual(watchList[1], watchAddress2)
 
-      tx = await labm.connect(owner).addToWatchList(watchAddress3, 0)
+      tx = await labm
+        .connect(owner)
+        .addToWatchListOrDecomission(watchAddress3, 0)
       await tx.wait
       watchList = await labm.getWatchList()
       assert.deepEqual(watchList[0], watchAddress1)
@@ -411,7 +417,9 @@ describe('LinkAvailableBalanceMonitor', () => {
     })
 
     it('Should allow owner to add only one address with an unique non-zero dstChainSelector 0 to the watchlist', async () => {
-      let tx = await labm.connect(owner).addToWatchList(watchAddress1, 1)
+      let tx = await labm
+        .connect(owner)
+        .addToWatchListOrDecomission(watchAddress1, 1)
       await tx.wait
       let watchList = await labm.getWatchList()
       assert.deepEqual(watchList[0], watchAddress1)
@@ -420,7 +428,9 @@ describe('LinkAvailableBalanceMonitor', () => {
       let report = await labm.getAccountInfo(watchAddress1)
       assert.isTrue(report.isActive)
 
-      tx = await labm.connect(owner).addToWatchList(watchAddress2, 1)
+      tx = await labm
+        .connect(owner)
+        .addToWatchListOrDecomission(watchAddress2, 1)
       await tx.wait
       watchList = await labm.getWatchList()
       assert.deepEqual(watchList[0], watchAddress2)
@@ -431,7 +441,9 @@ describe('LinkAvailableBalanceMonitor', () => {
       report = await labm.getAccountInfo(watchAddress1)
       assert.isFalse(report.isActive)
 
-      tx = await labm.connect(owner).addToWatchList(watchAddress3, 1)
+      tx = await labm
+        .connect(owner)
+        .addToWatchListOrDecomission(watchAddress3, 1)
       await tx.wait
       watchList = await labm.getWatchList()
       assert.deepEqual(watchList[0], watchAddress3)
@@ -446,19 +458,24 @@ describe('LinkAvailableBalanceMonitor', () => {
     })
 
     it('Should not add address 0 to the watchlist', async () => {
-      await labm.connect(owner).addToWatchList(ethers.constants.AddressZero, 1)
+      await labm
+        .connect(owner)
+        .addToWatchListOrDecomission(ethers.constants.AddressZero, 1)
       expect(await labm.getWatchList()).to.not.contain(
         ethers.constants.AddressZero,
       )
     })
 
     it('Should not allow stangers to add addresses to the watchlist', async () => {
-      await expect(labm.connect(stranger).addToWatchList(watchAddress1, 1)).to
-        .be.reverted
+      await expect(
+        labm.connect(stranger).addToWatchListOrDecomission(watchAddress1, 1),
+      ).to.be.reverted
     })
 
     it('Should allow owner to remove addresses from the watchlist', async () => {
-      let tx = await labm.connect(owner).addToWatchList(watchAddress1, 1)
+      let tx = await labm
+        .connect(owner)
+        .addToWatchListOrDecomission(watchAddress1, 1)
       await tx.wait
       let watchList = await labm.getWatchList()
       assert.deepEqual(watchList[0], watchAddress1)
@@ -478,11 +495,11 @@ describe('LinkAvailableBalanceMonitor', () => {
 
     it('Should allow only one address per dstChainSelector', async () => {
       // add address1
-      await labm.connect(owner).addToWatchList(watchAddress1, 1)
+      await labm.connect(owner).addToWatchListOrDecomission(watchAddress1, 1)
       expect(await labm.getWatchList()).to.contain(watchAddress1)
 
       // add address2
-      await labm.connect(owner).addToWatchList(watchAddress2, 1)
+      await labm.connect(owner).addToWatchListOrDecomission(watchAddress2, 1)
 
       // only address2 has to be in the watchlist
       const watchlist = await labm.getWatchList()
@@ -492,11 +509,13 @@ describe('LinkAvailableBalanceMonitor', () => {
 
     it('Should delete the onRamp address on a zero-address with same dstChainSelector', async () => {
       // add address1
-      await labm.connect(owner).addToWatchList(watchAddress1, 1)
+      await labm.connect(owner).addToWatchListOrDecomission(watchAddress1, 1)
       expect(await labm.getWatchList()).to.contain(watchAddress1)
 
       // simulates an onRampSet(zeroAddress, same dstChainSelector)
-      await labm.connect(owner).addToWatchList(ethers.constants.AddressZero, 1)
+      await labm
+        .connect(owner)
+        .addToWatchListOrDecomission(ethers.constants.AddressZero, 1)
 
       // address1 should be cleaned
       const watchlist = await labm.getWatchList()

From 0979edd20342d0cf47ad91cec7ec3007d1b60729 Mon Sep 17 00:00:00 2001
From: Ilja Pavlovs <ilja.pavlovs@gmail.com>
Date: Fri, 24 Nov 2023 17:48:52 +0200
Subject: [PATCH 007/130] VRF-765: make optional to cancel subs after test run
 for VRF WASP tests (#11379)

---
 integration-tests/load/vrfv2/config.go        |   3 +-
 integration-tests/load/vrfv2/config.toml      |  19 +--
 integration-tests/load/vrfv2/vrfv2_test.go    |  57 +++++----
 integration-tests/load/vrfv2plus/config.go    |  11 +-
 integration-tests/load/vrfv2plus/config.toml  |  28 +++--
 .../load/vrfv2plus/vrfv2plus_test.go          | 108 +++++++++++++-----
 6 files changed, 142 insertions(+), 84 deletions(-)

diff --git a/integration-tests/load/vrfv2/config.go b/integration-tests/load/vrfv2/config.go
index e23294e839b..d5e94bb75fb 100644
--- a/integration-tests/load/vrfv2/config.go
+++ b/integration-tests/load/vrfv2/config.go
@@ -52,7 +52,8 @@ type NewEnvConfig struct {
 }
 
 type Common struct {
-	MinimumConfirmations uint16 `toml:"minimum_confirmations"`
+	MinimumConfirmations   uint16 `toml:"minimum_confirmations"`
+	CancelSubsAfterTestRun bool   `toml:"cancel_subs_after_test_run"`
 }
 
 type Funding struct {
diff --git a/integration-tests/load/vrfv2/config.toml b/integration-tests/load/vrfv2/config.toml
index 4e82ec7aeb6..6f54d1ec998 100644
--- a/integration-tests/load/vrfv2/config.toml
+++ b/integration-tests/load/vrfv2/config.toml
@@ -1,20 +1,21 @@
 
 [Common]
 minimum_confirmations = 3
+cancel_subs_after_test_run = true
 
 [NewEnvConfig]
-sub_funds_link = 1
-node_sending_key_funding = 10
+sub_funds_link = 1000
+node_sending_key_funding = 1000
 
 [ExistingEnvConfig]
-coordinator_address = "0x50d47e4142598E3411aA864e08a44284e471AC6f"
-#consumer_address = "0x087F232165D9bA1A602f148025e5D0666953F64a"
-#sub_id = "52116875585187328970776211988181422347535732407068188096422095950800466618218"
-key_hash = "0x027f94ff1465b3525f9fc03e9ff7d6d2c0953482246dd6ae07570c45d6631414"
+coordinator_address = ""
+consumer_address = ""
+sub_id = 1
+key_hash = ""
 create_fund_subs_and_add_consumers = true
-link_address = "0xb1D4538B4571d411F07960EF2838Ce337FE1E80E"
-sub_funds_link = 3
-node_sending_key_funding_min = 2
+link_address = ""
+sub_funds_link = 10
+node_sending_key_funding_min = 1
 node_sending_keys = [
     "",
     "",
diff --git a/integration-tests/load/vrfv2/vrfv2_test.go b/integration-tests/load/vrfv2/vrfv2_test.go
index 37a70442895..8e74e3aa901 100644
--- a/integration-tests/load/vrfv2/vrfv2_test.go
+++ b/integration-tests/load/vrfv2/vrfv2_test.go
@@ -97,25 +97,9 @@ func TestVRFV2Performance(t *testing.T) {
 							Str("Network Name", env.EVMClient.GetNetworkName()).
 							Msg("Network is a simulated network. Skipping fund return for Coordinator Subscriptions.")
 					} else {
-						//cancel subs and return funds to sub owner
-						for _, subID := range subIDs {
-							l.Info().
-								Uint64("Returning funds from SubID", subID).
-								Str("Returning funds to", eoaWalletAddress).
-								Msg("Canceling subscription and returning funds to subscription owner")
-							pendingRequestsExist, err := vrfv2Contracts.Coordinator.PendingRequestsExist(context.Background(), subID)
-							if err != nil {
-								l.Error().Err(err).Msg("Error checking if pending requests exist")
-							}
-							if !pendingRequestsExist {
-								_, err := vrfv2Contracts.Coordinator.CancelSubscription(subID, common.HexToAddress(eoaWalletAddress))
-								if err != nil {
-									l.Error().Err(err).Msg("Error canceling subscription")
-								}
-							} else {
-								l.Error().Uint64("Sub ID", subID).Msg("Pending requests exist for subscription, cannot cancel subscription and return funds")
-							}
-
+						if cfg.Common.CancelSubsAfterTestRun {
+							//cancel subs and return funds to sub owner
+							cancelSubsAndReturnFunds(subIDs, l)
 						}
 					}
 				}).
@@ -186,18 +170,10 @@ func TestVRFV2Performance(t *testing.T) {
 							Str("Network Name", env.EVMClient.GetNetworkName()).
 							Msg("Network is a simulated network. Skipping fund return for Coordinator Subscriptions.")
 					} else {
-						for _, subID := range subIDs {
-							l.Info().
-								Uint64("Returning funds from SubID", subID).
-								Str("Returning funds to", eoaWalletAddress).
-								Msg("Canceling subscription and returning funds to subscription owner")
-							_, err := vrfv2Contracts.Coordinator.CancelSubscription(subID, common.HexToAddress(eoaWalletAddress))
-							if err != nil {
-								l.Error().Err(err).Msg("Error canceling subscription")
-							}
+						if cfg.Common.CancelSubsAfterTestRun {
+							//cancel subs and return funds to sub owner
+							cancelSubsAndReturnFunds(subIDs, l)
 						}
-						//err = vrfv2.ReturnFundsForFulfilledRequests(env.EVMClient, vrfv2Contracts.Coordinator, l)
-						//l.Error().Err(err).Msg("Error returning funds for fulfilled requests")
 					}
 					if err := env.Cleanup(); err != nil {
 						l.Error().Err(err).Msg("Error cleaning up test environment")
@@ -287,6 +263,27 @@ func TestVRFV2Performance(t *testing.T) {
 
 }
 
+func cancelSubsAndReturnFunds(subIDs []uint64, l zerolog.Logger) {
+	for _, subID := range subIDs {
+		l.Info().
+			Uint64("Returning funds from SubID", subID).
+			Str("Returning funds to", eoaWalletAddress).
+			Msg("Canceling subscription and returning funds to subscription owner")
+		pendingRequestsExist, err := vrfv2Contracts.Coordinator.PendingRequestsExist(context.Background(), subID)
+		if err != nil {
+			l.Error().Err(err).Msg("Error checking if pending requests exist")
+		}
+		if !pendingRequestsExist {
+			_, err := vrfv2Contracts.Coordinator.CancelSubscription(subID, common.HexToAddress(eoaWalletAddress))
+			if err != nil {
+				l.Error().Err(err).Msg("Error canceling subscription")
+			}
+		} else {
+			l.Error().Uint64("Sub ID", subID).Msg("Pending requests exist for subscription, cannot cancel subscription and return funds")
+		}
+	}
+}
+
 func FundNodesIfNeeded(cfg *PerformanceConfig, client blockchain.EVMClient, l zerolog.Logger) error {
 	if cfg.ExistingEnvConfig.NodeSendingKeyFundingMin > 0 {
 		for _, sendingKey := range cfg.ExistingEnvConfig.NodeSendingKeys {
diff --git a/integration-tests/load/vrfv2plus/config.go b/integration-tests/load/vrfv2plus/config.go
index 96dbf99c6b2..43bcf44d044 100644
--- a/integration-tests/load/vrfv2plus/config.go
+++ b/integration-tests/load/vrfv2plus/config.go
@@ -41,8 +41,9 @@ type ExistingEnvConfig struct {
 	LinkAddress        string `toml:"link_address"`
 	SubID              string `toml:"sub_id"`
 	KeyHash            string `toml:"key_hash"`
-	SubFunding
-	CreateFundSubsAndAddConsumers bool `toml:"create_fund_subs_and_add_consumers"`
+	Funding
+	CreateFundSubsAndAddConsumers bool     `toml:"create_fund_subs_and_add_consumers"`
+	NodeSendingKeys               []string `toml:"node_sending_keys"`
 }
 
 type NewEnvConfig struct {
@@ -50,12 +51,14 @@ type NewEnvConfig struct {
 }
 
 type Common struct {
-	MinimumConfirmations uint16 `toml:"minimum_confirmations"`
+	MinimumConfirmations   uint16 `toml:"minimum_confirmations"`
+	CancelSubsAfterTestRun bool   `toml:"cancel_subs_after_test_run"`
 }
 
 type Funding struct {
-	NodeFunds float64 `toml:"node_funds"`
 	SubFunding
+	NodeSendingKeyFunding    float64 `toml:"node_sending_key_funding"`
+	NodeSendingKeyFundingMin float64 `toml:"node_sending_key_funding_min"`
 }
 
 type SubFunding struct {
diff --git a/integration-tests/load/vrfv2plus/config.toml b/integration-tests/load/vrfv2plus/config.toml
index e3200fafe22..8ccf60c6d80 100644
--- a/integration-tests/load/vrfv2plus/config.toml
+++ b/integration-tests/load/vrfv2plus/config.toml
@@ -1,21 +1,31 @@
 
 [Common]
 minimum_confirmations = 3
+cancel_subs_after_test_run = true
 
 [NewEnvConfig]
 sub_funds_link = 1
 sub_funds_native = 1
 node_funds = 10
+node_sending_key_funding = 1000
 
 [ExistingEnvConfig]
-coordinator_address = "0x27b61f155F772b291D1d9B478BeAd37B2Ae447b0"
-#consumer_address = "0x087F232165D9bA1A602f148025e5D0666953F64a"
-#sub_id = "52116875585187328970776211988181422347535732407068188096422095950800466618218"
-key_hash = "0x787d74caea10b2b357790d5b5247c2f63d1d91572a9846f780606e4d953677ae"
+coordinator_address = ""
+consumer_address = ""
+sub_id = 1
+key_hash = ""
 create_fund_subs_and_add_consumers = true
-link_address = "0x779877A7B0D9E8603169DdbD7836e478b4624789"
-sub_funds_link = 3
-sub_funds_native = 1
+link_address = ""
+sub_funds_link = 10
+node_sending_key_funding_min = 1
+node_sending_keys = [
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+]
 
 # 10 RPM - 1 tx request with 1 rand request in each tx every 6 seconds
 [Soak]
@@ -25,7 +35,7 @@ randomness_request_count_per_request = 1 # amount of randomness requests to make
 randomness_request_count_per_request_deviation = 0 #NOTE - deviation should be less than randomness_request_count_per_request setting
 number_of_sub_to_create = 1
 
-# approx 60 RPM - 1 tx request with 4 rand requests in each tx every 3 seconds
+# approx 60 RPM - 1 tx request with 3 rand requests in each tx every 3 seconds
 [Load]
 rate_limit_unit_duration = "3s"
 rps = 1
@@ -47,4 +57,4 @@ rate_limit_unit_duration = "1m"
 rps = 1
 randomness_request_count_per_request = 150 # amount of randomness requests to make per one TX request
 randomness_request_count_per_request_deviation = 0 #NOTE - deviation should be less than randomness_request_count_per_request setting
-number_of_sub_to_create = 1
\ No newline at end of file
+number_of_sub_to_create = 1
diff --git a/integration-tests/load/vrfv2plus/vrfv2plus_test.go b/integration-tests/load/vrfv2plus/vrfv2plus_test.go
index 11e160297f0..ac22b5256f6 100644
--- a/integration-tests/load/vrfv2plus/vrfv2plus_test.go
+++ b/integration-tests/load/vrfv2plus/vrfv2plus_test.go
@@ -1,19 +1,24 @@
 package loadvrfv2plus
 
 import (
+	"context"
 	"math/big"
 	"os"
 	"sync"
 	"testing"
 	"time"
 
+	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/kelseyhightower/envconfig"
+	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	"github.com/smartcontractkit/wasp"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-testing-framework/blockchain"
 	"github.com/smartcontractkit/chainlink-testing-framework/logging"
+	"github.com/smartcontractkit/chainlink-testing-framework/utils/conversions"
 	"github.com/smartcontractkit/chainlink-testing-framework/utils/testcontext"
 	"github.com/smartcontractkit/chainlink/integration-tests/testreporters"
 
@@ -93,25 +98,9 @@ func TestVRFV2PlusPerformance(t *testing.T) {
 							Str("Network Name", env.EVMClient.GetNetworkName()).
 							Msg("Network is a simulated network. Skipping fund return for Coordinator Subscriptions.")
 					} else {
-						//cancel subs and return funds to sub owner
-						for _, subID := range subIDs {
-							l.Info().
-								Str("Returning funds from SubID", subID.String()).
-								Str("Returning funds to", eoaWalletAddress).
-								Msg("Canceling subscription and returning funds to subscription owner")
-							pendingRequestsExist, err := vrfv2PlusContracts.Coordinator.PendingRequestsExist(testcontext.Get(t), subID)
-							if err != nil {
-								l.Error().Err(err).Msg("Error checking if pending requests exist")
-							}
-							if !pendingRequestsExist {
-								_, err := vrfv2PlusContracts.Coordinator.CancelSubscription(subID, common.HexToAddress(eoaWalletAddress))
-								if err != nil {
-									l.Error().Err(err).Msg("Error canceling subscription")
-								}
-							} else {
-								l.Error().Str("Sub ID", subID.String()).Msg("Pending requests exist for subscription, cannot cancel subscription and return funds")
-							}
-
+						if cfg.Common.CancelSubsAfterTestRun {
+							//cancel subs and return funds to sub owner
+							cancelSubsAndReturnFunds(subIDs, l)
 						}
 					}
 				}).
@@ -147,6 +136,9 @@ func TestVRFV2PlusPerformance(t *testing.T) {
 			subIDs = append(subIDs, subID)
 		}
 
+		err = FundNodesIfNeeded(cfg, env.EVMClient, l)
+		require.NoError(t, err)
+
 		vrfv2PlusContracts = &vrfv2plus.VRFV2_5Contracts{
 			Coordinator:       coordinator,
 			LoadTestConsumers: consumers,
@@ -166,7 +158,7 @@ func TestVRFV2PlusPerformance(t *testing.T) {
 
 	} else {
 		//todo: temporary solution with envconfig and toml config until VRF-662 is implemented
-		vrfv2PlusConfig.ChainlinkNodeFunding = cfg.NewEnvConfig.NodeFunds
+		vrfv2PlusConfig.ChainlinkNodeFunding = cfg.NewEnvConfig.NodeSendingKeyFunding
 		vrfv2PlusConfig.SubscriptionFundingAmountLink = cfg.NewEnvConfig.Funding.SubFundsLink
 		vrfv2PlusConfig.SubscriptionFundingAmountNative = cfg.NewEnvConfig.Funding.SubFundsNative
 		env, err = test_env.NewCLTestEnvBuilder().
@@ -183,18 +175,10 @@ func TestVRFV2PlusPerformance(t *testing.T) {
 							Str("Network Name", env.EVMClient.GetNetworkName()).
 							Msg("Network is a simulated network. Skipping fund return for Coordinator Subscriptions.")
 					} else {
-						for _, subID := range subIDs {
-							l.Info().
-								Str("Returning funds from SubID", subID.String()).
-								Str("Returning funds to", eoaWalletAddress).
-								Msg("Canceling subscription and returning funds to subscription owner")
-							_, err := vrfv2PlusContracts.Coordinator.CancelSubscription(subID, common.HexToAddress(eoaWalletAddress))
-							if err != nil {
-								l.Error().Err(err).Msg("Error canceling subscription")
-							}
+						if cfg.Common.CancelSubsAfterTestRun {
+							//cancel subs and return funds to sub owner
+							cancelSubsAndReturnFunds(subIDs, l)
 						}
-						//err = vrfv2plus.ReturnFundsForFulfilledRequests(env.EVMClient, vrfv2PlusContracts.Coordinator, l)
-						//l.Error().Err(err).Msg("Error returning funds for fulfilled requests")
 					}
 					if err := env.Cleanup(); err != nil {
 						l.Error().Err(err).Msg("Error cleaning up test environment")
@@ -281,6 +265,68 @@ func TestVRFV2PlusPerformance(t *testing.T) {
 			Interface("Fulfilment Count", fulfilmentCount).
 			Msg("Final Request/Fulfilment Stats")
 	})
+
+}
+
+func cancelSubsAndReturnFunds(subIDs []*big.Int, l zerolog.Logger) {
+	for _, subID := range subIDs {
+		l.Info().
+			Str("Returning funds from SubID", subID.String()).
+			Str("Returning funds to", eoaWalletAddress).
+			Msg("Canceling subscription and returning funds to subscription owner")
+		pendingRequestsExist, err := vrfv2PlusContracts.Coordinator.PendingRequestsExist(context.Background(), subID)
+		if err != nil {
+			l.Error().Err(err).Msg("Error checking if pending requests exist")
+		}
+		if !pendingRequestsExist {
+			_, err := vrfv2PlusContracts.Coordinator.CancelSubscription(subID, common.HexToAddress(eoaWalletAddress))
+			if err != nil {
+				l.Error().Err(err).Msg("Error canceling subscription")
+			}
+		} else {
+			l.Error().Str("Sub ID", subID.String()).Msg("Pending requests exist for subscription, cannot cancel subscription and return funds")
+		}
+	}
+}
+
+func FundNodesIfNeeded(cfg *PerformanceConfig, client blockchain.EVMClient, l zerolog.Logger) error {
+	if cfg.ExistingEnvConfig.NodeSendingKeyFundingMin > 0 {
+		for _, sendingKey := range cfg.ExistingEnvConfig.NodeSendingKeys {
+			address := common.HexToAddress(sendingKey)
+			sendingKeyBalance, err := client.BalanceAt(context.Background(), address)
+			if err != nil {
+				return err
+			}
+			fundingAtLeast := conversions.EtherToWei(big.NewFloat(cfg.ExistingEnvConfig.NodeSendingKeyFundingMin))
+			fundingToSendWei := new(big.Int).Sub(fundingAtLeast, sendingKeyBalance)
+			fundingToSendEth := conversions.WeiToEther(fundingToSendWei)
+			if fundingToSendWei.Cmp(big.NewInt(0)) == 1 {
+				l.Info().
+					Str("Sending Key", sendingKey).
+					Str("Sending Key Current Balance", sendingKeyBalance.String()).
+					Str("Should have at least", fundingAtLeast.String()).
+					Str("Funding Amount in ETH", fundingToSendEth.String()).
+					Msg("Funding Node's Sending Key")
+				gasEstimates, err := client.EstimateGas(ethereum.CallMsg{
+					To: &address,
+				})
+				if err != nil {
+					return err
+				}
+				err = client.Fund(sendingKey, fundingToSendEth, gasEstimates)
+				if err != nil {
+					return err
+				}
+			} else {
+				l.Info().
+					Str("Sending Key", sendingKey).
+					Str("Sending Key Current Balance", sendingKeyBalance.String()).
+					Str("Should have at least", fundingAtLeast.String()).
+					Msg("Skipping Node's Sending Key funding as it has enough funds")
+			}
+		}
+	}
+	return nil
 }
 
 func teardown(

From 54e121414ea128494e5e4e03da87b6e3b89208ea Mon Sep 17 00:00:00 2001
From: Dmytro Haidashenko <34754799+dhaidashenko@users.noreply.github.com>
Date: Mon, 27 Nov 2023 14:12:58 +0100
Subject: [PATCH 008/130] Call proper loop for outOfSyncLoop exist on close
 test (#11384)

---
 core/chains/evm/client/node_lifecycle_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/chains/evm/client/node_lifecycle_test.go b/core/chains/evm/client/node_lifecycle_test.go
index 9fdd9bb64e1..05b8af13ec5 100644
--- a/core/chains/evm/client/node_lifecycle_test.go
+++ b/core/chains/evm/client/node_lifecycle_test.go
@@ -521,7 +521,7 @@ func TestUnit_NodeLifecycle_outOfSyncLoop(t *testing.T) {
 		n.wg.Add(1)
 		go func() {
 			defer close(ch)
-			n.aliveLoop()
+			n.outOfSyncLoop(func(num int64, td *utils.Big) bool { return false })
 		}()
 		assert.NoError(t, n.Close())
 		testutils.WaitWithTimeout(t, ch, "expected outOfSyncLoop to exit")

From 0b11c90368a9cf4ff3f58d97de56366911660bf6 Mon Sep 17 00:00:00 2001
From: Ilja Pavlovs <ilja.pavlovs@gmail.com>
Date: Mon, 27 Nov 2023 15:58:36 +0200
Subject: [PATCH 009/130] =?UTF-8?q?VRF-543:=20add=20test=20for=20verifying?=
 =?UTF-8?q?=20round=20robin=20for=20multiple=20sending=20keys=E2=80=A6=20(?=
 =?UTF-8?q?#11382)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* VRF-543: add test for verifying round robin for multiple sending keys in VRF v2 and VRF V2 Plus

* VRF-543: fixing lint issue
---
 integration-tests/actions/actions.go          |  23 ++++
 .../actions/vrfv2_actions/vrfv2_steps.go      |  45 +++++--
 .../actions/vrfv2plus/vrfv2plus_steps.go      |  42 +++++--
 .../contracts/contract_vrf_models.go          |   2 +-
 .../contracts/ethereum_vrfv2_contracts.go     |  15 ++-
 integration-tests/go.mod                      |   2 +-
 integration-tests/load/vrfv2/vrfv2_test.go    |  10 +-
 .../load/vrfv2plus/vrfv2plus_test.go          |   1 +
 integration-tests/smoke/vrfv2_test.go         |  93 +++++++++++++++
 integration-tests/smoke/vrfv2plus_test.go     | 111 +++++++++++++++++-
 integration-tests/types/config/node/core.go   |  22 ++--
 11 files changed, 318 insertions(+), 48 deletions(-)

diff --git a/integration-tests/actions/actions.go b/integration-tests/actions/actions.go
index 438c36a9f0e..624df39c479 100644
--- a/integration-tests/actions/actions.go
+++ b/integration-tests/actions/actions.go
@@ -9,6 +9,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
 
 	"github.com/ethereum/go-ethereum"
@@ -458,3 +459,25 @@ func GenerateWallet() (common.Address, error) {
 	}
 	return crypto.PubkeyToAddress(*publicKeyECDSA), nil
 }
+
+// todo - move to CTF
+func FundAddress(client blockchain.EVMClient, sendingKey string, fundingToSendEth *big.Float) error {
+	address := common.HexToAddress(sendingKey)
+	gasEstimates, err := client.EstimateGas(ethereum.CallMsg{
+		To: &address,
+	})
+	if err != nil {
+		return err
+	}
+	err = client.Fund(sendingKey, fundingToSendEth, gasEstimates)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// todo - move to CTF
+func GetTxFromAddress(tx *types.Transaction) (string, error) {
+	from, err := types.Sender(types.LatestSignerForChainID(tx.ChainId()), tx)
+	return from.String(), err
+}
diff --git a/integration-tests/actions/vrfv2_actions/vrfv2_steps.go b/integration-tests/actions/vrfv2_actions/vrfv2_steps.go
index f565af26d93..4ea4a4a8534 100644
--- a/integration-tests/actions/vrfv2_actions/vrfv2_steps.go
+++ b/integration-tests/actions/vrfv2_actions/vrfv2_steps.go
@@ -29,6 +29,7 @@ import (
 
 var (
 	ErrNodePrimaryKey          = "error getting node's primary ETH key"
+	ErrNodeNewTxKey            = "error creating node's EVM transaction key"
 	ErrCreatingProvingKeyHash  = "error creating a keyHash from the proving key"
 	ErrRegisteringProvingKey   = "error registering a proving key on Coordinator contract"
 	ErrRegisterProvingKey      = "error registering proving keys"
@@ -105,7 +106,7 @@ func DeployVRFV2Consumers(contractDeployer contracts.ContractDeployer, coordinat
 func CreateVRFV2Job(
 	chainlinkNode *client.ChainlinkClient,
 	coordinatorAddress string,
-	nativeTokenPrimaryKeyAddress string,
+	nativeTokenKeyAddresses []string,
 	pubKeyCompressed string,
 	chainID string,
 	minIncomingConfirmations uint16,
@@ -122,7 +123,7 @@ func CreateVRFV2Job(
 	job, err := chainlinkNode.MustCreateJob(&client.VRFV2JobSpec{
 		Name:                     fmt.Sprintf("vrf-v2-%s", jobUUID),
 		CoordinatorAddress:       coordinatorAddress,
-		FromAddresses:            []string{nativeTokenPrimaryKeyAddress},
+		FromAddresses:            nativeTokenKeyAddresses,
 		EVMChainID:               chainID,
 		MinIncomingConfirmations: int(minIncomingConfirmations),
 		PublicKey:                pubKeyCompressed,
@@ -181,6 +182,7 @@ func SetupVRFV2Environment(
 	linkToken contracts.LinkToken,
 	mockNativeLINKFeed contracts.MockETHLINKFeed,
 	registerProvingKeyAgainstAddress string,
+	numberOfTxKeysToCreate int,
 	numberOfConsumers int,
 	numberOfSubToCreate int,
 	l zerolog.Logger,
@@ -254,17 +256,21 @@ func SetupVRFV2Environment(
 	}
 
 	chainID := env.EVMClient.GetChainID()
-
+	newNativeTokenKeyAddresses, err := CreateAndFundSendingKeys(env, vrfv2Config, numberOfTxKeysToCreate, chainID)
+	if err != nil {
+		return nil, nil, nil, err
+	}
 	nativeTokenPrimaryKeyAddress, err := env.ClCluster.NodeAPIs()[0].PrimaryEthAddress()
 	if err != nil {
 		return nil, nil, nil, fmt.Errorf("%s, err %w", ErrNodePrimaryKey, err)
 	}
+	allNativeTokenKeyAddresses := append(newNativeTokenKeyAddresses, nativeTokenPrimaryKeyAddress)
 
 	l.Info().Msg("Creating VRFV2  Job")
 	vrfV2job, err := CreateVRFV2Job(
 		env.ClCluster.NodeAPIs()[0],
 		vrfv2Contracts.Coordinator.Address(),
-		nativeTokenPrimaryKeyAddress,
+		allNativeTokenKeyAddresses,
 		pubKeyCompressed,
 		chainID.String(),
 		vrfv2Config.MinimumConfirmations,
@@ -276,12 +282,8 @@ func SetupVRFV2Environment(
 	// this part is here because VRFv2 can work with only a specific key
 	// [[EVM.KeySpecific]]
 	//	Key = '...'
-	addr, err := env.ClCluster.Nodes[0].API.PrimaryEthAddress()
-	if err != nil {
-		return nil, nil, nil, fmt.Errorf("%s, err %w", ErrGetPrimaryKey, err)
-	}
 	nodeConfig := node.NewConfig(env.ClCluster.Nodes[0].NodeConfig,
-		node.WithVRFv2EVMEstimator(addr, vrfv2Config.CLNodeMaxGasPriceGWei),
+		node.WithVRFv2EVMEstimator(allNativeTokenKeyAddresses, vrfv2Config.CLNodeMaxGasPriceGWei),
 	)
 	l.Info().Msg("Restarting Node with new sending key PriceMax configuration")
 	err = env.ClCluster.Nodes[0].Restart(nodeConfig)
@@ -306,6 +308,25 @@ func SetupVRFV2Environment(
 	return vrfv2Contracts, subIDs, &data, nil
 }
 
+func CreateAndFundSendingKeys(env *test_env.CLClusterTestEnv, vrfv2Config vrfv2_config.VRFV2Config, numberOfNativeTokenAddressesToCreate int, chainID *big.Int) ([]string, error) {
+	var newNativeTokenKeyAddresses []string
+	for i := 0; i < numberOfNativeTokenAddressesToCreate; i++ {
+		newTxKey, response, err := env.ClCluster.NodeAPIs()[0].CreateTxKey("evm", chainID.String())
+		if err != nil {
+			return nil, fmt.Errorf("%s, err %w", ErrNodeNewTxKey, err)
+		}
+		if response.StatusCode != 200 {
+			return nil, fmt.Errorf("error creating transaction key - response code, err %d", response.StatusCode)
+		}
+		newNativeTokenKeyAddresses = append(newNativeTokenKeyAddresses, newTxKey.Data.ID)
+		err = actions.FundAddress(env.EVMClient, newTxKey.Data.ID, big.NewFloat(vrfv2Config.ChainlinkNodeFunding))
+		if err != nil {
+			return nil, err
+		}
+	}
+	return newNativeTokenKeyAddresses, nil
+}
+
 func CreateFundSubsAndAddConsumers(
 	env *test_env.CLClusterTestEnv,
 	vrfv2Config vrfv2_config.VRFV2Config,
@@ -448,7 +469,7 @@ func RequestRandomnessAndWaitForFulfillment(
 	l zerolog.Logger,
 ) (*vrf_coordinator_v2.VRFCoordinatorV2RandomWordsFulfilled, error) {
 	logRandRequest(consumer.Address(), coordinator.Address(), subID, vrfv2Config, l)
-	err := consumer.RequestRandomness(
+	_, err := consumer.RequestRandomness(
 		vrfv2Data.KeyHash,
 		subID,
 		vrfv2Config.MinimumConfirmations,
@@ -460,7 +481,7 @@ func RequestRandomnessAndWaitForFulfillment(
 		return nil, fmt.Errorf("%s, err %w", ErrRequestRandomness, err)
 	}
 
-	return WaitForRequestAndFulfillmentEvents(
+	fulfillmentEvents, err := WaitForRequestAndFulfillmentEvents(
 		consumer.Address(),
 		coordinator,
 		vrfv2Data,
@@ -468,6 +489,7 @@ func RequestRandomnessAndWaitForFulfillment(
 		randomWordsFulfilledEventTimeout,
 		l,
 	)
+	return fulfillmentEvents, err
 }
 
 func WaitForRequestAndFulfillmentEvents(
@@ -489,7 +511,6 @@ func WaitForRequestAndFulfillmentEvents(
 	}
 
 	LogRandomnessRequestedEvent(l, coordinator, randomWordsRequestedEvent)
-
 	randomWordsFulfilledEvent, err := coordinator.WaitForRandomWordsFulfilledEvent(
 		[]*big.Int{randomWordsRequestedEvent.RequestId},
 		randomWordsFulfilledEventTimeout,
diff --git a/integration-tests/actions/vrfv2plus/vrfv2plus_steps.go b/integration-tests/actions/vrfv2plus/vrfv2plus_steps.go
index d0a33948e31..0e3c8096f0c 100644
--- a/integration-tests/actions/vrfv2plus/vrfv2plus_steps.go
+++ b/integration-tests/actions/vrfv2plus/vrfv2plus_steps.go
@@ -7,9 +7,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/smartcontractkit/chainlink-testing-framework/utils/conversions"
-
 	commonassets "github.com/smartcontractkit/chainlink-common/pkg/assets"
+	"github.com/smartcontractkit/chainlink-testing-framework/utils/conversions"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/vrfv2plus_wrapper_load_test_consumer"
 
@@ -31,6 +30,7 @@ import (
 
 var (
 	ErrNodePrimaryKey                              = "error getting node's primary ETH key"
+	ErrNodeNewTxKey                                = "error creating node's EVM transaction key"
 	ErrCreatingProvingKeyHash                      = "error creating a keyHash from the proving key"
 	ErrRegisteringProvingKey                       = "error registering a proving key on Coordinator contract"
 	ErrRegisterProvingKey                          = "error registering proving keys"
@@ -112,7 +112,7 @@ func DeployVRFV2PlusConsumers(contractDeployer contracts.ContractDeployer, coord
 func CreateVRFV2PlusJob(
 	chainlinkNode *client.ChainlinkClient,
 	coordinatorAddress string,
-	nativeTokenPrimaryKeyAddress string,
+	nativeTokenKeyAddresses []string,
 	pubKeyCompressed string,
 	chainID string,
 	minIncomingConfirmations uint16,
@@ -129,7 +129,7 @@ func CreateVRFV2PlusJob(
 	job, err := chainlinkNode.MustCreateJob(&client.VRFV2PlusJobSpec{
 		Name:                     fmt.Sprintf("vrf-v2-plus-%s", jobUUID),
 		CoordinatorAddress:       coordinatorAddress,
-		FromAddresses:            []string{nativeTokenPrimaryKeyAddress},
+		FromAddresses:            nativeTokenKeyAddresses,
 		EVMChainID:               chainID,
 		MinIncomingConfirmations: int(minIncomingConfirmations),
 		PublicKey:                pubKeyCompressed,
@@ -207,6 +207,7 @@ func SetupVRFV2_5Environment(
 	linkToken contracts.LinkToken,
 	mockNativeLINKFeed contracts.MockETHLINKFeed,
 	registerProvingKeyAgainstAddress string,
+	numberOfTxKeysToCreate int,
 	numberOfConsumers int,
 	numberOfSubToCreate int,
 	l zerolog.Logger,
@@ -273,17 +274,21 @@ func SetupVRFV2_5Environment(
 	}
 
 	chainID := env.EVMClient.GetChainID()
-
+	newNativeTokenKeyAddresses, err := CreateAndFundSendingKeys(env, vrfv2PlusConfig, numberOfTxKeysToCreate, chainID)
+	if err != nil {
+		return nil, nil, nil, err
+	}
 	nativeTokenPrimaryKeyAddress, err := env.ClCluster.NodeAPIs()[0].PrimaryEthAddress()
 	if err != nil {
 		return nil, nil, nil, fmt.Errorf("%s, err %w", ErrNodePrimaryKey, err)
 	}
+	allNativeTokenKeyAddresses := append(newNativeTokenKeyAddresses, nativeTokenPrimaryKeyAddress)
 
 	l.Info().Msg("Creating VRFV2 Plus Job")
 	job, err := CreateVRFV2PlusJob(
 		env.ClCluster.NodeAPIs()[0],
 		vrfv2_5Contracts.Coordinator.Address(),
-		nativeTokenPrimaryKeyAddress,
+		allNativeTokenKeyAddresses,
 		pubKeyCompressed,
 		chainID.String(),
 		vrfv2PlusConfig.MinimumConfirmations,
@@ -295,12 +300,8 @@ func SetupVRFV2_5Environment(
 	// this part is here because VRFv2 can work with only a specific key
 	// [[EVM.KeySpecific]]
 	//	Key = '...'
-	addr, err := env.ClCluster.Nodes[0].API.PrimaryEthAddress()
-	if err != nil {
-		return nil, nil, nil, fmt.Errorf("%s, err %w", ErrGetPrimaryKey, err)
-	}
 	nodeConfig := node.NewConfig(env.ClCluster.Nodes[0].NodeConfig,
-		node.WithVRFv2EVMEstimator(addr, vrfv2PlusConfig.CLNodeMaxGasPriceGWei),
+		node.WithVRFv2EVMEstimator(allNativeTokenKeyAddresses, vrfv2PlusConfig.CLNodeMaxGasPriceGWei),
 	)
 	l.Info().Msg("Restarting Node with new sending key PriceMax configuration")
 	err = env.ClCluster.Nodes[0].Restart(nodeConfig)
@@ -325,6 +326,25 @@ func SetupVRFV2_5Environment(
 	return vrfv2_5Contracts, subIDs, &data, nil
 }
 
+func CreateAndFundSendingKeys(env *test_env.CLClusterTestEnv, vrfv2PlusConfig vrfv2plus_config.VRFV2PlusConfig, numberOfNativeTokenAddressesToCreate int, chainID *big.Int) ([]string, error) {
+	var newNativeTokenKeyAddresses []string
+	for i := 0; i < numberOfNativeTokenAddressesToCreate; i++ {
+		newTxKey, response, err := env.ClCluster.NodeAPIs()[0].CreateTxKey("evm", chainID.String())
+		if err != nil {
+			return nil, fmt.Errorf("%s, err %w", ErrNodeNewTxKey, err)
+		}
+		if response.StatusCode != 200 {
+			return nil, fmt.Errorf("error creating transaction key - response code, err %d", response.StatusCode)
+		}
+		newNativeTokenKeyAddresses = append(newNativeTokenKeyAddresses, newTxKey.Data.ID)
+		err = actions.FundAddress(env.EVMClient, newTxKey.Data.ID, big.NewFloat(vrfv2PlusConfig.ChainlinkNodeFunding))
+		if err != nil {
+			return nil, err
+		}
+	}
+	return newNativeTokenKeyAddresses, nil
+}
+
 func CreateFundSubsAndAddConsumers(
 	env *test_env.CLClusterTestEnv,
 	vrfv2PlusConfig vrfv2plus_config.VRFV2PlusConfig,
diff --git a/integration-tests/contracts/contract_vrf_models.go b/integration-tests/contracts/contract_vrf_models.go
index 5f850fce1a7..548cac252b1 100644
--- a/integration-tests/contracts/contract_vrf_models.go
+++ b/integration-tests/contracts/contract_vrf_models.go
@@ -170,7 +170,7 @@ type VRFv2Consumer interface {
 
 type VRFv2LoadTestConsumer interface {
 	Address() string
-	RequestRandomness(hash [32]byte, subID uint64, confs uint16, gasLimit uint32, numWords uint32, requestCount uint16) error
+	RequestRandomness(hash [32]byte, subID uint64, confs uint16, gasLimit uint32, numWords uint32, requestCount uint16) (*types.Transaction, error)
 	GetRequestStatus(ctx context.Context, requestID *big.Int) (vrf_load_test_with_metrics.GetRequestStatus, error)
 	GetLastRequestId(ctx context.Context) (*big.Int, error)
 	GetLoadTestMetrics(ctx context.Context) (*VRFLoadTestMetrics, error)
diff --git a/integration-tests/contracts/ethereum_vrfv2_contracts.go b/integration-tests/contracts/ethereum_vrfv2_contracts.go
index ac3926fa746..d1637c93c87 100644
--- a/integration-tests/contracts/ethereum_vrfv2_contracts.go
+++ b/integration-tests/contracts/ethereum_vrfv2_contracts.go
@@ -441,17 +441,24 @@ func (v *EthereumVRFv2LoadTestConsumer) Address() string {
 	return v.address.Hex()
 }
 
-func (v *EthereumVRFv2LoadTestConsumer) RequestRandomness(keyHash [32]byte, subID uint64, requestConfirmations uint16, callbackGasLimit uint32, numWords uint32, requestCount uint16) error {
+func (v *EthereumVRFv2LoadTestConsumer) RequestRandomness(
+	keyHash [32]byte,
+	subID uint64,
+	requestConfirmations uint16,
+	callbackGasLimit uint32,
+	numWords uint32,
+	requestCount uint16,
+) (*types.Transaction, error) {
 	opts, err := v.client.TransactionOpts(v.client.GetDefaultWallet())
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	tx, err := v.consumer.RequestRandomWords(opts, subID, requestConfirmations, keyHash, callbackGasLimit, numWords, requestCount)
 	if err != nil {
-		return err
+		return nil, err
 	}
-	return v.client.ProcessTransaction(tx)
+	return tx, v.client.ProcessTransaction(tx)
 }
 
 func (v *EthereumVRFv2Consumer) GetRequestStatus(ctx context.Context, requestID *big.Int) (vrf_v2_consumer_wrapper.GetRequestStatus, error) {
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index 2338c0caa58..d0ca2346636 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -11,6 +11,7 @@ require (
 	github.com/cli/go-gh/v2 v2.0.0
 	github.com/ethereum/go-ethereum v1.12.0
 	github.com/go-resty/resty/v2 v2.7.0
+	github.com/google/go-cmp v0.5.9
 	github.com/google/uuid v1.3.1
 	github.com/jmoiron/sqlx v1.3.5
 	github.com/kelseyhightower/envconfig v1.4.0
@@ -191,7 +192,6 @@ require (
 	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
 	github.com/google/btree v1.1.2 // indirect
 	github.com/google/gnostic v0.6.9 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/go-tpm v0.9.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
diff --git a/integration-tests/load/vrfv2/vrfv2_test.go b/integration-tests/load/vrfv2/vrfv2_test.go
index 8e74e3aa901..ae109f75e28 100644
--- a/integration-tests/load/vrfv2/vrfv2_test.go
+++ b/integration-tests/load/vrfv2/vrfv2_test.go
@@ -8,7 +8,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/kelseyhightower/envconfig"
 	"github.com/rs/zerolog"
@@ -199,6 +198,7 @@ func TestVRFV2Performance(t *testing.T) {
 			mockETHLinkFeed,
 			//register proving key against EOA address in order to return funds to this address
 			env.EVMClient.GetDefaultWallet().Address(),
+			0,
 			1,
 			vrfv2Config.NumberOfSubToCreate,
 			l,
@@ -302,13 +302,7 @@ func FundNodesIfNeeded(cfg *PerformanceConfig, client blockchain.EVMClient, l ze
 					Str("Should have at least", fundingAtLeast.String()).
 					Str("Funding Amount in ETH", fundingToSendEth.String()).
 					Msg("Funding Node's Sending Key")
-				gasEstimates, err := client.EstimateGas(ethereum.CallMsg{
-					To: &address,
-				})
-				if err != nil {
-					return err
-				}
-				err = client.Fund(sendingKey, fundingToSendEth, gasEstimates)
+				err := actions.FundAddress(client, sendingKey, fundingToSendEth)
 				if err != nil {
 					return err
 				}
diff --git a/integration-tests/load/vrfv2plus/vrfv2plus_test.go b/integration-tests/load/vrfv2plus/vrfv2plus_test.go
index ac22b5256f6..4b6728440b3 100644
--- a/integration-tests/load/vrfv2plus/vrfv2plus_test.go
+++ b/integration-tests/load/vrfv2plus/vrfv2plus_test.go
@@ -204,6 +204,7 @@ func TestVRFV2PlusPerformance(t *testing.T) {
 			mockETHLinkFeed,
 			//register proving key against EOA address in order to return funds to this address
 			env.EVMClient.GetDefaultWallet().Address(),
+			0,
 			1,
 			vrfv2PlusConfig.NumberOfSubToCreate,
 			l,
diff --git a/integration-tests/smoke/vrfv2_test.go b/integration-tests/smoke/vrfv2_test.go
index c7b48fc3a35..4edb92e5df6 100644
--- a/integration-tests/smoke/vrfv2_test.go
+++ b/integration-tests/smoke/vrfv2_test.go
@@ -5,9 +5,12 @@ import (
 	"math/big"
 	"testing"
 
+	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/kelseyhightower/envconfig"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-testing-framework/blockchain"
 	"github.com/smartcontractkit/chainlink/integration-tests/actions/vrfv2_actions"
 	"github.com/smartcontractkit/chainlink/integration-tests/actions/vrfv2_actions/vrfv2_config"
 
@@ -44,12 +47,14 @@ func TestVRFv2Basic(t *testing.T) {
 	// register proving key against oracle address (sending key) in order to test oracleWithdraw
 	defaultWalletAddress := env.EVMClient.GetDefaultWallet().Address()
 
+	numberOfTxKeysToCreate := 1
 	vrfv2Contracts, subIDs, vrfv2Data, err := vrfv2_actions.SetupVRFV2Environment(
 		env,
 		vrfv2Config,
 		linkToken,
 		mockETHLinkFeed,
 		defaultWalletAddress,
+		numberOfTxKeysToCreate,
 		1,
 		1,
 		l,
@@ -105,3 +110,91 @@ func TestVRFv2Basic(t *testing.T) {
 		}
 	})
 }
+
+func TestVRFv2MultipleSendingKeys(t *testing.T) {
+	t.Parallel()
+	l := logging.GetTestLogger(t)
+
+	var vrfv2Config vrfv2_config.VRFV2Config
+	err := envconfig.Process("VRFV2", &vrfv2Config)
+	require.NoError(t, err)
+
+	env, err := test_env.NewCLTestEnvBuilder().
+		WithTestLogger(t).
+		WithGeth().
+		WithCLNodes(1).
+		WithFunding(big.NewFloat(vrfv2Config.ChainlinkNodeFunding)).
+		WithStandardCleanup().
+		Build()
+	require.NoError(t, err, "error creating test env")
+
+	env.ParallelTransactions(true)
+
+	mockETHLinkFeed, err := actions.DeployMockETHLinkFeed(env.ContractDeployer, big.NewInt(vrfv2Config.LinkNativeFeedResponse))
+	require.NoError(t, err)
+	linkToken, err := actions.DeployLINKToken(env.ContractDeployer)
+	require.NoError(t, err)
+
+	// register proving key against oracle address (sending key) in order to test oracleWithdraw
+	defaultWalletAddress := env.EVMClient.GetDefaultWallet().Address()
+
+	numberOfTxKeysToCreate := 2
+	vrfv2Contracts, subIDs, vrfv2Data, err := vrfv2_actions.SetupVRFV2Environment(
+		env,
+		vrfv2Config,
+		linkToken,
+		mockETHLinkFeed,
+		defaultWalletAddress,
+		numberOfTxKeysToCreate,
+		1,
+		1,
+		l,
+	)
+	require.NoError(t, err, "error setting up VRF v2 env")
+
+	subID := subIDs[0]
+
+	subscription, err := vrfv2Contracts.Coordinator.GetSubscription(context.Background(), subID)
+	require.NoError(t, err, "error getting subscription information")
+
+	vrfv2_actions.LogSubDetails(l, subscription, subID, vrfv2Contracts.Coordinator)
+
+	t.Run("Request Randomness with multiple sending keys", func(t *testing.T) {
+		testConfig := vrfv2Config
+		txKeys, _, err := env.ClCluster.Nodes[0].API.ReadTxKeys("evm")
+		require.NoError(t, err, "error reading tx keys")
+
+		require.Equal(t, numberOfTxKeysToCreate+1, len(txKeys.Data))
+
+		var fulfillmentTxFromAddresses []string
+		for i := 0; i < numberOfTxKeysToCreate+1; i++ {
+			randomWordsFulfilledEvent, err := vrfv2_actions.RequestRandomnessAndWaitForFulfillment(
+				vrfv2Contracts.LoadTestConsumers[0],
+				vrfv2Contracts.Coordinator,
+				vrfv2Data,
+				subID,
+				testConfig.RandomnessRequestCountPerRequest,
+				testConfig,
+				testConfig.RandomWordsFulfilledEventTimeout,
+				l,
+			)
+			require.NoError(t, err, "error requesting randomness and waiting for fulfilment")
+
+			//todo - move TransactionByHash to EVMClient in CTF
+			fulfillmentTx, _, err := env.EVMClient.(*blockchain.EthereumMultinodeClient).DefaultClient.(*blockchain.EthereumClient).
+				Client.TransactionByHash(context.Background(), randomWordsFulfilledEvent.Raw.TxHash)
+			require.NoError(t, err, "error getting tx from hash")
+			fulfillmentTxFromAddress, err := actions.GetTxFromAddress(fulfillmentTx)
+			require.NoError(t, err, "error getting tx from address")
+			fulfillmentTxFromAddresses = append(fulfillmentTxFromAddresses, fulfillmentTxFromAddress)
+		}
+		require.Equal(t, numberOfTxKeysToCreate+1, len(fulfillmentTxFromAddresses))
+		var txKeyAddresses []string
+		for _, txKey := range txKeys.Data {
+			txKeyAddresses = append(txKeyAddresses, txKey.ID)
+		}
+		less := func(a, b string) bool { return a < b }
+		equalIgnoreOrder := cmp.Diff(txKeyAddresses, fulfillmentTxFromAddresses, cmpopts.SortSlices(less)) == ""
+		require.True(t, equalIgnoreOrder)
+	})
+}
diff --git a/integration-tests/smoke/vrfv2plus_test.go b/integration-tests/smoke/vrfv2plus_test.go
index 9ce9f216995..f4f52b6ee01 100644
--- a/integration-tests/smoke/vrfv2plus_test.go
+++ b/integration-tests/smoke/vrfv2plus_test.go
@@ -1,15 +1,19 @@
 package smoke
 
 import (
+	"context"
 	"fmt"
 	"math/big"
 	"testing"
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/kelseyhightower/envconfig"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-testing-framework/blockchain"
 	"github.com/smartcontractkit/chainlink-testing-framework/logging"
 	"github.com/smartcontractkit/chainlink-testing-framework/utils/testcontext"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/vrf_v2plus_upgraded_version"
@@ -49,12 +53,14 @@ func TestVRFv2Plus(t *testing.T) {
 	// register proving key against oracle address (sending key) in order to test oracleWithdraw
 	defaultWalletAddress := env.EVMClient.GetDefaultWallet().Address()
 
+	numberOfTxKeysToCreate := 2
 	vrfv2PlusContracts, subIDs, vrfv2PlusData, err := vrfv2plus.SetupVRFV2_5Environment(
 		env,
 		vrfv2PlusConfig,
 		linkToken,
 		mockETHLinkFeed,
 		defaultWalletAddress,
+		numberOfTxKeysToCreate,
 		1,
 		1,
 		l,
@@ -596,6 +602,97 @@ func TestVRFv2Plus(t *testing.T) {
 	})
 }
 
+func TestVRFv2PlusMultipleSendingKeys(t *testing.T) {
+	t.Parallel()
+	l := logging.GetTestLogger(t)
+
+	var vrfv2PlusConfig vrfv2plus_config.VRFV2PlusConfig
+	err := envconfig.Process("VRFV2PLUS", &vrfv2PlusConfig)
+	require.NoError(t, err)
+
+	env, err := test_env.NewCLTestEnvBuilder().
+		WithTestLogger(t).
+		WithGeth().
+		WithCLNodes(1).
+		WithFunding(big.NewFloat(vrfv2PlusConfig.ChainlinkNodeFunding)).
+		WithStandardCleanup().
+		Build()
+	require.NoError(t, err, "error creating test env")
+
+	env.ParallelTransactions(true)
+
+	mockETHLinkFeed, err := actions.DeployMockETHLinkFeed(env.ContractDeployer, big.NewInt(vrfv2PlusConfig.LinkNativeFeedResponse))
+	require.NoError(t, err, "error deploying mock ETH/LINK feed")
+
+	linkToken, err := actions.DeployLINKToken(env.ContractDeployer)
+	require.NoError(t, err, "error deploying LINK contract")
+
+	// register proving key against oracle address (sending key) in order to test oracleWithdraw
+	defaultWalletAddress := env.EVMClient.GetDefaultWallet().Address()
+
+	numberOfTxKeysToCreate := 2
+	vrfv2PlusContracts, subIDs, vrfv2PlusData, err := vrfv2plus.SetupVRFV2_5Environment(
+		env,
+		vrfv2PlusConfig,
+		linkToken,
+		mockETHLinkFeed,
+		defaultWalletAddress,
+		numberOfTxKeysToCreate,
+		1,
+		1,
+		l,
+	)
+	require.NoError(t, err, "error setting up VRF v2_5 env")
+
+	subID := subIDs[0]
+
+	subscription, err := vrfv2PlusContracts.Coordinator.GetSubscription(testcontext.Get(t), subID)
+	require.NoError(t, err, "error getting subscription information")
+
+	vrfv2plus.LogSubDetails(l, subscription, subID, vrfv2PlusContracts.Coordinator)
+
+	t.Run("Request Randomness with multiple sending keys", func(t *testing.T) {
+		testConfig := vrfv2PlusConfig
+		var isNativeBilling = false
+		txKeys, _, err := env.ClCluster.Nodes[0].API.ReadTxKeys("evm")
+		require.NoError(t, err, "error reading tx keys")
+
+		require.Equal(t, numberOfTxKeysToCreate+1, len(txKeys.Data))
+
+		var fulfillmentTxFromAddresses []string
+		for i := 0; i < numberOfTxKeysToCreate+1; i++ {
+			randomWordsFulfilledEvent, err := vrfv2plus.RequestRandomnessAndWaitForFulfillment(
+				vrfv2PlusContracts.LoadTestConsumers[0],
+				vrfv2PlusContracts.Coordinator,
+				vrfv2PlusData,
+				subID,
+				isNativeBilling,
+				testConfig.RandomnessRequestCountPerRequest,
+				testConfig,
+				testConfig.RandomWordsFulfilledEventTimeout,
+				l,
+			)
+			require.NoError(t, err, "error requesting randomness and waiting for fulfilment")
+
+			//todo - move TransactionByHash to EVMClient in CTF
+			fulfillmentTx, _, err := env.EVMClient.(*blockchain.EthereumMultinodeClient).DefaultClient.(*blockchain.EthereumClient).
+				Client.TransactionByHash(context.Background(), randomWordsFulfilledEvent.Raw.TxHash)
+			require.NoError(t, err, "error getting tx from hash")
+			fulfillmentTxFromAddress, err := actions.GetTxFromAddress(fulfillmentTx)
+			require.NoError(t, err, "error getting tx from address")
+			fulfillmentTxFromAddresses = append(fulfillmentTxFromAddresses, fulfillmentTxFromAddress)
+		}
+		require.Equal(t, numberOfTxKeysToCreate+1, len(fulfillmentTxFromAddresses))
+		var txKeyAddresses []string
+		for _, txKey := range txKeys.Data {
+			txKeyAddresses = append(txKeyAddresses, txKey.ID)
+		}
+		less := func(a, b string) bool { return a < b }
+		equalIgnoreOrder := cmp.Diff(txKeyAddresses, fulfillmentTxFromAddresses, cmpopts.SortSlices(less)) == ""
+		require.True(t, equalIgnoreOrder)
+	})
+}
+
 func TestVRFv2PlusMigration(t *testing.T) {
 	t.Parallel()
 	l := logging.GetTestLogger(t)
@@ -622,7 +719,17 @@ func TestVRFv2PlusMigration(t *testing.T) {
 	nativeTokenPrimaryKeyAddress, err := env.ClCluster.NodeAPIs()[0].PrimaryEthAddress()
 	require.NoError(t, err, "error getting primary eth address")
 
-	vrfv2PlusContracts, subIDs, vrfv2PlusData, err := vrfv2plus.SetupVRFV2_5Environment(env, vrfv2PlusConfig, linkAddress, mockETHLinkFeedAddress, nativeTokenPrimaryKeyAddress, 2, 1, l)
+	vrfv2PlusContracts, subIDs, vrfv2PlusData, err := vrfv2plus.SetupVRFV2_5Environment(
+		env,
+		vrfv2PlusConfig,
+		linkAddress,
+		mockETHLinkFeedAddress,
+		nativeTokenPrimaryKeyAddress,
+		0,
+		2,
+		1,
+		l,
+	)
 	require.NoError(t, err, "error setting up VRF v2_5 env")
 
 	subID := subIDs[0]
@@ -671,7 +778,7 @@ func TestVRFv2PlusMigration(t *testing.T) {
 	_, err = vrfv2plus.CreateVRFV2PlusJob(
 		env.ClCluster.NodeAPIs()[0],
 		newCoordinator.Address(),
-		vrfv2PlusData.PrimaryEthAddress,
+		[]string{vrfv2PlusData.PrimaryEthAddress},
 		vrfv2PlusData.VRFKey.Data.ID,
 		vrfv2PlusData.ChainID.String(),
 		vrfv2PlusConfig.MinimumConfirmations,
diff --git a/integration-tests/types/config/node/core.go b/integration-tests/types/config/node/core.go
index 47bc8e8cc1e..5934809bace 100644
--- a/integration-tests/types/config/node/core.go
+++ b/integration-tests/types/config/node/core.go
@@ -223,22 +223,26 @@ func WithPrivateEVMs(networks []blockchain.EVMNetwork) NodeConfigOpt {
 	}
 }
 
-func WithVRFv2EVMEstimator(addr string, maxGasPriceGWei int64) NodeConfigOpt {
+func WithVRFv2EVMEstimator(addresses []string, maxGasPriceGWei int64) NodeConfigOpt {
 	est := assets.GWei(maxGasPriceGWei)
-	return func(c *chainlink.Config) {
-		c.EVM[0].KeySpecific = evmcfg.KeySpecificConfig{
-			{
-				Key: ptr.Ptr(ethkey.EIP55Address(addr)),
-				GasEstimator: evmcfg.KeySpecificGasEstimator{
-					PriceMax: est,
-				},
+
+	var keySpecicifArr []evmcfg.KeySpecific
+	for _, addr := range addresses {
+		keySpecicifArr = append(keySpecicifArr, evmcfg.KeySpecific{
+			Key: ptr.Ptr(ethkey.EIP55Address(addr)),
+			GasEstimator: evmcfg.KeySpecificGasEstimator{
+				PriceMax: est,
 			},
-		}
+		})
+	}
+	return func(c *chainlink.Config) {
+		c.EVM[0].KeySpecific = keySpecicifArr
 		c.EVM[0].Chain.GasEstimator = evmcfg.GasEstimator{
 			LimitDefault: ptr.Ptr[uint32](3500000),
 		}
 		c.EVM[0].Chain.Transactions = evmcfg.Transactions{
 			MaxQueued: ptr.Ptr[uint32](10000),
 		}
+
 	}
 }

From 2077cfd7a5ef6081c7cb022c0745c6be019cca1b Mon Sep 17 00:00:00 2001
From: Jordan Krage <jmank88@gmail.com>
Date: Mon, 27 Nov 2023 08:04:00 -0600
Subject: [PATCH 010/130] core/internal/cltest: simplify (#11383)

---
 core/chains/evm/client/client_test.go         |  77 +++--
 core/chains/evm/client/pool_test.go           |   4 +-
 core/chains/evm/txmgr/broadcaster_test.go     |  74 ++---
 core/chains/evm/txmgr/confirmer_test.go       | 156 ++++++-----
 core/chains/evm/txmgr/evm_tx_store_test.go    | 126 ++++-----
 core/chains/evm/txmgr/reaper_test.go          |   4 +-
 core/chains/evm/txmgr/txmgr_test.go           | 265 +++++++++++++++++-
 core/cmd/admin_commands_test.go               |   8 +-
 core/cmd/blocks_commands_test.go              |   3 +-
 core/cmd/bridge_commands_test.go              |   6 +-
 core/cmd/cosmos_keys_commands_test.go         |   8 +-
 core/cmd/cosmos_transaction_commands_test.go  |   3 +-
 core/cmd/csa_keys_commands_test.go            |   6 +-
 core/cmd/dkgencrypt_keys_commands_test.go     |   8 +-
 core/cmd/dkgsign_keys_commands_test.go        |   8 +-
 core/cmd/eth_keys_commands_test.go            |  28 +-
 core/cmd/evm_transaction_commands_test.go     |  14 +-
 core/cmd/forwarders_commands_test.go          |   8 +-
 core/cmd/jobs_commands_test.go                |  12 +-
 core/cmd/ocr2_keys_commands_test.go           |  10 +-
 core/cmd/ocr_keys_commands_test.go            |   8 +-
 core/cmd/p2p_keys_commands_test.go            |   8 +-
 core/cmd/shell_local_test.go                  |  10 +-
 core/cmd/shell_remote_test.go                 |  38 +--
 core/cmd/shell_test.go                        |  49 ++++
 core/cmd/solana_keys_commands_test.go         |   8 +-
 core/cmd/solana_transaction_commands_test.go  |   3 +-
 core/cmd/starknet_keys_commands_test.go       |   8 +-
 core/cmd/vrf_keys_commands_test.go            |   8 +-
 core/internal/cltest/cltest.go                | 123 --------
 .../internal/cltest/event_websocket_server.go | 154 ----------
 core/internal/cltest/factories.go             | 246 +---------------
 core/internal/features/features_test.go       |  24 +-
 .../ocrcommon/discoverer_database_test.go     |  21 +-
 core/services/pg/event_broadcaster_test.go    |  10 +-
 35 files changed, 680 insertions(+), 866 deletions(-)
 delete mode 100644 core/internal/cltest/event_websocket_server.go

diff --git a/core/chains/evm/client/client_test.go b/core/chains/evm/client/client_test.go
index 673fe044afe..631b5722dec 100644
--- a/core/chains/evm/client/client_test.go
+++ b/core/chains/evm/client/client_test.go
@@ -89,7 +89,7 @@ func TestEthClient_TransactionReceipt(t *testing.T) {
 	t.Run("happy path", func(t *testing.T) {
 		result := mustReadResult(t, "../../../testdata/jsonrpc/getTransactionReceipt.json")
 
-		wsURL := cltest.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
+		wsURL := testutils.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
 			switch method {
 			case "eth_subscribe":
 				resp.Result = `"0x00"`
@@ -104,7 +104,7 @@ func TestEthClient_TransactionReceipt(t *testing.T) {
 				resp.Result = string(result)
 			}
 			return
-		})
+		}).WSURL().String()
 
 		clients := mustNewClients(t, wsURL)
 		for _, ethClient := range clients {
@@ -121,7 +121,7 @@ func TestEthClient_TransactionReceipt(t *testing.T) {
 
 	t.Run("no tx hash, returns ethereum.NotFound", func(t *testing.T) {
 		result := mustReadResult(t, "../../../testdata/jsonrpc/getTransactionReceipt_notFound.json")
-		wsURL := cltest.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
+		wsURL := testutils.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
 			switch method {
 			case "eth_subscribe":
 				resp.Result = `"0x00"`
@@ -136,7 +136,7 @@ func TestEthClient_TransactionReceipt(t *testing.T) {
 				resp.Result = string(result)
 			}
 			return
-		})
+		}).WSURL().String()
 
 		clients := mustNewClients(t, wsURL)
 		for _, ethClient := range clients {
@@ -155,7 +155,7 @@ func TestEthClient_PendingNonceAt(t *testing.T) {
 
 	address := testutils.NewAddress()
 
-	wsURL := cltest.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
+	wsURL := testutils.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
 		switch method {
 		case "eth_subscribe":
 			resp.Result = `"0x00"`
@@ -174,7 +174,7 @@ func TestEthClient_PendingNonceAt(t *testing.T) {
 			resp.Result = `"0x100"`
 		}
 		return
-	})
+	}).WSURL().String()
 
 	clients := mustNewClients(t, wsURL)
 	for _, ethClient := range clients {
@@ -206,7 +206,7 @@ func TestEthClient_BalanceAt(t *testing.T) {
 	for _, test := range tests {
 		test := test
 		t.Run(test.name, func(t *testing.T) {
-			wsURL := cltest.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
+			wsURL := testutils.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
 				switch method {
 				case "eth_subscribe":
 					resp.Result = `"0x00"`
@@ -221,7 +221,7 @@ func TestEthClient_BalanceAt(t *testing.T) {
 					resp.Result = `"` + hexutil.EncodeBig(test.balance) + `"`
 				}
 				return
-			})
+			}).WSURL().String()
 
 			clients := mustNewClients(t, wsURL)
 			for _, ethClient := range clients {
@@ -239,7 +239,7 @@ func TestEthClient_BalanceAt(t *testing.T) {
 func TestEthClient_LatestBlockHeight(t *testing.T) {
 	t.Parallel()
 
-	wsURL := cltest.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
+	wsURL := testutils.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
 		switch method {
 		case "eth_subscribe":
 			resp.Result = `"0x00"`
@@ -254,7 +254,7 @@ func TestEthClient_LatestBlockHeight(t *testing.T) {
 		}
 		resp.Result = `"0x100"`
 		return
-	})
+	}).WSURL().String()
 
 	clients := mustNewClients(t, wsURL)
 	for _, ethClient := range clients {
@@ -289,7 +289,7 @@ func TestEthClient_GetERC20Balance(t *testing.T) {
 			functionSelector := evmtypes.HexToFunctionSelector(client.BALANCE_OF_ADDRESS_FUNCTION_SELECTOR) // balanceOf(address)
 			txData := utils.ConcatBytes(functionSelector.Bytes(), common.LeftPadBytes(userAddress.Bytes(), utils.EVMWordByteLen))
 
-			wsURL := cltest.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
+			wsURL := testutils.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
 				switch method {
 				case "eth_subscribe":
 					resp.Result = `"0x00"`
@@ -312,8 +312,7 @@ func TestEthClient_GetERC20Balance(t *testing.T) {
 					resp.Result = `"` + hexutil.EncodeBig(test.balance) + `"`
 				}
 				return
-
-			})
+			}).WSURL().String()
 
 			clients := mustNewClients(t, wsURL)
 			for _, ethClient := range clients {
@@ -370,7 +369,7 @@ func TestEthClient_HeaderByNumber(t *testing.T) {
 	for _, test := range tests {
 		test := test
 		t.Run(test.name, func(t *testing.T) {
-			wsURL := cltest.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
+			wsURL := testutils.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
 				switch method {
 				case "eth_subscribe":
 					resp.Result = `"0x00"`
@@ -392,7 +391,7 @@ func TestEthClient_HeaderByNumber(t *testing.T) {
 					resp.Result = test.rpcResp
 				}
 				return
-			})
+			}).WSURL().String()
 
 			clients := mustNewClients(t, wsURL)
 			for _, ethClient := range clients {
@@ -420,7 +419,7 @@ func TestEthClient_SendTransaction_NoSecondaryURL(t *testing.T) {
 
 	tx := types.NewTransaction(uint64(42), testutils.NewAddress(), big.NewInt(142), 242, big.NewInt(342), []byte{1, 2, 3})
 
-	wsURL := cltest.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
+	wsURL := testutils.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
 		switch method {
 		case "eth_subscribe":
 			resp.Result = `"0x00"`
@@ -435,7 +434,7 @@ func TestEthClient_SendTransaction_NoSecondaryURL(t *testing.T) {
 		}
 		resp.Result = `"` + tx.Hash().Hex() + `"`
 		return
-	})
+	}).WSURL().String()
 
 	clients := mustNewClients(t, wsURL)
 	for _, ethClient := range clients {
@@ -452,7 +451,7 @@ func TestEthClient_SendTransaction_WithSecondaryURLs(t *testing.T) {
 
 	tx := types.NewTransaction(uint64(42), testutils.NewAddress(), big.NewInt(142), 242, big.NewInt(342), []byte{1, 2, 3})
 
-	wsURL := cltest.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
+	wsURL := testutils.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
 		switch method {
 		case "eth_subscribe":
 			resp.Result = `"0x00"`
@@ -465,7 +464,7 @@ func TestEthClient_SendTransaction_WithSecondaryURLs(t *testing.T) {
 			resp.Result = `"` + tx.Hash().Hex() + `"`
 		}
 		return
-	})
+	}).WSURL().String()
 
 	rpcSrv := rpc.NewServer()
 	t.Cleanup(rpcSrv.Stop)
@@ -498,7 +497,7 @@ func TestEthClient_SendTransactionReturnCode(t *testing.T) {
 	tx := types.NewTransaction(uint64(42), testutils.NewAddress(), big.NewInt(142), 242, big.NewInt(342), []byte{1, 2, 3})
 
 	t.Run("returns Fatal error type when error message is fatal", func(t *testing.T) {
-		wsURL := cltest.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
+		wsURL := testutils.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
 			switch method {
 			case "eth_subscribe":
 				resp.Result = `"0x00"`
@@ -512,7 +511,7 @@ func TestEthClient_SendTransactionReturnCode(t *testing.T) {
 				resp.Error.Message = "invalid sender"
 			}
 			return
-		})
+		}).WSURL().String()
 
 		clients := mustNewClients(t, wsURL)
 		for _, ethClient := range clients {
@@ -526,7 +525,7 @@ func TestEthClient_SendTransactionReturnCode(t *testing.T) {
 	})
 
 	t.Run("returns TransactionAlreadyKnown error type when error message is nonce too low", func(t *testing.T) {
-		wsURL := cltest.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
+		wsURL := testutils.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
 			switch method {
 			case "eth_subscribe":
 				resp.Result = `"0x00"`
@@ -540,7 +539,7 @@ func TestEthClient_SendTransactionReturnCode(t *testing.T) {
 				resp.Error.Message = "nonce too low"
 			}
 			return
-		})
+		}).WSURL().String()
 
 		clients := mustNewClients(t, wsURL)
 		for _, ethClient := range clients {
@@ -554,7 +553,7 @@ func TestEthClient_SendTransactionReturnCode(t *testing.T) {
 	})
 
 	t.Run("returns Successful error type when there is no error message", func(t *testing.T) {
-		wsURL := cltest.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
+		wsURL := testutils.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
 			switch method {
 			case "eth_subscribe":
 				resp.Result = `"0x00"`
@@ -567,7 +566,7 @@ func TestEthClient_SendTransactionReturnCode(t *testing.T) {
 				resp.Result = `"` + tx.Hash().Hex() + `"`
 			}
 			return
-		})
+		}).WSURL().String()
 
 		clients := mustNewClients(t, wsURL)
 		for _, ethClient := range clients {
@@ -581,7 +580,7 @@ func TestEthClient_SendTransactionReturnCode(t *testing.T) {
 	})
 
 	t.Run("returns Underpriced error type when transaction is terminally underpriced", func(t *testing.T) {
-		wsURL := cltest.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
+		wsURL := testutils.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
 			switch method {
 			case "eth_subscribe":
 				resp.Result = `"0x00"`
@@ -595,7 +594,7 @@ func TestEthClient_SendTransactionReturnCode(t *testing.T) {
 				resp.Error.Message = "transaction underpriced"
 			}
 			return
-		})
+		}).WSURL().String()
 
 		clients := mustNewClients(t, wsURL)
 		for _, ethClient := range clients {
@@ -609,7 +608,7 @@ func TestEthClient_SendTransactionReturnCode(t *testing.T) {
 	})
 
 	t.Run("returns Unsupported error type when error message is queue full", func(t *testing.T) {
-		wsURL := cltest.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
+		wsURL := testutils.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
 			switch method {
 			case "eth_subscribe":
 				resp.Result = `"0x00"`
@@ -623,7 +622,7 @@ func TestEthClient_SendTransactionReturnCode(t *testing.T) {
 				resp.Error.Message = "queue full"
 			}
 			return
-		})
+		}).WSURL().String()
 
 		clients := mustNewClients(t, wsURL)
 		for _, ethClient := range clients {
@@ -637,7 +636,7 @@ func TestEthClient_SendTransactionReturnCode(t *testing.T) {
 	})
 
 	t.Run("returns Retryable error type when there is a transaction gap", func(t *testing.T) {
-		wsURL := cltest.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
+		wsURL := testutils.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
 			switch method {
 			case "eth_subscribe":
 				resp.Result = `"0x00"`
@@ -651,7 +650,7 @@ func TestEthClient_SendTransactionReturnCode(t *testing.T) {
 				resp.Error.Message = "NonceGap"
 			}
 			return
-		})
+		}).WSURL().String()
 
 		clients := mustNewClients(t, wsURL)
 		for _, ethClient := range clients {
@@ -665,7 +664,7 @@ func TestEthClient_SendTransactionReturnCode(t *testing.T) {
 	})
 
 	t.Run("returns InsufficientFunds error type when the sender address doesn't have enough funds", func(t *testing.T) {
-		wsURL := cltest.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
+		wsURL := testutils.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
 			switch method {
 			case "eth_subscribe":
 				resp.Result = `"0x00"`
@@ -679,7 +678,7 @@ func TestEthClient_SendTransactionReturnCode(t *testing.T) {
 				resp.Error.Message = "insufficient funds for transfer"
 			}
 			return
-		})
+		}).WSURL().String()
 
 		clients := mustNewClients(t, wsURL)
 		for _, ethClient := range clients {
@@ -693,7 +692,7 @@ func TestEthClient_SendTransactionReturnCode(t *testing.T) {
 	})
 
 	t.Run("returns ExceedsFeeCap error type when gas price is too high for the node", func(t *testing.T) {
-		wsURL := cltest.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
+		wsURL := testutils.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
 			switch method {
 			case "eth_subscribe":
 				resp.Result = `"0x00"`
@@ -707,7 +706,7 @@ func TestEthClient_SendTransactionReturnCode(t *testing.T) {
 				resp.Error.Message = "Transaction fee cap exceeded"
 			}
 			return
-		})
+		}).WSURL().String()
 
 		clients := mustNewClients(t, wsURL)
 		for _, ethClient := range clients {
@@ -721,7 +720,7 @@ func TestEthClient_SendTransactionReturnCode(t *testing.T) {
 	})
 
 	t.Run("returns Unknown error type when the error can't be categorized", func(t *testing.T) {
-		wsURL := cltest.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
+		wsURL := testutils.NewWSServer(t, &cltest.FixtureChainID, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
 			switch method {
 			case "eth_subscribe":
 				resp.Result = `"0x00"`
@@ -735,7 +734,7 @@ func TestEthClient_SendTransactionReturnCode(t *testing.T) {
 				resp.Error.Message = "some random error"
 			}
 			return
-		})
+		}).WSURL().String()
 
 		clients := mustNewClients(t, wsURL)
 		for _, ethClient := range clients {
@@ -770,7 +769,7 @@ func TestEthClient_SubscribeNewHead(t *testing.T) {
 	defer cancel()
 
 	chainId := big.NewInt(123456)
-	wsURL := cltest.NewWSServer(t, chainId, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
+	wsURL := testutils.NewWSServer(t, chainId, func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
 		if method == "eth_unsubscribe" {
 			resp.Result = "true"
 			return
@@ -781,7 +780,7 @@ func TestEthClient_SubscribeNewHead(t *testing.T) {
 			resp.Notify = headResult
 		}
 		return
-	})
+	}).WSURL().String()
 
 	clients := mustNewClientsWithChainID(t, wsURL, chainId)
 	for _, ethClient := range clients {
diff --git a/core/chains/evm/client/pool_test.go b/core/chains/evm/client/pool_test.go
index 15a6484756d..75d38d01a4f 100644
--- a/core/chains/evm/client/pool_test.go
+++ b/core/chains/evm/client/pool_test.go
@@ -211,7 +211,7 @@ type chainIDResps struct {
 }
 
 func (r *chainIDResps) newNode(t *testing.T, nodeChainID int64) evmclient.Node {
-	ws := cltest.NewWSServer(t, big.NewInt(r.ws.chainID), func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
+	ws := testutils.NewWSServer(t, big.NewInt(r.ws.chainID), func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
 		switch method {
 		case "eth_subscribe":
 			resp.Result = `"0x00"`
@@ -223,7 +223,7 @@ func (r *chainIDResps) newNode(t *testing.T, nodeChainID int64) evmclient.Node {
 		}
 		t.Errorf("Unexpected method call: %s(%s)", method, params)
 		return
-	})
+	}).WSURL().String()
 
 	wsURL, err := url.Parse(ws)
 	require.NoError(t, err)
diff --git a/core/chains/evm/txmgr/broadcaster_test.go b/core/chains/evm/txmgr/broadcaster_test.go
index d1e26c6c969..43f2fdb8cac 100644
--- a/core/chains/evm/txmgr/broadcaster_test.go
+++ b/core/chains/evm/txmgr/broadcaster_test.go
@@ -195,7 +195,7 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_Success(t *testing.T) {
 	})
 
 	t.Run("eth_txes exist for a different from address", func(t *testing.T) {
-		cltest.MustCreateUnstartedTx(t, txStore, otherAddress, toAddress, encodedPayload, gasLimit, value, &cltest.FixtureChainID)
+		mustCreateUnstartedTx(t, txStore, otherAddress, toAddress, encodedPayload, gasLimit, value, &cltest.FixtureChainID)
 		retryable, err := eb.ProcessUnstartedTxs(testutils.Context(t), fromAddress)
 		assert.NoError(t, err)
 		assert.False(t, retryable)
@@ -383,7 +383,7 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_Success(t *testing.T) {
 			return tx.Nonce() == uint64(343) && tx.Value().Cmp(big.NewInt(242)) == 0
 		}), fromAddress).Return(commonclient.Successful, nil).Once()
 
-		etx := cltest.MustCreateUnstartedTx(t, txStore, fromAddress, toAddress, []byte{42, 42, 0}, gasLimit, big.Int(assets.NewEthValue(242)), &cltest.FixtureChainID)
+		etx := mustCreateUnstartedTx(t, txStore, fromAddress, toAddress, []byte{42, 42, 0}, gasLimit, big.Int(assets.NewEthValue(242)), &cltest.FixtureChainID)
 		// Do the thing
 		{
 			retryable, err := eb.ProcessUnstartedTxs(testutils.Context(t), fromAddress)
@@ -448,7 +448,7 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_Success(t *testing.T) {
 				return false
 			}), "latest").Return(nil).Once()
 
-			ethTx := cltest.MustCreateUnstartedTxFromEvmTxRequest(t, txStore, txRequest, &cltest.FixtureChainID)
+			ethTx := mustCreateUnstartedTxFromEvmTxRequest(t, txStore, txRequest, &cltest.FixtureChainID)
 
 			{
 				retryable, err := eb.ProcessUnstartedTxs(testutils.Context(t), fromAddress)
@@ -470,9 +470,9 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_Success(t *testing.T) {
 				return fmt.Sprintf("%s", callarg["value"]) == "0x21e" // 542
 			}), "latest").Return(errors.New("this is not a revert, something unexpected went wrong")).Once()
 
-			ethTx := cltest.MustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID,
-				cltest.EvmTxRequestWithChecker(checker),
-				cltest.EvmTxRequestWithValue(big.Int(assets.NewEthValue(542))))
+			ethTx := mustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID,
+				txRequestWithChecker(checker),
+				txRequestWithValue(big.Int(assets.NewEthValue(542))))
 
 			{
 				retryable, err := eb.ProcessUnstartedTxs(testutils.Context(t), fromAddress)
@@ -495,9 +495,9 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_Success(t *testing.T) {
 				return fmt.Sprintf("%s", callarg["value"]) == "0x282" // 642
 			}), "latest").Return(&jerr).Once()
 
-			ethTx := cltest.MustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID,
-				cltest.EvmTxRequestWithChecker(checker),
-				cltest.EvmTxRequestWithValue(big.Int(assets.NewEthValue(642))))
+			ethTx := mustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID,
+				txRequestWithChecker(checker),
+				txRequestWithValue(big.Int(assets.NewEthValue(642))))
 			{
 				retryable, err := eb.ProcessUnstartedTxs(testutils.Context(t), fromAddress)
 				assert.NoError(t, err)
@@ -537,9 +537,9 @@ func TestEthBroadcaster_TransmitChecking(t *testing.T) {
 			return tx.Nonce() == 0 && tx.Value().Cmp(big.NewInt(442)) == 0
 		}), fromAddress).Return(commonclient.Successful, nil).Once()
 
-		ethTx := cltest.MustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID,
-			cltest.EvmTxRequestWithValue(big.Int(assets.NewEthValue(442))),
-			cltest.EvmTxRequestWithChecker(checker))
+		ethTx := mustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID,
+			txRequestWithValue(big.Int(assets.NewEthValue(442))),
+			txRequestWithChecker(checker))
 		{
 			retryable, err := eb.ProcessUnstartedTxs(testutils.Context(t), fromAddress)
 			assert.NoError(t, err)
@@ -560,9 +560,9 @@ func TestEthBroadcaster_TransmitChecking(t *testing.T) {
 			return tx.Nonce() == 1 && tx.Value().Cmp(big.NewInt(442)) == 0
 		}), fromAddress).Return(commonclient.Successful, nil).Once()
 
-		ethTx := cltest.MustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID,
-			cltest.EvmTxRequestWithValue(big.Int(assets.NewEthValue(442))),
-			cltest.EvmTxRequestWithChecker(checker))
+		ethTx := mustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID,
+			txRequestWithValue(big.Int(assets.NewEthValue(442))),
+			txRequestWithChecker(checker))
 		{
 			retryable, err := eb.ProcessUnstartedTxs(testutils.Context(t), fromAddress)
 			assert.NoError(t, err)
@@ -579,7 +579,7 @@ func TestEthBroadcaster_TransmitChecking(t *testing.T) {
 		// Checker will return a fatal error
 		checkerFactory.err = errors.New("fatal checker error")
 
-		ethTx := cltest.MustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID, cltest.EvmTxRequestWithChecker(checker))
+		ethTx := mustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID, txRequestWithChecker(checker))
 		{
 			retryable, err := eb.ProcessUnstartedTxs(testutils.Context(t), fromAddress)
 			assert.NoError(t, err)
@@ -635,7 +635,7 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_OptimisticLockingOnEthTx(t *testi
 	require.NoError(t, eb.Start(testutils.Context(t)))
 	t.Cleanup(func() { assert.NoError(t, eb.Close()) })
 
-	cltest.MustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID)
+	mustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID)
 
 	go func() {
 		select {
@@ -688,7 +688,7 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_Success_WithMultiplier(t *testing
 		FeeLimit:       1231,
 		Strategy:       txmgrcommon.NewSendEveryStrategy(),
 	}
-	cltest.MustCreateUnstartedTxFromEvmTxRequest(t, txStore, txRequest, &cltest.FixtureChainID)
+	mustCreateUnstartedTxFromEvmTxRequest(t, txStore, txRequest, &cltest.FixtureChainID)
 
 	// Do the thing
 	{
@@ -758,7 +758,7 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_ResumingFromCrash(t *testing.T) {
 		// Crashed right after we commit the database transaction that saved
 		// the nonce to the eth_tx so evm.key_states.next_nonce has not been
 		// incremented yet
-		inProgressEthTx := cltest.MustInsertInProgressEthTxWithAttempt(t, txStore, firstNonce, fromAddress)
+		inProgressEthTx := mustInsertInProgressEthTxWithAttempt(t, txStore, firstNonce, fromAddress)
 
 		ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *gethTypes.Transaction) bool {
 			return tx.Nonce() == uint64(firstNonce)
@@ -794,7 +794,7 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_ResumingFromCrash(t *testing.T) {
 		eb := NewTestEthBroadcaster(t, txStore, ethClient, ethKeyStore, evmcfg, &testCheckerFactory{}, false)
 
 		// Crashed right after we commit the database transaction that saved the nonce to the eth_tx
-		inProgressEthTx := cltest.MustInsertInProgressEthTxWithAttempt(t, txStore, firstNonce, fromAddress)
+		inProgressEthTx := mustInsertInProgressEthTxWithAttempt(t, txStore, firstNonce, fromAddress)
 
 		ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *gethTypes.Transaction) bool {
 			return tx.Nonce() == uint64(firstNonce)
@@ -830,7 +830,7 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_ResumingFromCrash(t *testing.T) {
 		eb := NewTestEthBroadcaster(t, txStore, ethClient, ethKeyStore, evmcfg, &testCheckerFactory{}, false)
 
 		// Crashed right after we commit the database transaction that saved the nonce to the eth_tx
-		inProgressEthTx := cltest.MustInsertInProgressEthTxWithAttempt(t, txStore, firstNonce, fromAddress)
+		inProgressEthTx := mustInsertInProgressEthTxWithAttempt(t, txStore, firstNonce, fromAddress)
 
 		ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *gethTypes.Transaction) bool {
 			return tx.Nonce() == uint64(firstNonce)
@@ -865,7 +865,7 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_ResumingFromCrash(t *testing.T) {
 		eb := NewTestEthBroadcaster(t, txStore, ethClient, ethKeyStore, evmcfg, &testCheckerFactory{}, false)
 
 		// Crashed right after we commit the database transaction that saved the nonce to the eth_tx
-		inProgressEthTx := cltest.MustInsertInProgressEthTxWithAttempt(t, txStore, firstNonce, fromAddress)
+		inProgressEthTx := mustInsertInProgressEthTxWithAttempt(t, txStore, firstNonce, fromAddress)
 
 		ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *gethTypes.Transaction) bool {
 			return tx.Nonce() == uint64(firstNonce)
@@ -902,7 +902,7 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_ResumingFromCrash(t *testing.T) {
 		eb := NewTestEthBroadcaster(t, txStore, ethClient, ethKeyStore, evmcfg, &testCheckerFactory{}, false)
 
 		// Crashed right after we commit the database transaction that saved the nonce to the eth_tx
-		inProgressEthTx := cltest.MustInsertInProgressEthTxWithAttempt(t, txStore, firstNonce, fromAddress)
+		inProgressEthTx := mustInsertInProgressEthTxWithAttempt(t, txStore, firstNonce, fromAddress)
 
 		ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *gethTypes.Transaction) bool {
 			return tx.Nonce() == uint64(firstNonce)
@@ -943,7 +943,7 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_ResumingFromCrash(t *testing.T) {
 		eb := NewTestEthBroadcaster(t, txStore, ethClient, ethKeyStore, evmcfg, &testCheckerFactory{}, false)
 
 		// Crashed right after we commit the database transaction that saved the nonce to the eth_tx
-		inProgressEthTx := cltest.MustInsertInProgressEthTxWithAttempt(t, txStore, firstNonce, fromAddress)
+		inProgressEthTx := mustInsertInProgressEthTxWithAttempt(t, txStore, firstNonce, fromAddress)
 		require.Len(t, inProgressEthTx.TxAttempts, 1)
 		attempt := inProgressEthTx.TxAttempts[0]
 
@@ -1009,7 +1009,7 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_Errors(t *testing.T) {
 	require.NoError(t, utils.JustError(db.Exec(`SET CONSTRAINTS pipeline_runs_pipeline_spec_id_fkey DEFERRED`)))
 
 	t.Run("if external wallet sent a transaction from the account and now the nonce is one higher than it should be and we got replacement underpriced then we assume a previous transaction of ours was the one that succeeded, and hand off to EthConfirmer", func(t *testing.T) {
-		cltest.MustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, gasLimit, value, &cltest.FixtureChainID)
+		mustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, gasLimit, value, &cltest.FixtureChainID)
 		// First send, replacement underpriced
 		ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *gethTypes.Transaction) bool {
 			return tx.Nonce() == uint64(0)
@@ -1047,7 +1047,7 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_Errors(t *testing.T) {
 		localNextNonce := getLocalNextNonce(t, eb, fromAddress)
 
 		t.Run("without callback", func(t *testing.T) {
-			etx := cltest.MustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, gasLimit, value, &cltest.FixtureChainID)
+			etx := mustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, gasLimit, value, &cltest.FixtureChainID)
 			ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *gethTypes.Transaction) bool {
 				return tx.Nonce() == localNextNonce
 			}), fromAddress).Return(commonclient.Fatal, errors.New(fatalErrorExample)).Once()
@@ -1151,7 +1151,7 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_Errors(t *testing.T) {
 	t.Run("geth Client fails with error indicating that the transaction was too expensive", func(t *testing.T) {
 		TxFeeExceedsCapError := "tx fee (1.10 ether) exceeds the configured cap (1.00 ether)"
 		localNextNonce := getLocalNextNonce(t, eb, fromAddress)
-		etx := cltest.MustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, gasLimit, value, &cltest.FixtureChainID)
+		etx := mustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, gasLimit, value, &cltest.FixtureChainID)
 		ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *gethTypes.Transaction) bool {
 			return tx.Nonce() == localNextNonce
 		}), fromAddress).Return(commonclient.ExceedsMaxFee, errors.New(TxFeeExceedsCapError)).Twice()
@@ -1209,7 +1209,7 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_Errors(t *testing.T) {
 	t.Run("eth Client call fails with an unexpected random error, and transaction was not accepted into mempool", func(t *testing.T) {
 		retryableErrorExample := "some unknown error"
 		localNextNonce := getLocalNextNonce(t, eb, fromAddress)
-		etx := cltest.MustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, gasLimit, value, &cltest.FixtureChainID)
+		etx := mustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, gasLimit, value, &cltest.FixtureChainID)
 		ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *gethTypes.Transaction) bool {
 			return tx.Nonce() == uint64(localNextNonce)
 		}), fromAddress).Return(commonclient.Unknown, errors.New(retryableErrorExample)).Once()
@@ -1261,7 +1261,7 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_Errors(t *testing.T) {
 	t.Run("eth client call fails with an unexpected random error, and the nonce check also subsequently fails", func(t *testing.T) {
 		retryableErrorExample := "some unknown error"
 		localNextNonce := getLocalNextNonce(t, eb, fromAddress)
-		etx := cltest.MustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, gasLimit, value, &cltest.FixtureChainID)
+		etx := mustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, gasLimit, value, &cltest.FixtureChainID)
 		ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *gethTypes.Transaction) bool {
 			return tx.Nonce() == uint64(localNextNonce)
 		}), fromAddress).Return(commonclient.Unknown, errors.New(retryableErrorExample)).Once()
@@ -1313,7 +1313,7 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_Errors(t *testing.T) {
 	t.Run("eth Client call fails with an unexpected random error, and transaction was accepted into mempool", func(t *testing.T) {
 		retryableErrorExample := "some strange RPC returns an unexpected thing"
 		localNextNonce := getLocalNextNonce(t, eb, fromAddress)
-		etx := cltest.MustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, gasLimit, value, &cltest.FixtureChainID)
+		etx := mustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, gasLimit, value, &cltest.FixtureChainID)
 		ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *gethTypes.Transaction) bool {
 			return tx.Nonce() == localNextNonce
 		}), fromAddress).Return(commonclient.Unknown, errors.New(retryableErrorExample)).Once()
@@ -1345,7 +1345,7 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_Errors(t *testing.T) {
 		// This is a configuration error by the node operator, since it means they set the base gas level too low.
 		underpricedError := "transaction underpriced"
 		localNextNonce := getLocalNextNonce(t, eb, fromAddress)
-		etx := cltest.MustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, gasLimit, value, &cltest.FixtureChainID)
+		etx := mustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, gasLimit, value, &cltest.FixtureChainID)
 
 		// First was underpriced
 		ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *gethTypes.Transaction) bool {
@@ -1462,7 +1462,7 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_Errors(t *testing.T) {
 		}))
 		ethClient.On("PendingNonceAt", mock.Anything, fromAddress).Return(uint64(localNextNonce), nil).Once()
 		eb2 := NewTestEthBroadcaster(t, txStore, ethClient, ethKeyStore, evmcfg2, &testCheckerFactory{}, false)
-		cltest.MustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, gasLimit, value, &cltest.FixtureChainID)
+		mustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, gasLimit, value, &cltest.FixtureChainID)
 
 		// First was underpriced
 		ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *gethTypes.Transaction) bool {
@@ -1482,7 +1482,7 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_Errors(t *testing.T) {
 	t.Run("eth tx is left in progress if eth node returns insufficient eth", func(t *testing.T) {
 		insufficientEthError := "insufficient funds for transfer"
 		localNextNonce := getLocalNextNonce(t, eb, fromAddress)
-		etx := cltest.MustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, gasLimit, value, &cltest.FixtureChainID)
+		etx := mustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, gasLimit, value, &cltest.FixtureChainID)
 		ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *gethTypes.Transaction) bool {
 			return tx.Nonce() == localNextNonce
 		}), fromAddress).Return(commonclient.InsufficientFunds, errors.New(insufficientEthError)).Once()
@@ -1512,7 +1512,7 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_Errors(t *testing.T) {
 	t.Run("eth tx is left in progress if nonce is too high", func(t *testing.T) {
 		localNextNonce := getLocalNextNonce(t, eb, fromAddress)
 		nonceGapError := "NonceGap, Future nonce. Expected nonce: " + strconv.FormatUint(localNextNonce, 10)
-		etx := cltest.MustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, gasLimit, value, &cltest.FixtureChainID)
+		etx := mustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, gasLimit, value, &cltest.FixtureChainID)
 		ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *gethTypes.Transaction) bool {
 			return tx.Nonce() == localNextNonce
 		}), fromAddress).Return(commonclient.Retryable, errors.New(nonceGapError)).Once()
@@ -1554,7 +1554,7 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_Errors(t *testing.T) {
 		localNextNonce := getLocalNextNonce(t, eb, fromAddress)
 		ethClient.On("PendingNonceAt", mock.Anything, fromAddress).Return(uint64(localNextNonce), nil).Once()
 		eb2 := NewTestEthBroadcaster(t, txStore, ethClient, ethKeyStore, evmcfg2, &testCheckerFactory{}, false)
-		cltest.MustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, gasLimit, value, &cltest.FixtureChainID)
+		mustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, gasLimit, value, &cltest.FixtureChainID)
 		underpricedError := "transaction underpriced"
 		localNextNonce = getLocalNextNonce(t, eb, fromAddress)
 		ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *gethTypes.Transaction) bool {
@@ -1576,7 +1576,7 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_Errors(t *testing.T) {
 		// This is a configuration error by the node operator, since it means they set the base gas level too low.
 		underpricedError := "transaction underpriced"
 		localNextNonce := getLocalNextNonce(t, eb, fromAddress)
-		cltest.MustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, gasLimit, value, &cltest.FixtureChainID)
+		mustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, gasLimit, value, &cltest.FixtureChainID)
 
 		// Check gas tip cap verification
 		evmcfg2 := evmtest.NewChainScopedConfig(t, configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
@@ -1650,7 +1650,7 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_KeystoreErrors(t *testing.T) {
 	require.NoError(t, err)
 
 	t.Run("tx signing fails", func(t *testing.T) {
-		etx := cltest.MustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, gasLimit, value, &cltest.FixtureChainID)
+		etx := mustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, gasLimit, value, &cltest.FixtureChainID)
 		tx := *gethTypes.NewTx(&gethTypes.LegacyTx{})
 		kst.On("SignTx",
 			fromAddress,
diff --git a/core/chains/evm/txmgr/confirmer_test.go b/core/chains/evm/txmgr/confirmer_test.go
index 60d0648a541..f5889b06649 100644
--- a/core/chains/evm/txmgr/confirmer_test.go
+++ b/core/chains/evm/txmgr/confirmer_test.go
@@ -38,6 +38,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
+	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
 	ksmocks "github.com/smartcontractkit/chainlink/v2/core/services/keystore/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
@@ -84,7 +85,7 @@ func newInProgressLegacyEthTxAttempt(t *testing.T, etxID int64, gasPrice ...int6
 }
 
 func mustInsertInProgressEthTx(t *testing.T, txStore txmgr.TestEvmTxStore, nonce int64, fromAddress gethCommon.Address) txmgr.Tx {
-	etx := cltest.NewEthTx(t, fromAddress)
+	etx := cltest.NewEthTx(fromAddress)
 	etx.State = txmgrcommon.TxInProgress
 	n := evmtypes.Nonce(nonce)
 	etx.Sequence = &n
@@ -94,7 +95,7 @@ func mustInsertInProgressEthTx(t *testing.T, txStore txmgr.TestEvmTxStore, nonce
 }
 
 func mustInsertConfirmedEthTx(t *testing.T, txStore txmgr.TestEvmTxStore, nonce int64, fromAddress gethCommon.Address) txmgr.Tx {
-	etx := cltest.NewEthTx(t, fromAddress)
+	etx := cltest.NewEthTx(fromAddress)
 	etx.State = txmgrcommon.TxConfirmed
 	n := evmtypes.Nonce(nonce)
 	etx.Sequence = &n
@@ -111,7 +112,7 @@ func TestEthConfirmer_Lifecycle(t *testing.T) {
 
 	db := pgtest.NewSqlxDB(t)
 	config := newTestChainScopedConfig(t)
-	txStore := cltest.NewTxStore(t, db, config.Database())
+	txStore := newTxStore(t, db, config.Database())
 
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
 	ethKeyStore := cltest.NewKeyStore(t, db, config.Database()).Eth()
@@ -187,21 +188,21 @@ func TestEthConfirmer_CheckForReceipts(t *testing.T) {
 
 	_, fromAddress := cltest.MustInsertRandomKey(t, ethKeyStore)
 
-	ec := cltest.NewEthConfirmer(t, txStore, ethClient, config, ethKeyStore, nil)
+	ec := newEthConfirmer(t, txStore, ethClient, config, ethKeyStore, nil)
 
 	nonce := int64(0)
 	ctx := testutils.Context(t)
 	blockNum := int64(0)
 
 	t.Run("only finds eth_txes in unconfirmed state with at least one broadcast attempt", func(t *testing.T) {
-		cltest.MustInsertFatalErrorEthTx(t, txStore, fromAddress)
+		mustInsertFatalErrorEthTx(t, txStore, fromAddress)
 		mustInsertInProgressEthTx(t, txStore, nonce, fromAddress)
 		nonce++
 		cltest.MustInsertConfirmedEthTxWithLegacyAttempt(t, txStore, nonce, 1, fromAddress)
 		nonce++
-		cltest.MustInsertUnconfirmedEthTxWithInsufficientEthAttempt(t, txStore, nonce, fromAddress)
+		mustInsertUnconfirmedEthTxWithInsufficientEthAttempt(t, txStore, nonce, fromAddress)
 		nonce++
-		cltest.MustCreateUnstartedGeneratedTx(t, txStore, fromAddress, config.EVM().ChainID())
+		mustCreateUnstartedGeneratedTx(t, txStore, fromAddress, config.EVM().ChainID())
 
 		// Do the thing
 		require.NoError(t, ec.CheckForReceipts(ctx, blockNum))
@@ -450,7 +451,7 @@ func TestEthConfirmer_CheckForReceipts(t *testing.T) {
 		require.Len(t, attempt3_1.Receipts, 0)
 	})
 	t.Run("handles case where eth_receipt already exists somehow", func(t *testing.T) {
-		ethReceipt := cltest.MustInsertEthReceipt(t, txStore, 42, utils.NewHash(), attempt3_1.Hash)
+		ethReceipt := mustInsertEthReceipt(t, txStore, 42, utils.NewHash(), attempt3_1.Hash)
 		txmReceipt := evmtypes.Receipt{
 			TxHash:           attempt3_1.Hash,
 			BlockHash:        ethReceipt.BlockHash,
@@ -604,7 +605,7 @@ func TestEthConfirmer_CheckForReceipts_batching(t *testing.T) {
 
 	evmcfg := evmtest.NewChainScopedConfig(t, cfg)
 
-	ec := cltest.NewEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, nil)
+	ec := newEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, nil)
 	ctx := testutils.Context(t)
 
 	etx := cltest.MustInsertUnconfirmedEthTx(t, txStore, 0, fromAddress)
@@ -664,7 +665,7 @@ func TestEthConfirmer_CheckForReceipts_HandlesNonFwdTxsWithForwardingEnabled(t *
 	evmcfg := evmtest.NewChainScopedConfig(t, cfg)
 
 	_, fromAddress := cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
-	ec := cltest.NewEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, nil)
+	ec := newEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, nil)
 	ctx := testutils.Context(t)
 	// tx is not forwarded and doesn't have meta set. EthConfirmer should handle nil meta values
 	etx := cltest.MustInsertUnconfirmedEthTx(t, txStore, 0, fromAddress)
@@ -717,7 +718,7 @@ func TestEthConfirmer_CheckForReceipts_only_likely_confirmed(t *testing.T) {
 
 	evmcfg := evmtest.NewChainScopedConfig(t, cfg)
 
-	ec := cltest.NewEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, nil)
+	ec := newEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, nil)
 	ctx := testutils.Context(t)
 
 	var attempts []txmgr.TxAttempt
@@ -771,7 +772,7 @@ func TestEthConfirmer_CheckForReceipts_should_not_check_for_likely_unconfirmed(t
 
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
 
-	ec := cltest.NewEthConfirmer(t, txStore, ethClient, config, ethKeyStore, nil)
+	ec := newEthConfirmer(t, txStore, ethClient, config, ethKeyStore, nil)
 	ctx := testutils.Context(t)
 
 	etx := cltest.MustInsertUnconfirmedEthTx(t, txStore, 1, fromAddress)
@@ -802,7 +803,7 @@ func TestEthConfirmer_CheckForReceipts_confirmed_missing_receipt_scoped_to_key(t
 	ethClient.On("SequenceAt", mock.Anything, mock.Anything, mock.Anything).Return(evmtypes.Nonce(20), nil)
 	evmcfg := evmtest.NewChainScopedConfig(t, cfg)
 
-	ec := cltest.NewEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, nil)
+	ec := newEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, nil)
 	ctx := testutils.Context(t)
 
 	// STATE
@@ -869,7 +870,7 @@ func TestEthConfirmer_CheckForReceipts_confirmed_missing_receipt(t *testing.T) {
 
 	evmcfg := evmtest.NewChainScopedConfig(t, cfg)
 
-	ec := cltest.NewEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, nil)
+	ec := newEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, nil)
 	ctx := testutils.Context(t)
 
 	// STATE
@@ -1129,7 +1130,7 @@ func TestEthConfirmer_CheckConfirmedMissingReceipt(t *testing.T) {
 
 	evmcfg := evmtest.NewChainScopedConfig(t, cfg)
 
-	ec := cltest.NewEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, nil)
+	ec := newEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, nil)
 	ctx := testutils.Context(t)
 
 	// STATE
@@ -1137,18 +1138,18 @@ func TestEthConfirmer_CheckConfirmedMissingReceipt(t *testing.T) {
 	// eth_txes with nonce 1 has two attempts, the later attempt with higher gas fees
 	// eth_txes with nonce 2 has one attempt
 	originalBroadcastAt := time.Unix(1616509100, 0)
-	etx0 := cltest.MustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
+	etx0 := mustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
 		t, txStore, 0, 1, originalBroadcastAt, fromAddress)
 	attempt0_2 := newBroadcastLegacyEthTxAttempt(t, etx0.ID, int64(2))
 	require.NoError(t, txStore.InsertTxAttempt(&attempt0_2))
-	etx1 := cltest.MustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
+	etx1 := mustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
 		t, txStore, 1, 1, originalBroadcastAt, fromAddress)
 	attempt1_2 := newBroadcastLegacyEthTxAttempt(t, etx1.ID, int64(2))
 	require.NoError(t, txStore.InsertTxAttempt(&attempt1_2))
-	etx2 := cltest.MustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
+	etx2 := mustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
 		t, txStore, 2, 1, originalBroadcastAt, fromAddress)
 	attempt2_1 := etx2.TxAttempts[0]
-	etx3 := cltest.MustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
+	etx3 := mustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
 		t, txStore, 3, 1, originalBroadcastAt, fromAddress)
 	attempt3_1 := etx3.TxAttempts[0]
 
@@ -1208,7 +1209,7 @@ func TestEthConfirmer_CheckConfirmedMissingReceipt_batchSendTransactions_fails(t
 
 	evmcfg := evmtest.NewChainScopedConfig(t, cfg)
 
-	ec := cltest.NewEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, nil)
+	ec := newEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, nil)
 	ctx := testutils.Context(t)
 
 	// STATE
@@ -1216,15 +1217,15 @@ func TestEthConfirmer_CheckConfirmedMissingReceipt_batchSendTransactions_fails(t
 	// eth_txes with nonce 1 has two attempts, the later attempt with higher gas fees
 	// eth_txes with nonce 2 has one attempt
 	originalBroadcastAt := time.Unix(1616509100, 0)
-	etx0 := cltest.MustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
+	etx0 := mustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
 		t, txStore, 0, 1, originalBroadcastAt, fromAddress)
 	attempt0_2 := newBroadcastLegacyEthTxAttempt(t, etx0.ID, int64(2))
 	require.NoError(t, txStore.InsertTxAttempt(&attempt0_2))
-	etx1 := cltest.MustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
+	etx1 := mustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
 		t, txStore, 1, 1, originalBroadcastAt, fromAddress)
 	attempt1_2 := newBroadcastLegacyEthTxAttempt(t, etx1.ID, int64(2))
 	require.NoError(t, txStore.InsertTxAttempt(&attempt1_2))
-	etx2 := cltest.MustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
+	etx2 := mustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
 		t, txStore, 2, 1, originalBroadcastAt, fromAddress)
 	attempt2_1 := etx2.TxAttempts[0]
 
@@ -1272,7 +1273,7 @@ func TestEthConfirmer_CheckConfirmedMissingReceipt_smallEvmRPCBatchSize_middleBa
 
 	evmcfg := evmtest.NewChainScopedConfig(t, cfg)
 
-	ec := cltest.NewEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, nil)
+	ec := newEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, nil)
 	ctx := testutils.Context(t)
 
 	// STATE
@@ -1280,15 +1281,15 @@ func TestEthConfirmer_CheckConfirmedMissingReceipt_smallEvmRPCBatchSize_middleBa
 	// eth_txes with nonce 1 has two attempts, the later attempt with higher gas fees
 	// eth_txes with nonce 2 has one attempt
 	originalBroadcastAt := time.Unix(1616509100, 0)
-	etx0 := cltest.MustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
+	etx0 := mustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
 		t, txStore, 0, 1, originalBroadcastAt, fromAddress)
 	attempt0_2 := newBroadcastLegacyEthTxAttempt(t, etx0.ID, int64(2))
 	require.NoError(t, txStore.InsertTxAttempt(&attempt0_2))
-	etx1 := cltest.MustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
+	etx1 := mustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
 		t, txStore, 1, 1, originalBroadcastAt, fromAddress)
 	attempt1_2 := newBroadcastLegacyEthTxAttempt(t, etx1.ID, int64(2))
 	require.NoError(t, txStore.InsertTxAttempt(&attempt1_2))
-	etx2 := cltest.MustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
+	etx2 := mustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
 		t, txStore, 2, 1, originalBroadcastAt, fromAddress)
 
 	// Expect eth_sendRawTransaction in 3 batches. First batch will pass, 2nd will fail, 3rd never attempted.
@@ -1354,7 +1355,7 @@ func TestEthConfirmer_FindTxsRequiringRebroadcast(t *testing.T) {
 
 	lggr := logger.TestLogger(t)
 
-	ec := cltest.NewEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, nil)
+	ec := newEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, nil)
 
 	t.Run("returns nothing when there are no transactions", func(t *testing.T) {
 		etxs, err := ec.FindTxsRequiringRebroadcast(testutils.Context(t), lggr, evmFromAddress, currentHead, gasBumpThreshold, 10, 0, &cltest.FixtureChainID)
@@ -1416,7 +1417,7 @@ func TestEthConfirmer_FindTxsRequiringRebroadcast(t *testing.T) {
 		assert.Len(t, etxs, 0)
 	})
 
-	etxWithoutAttempts := cltest.NewEthTx(t, fromAddress)
+	etxWithoutAttempts := cltest.NewEthTx(fromAddress)
 	{
 		n := evmtypes.Nonce(nonce)
 		etxWithoutAttempts.Sequence = &n
@@ -1577,13 +1578,13 @@ func TestEthConfirmer_FindTxsRequiringRebroadcast(t *testing.T) {
 	attempt4_2.TxFee = gas.EvmFee{Legacy: assets.NewWeiI(40000)}
 	require.NoError(t, txStore.InsertTxAttempt(&attempt4_2))
 
-	etx5 := cltest.MustInsertUnconfirmedEthTxWithInsufficientEthAttempt(t, txStore, nonce, fromAddress)
+	etx5 := mustInsertUnconfirmedEthTxWithInsufficientEthAttempt(t, txStore, nonce, fromAddress)
 	nonce++
 
 	// This etx has one attempt that is too new, which would exclude it from
 	// the gas bumping query, but it should still be caught by the insufficient
 	// eth query
-	etx6 := cltest.MustInsertUnconfirmedEthTxWithInsufficientEthAttempt(t, txStore, nonce, fromAddress)
+	etx6 := mustInsertUnconfirmedEthTxWithInsufficientEthAttempt(t, txStore, nonce, fromAddress)
 	attempt6_2 := newBroadcastLegacyEthTxAttempt(t, etx3.ID)
 	attempt6_2.BroadcastBeforeBlockNum = &tooNew
 	attempt6_2.TxFee = gas.EvmFee{Legacy: assets.NewWeiI(30001)}
@@ -1696,7 +1697,7 @@ func TestEthConfirmer_RebroadcastWhereNecessary_WithConnectivityCheck(t *testing
 		nonce := int64(0)
 		originalBroadcastAt := time.Unix(1616509100, 0)
 
-		etx := cltest.MustInsertUnconfirmedEthTxWithBroadcastDynamicFeeAttempt(t, txStore, nonce, fromAddress, originalBroadcastAt)
+		etx := mustInsertUnconfirmedEthTxWithBroadcastDynamicFeeAttempt(t, txStore, nonce, fromAddress, originalBroadcastAt)
 		attempt1 := etx.TxAttempts[0]
 		var dbAttempt txmgr.DbEthTxAttempt
 		dbAttempt.FromTxAttempt(&attempt1)
@@ -1735,7 +1736,7 @@ func TestEthConfirmer_RebroadcastWhereNecessary(t *testing.T) {
 	addresses := []gethCommon.Address{fromAddress}
 	kst.On("EnabledAddressesForChain", &cltest.FixtureChainID).Return(addresses, nil).Maybe()
 	// Use a mock keystore for this test
-	ec := cltest.NewEthConfirmer(t, txStore, ethClient, evmcfg, kst, nil)
+	ec := newEthConfirmer(t, txStore, ethClient, evmcfg, kst, nil)
 	currentHead := int64(30)
 	oldEnough := int64(19)
 	nonce := int64(0)
@@ -2205,7 +2206,7 @@ func TestEthConfirmer_RebroadcastWhereNecessary(t *testing.T) {
 			c.EVM[0].GasEstimator.PriceMax = assets.NewWeiI(60500000000)
 		})
 		newCfg := evmtest.NewChainScopedConfig(t, gcfg)
-		ec2 := cltest.NewEthConfirmer(t, txStore, ethClient, newCfg, ethKeyStore, nil)
+		ec2 := newEthConfirmer(t, txStore, ethClient, newCfg, ethKeyStore, nil)
 
 		ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *types.Transaction) bool {
 			return evmtypes.Nonce(tx.Nonce()) == *etx3.Sequence && gasPrice.Cmp(tx.GasPrice()) == 0
@@ -2235,7 +2236,7 @@ func TestEthConfirmer_RebroadcastWhereNecessary(t *testing.T) {
 			c.EVM[0].GasEstimator.PriceMax = assets.NewWeiI(60480000000)
 		})
 		newCfg := evmtest.NewChainScopedConfig(t, gcfg)
-		ec2 := cltest.NewEthConfirmer(t, txStore, ethClient, newCfg, ethKeyStore, nil)
+		ec2 := newEthConfirmer(t, txStore, ethClient, newCfg, ethKeyStore, nil)
 
 		ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *types.Transaction) bool {
 			return evmtypes.Nonce(tx.Nonce()) == *etx3.Sequence && gasPrice.Cmp(tx.GasPrice()) == 0
@@ -2256,7 +2257,7 @@ func TestEthConfirmer_RebroadcastWhereNecessary(t *testing.T) {
 	})
 
 	// The EIP-1559 etx and attempt
-	etx4 := cltest.MustInsertUnconfirmedEthTxWithBroadcastDynamicFeeAttempt(t, txStore, nonce, fromAddress)
+	etx4 := mustInsertUnconfirmedEthTxWithBroadcastDynamicFeeAttempt(t, txStore, nonce, fromAddress)
 	attempt4_1 := etx4.TxAttempts[0]
 	require.NoError(t, db.Get(&dbAttempt, `UPDATE evm.tx_attempts SET broadcast_before_block_num=$1, gas_tip_cap=$2, gas_fee_cap=$3 WHERE id=$4 RETURNING *`,
 		oldEnough, assets.GWei(35), assets.GWei(100), attempt4_1.ID))
@@ -2303,7 +2304,7 @@ func TestEthConfirmer_RebroadcastWhereNecessary(t *testing.T) {
 			c.EVM[0].GasEstimator.PriceMax = assets.GWei(1000)
 		})
 		newCfg := evmtest.NewChainScopedConfig(t, gcfg)
-		ec2 := cltest.NewEthConfirmer(t, txStore, ethClient, newCfg, ethKeyStore, nil)
+		ec2 := newEthConfirmer(t, txStore, ethClient, newCfg, ethKeyStore, nil)
 
 		// Third attempt failed to bump, resubmits old one instead
 		ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *types.Transaction) bool {
@@ -2389,10 +2390,10 @@ func TestEthConfirmer_RebroadcastWhereNecessary_TerminallyUnderpriced_ThenGoesTh
 
 	t.Run("terminally underpriced transaction with in_progress attempt is retried with more gas", func(t *testing.T) {
 		ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
-		ec := cltest.NewEthConfirmer(t, txStore, ethClient, evmcfg, kst, nil)
+		ec := newEthConfirmer(t, txStore, ethClient, evmcfg, kst, nil)
 
 		originalBroadcastAt := time.Unix(1616509100, 0)
-		etx := cltest.MustInsertUnconfirmedEthTxWithAttemptState(t, txStore, nonce, fromAddress, txmgrtypes.TxAttemptInProgress, originalBroadcastAt)
+		etx := mustInsertUnconfirmedEthTxWithAttemptState(t, txStore, nonce, fromAddress, txmgrtypes.TxAttemptInProgress, originalBroadcastAt)
 		require.Equal(t, originalBroadcastAt, *etx.BroadcastAt)
 		nonce++
 		attempt := etx.TxAttempts[0]
@@ -2413,7 +2414,7 @@ func TestEthConfirmer_RebroadcastWhereNecessary_TerminallyUnderpriced_ThenGoesTh
 
 	t.Run("multiple gas bumps with existing broadcast attempts are retried with more gas until success in legacy mode", func(t *testing.T) {
 		ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
-		ec := cltest.NewEthConfirmer(t, txStore, ethClient, evmcfg, kst, nil)
+		ec := newEthConfirmer(t, txStore, ethClient, evmcfg, kst, nil)
 
 		etx := cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, txStore, nonce, fromAddress)
 		nonce++
@@ -2445,9 +2446,9 @@ func TestEthConfirmer_RebroadcastWhereNecessary_TerminallyUnderpriced_ThenGoesTh
 
 	t.Run("multiple gas bumps with existing broadcast attempts are retried with more gas until success in EIP-1559 mode", func(t *testing.T) {
 		ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
-		ec := cltest.NewEthConfirmer(t, txStore, ethClient, evmcfg, kst, nil)
+		ec := newEthConfirmer(t, txStore, ethClient, evmcfg, kst, nil)
 
-		etx := cltest.MustInsertUnconfirmedEthTxWithBroadcastDynamicFeeAttempt(t, txStore, nonce, fromAddress)
+		etx := mustInsertUnconfirmedEthTxWithBroadcastDynamicFeeAttempt(t, txStore, nonce, fromAddress)
 		nonce++
 		dxFeeAttempt := etx.TxAttempts[0]
 		var dbAttempt txmgr.DbEthTxAttempt
@@ -2510,7 +2511,7 @@ func TestEthConfirmer_RebroadcastWhereNecessary_WhenOutOfEth(t *testing.T) {
 	insufficientEthError := errors.New("insufficient funds for gas * price + value")
 
 	t.Run("saves attempt with state 'insufficient_eth' if eth node returns this error", func(t *testing.T) {
-		ec := cltest.NewEthConfirmer(t, txStore, ethClient, config, ethKeyStore, nil)
+		ec := newEthConfirmer(t, txStore, ethClient, config, ethKeyStore, nil)
 
 		expectedBumpedGasPrice := big.NewInt(20000000000)
 		require.Greater(t, expectedBumpedGasPrice.Int64(), attempt1_1.TxFee.Legacy.ToInt().Int64())
@@ -2536,7 +2537,7 @@ func TestEthConfirmer_RebroadcastWhereNecessary_WhenOutOfEth(t *testing.T) {
 	})
 
 	t.Run("does not bump gas when previous error was 'out of eth', instead resubmits existing transaction", func(t *testing.T) {
-		ec := cltest.NewEthConfirmer(t, txStore, ethClient, config, ethKeyStore, nil)
+		ec := newEthConfirmer(t, txStore, ethClient, config, ethKeyStore, nil)
 
 		expectedBumpedGasPrice := big.NewInt(20000000000)
 		require.Greater(t, expectedBumpedGasPrice.Int64(), attempt1_1.TxFee.Legacy.ToInt().Int64())
@@ -2561,7 +2562,7 @@ func TestEthConfirmer_RebroadcastWhereNecessary_WhenOutOfEth(t *testing.T) {
 	})
 
 	t.Run("saves the attempt as broadcast after node wallet has been topped up with sufficient balance", func(t *testing.T) {
-		ec := cltest.NewEthConfirmer(t, txStore, ethClient, config, ethKeyStore, nil)
+		ec := newEthConfirmer(t, txStore, ethClient, config, ethKeyStore, nil)
 
 		expectedBumpedGasPrice := big.NewInt(20000000000)
 		require.Greater(t, expectedBumpedGasPrice.Int64(), attempt1_1.TxFee.Legacy.ToInt().Int64())
@@ -2593,11 +2594,11 @@ func TestEthConfirmer_RebroadcastWhereNecessary_WhenOutOfEth(t *testing.T) {
 			c.EVM[0].GasEstimator.BumpTxDepth = ptr(uint32(depth))
 		})
 		evmcfg := evmtest.NewChainScopedConfig(t, cfg)
-		ec := cltest.NewEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, nil)
+		ec := newEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, nil)
 
 		for i := 0; i < etxCount; i++ {
 			n := nonce
-			cltest.MustInsertUnconfirmedEthTxWithInsufficientEthAttempt(t, txStore, nonce, fromAddress)
+			mustInsertUnconfirmedEthTxWithInsufficientEthAttempt(t, txStore, nonce, fromAddress)
 			ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *types.Transaction) bool {
 				return tx.Nonce() == uint64(n)
 			}), fromAddress).Return(commonclient.Successful, nil).Once()
@@ -2628,7 +2629,7 @@ func TestEthConfirmer_EnsureConfirmedTransactionsInLongestChain(t *testing.T) {
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
 
 	config := newTestChainScopedConfig(t)
-	ec := cltest.NewEthConfirmer(t, txStore, ethClient, config, ethKeyStore, nil)
+	ec := newEthConfirmer(t, txStore, ethClient, config, ethKeyStore, nil)
 
 	head := evmtypes.Head{
 		Hash:   utils.NewHash(),
@@ -2661,7 +2662,7 @@ func TestEthConfirmer_EnsureConfirmedTransactionsInLongestChain(t *testing.T) {
 
 	t.Run("does nothing to confirmed transactions with receipts within head height of the chain and included in the chain", func(t *testing.T) {
 		etx := cltest.MustInsertConfirmedEthTxWithLegacyAttempt(t, txStore, 2, 1, fromAddress)
-		cltest.MustInsertEthReceipt(t, txStore, head.Number, head.Hash, etx.TxAttempts[0].Hash)
+		mustInsertEthReceipt(t, txStore, head.Number, head.Hash, etx.TxAttempts[0].Hash)
 
 		// Do the thing
 		require.NoError(t, ec.EnsureConfirmedTransactionsInLongestChain(testutils.Context(t), &head))
@@ -2674,7 +2675,7 @@ func TestEthConfirmer_EnsureConfirmedTransactionsInLongestChain(t *testing.T) {
 	t.Run("does nothing to confirmed transactions that only have receipts older than the start of the chain", func(t *testing.T) {
 		etx := cltest.MustInsertConfirmedEthTxWithLegacyAttempt(t, txStore, 3, 1, fromAddress)
 		// Add receipt that is older than the lowest block of the chain
-		cltest.MustInsertEthReceipt(t, txStore, head.Parent.Parent.Number-1, utils.NewHash(), etx.TxAttempts[0].Hash)
+		mustInsertEthReceipt(t, txStore, head.Parent.Parent.Number-1, utils.NewHash(), etx.TxAttempts[0].Hash)
 
 		// Do the thing
 		require.NoError(t, ec.EnsureConfirmedTransactionsInLongestChain(testutils.Context(t), &head))
@@ -2688,7 +2689,7 @@ func TestEthConfirmer_EnsureConfirmedTransactionsInLongestChain(t *testing.T) {
 		etx := cltest.MustInsertConfirmedEthTxWithLegacyAttempt(t, txStore, 4, 1, fromAddress)
 		attempt := etx.TxAttempts[0]
 		// Include one within head height but a different block hash
-		cltest.MustInsertEthReceipt(t, txStore, head.Parent.Number, utils.NewHash(), attempt.Hash)
+		mustInsertEthReceipt(t, txStore, head.Parent.Number, utils.NewHash(), attempt.Hash)
 
 		ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *types.Transaction) bool {
 			atx, err := txmgr.GetGethSignedTx(attempt.SignedRawTx)
@@ -2713,9 +2714,9 @@ func TestEthConfirmer_EnsureConfirmedTransactionsInLongestChain(t *testing.T) {
 		attempt := etx.TxAttempts[0]
 		attemptHash := attempt.Hash
 		// Add receipt that is older than the lowest block of the chain
-		cltest.MustInsertEthReceipt(t, txStore, head.Parent.Parent.Number-1, utils.NewHash(), attemptHash)
+		mustInsertEthReceipt(t, txStore, head.Parent.Parent.Number-1, utils.NewHash(), attemptHash)
 		// Include one within head height but a different block hash
-		cltest.MustInsertEthReceipt(t, txStore, head.Parent.Number, utils.NewHash(), attemptHash)
+		mustInsertEthReceipt(t, txStore, head.Parent.Number, utils.NewHash(), attemptHash)
 
 		ethClient.On("SendTransactionReturnCode", mock.Anything, mock.Anything, fromAddress).Return(
 			commonclient.Successful, nil).Once()
@@ -2745,9 +2746,9 @@ func TestEthConfirmer_EnsureConfirmedTransactionsInLongestChain(t *testing.T) {
 		require.NoError(t, txStore.InsertTxAttempt(&attempt3))
 
 		// Receipt is within head height but a different block hash
-		cltest.MustInsertEthReceipt(t, txStore, head.Parent.Number, utils.NewHash(), attempt2.Hash)
+		mustInsertEthReceipt(t, txStore, head.Parent.Number, utils.NewHash(), attempt2.Hash)
 		// Receipt is within head height but a different block hash
-		cltest.MustInsertEthReceipt(t, txStore, head.Parent.Number, utils.NewHash(), attempt3.Hash)
+		mustInsertEthReceipt(t, txStore, head.Parent.Number, utils.NewHash(), attempt3.Hash)
 
 		ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *types.Transaction) bool {
 			s, err := txmgr.GetGethSignedTx(attempt3.SignedRawTx)
@@ -2774,7 +2775,7 @@ func TestEthConfirmer_EnsureConfirmedTransactionsInLongestChain(t *testing.T) {
 		etx := cltest.MustInsertConfirmedEthTxWithLegacyAttempt(t, txStore, 7, 1, fromAddress)
 		attempt := etx.TxAttempts[0]
 		// Add receipt that is higher than head
-		cltest.MustInsertEthReceipt(t, txStore, head.Number+1, utils.NewHash(), attempt.Hash)
+		mustInsertEthReceipt(t, txStore, head.Number+1, utils.NewHash(), attempt.Hash)
 
 		require.NoError(t, ec.EnsureConfirmedTransactionsInLongestChain(testutils.Context(t), &head))
 
@@ -2799,7 +2800,7 @@ func TestEthConfirmer_ForceRebroadcast(t *testing.T) {
 	_, fromAddress := cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
 
 	config := newTestChainScopedConfig(t)
-	cltest.MustCreateUnstartedGeneratedTx(t, txStore, fromAddress, config.EVM().ChainID())
+	mustCreateUnstartedGeneratedTx(t, txStore, fromAddress, config.EVM().ChainID())
 	mustInsertInProgressEthTx(t, txStore, 0, fromAddress)
 	etx1 := cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, txStore, 1, fromAddress)
 	etx2 := cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, txStore, 2, fromAddress)
@@ -2809,7 +2810,7 @@ func TestEthConfirmer_ForceRebroadcast(t *testing.T) {
 
 	t.Run("rebroadcasts one eth_tx if it falls within in nonce range", func(t *testing.T) {
 		ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
-		ec := cltest.NewEthConfirmer(t, txStore, ethClient, config, ethKeyStore, nil)
+		ec := newEthConfirmer(t, txStore, ethClient, config, ethKeyStore, nil)
 
 		ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *types.Transaction) bool {
 			return tx.Nonce() == uint64(*etx1.Sequence) &&
@@ -2824,7 +2825,7 @@ func TestEthConfirmer_ForceRebroadcast(t *testing.T) {
 
 	t.Run("uses default gas limit if overrideGasLimit is 0", func(t *testing.T) {
 		ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
-		ec := cltest.NewEthConfirmer(t, txStore, ethClient, config, ethKeyStore, nil)
+		ec := newEthConfirmer(t, txStore, ethClient, config, ethKeyStore, nil)
 
 		ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *types.Transaction) bool {
 			return tx.Nonce() == uint64(*etx1.Sequence) &&
@@ -2839,7 +2840,7 @@ func TestEthConfirmer_ForceRebroadcast(t *testing.T) {
 
 	t.Run("rebroadcasts several eth_txes in nonce range", func(t *testing.T) {
 		ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
-		ec := cltest.NewEthConfirmer(t, txStore, ethClient, config, ethKeyStore, nil)
+		ec := newEthConfirmer(t, txStore, ethClient, config, ethKeyStore, nil)
 
 		ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *types.Transaction) bool {
 			return tx.Nonce() == uint64(*etx1.Sequence) && tx.GasPrice().Int64() == gasPriceWei.Legacy.Int64() && tx.Gas() == uint64(overrideGasLimit)
@@ -2853,7 +2854,7 @@ func TestEthConfirmer_ForceRebroadcast(t *testing.T) {
 
 	t.Run("broadcasts zero transactions if eth_tx doesn't exist for that nonce", func(t *testing.T) {
 		ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
-		ec := cltest.NewEthConfirmer(t, txStore, ethClient, config, ethKeyStore, nil)
+		ec := newEthConfirmer(t, txStore, ethClient, config, ethKeyStore, nil)
 
 		ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *types.Transaction) bool {
 			return tx.Nonce() == uint64(1)
@@ -2879,7 +2880,7 @@ func TestEthConfirmer_ForceRebroadcast(t *testing.T) {
 
 	t.Run("zero transactions use default gas limit if override wasn't specified", func(t *testing.T) {
 		ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
-		ec := cltest.NewEthConfirmer(t, txStore, ethClient, config, ethKeyStore, nil)
+		ec := newEthConfirmer(t, txStore, ethClient, config, ethKeyStore, nil)
 
 		ethClient.On("SendTransactionReturnCode", mock.Anything, mock.MatchedBy(func(tx *types.Transaction) bool {
 			return tx.Nonce() == uint64(0) && tx.GasPrice().Int64() == gasPriceWei.Legacy.Int64() && uint32(tx.Gas()) == config.EVM().GasEstimator().LimitDefault()
@@ -2923,7 +2924,7 @@ func TestEthConfirmer_ResumePendingRuns(t *testing.T) {
 	pgtest.MustExec(t, db, `SET CONSTRAINTS pipeline_runs_pipeline_spec_id_fkey DEFERRED`)
 
 	t.Run("doesn't process task runs that are not suspended (possibly already previously resumed)", func(t *testing.T) {
-		ec := cltest.NewEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, func(uuid.UUID, interface{}, error) error {
+		ec := newEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, func(uuid.UUID, interface{}, error) error {
 			t.Fatal("No value expected")
 			return nil
 		})
@@ -2932,7 +2933,7 @@ func TestEthConfirmer_ResumePendingRuns(t *testing.T) {
 		tr := cltest.MustInsertUnfinishedPipelineTaskRun(t, db, run.ID)
 
 		etx := cltest.MustInsertConfirmedEthTxWithLegacyAttempt(t, txStore, 1, 1, fromAddress)
-		cltest.MustInsertEthReceipt(t, txStore, head.Number-minConfirmations, head.Hash, etx.TxAttempts[0].Hash)
+		mustInsertEthReceipt(t, txStore, head.Number-minConfirmations, head.Hash, etx.TxAttempts[0].Hash)
 		// Setting both signal_callback and callback_completed to TRUE to simulate a completed pipeline task
 		// It would only be in a state past suspended if the resume callback was called and callback_completed was set to TRUE
 		pgtest.MustExec(t, db, `UPDATE evm.txes SET pipeline_task_run_id = $1, min_confirmations = $2, signal_callback = TRUE, callback_completed = TRUE WHERE id = $3`, &tr.ID, minConfirmations, etx.ID)
@@ -2942,7 +2943,7 @@ func TestEthConfirmer_ResumePendingRuns(t *testing.T) {
 	})
 
 	t.Run("doesn't process task runs where the receipt is younger than minConfirmations", func(t *testing.T) {
-		ec := cltest.NewEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, func(uuid.UUID, interface{}, error) error {
+		ec := newEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, func(uuid.UUID, interface{}, error) error {
 			t.Fatal("No value expected")
 			return nil
 		})
@@ -2951,7 +2952,7 @@ func TestEthConfirmer_ResumePendingRuns(t *testing.T) {
 		tr := cltest.MustInsertUnfinishedPipelineTaskRun(t, db, run.ID)
 
 		etx := cltest.MustInsertConfirmedEthTxWithLegacyAttempt(t, txStore, 2, 1, fromAddress)
-		cltest.MustInsertEthReceipt(t, txStore, head.Number, head.Hash, etx.TxAttempts[0].Hash)
+		mustInsertEthReceipt(t, txStore, head.Number, head.Hash, etx.TxAttempts[0].Hash)
 
 		pgtest.MustExec(t, db, `UPDATE evm.txes SET pipeline_task_run_id = $1, min_confirmations = $2, signal_callback = TRUE WHERE id = $3`, &tr.ID, minConfirmations, etx.ID)
 
@@ -2963,7 +2964,7 @@ func TestEthConfirmer_ResumePendingRuns(t *testing.T) {
 		ch := make(chan interface{})
 		nonce := evmtypes.Nonce(3)
 		var err error
-		ec := cltest.NewEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, func(id uuid.UUID, value interface{}, thisErr error) error {
+		ec := newEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, func(id uuid.UUID, value interface{}, thisErr error) error {
 			err = thisErr
 			ch <- value
 			return nil
@@ -2975,7 +2976,7 @@ func TestEthConfirmer_ResumePendingRuns(t *testing.T) {
 
 		etx := cltest.MustInsertConfirmedEthTxWithLegacyAttempt(t, txStore, int64(nonce), 1, fromAddress)
 		pgtest.MustExec(t, db, `UPDATE evm.txes SET meta='{"FailOnRevert": true}'`)
-		receipt := cltest.MustInsertEthReceipt(t, txStore, head.Number-minConfirmations, head.Hash, etx.TxAttempts[0].Hash)
+		receipt := mustInsertEthReceipt(t, txStore, head.Number-minConfirmations, head.Hash, etx.TxAttempts[0].Hash)
 
 		pgtest.MustExec(t, db, `UPDATE evm.txes SET pipeline_task_run_id = $1, min_confirmations = $2, signal_callback = TRUE WHERE id = $3`, &tr.ID, minConfirmations, etx.ID)
 
@@ -3007,7 +3008,7 @@ func TestEthConfirmer_ResumePendingRuns(t *testing.T) {
 		ch := make(chan interface{})
 		nonce := evmtypes.Nonce(4)
 		var err error
-		ec := cltest.NewEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, func(id uuid.UUID, value interface{}, thisErr error) error {
+		ec := newEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, func(id uuid.UUID, value interface{}, thisErr error) error {
 			err = thisErr
 			ch <- value
 			return nil
@@ -3021,7 +3022,7 @@ func TestEthConfirmer_ResumePendingRuns(t *testing.T) {
 		pgtest.MustExec(t, db, `UPDATE evm.txes SET meta='{"FailOnRevert": true}'`)
 
 		// receipt is not passed through as a value since it reverted and caused an error
-		cltest.MustInsertRevertedEthReceipt(t, txStore, head.Number-minConfirmations, head.Hash, etx.TxAttempts[0].Hash)
+		mustInsertRevertedEthReceipt(t, txStore, head.Number-minConfirmations, head.Hash, etx.TxAttempts[0].Hash)
 
 		pgtest.MustExec(t, db, `UPDATE evm.txes SET pipeline_task_run_id = $1, min_confirmations = $2, signal_callback = TRUE WHERE id = $3`, &tr.ID, minConfirmations, etx.ID)
 
@@ -3049,7 +3050,7 @@ func TestEthConfirmer_ResumePendingRuns(t *testing.T) {
 
 	t.Run("does not mark callback complete if callback fails", func(t *testing.T) {
 		nonce := evmtypes.Nonce(5)
-		ec := cltest.NewEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, func(uuid.UUID, interface{}, error) error {
+		ec := newEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, func(uuid.UUID, interface{}, error) error {
 			return errors.New("error")
 		})
 
@@ -3057,7 +3058,7 @@ func TestEthConfirmer_ResumePendingRuns(t *testing.T) {
 		tr := cltest.MustInsertUnfinishedPipelineTaskRun(t, db, run.ID)
 
 		etx := cltest.MustInsertConfirmedEthTxWithLegacyAttempt(t, txStore, int64(nonce), 1, fromAddress)
-		cltest.MustInsertEthReceipt(t, txStore, head.Number-minConfirmations, head.Hash, etx.TxAttempts[0].Hash)
+		mustInsertEthReceipt(t, txStore, head.Number-minConfirmations, head.Hash, etx.TxAttempts[0].Hash)
 		pgtest.MustExec(t, db, `UPDATE evm.txes SET pipeline_task_run_id = $1, min_confirmations = $2, signal_callback = TRUE WHERE id = $3`, &tr.ID, minConfirmations, etx.ID)
 
 		err := ec.ResumePendingTaskRuns(testutils.Context(t), &head)
@@ -3071,3 +3072,14 @@ func TestEthConfirmer_ResumePendingRuns(t *testing.T) {
 }
 
 func ptr[T any](t T) *T { return &t }
+
+func newEthConfirmer(t testing.TB, txStore txmgr.EvmTxStore, ethClient client.Client, config evmconfig.ChainScopedConfig, ks keystore.Eth, fn txmgrcommon.ResumeCallback) *txmgr.Confirmer {
+	lggr := logger.TestLogger(t)
+	ge := config.EVM().GasEstimator()
+	estimator := gas.NewWrappedEvmEstimator(gas.NewFixedPriceEstimator(ge, ge.BlockHistory(), lggr), ge.EIP1559DynamicFees(), nil)
+	txBuilder := txmgr.NewEvmTxAttemptBuilder(*ethClient.ConfiguredChainID(), ge, ks, estimator)
+	ec := txmgr.NewEvmConfirmer(txStore, txmgr.NewEvmTxmClient(ethClient), txmgr.NewEvmTxmConfig(config.EVM()), txmgr.NewEvmTxmFeeConfig(ge), config.EVM().Transactions(), config.Database(), ks, txBuilder, lggr)
+	ec.SetResumeCallback(fn)
+	require.NoError(t, ec.Start(testutils.Context(t)))
+	return ec
+}
diff --git a/core/chains/evm/txmgr/evm_tx_store_test.go b/core/chains/evm/txmgr/evm_tx_store_test.go
index 73bfc6fc85a..15417a43096 100644
--- a/core/chains/evm/txmgr/evm_tx_store_test.go
+++ b/core/chains/evm/txmgr/evm_tx_store_test.go
@@ -52,7 +52,7 @@ func TestORM_TransactionsWithAttempts(t *testing.T) {
 	require.NoError(t, txStore.InsertTxAttempt(&attempt))
 
 	// tx 3 has no attempts
-	cltest.MustCreateUnstartedGeneratedTx(t, txStore, from, &cltest.FixtureChainID)
+	mustCreateUnstartedGeneratedTx(t, txStore, from, &cltest.FixtureChainID)
 
 	var count int
 	err := db.Get(&count, `SELECT count(*) FROM evm.txes`)
@@ -97,7 +97,7 @@ func TestORM_Transactions(t *testing.T) {
 	require.NoError(t, txStore.InsertTxAttempt(&attempt))
 
 	// tx 3 has no attempts
-	cltest.MustCreateUnstartedGeneratedTx(t, txStore, from, &cltest.FixtureChainID)
+	mustCreateUnstartedGeneratedTx(t, txStore, from, &cltest.FixtureChainID)
 
 	var count int
 	err := db.Get(&count, `SELECT count(*) FROM evm.txes`)
@@ -125,7 +125,7 @@ func TestORM(t *testing.T) {
 
 	var etx txmgr.Tx
 	t.Run("InsertTx", func(t *testing.T) {
-		etx = cltest.NewEthTx(t, fromAddress)
+		etx = cltest.NewEthTx(fromAddress)
 		require.NoError(t, orm.InsertTx(&etx))
 		assert.Greater(t, int(etx.ID), 0)
 		cltest.AssertCount(t, db, "evm.txes", 1)
@@ -147,7 +147,7 @@ func TestORM(t *testing.T) {
 	})
 	var r txmgr.Receipt
 	t.Run("InsertReceipt", func(t *testing.T) {
-		r = cltest.NewEthReceipt(t, 42, utils.NewHash(), attemptD.Hash, 0x1)
+		r = newEthReceipt(42, utils.NewHash(), attemptD.Hash, 0x1)
 		id, err := orm.InsertReceipt(&r.Receipt)
 		r.ID = id
 		require.NoError(t, err)
@@ -203,12 +203,12 @@ func TestORM_FindTxAttemptConfirmedByTxIDs(t *testing.T) {
 	require.NoError(t, orm.InsertTxAttempt(&attempt))
 
 	// add receipt for the second attempt
-	r := cltest.NewEthReceipt(t, 4, utils.NewHash(), attempt.Hash, 0x1)
+	r := newEthReceipt(4, utils.NewHash(), attempt.Hash, 0x1)
 	_, err := orm.InsertReceipt(&r.Receipt)
 	require.NoError(t, err)
 
 	// tx 3 has no attempts
-	cltest.MustCreateUnstartedGeneratedTx(t, orm, from, &cltest.FixtureChainID)
+	mustCreateUnstartedGeneratedTx(t, orm, from, &cltest.FixtureChainID)
 
 	cltest.MustInsertUnconfirmedEthTx(t, orm, 3, from)                           // tx4
 	cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, orm, 4, from) // tx5
@@ -252,7 +252,7 @@ func TestORM_FindTxAttemptsRequiringResend(t *testing.T) {
 
 	// Mix up the insert order to assure that they come out sorted by nonce not implicitly or by ID
 	e1 := cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, txStore, 1, fromAddress, time.Unix(1616509200, 0))
-	e3 := cltest.MustInsertUnconfirmedEthTxWithBroadcastDynamicFeeAttempt(t, txStore, 3, fromAddress, time.Unix(1616509400, 0))
+	e3 := mustInsertUnconfirmedEthTxWithBroadcastDynamicFeeAttempt(t, txStore, 3, fromAddress, time.Unix(1616509400, 0))
 	e0 := cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, txStore, 0, fromAddress, time.Unix(1616509100, 0))
 	e2 := cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, txStore, 2, fromAddress, time.Unix(1616509300, 0))
 
@@ -331,7 +331,7 @@ func TestORM_UpdateBroadcastAts(t *testing.T) {
 	t.Run("does not update when broadcast_at is NULL", func(t *testing.T) {
 		t.Parallel()
 
-		etx := cltest.MustCreateUnstartedGeneratedTx(t, orm, fromAddress, &cltest.FixtureChainID)
+		etx := mustCreateUnstartedGeneratedTx(t, orm, fromAddress, &cltest.FixtureChainID)
 
 		var nullTime *time.Time
 		assert.Equal(t, nullTime, etx.BroadcastAt)
@@ -349,7 +349,7 @@ func TestORM_UpdateBroadcastAts(t *testing.T) {
 		t.Parallel()
 
 		time1 := time.Now()
-		etx := cltest.NewEthTx(t, fromAddress)
+		etx := cltest.NewEthTx(fromAddress)
 		etx.Sequence = new(evmtypes.Nonce)
 		etx.State = txmgrcommon.TxUnconfirmed
 		etx.BroadcastAt = &time1
@@ -446,7 +446,7 @@ func TestORM_FindTxAttemptsConfirmedMissingReceipt(t *testing.T) {
 	_, fromAddress := cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
 
 	originalBroadcastAt := time.Unix(1616509100, 0)
-	etx0 := cltest.MustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
+	etx0 := mustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
 		t, txStore, 0, 1, originalBroadcastAt, fromAddress)
 
 	attempts, err := txStore.FindTxAttemptsConfirmedMissingReceipt(testutils.Context(t), ethClient.ConfiguredChainID())
@@ -468,7 +468,7 @@ func TestORM_UpdateTxsUnconfirmed(t *testing.T) {
 	_, fromAddress := cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
 
 	originalBroadcastAt := time.Unix(1616509100, 0)
-	etx0 := cltest.MustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
+	etx0 := mustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
 		t, txStore, 0, 1, originalBroadcastAt, fromAddress)
 	assert.Equal(t, etx0.State, txmgrcommon.TxConfirmedMissingReceipt)
 	require.NoError(t, txStore.UpdateTxsUnconfirmed(testutils.Context(t), []int64{etx0.ID}))
@@ -489,7 +489,7 @@ func TestORM_FindTxAttemptsRequiringReceiptFetch(t *testing.T) {
 	_, fromAddress := cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
 
 	originalBroadcastAt := time.Unix(1616509100, 0)
-	etx0 := cltest.MustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
+	etx0 := mustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
 		t, txStore, 0, 1, originalBroadcastAt, fromAddress)
 
 	attempts, err := txStore.FindTxAttemptsRequiringReceiptFetch(testutils.Context(t), ethClient.ConfiguredChainID())
@@ -510,7 +510,7 @@ func TestORM_SaveFetchedReceipts(t *testing.T) {
 	_, fromAddress := cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
 
 	originalBroadcastAt := time.Unix(1616509100, 0)
-	etx0 := cltest.MustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
+	etx0 := mustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
 		t, txStore, 0, 1, originalBroadcastAt, fromAddress)
 	require.Len(t, etx0.TxAttempts, 1)
 
@@ -552,7 +552,7 @@ func TestORM_MarkAllConfirmedMissingReceipt(t *testing.T) {
 	assert.Equal(t, txmgrcommon.TxUnconfirmed, etx0.State)
 
 	// create transaction 1 (nonce 1) that is confirmed (block 77)
-	etx1 := cltest.MustInsertConfirmedEthTxBySaveFetchedReceipts(t, txStore, fromAddress, int64(1), int64(77), *ethClient.ConfiguredChainID())
+	etx1 := mustInsertConfirmedEthTxBySaveFetchedReceipts(t, txStore, fromAddress, int64(1), int64(77), *ethClient.ConfiguredChainID())
 	assert.Equal(t, etx1.State, txmgrcommon.TxConfirmed)
 
 	// mark transaction 0 confirmed_missing_receipt
@@ -608,7 +608,7 @@ func TestORM_GetInProgressTxAttempts(t *testing.T) {
 	_, fromAddress := cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
 
 	// insert etx with attempt
-	etx := cltest.MustInsertUnconfirmedEthTxWithAttemptState(t, txStore, int64(7), fromAddress, txmgrtypes.TxAttemptInProgress)
+	etx := mustInsertUnconfirmedEthTxWithAttemptState(t, txStore, int64(7), fromAddress, txmgrtypes.TxAttemptInProgress)
 
 	// fetch attempt
 	attempts, err := txStore.GetInProgressTxAttempts(testutils.Context(t), fromAddress, ethClient.ConfiguredChainID())
@@ -653,7 +653,7 @@ func TestORM_FindTxesPendingCallback(t *testing.T) {
 	etx1 := cltest.MustInsertConfirmedEthTxWithLegacyAttempt(t, txStore, 3, 1, fromAddress)
 	pgtest.MustExec(t, db, `UPDATE evm.txes SET meta='{"FailOnRevert": true}'`)
 	attempt1 := etx1.TxAttempts[0]
-	cltest.MustInsertEthReceipt(t, txStore, head.Number-minConfirmations, head.Hash, attempt1.Hash)
+	mustInsertEthReceipt(t, txStore, head.Number-minConfirmations, head.Hash, attempt1.Hash)
 	pgtest.MustExec(t, db, `UPDATE evm.txes SET pipeline_task_run_id = $1, min_confirmations = $2, signal_callback = TRUE WHERE id = $3`, &tr1.ID, minConfirmations, etx1.ID)
 
 	// Callback to pipeline service completed. Should be ignored
@@ -662,7 +662,7 @@ func TestORM_FindTxesPendingCallback(t *testing.T) {
 	etx2 := cltest.MustInsertConfirmedEthTxWithLegacyAttempt(t, txStore, 4, 1, fromAddress)
 	pgtest.MustExec(t, db, `UPDATE evm.txes SET meta='{"FailOnRevert": false}'`)
 	attempt2 := etx2.TxAttempts[0]
-	cltest.MustInsertEthReceipt(t, txStore, head.Number-minConfirmations, head.Hash, attempt2.Hash)
+	mustInsertEthReceipt(t, txStore, head.Number-minConfirmations, head.Hash, attempt2.Hash)
 	pgtest.MustExec(t, db, `UPDATE evm.txes SET pipeline_task_run_id = $1, min_confirmations = $2, signal_callback = TRUE, callback_completed = TRUE WHERE id = $3`, &tr2.ID, minConfirmations, etx2.ID)
 
 	// Suspended run younger than minConfirmations. Should be ignored
@@ -672,13 +672,13 @@ func TestORM_FindTxesPendingCallback(t *testing.T) {
 	etx3 := cltest.MustInsertConfirmedEthTxWithLegacyAttempt(t, txStore, 5, 1, fromAddress)
 	pgtest.MustExec(t, db, `UPDATE evm.txes SET meta='{"FailOnRevert": false}'`)
 	attempt3 := etx3.TxAttempts[0]
-	cltest.MustInsertEthReceipt(t, txStore, head.Number, head.Hash, attempt3.Hash)
+	mustInsertEthReceipt(t, txStore, head.Number, head.Hash, attempt3.Hash)
 	pgtest.MustExec(t, db, `UPDATE evm.txes SET pipeline_task_run_id = $1, min_confirmations = $2, signal_callback = TRUE WHERE id = $3`, &tr3.ID, minConfirmations, etx3.ID)
 
 	// Tx not marked for callback. Should be ignore
 	etx4 := cltest.MustInsertConfirmedEthTxWithLegacyAttempt(t, txStore, 6, 1, fromAddress)
 	attempt4 := etx4.TxAttempts[0]
-	cltest.MustInsertEthReceipt(t, txStore, head.Number, head.Hash, attempt4.Hash)
+	mustInsertEthReceipt(t, txStore, head.Number, head.Hash, attempt4.Hash)
 	pgtest.MustExec(t, db, `UPDATE evm.txes SET min_confirmations = $1 WHERE id = $2`, minConfirmations, etx4.ID)
 
 	// Unconfirmed Tx without receipts. Should be ignored
@@ -710,8 +710,8 @@ func Test_FindTxWithIdempotencyKey(t *testing.T) {
 	t.Run("returns transaction if it exists", func(t *testing.T) {
 		idempotencyKey := "777"
 		cfg.EVM().ChainID()
-		etx := cltest.MustCreateUnstartedGeneratedTx(t, txStore, fromAddress, big.NewInt(0),
-			cltest.EvmTxRequestWithIdempotencyKey(idempotencyKey))
+		etx := mustCreateUnstartedGeneratedTx(t, txStore, fromAddress, big.NewInt(0),
+			txRequestWithIdempotencyKey(idempotencyKey))
 		require.Equal(t, idempotencyKey, *etx.IdempotencyKey)
 
 		res, err := txStore.FindTxWithIdempotencyKey(testutils.Context(t), idempotencyKey, big.NewInt(0))
@@ -756,7 +756,7 @@ func TestORM_UpdateTxForRebroadcast(t *testing.T) {
 	_, fromAddress := cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
 
 	t.Run("delete all receipts for eth transaction", func(t *testing.T) {
-		etx := cltest.MustInsertConfirmedEthTxWithReceipt(t, txStore, fromAddress, 777, 1)
+		etx := mustInsertConfirmedEthTxWithReceipt(t, txStore, fromAddress, 777, 1)
 		etx, err := txStore.FindTxWithAttempts(etx.ID)
 		assert.NoError(t, err)
 		// assert attempt state
@@ -811,8 +811,8 @@ func TestORM_FindTransactionsConfirmedInBlockRange(t *testing.T) {
 	}
 
 	t.Run("find all transactions confirmed in range", func(t *testing.T) {
-		etx_8 := cltest.MustInsertConfirmedEthTxWithReceipt(t, txStore, fromAddress, 700, 8)
-		etx_9 := cltest.MustInsertConfirmedEthTxWithReceipt(t, txStore, fromAddress, 777, 9)
+		etx_8 := mustInsertConfirmedEthTxWithReceipt(t, txStore, fromAddress, 700, 8)
+		etx_9 := mustInsertConfirmedEthTxWithReceipt(t, txStore, fromAddress, 777, 9)
 
 		etxes, err := txStore.FindTransactionsConfirmedInBlockRange(testutils.Context(t), head.Number, 8, ethClient.ConfiguredChainID())
 		require.NoError(t, err)
@@ -834,7 +834,7 @@ func TestORM_SaveInsufficientEthAttempt(t *testing.T) {
 	require.NoError(t, err)
 
 	t.Run("updates attempt state", func(t *testing.T) {
-		etx := cltest.MustInsertInProgressEthTxWithAttempt(t, txStore, 1, fromAddress)
+		etx := mustInsertInProgressEthTxWithAttempt(t, txStore, 1, fromAddress)
 		now := time.Now()
 
 		err = txStore.SaveInsufficientFundsAttempt(testutils.Context(t), defaultDuration, &etx.TxAttempts[0], now)
@@ -858,7 +858,7 @@ func TestORM_SaveSentAttempt(t *testing.T) {
 	require.NoError(t, err)
 
 	t.Run("updates attempt state to 'broadcast'", func(t *testing.T) {
-		etx := cltest.MustInsertInProgressEthTxWithAttempt(t, txStore, 1, fromAddress)
+		etx := mustInsertInProgressEthTxWithAttempt(t, txStore, 1, fromAddress)
 		require.Nil(t, etx.BroadcastAt)
 		now := time.Now()
 
@@ -883,7 +883,7 @@ func TestORM_SaveConfirmedMissingReceiptAttempt(t *testing.T) {
 	require.NoError(t, err)
 
 	t.Run("updates attempt to 'broadcast' and transaction to 'confirm_missing_receipt'", func(t *testing.T) {
-		etx := cltest.MustInsertUnconfirmedEthTxWithAttemptState(t, txStore, 1, fromAddress, txmgrtypes.TxAttemptInProgress)
+		etx := mustInsertUnconfirmedEthTxWithAttemptState(t, txStore, 1, fromAddress, txmgrtypes.TxAttemptInProgress)
 		now := time.Now()
 
 		err = txStore.SaveConfirmedMissingReceiptAttempt(testutils.Context(t), defaultDuration, &etx.TxAttempts[0], now)
@@ -906,7 +906,7 @@ func TestORM_DeleteInProgressAttempt(t *testing.T) {
 	_, fromAddress := cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
 
 	t.Run("deletes in_progress attempt", func(t *testing.T) {
-		etx := cltest.MustInsertInProgressEthTxWithAttempt(t, txStore, 1, fromAddress)
+		etx := mustInsertInProgressEthTxWithAttempt(t, txStore, 1, fromAddress)
 		attempt := etx.TxAttempts[0]
 
 		err := txStore.DeleteInProgressAttempt(testutils.Context(t), etx.TxAttempts[0])
@@ -942,7 +942,7 @@ func TestORM_SaveInProgressAttempt(t *testing.T) {
 	})
 
 	t.Run("updates old attempt to in_progress when insufficient_eth", func(t *testing.T) {
-		etx := cltest.MustInsertUnconfirmedEthTxWithInsufficientEthAttempt(t, txStore, 23, fromAddress)
+		etx := mustInsertUnconfirmedEthTxWithInsufficientEthAttempt(t, txStore, 23, fromAddress)
 		attempt := etx.TxAttempts[0]
 		require.Equal(t, txmgrtypes.TxAttemptInsufficientFunds, attempt.State)
 		require.NotEqual(t, 0, attempt.ID)
@@ -972,7 +972,7 @@ func TestORM_FindTxsRequiringGasBump(t *testing.T) {
 	currentBlockNum := int64(10)
 
 	t.Run("gets txs requiring gas bump", func(t *testing.T) {
-		etx := cltest.MustInsertUnconfirmedEthTxWithAttemptState(t, txStore, 1, fromAddress, txmgrtypes.TxAttemptBroadcast)
+		etx := mustInsertUnconfirmedEthTxWithAttemptState(t, txStore, 1, fromAddress, txmgrtypes.TxAttemptBroadcast)
 		err := txStore.SetBroadcastBeforeBlockNum(testutils.Context(t), currentBlockNum, ethClient.ConfiguredChainID())
 		require.NoError(t, err)
 
@@ -985,7 +985,7 @@ func TestORM_FindTxsRequiringGasBump(t *testing.T) {
 		assert.Equal(t, currentBlockNum, *attempts[0].BroadcastBeforeBlockNum)
 
 		// this tx will not require gas bump
-		cltest.MustInsertUnconfirmedEthTxWithAttemptState(t, txStore, 2, fromAddress, txmgrtypes.TxAttemptBroadcast)
+		mustInsertUnconfirmedEthTxWithAttemptState(t, txStore, 2, fromAddress, txmgrtypes.TxAttemptBroadcast)
 		err = txStore.SetBroadcastBeforeBlockNum(testutils.Context(t), currentBlockNum+1, ethClient.ConfiguredChainID())
 		require.NoError(t, err)
 
@@ -1012,18 +1012,18 @@ func TestEthConfirmer_FindTxsRequiringResubmissionDueToInsufficientEth(t *testin
 	_, otherAddress := cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
 
 	// Insert order is mixed up to test sorting
-	etx2 := cltest.MustInsertUnconfirmedEthTxWithInsufficientEthAttempt(t, txStore, 1, fromAddress)
+	etx2 := mustInsertUnconfirmedEthTxWithInsufficientEthAttempt(t, txStore, 1, fromAddress)
 	etx3 := cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, txStore, 2, fromAddress)
 	attempt3_2 := cltest.NewLegacyEthTxAttempt(t, etx3.ID)
 	attempt3_2.State = txmgrtypes.TxAttemptInsufficientFunds
 	attempt3_2.TxFee.Legacy = assets.NewWeiI(100)
 	require.NoError(t, txStore.InsertTxAttempt(&attempt3_2))
-	etx1 := cltest.MustInsertUnconfirmedEthTxWithInsufficientEthAttempt(t, txStore, 0, fromAddress)
+	etx1 := mustInsertUnconfirmedEthTxWithInsufficientEthAttempt(t, txStore, 0, fromAddress)
 
 	// These should never be returned
 	cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, txStore, 3, fromAddress)
 	cltest.MustInsertConfirmedEthTxWithLegacyAttempt(t, txStore, 4, 100, fromAddress)
-	cltest.MustInsertUnconfirmedEthTxWithInsufficientEthAttempt(t, txStore, 0, otherAddress)
+	mustInsertUnconfirmedEthTxWithInsufficientEthAttempt(t, txStore, 0, otherAddress)
 
 	t.Run("returns all eth_txes with at least one attempt that is in insufficient_eth state", func(t *testing.T) {
 		etxs, err := txStore.FindTxsRequiringResubmissionDueToInsufficientFunds(testutils.Context(t), fromAddress, &cltest.FixtureChainID)
@@ -1073,7 +1073,7 @@ func TestORM_MarkOldTxesMissingReceiptAsErrored(t *testing.T) {
 	// tx state should be confirmed missing receipt
 	// attempt should be broadcast before cutoff time
 	t.Run("successfully mark errored transactions", func(t *testing.T) {
-		etx := cltest.MustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(t, txStore, 1, 7, time.Now(), fromAddress)
+		etx := mustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(t, txStore, 1, 7, time.Now(), fromAddress)
 
 		err := txStore.MarkOldTxesMissingReceiptAsErrored(testutils.Context(t), 10, 2, ethClient.ConfiguredChainID())
 		require.NoError(t, err)
@@ -1084,7 +1084,7 @@ func TestORM_MarkOldTxesMissingReceiptAsErrored(t *testing.T) {
 	})
 
 	t.Run("successfully mark errored transactions w/ qopt passing in sql.Tx", func(t *testing.T) {
-		etx := cltest.MustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(t, txStore, 1, 7, time.Now(), fromAddress)
+		etx := mustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(t, txStore, 1, 7, time.Now(), fromAddress)
 		err := txStore.MarkOldTxesMissingReceiptAsErrored(testutils.Context(t), 10, 2, ethClient.ConfiguredChainID())
 		require.NoError(t, err)
 
@@ -1105,7 +1105,7 @@ func TestORM_LoadEthTxesAttempts(t *testing.T) {
 	_, fromAddress := cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
 
 	t.Run("load eth tx attempt", func(t *testing.T) {
-		etx := cltest.MustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(t, txStore, 1, 7, time.Now(), fromAddress)
+		etx := mustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(t, txStore, 1, 7, time.Now(), fromAddress)
 		etx.TxAttempts = []txmgr.TxAttempt{}
 
 		err := txStore.LoadTxesAttempts([]*txmgr.Tx{&etx})
@@ -1114,7 +1114,7 @@ func TestORM_LoadEthTxesAttempts(t *testing.T) {
 	})
 
 	t.Run("load new attempt inserted in current postgres transaction", func(t *testing.T) {
-		etx := cltest.MustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(t, txStore, 3, 9, time.Now(), fromAddress)
+		etx := mustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(t, txStore, 3, 9, time.Now(), fromAddress)
 		etx.TxAttempts = []txmgr.TxAttempt{}
 
 		q := pg.NewQ(db, logger.TestLogger(t), cfg.Database())
@@ -1154,7 +1154,7 @@ func TestORM_SaveReplacementInProgressAttempt(t *testing.T) {
 	_, fromAddress := cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
 
 	t.Run("replace eth tx attempt", func(t *testing.T) {
-		etx := cltest.MustInsertInProgressEthTxWithAttempt(t, txStore, 123, fromAddress)
+		etx := mustInsertInProgressEthTxWithAttempt(t, txStore, 123, fromAddress)
 		oldAttempt := etx.TxAttempts[0]
 
 		newAttempt := cltest.NewDynamicFeeEthTxAttempt(t, etx.ID)
@@ -1180,7 +1180,7 @@ func TestORM_FindNextUnstartedTransactionFromAddress(t *testing.T) {
 	_, fromAddress := cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
 
 	t.Run("cannot find unstarted tx", func(t *testing.T) {
-		cltest.MustInsertInProgressEthTxWithAttempt(t, txStore, 13, fromAddress)
+		mustInsertInProgressEthTxWithAttempt(t, txStore, 13, fromAddress)
 
 		resultEtx := new(txmgr.Tx)
 		err := txStore.FindNextUnstartedTransactionFromAddress(testutils.Context(t), resultEtx, fromAddress, ethClient.ConfiguredChainID())
@@ -1188,7 +1188,7 @@ func TestORM_FindNextUnstartedTransactionFromAddress(t *testing.T) {
 	})
 
 	t.Run("finds unstarted tx", func(t *testing.T) {
-		cltest.MustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID)
+		mustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID)
 		resultEtx := new(txmgr.Tx)
 		err := txStore.FindNextUnstartedTransactionFromAddress(testutils.Context(t), resultEtx, fromAddress, ethClient.ConfiguredChainID())
 		require.NoError(t, err)
@@ -1206,7 +1206,7 @@ func TestORM_UpdateTxFatalError(t *testing.T) {
 	_, fromAddress := cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
 
 	t.Run("update successful", func(t *testing.T) {
-		etx := cltest.MustInsertInProgressEthTxWithAttempt(t, txStore, 13, fromAddress)
+		etx := mustInsertInProgressEthTxWithAttempt(t, txStore, 13, fromAddress)
 		etxPretendError := null.StringFrom("no more toilet paper")
 		etx.Error = etxPretendError
 
@@ -1229,7 +1229,7 @@ func TestORM_UpdateTxAttemptInProgressToBroadcast(t *testing.T) {
 	_, fromAddress := cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
 
 	t.Run("update successful", func(t *testing.T) {
-		etx := cltest.MustInsertInProgressEthTxWithAttempt(t, txStore, 13, fromAddress)
+		etx := mustInsertInProgressEthTxWithAttempt(t, txStore, 13, fromAddress)
 		attempt := etx.TxAttempts[0]
 		require.Equal(t, txmgrtypes.TxAttemptInProgress, attempt.State)
 
@@ -1262,7 +1262,7 @@ func TestORM_UpdateTxUnstartedToInProgress(t *testing.T) {
 	nonce := evmtypes.Nonce(123)
 
 	t.Run("update successful", func(t *testing.T) {
-		etx := cltest.MustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID)
+		etx := mustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID)
 		etx.Sequence = &nonce
 		attempt := cltest.NewLegacyEthTxAttempt(t, etx.ID)
 
@@ -1276,7 +1276,7 @@ func TestORM_UpdateTxUnstartedToInProgress(t *testing.T) {
 	})
 
 	t.Run("update fails because tx is removed", func(t *testing.T) {
-		etx := cltest.MustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID)
+		etx := mustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID)
 		etx.Sequence = &nonce
 
 		attempt := cltest.NewLegacyEthTxAttempt(t, etx.ID)
@@ -1296,7 +1296,7 @@ func TestORM_UpdateTxUnstartedToInProgress(t *testing.T) {
 	q = pg.NewQ(db, logger.TestLogger(t), cfg.Database())
 
 	t.Run("update replaces abandoned tx with same hash", func(t *testing.T) {
-		etx := cltest.MustInsertInProgressEthTxWithAttempt(t, txStore, nonce, fromAddress)
+		etx := mustInsertInProgressEthTxWithAttempt(t, txStore, nonce, fromAddress)
 		require.Len(t, etx.TxAttempts, 1)
 
 		zero := models.MustNewDuration(time.Duration(0))
@@ -1314,7 +1314,7 @@ func TestORM_UpdateTxUnstartedToInProgress(t *testing.T) {
 		err := txMgr.XXXTestAbandon(fromAddress) // mark transaction as abandoned
 		require.NoError(t, err)
 
-		etx2 := cltest.MustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID)
+		etx2 := mustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID)
 		etx2.Sequence = &nonce
 		attempt2 := cltest.NewLegacyEthTxAttempt(t, etx2.ID)
 		attempt2.Hash = etx.TxAttempts[0].Hash
@@ -1329,7 +1329,7 @@ func TestORM_UpdateTxUnstartedToInProgress(t *testing.T) {
 
 	// Same flow as previous test, but without calling txMgr.Abandon()
 	t.Run("duplicate tx hash disallowed in tx_eth_attempts", func(t *testing.T) {
-		etx := cltest.MustInsertInProgressEthTxWithAttempt(t, txStore, nonce, fromAddress)
+		etx := mustInsertInProgressEthTxWithAttempt(t, txStore, nonce, fromAddress)
 		require.Len(t, etx.TxAttempts, 1)
 
 		etx.State = txmgrcommon.TxUnstarted
@@ -1357,7 +1357,7 @@ func TestORM_GetTxInProgress(t *testing.T) {
 	})
 
 	t.Run("get 1 in progress eth transaction", func(t *testing.T) {
-		etx := cltest.MustInsertInProgressEthTxWithAttempt(t, txStore, 123, fromAddress)
+		etx := mustInsertInProgressEthTxWithAttempt(t, txStore, 123, fromAddress)
 
 		etxResult, err := txStore.GetTxInProgress(testutils.Context(t), fromAddress)
 		require.NoError(t, err)
@@ -1382,7 +1382,7 @@ func TestORM_HasInProgressTransaction(t *testing.T) {
 	})
 
 	t.Run("has in progress eth transaction", func(t *testing.T) {
-		cltest.MustInsertInProgressEthTxWithAttempt(t, txStore, 123, fromAddress)
+		mustInsertInProgressEthTxWithAttempt(t, txStore, 123, fromAddress)
 
 		exists, err := txStore.HasInProgressTransaction(testutils.Context(t), fromAddress, ethClient.ConfiguredChainID())
 		require.NoError(t, err)
@@ -1422,9 +1422,9 @@ func TestORM_CountUnstartedTransactions(t *testing.T) {
 	_, fromAddress := cltest.MustInsertRandomKey(t, ethKeyStore)
 	_, otherAddress := cltest.MustInsertRandomKey(t, ethKeyStore)
 
-	cltest.MustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID)
-	cltest.MustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID)
-	cltest.MustCreateUnstartedGeneratedTx(t, txStore, otherAddress, &cltest.FixtureChainID)
+	mustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID)
+	mustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID)
+	mustCreateUnstartedGeneratedTx(t, txStore, otherAddress, &cltest.FixtureChainID)
 	cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, txStore, 2, fromAddress)
 
 	count, err := txStore.CountUnstartedTransactions(testutils.Context(t), fromAddress, &cltest.FixtureChainID)
@@ -1456,7 +1456,7 @@ func TestORM_CheckTxQueueCapacity(t *testing.T) {
 
 	// deliberately one extra to exceed limit
 	for i := 0; i <= int(maxUnconfirmedTransactions); i++ {
-		cltest.MustCreateUnstartedTx(t, txStore, otherAddress, toAddress, encodedPayload, feeLimit, value, &cltest.FixtureChainID)
+		mustCreateUnstartedTx(t, txStore, otherAddress, toAddress, encodedPayload, feeLimit, value, &cltest.FixtureChainID)
 	}
 
 	t.Run("with eth_txes from another address returns nil", func(t *testing.T) {
@@ -1465,7 +1465,7 @@ func TestORM_CheckTxQueueCapacity(t *testing.T) {
 	})
 
 	for i := 0; i <= int(maxUnconfirmedTransactions); i++ {
-		cltest.MustInsertFatalErrorEthTx(t, txStore, otherAddress)
+		mustInsertFatalErrorEthTx(t, txStore, otherAddress)
 	}
 
 	t.Run("ignores fatally_errored transactions", func(t *testing.T) {
@@ -1474,7 +1474,7 @@ func TestORM_CheckTxQueueCapacity(t *testing.T) {
 	})
 
 	var n int64
-	cltest.MustInsertInProgressEthTxWithAttempt(t, txStore, evmtypes.Nonce(n), fromAddress)
+	mustInsertInProgressEthTxWithAttempt(t, txStore, evmtypes.Nonce(n), fromAddress)
 	n++
 	cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, txStore, n, fromAddress)
 	n++
@@ -1496,7 +1496,7 @@ func TestORM_CheckTxQueueCapacity(t *testing.T) {
 	})
 
 	for i := 0; i < int(maxUnconfirmedTransactions)-1; i++ {
-		cltest.MustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, feeLimit, value, &cltest.FixtureChainID)
+		mustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, feeLimit, value, &cltest.FixtureChainID)
 	}
 
 	t.Run("with fewer unstarted eth_txes than limit returns nil", func(t *testing.T) {
@@ -1504,14 +1504,14 @@ func TestORM_CheckTxQueueCapacity(t *testing.T) {
 		require.NoError(t, err)
 	})
 
-	cltest.MustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, feeLimit, value, &cltest.FixtureChainID)
+	mustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, feeLimit, value, &cltest.FixtureChainID)
 
 	t.Run("with equal or more unstarted eth_txes than limit returns error", func(t *testing.T) {
 		err := txStore.CheckTxQueueCapacity(testutils.Context(t), fromAddress, maxUnconfirmedTransactions, &cltest.FixtureChainID)
 		require.Error(t, err)
 		require.Contains(t, err.Error(), fmt.Sprintf("cannot create transaction; too many unstarted transactions in the queue (2/%d). WARNING: Hitting EVM.Transactions.MaxQueued", maxUnconfirmedTransactions))
 
-		cltest.MustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, feeLimit, value, &cltest.FixtureChainID)
+		mustCreateUnstartedTx(t, txStore, fromAddress, toAddress, encodedPayload, feeLimit, value, &cltest.FixtureChainID)
 		err = txStore.CheckTxQueueCapacity(testutils.Context(t), fromAddress, maxUnconfirmedTransactions, &cltest.FixtureChainID)
 		require.Error(t, err)
 		require.Contains(t, err.Error(), fmt.Sprintf("cannot create transaction; too many unstarted transactions in the queue (3/%d). WARNING: Hitting EVM.Transactions.MaxQueued", maxUnconfirmedTransactions))
@@ -1533,7 +1533,7 @@ func TestORM_CreateTransaction(t *testing.T) {
 
 	db := pgtest.NewSqlxDB(t)
 	cfg := configtest.NewGeneralConfig(t, nil)
-	txStore := cltest.NewTxStore(t, db, cfg.Database())
+	txStore := newTxStore(t, db, cfg.Database())
 	kst := cltest.NewKeyStore(t, db, cfg.Database())
 
 	_, fromAddress := cltest.MustInsertRandomKey(t, kst.Eth())
@@ -1635,7 +1635,7 @@ func TestORM_PruneUnstartedTxQueue(t *testing.T) {
 
 	db := pgtest.NewSqlxDB(t)
 	cfg := newTestChainScopedConfig(t)
-	txStore := cltest.NewTxStore(t, db, cfg.Database())
+	txStore := newTxStore(t, db, cfg.Database())
 	ethKeyStore := cltest.NewKeyStore(t, db, cfg.Database()).Eth()
 	evmtest.NewEthClientMockWithDefaultChain(t)
 	_, fromAddress := cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
@@ -1644,7 +1644,7 @@ func TestORM_PruneUnstartedTxQueue(t *testing.T) {
 		subject1 := uuid.New()
 		strategy1 := txmgrcommon.NewDropOldestStrategy(subject1, uint32(5), cfg.Database().DefaultQueryTimeout())
 		for i := 0; i < 5; i++ {
-			cltest.MustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID, cltest.EvmTxRequestWithStrategy(strategy1))
+			mustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID, txRequestWithStrategy(strategy1))
 		}
 		testutils.AssertCountPerSubject(t, db, int64(5), subject1)
 	})
@@ -1653,7 +1653,7 @@ func TestORM_PruneUnstartedTxQueue(t *testing.T) {
 		subject2 := uuid.New()
 		strategy2 := txmgrcommon.NewDropOldestStrategy(subject2, uint32(3), cfg.Database().DefaultQueryTimeout())
 		for i := 0; i < 5; i++ {
-			cltest.MustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID, cltest.EvmTxRequestWithStrategy(strategy2))
+			mustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID, txRequestWithStrategy(strategy2))
 		}
 		testutils.AssertCountPerSubject(t, db, int64(3), subject2)
 	})
diff --git a/core/chains/evm/txmgr/reaper_test.go b/core/chains/evm/txmgr/reaper_test.go
index 20cc27a675f..67216c9fd15 100644
--- a/core/chains/evm/txmgr/reaper_test.go
+++ b/core/chains/evm/txmgr/reaper_test.go
@@ -64,7 +64,7 @@ func TestReaper_ReapTxes(t *testing.T) {
 	})
 
 	// Confirmed in block number 5
-	cltest.MustInsertConfirmedEthTxWithReceipt(t, txStore, from, nonce, 5)
+	mustInsertConfirmedEthTxWithReceipt(t, txStore, from, nonce, 5)
 
 	t.Run("skips if threshold=0", func(t *testing.T) {
 		config := txmgrmocks.NewReaperConfig(t)
@@ -119,7 +119,7 @@ func TestReaper_ReapTxes(t *testing.T) {
 		cltest.AssertCount(t, db, "evm.txes", 0)
 	})
 
-	cltest.MustInsertFatalErrorEthTx(t, txStore, from)
+	mustInsertFatalErrorEthTx(t, txStore, from)
 
 	t.Run("deletes errored evm.txes that exceed the age threshold", func(t *testing.T) {
 		config := txmgrmocks.NewReaperConfig(t)
diff --git a/core/chains/evm/txmgr/txmgr_test.go b/core/chains/evm/txmgr/txmgr_test.go
index e27cea137b5..bab18f445bf 100644
--- a/core/chains/evm/txmgr/txmgr_test.go
+++ b/core/chains/evm/txmgr/txmgr_test.go
@@ -1,6 +1,7 @@
 package txmgr_test
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -8,16 +9,19 @@ import (
 	"testing"
 	"time"
 
-	gethcommon "github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
+	"gopkg.in/guregu/null.v4"
 
 	"github.com/jmoiron/sqlx"
 
 	txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr"
+	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
 	commontxmmocks "github.com/smartcontractkit/chainlink/v2/common/txmgr/types/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
@@ -26,6 +30,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
+	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
@@ -34,6 +39,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
 	ksmocks "github.com/smartcontractkit/chainlink/v2/core/services/keystore/mocks"
+	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -145,7 +151,7 @@ func TestTxm_CreateTransaction(t *testing.T) {
 		assert.Equal(t, subject, etx.Subject.UUID)
 	})
 
-	cltest.MustInsertUnconfirmedEthTxWithInsufficientEthAttempt(t, txStore, 0, fromAddress)
+	mustInsertUnconfirmedEthTxWithInsufficientEthAttempt(t, txStore, 0, fromAddress)
 
 	t.Run("with queue at capacity does not insert eth_tx", func(t *testing.T) {
 		evmConfig.MaxQueued = uint64(1)
@@ -246,8 +252,8 @@ func TestTxm_CreateTransaction(t *testing.T) {
 		// max uint256 is 1.1579209e+77
 		testDefaultGlobalSubID := crypto.Keccak256Hash([]byte("sub id")).String()
 		jobID := int32(25)
-		requestID := gethcommon.HexToHash("abcd")
-		requestTxHash := gethcommon.HexToHash("dcba")
+		requestID := common.HexToHash("abcd")
+		requestTxHash := common.HexToHash("dcba")
 		meta := &txmgr.TxMeta{
 			JobID:         &jobID,
 			RequestID:     &requestID,
@@ -393,7 +399,7 @@ func TestTxm_CreateTransaction_OutOfEth(t *testing.T) {
 		payload := cltest.MustRandomBytes(t, 100)
 
 		evmConfig.MaxQueued = uint64(1)
-		cltest.MustInsertUnconfirmedEthTxWithInsufficientEthAttempt(t, txStore, 0, otherKey.Address)
+		mustInsertUnconfirmedEthTxWithInsufficientEthAttempt(t, txStore, 0, otherKey.Address)
 		strategy := newMockTxStrategy(t)
 		strategy.On("Subject").Return(uuid.NullUUID{})
 		strategy.On("PruneQueue", mock.Anything, mock.Anything).Return(int64(0), nil)
@@ -417,7 +423,7 @@ func TestTxm_CreateTransaction_OutOfEth(t *testing.T) {
 		payload := cltest.MustRandomBytes(t, 100)
 		evmConfig.MaxQueued = uint64(1)
 
-		cltest.MustInsertUnconfirmedEthTxWithInsufficientEthAttempt(t, txStore, 0, thisKey.Address)
+		mustInsertUnconfirmedEthTxWithInsufficientEthAttempt(t, txStore, 0, thisKey.Address)
 		strategy := newMockTxStrategy(t)
 		strategy.On("Subject").Return(uuid.NullUUID{})
 		strategy.On("PruneQueue", mock.Anything, mock.Anything).Return(int64(0), nil)
@@ -471,7 +477,7 @@ func TestTxm_Lifecycle(t *testing.T) {
 	evmConfig.ReaperThreshold = 1 * time.Hour
 	evmConfig.ReaperInterval = 1 * time.Hour
 
-	kst.On("EnabledAddressesForChain", &cltest.FixtureChainID).Return([]gethcommon.Address{}, nil)
+	kst.On("EnabledAddressesForChain", &cltest.FixtureChainID).Return([]common.Address{}, nil)
 
 	keyChangeCh := make(chan struct{})
 	unsub := cltest.NewAwaiter()
@@ -495,9 +501,9 @@ func TestTxm_Lifecycle(t *testing.T) {
 
 	keyState := cltest.MustGenerateRandomKeyState(t)
 
-	addr := []gethcommon.Address{keyState.Address.Address()}
+	addr := []common.Address{keyState.Address.Address()}
 	kst.On("EnabledAddressesForChain", &cltest.FixtureChainID).Return(addr, nil)
-	ethClient.On("PendingNonceAt", mock.AnythingOfType("*context.cancelCtx"), gethcommon.Address{}).Return(uint64(0), nil).Maybe()
+	ethClient.On("PendingNonceAt", mock.AnythingOfType("*context.cancelCtx"), common.Address{}).Return(uint64(0), nil).Maybe()
 	keyChangeCh <- struct{}{}
 
 	require.NoError(t, txm.Close())
@@ -568,3 +574,244 @@ func TestTxm_Reset(t *testing.T) {
 		assert.Equal(t, 0, count)
 	})
 }
+
+func newTxStore(t *testing.T, db *sqlx.DB, cfg pg.QConfig) txmgr.EvmTxStore {
+	return txmgr.NewTxStore(db, logger.TestLogger(t), cfg)
+}
+
+func newEthReceipt(blockNumber int64, blockHash common.Hash, txHash common.Hash, status uint64) txmgr.Receipt {
+	transactionIndex := uint(cltest.NewRandomPositiveInt64())
+
+	receipt := evmtypes.Receipt{
+		BlockNumber:      big.NewInt(blockNumber),
+		BlockHash:        blockHash,
+		TxHash:           txHash,
+		TransactionIndex: transactionIndex,
+		Status:           status,
+	}
+
+	r := txmgr.Receipt{
+		BlockNumber:      blockNumber,
+		BlockHash:        blockHash,
+		TxHash:           txHash,
+		TransactionIndex: transactionIndex,
+		Receipt:          receipt,
+	}
+	return r
+}
+
+func mustInsertEthReceipt(t *testing.T, txStore txmgr.TestEvmTxStore, blockNumber int64, blockHash common.Hash, txHash common.Hash) txmgr.Receipt {
+	r := newEthReceipt(blockNumber, blockHash, txHash, 0x1)
+	id, err := txStore.InsertReceipt(&r.Receipt)
+	require.NoError(t, err)
+	r.ID = id
+	return r
+}
+
+func mustInsertRevertedEthReceipt(t *testing.T, txStore txmgr.TestEvmTxStore, blockNumber int64, blockHash common.Hash, txHash common.Hash) txmgr.Receipt {
+	r := newEthReceipt(blockNumber, blockHash, txHash, 0x0)
+	id, err := txStore.InsertReceipt(&r.Receipt)
+	require.NoError(t, err)
+	r.ID = id
+	return r
+}
+
+// Inserts into evm.receipts but does not update evm.txes or evm.tx_attempts
+func mustInsertConfirmedEthTxWithReceipt(t *testing.T, txStore txmgr.TestEvmTxStore, fromAddress common.Address, nonce, blockNum int64) (etx txmgr.Tx) {
+	etx = cltest.MustInsertConfirmedEthTxWithLegacyAttempt(t, txStore, nonce, blockNum, fromAddress)
+	mustInsertEthReceipt(t, txStore, blockNum, utils.NewHash(), etx.TxAttempts[0].Hash)
+	return etx
+}
+
+func mustInsertConfirmedEthTxBySaveFetchedReceipts(t *testing.T, txStore txmgr.TestEvmTxStore, fromAddress common.Address, nonce int64, blockNum int64, chainID big.Int) (etx txmgr.Tx) {
+	etx = cltest.MustInsertConfirmedEthTxWithLegacyAttempt(t, txStore, nonce, blockNum, fromAddress)
+	receipt := evmtypes.Receipt{
+		TxHash:           etx.TxAttempts[0].Hash,
+		BlockHash:        utils.NewHash(),
+		BlockNumber:      big.NewInt(nonce),
+		TransactionIndex: uint(1),
+	}
+	err := txStore.SaveFetchedReceipts(testutils.Context(t), []*evmtypes.Receipt{&receipt}, &chainID)
+	require.NoError(t, err)
+	return etx
+}
+
+func mustInsertFatalErrorEthTx(t *testing.T, txStore txmgr.TestEvmTxStore, fromAddress common.Address) txmgr.Tx {
+	etx := cltest.NewEthTx(fromAddress)
+	etx.Error = null.StringFrom("something exploded")
+	etx.State = txmgrcommon.TxFatalError
+
+	require.NoError(t, txStore.InsertTx(&etx))
+	return etx
+}
+
+func mustInsertUnconfirmedEthTxWithAttemptState(t *testing.T, txStore txmgr.TestEvmTxStore, nonce int64, fromAddress common.Address, txAttemptState txmgrtypes.TxAttemptState, opts ...interface{}) txmgr.Tx {
+	etx := cltest.MustInsertUnconfirmedEthTx(t, txStore, nonce, fromAddress, opts...)
+	attempt := cltest.NewLegacyEthTxAttempt(t, etx.ID)
+
+	tx := types.NewTransaction(uint64(nonce), testutils.NewAddress(), big.NewInt(142), 242, big.NewInt(342), []byte{1, 2, 3})
+	rlp := new(bytes.Buffer)
+	require.NoError(t, tx.EncodeRLP(rlp))
+	attempt.SignedRawTx = rlp.Bytes()
+
+	attempt.State = txAttemptState
+	require.NoError(t, txStore.InsertTxAttempt(&attempt))
+	etx, err := txStore.FindTxWithAttempts(etx.ID)
+	require.NoError(t, err)
+	return etx
+}
+
+func mustInsertUnconfirmedEthTxWithBroadcastDynamicFeeAttempt(t *testing.T, txStore txmgr.TestEvmTxStore, nonce int64, fromAddress common.Address, opts ...interface{}) txmgr.Tx {
+	etx := cltest.MustInsertUnconfirmedEthTx(t, txStore, nonce, fromAddress, opts...)
+	attempt := cltest.NewDynamicFeeEthTxAttempt(t, etx.ID)
+
+	addr := testutils.NewAddress()
+	dtx := types.DynamicFeeTx{
+		ChainID:   big.NewInt(0),
+		Nonce:     uint64(nonce),
+		GasTipCap: big.NewInt(1),
+		GasFeeCap: big.NewInt(1),
+		Gas:       242,
+		To:        &addr,
+		Value:     big.NewInt(342),
+		Data:      []byte{2, 3, 4},
+	}
+	tx := types.NewTx(&dtx)
+	rlp := new(bytes.Buffer)
+	require.NoError(t, tx.EncodeRLP(rlp))
+	attempt.SignedRawTx = rlp.Bytes()
+
+	attempt.State = txmgrtypes.TxAttemptBroadcast
+	require.NoError(t, txStore.InsertTxAttempt(&attempt))
+	etx, err := txStore.FindTxWithAttempts(etx.ID)
+	require.NoError(t, err)
+	return etx
+}
+
+func mustInsertUnconfirmedEthTxWithInsufficientEthAttempt(t *testing.T, txStore txmgr.TestEvmTxStore, nonce int64, fromAddress common.Address) txmgr.Tx {
+	timeNow := time.Now()
+	etx := cltest.NewEthTx(fromAddress)
+
+	etx.BroadcastAt = &timeNow
+	etx.InitialBroadcastAt = &timeNow
+	n := evmtypes.Nonce(nonce)
+	etx.Sequence = &n
+	etx.State = txmgrcommon.TxUnconfirmed
+	require.NoError(t, txStore.InsertTx(&etx))
+	attempt := cltest.NewLegacyEthTxAttempt(t, etx.ID)
+
+	tx := types.NewTransaction(uint64(nonce), testutils.NewAddress(), big.NewInt(142), 242, big.NewInt(342), []byte{1, 2, 3})
+	rlp := new(bytes.Buffer)
+	require.NoError(t, tx.EncodeRLP(rlp))
+	attempt.SignedRawTx = rlp.Bytes()
+
+	attempt.State = txmgrtypes.TxAttemptInsufficientFunds
+	require.NoError(t, txStore.InsertTxAttempt(&attempt))
+	etx, err := txStore.FindTxWithAttempts(etx.ID)
+	require.NoError(t, err)
+	return etx
+}
+
+func mustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
+	t *testing.T, txStore txmgr.TestEvmTxStore, nonce int64, broadcastBeforeBlockNum int64,
+	broadcastAt time.Time, fromAddress common.Address) txmgr.Tx {
+	etx := cltest.NewEthTx(fromAddress)
+
+	etx.BroadcastAt = &broadcastAt
+	etx.InitialBroadcastAt = &broadcastAt
+	n := evmtypes.Nonce(nonce)
+	etx.Sequence = &n
+	etx.State = txmgrcommon.TxConfirmedMissingReceipt
+	require.NoError(t, txStore.InsertTx(&etx))
+	attempt := cltest.NewLegacyEthTxAttempt(t, etx.ID)
+	attempt.BroadcastBeforeBlockNum = &broadcastBeforeBlockNum
+	attempt.State = txmgrtypes.TxAttemptBroadcast
+	require.NoError(t, txStore.InsertTxAttempt(&attempt))
+	etx.TxAttempts = append(etx.TxAttempts, attempt)
+	return etx
+}
+
+func mustInsertInProgressEthTxWithAttempt(t *testing.T, txStore txmgr.TestEvmTxStore, nonce evmtypes.Nonce, fromAddress common.Address) txmgr.Tx {
+	etx := cltest.NewEthTx(fromAddress)
+
+	etx.Sequence = &nonce
+	etx.State = txmgrcommon.TxInProgress
+	require.NoError(t, txStore.InsertTx(&etx))
+	attempt := cltest.NewLegacyEthTxAttempt(t, etx.ID)
+	tx := types.NewTransaction(uint64(nonce), testutils.NewAddress(), big.NewInt(142), 242, big.NewInt(342), []byte{1, 2, 3})
+	rlp := new(bytes.Buffer)
+	require.NoError(t, tx.EncodeRLP(rlp))
+	attempt.SignedRawTx = rlp.Bytes()
+	attempt.State = txmgrtypes.TxAttemptInProgress
+	require.NoError(t, txStore.InsertTxAttempt(&attempt))
+	etx, err := txStore.FindTxWithAttempts(etx.ID)
+	require.NoError(t, err)
+	return etx
+}
+
+func mustCreateUnstartedGeneratedTx(t testing.TB, txStore txmgr.EvmTxStore, fromAddress common.Address, chainID *big.Int, opts ...func(*txmgr.TxRequest)) (tx txmgr.Tx) {
+	txRequest := txmgr.TxRequest{
+		FromAddress: fromAddress,
+	}
+
+	// Apply the default options
+	withDefaults()(&txRequest)
+	// Apply the optional parameters
+	for _, opt := range opts {
+		opt(&txRequest)
+	}
+	return mustCreateUnstartedTxFromEvmTxRequest(t, txStore, txRequest, chainID)
+}
+
+func withDefaults() func(*txmgr.TxRequest) {
+	return func(tx *txmgr.TxRequest) {
+		tx.ToAddress = testutils.NewAddress()
+		tx.EncodedPayload = []byte{1, 2, 3}
+		tx.Value = big.Int(assets.NewEthValue(142))
+		tx.FeeLimit = uint32(1000000000)
+		tx.Strategy = txmgrcommon.NewSendEveryStrategy()
+		// Set default values for other fields if needed
+	}
+}
+
+func mustCreateUnstartedTx(t testing.TB, txStore txmgr.EvmTxStore, fromAddress common.Address, toAddress common.Address, encodedPayload []byte, gasLimit uint32, value big.Int, chainID *big.Int, opts ...interface{}) (tx txmgr.Tx) {
+	txRequest := txmgr.TxRequest{
+		FromAddress:    fromAddress,
+		ToAddress:      toAddress,
+		EncodedPayload: encodedPayload,
+		Value:          value,
+		FeeLimit:       gasLimit,
+		Strategy:       txmgrcommon.NewSendEveryStrategy(),
+	}
+
+	return mustCreateUnstartedTxFromEvmTxRequest(t, txStore, txRequest, chainID)
+}
+
+func mustCreateUnstartedTxFromEvmTxRequest(t testing.TB, txStore txmgr.EvmTxStore, txRequest txmgr.TxRequest, chainID *big.Int) (tx txmgr.Tx) {
+	tx, err := txStore.CreateTransaction(testutils.Context(t), txRequest, chainID)
+	require.NoError(t, err)
+	return tx
+}
+
+func txRequestWithStrategy(strategy txmgrtypes.TxStrategy) func(*txmgr.TxRequest) {
+	return func(tx *txmgr.TxRequest) {
+		tx.Strategy = strategy
+	}
+}
+
+func txRequestWithChecker(checker txmgr.TransmitCheckerSpec) func(*txmgr.TxRequest) {
+	return func(tx *txmgr.TxRequest) {
+		tx.Checker = checker
+	}
+}
+func txRequestWithValue(value big.Int) func(*txmgr.TxRequest) {
+	return func(tx *txmgr.TxRequest) {
+		tx.Value = value
+	}
+}
+
+func txRequestWithIdempotencyKey(idempotencyKey string) func(*txmgr.TxRequest) {
+	return func(tx *txmgr.TxRequest) {
+		tx.IdempotencyKey = &idempotencyKey
+	}
+}
diff --git a/core/cmd/admin_commands_test.go b/core/cmd/admin_commands_test.go
index 954e3577d3d..fc4c1b7e959 100644
--- a/core/cmd/admin_commands_test.go
+++ b/core/cmd/admin_commands_test.go
@@ -43,7 +43,7 @@ func TestShell_CreateUser(t *testing.T) {
 		test := tt
 		t.Run(test.name, func(t *testing.T) {
 			set := flag.NewFlagSet("test", 0)
-			cltest.FlagSetApplyFromAction(client.CreateUser, set, "")
+			flagSetApplyFromAction(client.CreateUser, set, "")
 
 			require.NoError(t, set.Set("email", test.email))
 			require.NoError(t, set.Set("role", test.role))
@@ -83,7 +83,7 @@ func TestShell_ChangeRole(t *testing.T) {
 		test := tt
 		t.Run(test.name, func(t *testing.T) {
 			set := flag.NewFlagSet("test", 0)
-			cltest.FlagSetApplyFromAction(client.ChangeRole, set, "")
+			flagSetApplyFromAction(client.ChangeRole, set, "")
 
 			require.NoError(t, set.Set("email", test.email))
 			require.NoError(t, set.Set("new-role", test.role))
@@ -118,7 +118,7 @@ func TestShell_DeleteUser(t *testing.T) {
 		test := tt
 		t.Run(test.name, func(t *testing.T) {
 			set := flag.NewFlagSet("test", 0)
-			cltest.FlagSetApplyFromAction(client.DeleteUser, set, "")
+			flagSetApplyFromAction(client.DeleteUser, set, "")
 
 			require.NoError(t, set.Set("email", test.email))
 			c := cli.NewContext(nil, set, nil)
@@ -138,7 +138,7 @@ func TestShell_ListUsers(t *testing.T) {
 	require.NoError(t, app.AuthenticationProvider().CreateUser(&user))
 
 	set := flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.ListUsers, set, "")
+	flagSetApplyFromAction(client.ListUsers, set, "")
 	c := cli.NewContext(nil, set, nil)
 
 	buffer := bytes.NewBufferString("")
diff --git a/core/cmd/blocks_commands_test.go b/core/cmd/blocks_commands_test.go
index a972df67d64..d0c0e118f9d 100644
--- a/core/cmd/blocks_commands_test.go
+++ b/core/cmd/blocks_commands_test.go
@@ -8,7 +8,6 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/urfave/cli"
 
-	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
@@ -24,7 +23,7 @@ func Test_ReplayFromBlock(t *testing.T) {
 	client, _ := app.NewShellAndRenderer()
 
 	set := flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.ReplayFromBlock, set, "")
+	flagSetApplyFromAction(client.ReplayFromBlock, set, "")
 
 	//Incorrect block number
 	require.NoError(t, set.Set("block-number", "0"))
diff --git a/core/cmd/bridge_commands_test.go b/core/cmd/bridge_commands_test.go
index 4f043ff87e8..fae5d68e678 100644
--- a/core/cmd/bridge_commands_test.go
+++ b/core/cmd/bridge_commands_test.go
@@ -111,7 +111,7 @@ func TestShell_ShowBridge(t *testing.T) {
 	require.NoError(t, app.BridgeORM().CreateBridgeType(bt))
 
 	set := flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.ShowBridge, set, "")
+	flagSetApplyFromAction(client.ShowBridge, set, "")
 
 	require.NoError(t, set.Parse([]string{bt.Name.String()}))
 
@@ -148,7 +148,7 @@ func TestShell_CreateBridge(t *testing.T) {
 		test := tt
 		t.Run(test.name, func(t *testing.T) {
 			set := flag.NewFlagSet("bridge", 0)
-			cltest.FlagSetApplyFromAction(client.CreateBridge, set, "")
+			flagSetApplyFromAction(client.CreateBridge, set, "")
 
 			require.NoError(t, set.Parse([]string{test.param}))
 
@@ -177,7 +177,7 @@ func TestShell_RemoveBridge(t *testing.T) {
 	require.NoError(t, err)
 
 	set := flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.RemoveBridge, set, "")
+	flagSetApplyFromAction(client.RemoveBridge, set, "")
 
 	require.NoError(t, set.Parse([]string{bt.Name.String()}))
 
diff --git a/core/cmd/cosmos_keys_commands_test.go b/core/cmd/cosmos_keys_commands_test.go
index 05a26fe84d7..2cab11379d0 100644
--- a/core/cmd/cosmos_keys_commands_test.go
+++ b/core/cmd/cosmos_keys_commands_test.go
@@ -95,7 +95,7 @@ func TestShell_CosmosKeys(t *testing.T) {
 		require.NoError(t, err)
 		requireCosmosKeyCount(t, app, 1)
 		set := flag.NewFlagSet("test", 0)
-		cltest.FlagSetApplyFromAction(cmd.NewCosmosKeysClient(client).DeleteKey, set, "cosmos")
+		flagSetApplyFromAction(cmd.NewCosmosKeysClient(client).DeleteKey, set, "cosmos")
 
 		strID := key.ID()
 		require.NoError(tt, set.Set("yes", "true"))
@@ -121,7 +121,7 @@ func TestShell_CosmosKeys(t *testing.T) {
 
 		// Export test invalid id
 		set := flag.NewFlagSet("test Cosmos export", 0)
-		cltest.FlagSetApplyFromAction(cmd.NewCosmosKeysClient(client).ExportKey, set, "cosmos")
+		flagSetApplyFromAction(cmd.NewCosmosKeysClient(client).ExportKey, set, "cosmos")
 
 		require.NoError(tt, set.Parse([]string{"0"}))
 		require.NoError(tt, set.Set("new-password", "../internal/fixtures/incorrect_password.txt"))
@@ -135,7 +135,7 @@ func TestShell_CosmosKeys(t *testing.T) {
 
 		// Export test
 		set = flag.NewFlagSet("test Cosmos export", 0)
-		cltest.FlagSetApplyFromAction(cmd.NewCosmosKeysClient(client).ExportKey, set, "cosmos")
+		flagSetApplyFromAction(cmd.NewCosmosKeysClient(client).ExportKey, set, "cosmos")
 
 		require.NoError(tt, set.Parse([]string{fmt.Sprint(key.ID())}))
 		require.NoError(tt, set.Set("new-password", "../internal/fixtures/incorrect_password.txt"))
@@ -150,7 +150,7 @@ func TestShell_CosmosKeys(t *testing.T) {
 		requireCosmosKeyCount(t, app, 0)
 
 		set = flag.NewFlagSet("test Cosmos import", 0)
-		cltest.FlagSetApplyFromAction(cmd.NewCosmosKeysClient(client).ImportKey, set, "cosmos")
+		flagSetApplyFromAction(cmd.NewCosmosKeysClient(client).ImportKey, set, "cosmos")
 
 		require.NoError(tt, set.Parse([]string{keyName}))
 		require.NoError(tt, set.Set("old-password", "../internal/fixtures/incorrect_password.txt"))
diff --git a/core/cmd/cosmos_transaction_commands_test.go b/core/cmd/cosmos_transaction_commands_test.go
index f54ccaf4a68..5b5454eed44 100644
--- a/core/cmd/cosmos_transaction_commands_test.go
+++ b/core/cmd/cosmos_transaction_commands_test.go
@@ -21,7 +21,6 @@ import (
 	"github.com/smartcontractkit/chainlink-cosmos/pkg/cosmos/params"
 
 	"github.com/smartcontractkit/chainlink/v2/core/cmd"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/cosmostest"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/cosmoskey"
@@ -93,7 +92,7 @@ func TestShell_SendCosmosCoins(t *testing.T) {
 			require.NoError(t, err)
 
 			set := flag.NewFlagSet("sendcosmoscoins", 0)
-			cltest.FlagSetApplyFromAction(client.CosmosSendNativeToken, set, "cosmos")
+			flagSetApplyFromAction(client.CosmosSendNativeToken, set, "cosmos")
 
 			require.NoError(t, set.Set("id", chainID))
 			require.NoError(t, set.Parse([]string{nativeToken, tt.amount, from.Address.String(), to.Address.String()}))
diff --git a/core/cmd/csa_keys_commands_test.go b/core/cmd/csa_keys_commands_test.go
index 23749476ac8..869608fa72b 100644
--- a/core/cmd/csa_keys_commands_test.go
+++ b/core/cmd/csa_keys_commands_test.go
@@ -98,7 +98,7 @@ func TestShell_ImportExportCsaKey(t *testing.T) {
 
 	// Export test invalid id
 	set := flag.NewFlagSet("test CSA export", 0)
-	cltest.FlagSetApplyFromAction(client.ExportCSAKey, set, "")
+	flagSetApplyFromAction(client.ExportCSAKey, set, "")
 
 	require.NoError(t, set.Parse([]string{"0"}))
 	require.NoError(t, set.Set("new-password", "../internal/fixtures/incorrect_password.txt"))
@@ -111,7 +111,7 @@ func TestShell_ImportExportCsaKey(t *testing.T) {
 
 	// Export test
 	set = flag.NewFlagSet("test CSA export", 0)
-	cltest.FlagSetApplyFromAction(client.ExportCSAKey, set, "")
+	flagSetApplyFromAction(client.ExportCSAKey, set, "")
 
 	require.NoError(t, set.Parse([]string{fmt.Sprint(key.ID())}))
 	require.NoError(t, set.Set("new-password", "../internal/fixtures/incorrect_password.txt"))
@@ -127,7 +127,7 @@ func TestShell_ImportExportCsaKey(t *testing.T) {
 
 	//Import test
 	set = flag.NewFlagSet("test CSA import", 0)
-	cltest.FlagSetApplyFromAction(client.ImportCSAKey, set, "")
+	flagSetApplyFromAction(client.ImportCSAKey, set, "")
 
 	require.NoError(t, set.Parse([]string{keyName}))
 	require.NoError(t, set.Set("old-password", "../internal/fixtures/incorrect_password.txt"))
diff --git a/core/cmd/dkgencrypt_keys_commands_test.go b/core/cmd/dkgencrypt_keys_commands_test.go
index 61e343569cb..a7505ce46dc 100644
--- a/core/cmd/dkgencrypt_keys_commands_test.go
+++ b/core/cmd/dkgencrypt_keys_commands_test.go
@@ -94,7 +94,7 @@ func TestShell_DKGEncryptKeys(t *testing.T) {
 		assert.NoError(tt, err)
 		requireDKGEncryptKeyCount(tt, app, 1)
 		set := flag.NewFlagSet("test", 0)
-		cltest.FlagSetApplyFromAction(cmd.NewDKGEncryptKeysClient(client).DeleteKey, set, "")
+		flagSetApplyFromAction(cmd.NewDKGEncryptKeysClient(client).DeleteKey, set, "")
 
 		require.NoError(tt, set.Set("yes", "true"))
 
@@ -122,7 +122,7 @@ func TestShell_DKGEncryptKeys(t *testing.T) {
 
 		// Export test invalid id
 		set := flag.NewFlagSet("test DKGEncrypt export", 0)
-		cltest.FlagSetApplyFromAction(cmd.NewDKGEncryptKeysClient(client).ExportKey, set, "")
+		flagSetApplyFromAction(cmd.NewDKGEncryptKeysClient(client).ExportKey, set, "")
 
 		require.NoError(tt, set.Parse([]string{"0"}))
 		require.NoError(tt, set.Set("new-password", "../internal/fixtures/incorrect_password.txt"))
@@ -135,7 +135,7 @@ func TestShell_DKGEncryptKeys(t *testing.T) {
 
 		// Export test
 		set = flag.NewFlagSet("test DKGEncrypt export", 0)
-		cltest.FlagSetApplyFromAction(cmd.NewDKGEncryptKeysClient(client).ExportKey, set, "")
+		flagSetApplyFromAction(cmd.NewDKGEncryptKeysClient(client).ExportKey, set, "")
 
 		require.NoError(tt, set.Parse([]string{fmt.Sprint(key.ID())}))
 		require.NoError(tt, set.Set("new-password", "../internal/fixtures/incorrect_password.txt"))
@@ -151,7 +151,7 @@ func TestShell_DKGEncryptKeys(t *testing.T) {
 
 		//Import test
 		set = flag.NewFlagSet("test DKGEncrypt import", 0)
-		cltest.FlagSetApplyFromAction(cmd.NewDKGEncryptKeysClient(client).ImportKey, set, "")
+		flagSetApplyFromAction(cmd.NewDKGEncryptKeysClient(client).ImportKey, set, "")
 
 		require.NoError(tt, set.Parse([]string{keyName}))
 		require.NoError(tt, set.Set("old-password", "../internal/fixtures/incorrect_password.txt"))
diff --git a/core/cmd/dkgsign_keys_commands_test.go b/core/cmd/dkgsign_keys_commands_test.go
index 27413e6ae7b..1948800d677 100644
--- a/core/cmd/dkgsign_keys_commands_test.go
+++ b/core/cmd/dkgsign_keys_commands_test.go
@@ -94,7 +94,7 @@ func TestShell_DKGSignKeys(t *testing.T) {
 		assert.NoError(tt, err)
 		requireDKGSignKeyCount(tt, app, 1)
 		set := flag.NewFlagSet("test", 0)
-		cltest.FlagSetApplyFromAction(cmd.NewDKGSignKeysClient(client).DeleteKey, set, "")
+		flagSetApplyFromAction(cmd.NewDKGSignKeysClient(client).DeleteKey, set, "")
 
 		require.NoError(tt, set.Set("yes", "true"))
 		strID := key.ID()
@@ -121,7 +121,7 @@ func TestShell_DKGSignKeys(t *testing.T) {
 
 		// Export test invalid id
 		set := flag.NewFlagSet("test DKGSign export", 0)
-		cltest.FlagSetApplyFromAction(cmd.NewDKGSignKeysClient(client).ExportKey, set, "")
+		flagSetApplyFromAction(cmd.NewDKGSignKeysClient(client).ExportKey, set, "")
 
 		require.NoError(tt, set.Parse([]string{"0"}))
 		require.NoError(tt, set.Set("new-password", "../internal/fixtures/incorrect_password.txt"))
@@ -134,7 +134,7 @@ func TestShell_DKGSignKeys(t *testing.T) {
 
 		// Export test
 		set = flag.NewFlagSet("test DKGSign export", 0)
-		cltest.FlagSetApplyFromAction(cmd.NewDKGSignKeysClient(client).ExportKey, set, "")
+		flagSetApplyFromAction(cmd.NewDKGSignKeysClient(client).ExportKey, set, "")
 
 		require.NoError(tt, set.Parse([]string{fmt.Sprint(key.ID())}))
 		require.NoError(tt, set.Set("new-password", "../internal/fixtures/incorrect_password.txt"))
@@ -149,7 +149,7 @@ func TestShell_DKGSignKeys(t *testing.T) {
 		requireDKGSignKeyCount(tt, app, 0)
 
 		set = flag.NewFlagSet("test DKGSign import", 0)
-		cltest.FlagSetApplyFromAction(cmd.NewDKGSignKeysClient(client).ImportKey, set, "")
+		flagSetApplyFromAction(cmd.NewDKGSignKeysClient(client).ImportKey, set, "")
 
 		require.NoError(tt, set.Parse([]string{keyName}))
 		require.NoError(tt, set.Set("old-password", "../internal/fixtures/incorrect_password.txt"))
diff --git a/core/cmd/eth_keys_commands_test.go b/core/cmd/eth_keys_commands_test.go
index 293a2d3f6da..3eb45e27bd0 100644
--- a/core/cmd/eth_keys_commands_test.go
+++ b/core/cmd/eth_keys_commands_test.go
@@ -191,7 +191,7 @@ func TestShell_CreateETHKey(t *testing.T) {
 	id := big.NewInt(0)
 
 	set := flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.CreateETHKey, set, "")
+	flagSetApplyFromAction(client.CreateETHKey, set, "")
 
 	require.NoError(t, set.Set("evm-chain-id", testutils.FixtureChainID.String()))
 
@@ -224,7 +224,7 @@ func TestShell_DeleteETHKey(t *testing.T) {
 
 	// Delete the key
 	set := flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.DeleteETHKey, set, "")
+	flagSetApplyFromAction(client.DeleteETHKey, set, "")
 
 	require.NoError(t, set.Set("yes", "true"))
 	require.NoError(t, set.Parse([]string{key.Address.Hex()}))
@@ -257,7 +257,7 @@ func TestShell_ImportExportETHKey_NoChains(t *testing.T) {
 	ethKeyStore := app.GetKeyStore().Eth()
 
 	set := flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.RemoteLogin, set, "")
+	flagSetApplyFromAction(client.RemoteLogin, set, "")
 
 	require.NoError(t, set.Set("file", "internal/fixtures/apicredentials"))
 	require.NoError(t, set.Set("bypass-version-check", "true"))
@@ -281,7 +281,7 @@ func TestShell_ImportExportETHKey_NoChains(t *testing.T) {
 	defer os.RemoveAll(testdir)
 	keyfilepath := filepath.Join(testdir, "key")
 	set = flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.ExportETHKey, set, "")
+	flagSetApplyFromAction(client.ExportETHKey, set, "")
 
 	require.NoError(t, set.Set("new-password", "../internal/fixtures/incorrect_password.txt"))
 	require.NoError(t, set.Set("output", keyfilepath))
@@ -293,7 +293,7 @@ func TestShell_ImportExportETHKey_NoChains(t *testing.T) {
 
 	// Delete the key
 	set = flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.DeleteETHKey, set, "")
+	flagSetApplyFromAction(client.DeleteETHKey, set, "")
 
 	require.NoError(t, set.Set("yes", "true"))
 	require.NoError(t, set.Parse([]string{address}))
@@ -308,7 +308,7 @@ func TestShell_ImportExportETHKey_NoChains(t *testing.T) {
 
 	// Import the key
 	set = flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.ImportETHKey, set, "")
+	flagSetApplyFromAction(client.ImportETHKey, set, "")
 
 	require.NoError(t, set.Set("evmChainID", testutils.FixtureChainID.String()))
 	require.NoError(t, set.Set("old-password", "../internal/fixtures/incorrect_password.txt"))
@@ -321,7 +321,7 @@ func TestShell_ImportExportETHKey_NoChains(t *testing.T) {
 	r.Renders = nil
 
 	set = flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.ListETHKeys, set, "")
+	flagSetApplyFromAction(client.ListETHKeys, set, "")
 	c = cli.NewContext(nil, set, nil)
 	err = client.ListETHKeys(c)
 	require.NoError(t, err)
@@ -332,7 +332,7 @@ func TestShell_ImportExportETHKey_NoChains(t *testing.T) {
 	// Export test invalid id
 	keyName := keyNameForTest(t)
 	set = flag.NewFlagSet("test Eth export invalid id", 0)
-	cltest.FlagSetApplyFromAction(client.ExportETHKey, set, "")
+	flagSetApplyFromAction(client.ExportETHKey, set, "")
 
 	require.NoError(t, set.Parse([]string{"999"}))
 	require.NoError(t, set.Set("new-password", "../internal/fixtures/apicredentials"))
@@ -365,7 +365,7 @@ func TestShell_ImportExportETHKey_WithChains(t *testing.T) {
 	ethClient.On("LINKBalance", mock.Anything, mock.Anything, mock.Anything).Return(commonassets.NewLinkFromJuels(42), nil)
 
 	set := flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.RemoteLogin, set, "")
+	flagSetApplyFromAction(client.RemoteLogin, set, "")
 
 	require.NoError(t, set.Set("file", "internal/fixtures/apicredentials"))
 	require.NoError(t, set.Set("bypass-version-check", "true"))
@@ -389,7 +389,7 @@ func TestShell_ImportExportETHKey_WithChains(t *testing.T) {
 	defer os.RemoveAll(testdir)
 	keyfilepath := filepath.Join(testdir, "key")
 	set = flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.ExportETHKey, set, "")
+	flagSetApplyFromAction(client.ExportETHKey, set, "")
 
 	require.NoError(t, set.Set("new-password", "../internal/fixtures/incorrect_password.txt"))
 	require.NoError(t, set.Set("output", keyfilepath))
@@ -401,7 +401,7 @@ func TestShell_ImportExportETHKey_WithChains(t *testing.T) {
 
 	// Delete the key
 	set = flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.DeleteETHKey, set, "")
+	flagSetApplyFromAction(client.DeleteETHKey, set, "")
 
 	require.NoError(t, set.Set("yes", "true"))
 	require.NoError(t, set.Parse([]string{address}))
@@ -414,7 +414,7 @@ func TestShell_ImportExportETHKey_WithChains(t *testing.T) {
 
 	// Import the key
 	set = flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.ImportETHKey, set, "")
+	flagSetApplyFromAction(client.ImportETHKey, set, "")
 
 	require.NoError(t, set.Set("evmChainID", testutils.FixtureChainID.String()))
 	require.NoError(t, set.Set("evmChainID", testutils.FixtureChainID.String()))
@@ -428,7 +428,7 @@ func TestShell_ImportExportETHKey_WithChains(t *testing.T) {
 	r.Renders = nil
 
 	set = flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.ListETHKeys, set, "")
+	flagSetApplyFromAction(client.ListETHKeys, set, "")
 	c = cli.NewContext(nil, set, nil)
 	err = client.ListETHKeys(c)
 	require.NoError(t, err)
@@ -439,7 +439,7 @@ func TestShell_ImportExportETHKey_WithChains(t *testing.T) {
 	// Export test invalid id
 	keyName := keyNameForTest(t)
 	set = flag.NewFlagSet("test Eth export invalid id", 0)
-	cltest.FlagSetApplyFromAction(client.ExportETHKey, set, "")
+	flagSetApplyFromAction(client.ExportETHKey, set, "")
 
 	require.NoError(t, set.Parse([]string{"999"}))
 	require.NoError(t, set.Set("new-password", "../internal/fixtures/apicredentials"))
diff --git a/core/cmd/evm_transaction_commands_test.go b/core/cmd/evm_transaction_commands_test.go
index e071d875f03..6c079a12495 100644
--- a/core/cmd/evm_transaction_commands_test.go
+++ b/core/cmd/evm_transaction_commands_test.go
@@ -37,7 +37,7 @@ func TestShell_IndexTransactions(t *testing.T) {
 
 	// page 1
 	set := flag.NewFlagSet("test transactions", 0)
-	cltest.FlagSetApplyFromAction(client.IndexTransactions, set, "")
+	flagSetApplyFromAction(client.IndexTransactions, set, "")
 
 	require.NoError(t, set.Set("page", "1"))
 
@@ -51,7 +51,7 @@ func TestShell_IndexTransactions(t *testing.T) {
 
 	// page 2 which doesn't exist
 	set = flag.NewFlagSet("test txattempts", 0)
-	cltest.FlagSetApplyFromAction(client.IndexTransactions, set, "")
+	flagSetApplyFromAction(client.IndexTransactions, set, "")
 
 	require.NoError(t, set.Set("page", "2"))
 
@@ -77,7 +77,7 @@ func TestShell_ShowTransaction(t *testing.T) {
 	attempt := tx.TxAttempts[0]
 
 	set := flag.NewFlagSet("test get tx", 0)
-	cltest.FlagSetApplyFromAction(client.ShowTransaction, set, "")
+	flagSetApplyFromAction(client.ShowTransaction, set, "")
 
 	require.NoError(t, set.Parse([]string{attempt.Hash.String()}))
 
@@ -101,7 +101,7 @@ func TestShell_IndexTxAttempts(t *testing.T) {
 
 	// page 1
 	set := flag.NewFlagSet("test txattempts", 0)
-	cltest.FlagSetApplyFromAction(client.IndexTxAttempts, set, "")
+	flagSetApplyFromAction(client.IndexTxAttempts, set, "")
 
 	require.NoError(t, set.Set("page", "1"))
 
@@ -115,7 +115,7 @@ func TestShell_IndexTxAttempts(t *testing.T) {
 
 	// page 2 which doesn't exist
 	set = flag.NewFlagSet("test transactions", 0)
-	cltest.FlagSetApplyFromAction(client.IndexTxAttempts, set, "")
+	flagSetApplyFromAction(client.IndexTxAttempts, set, "")
 
 	require.NoError(t, set.Set("page", "2"))
 
@@ -158,7 +158,7 @@ func TestShell_SendEther_From_Txm(t *testing.T) {
 	db := app.GetSqlxDB()
 
 	set := flag.NewFlagSet("sendether", 0)
-	cltest.FlagSetApplyFromAction(client.SendEther, set, "")
+	flagSetApplyFromAction(client.SendEther, set, "")
 
 	amount := "100.5"
 	to := "0x342156c8d3bA54Abc67920d35ba1d1e67201aC9C"
@@ -218,7 +218,7 @@ func TestShell_SendEther_From_Txm_WEI(t *testing.T) {
 	db := app.GetSqlxDB()
 
 	set := flag.NewFlagSet("sendether", 0)
-	cltest.FlagSetApplyFromAction(client.SendEther, set, "")
+	flagSetApplyFromAction(client.SendEther, set, "")
 
 	require.NoError(t, set.Set("id", testutils.FixtureChainID.String()))
 	require.NoError(t, set.Set("wei", "false"))
diff --git a/core/cmd/forwarders_commands_test.go b/core/cmd/forwarders_commands_test.go
index b08d94f64dc..179216b8e41 100644
--- a/core/cmd/forwarders_commands_test.go
+++ b/core/cmd/forwarders_commands_test.go
@@ -73,7 +73,7 @@ func TestShell_TrackEVMForwarder(t *testing.T) {
 
 	// Create the fwdr
 	set := flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.TrackForwarder, set, "")
+	flagSetApplyFromAction(client.TrackForwarder, set, "")
 
 	require.NoError(t, set.Set("address", utils.RandomAddress().Hex()))
 	require.NoError(t, set.Set("evm-chain-id", id.String()))
@@ -92,7 +92,7 @@ func TestShell_TrackEVMForwarder(t *testing.T) {
 
 	// Delete fwdr
 	set = flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.DeleteForwarder, set, "")
+	flagSetApplyFromAction(client.DeleteForwarder, set, "")
 
 	require.NoError(t, set.Parse([]string{createOutput.ID}))
 
@@ -118,7 +118,7 @@ func TestShell_TrackEVMForwarder_BadAddress(t *testing.T) {
 
 	// Create the fwdr
 	set := flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.TrackForwarder, set, "")
+	flagSetApplyFromAction(client.TrackForwarder, set, "")
 
 	require.NoError(t, set.Set("address", "0xWrongFormatAddress"))
 	require.NoError(t, set.Set("evm-chain-id", id.String()))
@@ -137,7 +137,7 @@ func TestShell_DeleteEVMForwarders_MissingFwdId(t *testing.T) {
 
 	// Delete fwdr without id
 	set := flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.DeleteForwarder, set, "")
+	flagSetApplyFromAction(client.DeleteForwarder, set, "")
 
 	c := cli.NewContext(nil, set, nil)
 	require.Equal(t, "must pass the forwarder id to be archived", client.DeleteForwarder(c).Error())
diff --git a/core/cmd/jobs_commands_test.go b/core/cmd/jobs_commands_test.go
index b83b17f0be6..04908e18ff3 100644
--- a/core/cmd/jobs_commands_test.go
+++ b/core/cmd/jobs_commands_test.go
@@ -313,7 +313,7 @@ func TestShell_ListFindJobs(t *testing.T) {
 
 	// Create the job
 	fs := flag.NewFlagSet("", flag.ExitOnError)
-	cltest.FlagSetApplyFromAction(client.CreateJob, fs, "")
+	flagSetApplyFromAction(client.CreateJob, fs, "")
 
 	require.NoError(t, fs.Parse([]string{getDirectRequestSpec()}))
 
@@ -339,7 +339,7 @@ func TestShell_ShowJob(t *testing.T) {
 
 	// Create the job
 	fs := flag.NewFlagSet("", flag.ExitOnError)
-	cltest.FlagSetApplyFromAction(client.CreateJob, fs, "")
+	flagSetApplyFromAction(client.CreateJob, fs, "")
 
 	require.NoError(t, fs.Parse([]string{getDirectRequestSpec()}))
 
@@ -382,7 +382,7 @@ func TestShell_CreateJobV2(t *testing.T) {
 	requireJobsCount(t, app.JobORM(), 0)
 
 	fs := flag.NewFlagSet("", flag.ExitOnError)
-	cltest.FlagSetApplyFromAction(client.CreateJob, fs, "")
+	flagSetApplyFromAction(client.CreateJob, fs, "")
 
 	nameAndExternalJobID := uuid.New()
 	spec := fmt.Sprintf(ocrBootstrapSpec, nameAndExternalJobID, nameAndExternalJobID)
@@ -413,7 +413,7 @@ func TestShell_DeleteJob(t *testing.T) {
 
 	// Create the job
 	fs := flag.NewFlagSet("", flag.ExitOnError)
-	cltest.FlagSetApplyFromAction(client.CreateJob, fs, "")
+	flagSetApplyFromAction(client.CreateJob, fs, "")
 
 	require.NoError(t, fs.Parse([]string{getDirectRequestSpec()}))
 
@@ -432,12 +432,12 @@ func TestShell_DeleteJob(t *testing.T) {
 
 	// Must supply job id
 	set := flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.DeleteJob, set, "")
+	flagSetApplyFromAction(client.DeleteJob, set, "")
 	c := cli.NewContext(nil, set, nil)
 	require.Equal(t, "must pass the job id to be archived", client.DeleteJob(c).Error())
 
 	set = flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.DeleteJob, set, "")
+	flagSetApplyFromAction(client.DeleteJob, set, "")
 
 	require.NoError(t, set.Parse([]string{output.ID}))
 
diff --git a/core/cmd/ocr2_keys_commands_test.go b/core/cmd/ocr2_keys_commands_test.go
index 88ea426747e..dd2ac2544da 100644
--- a/core/cmd/ocr2_keys_commands_test.go
+++ b/core/cmd/ocr2_keys_commands_test.go
@@ -97,7 +97,7 @@ func TestShell_OCR2Keys(t *testing.T) {
 		client, r := app.NewShellAndRenderer()
 
 		set := flag.NewFlagSet("test", 0)
-		cltest.FlagSetApplyFromAction(client.CreateOCR2KeyBundle, set, "")
+		flagSetApplyFromAction(client.CreateOCR2KeyBundle, set, "")
 
 		require.NoError(tt, set.Parse([]string{"evm"}))
 
@@ -119,7 +119,7 @@ func TestShell_OCR2Keys(t *testing.T) {
 		require.NoError(t, err)
 		requireOCR2KeyCount(t, app, 1)
 		set := flag.NewFlagSet("test", 0)
-		cltest.FlagSetApplyFromAction(client.DeleteOCR2KeyBundle, set, "")
+		flagSetApplyFromAction(client.DeleteOCR2KeyBundle, set, "")
 
 		require.NoError(tt, set.Parse([]string{key.ID()}))
 		require.NoError(tt, set.Set("yes", "true"))
@@ -147,7 +147,7 @@ func TestShell_OCR2Keys(t *testing.T) {
 
 		// Export test invalid id
 		set := flag.NewFlagSet("test OCR2 export", 0)
-		cltest.FlagSetApplyFromAction(client.ExportOCR2Key, set, "")
+		flagSetApplyFromAction(client.ExportOCR2Key, set, "")
 
 		require.NoError(tt, set.Parse([]string{"0"}))
 		require.NoError(tt, set.Set("new-password", "../internal/fixtures/new_password.txt"))
@@ -160,7 +160,7 @@ func TestShell_OCR2Keys(t *testing.T) {
 
 		// Export
 		set = flag.NewFlagSet("test OCR2 export", 0)
-		cltest.FlagSetApplyFromAction(client.ExportOCR2Key, set, "")
+		flagSetApplyFromAction(client.ExportOCR2Key, set, "")
 
 		require.NoError(tt, set.Parse([]string{key.ID()}))
 		require.NoError(tt, set.Set("new-password", "../internal/fixtures/new_password.txt"))
@@ -175,7 +175,7 @@ func TestShell_OCR2Keys(t *testing.T) {
 		requireOCR2KeyCount(t, app, 0)
 
 		set = flag.NewFlagSet("test OCR2 import", 0)
-		cltest.FlagSetApplyFromAction(client.ImportOCR2Key, set, "")
+		flagSetApplyFromAction(client.ImportOCR2Key, set, "")
 
 		require.NoError(tt, set.Parse([]string{keyName}))
 		require.NoError(tt, set.Set("old-password", "../internal/fixtures/new_password.txt"))
diff --git a/core/cmd/ocr_keys_commands_test.go b/core/cmd/ocr_keys_commands_test.go
index 2ae765d4d2a..aeda9006610 100644
--- a/core/cmd/ocr_keys_commands_test.go
+++ b/core/cmd/ocr_keys_commands_test.go
@@ -111,7 +111,7 @@ func TestShell_DeleteOCRKeyBundle(t *testing.T) {
 	requireOCRKeyCount(t, app, 1)
 
 	set := flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.DeleteOCRKeyBundle, set, "")
+	flagSetApplyFromAction(client.DeleteOCRKeyBundle, set, "")
 
 	require.NoError(t, set.Parse([]string{key.ID()}))
 	require.NoError(t, set.Set("yes", "true"))
@@ -140,7 +140,7 @@ func TestShell_ImportExportOCRKey(t *testing.T) {
 
 	// Export test invalid id
 	set := flag.NewFlagSet("test OCR export", 0)
-	cltest.FlagSetApplyFromAction(client.ExportOCRKey, set, "")
+	flagSetApplyFromAction(client.ExportOCRKey, set, "")
 
 	require.NoError(t, set.Parse([]string{"0"}))
 	require.NoError(t, set.Set("new-password", "../internal/fixtures/new_password.txt"))
@@ -153,7 +153,7 @@ func TestShell_ImportExportOCRKey(t *testing.T) {
 
 	// Export
 	set = flag.NewFlagSet("test OCR export", 0)
-	cltest.FlagSetApplyFromAction(client.ExportOCRKey, set, "")
+	flagSetApplyFromAction(client.ExportOCRKey, set, "")
 
 	require.NoError(t, set.Parse([]string{key.ID()}))
 	require.NoError(t, set.Set("new-password", "../internal/fixtures/new_password.txt"))
@@ -168,7 +168,7 @@ func TestShell_ImportExportOCRKey(t *testing.T) {
 	requireOCRKeyCount(t, app, 0)
 
 	set = flag.NewFlagSet("test OCR import", 0)
-	cltest.FlagSetApplyFromAction(client.ImportOCRKey, set, "")
+	flagSetApplyFromAction(client.ImportOCRKey, set, "")
 
 	require.NoError(t, set.Parse([]string{keyName}))
 	require.NoError(t, set.Set("old-password", "../internal/fixtures/new_password.txt"))
diff --git a/core/cmd/p2p_keys_commands_test.go b/core/cmd/p2p_keys_commands_test.go
index 0407c924575..683129fafa7 100644
--- a/core/cmd/p2p_keys_commands_test.go
+++ b/core/cmd/p2p_keys_commands_test.go
@@ -102,7 +102,7 @@ func TestShell_DeleteP2PKey(t *testing.T) {
 	requireP2PKeyCount(t, app, 1)
 
 	set := flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.DeleteP2PKey, set, "")
+	flagSetApplyFromAction(client.DeleteP2PKey, set, "")
 
 	require.NoError(t, set.Set("yes", "true"))
 
@@ -132,7 +132,7 @@ func TestShell_ImportExportP2PKeyBundle(t *testing.T) {
 
 	// Export test invalid id
 	set := flag.NewFlagSet("test P2P export", 0)
-	cltest.FlagSetApplyFromAction(client.ExportP2PKey, set, "")
+	flagSetApplyFromAction(client.ExportP2PKey, set, "")
 
 	require.NoError(t, set.Parse([]string{"0"}))
 	require.NoError(t, set.Set("new-password", "../internal/fixtures/incorrect_password.txt"))
@@ -145,7 +145,7 @@ func TestShell_ImportExportP2PKeyBundle(t *testing.T) {
 
 	// Export test
 	set = flag.NewFlagSet("test P2P export", 0)
-	cltest.FlagSetApplyFromAction(client.ExportP2PKey, set, "")
+	flagSetApplyFromAction(client.ExportP2PKey, set, "")
 
 	require.NoError(t, set.Parse([]string{fmt.Sprint(key.ID())}))
 	require.NoError(t, set.Set("new-password", "../internal/fixtures/incorrect_password.txt"))
@@ -160,7 +160,7 @@ func TestShell_ImportExportP2PKeyBundle(t *testing.T) {
 	requireP2PKeyCount(t, app, 0)
 
 	set = flag.NewFlagSet("test P2P import", 0)
-	cltest.FlagSetApplyFromAction(client.ImportP2PKey, set, "")
+	flagSetApplyFromAction(client.ImportP2PKey, set, "")
 
 	require.NoError(t, set.Parse([]string{keyName}))
 	require.NoError(t, set.Set("old-password", "../internal/fixtures/incorrect_password.txt"))
diff --git a/core/cmd/shell_local_test.go b/core/cmd/shell_local_test.go
index 4d906214ef4..2dc182944d3 100644
--- a/core/cmd/shell_local_test.go
+++ b/core/cmd/shell_local_test.go
@@ -124,7 +124,7 @@ func TestShell_RunNodeWithPasswords(t *testing.T) {
 			}
 
 			set := flag.NewFlagSet("test", 0)
-			cltest.FlagSetApplyFromAction(client.RunNode, set, "")
+			flagSetApplyFromAction(client.RunNode, set, "")
 
 			require.NoError(t, set.Set("password", test.pwdfile))
 
@@ -221,7 +221,7 @@ func TestShell_RunNodeWithAPICredentialsFile(t *testing.T) {
 			}
 
 			set := flag.NewFlagSet("test", 0)
-			cltest.FlagSetApplyFromAction(client.RunNode, set, "")
+			flagSetApplyFromAction(client.RunNode, set, "")
 
 			require.NoError(t, set.Set("api", test.apiFile))
 
@@ -318,7 +318,7 @@ func TestShell_RebroadcastTransactions_Txm(t *testing.T) {
 	beginningNonce := uint64(7)
 	endingNonce := uint64(10)
 	set := flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(c.RebroadcastTransactions, set, "")
+	flagSetApplyFromAction(c.RebroadcastTransactions, set, "")
 
 	require.NoError(t, set.Set("evmChainID", testutils.FixtureChainID.String()))
 	require.NoError(t, set.Set("beginningNonce", strconv.FormatUint(beginningNonce, 10)))
@@ -397,7 +397,7 @@ func TestShell_RebroadcastTransactions_OutsideRange_Txm(t *testing.T) {
 			}
 
 			set := flag.NewFlagSet("test", 0)
-			cltest.FlagSetApplyFromAction(c.RebroadcastTransactions, set, "")
+			flagSetApplyFromAction(c.RebroadcastTransactions, set, "")
 
 			require.NoError(t, set.Set("evmChainID", testutils.FixtureChainID.String()))
 			require.NoError(t, set.Set("beginningNonce", strconv.FormatUint(uint64(beginningNonce), 10)))
@@ -477,7 +477,7 @@ func TestShell_RebroadcastTransactions_AddressCheck(t *testing.T) {
 			}
 
 			set := flag.NewFlagSet("test", 0)
-			cltest.FlagSetApplyFromAction(client.RebroadcastTransactions, set, "")
+			flagSetApplyFromAction(client.RebroadcastTransactions, set, "")
 
 			require.NoError(t, set.Set("evmChainID", testutils.FixtureChainID.String()))
 			require.NoError(t, set.Set("address", fromAddress.Hex()))
diff --git a/core/cmd/shell_remote_test.go b/core/cmd/shell_remote_test.go
index 91b56ee53a4..6143d678a90 100644
--- a/core/cmd/shell_remote_test.go
+++ b/core/cmd/shell_remote_test.go
@@ -123,7 +123,7 @@ func TestShell_ReplayBlocks(t *testing.T) {
 	client, _ := app.NewShellAndRenderer()
 
 	set := flag.NewFlagSet("flagset", 0)
-	cltest.FlagSetApplyFromAction(client.ReplayFromBlock, set, "")
+	flagSetApplyFromAction(client.ReplayFromBlock, set, "")
 
 	require.NoError(t, set.Set("block-number", "42"))
 	require.NoError(t, set.Set("evm-chain-id", "12345678"))
@@ -156,7 +156,7 @@ func TestShell_CreateExternalInitiator(t *testing.T) {
 			client, _ := app.NewShellAndRenderer()
 
 			set := flag.NewFlagSet("create", 0)
-			cltest.FlagSetApplyFromAction(client.CreateExternalInitiator, set, "")
+			flagSetApplyFromAction(client.CreateExternalInitiator, set, "")
 			assert.NoError(t, set.Parse(test.args))
 			c := cli.NewContext(nil, set, nil)
 
@@ -197,7 +197,7 @@ func TestShell_CreateExternalInitiator_Errors(t *testing.T) {
 			initialExis := len(cltest.AllExternalInitiators(t, app.GetSqlxDB()))
 
 			set := flag.NewFlagSet("create", 0)
-			cltest.FlagSetApplyFromAction(client.CreateExternalInitiator, set, "")
+			flagSetApplyFromAction(client.CreateExternalInitiator, set, "")
 
 			assert.NoError(t, set.Parse(test.args))
 			c := cli.NewContext(nil, set, nil)
@@ -228,7 +228,7 @@ func TestShell_DestroyExternalInitiator(t *testing.T) {
 	require.NoError(t, err)
 
 	set := flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.DeleteExternalInitiator, set, "")
+	flagSetApplyFromAction(client.DeleteExternalInitiator, set, "")
 
 	require.NoError(t, set.Parse([]string{exi.Name}))
 
@@ -246,7 +246,7 @@ func TestShell_DestroyExternalInitiator_NotFound(t *testing.T) {
 	client, r := app.NewShellAndRenderer()
 
 	set := flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.DeleteExternalInitiator, set, "")
+	flagSetApplyFromAction(client.DeleteExternalInitiator, set, "")
 
 	require.NoError(t, set.Parse([]string{"bogus-ID"}))
 
@@ -280,7 +280,7 @@ func TestShell_RemoteLogin(t *testing.T) {
 			client := app.NewAuthenticatingShell(prompter)
 
 			set := flag.NewFlagSet("test", 0)
-			cltest.FlagSetApplyFromAction(client.RemoteLogin, set, "")
+			flagSetApplyFromAction(client.RemoteLogin, set, "")
 
 			require.NoError(t, set.Set("file", test.file))
 			require.NoError(t, set.Set("bypass-version-check", "true"))
@@ -318,7 +318,7 @@ func TestShell_RemoteBuildCompatibility(t *testing.T) {
 
 	// Fails without bypass
 	set := flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.RemoteLogin, set, "")
+	flagSetApplyFromAction(client.RemoteLogin, set, "")
 
 	require.NoError(t, set.Set("bypass-version-check", "false"))
 
@@ -329,7 +329,7 @@ func TestShell_RemoteBuildCompatibility(t *testing.T) {
 
 	// Defaults to false
 	set = flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.RemoteLogin, set, "")
+	flagSetApplyFromAction(client.RemoteLogin, set, "")
 	c = cli.NewContext(nil, set, nil)
 	err = client.RemoteLogin(c)
 	assert.Error(t, err)
@@ -425,7 +425,7 @@ func TestShell_ChangePassword(t *testing.T) {
 	otherClient := app.NewAuthenticatingShell(prompter)
 
 	set := flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.RemoteLogin, set, "")
+	flagSetApplyFromAction(client.RemoteLogin, set, "")
 
 	require.NoError(t, set.Set("file", "../internal/fixtures/apicredentials"))
 	require.NoError(t, set.Set("bypass-version-check", "true"))
@@ -473,7 +473,7 @@ func TestShell_Profile_InvalidSecondsParam(t *testing.T) {
 	client := app.NewAuthenticatingShell(prompter)
 
 	set := flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.RemoteLogin, set, "")
+	flagSetApplyFromAction(client.RemoteLogin, set, "")
 
 	require.NoError(t, set.Set("file", "../internal/fixtures/apicredentials"))
 	require.NoError(t, set.Set("bypass-version-check", "true"))
@@ -504,7 +504,7 @@ func TestShell_Profile(t *testing.T) {
 	client := app.NewAuthenticatingShell(prompter)
 
 	set := flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.RemoteLogin, set, "")
+	flagSetApplyFromAction(client.RemoteLogin, set, "")
 
 	require.NoError(t, set.Set("file", "../internal/fixtures/apicredentials"))
 	require.NoError(t, set.Set("bypass-version-check", "true"))
@@ -595,7 +595,7 @@ func TestShell_RunOCRJob_HappyPath(t *testing.T) {
 	require.NoError(t, err)
 
 	set := flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.RemoteLogin, set, "")
+	flagSetApplyFromAction(client.RemoteLogin, set, "")
 
 	require.NoError(t, set.Set("bypass-version-check", "true"))
 	require.NoError(t, set.Parse([]string{strconv.FormatInt(int64(jb.ID), 10)}))
@@ -613,7 +613,7 @@ func TestShell_RunOCRJob_MissingJobID(t *testing.T) {
 	client, _ := app.NewShellAndRenderer()
 
 	set := flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.RemoteLogin, set, "")
+	flagSetApplyFromAction(client.RemoteLogin, set, "")
 
 	require.NoError(t, set.Set("bypass-version-check", "true"))
 
@@ -630,7 +630,7 @@ func TestShell_RunOCRJob_JobNotFound(t *testing.T) {
 	client, _ := app.NewShellAndRenderer()
 
 	set := flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.RemoteLogin, set, "")
+	flagSetApplyFromAction(client.RemoteLogin, set, "")
 
 	require.NoError(t, set.Parse([]string{"1"}))
 	require.NoError(t, set.Set("bypass-version-check", "true"))
@@ -659,7 +659,7 @@ func TestShell_AutoLogin(t *testing.T) {
 	client.HTTP = cmd.NewAuthenticatedHTTPClient(app.Logger, app.NewClientOpts(), client.CookieAuthenticator, sr)
 
 	fs := flag.NewFlagSet("", flag.ExitOnError)
-	cltest.FlagSetApplyFromAction(client.ListJobs, fs, "")
+	flagSetApplyFromAction(client.ListJobs, fs, "")
 
 	err := client.ListJobs(cli.NewContext(nil, fs, nil))
 	require.NoError(t, err)
@@ -687,7 +687,7 @@ func TestShell_AutoLogin_AuthFails(t *testing.T) {
 	client.HTTP = cmd.NewAuthenticatedHTTPClient(app.Logger, app.NewClientOpts(), client.CookieAuthenticator, sr)
 
 	fs := flag.NewFlagSet("", flag.ExitOnError)
-	cltest.FlagSetApplyFromAction(client.ListJobs, fs, "")
+	flagSetApplyFromAction(client.ListJobs, fs, "")
 	err := client.ListJobs(cli.NewContext(nil, fs, nil))
 	require.Error(t, err)
 }
@@ -716,7 +716,7 @@ func TestShell_SetLogConfig(t *testing.T) {
 
 	logLevel := "warn"
 	set := flag.NewFlagSet("loglevel", 0)
-	cltest.FlagSetApplyFromAction(client.SetLogLevel, set, "")
+	flagSetApplyFromAction(client.SetLogLevel, set, "")
 
 	require.NoError(t, set.Set("level", logLevel))
 
@@ -728,7 +728,7 @@ func TestShell_SetLogConfig(t *testing.T) {
 
 	sqlEnabled := true
 	set = flag.NewFlagSet("logsql", 0)
-	cltest.FlagSetApplyFromAction(client.SetLogSQL, set, "")
+	flagSetApplyFromAction(client.SetLogSQL, set, "")
 
 	require.NoError(t, set.Set("enable", strconv.FormatBool(sqlEnabled)))
 	c = cli.NewContext(nil, set, nil)
@@ -739,7 +739,7 @@ func TestShell_SetLogConfig(t *testing.T) {
 
 	sqlEnabled = false
 	set = flag.NewFlagSet("logsql", 0)
-	cltest.FlagSetApplyFromAction(client.SetLogSQL, set, "")
+	flagSetApplyFromAction(client.SetLogSQL, set, "")
 
 	require.NoError(t, set.Set("disable", "true"))
 	c = cli.NewContext(nil, set, nil)
diff --git a/core/cmd/shell_test.go b/core/cmd/shell_test.go
index 2a8c2c55861..ade14aa0d8a 100644
--- a/core/cmd/shell_test.go
+++ b/core/cmd/shell_test.go
@@ -2,15 +2,20 @@ package cmd_test
 
 import (
 	"crypto/rand"
+	"flag"
 	"fmt"
 	"math/big"
 	"os"
 	"path/filepath"
+	"reflect"
+	"runtime"
+	"strings"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"github.com/urfave/cli"
 
 	"github.com/smartcontractkit/chainlink-solana/pkg/solana"
 	solcfg "github.com/smartcontractkit/chainlink-solana/pkg/solana/config"
@@ -514,3 +519,47 @@ func TestSetupStarkNetRelayer(t *testing.T) {
 		require.Error(t, err)
 	})
 }
+
+// flagSetApplyFromAction applies the flags from action to the flagSet.
+// `parentCommand` will filter the app commands and only applies the flags if the command/subcommand has a parent with that name, if left empty no filtering is done
+func flagSetApplyFromAction(action interface{}, flagSet *flag.FlagSet, parentCommand string) {
+	cliApp := cmd.Shell{}
+	app := cmd.NewApp(&cliApp)
+
+	foundName := parentCommand == ""
+	actionFuncName := getFuncName(action)
+
+	for _, command := range app.Commands {
+		flags := recursiveFindFlagsWithName(actionFuncName, command, parentCommand, foundName)
+
+		for _, flag := range flags {
+			flag.Apply(flagSet)
+		}
+	}
+
+}
+
+func recursiveFindFlagsWithName(actionFuncName string, command cli.Command, parent string, foundName bool) []cli.Flag {
+
+	if command.Action != nil {
+		if actionFuncName == getFuncName(command.Action) && foundName {
+			return command.Flags
+		}
+	}
+
+	for _, subcommand := range command.Subcommands {
+		if !foundName {
+			foundName = strings.EqualFold(subcommand.Name, parent)
+		}
+
+		found := recursiveFindFlagsWithName(actionFuncName, subcommand, parent, foundName)
+		if found != nil {
+			return found
+		}
+	}
+	return nil
+}
+
+func getFuncName(i interface{}) string {
+	return runtime.FuncForPC(reflect.ValueOf(i).Pointer()).Name()
+}
diff --git a/core/cmd/solana_keys_commands_test.go b/core/cmd/solana_keys_commands_test.go
index 32b44fc8947..e72343be45c 100644
--- a/core/cmd/solana_keys_commands_test.go
+++ b/core/cmd/solana_keys_commands_test.go
@@ -95,7 +95,7 @@ func TestShell_SolanaKeys(t *testing.T) {
 		require.NoError(t, err)
 		requireSolanaKeyCount(t, app, 1)
 		set := flag.NewFlagSet("test", 0)
-		cltest.FlagSetApplyFromAction(cmd.NewSolanaKeysClient(client).DeleteKey, set, "solana")
+		flagSetApplyFromAction(cmd.NewSolanaKeysClient(client).DeleteKey, set, "solana")
 
 		require.NoError(tt, set.Set("yes", "true"))
 
@@ -122,7 +122,7 @@ func TestShell_SolanaKeys(t *testing.T) {
 
 		// Export test invalid id
 		set := flag.NewFlagSet("test Solana export", 0)
-		cltest.FlagSetApplyFromAction(cmd.NewSolanaKeysClient(client).ExportKey, set, "solana")
+		flagSetApplyFromAction(cmd.NewSolanaKeysClient(client).ExportKey, set, "solana")
 
 		require.NoError(tt, set.Parse([]string{"0"}))
 		require.NoError(tt, set.Set("new-password", "../internal/fixtures/incorrect_password.txt"))
@@ -135,7 +135,7 @@ func TestShell_SolanaKeys(t *testing.T) {
 
 		// Export test
 		set = flag.NewFlagSet("test Solana export", 0)
-		cltest.FlagSetApplyFromAction(cmd.NewSolanaKeysClient(client).ExportKey, set, "solana")
+		flagSetApplyFromAction(cmd.NewSolanaKeysClient(client).ExportKey, set, "solana")
 
 		require.NoError(tt, set.Parse([]string{fmt.Sprint(key.ID())}))
 		require.NoError(tt, set.Set("new-password", "../internal/fixtures/incorrect_password.txt"))
@@ -150,7 +150,7 @@ func TestShell_SolanaKeys(t *testing.T) {
 		requireSolanaKeyCount(t, app, 0)
 
 		set = flag.NewFlagSet("test Solana import", 0)
-		cltest.FlagSetApplyFromAction(cmd.NewSolanaKeysClient(client).ImportKey, set, "solana")
+		flagSetApplyFromAction(cmd.NewSolanaKeysClient(client).ImportKey, set, "solana")
 
 		require.NoError(tt, set.Parse([]string{keyName}))
 		require.NoError(tt, set.Set("old-password", "../internal/fixtures/incorrect_password.txt"))
diff --git a/core/cmd/solana_transaction_commands_test.go b/core/cmd/solana_transaction_commands_test.go
index f019616cb85..b190caec51b 100644
--- a/core/cmd/solana_transaction_commands_test.go
+++ b/core/cmd/solana_transaction_commands_test.go
@@ -21,7 +21,6 @@ import (
 	solcfg "github.com/smartcontractkit/chainlink-solana/pkg/solana/config"
 
 	"github.com/smartcontractkit/chainlink/v2/core/cmd"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 )
 
 func TestShell_SolanaSendSol(t *testing.T) {
@@ -69,7 +68,7 @@ func TestShell_SolanaSendSol(t *testing.T) {
 			require.NoError(t, err)
 
 			set := flag.NewFlagSet("sendsolcoins", 0)
-			cltest.FlagSetApplyFromAction(client.SolanaSendSol, set, "solana")
+			flagSetApplyFromAction(client.SolanaSendSol, set, "solana")
 
 			require.NoError(t, set.Set("id", chainID))
 			require.NoError(t, set.Parse([]string{tt.amount, from.PublicKey().String(), to.PublicKey().String()}))
diff --git a/core/cmd/starknet_keys_commands_test.go b/core/cmd/starknet_keys_commands_test.go
index 17584eefe05..b1fa4d88f05 100644
--- a/core/cmd/starknet_keys_commands_test.go
+++ b/core/cmd/starknet_keys_commands_test.go
@@ -94,7 +94,7 @@ func TestShell_StarkNetKeys(t *testing.T) {
 		require.NoError(t, err)
 		requireStarkNetKeyCount(t, app, 1)
 		set := flag.NewFlagSet("test", 0)
-		cltest.FlagSetApplyFromAction(cmd.NewStarkNetKeysClient(client).DeleteKey, set, "starknet")
+		flagSetApplyFromAction(cmd.NewStarkNetKeysClient(client).DeleteKey, set, "starknet")
 
 		require.NoError(tt, set.Set("yes", "true"))
 
@@ -121,7 +121,7 @@ func TestShell_StarkNetKeys(t *testing.T) {
 
 		// Export test invalid id
 		set := flag.NewFlagSet("test StarkNet export", 0)
-		cltest.FlagSetApplyFromAction(cmd.NewStarkNetKeysClient(client).ExportKey, set, "starknet")
+		flagSetApplyFromAction(cmd.NewStarkNetKeysClient(client).ExportKey, set, "starknet")
 
 		require.NoError(tt, set.Parse([]string{"0"}))
 		require.NoError(tt, set.Set("new-password", "../internal/fixtures/incorrect_password.txt"))
@@ -134,7 +134,7 @@ func TestShell_StarkNetKeys(t *testing.T) {
 
 		// Export test
 		set = flag.NewFlagSet("test StarkNet export", 0)
-		cltest.FlagSetApplyFromAction(cmd.NewStarkNetKeysClient(client).ExportKey, set, "starknet")
+		flagSetApplyFromAction(cmd.NewStarkNetKeysClient(client).ExportKey, set, "starknet")
 
 		require.NoError(tt, set.Parse([]string{fmt.Sprint(key.ID())}))
 		require.NoError(tt, set.Set("new-password", "../internal/fixtures/incorrect_password.txt"))
@@ -149,7 +149,7 @@ func TestShell_StarkNetKeys(t *testing.T) {
 		requireStarkNetKeyCount(t, app, 0)
 
 		set = flag.NewFlagSet("test StarkNet import", 0)
-		cltest.FlagSetApplyFromAction(cmd.NewStarkNetKeysClient(client).ImportKey, set, "starknet")
+		flagSetApplyFromAction(cmd.NewStarkNetKeysClient(client).ImportKey, set, "starknet")
 
 		require.NoError(tt, set.Parse([]string{keyName}))
 		require.NoError(tt, set.Set("old-password", "../internal/fixtures/incorrect_password.txt"))
diff --git a/core/cmd/vrf_keys_commands_test.go b/core/cmd/vrf_keys_commands_test.go
index 20552604446..a061067771d 100644
--- a/core/cmd/vrf_keys_commands_test.go
+++ b/core/cmd/vrf_keys_commands_test.go
@@ -105,7 +105,7 @@ func TestShellVRF_CRUD(t *testing.T) {
 
 	// Now do a hard delete and ensure its completely removes the key
 	set := flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.DeleteVRFKey, set, "")
+	flagSetApplyFromAction(client.DeleteVRFKey, set, "")
 
 	require.NoError(t, set.Parse([]string{k2.Compressed}))
 	require.NoError(t, set.Set("hard", "true"))
@@ -141,7 +141,7 @@ func TestVRF_ImportExport(t *testing.T) {
 	// Export it, encrypted with cltest.Password instead
 	keyName := "vrfkey1"
 	set := flag.NewFlagSet("test VRF export", 0)
-	cltest.FlagSetApplyFromAction(client.ExportVRFKey, set, "")
+	flagSetApplyFromAction(client.ExportVRFKey, set, "")
 
 	require.NoError(t, set.Parse([]string{k1.Compressed})) // Arguments
 	require.NoError(t, set.Set("new-password", "../internal/fixtures/correct_password.txt"))
@@ -157,7 +157,7 @@ func TestVRF_ImportExport(t *testing.T) {
 
 	// Should error if we try to import a duplicate key
 	importSet := flag.NewFlagSet("test VRF import", 0)
-	cltest.FlagSetApplyFromAction(client.ImportVRFKey, importSet, "")
+	flagSetApplyFromAction(client.ImportVRFKey, importSet, "")
 
 	require.NoError(t, importSet.Parse([]string{keyName}))
 	require.NoError(t, importSet.Set("old-password", "../internal/fixtures/correct_password.txt"))
@@ -167,7 +167,7 @@ func TestVRF_ImportExport(t *testing.T) {
 
 	// Lets delete the key and import it
 	set = flag.NewFlagSet("test", 0)
-	cltest.FlagSetApplyFromAction(client.DeleteVRFKey, set, "")
+	flagSetApplyFromAction(client.DeleteVRFKey, set, "")
 
 	require.NoError(t, set.Parse([]string{k1.Compressed}))
 	require.NoError(t, set.Set("hard", "true"))
diff --git a/core/internal/cltest/cltest.go b/core/internal/cltest/cltest.go
index cf3f4f5c073..b1431bf0599 100644
--- a/core/internal/cltest/cltest.go
+++ b/core/internal/cltest/cltest.go
@@ -6,7 +6,6 @@ import (
 	crand "crypto/rand"
 	"encoding/json"
 	"errors"
-	"flag"
 	"fmt"
 	"io"
 	"math/big"
@@ -16,8 +15,6 @@ import (
 	"net/url"
 	"os"
 	"reflect"
-	"runtime"
-	"strings"
 	"testing"
 	"time"
 
@@ -29,7 +26,6 @@ import (
 	"github.com/google/uuid"
 	"github.com/gorilla/securecookie"
 	"github.com/gorilla/sessions"
-	cryptop2p "github.com/libp2p/go-libp2p-core/crypto"
 	p2ppeer "github.com/libp2p/go-libp2p-core/peer"
 	"github.com/manyminds/api2go/jsonapi"
 	"github.com/onsi/gomega"
@@ -37,7 +33,6 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 	"github.com/tidwall/gjson"
-	"github.com/urfave/cli"
 
 	"github.com/jmoiron/sqlx"
 
@@ -46,7 +41,6 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/loop"
 
 	"github.com/smartcontractkit/chainlink/v2/common/client"
-	txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr"
 	commonmocks "github.com/smartcontractkit/chainlink/v2/common/types/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/auth"
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
@@ -55,7 +49,6 @@ import (
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	evmconfig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
 	httypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker/types"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
@@ -120,7 +113,6 @@ const (
 var (
 	DefaultP2PPeerID p2pkey.PeerID
 	FixtureChainID   = *testutils.FixtureChainID
-	source           rand.Source
 
 	DefaultCosmosKey     = cosmoskey.MustNewInsecure(keystest.NewRandReaderFromSeed(KeyBigIntSeed))
 	DefaultCSAKey        = csakey.MustNewV2XXXTestingOnly(big.NewInt(KeyBigIntSeed))
@@ -147,13 +139,6 @@ func init() {
 		fmt.Printf("[gin] %-6s %-25s --> %s (%d handlers)\n", httpMethod, absolutePath, handlerName, nuHandlers)
 	}
 
-	// Seed the random number generator, otherwise separate modules will take
-	// the same advisory locks when tested with `go test -p N` for N > 1
-	seed := time.Now().UTC().UnixNano()
-	fmt.Printf("cltest random seed: %v\n", seed)
-
-	// Also seed the local source
-	source = rand.NewSource(seed)
 	defaultP2PPeerID, err := p2ppeer.Decode(configtest.DefaultPeerID)
 	if err != nil {
 		panic(err)
@@ -201,22 +186,6 @@ func NewJobPipelineV2(t testing.TB, cfg pipeline.BridgeConfig, jpcfg JobPipeline
 	}
 }
 
-func NewEventBroadcaster(t testing.TB, dbURL url.URL) pg.EventBroadcaster {
-	lggr := logger.TestLogger(t)
-	return pg.NewEventBroadcaster(dbURL, 0, 0, lggr, uuid.New())
-}
-
-func NewEthConfirmer(t testing.TB, txStore txmgr.EvmTxStore, ethClient evmclient.Client, config evmconfig.ChainScopedConfig, ks keystore.Eth, fn txmgrcommon.ResumeCallback) *txmgr.Confirmer {
-	lggr := logger.TestLogger(t)
-	ge := config.EVM().GasEstimator()
-	estimator := gas.NewWrappedEvmEstimator(gas.NewFixedPriceEstimator(ge, ge.BlockHistory(), lggr), ge.EIP1559DynamicFees(), nil)
-	txBuilder := txmgr.NewEvmTxAttemptBuilder(*ethClient.ConfiguredChainID(), ge, ks, estimator)
-	ec := txmgr.NewEvmConfirmer(txStore, txmgr.NewEvmTxmClient(ethClient), txmgr.NewEvmTxmConfig(config.EVM()), txmgr.NewEvmTxmFeeConfig(ge), config.EVM().Transactions(), config.Database(), ks, txBuilder, lggr)
-	ec.SetResumeCallback(fn)
-	require.NoError(t, ec.Start(testutils.Context(t)))
-	return ec
-}
-
 // TestApplication holds the test application and test servers
 type TestApplication struct {
 	t testing.TB
@@ -228,13 +197,6 @@ type TestApplication struct {
 	Keys    []ethkey.KeyV2
 }
 
-// NewWSServer starts a websocket server which invokes callback for each message received.
-// If chainID is set, then eth_chainId calls will be automatically handled.
-func NewWSServer(t *testing.T, chainID *big.Int, callback testutils.JSONRPCHandler) string {
-	server := testutils.NewWSServer(t, chainID, callback)
-	return server.WSURL().String()
-}
-
 // NewApplicationEVMDisabled creates a new application with default config but EVM disabled
 // Useful for testing controllers
 func NewApplicationEVMDisabled(t *testing.T) *TestApplication {
@@ -1578,58 +1540,17 @@ func AssertRecordEventually(t *testing.T, db *sqlx.DB, model interface{}, stmt s
 	}, testutils.WaitTimeout(t), DBPollingInterval).Should(gomega.BeTrue())
 }
 
-func MustSendingKeyStates(t *testing.T, ethKeyStore keystore.Eth, chainID *big.Int) []ethkey.State {
-	keys, err := ethKeyStore.EnabledKeysForChain(chainID)
-	require.NoError(t, err)
-	states, err := ethKeyStore.GetStatesForKeys(keys)
-	require.NoError(t, err)
-	return states
-}
-
-func MustRandomP2PPeerID(t *testing.T) p2ppeer.ID {
-	reader := rand.New(source)
-	p2pPrivkey, _, err := cryptop2p.GenerateEd25519Key(reader)
-	require.NoError(t, err)
-	id, err := p2ppeer.IDFromPrivateKey(p2pPrivkey)
-	require.NoError(t, err)
-	return id
-}
-
 func MustWebURL(t *testing.T, s string) *models.WebURL {
 	uri, err := url.Parse(s)
 	require.NoError(t, err)
 	return (*models.WebURL)(uri)
 }
 
-func AssertPipelineTaskRunsSuccessful(t testing.TB, runs []pipeline.TaskRun) {
-	t.Helper()
-	for i, run := range runs {
-		require.True(t, run.Error.IsZero(), fmt.Sprintf("pipeline.Task run failed (idx: %v, dotID: %v, error: '%v')", i, run.GetDotID(), run.Error.ValueOrZero()))
-	}
-}
-
-func AssertPipelineTaskRunsErrored(t testing.TB, runs []pipeline.TaskRun) {
-	t.Helper()
-	for i, run := range runs {
-		require.False(t, run.Error.IsZero(), fmt.Sprintf("expected pipeline.Task run to have failed, but it succeeded (idx: %v, dotID: %v, output: '%v')", i, run.GetDotID(), run.Output))
-	}
-}
-
 func NewTestChainScopedConfig(t testing.TB) evmconfig.ChainScopedConfig {
 	cfg := configtest.NewGeneralConfig(t, nil)
 	return evmtest.NewChainScopedConfig(t, cfg)
 }
 
-func MustGetStateForKey(t testing.TB, kst keystore.Eth, key ethkey.KeyV2) ethkey.State {
-	state, err := kst.GetStateForKey(key)
-	require.NoError(t, err)
-	return state
-}
-
-func NewTxStore(t *testing.T, db *sqlx.DB, cfg pg.QConfig) txmgr.EvmTxStore {
-	return txmgr.NewTxStore(db, logger.TestLogger(t), cfg)
-}
-
 func NewTestTxStore(t *testing.T, db *sqlx.DB, cfg pg.QConfig) txmgr.TestEvmTxStore {
 	return txmgr.NewTxStore(db, logger.TestLogger(t), cfg)
 }
@@ -1647,47 +1568,3 @@ func ClearDBTables(t *testing.T, db *sqlx.DB, tables ...string) {
 	err = tx.Commit()
 	require.NoError(t, err)
 }
-
-// FlagSetApplyFromAction applies the flags from action to the flagSet.
-// `parentCommand` will filter the app commands and only applies the flags if the command/subcommand has a parent with that name, if left empty no filtering is done
-func FlagSetApplyFromAction(action interface{}, flagSet *flag.FlagSet, parentCommand string) {
-	cliApp := cmd.Shell{}
-	app := cmd.NewApp(&cliApp)
-
-	foundName := parentCommand == ""
-	actionFuncName := getFuncName(action)
-
-	for _, command := range app.Commands {
-		flags := recursiveFindFlagsWithName(actionFuncName, command, parentCommand, foundName)
-
-		for _, flag := range flags {
-			flag.Apply(flagSet)
-		}
-	}
-
-}
-
-func recursiveFindFlagsWithName(actionFuncName string, command cli.Command, parent string, foundName bool) []cli.Flag {
-
-	if command.Action != nil {
-		if actionFuncName == getFuncName(command.Action) && foundName {
-			return command.Flags
-		}
-	}
-
-	for _, subcommand := range command.Subcommands {
-		if !foundName {
-			foundName = strings.EqualFold(subcommand.Name, parent)
-		}
-
-		found := recursiveFindFlagsWithName(actionFuncName, subcommand, parent, foundName)
-		if found != nil {
-			return found
-		}
-	}
-	return nil
-}
-
-func getFuncName(i interface{}) string {
-	return runtime.FuncForPC(reflect.ValueOf(i).Pointer()).Name()
-}
diff --git a/core/internal/cltest/event_websocket_server.go b/core/internal/cltest/event_websocket_server.go
deleted file mode 100644
index 64b3e90cd81..00000000000
--- a/core/internal/cltest/event_websocket_server.go
+++ /dev/null
@@ -1,154 +0,0 @@
-package cltest
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"sync"
-	"testing"
-
-	"github.com/pkg/errors"
-
-	"github.com/gorilla/websocket"
-)
-
-// EventWebSocketServer is a web socket server designed specifically for testing
-type EventWebSocketServer struct {
-	*httptest.Server
-	mutex          *sync.RWMutex // shared mutex for safe access to arrays/maps.
-	t              *testing.T
-	connections    []*websocket.Conn
-	Connected      chan struct{}
-	Disconnected   chan struct{}
-	ReceivedText   chan string
-	ReceivedBinary chan []byte
-	URL            *url.URL
-}
-
-// NewEventWebSocketServer returns a new EventWebSocketServer
-func NewEventWebSocketServer(t *testing.T) (*EventWebSocketServer, func()) {
-	server := &EventWebSocketServer{
-		mutex:          &sync.RWMutex{},
-		t:              t,
-		Connected:      make(chan struct{}, 1), // have buffer of one for easier assertions after the event
-		Disconnected:   make(chan struct{}, 1), // have buffer of one for easier assertions after the event
-		ReceivedText:   make(chan string, 100),
-		ReceivedBinary: make(chan []byte, 100),
-	}
-
-	server.Server = httptest.NewServer(http.HandlerFunc(server.handler))
-	u, err := url.Parse(server.Server.URL)
-	if err != nil {
-		t.Fatal("EventWebSocketServer: ", err)
-	}
-	u.Scheme = "ws"
-	server.URL = u
-	return server, func() {
-		server.Close()
-	}
-}
-
-func (wss EventWebSocketServer) ConnectionsCount() int {
-	wss.mutex.RLock()
-	defer wss.mutex.RUnlock()
-	return len(wss.connections)
-}
-
-// Broadcast sends a message to every web socket client connected to the EventWebSocketServer
-func (wss *EventWebSocketServer) Broadcast(message string) error {
-	wss.mutex.RLock()
-	defer wss.mutex.RUnlock()
-	for _, connection := range wss.connections {
-		err := connection.WriteMessage(websocket.TextMessage, []byte(message))
-		if err != nil {
-			return errors.Wrap(err, "error writing message to connection")
-		}
-	}
-
-	return nil
-}
-
-// WriteCloseMessage tells connected clients to disconnect.
-// Useful to emulate that the websocket server is shutting down without
-// actually shutting down.
-// This overcomes httptest.Server's inability to restart on the same URL:port.
-func (wss *EventWebSocketServer) WriteCloseMessage() {
-	wss.mutex.RLock()
-	for _, connection := range wss.connections {
-		err := connection.WriteMessage(
-			websocket.CloseMessage,
-			websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
-		if err != nil {
-			wss.t.Error(err)
-		}
-	}
-	wss.mutex.RUnlock()
-}
-
-var (
-	upgrader = websocket.Upgrader{
-		CheckOrigin: func(r *http.Request) bool { return true },
-	}
-
-	closeCodes = []int{websocket.CloseNormalClosure, websocket.CloseAbnormalClosure}
-)
-
-func (wss *EventWebSocketServer) handler(w http.ResponseWriter, r *http.Request) {
-	var err error
-	conn, err := upgrader.Upgrade(w, r, nil)
-	if err != nil {
-		wss.t.Fatal("EventWebSocketServer Upgrade: ", err)
-	}
-
-	wss.addConnection(conn)
-	for {
-		messageType, payload, err := conn.ReadMessage() // we only read
-		if websocket.IsCloseError(err, closeCodes...) {
-			wss.removeConnection(conn)
-			return
-		}
-		if err != nil {
-			wss.t.Fatal("EventWebSocketServer ReadMessage: ", err)
-		}
-
-		if messageType == websocket.TextMessage {
-			select {
-			case wss.ReceivedText <- string(payload):
-			default:
-			}
-		} else if messageType == websocket.BinaryMessage {
-			select {
-			case wss.ReceivedBinary <- payload:
-			default:
-			}
-		} else {
-			wss.t.Fatal("EventWebSocketServer UnsupportedMessageType: ", messageType)
-		}
-	}
-}
-
-func (wss *EventWebSocketServer) addConnection(conn *websocket.Conn) {
-	wss.mutex.Lock()
-	wss.connections = append(wss.connections, conn)
-	wss.mutex.Unlock()
-	select { // broadcast connected event
-	case wss.Connected <- struct{}{}:
-	default:
-	}
-}
-
-func (wss *EventWebSocketServer) removeConnection(conn *websocket.Conn) {
-	newc := []*websocket.Conn{}
-	wss.mutex.Lock()
-	for _, connection := range wss.connections {
-		if connection != conn {
-			newc = append(newc, connection)
-		}
-	}
-	wss.connections = newc
-	wss.mutex.Unlock()
-	select { // broadcast disconnected event
-	case wss.Disconnected <- struct{}{}:
-	default:
-	}
-}
diff --git a/core/internal/cltest/factories.go b/core/internal/cltest/factories.go
index 741afe828f9..46014c4e04f 100644
--- a/core/internal/cltest/factories.go
+++ b/core/internal/cltest/factories.go
@@ -134,7 +134,7 @@ func EmptyCLIContext() *cli.Context {
 	return cli.NewContext(nil, set, nil)
 }
 
-func NewEthTx(t *testing.T, fromAddress common.Address) txmgr.Tx {
+func NewEthTx(fromAddress common.Address) txmgr.Tx {
 	return txmgr.Tx{
 		FromAddress:    fromAddress,
 		ToAddress:      testutils.NewAddress(),
@@ -156,7 +156,7 @@ func MustInsertUnconfirmedEthTx(t *testing.T, txStore txmgr.TestEvmTxStore, nonc
 			chainID = v
 		}
 	}
-	etx := NewEthTx(t, fromAddress)
+	etx := NewEthTx(fromAddress)
 
 	etx.BroadcastAt = &broadcastAt
 	etx.InitialBroadcastAt = &broadcastAt
@@ -184,95 +184,9 @@ func MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t *testing.T, txStore
 	return etx
 }
 
-func MustInsertUnconfirmedEthTxWithAttemptState(t *testing.T, txStore txmgr.TestEvmTxStore, nonce int64, fromAddress common.Address, txAttemptState txmgrtypes.TxAttemptState, opts ...interface{}) txmgr.Tx {
-	etx := MustInsertUnconfirmedEthTx(t, txStore, nonce, fromAddress, opts...)
-	attempt := NewLegacyEthTxAttempt(t, etx.ID)
-
-	tx := types.NewTransaction(uint64(nonce), testutils.NewAddress(), big.NewInt(142), 242, big.NewInt(342), []byte{1, 2, 3})
-	rlp := new(bytes.Buffer)
-	require.NoError(t, tx.EncodeRLP(rlp))
-	attempt.SignedRawTx = rlp.Bytes()
-
-	attempt.State = txAttemptState
-	require.NoError(t, txStore.InsertTxAttempt(&attempt))
-	etx, err := txStore.FindTxWithAttempts(etx.ID)
-	require.NoError(t, err)
-	return etx
-}
-
-func MustInsertUnconfirmedEthTxWithBroadcastDynamicFeeAttempt(t *testing.T, txStore txmgr.TestEvmTxStore, nonce int64, fromAddress common.Address, opts ...interface{}) txmgr.Tx {
-	etx := MustInsertUnconfirmedEthTx(t, txStore, nonce, fromAddress, opts...)
-	attempt := NewDynamicFeeEthTxAttempt(t, etx.ID)
-
-	addr := testutils.NewAddress()
-	dtx := types.DynamicFeeTx{
-		ChainID:   big.NewInt(0),
-		Nonce:     uint64(nonce),
-		GasTipCap: big.NewInt(1),
-		GasFeeCap: big.NewInt(1),
-		Gas:       242,
-		To:        &addr,
-		Value:     big.NewInt(342),
-		Data:      []byte{2, 3, 4},
-	}
-	tx := types.NewTx(&dtx)
-	rlp := new(bytes.Buffer)
-	require.NoError(t, tx.EncodeRLP(rlp))
-	attempt.SignedRawTx = rlp.Bytes()
-
-	attempt.State = txmgrtypes.TxAttemptBroadcast
-	require.NoError(t, txStore.InsertTxAttempt(&attempt))
-	etx, err := txStore.FindTxWithAttempts(etx.ID)
-	require.NoError(t, err)
-	return etx
-}
-
-func MustInsertUnconfirmedEthTxWithInsufficientEthAttempt(t *testing.T, txStore txmgr.TestEvmTxStore, nonce int64, fromAddress common.Address) txmgr.Tx {
-	timeNow := time.Now()
-	etx := NewEthTx(t, fromAddress)
-
-	etx.BroadcastAt = &timeNow
-	etx.InitialBroadcastAt = &timeNow
-	n := evmtypes.Nonce(nonce)
-	etx.Sequence = &n
-	etx.State = txmgrcommon.TxUnconfirmed
-	require.NoError(t, txStore.InsertTx(&etx))
-	attempt := NewLegacyEthTxAttempt(t, etx.ID)
-
-	tx := types.NewTransaction(uint64(nonce), testutils.NewAddress(), big.NewInt(142), 242, big.NewInt(342), []byte{1, 2, 3})
-	rlp := new(bytes.Buffer)
-	require.NoError(t, tx.EncodeRLP(rlp))
-	attempt.SignedRawTx = rlp.Bytes()
-
-	attempt.State = txmgrtypes.TxAttemptInsufficientFunds
-	require.NoError(t, txStore.InsertTxAttempt(&attempt))
-	etx, err := txStore.FindTxWithAttempts(etx.ID)
-	require.NoError(t, err)
-	return etx
-}
-
-func MustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(
-	t *testing.T, txStore txmgr.TestEvmTxStore, nonce int64, broadcastBeforeBlockNum int64,
-	broadcastAt time.Time, fromAddress common.Address) txmgr.Tx {
-	etx := NewEthTx(t, fromAddress)
-
-	etx.BroadcastAt = &broadcastAt
-	etx.InitialBroadcastAt = &broadcastAt
-	n := evmtypes.Nonce(nonce)
-	etx.Sequence = &n
-	etx.State = txmgrcommon.TxConfirmedMissingReceipt
-	require.NoError(t, txStore.InsertTx(&etx))
-	attempt := NewLegacyEthTxAttempt(t, etx.ID)
-	attempt.BroadcastBeforeBlockNum = &broadcastBeforeBlockNum
-	attempt.State = txmgrtypes.TxAttemptBroadcast
-	require.NoError(t, txStore.InsertTxAttempt(&attempt))
-	etx.TxAttempts = append(etx.TxAttempts, attempt)
-	return etx
-}
-
 func MustInsertConfirmedEthTxWithLegacyAttempt(t *testing.T, txStore txmgr.TestEvmTxStore, nonce int64, broadcastBeforeBlockNum int64, fromAddress common.Address) txmgr.Tx {
 	timeNow := time.Now()
-	etx := NewEthTx(t, fromAddress)
+	etx := NewEthTx(fromAddress)
 
 	etx.BroadcastAt = &timeNow
 	etx.InitialBroadcastAt = &timeNow
@@ -288,91 +202,6 @@ func MustInsertConfirmedEthTxWithLegacyAttempt(t *testing.T, txStore txmgr.TestE
 	return etx
 }
 
-func MustInsertInProgressEthTxWithAttempt(t *testing.T, txStore txmgr.TestEvmTxStore, nonce evmtypes.Nonce, fromAddress common.Address) txmgr.Tx {
-	etx := NewEthTx(t, fromAddress)
-
-	etx.Sequence = &nonce
-	etx.State = txmgrcommon.TxInProgress
-	require.NoError(t, txStore.InsertTx(&etx))
-	attempt := NewLegacyEthTxAttempt(t, etx.ID)
-	tx := types.NewTransaction(uint64(nonce), testutils.NewAddress(), big.NewInt(142), 242, big.NewInt(342), []byte{1, 2, 3})
-	rlp := new(bytes.Buffer)
-	require.NoError(t, tx.EncodeRLP(rlp))
-	attempt.SignedRawTx = rlp.Bytes()
-	attempt.State = txmgrtypes.TxAttemptInProgress
-	require.NoError(t, txStore.InsertTxAttempt(&attempt))
-	etx, err := txStore.FindTxWithAttempts(etx.ID)
-	require.NoError(t, err)
-	return etx
-}
-
-func MustCreateUnstartedGeneratedTx(t testing.TB, txStore txmgr.EvmTxStore, fromAddress common.Address, chainID *big.Int, opts ...func(*txmgr.TxRequest)) (tx txmgr.Tx) {
-	txRequest := txmgr.TxRequest{
-		FromAddress: fromAddress,
-	}
-
-	// Apply the default options
-	WithDefaults()(&txRequest)
-	// Apply the optional parameters
-	for _, opt := range opts {
-		opt(&txRequest)
-	}
-	return MustCreateUnstartedTxFromEvmTxRequest(t, txStore, txRequest, chainID)
-}
-
-func WithDefaults() func(*txmgr.TxRequest) {
-	return func(tx *txmgr.TxRequest) {
-		tx.ToAddress = testutils.NewAddress()
-		tx.EncodedPayload = []byte{1, 2, 3}
-		tx.Value = big.Int(assets.NewEthValue(142))
-		tx.FeeLimit = uint32(1000000000)
-		tx.Strategy = txmgrcommon.NewSendEveryStrategy()
-		// Set default values for other fields if needed
-	}
-}
-
-func EvmTxRequestWithStrategy(strategy txmgrtypes.TxStrategy) func(*txmgr.TxRequest) {
-	return func(tx *txmgr.TxRequest) {
-		tx.Strategy = strategy
-	}
-}
-
-func EvmTxRequestWithChecker(checker txmgr.TransmitCheckerSpec) func(*txmgr.TxRequest) {
-	return func(tx *txmgr.TxRequest) {
-		tx.Checker = checker
-	}
-}
-func EvmTxRequestWithValue(value big.Int) func(*txmgr.TxRequest) {
-	return func(tx *txmgr.TxRequest) {
-		tx.Value = value
-	}
-}
-
-func EvmTxRequestWithIdempotencyKey(idempotencyKey string) func(*txmgr.TxRequest) {
-	return func(tx *txmgr.TxRequest) {
-		tx.IdempotencyKey = &idempotencyKey
-	}
-}
-
-func MustCreateUnstartedTx(t testing.TB, txStore txmgr.EvmTxStore, fromAddress common.Address, toAddress common.Address, encodedPayload []byte, gasLimit uint32, value big.Int, chainID *big.Int, opts ...interface{}) (tx txmgr.Tx) {
-	txRequest := txmgr.TxRequest{
-		FromAddress:    fromAddress,
-		ToAddress:      toAddress,
-		EncodedPayload: encodedPayload,
-		Value:          value,
-		FeeLimit:       gasLimit,
-		Strategy:       txmgrcommon.NewSendEveryStrategy(),
-	}
-
-	return MustCreateUnstartedTxFromEvmTxRequest(t, txStore, txRequest, chainID)
-}
-
-func MustCreateUnstartedTxFromEvmTxRequest(t testing.TB, txStore txmgr.EvmTxStore, txRequest txmgr.TxRequest, chainID *big.Int) (tx txmgr.Tx) {
-	tx, err := txStore.CreateTransaction(testutils.Context(t), txRequest, chainID)
-	require.NoError(t, err)
-	return tx
-}
-
 func NewLegacyEthTxAttempt(t *testing.T, etxID int64) txmgr.TxAttempt {
 	gasPrice := assets.NewWeiI(1)
 	return txmgr.TxAttempt{
@@ -406,72 +235,6 @@ func NewDynamicFeeEthTxAttempt(t *testing.T, etxID int64) txmgr.TxAttempt {
 	}
 }
 
-func NewEthReceipt(t *testing.T, blockNumber int64, blockHash common.Hash, txHash common.Hash, status uint64) txmgr.Receipt {
-	transactionIndex := uint(NewRandomPositiveInt64())
-
-	receipt := evmtypes.Receipt{
-		BlockNumber:      big.NewInt(blockNumber),
-		BlockHash:        blockHash,
-		TxHash:           txHash,
-		TransactionIndex: transactionIndex,
-		Status:           status,
-	}
-
-	r := txmgr.Receipt{
-		BlockNumber:      blockNumber,
-		BlockHash:        blockHash,
-		TxHash:           txHash,
-		TransactionIndex: transactionIndex,
-		Receipt:          receipt,
-	}
-	return r
-}
-
-func MustInsertEthReceipt(t *testing.T, txStore txmgr.TestEvmTxStore, blockNumber int64, blockHash common.Hash, txHash common.Hash) txmgr.Receipt {
-	r := NewEthReceipt(t, blockNumber, blockHash, txHash, 0x1)
-	id, err := txStore.InsertReceipt(&r.Receipt)
-	require.NoError(t, err)
-	r.ID = id
-	return r
-}
-
-func MustInsertRevertedEthReceipt(t *testing.T, txStore txmgr.TestEvmTxStore, blockNumber int64, blockHash common.Hash, txHash common.Hash) txmgr.Receipt {
-	r := NewEthReceipt(t, blockNumber, blockHash, txHash, 0x0)
-	id, err := txStore.InsertReceipt(&r.Receipt)
-	require.NoError(t, err)
-	r.ID = id
-	return r
-}
-
-// Inserts into evm.receipts but does not update evm.txes or evm.tx_attempts
-func MustInsertConfirmedEthTxWithReceipt(t *testing.T, txStore txmgr.TestEvmTxStore, fromAddress common.Address, nonce, blockNum int64) (etx txmgr.Tx) {
-	etx = MustInsertConfirmedEthTxWithLegacyAttempt(t, txStore, nonce, blockNum, fromAddress)
-	MustInsertEthReceipt(t, txStore, blockNum, utils.NewHash(), etx.TxAttempts[0].Hash)
-	return etx
-}
-
-func MustInsertConfirmedEthTxBySaveFetchedReceipts(t *testing.T, txStore txmgr.TestEvmTxStore, fromAddress common.Address, nonce int64, blockNum int64, chainID big.Int) (etx txmgr.Tx) {
-	etx = MustInsertConfirmedEthTxWithLegacyAttempt(t, txStore, nonce, blockNum, fromAddress)
-	receipt := evmtypes.Receipt{
-		TxHash:           etx.TxAttempts[0].Hash,
-		BlockHash:        utils.NewHash(),
-		BlockNumber:      big.NewInt(nonce),
-		TransactionIndex: uint(1),
-	}
-	err := txStore.SaveFetchedReceipts(testutils.Context(t), []*evmtypes.Receipt{&receipt}, &chainID)
-	require.NoError(t, err)
-	return etx
-}
-
-func MustInsertFatalErrorEthTx(t *testing.T, txStore txmgr.TestEvmTxStore, fromAddress common.Address) txmgr.Tx {
-	etx := NewEthTx(t, fromAddress)
-	etx.Error = null.StringFrom("something exploded")
-	etx.State = txmgrcommon.TxFatalError
-
-	require.NoError(t, txStore.InsertTx(&etx))
-	return etx
-}
-
 type RandomKey struct {
 	Nonce    int64
 	Disabled bool
@@ -500,7 +263,8 @@ func (r RandomKey) MustInsert(t testing.TB, keystore keystore.Eth) (ethkey.KeyV2
 
 func (r RandomKey) MustInsertWithState(t testing.TB, keystore keystore.Eth) (ethkey.State, common.Address) {
 	k, address := r.MustInsert(t, keystore)
-	state := MustGetStateForKey(t, keystore, k)
+	state, err := keystore.GetStateForKey(k)
+	require.NoError(t, err)
 	return state, address
 }
 
diff --git a/core/internal/features/features_test.go b/core/internal/features/features_test.go
index 7749b173c55..35fd3a31ff8 100644
--- a/core/internal/features/features_test.go
+++ b/core/internal/features/features_test.go
@@ -429,7 +429,7 @@ func TestIntegration_DirectRequest(t *testing.T) {
 
 			pipelineRuns := cltest.WaitForPipelineComplete(t, 0, j.ID, 1, 14, app.JobORM(), testutils.WaitTimeout(t)/2, time.Second)
 			pipelineRun := pipelineRuns[0]
-			cltest.AssertPipelineTaskRunsSuccessful(t, pipelineRun.PipelineTaskRuns)
+			assertPipelineTaskRunsSuccessful(t, pipelineRun.PipelineTaskRuns)
 			assertPricesUint256(t, big.NewInt(61464), big.NewInt(50707), big.NewInt(6381886), operatorContracts.multiWord)
 
 			nameAndExternalJobID = uuid.New()
@@ -454,7 +454,7 @@ func TestIntegration_DirectRequest(t *testing.T) {
 
 			pipelineRuns = cltest.WaitForPipelineComplete(t, 0, jobSingleWord.ID, 1, 8, app.JobORM(), testutils.WaitTimeout(t), time.Second)
 			pipelineRun = pipelineRuns[0]
-			cltest.AssertPipelineTaskRunsSuccessful(t, pipelineRun.PipelineTaskRuns)
+			assertPipelineTaskRunsSuccessful(t, pipelineRun.PipelineTaskRuns)
 			v, err := operatorContracts.singleWord.CurrentPriceInt(nil)
 			require.NoError(t, err)
 			assert.Equal(t, big.NewInt(61464), v)
@@ -535,7 +535,7 @@ observationSource   = """
 
 		// The run should have succeeded but with the receipt detailing the reverted transaction
 		pipelineRun := pipelineRuns[0]
-		cltest.AssertPipelineTaskRunsSuccessful(t, pipelineRun.PipelineTaskRuns)
+		assertPipelineTaskRunsSuccessful(t, pipelineRun.PipelineTaskRuns)
 
 		outputs := pipelineRun.Outputs.Val.([]interface{})
 		require.Len(t, outputs, 1)
@@ -581,7 +581,7 @@ observationSource   = """
 
 		// The run should have failed as a revert
 		pipelineRun := pipelineRuns[0]
-		cltest.AssertPipelineTaskRunsErrored(t, pipelineRun.PipelineTaskRuns)
+		assertPipelineTaskRunsErrored(t, pipelineRun.PipelineTaskRuns)
 	})
 
 	t.Run("with FailOnRevert disabled, run succeeds with output being reverted receipt", func(t *testing.T) {
@@ -619,7 +619,7 @@ observationSource   = """
 
 		// The run should have succeeded but with the receipt detailing the reverted transaction
 		pipelineRun := pipelineRuns[0]
-		cltest.AssertPipelineTaskRunsSuccessful(t, pipelineRun.PipelineTaskRuns)
+		assertPipelineTaskRunsSuccessful(t, pipelineRun.PipelineTaskRuns)
 
 		outputs := pipelineRun.Outputs.Val.([]interface{})
 		require.Len(t, outputs, 1)
@@ -1454,3 +1454,17 @@ func assertPricesUint256(t *testing.T, usd, eur, jpy *big.Int, consumer *multiwo
 }
 
 func ptr[T any](v T) *T { return &v }
+
+func assertPipelineTaskRunsSuccessful(t testing.TB, runs []pipeline.TaskRun) {
+	t.Helper()
+	for i, run := range runs {
+		require.True(t, run.Error.IsZero(), fmt.Sprintf("pipeline.Task run failed (idx: %v, dotID: %v, error: '%v')", i, run.GetDotID(), run.Error.ValueOrZero()))
+	}
+}
+
+func assertPipelineTaskRunsErrored(t testing.TB, runs []pipeline.TaskRun) {
+	t.Helper()
+	for i, run := range runs {
+		require.False(t, run.Error.IsZero(), fmt.Sprintf("expected pipeline.Task run to have failed, but it succeeded (idx: %v, dotID: %v, output: '%v')", i, run.GetDotID(), run.Output))
+	}
+}
diff --git a/core/services/ocrcommon/discoverer_database_test.go b/core/services/ocrcommon/discoverer_database_test.go
index 2300316092d..ff1a931b017 100644
--- a/core/services/ocrcommon/discoverer_database_test.go
+++ b/core/services/ocrcommon/discoverer_database_test.go
@@ -1,23 +1,24 @@
 package ocrcommon_test
 
 import (
+	"crypto/rand"
 	"testing"
 
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocrcommon"
-
+	cryptop2p "github.com/libp2p/go-libp2p-core/crypto"
+	p2ppeer "github.com/libp2p/go-libp2p-core/peer"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
+	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocrcommon"
 )
 
 func Test_DiscovererDatabase(t *testing.T) {
 	db := pgtest.NewSqlDB(t)
 
-	localPeerID1 := cltest.MustRandomP2PPeerID(t)
-	localPeerID2 := cltest.MustRandomP2PPeerID(t)
+	localPeerID1 := mustRandomP2PPeerID(t)
+	localPeerID2 := mustRandomP2PPeerID(t)
 
 	dd1 := ocrcommon.NewDiscovererDatabase(db, localPeerID1)
 	dd2 := ocrcommon.NewDiscovererDatabase(db, localPeerID2)
@@ -81,3 +82,11 @@ func Test_DiscovererDatabase(t *testing.T) {
 
 	})
 }
+
+func mustRandomP2PPeerID(t *testing.T) p2ppeer.ID {
+	p2pPrivkey, _, err := cryptop2p.GenerateEd25519Key(rand.Reader)
+	require.NoError(t, err)
+	id, err := p2ppeer.IDFromPrivateKey(p2pPrivkey)
+	require.NoError(t, err)
+	return id
+}
diff --git a/core/services/pg/event_broadcaster_test.go b/core/services/pg/event_broadcaster_test.go
index a82e26e0589..41dcbb0176f 100644
--- a/core/services/pg/event_broadcaster_test.go
+++ b/core/services/pg/event_broadcaster_test.go
@@ -5,20 +5,20 @@ import (
 	"testing"
 	"time"
 
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
-
+	"github.com/google/uuid"
 	"github.com/onsi/gomega"
 	"github.com/stretchr/testify/require"
 
-	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest/heavyweight"
+	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
+	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 )
 
 func TestEventBroadcaster(t *testing.T) {
 	config, _ := heavyweight.FullTestDBNoFixturesV2(t, nil)
 
-	eventBroadcaster := cltest.NewEventBroadcaster(t, config.Database().URL())
+	eventBroadcaster := pg.NewEventBroadcaster(config.Database().URL(), 0, 0, logger.TestLogger(t), uuid.New())
 	require.NoError(t, eventBroadcaster.Start(testutils.Context(t)))
 	t.Cleanup(func() { require.NoError(t, eventBroadcaster.Close()) })
 

From d424b11e082a1343db30e18fac802028996f8ae1 Mon Sep 17 00:00:00 2001
From: Jordan Krage <jmank88@gmail.com>
Date: Mon, 27 Nov 2023 10:58:28 -0600
Subject: [PATCH 011/130] bump various deps (#11357)

---
 core/scripts/go.mod      |  71 ++++++------
 core/scripts/go.sum      | 226 +++++++++++++++++++++++---------------
 go.mod                   |  69 ++++++------
 go.sum                   | 228 ++++++++++++++++++++++++---------------
 integration-tests/go.mod |  70 ++++++------
 integration-tests/go.sum | 160 +++++++++++++--------------
 6 files changed, 468 insertions(+), 356 deletions(-)

diff --git a/core/scripts/go.mod b/core/scripts/go.mod
index e9fa432d4cd..1a0775bb837 100644
--- a/core/scripts/go.mod
+++ b/core/scripts/go.mod
@@ -8,11 +8,11 @@ replace github.com/smartcontractkit/chainlink/v2 => ../../
 require (
 	github.com/ava-labs/coreth v0.12.1
 	github.com/avast/retry-go v3.0.0+incompatible
-	github.com/docker/docker v24.0.6+incompatible
+	github.com/docker/docker v24.0.7+incompatible
 	github.com/docker/go-connections v0.4.0
 	github.com/ethereum/go-ethereum v1.12.0
-	github.com/google/go-cmp v0.5.9
-	github.com/google/uuid v1.3.1
+	github.com/google/go-cmp v0.6.0
+	github.com/google/uuid v1.4.0
 	github.com/jmoiron/sqlx v1.3.5
 	github.com/joho/godotenv v1.4.0
 	github.com/manyminds/api2go v0.0.0-20171030193247-e7b693844a6f
@@ -56,7 +56,7 @@ require (
 	github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 // indirect
 	github.com/armon/go-metrics v0.4.1 // indirect
 	github.com/ava-labs/avalanchego v1.10.1 // indirect
-	github.com/avast/retry-go/v4 v4.5.0 // indirect
+	github.com/avast/retry-go/v4 v4.5.1 // indirect
 	github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect
@@ -103,7 +103,7 @@ require (
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
 	github.com/esote/minmaxheap v1.0.0 // indirect
-	github.com/fatih/color v1.15.0 // indirect
+	github.com/fatih/color v1.16.0 // indirect
 	github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/fxamacker/cbor/v2 v2.5.0 // indirect
@@ -125,21 +125,21 @@ require (
 	github.com/go-kit/log v0.2.1 // indirect
 	github.com/go-ldap/ldap/v3 v3.4.5 // indirect
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-logr/logr v1.3.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.14.0 // indirect
 	github.com/go-stack/stack v1.8.1 // indirect
-	github.com/go-webauthn/webauthn v0.8.6 // indirect
+	github.com/go-webauthn/webauthn v0.9.1 // indirect
 	github.com/go-webauthn/x v0.1.4 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
 	github.com/gofrs/flock v0.8.1 // indirect
 	github.com/gogo/protobuf v1.3.3 // indirect
-	github.com/golang-jwt/jwt/v5 v5.0.0 // indirect
-	github.com/golang/glog v1.1.0 // indirect
+	github.com/golang-jwt/jwt/v5 v5.1.0 // indirect
+	github.com/golang/glog v1.1.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/mock v1.6.0 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
@@ -151,9 +151,9 @@ require (
 	github.com/google/gopacket v1.1.19 // indirect
 	github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8 // indirect
 	github.com/gorilla/context v1.1.1 // indirect
-	github.com/gorilla/securecookie v1.1.1 // indirect
-	github.com/gorilla/sessions v1.2.1 // indirect
-	github.com/gorilla/websocket v1.5.0 // indirect
+	github.com/gorilla/securecookie v1.1.2 // indirect
+	github.com/gorilla/sessions v1.2.2 // indirect
+	github.com/gorilla/websocket v1.5.1 // indirect
 	github.com/grafana/pyroscope-go v1.0.4 // indirect
 	github.com/grafana/pyroscope-go/godeltaprof v0.1.4 // indirect
 	github.com/graph-gophers/dataloader v5.0.0+incompatible // indirect
@@ -201,7 +201,7 @@ require (
 	github.com/jmhodges/levigo v1.0.0 // indirect
 	github.com/jpillora/backoff v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.0 // indirect
+	github.com/klauspost/compress v1.17.2 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
 	github.com/koron/go-ssdp v0.0.2 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
@@ -251,7 +251,7 @@ require (
 	github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-runewidth v0.0.14 // indirect
 	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
 	github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
@@ -285,7 +285,7 @@ require (
 	github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
-	github.com/pressly/goose/v3 v3.15.1 // indirect
+	github.com/pressly/goose/v3 v3.16.0 // indirect
 	github.com/prometheus/client_golang v1.17.0 // indirect
 	github.com/prometheus/client_model v0.5.0 // indirect
 	github.com/prometheus/common v0.45.0 // indirect
@@ -299,8 +299,9 @@ require (
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/sasha-s/go-deadlock v0.3.1 // indirect
 	github.com/scylladb/go-reflectx v1.0.1 // indirect
+	github.com/sethvargo/go-retry v0.2.4 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
-	github.com/shirou/gopsutil/v3 v3.23.9 // indirect
+	github.com/shirou/gopsutil/v3 v3.23.10 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect
 	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231121180428-d7f28e91ccc3 // indirect
@@ -344,33 +345,33 @@ require (
 	go.dedis.ch/fixbuf v1.0.3 // indirect
 	go.etcd.io/bbolt v1.3.7 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 // indirect
-	go.opentelemetry.io/otel v1.19.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.18.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.18.0 // indirect
-	go.opentelemetry.io/otel/metric v1.19.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.19.0 // indirect
-	go.opentelemetry.io/otel/trace v1.19.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
+	go.opentelemetry.io/otel v1.21.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
+	go.opentelemetry.io/otel/metric v1.21.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.21.0 // indirect
+	go.opentelemetry.io/otel/trace v1.21.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/ratelimit v0.2.0 // indirect
 	go.uber.org/zap v1.26.0 // indirect
 	golang.org/x/arch v0.4.0 // indirect
-	golang.org/x/crypto v0.14.0 // indirect
+	golang.org/x/crypto v0.15.0 // indirect
 	golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect
-	golang.org/x/mod v0.13.0 // indirect
-	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/sync v0.4.0 // indirect
-	golang.org/x/sys v0.13.0 // indirect
-	golang.org/x/term v0.13.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
+	golang.org/x/mod v0.14.0 // indirect
+	golang.org/x/net v0.18.0 // indirect
+	golang.org/x/sync v0.5.0 // indirect
+	golang.org/x/sys v0.14.0 // indirect
+	golang.org/x/term v0.14.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.14.0 // indirect
+	golang.org/x/tools v0.15.0 // indirect
 	gonum.org/v1/gonum v0.14.0 // indirect
-	google.golang.org/genproto v0.0.0-20230717213848-3f92550aa753 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20230717213848-3f92550aa753 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230717213848-3f92550aa753 // indirect
-	google.golang.org/grpc v1.58.3 // indirect
+	google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
+	google.golang.org/grpc v1.59.0 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/guregu/null.v2 v2.1.2 // indirect
 	gopkg.in/guregu/null.v4 v4.0.0 // indirect
diff --git a/core/scripts/go.sum b/core/scripts/go.sum
index 3d9962474b9..ef7aa735bb9 100644
--- a/core/scripts/go.sum
+++ b/core/scripts/go.sum
@@ -18,23 +18,23 @@ cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHOb
 cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
 cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
 cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY=
-cloud.google.com/go v0.110.4 h1:1JYyxKMN9hd5dR2MYTPWkGUgcoxVVhg0LKNKEo0qvmk=
-cloud.google.com/go v0.110.4/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI=
+cloud.google.com/go v0.110.9 h1:e7ITSqGFFk4rbz/JFIqZh3G4VEHguhAL4BQcFlWtU68=
+cloud.google.com/go v0.110.9/go.mod h1:rpxevX/0Lqvlbc88b7Sc1SPNdyK1riNBTUU6JXhYNpM=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
 cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
 cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
 cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/compute v1.22.0 h1:cB8R6FtUtT1TYGl5R3xuxnW6OUIc/DrT2aiR16TTG7Y=
-cloud.google.com/go/compute v1.22.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM=
+cloud.google.com/go/compute v1.23.2 h1:nWEMDhgbBkBJjfpVySqU4jgWdc22PLR0o4vEexZHers=
+cloud.google.com/go/compute v1.23.2/go.mod h1:JJ0atRC0J/oWYiiVBmsSsrRnh92DhZPG4hFDcR04Rns=
 cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
 cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
 cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk=
-cloud.google.com/go/iam v1.1.1 h1:lW7fzj15aVIXYHREOqjRBV9PsH0Z6u8Y46a1YGvQP4Y=
-cloud.google.com/go/iam v1.1.1/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU=
+cloud.google.com/go/iam v1.1.4 h1:K6n/GZHFTtEoKT5aUG3l9diPi0VduZNQ1PfdnpkkIFk=
+cloud.google.com/go/iam v1.1.4/go.mod h1:l/rg8l1AaA+VFMho/HYx2Vv6xinPSLMF8qfhRPIZ0L8=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
 cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
@@ -87,6 +87,10 @@ github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbi
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg=
 github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4=
+github.com/ClickHouse/ch-go v0.58.2 h1:jSm2szHbT9MCAB1rJ3WuCJqmGLi5UTjlNu+f530UTS0=
+github.com/ClickHouse/ch-go v0.58.2/go.mod h1:Ap/0bEmiLa14gYjCiRkYGbXvbe8vwdrfTYWhsuQ99aw=
+github.com/ClickHouse/clickhouse-go/v2 v2.15.0 h1:G0hTKyO8fXXR1bGnZ0DY3vTG01xYfOGW76zgjg5tmC4=
+github.com/ClickHouse/clickhouse-go/v2 v2.15.0/go.mod h1:kXt1SRq0PIRa6aKZD7TnFnY9PQKmc2b13sHtOYcK6cQ=
 github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno=
 github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo=
 github.com/CosmWasm/wasmd v0.40.1 h1:LxbO78t/6S8TkeQlUrJ0m5O87HtAwLx4RGHq3rdrOEU=
@@ -133,6 +137,8 @@ github.com/allegro/bigcache v1.2.1 h1:hg1sY1raCwic3Vnsvje6TT7/pnZba83LeFck5NrFKS
 github.com/allegro/bigcache v1.2.1/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
 github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 h1:MzBOUgng9orim59UnfUTLRjMpd09C5uEVQ6RPGeCaVI=
 github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129/go.mod h1:rFgpPQZYZ8vdbc+48xibu8ALc3yeyd64IhHS+PU6Yyg=
+github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI=
+github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/appleboy/gofight/v2 v2.1.2 h1:VOy3jow4vIK8BRQJoC/I9muxyYlJ2yb9ht2hZoS3rf4=
 github.com/appleboy/gofight/v2 v2.1.2/go.mod h1:frW+U1QZEdDgixycTj4CygQ48yLTUhplt43+Wczp3rw=
@@ -148,8 +154,8 @@ github.com/ava-labs/coreth v0.12.1 h1:EWSkFGHGVUxmu1pnSK/2pdcxaAVHbGspHqO3Ag+i7s
 github.com/ava-labs/coreth v0.12.1/go.mod h1:/5x54QlIKjlPebkdzTA5ic9wXdejbWOnQosztkv9jxo=
 github.com/avast/retry-go v3.0.0+incompatible h1:4SOWQ7Qs+oroOTQOYnAHqelpCO0biHSxpiH9JdtuBj0=
 github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY=
-github.com/avast/retry-go/v4 v4.5.0 h1:QoRAZZ90cj5oni2Lsgl2GW8mNTnUCnmpx/iKpwVisHg=
-github.com/avast/retry-go/v4 v4.5.0/go.mod h1:7hLEXp0oku2Nir2xBAsg0PTphp9z71bN5Aq1fboC3+I=
+github.com/avast/retry-go/v4 v4.5.1 h1:AxIx0HGi4VZ3I02jr78j5lZ3M6x1E0Ivxa6b0pUUh7o=
+github.com/avast/retry-go/v4 v4.5.1/go.mod h1:/sipNsvNB3RRuT5iNcb6h73nw3IBmXJ/H3XrCQYSOpc=
 github.com/aws/aws-sdk-go v1.22.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.44.302 h1:ST3ko6GrJKn3Xi+nAvxjG3uk/V1pW8KC52WLeIxqqNk=
@@ -246,8 +252,8 @@ github.com/cometbft/cometbft-db v0.7.0 h1:uBjbrBx4QzU0zOEnU8KxoDl18dMNgDh+zZRUE0
 github.com/cometbft/cometbft-db v0.7.0/go.mod h1:yiKJIm2WKrt6x8Cyxtq9YTEcIMPcEe4XPxhgX59Fzf0=
 github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4=
 github.com/confio/ics23/go v0.9.0/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e/mYVRak=
-github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM=
-github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=
+github.com/containerd/continuity v0.4.3 h1:6HVkalIp+2u1ZLH1J/pYX2oBVXlJZvh1X1A7bEZ9Su8=
+github.com/containerd/continuity v0.4.3/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
@@ -335,10 +341,12 @@ github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUn
 github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y=
 github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
+github.com/docker/cli v24.0.7+incompatible h1:wa/nIwYFW7BVTGa7SWPVyyXU9lgORqUb1xfI36MSkFg=
+github.com/docker/cli v24.0.7+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
 github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v24.0.6+incompatible h1:hceabKCtUgDqPu+qm0NgsaXf28Ljf4/pWFL7xjWWDgE=
-github.com/docker/docker v24.0.6+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM=
+github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
@@ -349,6 +357,10 @@ github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+m
 github.com/dvsekhvalnov/jose2go v1.5.0 h1:3j8ya4Z4kMCwT5nXIKFSV84YS+HdqSSO0VsTQxaLAeM=
 github.com/dvsekhvalnov/jose2go v1.5.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU=
 github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
+github.com/elastic/go-sysinfo v1.11.1 h1:g9mwl05njS4r69TisC+vwHWTSKywZFYYUu3so3T/Lao=
+github.com/elastic/go-sysinfo v1.11.1/go.mod h1:6KQb31j0QeWBDF88jIdWSxE8cwoOB9tO4Y4osN7Q70E=
+github.com/elastic/go-windows v1.0.1 h1:AlYZOldA+UJ0/2nBuqWdo90GFCgG9xuyw9SYzGUtJm0=
+github.com/elastic/go-windows v1.0.1/go.mod h1:FoVvqWSun28vaDQPbj2Elfc0JahhPB7WQEGa3c814Ss=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -373,8 +385,8 @@ github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
-github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
+github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
+github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
 github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
 github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
@@ -434,6 +446,10 @@ github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclK
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
 github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
 github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
+github.com/go-faster/city v1.0.1 h1:4WAxSZ3V2Ws4QRDrscLEDcibJY8uf41H6AhXDrNDcGw=
+github.com/go-faster/city v1.0.1/go.mod h1:jKcUJId49qdW3L1qKHH/3wPeUstCVpVSXTM6vO3VcTw=
+github.com/go-faster/errors v0.6.1 h1:nNIPOBkprlKzkThvS/0YaX8Zs9KewLCOSFQS5BU06FI=
+github.com/go-faster/errors v0.6.1/go.mod h1:5MGV2/2T9yvlrbhe9pD9LO5Z/2zCSq2T8j+Jpi2LAyY=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -452,8 +468,8 @@ github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG
 github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=
 github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
-github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
+github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8=
@@ -478,8 +494,8 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me
 github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw=
 github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
-github.com/go-webauthn/webauthn v0.8.6 h1:bKMtL1qzd2WTFkf1mFTVbreYrwn7dsYmEPjTq6QN90E=
-github.com/go-webauthn/webauthn v0.8.6/go.mod h1:emwVLMCI5yx9evTTvr0r+aOZCdWJqMfbRhF0MufyUog=
+github.com/go-webauthn/webauthn v0.9.1 h1:KuZjvUX9JTuFjB2n7kZhM6n76BClLUFbFM8SLKnrXpo=
+github.com/go-webauthn/webauthn v0.9.1/go.mod h1:m315kRGbUljOytw8b9FGWG9QzErjI5v02pNFCF3lwpI=
 github.com/go-webauthn/x v0.1.4 h1:sGmIFhcY70l6k7JIDfnjVBiAAFEssga5lXIUXe0GtAs=
 github.com/go-webauthn/x v0.1.4/go.mod h1:75Ug0oK6KYpANh5hDOanfDI+dvPWHk788naJVG/37H8=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
@@ -503,11 +519,11 @@ github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keL
 github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
 github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
-github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE=
-github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/golang-jwt/jwt/v5 v5.1.0 h1:UGKbA/IPjtS6zLcdB7i5TyACMgSbOTiR8qzXgw8HWQU=
+github.com/golang-jwt/jwt/v5 v5.1.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE=
-github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ=
+github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo=
+github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -565,8 +581,9 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
@@ -601,11 +618,13 @@ github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8/go.mod h1:Jh3hGz2jkYa
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc=
 github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
+github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
+github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
-github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
+github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/enterprise-certificate-proxy v0.2.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM=
 github.com/googleapis/enterprise-certificate-proxy v0.2.5/go.mod h1:RxW0N9901Cko1VOCW3SXCpWP+mlIEkk2tP7jnHy9a3w=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
@@ -621,14 +640,14 @@ github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/rpc v1.2.0/go.mod h1:V4h9r+4sF5HnzqbwIez0fKSpANP0zlYd3qR7p36jkTQ=
-github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
-github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
-github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI=
-github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
+github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA=
+github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo=
+github.com/gorilla/sessions v1.2.2 h1:lqzMYz6bOfvn2WriPUjNByzeXIlVzURcPmgMczkmTjY=
+github.com/gorilla/sessions v1.2.2/go.mod h1:ePLdVu+jbEgHH+KWw8I1z2wqd0BAdAQh/8LRvBeoNcQ=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
-github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
+github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
 github.com/grafana/pyroscope-go v1.0.4 h1:oyQX0BOkL+iARXzHuCdIF5TQ7/sRSel1YFViMHC7Bm0=
 github.com/grafana/pyroscope-go v1.0.4/go.mod h1:0d7ftwSMBV/Awm7CCiYmHQEG8Y44Ma3YSjt+nWcWztY=
 github.com/grafana/pyroscope-go/godeltaprof v0.1.4 h1:mDsJ3ngul7UfrHibGQpV66PbZ3q1T8glz/tK3bQKKEk=
@@ -732,6 +751,8 @@ github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3
 github.com/hydrogen18/memlistener v0.0.0-20200120041712-dcc25e7acd91/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
+github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
 github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA=
 github.com/improbable-eng/grpc-web v0.15.0 h1:BN+7z6uNXZ1tQGcNAuaU1YjsLTApzkjt2tzCixLaUPQ=
 github.com/improbable-eng/grpc-web v0.15.0/go.mod h1:1sy9HKV4Jt9aEs9JSnkWlRJPuPtwNr0l57L4f878wP8=
@@ -832,10 +853,15 @@ github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQ
 github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs=
 github.com/jackc/pgx/v4 v4.18.1 h1:YP7G1KABtKpB5IHrO9vYwSrCOhs7p3uqhvhhQBptya0=
 github.com/jackc/pgx/v4 v4.18.1/go.mod h1:FydWkUyadDmdNH/mHnGob881GawxeEm7TcMCzkb+qQE=
+github.com/jackc/pgx/v5 v5.5.0 h1:NxstgwndsTRy7eq9/kqYc/BZh5w2hHJV86wjvO+1xPw=
+github.com/jackc/pgx/v5 v5.5.0/go.mod h1:Ig06C2Vu0t5qXC60W8sqIthScaEnFvojjj9dSljmHRA=
 github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v1.3.0 h1:eHK/5clGOatcjX3oWGBO/MpxpbHzSwud5EWTSCI+MX0=
 github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk=
+github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 github.com/jackpal/gateway v1.0.5/go.mod h1:lTpwd4ACLXmpyiCTRtfiNyVnUmqT9RivzCDQetPfnjA=
 github.com/jackpal/go-nat-pmp v1.0.1/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
 github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
@@ -860,9 +886,13 @@ github.com/jmhodges/levigo v1.0.0 h1:q5EC36kV79HWeTBWsod3mG11EgStG3qArTKcvlksN1U
 github.com/jmhodges/levigo v1.0.0/go.mod h1:Q6Qx+uH3RAqyK4rFQroq9RL7mdkABMcfhEI+nNuzMJQ=
 github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
 github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
+github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 h1:rp+c0RAYOWj8l6qbCUTSiRLG/iKnW3K3/QfPPuSsBt4=
+github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod h1:Z86h9688Y0wesXCyonoVr47MasHilkuLMqGhRZ4Hpak=
 github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg=
 github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4=
+github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc=
 github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
@@ -891,8 +921,8 @@ github.com/klauspost/compress v1.9.7/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0
 github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/klauspost/compress v1.17.0 h1:Rnbp4K9EjcDuVuHtd0dgA4qNuv9yKDYKK1ulpJwgrqM=
-github.com/klauspost/compress v1.17.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
+github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4=
+github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
@@ -1168,8 +1198,8 @@ github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOA
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
-github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
 github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
@@ -1326,25 +1356,29 @@ github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoT
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
-github.com/onsi/gomega v1.27.8 h1:gegWiwZjBsf2DgiSbf5hpokZ98JVDMcWkUiigk6/KXc=
-github.com/onsi/gomega v1.27.8/go.mod h1:2J8vzI/s+2shY9XHRApDkdgPo1TKT7P2u6fXeJKFnNQ=
+github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
+github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/cbdlwvlWt0pnFI=
 github.com/opencontainers/image-spec v1.1.0-rc5/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
-github.com/opencontainers/runc v1.1.9 h1:XR0VIHTGce5eWPkaPesqTBrhW2yAcaraWfsEalNwQLM=
-github.com/opencontainers/runc v1.1.9/go.mod h1:CbUumNnWCuTGFukNXahoo/RFBZvDAgRh/smNYNOhA50=
+github.com/opencontainers/runc v1.1.10 h1:EaL5WeO9lv9wmS6SASjszOeQdSctvpbu0DdBQBizE40=
+github.com/opencontainers/runc v1.1.10/go.mod h1:+/R6+KmDlh+hOO8NkjmgkG9Qzvypzk0yXxAPYYR65+M=
 github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA=
 github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs=
+github.com/ory/dockertest/v3 v3.10.0 h1:4K3z2VMe8Woe++invjaTB7VRyQXQy5UY+loujO4aNE4=
+github.com/ory/dockertest/v3 v3.10.0/go.mod h1:nr57ZbRWMqfsdGdFNLHz5jjNdDb7VVFnzAeW1n5N1Lg=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
+github.com/paulmach/orb v0.10.0 h1:guVYVqzxHE/CQ1KpfGO077TR0ATHSNjp4s6XGLn3W9s=
+github.com/paulmach/orb v0.10.0/go.mod h1:5mULz1xQfs3bmQm63QEJA6lNGujuRafwA5S/EnuLaLU=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
@@ -1354,6 +1388,8 @@ github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdU
 github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o=
 github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 h1:hDSdbBuw3Lefr6R18ax0tZ2BJeNB3NehB3trOwYBsdU=
 github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
+github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ=
+github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
 github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
@@ -1368,8 +1404,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
-github.com/pressly/goose/v3 v3.15.1 h1:dKaJ1SdLvS/+HtS8PzFT0KBEtICC1jewLXM+b3emlv8=
-github.com/pressly/goose/v3 v3.15.1/go.mod h1:0E3Yg/+EwYzO6Rz2P98MlClFgIcoujbVRs575yi3iIM=
+github.com/pressly/goose/v3 v3.16.0 h1:xMJUsZdHLqSnCqESyKSqEfcYVYsUuup1nrOhaEFftQg=
+github.com/pressly/goose/v3 v3.16.0/go.mod h1:JwdKVnmCRhnF6XLQs2mHEQtucFD49cQBdRM4UiwkxsM=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
@@ -1443,11 +1479,15 @@ github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtm
 github.com/scylladb/go-reflectx v1.0.1 h1:b917wZM7189pZdlND9PbIJ6NQxfDPfBvUaQ7cjj1iZQ=
 github.com/scylladb/go-reflectx v1.0.1/go.mod h1:rWnOfDIRWBGN0miMLIcoPt/Dhi2doCMZqwMCJ3KupFc=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
+github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys=
+github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
+github.com/sethvargo/go-retry v0.2.4 h1:T+jHEQy/zKJf5s95UkguisicE0zuF9y7+/vgz08Ocec=
+github.com/sethvargo/go-retry v0.2.4/go.mod h1:1afjQuvh7s4gflMObvjLPaWgluLLyhA1wmVZ6KLpICw=
 github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
 github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
-github.com/shirou/gopsutil/v3 v3.23.9 h1:ZI5bWVeu2ep4/DIxB4U9okeYJ7zp/QLTO4auRb/ty/E=
-github.com/shirou/gopsutil/v3 v3.23.9/go.mod h1:x/NWSb71eMcjFIO0vhyGW5nZ7oSIgVjrCnADckb85GA=
+github.com/shirou/gopsutil/v3 v3.23.10 h1:/N42opWlYzegYaVkWejXWJpbzKv2JDy3mrgGzKsh9hM=
+github.com/shirou/gopsutil/v3 v3.23.10/go.mod h1:JIE26kpucQi+innVlAUnIEOSBhBUkirr5b44yr55+WE=
 github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
 github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
@@ -1605,6 +1645,8 @@ github.com/valyala/fastjson v1.4.1/go.mod h1:nV6MsjxL2IMJQUoHDIrjEI7oLyeqK6aBD7E
 github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
+github.com/vertica/vertica-sql-go v1.3.3 h1:fL+FKEAEy5ONmsvya2WH5T8bhkvY27y/Ik3ReR2T+Qw=
+github.com/vertica/vertica-sql-go v1.3.3/go.mod h1:jnn2GFuv+O2Jcjktb7zyc4Utlbu9YVqpHH/lx63+1M4=
 github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 h1:EKhdznlJHPMoKr0XTrX+IlJs1LH3lyx2nfr1dOlZ79k=
 github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1/go.mod h1:8UvriyWtv5Q5EOgjHaSseUEdkQfvwFv1I/In/O2M9gc=
 github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc/go.mod h1:bopw91TMyo8J3tvftk8xmU2kPmlrt4nScJQZU2hE5EM=
@@ -1617,13 +1659,21 @@ github.com/x-cray/logrus-prefixed-formatter v0.5.2/go.mod h1:2duySbKsL6M18s5GU7V
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo=
+github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
+github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
 github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI=
+github.com/ydb-platform/ydb-go-genproto v0.0.0-20231012155159-f85a672542fd h1:dzWP1Lu+A40W883dK/Mr3xyDSM/2MggS8GtHT0qgAnE=
+github.com/ydb-platform/ydb-go-genproto v0.0.0-20231012155159-f85a672542fd/go.mod h1:Er+FePu1dNUieD+XTMDduGpQuCPssK5Q4BjF+IIXJ3I=
+github.com/ydb-platform/ydb-go-sdk/v3 v3.54.2 h1:E0yUuuX7UmPxXm92+yQCjMveLFO3zfvYFIJVuAqsVRA=
+github.com/ydb-platform/ydb-go-sdk/v3 v3.54.2/go.mod h1:fjBLQ2TdQNl4bMjuWl9adoTGBypwUTPoGC+EqYqiIcU=
 github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
 github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM=
 github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc=
@@ -1662,20 +1712,20 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 h1:RsQi0qJ2imFfCvZabqzM9cNXBG8k6gXMv1A0cXRmH6A=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0/go.mod h1:vsh3ySueQCiKPxFLvjWC4Z135gIa34TQ/NSqkDTZYUM=
-go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs=
-go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.18.0 h1:IAtl+7gua134xcV3NieDhJHjjOVeJhXAnYf/0hswjUY=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.18.0/go.mod h1:w+pXobnBzh95MNIkeIuAKcHe/Uu/CX2PKIvBP6ipKRA=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.18.0 h1:yE32ay7mJG2leczfREEhoW3VfSZIvHaB+gvVo1o8DQ8=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.18.0/go.mod h1:G17FHPDLt74bCI7tJ4CMitEk4BXTYG4FW6XUpkPBXa4=
-go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE=
-go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8=
-go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o=
-go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A=
-go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg=
-go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 h1:SpGay3w+nEwMpfVnbqOLH5gY52/foP8RE8UzTZ1pdSE=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1/go.mod h1:4UoMYEZOC0yN/sPGH76KPkkU7zgiEWYWL9vwmbnTJPE=
+go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc=
+go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 h1:cl5P5/GIfFh4t6xyruOgJP5QiA1pw4fYYdv6nc6CBWw=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0/go.mod h1:zgBdWWAu7oEEMC06MMKc5NLbA/1YDXV1sMpSqEeLQLg=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 h1:tIqheXEFWAZ7O8A7m+J0aPTmpJN3YQ7qetUAdkkkKpk=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0/go.mod h1:nUeKExfxAQVbiVFn32YXpXZZHZ61Cc3s3Rn1pDBGAb0=
+go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4=
+go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM=
+go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8=
+go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E=
+go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc=
+go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ=
 go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
 go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@@ -1687,8 +1737,8 @@ go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
 go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/goleak v1.0.0/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
-go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
-go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
 go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
@@ -1748,8 +1798,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
-golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
-golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
+golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
+golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -1789,8 +1839,8 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
-golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
+golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1850,8 +1900,8 @@ golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
-golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
-golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
+golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1877,8 +1927,8 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
-golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
+golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -1971,17 +2021,17 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
-golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
-golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
+golang.org/x/term v0.14.0 h1:LGK9IlZ8T9jvdy6cTdfKUCltatMFOehAQo9SRC46UQ8=
+golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1993,8 +2043,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -2070,8 +2120,8 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
-golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
+golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8=
+golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -2159,12 +2209,12 @@ google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6D
 google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210401141331-865547bb08e2/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
 google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
-google.golang.org/genproto v0.0.0-20230717213848-3f92550aa753 h1:+VoAg+OKmWaommL56xmZSE2sUK8A7m6SUO7X89F2tbw=
-google.golang.org/genproto v0.0.0-20230717213848-3f92550aa753/go.mod h1:iqkVr8IRpZ53gx1dEnWlCUIEwDWqWARWrbzpasaTNYM=
-google.golang.org/genproto/googleapis/api v0.0.0-20230717213848-3f92550aa753 h1:lCbbUxUDD+DiXx9Q6F/ttL0aAu7N2pz8XnmMm8ZW4NE=
-google.golang.org/genproto/googleapis/api v0.0.0-20230717213848-3f92550aa753/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230717213848-3f92550aa753 h1:XUODHrpzJEUeWmVo/jfNTLj0YyVveOo28oE6vkFbkO4=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230717213848-3f92550aa753/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM=
+google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 h1:I6WNifs6pF9tNdSob2W24JtyxIYjzFB9qDlpUC76q+U=
+google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405/go.mod h1:3WDQMjmJk36UQhjQ89emUzb1mdaHcPeeAh4SCBKznB4=
+google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b h1:CIC2YMXmIhYw6evmhPxBKJ4fmLbOFtXQN/GV3XOZR8k=
+google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:IBQ646DjkDkvUIsVq/cc03FUFQ9wbZu7yE396YcL870=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA=
 google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
@@ -2189,8 +2239,8 @@ google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG
 google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
 google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ=
-google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
+google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
+google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
 google.golang.org/grpc/examples v0.0.0-20210424002626-9572fd6faeae/go.mod h1:Ly7ZA/ARzg8fnPU9TyZIxoz33sEUuWX7txiqs8lPTgE=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
@@ -2265,22 +2315,24 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las=
+howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM=
+howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g=
 lukechampine.com/uint128 v1.3.0 h1:cDdUVfRwDUDovz610ABgFD17nXD4/uDgVHl2sC3+sbo=
 lukechampine.com/uint128 v1.3.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
 modernc.org/cc/v3 v3.41.0 h1:QoR1Sn3YWlmA1T4vLaKZfawdVtSiGx8H+cEojbC7v1Q=
 modernc.org/cc/v3 v3.41.0/go.mod h1:Ni4zjJYJ04CDOhG7dn640WGfwBzfE0ecX8TyMB0Fv0Y=
 modernc.org/ccgo/v3 v3.16.15 h1:KbDR3ZAVU+wiLyMESPtbtE/Add4elztFyfsWoNTgxS0=
 modernc.org/ccgo/v3 v3.16.15/go.mod h1:yT7B+/E2m43tmMOT51GMoM98/MtHIcQQSleGnddkUNI=
-modernc.org/libc v1.24.1 h1:uvJSeCKL/AgzBo2yYIPPTy82v21KgGnizcGYfBHaNuM=
-modernc.org/libc v1.24.1/go.mod h1:FmfO1RLrU3MHJfyi9eYYmZBfi/R+tqZ6+hQ3yQQUkak=
+modernc.org/libc v1.32.0 h1:yXatHTrACp3WaKNRCoZwUK7qj5V8ep1XyY0ka4oYcNc=
+modernc.org/libc v1.32.0/go.mod h1:YAXkAZ8ktnkCKaN9sw/UDeUVkGYJ/YquGO4FTi5nmHE=
 modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
 modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
 modernc.org/memory v1.7.2 h1:Klh90S215mmH8c9gO98QxQFsY+W451E8AnzjoE2ee1E=
 modernc.org/memory v1.7.2/go.mod h1:NO4NVCQy0N7ln+T9ngWqOQfi7ley4vpwvARR+Hjw95E=
 modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
 modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
-modernc.org/sqlite v1.26.0 h1:SocQdLRSYlA8W99V8YH0NES75thx19d9sB/aFc4R8Lw=
-modernc.org/sqlite v1.26.0/go.mod h1:FL3pVXie73rg3Rii6V/u5BoHlSoyeZeIgKZEgHARyCU=
+modernc.org/sqlite v1.27.0 h1:MpKAHoyYB7xqcwnUwkuD+npwEa0fojF0B5QRbN+auJ8=
+modernc.org/sqlite v1.27.0/go.mod h1:Qxpazz0zH8Z1xCFyi5GSL3FzbtZ3fvbjmywNogldEW0=
 modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA=
 modernc.org/strutil v1.2.0/go.mod h1:/mdcBmfOibveCTBxUl5B5l6W+TTH1FXPLHZE6bTosX0=
 modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
diff --git a/go.mod b/go.mod
index e6bb7347ffd..e396ba5ede9 100644
--- a/go.mod
+++ b/go.mod
@@ -6,14 +6,14 @@ require (
 	github.com/Depado/ginprom v1.7.11
 	github.com/Masterminds/semver/v3 v3.2.1
 	github.com/Masterminds/sprig/v3 v3.2.3
-	github.com/avast/retry-go/v4 v4.5.0
+	github.com/avast/retry-go/v4 v4.5.1
 	github.com/btcsuite/btcd v0.23.4
 	github.com/cometbft/cometbft v0.37.2
 	github.com/cosmos/cosmos-sdk v0.47.4
 	github.com/danielkov/gin-helmet v0.0.0-20171108135313-1387e224435e
 	github.com/esote/minmaxheap v1.0.0
 	github.com/ethereum/go-ethereum v1.12.0
-	github.com/fatih/color v1.15.0
+	github.com/fatih/color v1.16.0
 	github.com/fxamacker/cbor/v2 v2.5.0
 	github.com/gagliardetto/solana-go v1.4.1-0.20220428092759-5250b4abbb27
 	github.com/getsentry/sentry-go v0.19.0
@@ -22,12 +22,12 @@ require (
 	github.com/gin-contrib/sessions v0.0.5
 	github.com/gin-contrib/size v0.0.0-20230212012657-e14a14094dc4
 	github.com/gin-gonic/gin v1.9.1
-	github.com/go-webauthn/webauthn v0.8.6
+	github.com/go-webauthn/webauthn v0.9.1
 	github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8
-	github.com/google/uuid v1.3.1
-	github.com/gorilla/securecookie v1.1.1
-	github.com/gorilla/sessions v1.2.1
-	github.com/gorilla/websocket v1.5.0
+	github.com/google/uuid v1.4.0
+	github.com/gorilla/securecookie v1.1.2
+	github.com/gorilla/sessions v1.2.2
+	github.com/gorilla/websocket v1.5.1
 	github.com/grafana/pyroscope-go v1.0.4
 	github.com/graph-gophers/dataloader v5.0.0+incompatible
 	github.com/graph-gophers/graphql-go v1.3.0
@@ -49,12 +49,12 @@ require (
 	github.com/mr-tron/base58 v1.2.0
 	github.com/multiformats/go-multiaddr v0.3.3
 	github.com/olekukonko/tablewriter v0.0.5
-	github.com/onsi/gomega v1.27.8
+	github.com/onsi/gomega v1.30.0
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/pelletier/go-toml v1.9.5
 	github.com/pelletier/go-toml/v2 v2.1.0
 	github.com/pkg/errors v0.9.1
-	github.com/pressly/goose/v3 v3.15.1
+	github.com/pressly/goose/v3 v3.16.0
 	github.com/prometheus/client_golang v1.17.0
 	github.com/prometheus/client_model v0.5.0
 	github.com/prometheus/common v0.45.0
@@ -62,7 +62,7 @@ require (
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/rogpeppe/go-internal v1.11.0
 	github.com/scylladb/go-reflectx v1.0.1
-	github.com/shirou/gopsutil/v3 v3.23.9
+	github.com/shirou/gopsutil/v3 v3.23.10
 	github.com/shopspring/decimal v1.3.1
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704
 	github.com/smartcontractkit/chainlink-automation v1.0.0-alpha.0.0.20231120164534-d4cab696c459
@@ -88,15 +88,15 @@ require (
 	go.dedis.ch/kyber/v3 v3.1.0
 	go.uber.org/multierr v1.11.0
 	go.uber.org/zap v1.26.0
-	golang.org/x/crypto v0.14.0
+	golang.org/x/crypto v0.15.0
 	golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1
-	golang.org/x/sync v0.4.0
-	golang.org/x/term v0.13.0
-	golang.org/x/text v0.13.0
+	golang.org/x/sync v0.5.0
+	golang.org/x/term v0.14.0
+	golang.org/x/text v0.14.0
 	golang.org/x/time v0.3.0
-	golang.org/x/tools v0.14.0
+	golang.org/x/tools v0.15.0
 	gonum.org/v1/gonum v0.14.0
-	google.golang.org/grpc v1.58.3
+	google.golang.org/grpc v1.59.0
 	google.golang.org/protobuf v1.31.0
 	gopkg.in/guregu/null.v2 v2.1.2
 	gopkg.in/guregu/null.v4 v4.0.0
@@ -174,7 +174,7 @@ require (
 	github.com/go-kit/log v0.2.1 // indirect
 	github.com/go-ldap/ldap/v3 v3.4.5
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-logr/logr v1.3.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
@@ -187,13 +187,13 @@ require (
 	github.com/gofrs/flock v0.8.1 // indirect
 	github.com/gofrs/uuid v4.3.1+incompatible // indirect
 	github.com/gogo/protobuf v1.3.3 // indirect
-	github.com/golang-jwt/jwt/v5 v5.0.0 // indirect
-	github.com/golang/glog v1.1.0 // indirect
+	github.com/golang-jwt/jwt/v5 v5.1.0 // indirect
+	github.com/golang/glog v1.1.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
 	github.com/google/btree v1.1.2 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/go-tpm v0.9.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
@@ -239,7 +239,7 @@ require (
 	github.com/jmhodges/levigo v1.0.0 // indirect
 	github.com/jmoiron/sqlx v1.3.5
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.0 // indirect
+	github.com/klauspost/compress v1.17.2 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
 	github.com/koron/go-ssdp v0.0.2 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
@@ -284,7 +284,7 @@ require (
 	github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-runewidth v0.0.14 // indirect
 	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
 	github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
@@ -318,6 +318,7 @@ require (
 	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/sasha-s/go-deadlock v0.3.1 // indirect
+	github.com/sethvargo/go-retry v0.2.4 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
@@ -352,21 +353,21 @@ require (
 	go.dedis.ch/protobuf v1.0.11 // indirect
 	go.etcd.io/bbolt v1.3.7 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 // indirect
-	go.opentelemetry.io/otel v1.19.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.18.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.18.0 // indirect
-	go.opentelemetry.io/otel/metric v1.19.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.19.0 // indirect
-	go.opentelemetry.io/otel/trace v1.19.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
+	go.opentelemetry.io/otel v1.21.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
+	go.opentelemetry.io/otel/metric v1.21.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.21.0 // indirect
+	go.opentelemetry.io/otel/trace v1.21.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
 	go.uber.org/ratelimit v0.2.0 // indirect
 	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/sys v0.13.0 // indirect
-	google.golang.org/genproto v0.0.0-20230717213848-3f92550aa753 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20230717213848-3f92550aa753 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230717213848-3f92550aa753 // indirect
+	golang.org/x/net v0.18.0 // indirect
+	golang.org/x/sys v0.14.0 // indirect
+	google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
diff --git a/go.sum b/go.sum
index 24d662390d0..0c72ac7e639 100644
--- a/go.sum
+++ b/go.sum
@@ -18,23 +18,23 @@ cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHOb
 cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
 cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
 cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY=
-cloud.google.com/go v0.110.4 h1:1JYyxKMN9hd5dR2MYTPWkGUgcoxVVhg0LKNKEo0qvmk=
-cloud.google.com/go v0.110.4/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI=
+cloud.google.com/go v0.110.9 h1:e7ITSqGFFk4rbz/JFIqZh3G4VEHguhAL4BQcFlWtU68=
+cloud.google.com/go v0.110.9/go.mod h1:rpxevX/0Lqvlbc88b7Sc1SPNdyK1riNBTUU6JXhYNpM=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
 cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
 cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
 cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/compute v1.22.0 h1:cB8R6FtUtT1TYGl5R3xuxnW6OUIc/DrT2aiR16TTG7Y=
-cloud.google.com/go/compute v1.22.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM=
+cloud.google.com/go/compute v1.23.2 h1:nWEMDhgbBkBJjfpVySqU4jgWdc22PLR0o4vEexZHers=
+cloud.google.com/go/compute v1.23.2/go.mod h1:JJ0atRC0J/oWYiiVBmsSsrRnh92DhZPG4hFDcR04Rns=
 cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
 cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
 cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk=
-cloud.google.com/go/iam v1.1.1 h1:lW7fzj15aVIXYHREOqjRBV9PsH0Z6u8Y46a1YGvQP4Y=
-cloud.google.com/go/iam v1.1.1/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU=
+cloud.google.com/go/iam v1.1.4 h1:K6n/GZHFTtEoKT5aUG3l9diPi0VduZNQ1PfdnpkkIFk=
+cloud.google.com/go/iam v1.1.4/go.mod h1:l/rg8l1AaA+VFMho/HYx2Vv6xinPSLMF8qfhRPIZ0L8=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
 cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
@@ -87,6 +87,10 @@ github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbi
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg=
 github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4=
+github.com/ClickHouse/ch-go v0.58.2 h1:jSm2szHbT9MCAB1rJ3WuCJqmGLi5UTjlNu+f530UTS0=
+github.com/ClickHouse/ch-go v0.58.2/go.mod h1:Ap/0bEmiLa14gYjCiRkYGbXvbe8vwdrfTYWhsuQ99aw=
+github.com/ClickHouse/clickhouse-go/v2 v2.15.0 h1:G0hTKyO8fXXR1bGnZ0DY3vTG01xYfOGW76zgjg5tmC4=
+github.com/ClickHouse/clickhouse-go/v2 v2.15.0/go.mod h1:kXt1SRq0PIRa6aKZD7TnFnY9PQKmc2b13sHtOYcK6cQ=
 github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno=
 github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo=
 github.com/CosmWasm/wasmd v0.40.1 h1:LxbO78t/6S8TkeQlUrJ0m5O87HtAwLx4RGHq3rdrOEU=
@@ -138,6 +142,8 @@ github.com/allegro/bigcache v1.2.1 h1:hg1sY1raCwic3Vnsvje6TT7/pnZba83LeFck5NrFKS
 github.com/allegro/bigcache v1.2.1/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
 github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 h1:MzBOUgng9orim59UnfUTLRjMpd09C5uEVQ6RPGeCaVI=
 github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129/go.mod h1:rFgpPQZYZ8vdbc+48xibu8ALc3yeyd64IhHS+PU6Yyg=
+github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI=
+github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/appleboy/gofight/v2 v2.1.2 h1:VOy3jow4vIK8BRQJoC/I9muxyYlJ2yb9ht2hZoS3rf4=
 github.com/appleboy/gofight/v2 v2.1.2/go.mod h1:frW+U1QZEdDgixycTj4CygQ48yLTUhplt43+Wczp3rw=
@@ -147,8 +153,8 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV
 github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA=
 github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/avast/retry-go/v4 v4.5.0 h1:QoRAZZ90cj5oni2Lsgl2GW8mNTnUCnmpx/iKpwVisHg=
-github.com/avast/retry-go/v4 v4.5.0/go.mod h1:7hLEXp0oku2Nir2xBAsg0PTphp9z71bN5Aq1fboC3+I=
+github.com/avast/retry-go/v4 v4.5.1 h1:AxIx0HGi4VZ3I02jr78j5lZ3M6x1E0Ivxa6b0pUUh7o=
+github.com/avast/retry-go/v4 v4.5.1/go.mod h1:/sipNsvNB3RRuT5iNcb6h73nw3IBmXJ/H3XrCQYSOpc=
 github.com/aws/aws-sdk-go v1.22.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.44.302 h1:ST3ko6GrJKn3Xi+nAvxjG3uk/V1pW8KC52WLeIxqqNk=
@@ -245,8 +251,8 @@ github.com/cometbft/cometbft-db v0.7.0 h1:uBjbrBx4QzU0zOEnU8KxoDl18dMNgDh+zZRUE0
 github.com/cometbft/cometbft-db v0.7.0/go.mod h1:yiKJIm2WKrt6x8Cyxtq9YTEcIMPcEe4XPxhgX59Fzf0=
 github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4=
 github.com/confio/ics23/go v0.9.0/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e/mYVRak=
-github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM=
-github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=
+github.com/containerd/continuity v0.4.3 h1:6HVkalIp+2u1ZLH1J/pYX2oBVXlJZvh1X1A7bEZ9Su8=
+github.com/containerd/continuity v0.4.3/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
@@ -332,8 +338,12 @@ github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUn
 github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y=
 github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
+github.com/docker/cli v24.0.7+incompatible h1:wa/nIwYFW7BVTGa7SWPVyyXU9lgORqUb1xfI36MSkFg=
+github.com/docker/cli v24.0.7+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
 github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
+github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM=
+github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
@@ -344,6 +354,10 @@ github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+m
 github.com/dvsekhvalnov/jose2go v1.5.0 h1:3j8ya4Z4kMCwT5nXIKFSV84YS+HdqSSO0VsTQxaLAeM=
 github.com/dvsekhvalnov/jose2go v1.5.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU=
 github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
+github.com/elastic/go-sysinfo v1.11.1 h1:g9mwl05njS4r69TisC+vwHWTSKywZFYYUu3so3T/Lao=
+github.com/elastic/go-sysinfo v1.11.1/go.mod h1:6KQb31j0QeWBDF88jIdWSxE8cwoOB9tO4Y4osN7Q70E=
+github.com/elastic/go-windows v1.0.1 h1:AlYZOldA+UJ0/2nBuqWdo90GFCgG9xuyw9SYzGUtJm0=
+github.com/elastic/go-windows v1.0.1/go.mod h1:FoVvqWSun28vaDQPbj2Elfc0JahhPB7WQEGa3c814Ss=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -368,8 +382,8 @@ github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
-github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
+github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
+github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
 github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
 github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
@@ -429,6 +443,10 @@ github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclK
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
 github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
 github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
+github.com/go-faster/city v1.0.1 h1:4WAxSZ3V2Ws4QRDrscLEDcibJY8uf41H6AhXDrNDcGw=
+github.com/go-faster/city v1.0.1/go.mod h1:jKcUJId49qdW3L1qKHH/3wPeUstCVpVSXTM6vO3VcTw=
+github.com/go-faster/errors v0.6.1 h1:nNIPOBkprlKzkThvS/0YaX8Zs9KewLCOSFQS5BU06FI=
+github.com/go-faster/errors v0.6.1/go.mod h1:5MGV2/2T9yvlrbhe9pD9LO5Z/2zCSq2T8j+Jpi2LAyY=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -447,8 +465,8 @@ github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG
 github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=
 github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
-github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
+github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8=
@@ -475,8 +493,8 @@ github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
-github.com/go-webauthn/webauthn v0.8.6 h1:bKMtL1qzd2WTFkf1mFTVbreYrwn7dsYmEPjTq6QN90E=
-github.com/go-webauthn/webauthn v0.8.6/go.mod h1:emwVLMCI5yx9evTTvr0r+aOZCdWJqMfbRhF0MufyUog=
+github.com/go-webauthn/webauthn v0.9.1 h1:KuZjvUX9JTuFjB2n7kZhM6n76BClLUFbFM8SLKnrXpo=
+github.com/go-webauthn/webauthn v0.9.1/go.mod h1:m315kRGbUljOytw8b9FGWG9QzErjI5v02pNFCF3lwpI=
 github.com/go-webauthn/x v0.1.4 h1:sGmIFhcY70l6k7JIDfnjVBiAAFEssga5lXIUXe0GtAs=
 github.com/go-webauthn/x v0.1.4/go.mod h1:75Ug0oK6KYpANh5hDOanfDI+dvPWHk788naJVG/37H8=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
@@ -500,11 +518,11 @@ github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keL
 github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
 github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
-github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE=
-github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/golang-jwt/jwt/v5 v5.1.0 h1:UGKbA/IPjtS6zLcdB7i5TyACMgSbOTiR8qzXgw8HWQU=
+github.com/golang-jwt/jwt/v5 v5.1.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE=
-github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ=
+github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo=
+github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -562,8 +580,9 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
@@ -598,11 +617,13 @@ github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8/go.mod h1:Jh3hGz2jkYa
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc=
 github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
+github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
+github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
-github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
+github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/enterprise-certificate-proxy v0.2.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM=
 github.com/googleapis/enterprise-certificate-proxy v0.2.5/go.mod h1:RxW0N9901Cko1VOCW3SXCpWP+mlIEkk2tP7jnHy9a3w=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
@@ -618,14 +639,14 @@ github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/rpc v1.2.0/go.mod h1:V4h9r+4sF5HnzqbwIez0fKSpANP0zlYd3qR7p36jkTQ=
-github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
-github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
-github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI=
-github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
+github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA=
+github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo=
+github.com/gorilla/sessions v1.2.2 h1:lqzMYz6bOfvn2WriPUjNByzeXIlVzURcPmgMczkmTjY=
+github.com/gorilla/sessions v1.2.2/go.mod h1:ePLdVu+jbEgHH+KWw8I1z2wqd0BAdAQh/8LRvBeoNcQ=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
-github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
+github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
 github.com/grafana/pyroscope-go v1.0.4 h1:oyQX0BOkL+iARXzHuCdIF5TQ7/sRSel1YFViMHC7Bm0=
 github.com/grafana/pyroscope-go v1.0.4/go.mod h1:0d7ftwSMBV/Awm7CCiYmHQEG8Y44Ma3YSjt+nWcWztY=
 github.com/grafana/pyroscope-go/godeltaprof v0.1.4 h1:mDsJ3ngul7UfrHibGQpV66PbZ3q1T8glz/tK3bQKKEk=
@@ -833,10 +854,15 @@ github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQ
 github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs=
 github.com/jackc/pgx/v4 v4.18.1 h1:YP7G1KABtKpB5IHrO9vYwSrCOhs7p3uqhvhhQBptya0=
 github.com/jackc/pgx/v4 v4.18.1/go.mod h1:FydWkUyadDmdNH/mHnGob881GawxeEm7TcMCzkb+qQE=
+github.com/jackc/pgx/v5 v5.5.0 h1:NxstgwndsTRy7eq9/kqYc/BZh5w2hHJV86wjvO+1xPw=
+github.com/jackc/pgx/v5 v5.5.0/go.mod h1:Ig06C2Vu0t5qXC60W8sqIthScaEnFvojjj9dSljmHRA=
 github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v1.3.0 h1:eHK/5clGOatcjX3oWGBO/MpxpbHzSwud5EWTSCI+MX0=
 github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk=
+github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 github.com/jackpal/gateway v1.0.5/go.mod h1:lTpwd4ACLXmpyiCTRtfiNyVnUmqT9RivzCDQetPfnjA=
 github.com/jackpal/go-nat-pmp v1.0.1/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
 github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
@@ -861,9 +887,13 @@ github.com/jmhodges/levigo v1.0.0 h1:q5EC36kV79HWeTBWsod3mG11EgStG3qArTKcvlksN1U
 github.com/jmhodges/levigo v1.0.0/go.mod h1:Q6Qx+uH3RAqyK4rFQroq9RL7mdkABMcfhEI+nNuzMJQ=
 github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
 github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
+github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 h1:rp+c0RAYOWj8l6qbCUTSiRLG/iKnW3K3/QfPPuSsBt4=
+github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod h1:Z86h9688Y0wesXCyonoVr47MasHilkuLMqGhRZ4Hpak=
 github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg=
 github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4=
+github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc=
 github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
@@ -892,8 +922,8 @@ github.com/klauspost/compress v1.9.7/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0
 github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/klauspost/compress v1.17.0 h1:Rnbp4K9EjcDuVuHtd0dgA4qNuv9yKDYKK1ulpJwgrqM=
-github.com/klauspost/compress v1.17.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
+github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4=
+github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
@@ -1169,8 +1199,8 @@ github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOA
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
-github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
 github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
@@ -1222,6 +1252,8 @@ github.com/mitchellh/pointerstructure v1.2.0/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8oh
 github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
+github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
+github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -1319,8 +1351,8 @@ github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vv
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
 github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
-github.com/onsi/ginkgo/v2 v2.9.7 h1:06xGQy5www2oN160RtEZoTvnP2sPhEfePYmCDc2szss=
-github.com/onsi/ginkgo/v2 v2.9.7/go.mod h1:cxrmXWykAwTwhQsJOPfdIDiJ+l2RYq7U8hFU+M/1uw0=
+github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4=
+github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
 github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
@@ -1329,25 +1361,29 @@ github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoT
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
-github.com/onsi/gomega v1.27.8 h1:gegWiwZjBsf2DgiSbf5hpokZ98JVDMcWkUiigk6/KXc=
-github.com/onsi/gomega v1.27.8/go.mod h1:2J8vzI/s+2shY9XHRApDkdgPo1TKT7P2u6fXeJKFnNQ=
+github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
+github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/cbdlwvlWt0pnFI=
 github.com/opencontainers/image-spec v1.1.0-rc5/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
-github.com/opencontainers/runc v1.1.9 h1:XR0VIHTGce5eWPkaPesqTBrhW2yAcaraWfsEalNwQLM=
-github.com/opencontainers/runc v1.1.9/go.mod h1:CbUumNnWCuTGFukNXahoo/RFBZvDAgRh/smNYNOhA50=
+github.com/opencontainers/runc v1.1.10 h1:EaL5WeO9lv9wmS6SASjszOeQdSctvpbu0DdBQBizE40=
+github.com/opencontainers/runc v1.1.10/go.mod h1:+/R6+KmDlh+hOO8NkjmgkG9Qzvypzk0yXxAPYYR65+M=
 github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA=
 github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs=
+github.com/ory/dockertest/v3 v3.10.0 h1:4K3z2VMe8Woe++invjaTB7VRyQXQy5UY+loujO4aNE4=
+github.com/ory/dockertest/v3 v3.10.0/go.mod h1:nr57ZbRWMqfsdGdFNLHz5jjNdDb7VVFnzAeW1n5N1Lg=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
+github.com/paulmach/orb v0.10.0 h1:guVYVqzxHE/CQ1KpfGO077TR0ATHSNjp4s6XGLn3W9s=
+github.com/paulmach/orb v0.10.0/go.mod h1:5mULz1xQfs3bmQm63QEJA6lNGujuRafwA5S/EnuLaLU=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
@@ -1357,6 +1393,8 @@ github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdU
 github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o=
 github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 h1:hDSdbBuw3Lefr6R18ax0tZ2BJeNB3NehB3trOwYBsdU=
 github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
+github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ=
+github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
 github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
@@ -1371,8 +1409,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
-github.com/pressly/goose/v3 v3.15.1 h1:dKaJ1SdLvS/+HtS8PzFT0KBEtICC1jewLXM+b3emlv8=
-github.com/pressly/goose/v3 v3.15.1/go.mod h1:0E3Yg/+EwYzO6Rz2P98MlClFgIcoujbVRs575yi3iIM=
+github.com/pressly/goose/v3 v3.16.0 h1:xMJUsZdHLqSnCqESyKSqEfcYVYsUuup1nrOhaEFftQg=
+github.com/pressly/goose/v3 v3.16.0/go.mod h1:JwdKVnmCRhnF6XLQs2mHEQtucFD49cQBdRM4UiwkxsM=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
@@ -1444,11 +1482,15 @@ github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtm
 github.com/scylladb/go-reflectx v1.0.1 h1:b917wZM7189pZdlND9PbIJ6NQxfDPfBvUaQ7cjj1iZQ=
 github.com/scylladb/go-reflectx v1.0.1/go.mod h1:rWnOfDIRWBGN0miMLIcoPt/Dhi2doCMZqwMCJ3KupFc=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
+github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys=
+github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
+github.com/sethvargo/go-retry v0.2.4 h1:T+jHEQy/zKJf5s95UkguisicE0zuF9y7+/vgz08Ocec=
+github.com/sethvargo/go-retry v0.2.4/go.mod h1:1afjQuvh7s4gflMObvjLPaWgluLLyhA1wmVZ6KLpICw=
 github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
 github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
-github.com/shirou/gopsutil/v3 v3.23.9 h1:ZI5bWVeu2ep4/DIxB4U9okeYJ7zp/QLTO4auRb/ty/E=
-github.com/shirou/gopsutil/v3 v3.23.9/go.mod h1:x/NWSb71eMcjFIO0vhyGW5nZ7oSIgVjrCnADckb85GA=
+github.com/shirou/gopsutil/v3 v3.23.10 h1:/N42opWlYzegYaVkWejXWJpbzKv2JDy3mrgGzKsh9hM=
+github.com/shirou/gopsutil/v3 v3.23.10/go.mod h1:JIE26kpucQi+innVlAUnIEOSBhBUkirr5b44yr55+WE=
 github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
 github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
@@ -1607,6 +1649,8 @@ github.com/valyala/fastjson v1.4.1/go.mod h1:nV6MsjxL2IMJQUoHDIrjEI7oLyeqK6aBD7E
 github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
+github.com/vertica/vertica-sql-go v1.3.3 h1:fL+FKEAEy5ONmsvya2WH5T8bhkvY27y/Ik3ReR2T+Qw=
+github.com/vertica/vertica-sql-go v1.3.3/go.mod h1:jnn2GFuv+O2Jcjktb7zyc4Utlbu9YVqpHH/lx63+1M4=
 github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 h1:EKhdznlJHPMoKr0XTrX+IlJs1LH3lyx2nfr1dOlZ79k=
 github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1/go.mod h1:8UvriyWtv5Q5EOgjHaSseUEdkQfvwFv1I/In/O2M9gc=
 github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc/go.mod h1:bopw91TMyo8J3tvftk8xmU2kPmlrt4nScJQZU2hE5EM=
@@ -1619,13 +1663,21 @@ github.com/x-cray/logrus-prefixed-formatter v0.5.2/go.mod h1:2duySbKsL6M18s5GU7V
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo=
+github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
+github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
 github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI=
+github.com/ydb-platform/ydb-go-genproto v0.0.0-20231012155159-f85a672542fd h1:dzWP1Lu+A40W883dK/Mr3xyDSM/2MggS8GtHT0qgAnE=
+github.com/ydb-platform/ydb-go-genproto v0.0.0-20231012155159-f85a672542fd/go.mod h1:Er+FePu1dNUieD+XTMDduGpQuCPssK5Q4BjF+IIXJ3I=
+github.com/ydb-platform/ydb-go-sdk/v3 v3.54.2 h1:E0yUuuX7UmPxXm92+yQCjMveLFO3zfvYFIJVuAqsVRA=
+github.com/ydb-platform/ydb-go-sdk/v3 v3.54.2/go.mod h1:fjBLQ2TdQNl4bMjuWl9adoTGBypwUTPoGC+EqYqiIcU=
 github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
 github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM=
 github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc=
@@ -1664,20 +1716,20 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 h1:RsQi0qJ2imFfCvZabqzM9cNXBG8k6gXMv1A0cXRmH6A=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0/go.mod h1:vsh3ySueQCiKPxFLvjWC4Z135gIa34TQ/NSqkDTZYUM=
-go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs=
-go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.18.0 h1:IAtl+7gua134xcV3NieDhJHjjOVeJhXAnYf/0hswjUY=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.18.0/go.mod h1:w+pXobnBzh95MNIkeIuAKcHe/Uu/CX2PKIvBP6ipKRA=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.18.0 h1:yE32ay7mJG2leczfREEhoW3VfSZIvHaB+gvVo1o8DQ8=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.18.0/go.mod h1:G17FHPDLt74bCI7tJ4CMitEk4BXTYG4FW6XUpkPBXa4=
-go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE=
-go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8=
-go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o=
-go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A=
-go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg=
-go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 h1:SpGay3w+nEwMpfVnbqOLH5gY52/foP8RE8UzTZ1pdSE=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1/go.mod h1:4UoMYEZOC0yN/sPGH76KPkkU7zgiEWYWL9vwmbnTJPE=
+go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc=
+go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 h1:cl5P5/GIfFh4t6xyruOgJP5QiA1pw4fYYdv6nc6CBWw=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0/go.mod h1:zgBdWWAu7oEEMC06MMKc5NLbA/1YDXV1sMpSqEeLQLg=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 h1:tIqheXEFWAZ7O8A7m+J0aPTmpJN3YQ7qetUAdkkkKpk=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0/go.mod h1:nUeKExfxAQVbiVFn32YXpXZZHZ61Cc3s3Rn1pDBGAb0=
+go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4=
+go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM=
+go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8=
+go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E=
+go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc=
+go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ=
 go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
 go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@@ -1689,8 +1741,8 @@ go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
 go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/goleak v1.0.0/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
-go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
-go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
 go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
@@ -1751,8 +1803,8 @@ golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
-golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
-golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
+golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
+golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -1792,8 +1844,8 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
-golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
+golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1854,8 +1906,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
-golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
-golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
+golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1881,8 +1933,8 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
-golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
+golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -1975,9 +2027,9 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -1985,8 +2037,8 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
-golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
-golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
+golang.org/x/term v0.14.0 h1:LGK9IlZ8T9jvdy6cTdfKUCltatMFOehAQo9SRC46UQ8=
+golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1999,8 +2051,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -2075,8 +2127,8 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
-golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
+golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8=
+golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -2164,12 +2216,12 @@ google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6D
 google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210401141331-865547bb08e2/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
 google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
-google.golang.org/genproto v0.0.0-20230717213848-3f92550aa753 h1:+VoAg+OKmWaommL56xmZSE2sUK8A7m6SUO7X89F2tbw=
-google.golang.org/genproto v0.0.0-20230717213848-3f92550aa753/go.mod h1:iqkVr8IRpZ53gx1dEnWlCUIEwDWqWARWrbzpasaTNYM=
-google.golang.org/genproto/googleapis/api v0.0.0-20230717213848-3f92550aa753 h1:lCbbUxUDD+DiXx9Q6F/ttL0aAu7N2pz8XnmMm8ZW4NE=
-google.golang.org/genproto/googleapis/api v0.0.0-20230717213848-3f92550aa753/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230717213848-3f92550aa753 h1:XUODHrpzJEUeWmVo/jfNTLj0YyVveOo28oE6vkFbkO4=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230717213848-3f92550aa753/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM=
+google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 h1:I6WNifs6pF9tNdSob2W24JtyxIYjzFB9qDlpUC76q+U=
+google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405/go.mod h1:3WDQMjmJk36UQhjQ89emUzb1mdaHcPeeAh4SCBKznB4=
+google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b h1:CIC2YMXmIhYw6evmhPxBKJ4fmLbOFtXQN/GV3XOZR8k=
+google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:IBQ646DjkDkvUIsVq/cc03FUFQ9wbZu7yE396YcL870=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA=
 google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
@@ -2194,8 +2246,8 @@ google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG
 google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
 google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ=
-google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
+google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
+google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
 google.golang.org/grpc/examples v0.0.0-20210424002626-9572fd6faeae/go.mod h1:Ly7ZA/ARzg8fnPU9TyZIxoz33sEUuWX7txiqs8lPTgE=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
@@ -2268,22 +2320,24 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las=
+howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM=
+howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g=
 lukechampine.com/uint128 v1.3.0 h1:cDdUVfRwDUDovz610ABgFD17nXD4/uDgVHl2sC3+sbo=
 lukechampine.com/uint128 v1.3.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
 modernc.org/cc/v3 v3.41.0 h1:QoR1Sn3YWlmA1T4vLaKZfawdVtSiGx8H+cEojbC7v1Q=
 modernc.org/cc/v3 v3.41.0/go.mod h1:Ni4zjJYJ04CDOhG7dn640WGfwBzfE0ecX8TyMB0Fv0Y=
 modernc.org/ccgo/v3 v3.16.15 h1:KbDR3ZAVU+wiLyMESPtbtE/Add4elztFyfsWoNTgxS0=
 modernc.org/ccgo/v3 v3.16.15/go.mod h1:yT7B+/E2m43tmMOT51GMoM98/MtHIcQQSleGnddkUNI=
-modernc.org/libc v1.24.1 h1:uvJSeCKL/AgzBo2yYIPPTy82v21KgGnizcGYfBHaNuM=
-modernc.org/libc v1.24.1/go.mod h1:FmfO1RLrU3MHJfyi9eYYmZBfi/R+tqZ6+hQ3yQQUkak=
+modernc.org/libc v1.32.0 h1:yXatHTrACp3WaKNRCoZwUK7qj5V8ep1XyY0ka4oYcNc=
+modernc.org/libc v1.32.0/go.mod h1:YAXkAZ8ktnkCKaN9sw/UDeUVkGYJ/YquGO4FTi5nmHE=
 modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
 modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
 modernc.org/memory v1.7.2 h1:Klh90S215mmH8c9gO98QxQFsY+W451E8AnzjoE2ee1E=
 modernc.org/memory v1.7.2/go.mod h1:NO4NVCQy0N7ln+T9ngWqOQfi7ley4vpwvARR+Hjw95E=
 modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
 modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
-modernc.org/sqlite v1.26.0 h1:SocQdLRSYlA8W99V8YH0NES75thx19d9sB/aFc4R8Lw=
-modernc.org/sqlite v1.26.0/go.mod h1:FL3pVXie73rg3Rii6V/u5BoHlSoyeZeIgKZEgHARyCU=
+modernc.org/sqlite v1.27.0 h1:MpKAHoyYB7xqcwnUwkuD+npwEa0fojF0B5QRbN+auJ8=
+modernc.org/sqlite v1.27.0/go.mod h1:Qxpazz0zH8Z1xCFyi5GSL3FzbtZ3fvbjmywNogldEW0=
 modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA=
 modernc.org/strutil v1.2.0/go.mod h1:/mdcBmfOibveCTBxUl5B5l6W+TTH1FXPLHZE6bTosX0=
 modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index d0ca2346636..fd167f81a9b 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -11,13 +11,13 @@ require (
 	github.com/cli/go-gh/v2 v2.0.0
 	github.com/ethereum/go-ethereum v1.12.0
 	github.com/go-resty/resty/v2 v2.7.0
-	github.com/google/go-cmp v0.5.9
-	github.com/google/uuid v1.3.1
+	github.com/google/go-cmp v0.6.0
+	github.com/google/uuid v1.4.0
 	github.com/jmoiron/sqlx v1.3.5
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/lib/pq v1.10.9
 	github.com/manifoldco/promptui v0.9.0
-	github.com/onsi/gomega v1.27.8
+	github.com/onsi/gomega v1.30.0
 	github.com/pelletier/go-toml/v2 v2.1.0
 	github.com/rs/zerolog v1.30.0
 	github.com/scylladb/go-reflectx v1.0.1
@@ -37,7 +37,7 @@ require (
 	github.com/umbracle/ethgo v0.1.3
 	go.dedis.ch/kyber/v3 v3.1.0
 	go.uber.org/zap v1.26.0
-	golang.org/x/sync v0.4.0
+	golang.org/x/sync v0.5.0
 	gopkg.in/guregu/null.v4 v4.0.0
 )
 
@@ -73,7 +73,7 @@ require (
 	github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 // indirect
 	github.com/armon/go-metrics v0.4.1 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
-	github.com/avast/retry-go/v4 v4.5.0 // indirect
+	github.com/avast/retry-go/v4 v4.5.1 // indirect
 	github.com/aws/aws-sdk-go v1.44.302 // indirect
 	github.com/aws/constructs-go/constructs/v10 v10.1.255 // indirect
 	github.com/aws/jsii-runtime-go v1.75.0 // indirect
@@ -140,7 +140,7 @@ require (
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
 	github.com/fatih/camelcase v1.0.0 // indirect
-	github.com/fatih/color v1.15.0 // indirect
+	github.com/fatih/color v1.16.0 // indirect
 	github.com/felixge/httpsnoop v1.0.3 // indirect
 	github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
@@ -161,7 +161,7 @@ require (
 	github.com/go-kit/log v0.2.1 // indirect
 	github.com/go-ldap/ldap/v3 v3.4.5 // indirect
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-logr/logr v1.3.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-openapi/analysis v0.21.4 // indirect
@@ -177,7 +177,7 @@ require (
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.14.0 // indirect
 	github.com/go-stack/stack v1.8.1 // indirect
-	github.com/go-webauthn/webauthn v0.8.6 // indirect
+	github.com/go-webauthn/webauthn v0.9.1 // indirect
 	github.com/go-webauthn/x v0.1.4 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
@@ -185,8 +185,8 @@ require (
 	github.com/gogo/googleapis v1.4.1 // indirect
 	github.com/gogo/protobuf v1.3.3 // indirect
 	github.com/gogo/status v1.1.1 // indirect
-	github.com/golang-jwt/jwt/v5 v5.0.0 // indirect
-	github.com/golang/glog v1.1.0 // indirect
+	github.com/golang-jwt/jwt/v5 v5.1.0 // indirect
+	github.com/golang/glog v1.1.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
@@ -200,9 +200,9 @@ require (
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/gorilla/context v1.1.1 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
-	github.com/gorilla/securecookie v1.1.1 // indirect
-	github.com/gorilla/sessions v1.2.1 // indirect
-	github.com/gorilla/websocket v1.5.0 // indirect
+	github.com/gorilla/securecookie v1.1.2 // indirect
+	github.com/gorilla/sessions v1.2.2 // indirect
+	github.com/gorilla/websocket v1.5.1 // indirect
 	github.com/gosimple/slug v1.13.1 // indirect
 	github.com/gosimple/unidecode v1.0.1 // indirect
 	github.com/grafana/dskit v0.0.0-20230201083518-528d8a7d52f2 // indirect
@@ -265,7 +265,7 @@ require (
 	github.com/jpillora/backoff v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/julienschmidt/httprouter v1.3.0 // indirect
-	github.com/klauspost/compress v1.17.0 // indirect
+	github.com/klauspost/compress v1.17.2 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
 	github.com/koron/go-ssdp v0.0.2 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
@@ -315,7 +315,7 @@ require (
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-runewidth v0.0.14 // indirect
 	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
 	github.com/miekg/dns v1.1.55 // indirect
@@ -385,7 +385,7 @@ require (
 	github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
 	github.com/sercand/kuberesolver/v4 v4.0.0 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
-	github.com/shirou/gopsutil/v3 v3.23.9 // indirect
+	github.com/shirou/gopsutil/v3 v3.23.10 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect
@@ -438,38 +438,38 @@ require (
 	go.etcd.io/etcd/client/v3 v3.5.7 // indirect
 	go.mongodb.org/mongo-driver v1.12.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect
-	go.opentelemetry.io/otel v1.19.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.18.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.18.0 // indirect
-	go.opentelemetry.io/otel/metric v1.19.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.19.0 // indirect
-	go.opentelemetry.io/otel/trace v1.19.0 // indirect
+	go.opentelemetry.io/otel v1.21.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
+	go.opentelemetry.io/otel/metric v1.21.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.21.0 // indirect
+	go.opentelemetry.io/otel/trace v1.21.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
 	go.starlark.net v0.0.0-20220817180228-f738f5508c12 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
-	go.uber.org/goleak v1.2.1 // indirect
+	go.uber.org/goleak v1.3.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/ratelimit v0.2.0 // indirect
 	golang.org/x/arch v0.4.0 // indirect
-	golang.org/x/crypto v0.14.0 // indirect
+	golang.org/x/crypto v0.15.0 // indirect
 	golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect
-	golang.org/x/mod v0.13.0 // indirect
-	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/mod v0.14.0 // indirect
+	golang.org/x/net v0.18.0 // indirect
 	golang.org/x/oauth2 v0.12.0 // indirect
-	golang.org/x/sys v0.13.0 // indirect
-	golang.org/x/term v0.13.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
+	golang.org/x/sys v0.14.0 // indirect
+	golang.org/x/term v0.14.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.14.0 // indirect
+	golang.org/x/tools v0.15.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	gonum.org/v1/gonum v0.14.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230717213848-3f92550aa753 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20230717213848-3f92550aa753 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230717213848-3f92550aa753 // indirect
-	google.golang.org/grpc v1.58.3 // indirect
+	google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
+	google.golang.org/grpc v1.59.0 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/guregu/null.v2 v2.1.2 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index 21be8c1f480..0ee9d7848a9 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -37,8 +37,8 @@ cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRY
 cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go v0.107.0/go.mod h1:wpc2eNrD7hXUTy8EKS10jkxpZBjASrORK7goS+3YX2I=
 cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY=
-cloud.google.com/go v0.110.4 h1:1JYyxKMN9hd5dR2MYTPWkGUgcoxVVhg0LKNKEo0qvmk=
-cloud.google.com/go v0.110.4/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI=
+cloud.google.com/go v0.110.9 h1:e7ITSqGFFk4rbz/JFIqZh3G4VEHguhAL4BQcFlWtU68=
+cloud.google.com/go v0.110.9/go.mod h1:rpxevX/0Lqvlbc88b7Sc1SPNdyK1riNBTUU6JXhYNpM=
 cloud.google.com/go/accessapproval v1.4.0/go.mod h1:zybIuC3KpDOvotz59lFe5qxRZx6C75OtwbisN56xYB4=
 cloud.google.com/go/accessapproval v1.5.0/go.mod h1:HFy3tuiGvMdcd/u+Cu5b9NkO1pEICJ46IR82PoUdplw=
 cloud.google.com/go/accessapproval v1.6.0/go.mod h1:R0EiYnwV5fsRFiKZkPHr6mwyk2wxUJ30nL4j2pcFY2E=
@@ -149,8 +149,8 @@ cloud.google.com/go/compute v1.13.0/go.mod h1:5aPTS0cUNMIc1CE546K+Th6weJUNQErARy
 cloud.google.com/go/compute v1.14.0/go.mod h1:YfLtxrj9sU4Yxv+sXzZkyPjEyPBZfXHUvjxega5vAdo=
 cloud.google.com/go/compute v1.15.1/go.mod h1:bjjoF/NtFUrkD/urWfdHaKuOPDR5nWIs63rR+SXhcpA=
 cloud.google.com/go/compute v1.18.0/go.mod h1:1X7yHxec2Ga+Ss6jPyjxRxpu2uu7PLgsOVXvgU0yacs=
-cloud.google.com/go/compute v1.21.0 h1:JNBsyXVoOoNJtTQcnEY5uYpZIbeCTYIeDe0Xh1bySMk=
-cloud.google.com/go/compute v1.21.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM=
+cloud.google.com/go/compute v1.23.2 h1:nWEMDhgbBkBJjfpVySqU4jgWdc22PLR0o4vEexZHers=
+cloud.google.com/go/compute v1.23.2/go.mod h1:JJ0atRC0J/oWYiiVBmsSsrRnh92DhZPG4hFDcR04Rns=
 cloud.google.com/go/compute/metadata v0.1.0/go.mod h1:Z1VN+bulIf6bt4P/C37K4DyZYZEXYonfTBHHFPO/4UU=
 cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
 cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM=
@@ -272,8 +272,8 @@ cloud.google.com/go/iam v0.7.0/go.mod h1:H5Br8wRaDGNc8XP3keLc4unfUUZeyH3Sfl9XpQE
 cloud.google.com/go/iam v0.8.0/go.mod h1:lga0/y3iH6CX7sYqypWJ33hf7kkfXJag67naqGESjkE=
 cloud.google.com/go/iam v0.11.0/go.mod h1:9PiLDanza5D+oWFZiH1uG+RnRCfEGKoyl6yo4cgWZGY=
 cloud.google.com/go/iam v0.12.0/go.mod h1:knyHGviacl11zrtZUoDuYpDgLjvr28sLQaG0YB2GYAY=
-cloud.google.com/go/iam v1.1.1 h1:lW7fzj15aVIXYHREOqjRBV9PsH0Z6u8Y46a1YGvQP4Y=
-cloud.google.com/go/iam v1.1.1/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU=
+cloud.google.com/go/iam v1.1.4 h1:K6n/GZHFTtEoKT5aUG3l9diPi0VduZNQ1PfdnpkkIFk=
+cloud.google.com/go/iam v1.1.4/go.mod h1:l/rg8l1AaA+VFMho/HYx2Vv6xinPSLMF8qfhRPIZ0L8=
 cloud.google.com/go/iap v1.4.0/go.mod h1:RGFwRJdihTINIe4wZ2iCP0zF/qu18ZwyKxrhMhygBEc=
 cloud.google.com/go/iap v1.5.0/go.mod h1:UH/CGgKd4KyohZL5Pt0jSKE4m3FR51qg6FKQ/z/Ix9A=
 cloud.google.com/go/iap v1.6.0/go.mod h1:NSuvI9C/j7UdjGjIde7t7HBz+QTwBcapPE07+sSRcLk=
@@ -666,8 +666,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkY
 github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
-github.com/avast/retry-go/v4 v4.5.0 h1:QoRAZZ90cj5oni2Lsgl2GW8mNTnUCnmpx/iKpwVisHg=
-github.com/avast/retry-go/v4 v4.5.0/go.mod h1:7hLEXp0oku2Nir2xBAsg0PTphp9z71bN5Aq1fboC3+I=
+github.com/avast/retry-go/v4 v4.5.1 h1:AxIx0HGi4VZ3I02jr78j5lZ3M6x1E0Ivxa6b0pUUh7o=
+github.com/avast/retry-go/v4 v4.5.1/go.mod h1:/sipNsvNB3RRuT5iNcb6h73nw3IBmXJ/H3XrCQYSOpc=
 github.com/aws/aws-sdk-go v1.22.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
@@ -972,8 +972,8 @@ github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwo
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
-github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
+github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
+github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
 github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
@@ -1064,8 +1064,8 @@ github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi
 github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
-github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
+github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-logr/zapr v1.2.3 h1:a9vnzlIBPQBBkeaR9IuMUfmVOrQlkoC4YfPoFkX3T7A=
@@ -1136,8 +1136,8 @@ github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEe
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 github.com/go-test/deep v1.0.4 h1:u2CU3YKy9I2pmu9pX0eq50wCgjfGIt539SqR7FbHiho=
 github.com/go-test/deep v1.0.4/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
-github.com/go-webauthn/webauthn v0.8.6 h1:bKMtL1qzd2WTFkf1mFTVbreYrwn7dsYmEPjTq6QN90E=
-github.com/go-webauthn/webauthn v0.8.6/go.mod h1:emwVLMCI5yx9evTTvr0r+aOZCdWJqMfbRhF0MufyUog=
+github.com/go-webauthn/webauthn v0.9.1 h1:KuZjvUX9JTuFjB2n7kZhM6n76BClLUFbFM8SLKnrXpo=
+github.com/go-webauthn/webauthn v0.9.1/go.mod h1:m315kRGbUljOytw8b9FGWG9QzErjI5v02pNFCF3lwpI=
 github.com/go-webauthn/x v0.1.4 h1:sGmIFhcY70l6k7JIDfnjVBiAAFEssga5lXIUXe0GtAs=
 github.com/go-webauthn/x v0.1.4/go.mod h1:75Ug0oK6KYpANh5hDOanfDI+dvPWHk788naJVG/37H8=
 github.com/go-zookeeper/zk v1.0.3 h1:7M2kwOsc//9VeeFiPtf+uSJlVpU66x9Ba5+8XK7/TDg=
@@ -1195,13 +1195,14 @@ github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keL
 github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
 github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
-github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE=
-github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/golang-jwt/jwt/v5 v5.1.0 h1:UGKbA/IPjtS6zLcdB7i5TyACMgSbOTiR8qzXgw8HWQU=
+github.com/golang-jwt/jwt/v5 v5.1.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
-github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE=
 github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ=
+github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo=
+github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -1266,8 +1267,9 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
@@ -1315,8 +1317,8 @@ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
-github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
+github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8=
 github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8=
 github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg=
@@ -1348,14 +1350,14 @@ github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2z
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/rpc v1.2.0/go.mod h1:V4h9r+4sF5HnzqbwIez0fKSpANP0zlYd3qR7p36jkTQ=
-github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
-github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
-github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI=
-github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
+github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA=
+github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo=
+github.com/gorilla/sessions v1.2.2 h1:lqzMYz6bOfvn2WriPUjNByzeXIlVzURcPmgMczkmTjY=
+github.com/gorilla/sessions v1.2.2/go.mod h1:ePLdVu+jbEgHH+KWw8I1z2wqd0BAdAQh/8LRvBeoNcQ=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
-github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
+github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
 github.com/gosimple/slug v1.13.1 h1:bQ+kpX9Qa6tHRaK+fZR0A0M2Kd7Pa5eHPPsb1JpHD+Q=
 github.com/gosimple/slug v1.13.1/go.mod h1:UiRaFH+GEilHstLUmcBgWcI42viBN7mAb818JrYOeFQ=
 github.com/gosimple/unidecode v1.0.1 h1:hZzFTMMqSswvf0LBJZCZgThIZrpDHFXux9KeGmn6T/o=
@@ -1678,8 +1680,8 @@ github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYs
 github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
-github.com/klauspost/compress v1.17.0 h1:Rnbp4K9EjcDuVuHtd0dgA4qNuv9yKDYKK1ulpJwgrqM=
-github.com/klauspost/compress v1.17.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
+github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4=
+github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
@@ -1975,8 +1977,8 @@ github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOA
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
-github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
 github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
@@ -2157,8 +2159,8 @@ github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vv
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
 github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
-github.com/onsi/ginkgo/v2 v2.9.7 h1:06xGQy5www2oN160RtEZoTvnP2sPhEfePYmCDc2szss=
-github.com/onsi/ginkgo/v2 v2.9.7/go.mod h1:cxrmXWykAwTwhQsJOPfdIDiJ+l2RYq7U8hFU+M/1uw0=
+github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4=
+github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
 github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
@@ -2167,8 +2169,8 @@ github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoT
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
-github.com/onsi/gomega v1.27.8 h1:gegWiwZjBsf2DgiSbf5hpokZ98JVDMcWkUiigk6/KXc=
-github.com/onsi/gomega v1.27.8/go.mod h1:2J8vzI/s+2shY9XHRApDkdgPo1TKT7P2u6fXeJKFnNQ=
+github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
+github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.1.0-rc4 h1:oOxKUJWnFC4YGHCCMNql1x4YaDfYBTS5Y4x/Cgeo1E0=
@@ -2231,8 +2233,8 @@ github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndr
 github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
-github.com/pressly/goose/v3 v3.15.1 h1:dKaJ1SdLvS/+HtS8PzFT0KBEtICC1jewLXM+b3emlv8=
-github.com/pressly/goose/v3 v3.15.1/go.mod h1:0E3Yg/+EwYzO6Rz2P98MlClFgIcoujbVRs575yi3iIM=
+github.com/pressly/goose/v3 v3.16.0 h1:xMJUsZdHLqSnCqESyKSqEfcYVYsUuup1nrOhaEFftQg=
+github.com/pressly/goose/v3 v3.16.0/go.mod h1:JwdKVnmCRhnF6XLQs2mHEQtucFD49cQBdRM4UiwkxsM=
 github.com/prometheus/alertmanager v0.25.1 h1:LGBNMspOfv8h7brb+LWj2wnwBCg2ZuuKWTh6CAVw2/Y=
 github.com/prometheus/alertmanager v0.25.1/go.mod h1:MEZ3rFVHqKZsw7IcNS/m4AWZeXThmJhumpiWR4eHU/w=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
@@ -2348,10 +2350,12 @@ github.com/sercand/kuberesolver/v5 v5.1.1/go.mod h1:Fs1KbKhVRnB2aDWN12NjKCB+RgYM
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
 github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
+github.com/sethvargo/go-retry v0.2.4 h1:T+jHEQy/zKJf5s95UkguisicE0zuF9y7+/vgz08Ocec=
+github.com/sethvargo/go-retry v0.2.4/go.mod h1:1afjQuvh7s4gflMObvjLPaWgluLLyhA1wmVZ6KLpICw=
 github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
 github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
-github.com/shirou/gopsutil/v3 v3.23.9 h1:ZI5bWVeu2ep4/DIxB4U9okeYJ7zp/QLTO4auRb/ty/E=
-github.com/shirou/gopsutil/v3 v3.23.9/go.mod h1:x/NWSb71eMcjFIO0vhyGW5nZ7oSIgVjrCnADckb85GA=
+github.com/shirou/gopsutil/v3 v3.23.10 h1:/N42opWlYzegYaVkWejXWJpbzKv2JDy3mrgGzKsh9hM=
+github.com/shirou/gopsutil/v3 v3.23.10/go.mod h1:JIE26kpucQi+innVlAUnIEOSBhBUkirr5b44yr55+WE=
 github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
 github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
@@ -2620,22 +2624,22 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 h1:RsQi0qJ2imFfCvZabqzM9cNXBG8k6gXMv1A0cXRmH6A=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0/go.mod h1:vsh3ySueQCiKPxFLvjWC4Z135gIa34TQ/NSqkDTZYUM=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 h1:SpGay3w+nEwMpfVnbqOLH5gY52/foP8RE8UzTZ1pdSE=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1/go.mod h1:4UoMYEZOC0yN/sPGH76KPkkU7zgiEWYWL9vwmbnTJPE=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 h1:pginetY7+onl4qN1vl0xW/V/v6OBZ0vVdH+esuJgvmM=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0/go.mod h1:XiYsayHc36K3EByOO6nbAXnAWbrUxdjUROCEeeROOH8=
-go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs=
-go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.18.0 h1:IAtl+7gua134xcV3NieDhJHjjOVeJhXAnYf/0hswjUY=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.18.0/go.mod h1:w+pXobnBzh95MNIkeIuAKcHe/Uu/CX2PKIvBP6ipKRA=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.18.0 h1:yE32ay7mJG2leczfREEhoW3VfSZIvHaB+gvVo1o8DQ8=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.18.0/go.mod h1:G17FHPDLt74bCI7tJ4CMitEk4BXTYG4FW6XUpkPBXa4=
-go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE=
-go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8=
-go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o=
-go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A=
-go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg=
-go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo=
+go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc=
+go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 h1:cl5P5/GIfFh4t6xyruOgJP5QiA1pw4fYYdv6nc6CBWw=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0/go.mod h1:zgBdWWAu7oEEMC06MMKc5NLbA/1YDXV1sMpSqEeLQLg=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 h1:tIqheXEFWAZ7O8A7m+J0aPTmpJN3YQ7qetUAdkkkKpk=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0/go.mod h1:nUeKExfxAQVbiVFn32YXpXZZHZ61Cc3s3Rn1pDBGAb0=
+go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4=
+go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM=
+go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8=
+go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E=
+go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc=
+go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
 go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
@@ -2653,8 +2657,8 @@ go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
 go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/goleak v1.0.0/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
-go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
-go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
 go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
@@ -2719,8 +2723,8 @@ golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0
 golang.org/x/crypto v0.0.0-20221012134737-56aed061732a/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
-golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
-golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
+golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
+golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -2780,8 +2784,8 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91
 golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
-golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
+golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -2866,8 +2870,8 @@ golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
-golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
-golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
+golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -2916,8 +2920,8 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
-golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
+golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -3046,9 +3050,9 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -3059,8 +3063,8 @@ golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
 golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
-golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
-golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
+golang.org/x/term v0.14.0 h1:LGK9IlZ8T9jvdy6cTdfKUCltatMFOehAQo9SRC46UQ8=
+golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -3076,8 +3080,8 @@ golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -3169,8 +3173,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
 golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
-golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
-golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
+golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8=
+golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -3394,12 +3398,12 @@ google.golang.org/genproto v0.0.0-20230209215440-0dfe4f8abfcc/go.mod h1:RGgjbofJ
 google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44/go.mod h1:8B0gmkoRebU8ukX6HP+4wrVQUY1+6PkQ44BSyIlflHA=
 google.golang.org/genproto v0.0.0-20230222225845-10f96fb3dbec/go.mod h1:3Dl5ZL0q0isWJt+FVcfpQyirqemEuLAK/iFvg1UP1Hw=
 google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s=
-google.golang.org/genproto v0.0.0-20230717213848-3f92550aa753 h1:+VoAg+OKmWaommL56xmZSE2sUK8A7m6SUO7X89F2tbw=
-google.golang.org/genproto v0.0.0-20230717213848-3f92550aa753/go.mod h1:iqkVr8IRpZ53gx1dEnWlCUIEwDWqWARWrbzpasaTNYM=
-google.golang.org/genproto/googleapis/api v0.0.0-20230717213848-3f92550aa753 h1:lCbbUxUDD+DiXx9Q6F/ttL0aAu7N2pz8XnmMm8ZW4NE=
-google.golang.org/genproto/googleapis/api v0.0.0-20230717213848-3f92550aa753/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230717213848-3f92550aa753 h1:XUODHrpzJEUeWmVo/jfNTLj0YyVveOo28oE6vkFbkO4=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230717213848-3f92550aa753/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM=
+google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 h1:I6WNifs6pF9tNdSob2W24JtyxIYjzFB9qDlpUC76q+U=
+google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405/go.mod h1:3WDQMjmJk36UQhjQ89emUzb1mdaHcPeeAh4SCBKznB4=
+google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b h1:CIC2YMXmIhYw6evmhPxBKJ4fmLbOFtXQN/GV3XOZR8k=
+google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:IBQ646DjkDkvUIsVq/cc03FUFQ9wbZu7yE396YcL870=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA=
 google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
@@ -3444,8 +3448,8 @@ google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsA
 google.golang.org/grpc v1.52.0/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY=
 google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw=
 google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8=
-google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ=
-google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
+google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
+google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
 google.golang.org/grpc/examples v0.0.0-20210424002626-9572fd6faeae/go.mod h1:Ly7ZA/ARzg8fnPU9TyZIxoz33sEUuWX7txiqs8lPTgE=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=

From 96fa461e47da01a05532074ea0507ca739a0f76a Mon Sep 17 00:00:00 2001
From: Ryan Hall <RyanRHall@users.noreply.github.com>
Date: Mon, 27 Nov 2023 12:33:27 -0500
Subject: [PATCH 012/130] Upkeep Balance Monitor (#11180)

* write UpkeepBalanceMonWithBuffer

* Update AutomationRegistryInterface2_0.sol

Support getMinBalanceForUpkeep

* reformat

* remove modifier

* add typeAndVersion check in constructor

* restore AutomationRegistryInterface2_0.sol function

* update import paths

* update comments

* cleanup

* get rid of redundant REGISTRY variable

* cleanup

* rename

* cleanup

* remove target, min wait period, switch to min/target percentages

* refactor getUnderfundedUpkeeps() to return top up amounts

* refactor topUp() function

* switch to max batch size

* add max top up amount

* add maxTopUpAmount

* whitelist performUpkeep to forwarder

* cleanup

* rename

* bring topUp() back

* write initial test suite

* fix solhint errors

* update test for getUnderfundedUpkeeps()

* add tests for owner only functions and events

* add topUp and performUpkeep tests

* rearrange functions on contract

* add support for multiple registries

* cleanup

* change topUpAmounts to uint96[]

* move pausable to topUp(); add length check to topUp()

---------

Co-authored-by: De Clercq Wentzel <10665586+wentzeld@users.noreply.github.com>
---
 .../upkeeps/UpkeepBalanceMonitor.sol          | 258 +++++++++++
 .../automation/UpkeepBalanceMonitor.test.ts   | 399 ++++++++++++++++++
 2 files changed, 657 insertions(+)
 create mode 100644 contracts/src/v0.8/automation/upkeeps/UpkeepBalanceMonitor.sol
 create mode 100644 contracts/test/v0.8/automation/UpkeepBalanceMonitor.test.ts

diff --git a/contracts/src/v0.8/automation/upkeeps/UpkeepBalanceMonitor.sol b/contracts/src/v0.8/automation/upkeeps/UpkeepBalanceMonitor.sol
new file mode 100644
index 00000000000..dae17da7293
--- /dev/null
+++ b/contracts/src/v0.8/automation/upkeeps/UpkeepBalanceMonitor.sol
@@ -0,0 +1,258 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity 0.8.19;
+
+import {ConfirmedOwner} from "../../shared/access/ConfirmedOwner.sol";
+import {IAutomationRegistryConsumer} from "../interfaces/IAutomationRegistryConsumer.sol";
+import {LinkTokenInterface} from "../../shared/interfaces/LinkTokenInterface.sol";
+import {Pausable} from "@openzeppelin/contracts/security/Pausable.sol";
+import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
+
+/// @title The UpkeepBalanceMonitor contract
+/// @notice A keeper-compatible contract that monitors and funds Chainlink Automation upkeeps.
+contract UpkeepBalanceMonitor is ConfirmedOwner, Pausable {
+  using EnumerableSet for EnumerableSet.AddressSet;
+
+  event ConfigSet(Config config);
+  event ForwarderSet(address forwarderAddress);
+  event FundsWithdrawn(uint256 amountWithdrawn, address payee);
+  event TopUpFailed(uint256 indexed upkeepId);
+  event TopUpSucceeded(uint256 indexed upkeepId, uint96 amount);
+  event WatchListSet(address registryAddress);
+
+  error InvalidConfig();
+  error InvalidTopUpData();
+  error OnlyForwarderOrOwner();
+
+  /// @member maxBatchSize is the maximum number of upkeeps to fund in a single transaction
+  /// @member minPercentage is the percentage of the upkeep's minBalance at which top-up occurs
+  /// @member targetPercentage is the percentage of the upkeep's minBalance to top-up to
+  /// @member maxTopUpAmount is the maximum amount of LINK to top-up an upkeep with
+  struct Config {
+    uint8 maxBatchSize;
+    uint24 minPercentage;
+    uint24 targetPercentage;
+    uint96 maxTopUpAmount;
+  }
+
+  // ================================================================
+  // |                           STORAGE                            |
+  // ================================================================
+
+  LinkTokenInterface private immutable LINK_TOKEN;
+
+  mapping(address => uint256[]) s_registryWatchLists;
+  EnumerableSet.AddressSet s_registries;
+  Config private s_config;
+  address private s_forwarderAddress;
+
+  // ================================================================
+  // |                         CONSTRUCTOR                          |
+  // ================================================================
+
+  /// @param linkToken the Link token address
+  /// @param config the initial config for the contract
+  constructor(LinkTokenInterface linkToken, Config memory config) ConfirmedOwner(msg.sender) {
+    require(address(linkToken) != address(0));
+    LINK_TOKEN = linkToken;
+    setConfig(config);
+  }
+
+  // ================================================================
+  // |                      CORE FUNCTIONALITY                      |
+  // ================================================================
+
+  /// @notice Gets a list of upkeeps that are underfunded
+  /// @return needsFunding list of underfunded upkeepIDs
+  /// @return registryAddresses list of registries that the upkeepIDs belong to
+  /// @return topUpAmounts amount to top up each upkeep
+  function getUnderfundedUpkeeps() public view returns (uint256[] memory, address[] memory, uint96[] memory) {
+    Config memory config = s_config;
+    uint256[] memory needsFunding = new uint256[](config.maxBatchSize);
+    address[] memory registryAddresses = new address[](config.maxBatchSize);
+    uint96[] memory topUpAmounts = new uint96[](config.maxBatchSize);
+    uint256 availableFunds = LINK_TOKEN.balanceOf(address(this));
+    uint256 count;
+    for (uint256 i = 0; i < s_registries.length(); i++) {
+      IAutomationRegistryConsumer registry = IAutomationRegistryConsumer(s_registries.at(i));
+      for (uint256 j = 0; j < s_registryWatchLists[address(registry)].length; j++) {
+        uint256 upkeepID = s_registryWatchLists[address(registry)][j];
+        uint96 upkeepBalance = registry.getBalance(upkeepID);
+        uint96 minBalance = registry.getMinBalance(upkeepID);
+        uint96 topUpThreshold = (minBalance * config.minPercentage) / 100;
+        uint96 topUpAmount = ((minBalance * config.targetPercentage) / 100) - upkeepBalance;
+        if (topUpAmount > config.maxTopUpAmount) {
+          topUpAmount = config.maxTopUpAmount;
+        }
+        if (upkeepBalance <= topUpThreshold && availableFunds >= topUpAmount) {
+          needsFunding[count] = upkeepID;
+          topUpAmounts[count] = topUpAmount;
+          registryAddresses[count] = address(registry);
+          count++;
+          availableFunds -= topUpAmount;
+        }
+        if (count == config.maxBatchSize) {
+          break;
+        }
+      }
+      if (count == config.maxBatchSize) {
+        break;
+      }
+    }
+    if (count < config.maxBatchSize) {
+      assembly {
+        mstore(needsFunding, count)
+        mstore(registryAddresses, count)
+        mstore(topUpAmounts, count)
+      }
+    }
+    return (needsFunding, registryAddresses, topUpAmounts);
+  }
+
+  /// @notice Called by the keeper/owner to send funds to underfunded upkeeps
+  /// @param upkeepIDs the list of upkeep ids to fund
+  /// @param registryAddresses the list of registries that the upkeepIDs belong to
+  /// @param topUpAmounts the list of amounts to fund each upkeep with
+  /// @dev We explicitly choose not to verify that input upkeepIDs are included in the watchlist. We also
+  /// explicity permit any amount to be sent via topUpAmounts; it does not have to meet the criteria
+  /// specified in getUnderfundedUpkeeps(). Here, we are relying on the security of automation's OCR to
+  /// secure the output of getUnderfundedUpkeeps() as the input to topUp(), and we are treating the owner
+  /// as a privileged user that can perform arbitrary top-ups to any upkeepID.
+  function topUp(
+    uint256[] memory upkeepIDs,
+    address[] memory registryAddresses,
+    uint96[] memory topUpAmounts
+  ) public whenNotPaused {
+    if (msg.sender != address(s_forwarderAddress) && msg.sender != owner()) revert OnlyForwarderOrOwner();
+    if (upkeepIDs.length != registryAddresses.length || upkeepIDs.length != topUpAmounts.length)
+      revert InvalidTopUpData();
+    for (uint256 i = 0; i < upkeepIDs.length; i++) {
+      try LINK_TOKEN.transferAndCall(registryAddresses[i], topUpAmounts[i], abi.encode(upkeepIDs[i])) returns (
+        bool success
+      ) {
+        if (success) {
+          emit TopUpSucceeded(upkeepIDs[i], topUpAmounts[i]);
+          continue;
+        }
+      } catch {}
+      emit TopUpFailed(upkeepIDs[i]);
+    }
+  }
+
+  // ================================================================
+  // |                    AUTOMATION COMPATIBLE                     |
+  // ================================================================
+
+  /// @notice Gets list of upkeeps ids that are underfunded and returns a keeper-compatible payload.
+  /// @return upkeepNeeded signals if upkeep is needed, performData is an abi encoded list of subscription ids that need funds
+  function checkUpkeep(bytes calldata) external view returns (bool upkeepNeeded, bytes memory performData) {
+    (
+      uint256[] memory needsFunding,
+      address[] memory registryAddresses,
+      uint96[] memory topUpAmounts
+    ) = getUnderfundedUpkeeps();
+    upkeepNeeded = needsFunding.length > 0;
+    if (upkeepNeeded) {
+      performData = abi.encode(needsFunding, registryAddresses, topUpAmounts);
+    }
+    return (upkeepNeeded, performData);
+  }
+
+  /// @notice Called by the keeper to send funds to underfunded addresses.
+  /// @param performData the abi encoded list of addresses to fund
+  function performUpkeep(bytes calldata performData) external {
+    (uint256[] memory upkeepIDs, address[] memory registryAddresses, uint96[] memory topUpAmounts) = abi.decode(
+      performData,
+      (uint256[], address[], uint96[])
+    );
+    topUp(upkeepIDs, registryAddresses, topUpAmounts);
+  }
+
+  // ================================================================
+  // |                            ADMIN                             |
+  // ================================================================
+
+  /// @notice Withdraws the contract balance in LINK.
+  /// @param amount the amount of LINK (in juels) to withdraw
+  /// @param payee the address to pay
+  function withdraw(uint256 amount, address payee) external onlyOwner {
+    require(payee != address(0));
+    LINK_TOKEN.transfer(payee, amount);
+    emit FundsWithdrawn(amount, payee);
+  }
+
+  /// @notice Pause the contract, which prevents executing performUpkeep.
+  function pause() external onlyOwner {
+    _pause();
+  }
+
+  /// @notice Unpause the contract.
+  function unpause() external onlyOwner {
+    _unpause();
+  }
+
+  // ================================================================
+  // |                           SETTERS                            |
+  // ================================================================
+
+  /// @notice Sets the list of upkeeps to watch
+  /// @param registryAddress the registry that this watchlist applies to
+  /// @param watchlist the list of UpkeepIDs to watch
+  function setWatchList(address registryAddress, uint256[] calldata watchlist) external onlyOwner {
+    if (watchlist.length == 0) {
+      s_registries.remove(registryAddress);
+      delete s_registryWatchLists[registryAddress];
+    } else {
+      s_registries.add(registryAddress);
+      s_registryWatchLists[registryAddress] = watchlist;
+    }
+    emit WatchListSet(registryAddress);
+  }
+
+  /// @notice Sets the contract config
+  /// @param config the new config
+  function setConfig(Config memory config) public onlyOwner {
+    if (
+      config.maxBatchSize == 0 ||
+      config.minPercentage < 100 ||
+      config.targetPercentage <= config.minPercentage ||
+      config.maxTopUpAmount == 0
+    ) {
+      revert InvalidConfig();
+    }
+    s_config = config;
+    emit ConfigSet(config);
+  }
+
+  /// @notice Sets the upkeep's forwarder contract
+  /// @param forwarderAddress the new forwarder
+  /// @dev this should only need to be called once, after registering the contract with the registry
+  function setForwarder(address forwarderAddress) external onlyOwner {
+    s_forwarderAddress = forwarderAddress;
+    emit ForwarderSet(forwarderAddress);
+  }
+
+  // ================================================================
+  // |                           GETTERS                            |
+  // ================================================================
+
+  /// @notice Gets the list of upkeeps ids being monitored
+  function getWatchList() external view returns (address[] memory, uint256[][] memory) {
+    address[] memory registryAddresses = s_registries.values();
+    uint256[][] memory upkeepIDs = new uint256[][](registryAddresses.length);
+    for (uint256 i = 0; i < registryAddresses.length; i++) {
+      upkeepIDs[i] = s_registryWatchLists[registryAddresses[i]];
+    }
+    return (registryAddresses, upkeepIDs);
+  }
+
+  /// @notice Gets the contract config
+  function getConfig() external view returns (Config memory) {
+    return s_config;
+  }
+
+  /// @notice Gets the upkeep's forwarder contract
+  function getForwarder() external view returns (address) {
+    return s_forwarderAddress;
+  }
+}
diff --git a/contracts/test/v0.8/automation/UpkeepBalanceMonitor.test.ts b/contracts/test/v0.8/automation/UpkeepBalanceMonitor.test.ts
new file mode 100644
index 00000000000..259a9c3b9f8
--- /dev/null
+++ b/contracts/test/v0.8/automation/UpkeepBalanceMonitor.test.ts
@@ -0,0 +1,399 @@
+import { ethers } from 'hardhat'
+import { expect } from 'chai'
+import type { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers'
+import { randomAddress } from '../../test-helpers/helpers'
+import { loadFixture } from '@nomicfoundation/hardhat-network-helpers'
+import { IKeeperRegistryMaster__factory as RegistryFactory } from '../../../typechain/factories/IKeeperRegistryMaster__factory'
+import { IAutomationForwarder__factory as ForwarderFactory } from '../../../typechain/factories/IAutomationForwarder__factory'
+import { UpkeepBalanceMonitor } from '../../../typechain/UpkeepBalanceMonitor'
+import { LinkToken } from '../../../typechain/LinkToken'
+import { BigNumber } from 'ethers'
+import {
+  deployMockContract,
+  MockContract,
+} from '@ethereum-waffle/mock-contract'
+
+let owner: SignerWithAddress
+let stranger: SignerWithAddress
+let registry: MockContract
+let registry2: MockContract
+let forwarder: MockContract
+let linkToken: LinkToken
+let upkeepBalanceMonitor: UpkeepBalanceMonitor
+
+const setup = async () => {
+  const accounts = await ethers.getSigners()
+  owner = accounts[0]
+  stranger = accounts[1]
+
+  const ltFactory = await ethers.getContractFactory(
+    'src/v0.4/LinkToken.sol:LinkToken',
+    owner,
+  )
+  linkToken = (await ltFactory.deploy()) as LinkToken
+  const bmFactory = await ethers.getContractFactory(
+    'UpkeepBalanceMonitor',
+    owner,
+  )
+  upkeepBalanceMonitor = await bmFactory.deploy(linkToken.address, {
+    maxBatchSize: 10,
+    minPercentage: 120,
+    targetPercentage: 300,
+    maxTopUpAmount: ethers.utils.parseEther('100'),
+  })
+  registry = await deployMockContract(owner, RegistryFactory.abi)
+  registry2 = await deployMockContract(owner, RegistryFactory.abi)
+  forwarder = await deployMockContract(owner, ForwarderFactory.abi)
+  await forwarder.mock.getRegistry.returns(registry.address)
+  await upkeepBalanceMonitor.setForwarder(forwarder.address)
+  await linkToken
+    .connect(owner)
+    .transfer(upkeepBalanceMonitor.address, ethers.utils.parseEther('10000'))
+  await upkeepBalanceMonitor
+    .connect(owner)
+    .setWatchList(registry.address, [0, 1, 2, 3, 4, 5, 6, 7, 8])
+  await upkeepBalanceMonitor
+    .connect(owner)
+    .setWatchList(registry2.address, [9, 10, 11])
+  for (let i = 0; i < 9; i++) {
+    await registry.mock.getMinBalance.withArgs(i).returns(100)
+    await registry.mock.getBalance.withArgs(i).returns(121) // all upkeeps are sufficiently funded
+  }
+  for (let i = 9; i < 12; i++) {
+    await registry2.mock.getMinBalance.withArgs(i).returns(100)
+    await registry2.mock.getBalance.withArgs(i).returns(121) // all upkeeps are sufficiently funded
+  }
+}
+
+describe('UpkeepBalanceMonitor', () => {
+  beforeEach(async () => {
+    await loadFixture(setup)
+  })
+
+  describe('constructor()', () => {
+    it('should set the initial values correctly', async () => {
+      const config = await upkeepBalanceMonitor.getConfig()
+      expect(config.maxBatchSize).to.equal(10)
+      expect(config.minPercentage).to.equal(120)
+      expect(config.targetPercentage).to.equal(300)
+      expect(config.maxTopUpAmount).to.equal(ethers.utils.parseEther('100'))
+    })
+  })
+
+  describe('setConfig()', () => {
+    const newConfig = {
+      maxBatchSize: 100,
+      minPercentage: 150,
+      targetPercentage: 500,
+      maxTopUpAmount: 1,
+    }
+
+    it('should set config correctly', async () => {
+      await upkeepBalanceMonitor.connect(owner).setConfig(newConfig)
+      const config = await upkeepBalanceMonitor.getConfig()
+      expect(config.maxBatchSize).to.equal(newConfig.maxBatchSize)
+      expect(config.minPercentage).to.equal(newConfig.minPercentage)
+      expect(config.targetPercentage).to.equal(newConfig.targetPercentage)
+      expect(config.maxTopUpAmount).to.equal(newConfig.maxTopUpAmount)
+    })
+
+    it('cannot be called by a non-owner', async () => {
+      await expect(
+        upkeepBalanceMonitor.connect(stranger).setConfig(newConfig),
+      ).to.be.revertedWith('Only callable by owner')
+    })
+
+    it('should emit an event', async () => {
+      await expect(
+        upkeepBalanceMonitor.connect(owner).setConfig(newConfig),
+      ).to.emit(upkeepBalanceMonitor, 'ConfigSet')
+    })
+  })
+
+  describe('setForwarder()', () => {
+    const newForwarder = randomAddress()
+
+    it('should set the forwarder correctly', async () => {
+      await upkeepBalanceMonitor.connect(owner).setForwarder(newForwarder)
+      const forwarderAddress = await upkeepBalanceMonitor.getForwarder()
+      expect(forwarderAddress).to.equal(newForwarder)
+    })
+
+    it('cannot be called by a non-owner', async () => {
+      await expect(
+        upkeepBalanceMonitor.connect(stranger).setForwarder(randomAddress()),
+      ).to.be.revertedWith('Only callable by owner')
+    })
+
+    it('should emit an event', async () => {
+      await expect(
+        upkeepBalanceMonitor.connect(owner).setForwarder(newForwarder),
+      )
+        .to.emit(upkeepBalanceMonitor, 'ForwarderSet')
+        .withArgs(newForwarder)
+    })
+  })
+
+  describe('setWatchList()', () => {
+    const newWatchList = [
+      BigNumber.from(1),
+      BigNumber.from(2),
+      BigNumber.from(10),
+    ]
+
+    it('should add addresses to the watchlist', async () => {
+      await upkeepBalanceMonitor
+        .connect(owner)
+        .setWatchList(registry.address, newWatchList)
+      const [_, upkeepIDs] = await upkeepBalanceMonitor.getWatchList()
+      expect(upkeepIDs[0]).to.deep.equal(newWatchList)
+    })
+
+    it('cannot be called by a non-owner', async () => {
+      await expect(
+        upkeepBalanceMonitor
+          .connect(stranger)
+          .setWatchList(registry.address, [1, 2, 3]),
+      ).to.be.revertedWith('Only callable by owner')
+    })
+
+    it('should emit an event', async () => {
+      await expect(
+        upkeepBalanceMonitor
+          .connect(owner)
+          .setWatchList(registry.address, newWatchList),
+      )
+        .to.emit(upkeepBalanceMonitor, 'WatchListSet')
+        .withArgs(registry.address)
+    })
+  })
+
+  describe('withdraw()', () => {
+    const payee = randomAddress()
+    const withdrawAmount = 100
+
+    it('should withdraw funds to a payee', async () => {
+      const initialBalance = await linkToken.balanceOf(
+        upkeepBalanceMonitor.address,
+      )
+      await upkeepBalanceMonitor.connect(owner).withdraw(withdrawAmount, payee)
+      const finalBalance = await linkToken.balanceOf(
+        upkeepBalanceMonitor.address,
+      )
+      const payeeBalance = await linkToken.balanceOf(payee)
+      expect(finalBalance).to.equal(initialBalance.sub(withdrawAmount))
+      expect(payeeBalance).to.equal(withdrawAmount)
+    })
+
+    it('cannot be called by a non-owner', async () => {
+      await expect(
+        upkeepBalanceMonitor.connect(stranger).withdraw(withdrawAmount, payee),
+      ).to.be.revertedWith('Only callable by owner')
+    })
+
+    it('should emit an event', async () => {
+      await expect(
+        upkeepBalanceMonitor.connect(owner).withdraw(withdrawAmount, payee),
+      )
+        .to.emit(upkeepBalanceMonitor, 'FundsWithdrawn')
+        .withArgs(100, payee)
+    })
+  })
+
+  describe('pause() and unpause()', () => {
+    it('should pause and unpause the contract', async () => {
+      await upkeepBalanceMonitor.connect(owner).pause()
+      expect(await upkeepBalanceMonitor.paused()).to.be.true
+      await upkeepBalanceMonitor.connect(owner).unpause()
+      expect(await upkeepBalanceMonitor.paused()).to.be.false
+    })
+
+    it('cannot be called by a non-owner', async () => {
+      await expect(
+        upkeepBalanceMonitor.connect(stranger).pause(),
+      ).to.be.revertedWith('Only callable by owner')
+      await upkeepBalanceMonitor.connect(owner).pause()
+      await expect(
+        upkeepBalanceMonitor.connect(stranger).unpause(),
+      ).to.be.revertedWith('Only callable by owner')
+    })
+  })
+
+  describe('checkUpkeep() / getUnderfundedUpkeeps()', () => {
+    it('should find the underfunded upkeeps', async () => {
+      let [upkeepIDs, registries, topUpAmounts] =
+        await upkeepBalanceMonitor.getUnderfundedUpkeeps()
+      expect(upkeepIDs.length).to.equal(0)
+      expect(registries.length).to.equal(0)
+      expect(topUpAmounts.length).to.equal(0)
+      let [upkeepNeeded, performData] =
+        await upkeepBalanceMonitor.checkUpkeep('0x')
+      expect(upkeepNeeded).to.be.false
+      expect(performData).to.equal('0x')
+      // update the balance for some upkeeps
+      await registry.mock.getBalance.withArgs(2).returns(120)
+      await registry.mock.getBalance.withArgs(4).returns(15)
+      await registry.mock.getBalance.withArgs(5).returns(0)
+      ;[upkeepIDs, registries, topUpAmounts] =
+        await upkeepBalanceMonitor.getUnderfundedUpkeeps()
+      expect(upkeepIDs.map((v) => v.toNumber())).to.deep.equal([2, 4, 5])
+      expect(registries).to.deep.equal([
+        registry.address,
+        registry.address,
+        registry.address,
+      ])
+      expect(topUpAmounts.map((v) => v.toNumber())).to.deep.equal([
+        180, 285, 300,
+      ])
+      ;[upkeepNeeded, performData] =
+        await upkeepBalanceMonitor.checkUpkeep('0x')
+      expect(upkeepNeeded).to.be.true
+      expect(performData).to.equal(
+        ethers.utils.defaultAbiCoder.encode(
+          ['uint256[]', 'address[]', 'uint256[]'],
+          [
+            [2, 4, 5],
+            [registry.address, registry.address, registry.address],
+            [180, 285, 300],
+          ],
+        ),
+      )
+      // update all to need funding
+      for (let i = 0; i < 9; i++) {
+        await registry.mock.getBalance.withArgs(i).returns(0)
+      }
+      for (let i = 9; i < 12; i++) {
+        await registry2.mock.getBalance.withArgs(i).returns(0)
+      }
+      // only the max batch size are included in the list
+      ;[upkeepIDs, registries, topUpAmounts] =
+        await upkeepBalanceMonitor.getUnderfundedUpkeeps()
+      expect(upkeepIDs.length).to.equal(10)
+      expect(topUpAmounts.length).to.equal(10)
+      expect(upkeepIDs.map((v) => v.toNumber())).to.deep.equal([
+        0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+      ])
+      expect(registries).to.deep.equal([
+        ...Array(9).fill(registry.address),
+        registry2.address,
+      ])
+      expect(topUpAmounts.map((v) => v.toNumber())).to.deep.equal([
+        ...Array(10).fill(300),
+      ])
+      // update the balance for some upkeeps
+      await registry.mock.getBalance.withArgs(0).returns(300)
+      await registry.mock.getBalance.withArgs(5).returns(300)
+      ;[upkeepIDs, registries, topUpAmounts] =
+        await upkeepBalanceMonitor.getUnderfundedUpkeeps()
+      expect(upkeepIDs.length).to.equal(10)
+      expect(topUpAmounts.length).to.equal(10)
+      expect(upkeepIDs.map((v) => v.toNumber())).to.deep.equal([
+        1, 2, 3, 4, 6, 7, 8, 9, 10, 11,
+      ])
+      expect(registries).to.deep.equal([
+        ...Array(7).fill(registry.address),
+        ...Array(3).fill(registry2.address),
+      ])
+      expect(topUpAmounts.map((v) => v.toNumber())).to.deep.equal([
+        ...Array(10).fill(300),
+      ])
+    })
+  })
+
+  describe('topUp()', () => {
+    beforeEach(async () => {
+      await registry.mock.onTokenTransfer
+        .withArgs(
+          upkeepBalanceMonitor.address,
+          100,
+          ethers.utils.defaultAbiCoder.encode(['uint256'], [1]),
+        )
+        .returns()
+      await registry.mock.onTokenTransfer
+        .withArgs(
+          upkeepBalanceMonitor.address,
+          50,
+          ethers.utils.defaultAbiCoder.encode(['uint256'], [7]),
+        )
+        .returns()
+    })
+
+    it('cannot be called by a non-owner', async () => {
+      await expect(
+        upkeepBalanceMonitor.connect(stranger).topUp([], [], []),
+      ).to.be.revertedWith('OnlyForwarderOrOwner()')
+    })
+
+    it('should revert if the contract is paused', async () => {
+      await upkeepBalanceMonitor.connect(owner).pause()
+      await expect(
+        upkeepBalanceMonitor.connect(owner).topUp([], [], []),
+      ).to.be.revertedWith('Pausable: paused')
+    })
+
+    it('tops up the upkeeps by the amounts provided', async () => {
+      const initialBalance = await linkToken.balanceOf(registry.address)
+      const tx = await upkeepBalanceMonitor
+        .connect(owner)
+        .topUp([1, 7], [registry.address, registry.address], [100, 50])
+      const finalBalance = await linkToken.balanceOf(registry.address)
+      expect(finalBalance).to.equal(initialBalance.add(150))
+      await expect(tx)
+        .to.emit(upkeepBalanceMonitor, 'TopUpSucceeded')
+        .withArgs(1, 100)
+      await expect(tx)
+        .to.emit(upkeepBalanceMonitor, 'TopUpSucceeded')
+        .withArgs(7, 50)
+    })
+
+    it('does not abort if one top-up fails', async () => {
+      const initialBalance = await linkToken.balanceOf(registry.address)
+      const tx = await upkeepBalanceMonitor
+        .connect(owner)
+        .topUp(
+          [1, 7, 100],
+          [registry.address, registry.address, registry.address],
+          [100, 50, 100],
+        )
+      const finalBalance = await linkToken.balanceOf(registry.address)
+      expect(finalBalance).to.equal(initialBalance.add(150))
+      await expect(tx)
+        .to.emit(upkeepBalanceMonitor, 'TopUpSucceeded')
+        .withArgs(1, 100)
+      await expect(tx)
+        .to.emit(upkeepBalanceMonitor, 'TopUpSucceeded')
+        .withArgs(7, 50)
+      await expect(tx)
+        .to.emit(upkeepBalanceMonitor, 'TopUpFailed')
+        .withArgs(100)
+    })
+  })
+
+  describe('checkUpkeep() / performUpkeep()', () => {
+    it('works round-trip', async () => {
+      await registry.mock.getBalance.withArgs(1).returns(100) // needs 200
+      await registry.mock.getBalance.withArgs(7).returns(0) // needs 300
+      await registry.mock.onTokenTransfer
+        .withArgs(
+          upkeepBalanceMonitor.address,
+          200,
+          ethers.utils.defaultAbiCoder.encode(['uint256'], [1]),
+        )
+        .returns()
+      await registry.mock.onTokenTransfer
+        .withArgs(
+          upkeepBalanceMonitor.address,
+          300,
+          ethers.utils.defaultAbiCoder.encode(['uint256'], [7]),
+        )
+        .returns()
+      const [upkeepNeeded, performData] =
+        await upkeepBalanceMonitor.checkUpkeep('0x')
+      expect(upkeepNeeded).to.be.true
+      const initialBalance = await linkToken.balanceOf(registry.address)
+      await upkeepBalanceMonitor.connect(owner).performUpkeep(performData)
+      const finalBalance = await linkToken.balanceOf(registry.address)
+      expect(finalBalance).to.equal(initialBalance.add(500))
+    })
+  })
+})

From af294327f029815b3de1d7138e5e6f48876dc00e Mon Sep 17 00:00:00 2001
From: Amir Y <83904651+amirylm@users.noreply.github.com>
Date: Mon, 27 Nov 2023 16:06:22 -0300
Subject: [PATCH 013/130] Bump chainlink-automation version (#11380)

* bump chainlink-automation version

NOTE: this is just for testing, referring to an open branch
DO NOT MERGE before we import a proper version of chainlink-automation

* go tidy

* update version to 2.7.1

* go mod tidy

* Update to cut tag

* revert version change

---------

Co-authored-by: anirudhwarrier <12178754+anirudhwarrier@users.noreply.github.com>
Co-authored-by: Akshay Aggarwal <akshay.aggarwal@smartcontract.com>
---
 core/scripts/go.mod      | 2 +-
 core/scripts/go.sum      | 4 ++--
 go.mod                   | 2 +-
 go.sum                   | 4 ++--
 integration-tests/go.mod | 2 +-
 integration-tests/go.sum | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/scripts/go.mod b/core/scripts/go.mod
index 1a0775bb837..43840f93ce8 100644
--- a/core/scripts/go.mod
+++ b/core/scripts/go.mod
@@ -21,7 +21,7 @@ require (
 	github.com/pelletier/go-toml/v2 v2.1.0
 	github.com/pkg/errors v0.9.1
 	github.com/shopspring/decimal v1.3.1
-	github.com/smartcontractkit/chainlink-automation v1.0.0-alpha.0.0.20231120164534-d4cab696c459
+	github.com/smartcontractkit/chainlink-automation v1.0.1
 	github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
 	github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000
 	github.com/smartcontractkit/libocr v0.0.0-20231107151413-13e0202ae8d7
diff --git a/core/scripts/go.sum b/core/scripts/go.sum
index ef7aa735bb9..d8e682c742d 100644
--- a/core/scripts/go.sum
+++ b/core/scripts/go.sum
@@ -1502,8 +1502,8 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumvbfM1u/etVq42Afwq/jtNSBSOA8n5jntnNPo=
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
-github.com/smartcontractkit/chainlink-automation v1.0.0-alpha.0.0.20231120164534-d4cab696c459 h1:hJhuShYv9eUQxHJQdOmyEymVmApOrICrQdOY7kKQ5Io=
-github.com/smartcontractkit/chainlink-automation v1.0.0-alpha.0.0.20231120164534-d4cab696c459/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
+github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
+github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
 github.com/smartcontractkit/chainlink-common v0.1.7-0.20231121180428-d7f28e91ccc3 h1:cyA1aW1PYrOLZAMaSmuH7U99QBTfrF59s+6uDxQgOr0=
 github.com/smartcontractkit/chainlink-common v0.1.7-0.20231121180428-d7f28e91ccc3/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 h1:oewYJtdRkJKUHCNDCj5C2LQe6Oq6qy975g931nfG0cc=
diff --git a/go.mod b/go.mod
index e396ba5ede9..0f75e120fe6 100644
--- a/go.mod
+++ b/go.mod
@@ -65,7 +65,7 @@ require (
 	github.com/shirou/gopsutil/v3 v3.23.10
 	github.com/shopspring/decimal v1.3.1
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704
-	github.com/smartcontractkit/chainlink-automation v1.0.0-alpha.0.0.20231120164534-d4cab696c459
+	github.com/smartcontractkit/chainlink-automation v1.0.1
 	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231121180428-d7f28e91ccc3
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542
 	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231117191230-aa6640f2edd1
diff --git a/go.sum b/go.sum
index 0c72ac7e639..fc8cab806a9 100644
--- a/go.sum
+++ b/go.sum
@@ -1505,8 +1505,8 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumvbfM1u/etVq42Afwq/jtNSBSOA8n5jntnNPo=
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
-github.com/smartcontractkit/chainlink-automation v1.0.0-alpha.0.0.20231120164534-d4cab696c459 h1:hJhuShYv9eUQxHJQdOmyEymVmApOrICrQdOY7kKQ5Io=
-github.com/smartcontractkit/chainlink-automation v1.0.0-alpha.0.0.20231120164534-d4cab696c459/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
+github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
+github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
 github.com/smartcontractkit/chainlink-common v0.1.7-0.20231121180428-d7f28e91ccc3 h1:cyA1aW1PYrOLZAMaSmuH7U99QBTfrF59s+6uDxQgOr0=
 github.com/smartcontractkit/chainlink-common v0.1.7-0.20231121180428-d7f28e91ccc3/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 h1:oewYJtdRkJKUHCNDCj5C2LQe6Oq6qy975g931nfG0cc=
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index fd167f81a9b..ca77d3730e2 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -23,7 +23,7 @@ require (
 	github.com/scylladb/go-reflectx v1.0.1
 	github.com/segmentio/ksuid v1.0.4
 	github.com/slack-go/slack v0.12.2
-	github.com/smartcontractkit/chainlink-automation v1.0.0-alpha.0.0.20231120164534-d4cab696c459
+	github.com/smartcontractkit/chainlink-automation v1.0.1
 	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231121180428-d7f28e91ccc3
 	github.com/smartcontractkit/chainlink-testing-framework v1.19.5
 	github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index 0ee9d7848a9..f117bf73e81 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -2374,8 +2374,8 @@ github.com/slack-go/slack v0.12.2 h1:x3OppyMyGIbbiyFhsBmpf9pwkUzMhthJMRNmNlA4LaQ
 github.com/slack-go/slack v0.12.2/go.mod h1:hlGi5oXA+Gt+yWTPP0plCdRKmjsDxecdHxYQdlMQKOw=
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumvbfM1u/etVq42Afwq/jtNSBSOA8n5jntnNPo=
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
-github.com/smartcontractkit/chainlink-automation v1.0.0-alpha.0.0.20231120164534-d4cab696c459 h1:hJhuShYv9eUQxHJQdOmyEymVmApOrICrQdOY7kKQ5Io=
-github.com/smartcontractkit/chainlink-automation v1.0.0-alpha.0.0.20231120164534-d4cab696c459/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
+github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
+github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
 github.com/smartcontractkit/chainlink-common v0.1.7-0.20231121180428-d7f28e91ccc3 h1:cyA1aW1PYrOLZAMaSmuH7U99QBTfrF59s+6uDxQgOr0=
 github.com/smartcontractkit/chainlink-common v0.1.7-0.20231121180428-d7f28e91ccc3/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 h1:oewYJtdRkJKUHCNDCj5C2LQe6Oq6qy975g931nfG0cc=

From ead3beb91de7ad2922cb63f9b31132c85264a64d Mon Sep 17 00:00:00 2001
From: Bolek <1416262+bolekk@users.noreply.github.com>
Date: Mon, 27 Nov 2023 13:37:43 -0800
Subject: [PATCH 014/130] [Functions] Heartbeat request support in Gateway
 handlers (#11345)

1. Functions Handler
  - add a new method "heartbeat"
  - add a configurable list of allowed heartbeat senders
  - collect results from first F+1 nodes and send back in raw form
2. Connector Handler
  - asynchronously forward requests to Listener and cache results
  - run a loop to collect OCR reports from Offchain Transmitter
3. Listener
  - add Timestampi field and validate it
---
 core/services/functions/connector_handler.go  | 182 ++++++++++++++++--
 .../functions/connector_handler_test.go       | 109 ++++++++++-
 core/services/functions/listener.go           |   3 +
 core/services/functions/listener_test.go      |   8 +
 core/services/functions/request.go            |  17 +-
 .../gateway/handlers/functions/api.go         |   1 +
 .../handlers/functions/handler.functions.go   | 104 +++++++---
 .../functions/handler.functions_test.go       |  54 +++++-
 .../services/ocr2/plugins/functions/plugin.go |   6 +-
 .../ocr2/plugins/functions/plugin_test.go     |   9 +-
 10 files changed, 432 insertions(+), 61 deletions(-)

diff --git a/core/services/functions/connector_handler.go b/core/services/functions/connector_handler.go
index 76608b8ada3..5496bbdefc1 100644
--- a/core/services/functions/connector_handler.go
+++ b/core/services/functions/connector_handler.go
@@ -1,14 +1,18 @@
 package functions
 
 import (
+	"bytes"
 	"context"
 	"crypto/ecdsa"
 	"encoding/json"
 	"fmt"
+	"sync"
+	"time"
 
 	"go.uber.org/multierr"
 
 	ethCommon "github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/crypto"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/assets"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
@@ -25,35 +29,56 @@ import (
 type functionsConnectorHandler struct {
 	services.StateMachine
 
-	connector      connector.GatewayConnector
-	signerKey      *ecdsa.PrivateKey
-	nodeAddress    string
-	storage        s4.Storage
-	allowlist      functions.OnchainAllowlist
-	rateLimiter    *hc.RateLimiter
-	subscriptions  functions.OnchainSubscriptions
-	minimumBalance assets.Link
-	lggr           logger.Logger
+	connector           connector.GatewayConnector
+	signerKey           *ecdsa.PrivateKey
+	nodeAddress         string
+	storage             s4.Storage
+	allowlist           functions.OnchainAllowlist
+	rateLimiter         *hc.RateLimiter
+	subscriptions       functions.OnchainSubscriptions
+	minimumBalance      assets.Link
+	listener            FunctionsListener
+	offchainTransmitter OffchainTransmitter
+	heartbeatRequests   map[RequestID]*HeartbeatResponse
+	orderedRequests     []RequestID
+	mu                  sync.Mutex
+	chStop              services.StopChan
+	shutdownWaitGroup   sync.WaitGroup
+	lggr                logger.Logger
 }
 
+const (
+	HeartbeatRequestTimeoutSec = 240
+	HeartbeatCacheSize         = 1000
+)
+
 var (
 	_ connector.Signer                  = &functionsConnectorHandler{}
 	_ connector.GatewayConnectorHandler = &functionsConnectorHandler{}
 )
 
-func NewFunctionsConnectorHandler(nodeAddress string, signerKey *ecdsa.PrivateKey, storage s4.Storage, allowlist functions.OnchainAllowlist, rateLimiter *hc.RateLimiter, subscriptions functions.OnchainSubscriptions, minimumBalance assets.Link, lggr logger.Logger) (*functionsConnectorHandler, error) {
-	if signerKey == nil || storage == nil || allowlist == nil || rateLimiter == nil || subscriptions == nil {
-		return nil, fmt.Errorf("signerKey, storage, allowlist, rateLimiter and subscriptions must be non-nil")
+// internal request ID is a hash of (sender, requestID)
+func InternalId(sender []byte, requestId []byte) RequestID {
+	return RequestID(crypto.Keccak256Hash(append(sender, requestId...)).Bytes())
+}
+
+func NewFunctionsConnectorHandler(nodeAddress string, signerKey *ecdsa.PrivateKey, storage s4.Storage, allowlist functions.OnchainAllowlist, rateLimiter *hc.RateLimiter, subscriptions functions.OnchainSubscriptions, listener FunctionsListener, offchainTransmitter OffchainTransmitter, minimumBalance assets.Link, lggr logger.Logger) (*functionsConnectorHandler, error) {
+	if signerKey == nil || storage == nil || allowlist == nil || rateLimiter == nil || subscriptions == nil || listener == nil || offchainTransmitter == nil {
+		return nil, fmt.Errorf("all dependencies must be non-nil")
 	}
 	return &functionsConnectorHandler{
-		nodeAddress:    nodeAddress,
-		signerKey:      signerKey,
-		storage:        storage,
-		allowlist:      allowlist,
-		rateLimiter:    rateLimiter,
-		subscriptions:  subscriptions,
-		minimumBalance: minimumBalance,
-		lggr:           lggr.Named("FunctionsConnectorHandler"),
+		nodeAddress:         nodeAddress,
+		signerKey:           signerKey,
+		storage:             storage,
+		allowlist:           allowlist,
+		rateLimiter:         rateLimiter,
+		subscriptions:       subscriptions,
+		minimumBalance:      minimumBalance,
+		listener:            listener,
+		offchainTransmitter: offchainTransmitter,
+		heartbeatRequests:   make(map[RequestID]*HeartbeatResponse),
+		chStop:              make(services.StopChan),
+		lggr:                lggr.Named("FunctionsConnectorHandler"),
 	}, nil
 }
 
@@ -92,6 +117,8 @@ func (h *functionsConnectorHandler) HandleGatewayMessage(ctx context.Context, ga
 			return
 		}
 		h.handleSecretsSet(ctx, gatewayId, body, fromAddr)
+	case functions.MethodHeartbeat:
+		h.handleHeartbeat(ctx, gatewayId, body, fromAddr)
 	default:
 		h.lggr.Errorw("unsupported method", "id", gatewayId, "method", body.Method)
 	}
@@ -102,14 +129,21 @@ func (h *functionsConnectorHandler) Start(ctx context.Context) error {
 		if err := h.allowlist.Start(ctx); err != nil {
 			return err
 		}
-		return h.subscriptions.Start(ctx)
+		if err := h.subscriptions.Start(ctx); err != nil {
+			return err
+		}
+		h.shutdownWaitGroup.Add(1)
+		go h.reportLoop()
+		return nil
 	})
 }
 
 func (h *functionsConnectorHandler) Close() error {
 	return h.StopOnce("FunctionsConnectorHandler", func() (err error) {
+		close(h.chStop)
 		err = multierr.Combine(err, h.allowlist.Close())
 		err = multierr.Combine(err, h.subscriptions.Close())
+		h.shutdownWaitGroup.Wait()
 		return
 	})
 }
@@ -160,6 +194,112 @@ func (h *functionsConnectorHandler) handleSecretsSet(ctx context.Context, gatewa
 	h.sendResponseAndLog(ctx, gatewayId, body, response)
 }
 
+func (h *functionsConnectorHandler) handleHeartbeat(ctx context.Context, gatewayId string, requestBody *api.MessageBody, fromAddr ethCommon.Address) {
+	var request *OffchainRequest
+	err := json.Unmarshal(requestBody.Payload, &request)
+	if err != nil {
+		h.sendResponseAndLog(ctx, gatewayId, requestBody, internalErrorResponse(fmt.Sprintf("failed to unmarshal request: %v", err)))
+		return
+	}
+	if !bytes.Equal(request.RequestInitiator, fromAddr.Bytes()) {
+		h.sendResponseAndLog(ctx, gatewayId, requestBody, internalErrorResponse("RequestInitiator doesn't match sender"))
+		return
+	}
+	if !bytes.Equal(request.SubscriptionOwner, fromAddr.Bytes()) {
+		h.sendResponseAndLog(ctx, gatewayId, requestBody, internalErrorResponse("SubscriptionOwner doesn't match sender"))
+		return
+	}
+
+	internalId := InternalId(fromAddr.Bytes(), request.RequestId)
+	request.RequestId = internalId[:]
+	h.lggr.Infow("handling offchain heartbeat", "messageId", requestBody.MessageId, "internalId", internalId, "sender", requestBody.Sender)
+	h.mu.Lock()
+	response, ok := h.heartbeatRequests[internalId]
+	if !ok { // new request
+		response = &HeartbeatResponse{
+			Status:     RequestStatePending,
+			ReceivedTs: uint64(time.Now().Unix()),
+		}
+		h.cacheNewRequestLocked(internalId, response)
+		h.shutdownWaitGroup.Add(1)
+		go h.handleOffchainRequest(request)
+	}
+	responseToSend := *response
+	h.mu.Unlock()
+	requestBody.Receiver = requestBody.Sender
+	h.sendResponseAndLog(ctx, gatewayId, requestBody, responseToSend)
+}
+
+func internalErrorResponse(internalError string) HeartbeatResponse {
+	return HeartbeatResponse{
+		Status:        RequestStateInternalError,
+		InternalError: internalError,
+	}
+}
+
+func (h *functionsConnectorHandler) handleOffchainRequest(request *OffchainRequest) {
+	defer h.shutdownWaitGroup.Done()
+	stopCtx, _ := h.chStop.NewCtx()
+	ctx, cancel := context.WithTimeout(stopCtx, time.Duration(HeartbeatRequestTimeoutSec)*time.Second)
+	defer cancel()
+	err := h.listener.HandleOffchainRequest(ctx, request)
+	if err != nil {
+		h.lggr.Errorw("internal error while processing", "id", request.RequestId, "error", err)
+		h.mu.Lock()
+		defer h.mu.Unlock()
+		state, ok := h.heartbeatRequests[RequestID(request.RequestId)]
+		if !ok {
+			h.lggr.Errorw("request unexpectedly disappeared from local cache", "id", request.RequestId)
+			return
+		}
+		state.CompletedTs = uint64(time.Now().Unix())
+		state.Status = RequestStateInternalError
+		state.InternalError = err.Error()
+	} else {
+		// no error - results will be sent to OCR aggregation and returned via reportLoop()
+		h.lggr.Infow("request processed successfully, waiting for aggregation ...", "id", request.RequestId)
+	}
+}
+
+// Listen to OCR reports passed from the plugin and process them against a local cache of requests.
+func (h *functionsConnectorHandler) reportLoop() {
+	defer h.shutdownWaitGroup.Done()
+	for {
+		select {
+		case report := <-h.offchainTransmitter.ReportChannel():
+			h.lggr.Infow("received report", "requestId", report.RequestId, "resultLen", len(report.Result), "errorLen", len(report.Error))
+			if len(report.RequestId) != RequestIDLength {
+				h.lggr.Errorw("report has invalid requestId", "requestId", report.RequestId)
+				continue
+			}
+			h.mu.Lock()
+			cachedResponse, ok := h.heartbeatRequests[RequestID(report.RequestId)]
+			if !ok {
+				h.lggr.Infow("received report for unknown request, caching it", "id", report.RequestId)
+				cachedResponse = &HeartbeatResponse{}
+				h.cacheNewRequestLocked(RequestID(report.RequestId), cachedResponse)
+			}
+			cachedResponse.CompletedTs = uint64(time.Now().Unix())
+			cachedResponse.Status = RequestStateComplete
+			cachedResponse.Response = report
+			h.mu.Unlock()
+		case <-h.chStop:
+			h.lggr.Info("exiting reportLoop")
+			return
+		}
+	}
+}
+
+func (h *functionsConnectorHandler) cacheNewRequestLocked(requestId RequestID, response *HeartbeatResponse) {
+	// remove oldest requests
+	for len(h.orderedRequests) >= HeartbeatCacheSize {
+		delete(h.heartbeatRequests, h.orderedRequests[0])
+		h.orderedRequests = h.orderedRequests[1:]
+	}
+	h.heartbeatRequests[requestId] = response
+	h.orderedRequests = append(h.orderedRequests, requestId)
+}
+
 func (h *functionsConnectorHandler) sendResponseAndLog(ctx context.Context, gatewayId string, requestBody *api.MessageBody, payload any) {
 	err := h.sendResponse(ctx, gatewayId, requestBody, payload)
 	if err != nil {
diff --git a/core/services/functions/connector_handler_test.go b/core/services/functions/connector_handler_test.go
index 82c3dab3afc..fe1a1baa6fc 100644
--- a/core/services/functions/connector_handler_test.go
+++ b/core/services/functions/connector_handler_test.go
@@ -1,16 +1,20 @@
 package functions_test
 
 import (
+	"crypto/rand"
 	"encoding/base64"
 	"encoding/json"
 	"errors"
 	"math/big"
 	"testing"
 
+	geth_common "github.com/ethereum/go-ethereum/common"
+
 	"github.com/smartcontractkit/chainlink-common/pkg/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/functions"
+	sfmocks "github.com/smartcontractkit/chainlink/v2/core/services/functions/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/services/gateway/api"
 	"github.com/smartcontractkit/chainlink/v2/core/services/gateway/common"
 	gcmocks "github.com/smartcontractkit/chainlink/v2/core/services/gateway/connector/mocks"
@@ -24,6 +28,31 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+func newOffchainRequest(t *testing.T, sender []byte) (*api.Message, functions.RequestID) {
+	requestId := make([]byte, 32)
+	_, err := rand.Read(requestId)
+	require.NoError(t, err)
+	request := &functions.OffchainRequest{
+		RequestId:         requestId,
+		RequestInitiator:  sender,
+		SubscriptionId:    1,
+		SubscriptionOwner: sender,
+	}
+
+	internalId := functions.InternalId(request.RequestInitiator, request.RequestId)
+	req, err := json.Marshal(request)
+	require.NoError(t, err)
+	msg := &api.Message{
+		Body: api.MessageBody{
+			DonId:     "fun4",
+			MessageId: "1",
+			Method:    "heartbeat",
+			Payload:   req,
+		},
+	}
+	return msg, internalId
+}
+
 func TestFunctionsConnectorHandler(t *testing.T) {
 	t.Parallel()
 
@@ -34,12 +63,16 @@ func TestFunctionsConnectorHandler(t *testing.T) {
 	allowlist := gfmocks.NewOnchainAllowlist(t)
 	rateLimiter, err := hc.NewRateLimiter(hc.RateLimiterConfig{GlobalRPS: 100.0, GlobalBurst: 100, PerSenderRPS: 100.0, PerSenderBurst: 100})
 	subscriptions := gfmocks.NewOnchainSubscriptions(t)
+	reportCh := make(chan *functions.OffchainResponse)
+	offchainTransmitter := sfmocks.NewOffchainTransmitter(t)
+	offchainTransmitter.On("ReportChannel", mock.Anything).Return(reportCh)
+	listener := sfmocks.NewFunctionsListener(t)
 	require.NoError(t, err)
 	allowlist.On("Start", mock.Anything).Return(nil)
 	allowlist.On("Close", mock.Anything).Return(nil)
 	subscriptions.On("Start", mock.Anything).Return(nil)
 	subscriptions.On("Close", mock.Anything).Return(nil)
-	handler, err := functions.NewFunctionsConnectorHandler(addr.Hex(), privateKey, storage, allowlist, rateLimiter, subscriptions, *assets.NewLinkFromJuels(100), logger)
+	handler, err := functions.NewFunctionsConnectorHandler(addr.Hex(), privateKey, storage, allowlist, rateLimiter, subscriptions, listener, offchainTransmitter, *assets.NewLinkFromJuels(100), logger)
 	require.NoError(t, err)
 
 	handler.SetConnector(connector)
@@ -219,4 +252,78 @@ func TestFunctionsConnectorHandler(t *testing.T) {
 			handler.HandleGatewayMessage(testutils.Context(t), "gw1", &msg)
 		})
 	})
+
+	t.Run("heartbeat success", func(t *testing.T) {
+		ctx := testutils.Context(t)
+		msg, internalId := newOffchainRequest(t, addr.Bytes())
+		require.NoError(t, msg.Sign(privateKey))
+
+		// first call to trigger the request
+		var response functions.HeartbeatResponse
+		allowlist.On("Allow", addr).Return(true).Once()
+		listener.On("HandleOffchainRequest", mock.Anything, mock.Anything).Return(nil).Once()
+		connector.On("SendToGateway", mock.Anything, "gw1", mock.Anything).Run(func(args mock.Arguments) {
+			respMsg, ok := args[2].(*api.Message)
+			require.True(t, ok)
+			require.NoError(t, json.Unmarshal(respMsg.Body.Payload, &response))
+			require.Equal(t, functions.RequestStatePending, response.Status)
+		}).Return(nil).Once()
+		handler.HandleGatewayMessage(ctx, "gw1", msg)
+
+		// async response computation
+		reportCh <- &functions.OffchainResponse{
+			RequestId: internalId[:],
+			Result:    []byte("ok!"),
+		}
+		reportCh <- &functions.OffchainResponse{} // sending second item to make sure the first one got processed
+
+		// second call to collect the response
+		allowlist.On("Allow", addr).Return(true).Once()
+		connector.On("SendToGateway", mock.Anything, "gw1", mock.Anything).Run(func(args mock.Arguments) {
+			respMsg, ok := args[2].(*api.Message)
+			require.True(t, ok)
+			require.NoError(t, json.Unmarshal(respMsg.Body.Payload, &response))
+			require.Equal(t, functions.RequestStateComplete, response.Status)
+		}).Return(nil).Once()
+		handler.HandleGatewayMessage(ctx, "gw1", msg)
+	})
+
+	t.Run("heartbeat internal error", func(t *testing.T) {
+		ctx := testutils.Context(t)
+		msg, _ := newOffchainRequest(t, addr.Bytes())
+		require.NoError(t, msg.Sign(privateKey))
+
+		// first call to trigger the request
+		var response functions.HeartbeatResponse
+		allowlist.On("Allow", addr).Return(true).Once()
+		listener.On("HandleOffchainRequest", mock.Anything, mock.Anything).Return(errors.New("boom")).Once()
+		connector.On("SendToGateway", mock.Anything, "gw1", mock.Anything).Return(nil).Once()
+		handler.HandleGatewayMessage(ctx, "gw1", msg)
+
+		// second call to collect the response
+		allowlist.On("Allow", addr).Return(true).Once()
+		connector.On("SendToGateway", mock.Anything, "gw1", mock.Anything).Run(func(args mock.Arguments) {
+			respMsg, ok := args[2].(*api.Message)
+			require.True(t, ok)
+			require.NoError(t, json.Unmarshal(respMsg.Body.Payload, &response))
+			require.Equal(t, functions.RequestStateInternalError, response.Status)
+		}).Return(nil).Once()
+		handler.HandleGatewayMessage(ctx, "gw1", msg)
+	})
+
+	t.Run("heartbeat sender address doesn't match", func(t *testing.T) {
+		ctx := testutils.Context(t)
+		msg, _ := newOffchainRequest(t, geth_common.BytesToAddress([]byte("0x1234")).Bytes())
+		require.NoError(t, msg.Sign(privateKey))
+
+		var response functions.HeartbeatResponse
+		allowlist.On("Allow", addr).Return(true).Once()
+		connector.On("SendToGateway", mock.Anything, "gw1", mock.Anything).Run(func(args mock.Arguments) {
+			respMsg, ok := args[2].(*api.Message)
+			require.True(t, ok)
+			require.NoError(t, json.Unmarshal(respMsg.Body.Payload, &response))
+			require.Equal(t, functions.RequestStateInternalError, response.Status)
+		}).Return(nil).Once()
+		handler.HandleGatewayMessage(ctx, "gw1", msg)
+	})
 }
diff --git a/core/services/functions/listener.go b/core/services/functions/listener.go
index 3a308431807..65c364adb7c 100644
--- a/core/services/functions/listener.go
+++ b/core/services/functions/listener.go
@@ -300,6 +300,9 @@ func (l *functionsListener) HandleOffchainRequest(ctx context.Context, request *
 	if len(request.SubscriptionOwner) != common.AddressLength || len(request.RequestInitiator) != common.AddressLength {
 		return fmt.Errorf("HandleOffchainRequest: SubscriptionOwner and RequestInitiator must be set to valid addresses")
 	}
+	if request.Timestamp < uint64(time.Now().Unix()-int64(l.pluginConfig.RequestTimeoutSec)) {
+		return fmt.Errorf("HandleOffchainRequest: request timestamp is too old")
+	}
 
 	var requestId RequestID
 	copy(requestId[:], request.RequestId[:32])
diff --git a/core/services/functions/listener_test.go b/core/services/functions/listener_test.go
index ecad9e4cceb..0fcc9c65599 100644
--- a/core/services/functions/listener_test.go
+++ b/core/services/functions/listener_test.go
@@ -7,6 +7,7 @@ import (
 	"math/big"
 	"sync"
 	"testing"
+	"time"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/fxamacker/cbor/v2"
@@ -195,6 +196,7 @@ func TestFunctionsListener_HandleOffchainRequest_Success(t *testing.T) {
 		RequestInitiator:  SubscriptionOwner.Bytes(),
 		SubscriptionId:    uint64(SubscriptionID),
 		SubscriptionOwner: SubscriptionOwner.Bytes(),
+		Timestamp:         uint64(time.Now().Unix()),
 		Data:              functions_service.RequestData{},
 	}
 	require.NoError(t, uni.service.HandleOffchainRequest(testutils.Context(t), request))
@@ -210,6 +212,7 @@ func TestFunctionsListener_HandleOffchainRequest_Invalid(t *testing.T) {
 		RequestInitiator:  []byte("invalid_address"),
 		SubscriptionId:    uint64(SubscriptionID),
 		SubscriptionOwner: SubscriptionOwner.Bytes(),
+		Timestamp:         uint64(time.Now().Unix()),
 		Data:              functions_service.RequestData{},
 	}
 	require.Error(t, uni.service.HandleOffchainRequest(testutils.Context(t), request))
@@ -217,6 +220,10 @@ func TestFunctionsListener_HandleOffchainRequest_Invalid(t *testing.T) {
 	request.RequestInitiator = SubscriptionOwner.Bytes()
 	request.SubscriptionOwner = []byte("invalid_address")
 	require.Error(t, uni.service.HandleOffchainRequest(testutils.Context(t), request))
+
+	request.SubscriptionOwner = SubscriptionOwner.Bytes()
+	request.Timestamp = 1
+	require.Error(t, uni.service.HandleOffchainRequest(testutils.Context(t), request))
 }
 
 func TestFunctionsListener_HandleOffchainRequest_InternalError(t *testing.T) {
@@ -233,6 +240,7 @@ func TestFunctionsListener_HandleOffchainRequest_InternalError(t *testing.T) {
 		RequestInitiator:  SubscriptionOwner.Bytes(),
 		SubscriptionId:    uint64(SubscriptionID),
 		SubscriptionOwner: SubscriptionOwner.Bytes(),
+		Timestamp:         uint64(time.Now().Unix()),
 		Data:              functions_service.RequestData{},
 	}
 	require.Error(t, uni.service.HandleOffchainRequest(testutils.Context(t), request))
diff --git a/core/services/functions/request.go b/core/services/functions/request.go
index 14c0b0d0e5a..eaa92fc8088 100644
--- a/core/services/functions/request.go
+++ b/core/services/functions/request.go
@@ -5,6 +5,10 @@ const (
 	LocationRemote     = 1
 	LocationDONHosted  = 2
 	LanguageJavaScript = 0
+
+	RequestStatePending       = 1
+	RequestStateComplete      = 2
+	RequestStateInternalError = 3
 )
 
 type RequestFlags [32]byte
@@ -14,6 +18,7 @@ type OffchainRequest struct {
 	RequestInitiator  []byte      `json:"requestInitiator"`
 	SubscriptionId    uint64      `json:"subscriptionId"`
 	SubscriptionOwner []byte      `json:"subscriptionOwner"`
+	Timestamp         uint64      `json:"timestamp"`
 	Data              RequestData `json:"data"`
 }
 
@@ -30,8 +35,16 @@ type RequestData struct {
 // NOTE: to be extended with raw report and signatures when needed
 type OffchainResponse struct {
 	RequestId []byte `json:"requestId"`
-	Result    []byte `json:"result"`
-	Error     []byte `json:"error"`
+	Result    []byte `json:"result,omitempty"`
+	Error     []byte `json:"error,omitempty"`
+}
+
+type HeartbeatResponse struct {
+	Status        int               `json:"status"`
+	InternalError string            `json:"internalError,omitempty"`
+	ReceivedTs    uint64            `json:"receivedTs"`
+	CompletedTs   uint64            `json:"completedTs"`
+	Response      *OffchainResponse `json:"response,omitempty"`
 }
 
 type DONHostedSecrets struct {
diff --git a/core/services/gateway/handlers/functions/api.go b/core/services/gateway/handlers/functions/api.go
index 202fa99e414..36db1943931 100644
--- a/core/services/gateway/handlers/functions/api.go
+++ b/core/services/gateway/handlers/functions/api.go
@@ -5,6 +5,7 @@ import "github.com/smartcontractkit/chainlink/v2/core/services/gateway/api"
 const (
 	MethodSecretsSet  = "secrets_set"
 	MethodSecretsList = "secrets_list"
+	MethodHeartbeat   = "heartbeat"
 )
 
 type SecretsSetRequest struct {
diff --git a/core/services/gateway/handlers/functions/handler.functions.go b/core/services/gateway/handlers/functions/handler.functions.go
index 3269caa2d6a..b52c866a131 100644
--- a/core/services/gateway/handlers/functions/handler.functions.go
+++ b/core/services/gateway/handlers/functions/handler.functions.go
@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"math/big"
+	"strings"
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -62,26 +63,28 @@ type FunctionsHandlerConfig struct {
 	OnchainSubscriptions       *OnchainSubscriptionsConfig `json:"onchainSubscriptions"`
 	MinimumSubscriptionBalance *assets.Link                `json:"minimumSubscriptionBalance"`
 	// Not specifying RateLimiter config disables rate limiting
-	UserRateLimiter      *hc.RateLimiterConfig `json:"userRateLimiter"`
-	NodeRateLimiter      *hc.RateLimiterConfig `json:"nodeRateLimiter"`
-	MaxPendingRequests   uint32                `json:"maxPendingRequests"`
-	RequestTimeoutMillis int64                 `json:"requestTimeoutMillis"`
+	UserRateLimiter            *hc.RateLimiterConfig `json:"userRateLimiter"`
+	NodeRateLimiter            *hc.RateLimiterConfig `json:"nodeRateLimiter"`
+	MaxPendingRequests         uint32                `json:"maxPendingRequests"`
+	RequestTimeoutMillis       int64                 `json:"requestTimeoutMillis"`
+	AllowedHeartbeatInitiators []string              `json:"allowedHeartbeatInitiators"`
 }
 
 type functionsHandler struct {
 	services.StateMachine
 
-	handlerConfig   FunctionsHandlerConfig
-	donConfig       *config.DONConfig
-	don             handlers.DON
-	pendingRequests hc.RequestCache[PendingRequest]
-	allowlist       OnchainAllowlist
-	subscriptions   OnchainSubscriptions
-	minimumBalance  *assets.Link
-	userRateLimiter *hc.RateLimiter
-	nodeRateLimiter *hc.RateLimiter
-	chStop          services.StopChan
-	lggr            logger.Logger
+	handlerConfig              FunctionsHandlerConfig
+	donConfig                  *config.DONConfig
+	don                        handlers.DON
+	pendingRequests            hc.RequestCache[PendingRequest]
+	allowlist                  OnchainAllowlist
+	subscriptions              OnchainSubscriptions
+	minimumBalance             *assets.Link
+	userRateLimiter            *hc.RateLimiter
+	nodeRateLimiter            *hc.RateLimiter
+	allowedHeartbeatInitiators map[string]struct{}
+	chStop                     services.StopChan
+	lggr                       logger.Logger
 }
 
 type PendingRequest struct {
@@ -135,8 +138,12 @@ func NewFunctionsHandlerFromConfig(handlerConfig json.RawMessage, donConfig *con
 			return nil, err2
 		}
 	}
+	allowedHeartbeatInitiators := make(map[string]struct{})
+	for _, initiator := range cfg.AllowedHeartbeatInitiators {
+		allowedHeartbeatInitiators[strings.ToLower(initiator)] = struct{}{}
+	}
 	pendingRequestsCache := hc.NewRequestCache[PendingRequest](time.Millisecond*time.Duration(cfg.RequestTimeoutMillis), cfg.MaxPendingRequests)
-	return NewFunctionsHandler(cfg, donConfig, don, pendingRequestsCache, allowlist, subscriptions, cfg.MinimumSubscriptionBalance, userRateLimiter, nodeRateLimiter, lggr), nil
+	return NewFunctionsHandler(cfg, donConfig, don, pendingRequestsCache, allowlist, subscriptions, cfg.MinimumSubscriptionBalance, userRateLimiter, nodeRateLimiter, allowedHeartbeatInitiators, lggr), nil
 }
 
 func NewFunctionsHandler(
@@ -149,19 +156,21 @@ func NewFunctionsHandler(
 	minimumBalance *assets.Link,
 	userRateLimiter *hc.RateLimiter,
 	nodeRateLimiter *hc.RateLimiter,
+	allowedHeartbeatInitiators map[string]struct{},
 	lggr logger.Logger) handlers.Handler {
 	return &functionsHandler{
-		handlerConfig:   cfg,
-		donConfig:       donConfig,
-		don:             don,
-		pendingRequests: pendingRequestsCache,
-		allowlist:       allowlist,
-		subscriptions:   subscriptions,
-		minimumBalance:  minimumBalance,
-		userRateLimiter: userRateLimiter,
-		nodeRateLimiter: nodeRateLimiter,
-		chStop:          make(services.StopChan),
-		lggr:            lggr,
+		handlerConfig:              cfg,
+		donConfig:                  donConfig,
+		don:                        don,
+		pendingRequests:            pendingRequestsCache,
+		allowlist:                  allowlist,
+		subscriptions:              subscriptions,
+		minimumBalance:             minimumBalance,
+		userRateLimiter:            userRateLimiter,
+		nodeRateLimiter:            nodeRateLimiter,
+		allowedHeartbeatInitiators: allowedHeartbeatInitiators,
+		chStop:                     make(services.StopChan),
+		lggr:                       lggr,
 	}
 }
 
@@ -193,6 +202,13 @@ func (h *functionsHandler) HandleUserMessage(ctx context.Context, msg *api.Messa
 	switch msg.Body.Method {
 	case MethodSecretsSet, MethodSecretsList:
 		return h.handleRequest(ctx, msg, callbackCh)
+	case MethodHeartbeat:
+		if _, ok := h.allowedHeartbeatInitiators[msg.Body.Sender]; !ok {
+			h.lggr.Debugw("received heartbeat request from a non-allowed sender", "sender", msg.Body.Sender)
+			promHandlerError.WithLabelValues(h.donConfig.DonId, ErrNotAllowlisted.Error()).Inc()
+			return ErrUnsupportedMethod
+		}
+		return h.handleRequest(ctx, msg, callbackCh)
 	default:
 		h.lggr.Debugw("unsupported method", "method", msg.Body.Method)
 		promHandlerError.WithLabelValues(h.donConfig.DonId, ErrUnsupportedMethod.Error()).Inc()
@@ -227,6 +243,8 @@ func (h *functionsHandler) HandleNodeMessage(ctx context.Context, msg *api.Messa
 	switch msg.Body.Method {
 	case MethodSecretsSet, MethodSecretsList:
 		return h.pendingRequests.ProcessResponse(msg, h.processSecretsResponse)
+	case MethodHeartbeat:
+		return h.pendingRequests.ProcessResponse(msg, h.processHeartbeatResponse)
 	default:
 		h.lggr.Debugw("unsupported method", "method", msg.Body.Method)
 		return ErrUnsupportedMethod
@@ -295,6 +313,38 @@ func newSecretsResponse(request *api.Message, success bool, responses []*api.Mes
 	return &handlers.UserCallbackPayload{Msg: &userResponse, ErrCode: api.NoError, ErrMsg: ""}, nil
 }
 
+// Conforms to ResponseProcessor[*PendingRequest]
+func (h *functionsHandler) processHeartbeatResponse(response *api.Message, responseData *PendingRequest) (*handlers.UserCallbackPayload, *PendingRequest, error) {
+	if _, exists := responseData.responses[response.Body.Sender]; exists {
+		return nil, nil, errors.New("duplicate response")
+	}
+	if response.Body.Method != responseData.request.Body.Method {
+		return nil, responseData, errors.New("invalid method")
+	}
+	responseData.responses[response.Body.Sender] = response
+
+	// user response is ready with F+1 node responses
+	if len(responseData.responses) >= h.donConfig.F+1 {
+		var responseList []*api.Message
+		for _, response := range responseData.responses {
+			responseList = append(responseList, response)
+		}
+		userResponse := *responseData.request
+		userResponse.Body.Receiver = responseData.request.Body.Sender
+		// success = true only means that we got F+1 responses
+		// it's up to the heartbeat sender to validate computation results
+		payload := CombinedResponse{ResponseBase: ResponseBase{Success: true}, NodeResponses: responseList}
+		payloadJson, err := json.Marshal(payload)
+		if err != nil {
+			return &handlers.UserCallbackPayload{Msg: &userResponse, ErrCode: api.NodeReponseEncodingError, ErrMsg: ""}, nil, nil
+		}
+		userResponse.Body.Payload = payloadJson
+		return &handlers.UserCallbackPayload{Msg: &userResponse, ErrCode: api.NoError, ErrMsg: ""}, nil, nil
+	}
+	// not ready to be processed yet
+	return nil, responseData, nil
+}
+
 func (h *functionsHandler) Start(ctx context.Context) error {
 	return h.StartOnce("FunctionsHandler", func() error {
 		h.lggr.Info("starting FunctionsHandler")
diff --git a/core/services/gateway/handlers/functions/handler.functions_test.go b/core/services/gateway/handlers/functions/handler.functions_test.go
index 402823df173..f36b64709a2 100644
--- a/core/services/gateway/handlers/functions/handler.functions_test.go
+++ b/core/services/gateway/handlers/functions/handler.functions_test.go
@@ -25,7 +25,7 @@ import (
 	handlers_mocks "github.com/smartcontractkit/chainlink/v2/core/services/gateway/handlers/mocks"
 )
 
-func newFunctionsHandlerForATestDON(t *testing.T, nodes []gc.TestNode, requestTimeout time.Duration) (handlers.Handler, *handlers_mocks.DON, *functions_mocks.OnchainAllowlist, *functions_mocks.OnchainSubscriptions) {
+func newFunctionsHandlerForATestDON(t *testing.T, nodes []gc.TestNode, requestTimeout time.Duration, heartbeatSender string) (handlers.Handler, *handlers_mocks.DON, *functions_mocks.OnchainAllowlist, *functions_mocks.OnchainSubscriptions) {
 	cfg := functions.FunctionsHandlerConfig{}
 	donConfig := &config.DONConfig{
 		Members: []config.NodeConfig{},
@@ -48,7 +48,8 @@ func newFunctionsHandlerForATestDON(t *testing.T, nodes []gc.TestNode, requestTi
 	nodeRateLimiter, err := hc.NewRateLimiter(hc.RateLimiterConfig{GlobalRPS: 100.0, GlobalBurst: 100, PerSenderRPS: 100.0, PerSenderBurst: 100})
 	require.NoError(t, err)
 	pendingRequestsCache := hc.NewRequestCache[functions.PendingRequest](requestTimeout, 1000)
-	handler := functions.NewFunctionsHandler(cfg, donConfig, don, pendingRequestsCache, allowlist, subscriptions, minBalance, userRateLimiter, nodeRateLimiter, logger.TestLogger(t))
+	allowedHeartbeatInititors := map[string]struct{}{heartbeatSender: {}}
+	handler := functions.NewFunctionsHandler(cfg, donConfig, don, pendingRequestsCache, allowlist, subscriptions, minBalance, userRateLimiter, nodeRateLimiter, allowedHeartbeatInititors, logger.TestLogger(t))
 	return handler, don, allowlist, subscriptions
 }
 
@@ -117,7 +118,7 @@ func TestFunctionsHandler_HandleUserMessage_SecretsSet(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 			nodes, user := gc.NewTestNodes(t, 4), gc.NewTestNodes(t, 1)[0]
-			handler, don, allowlist, subscriptions := newFunctionsHandlerForATestDON(t, nodes, time.Hour*24)
+			handler, don, allowlist, subscriptions := newFunctionsHandlerForATestDON(t, nodes, time.Hour*24, user.Address)
 			userRequestMsg := newSignedMessage(t, "1234", "secrets_set", "don_id", user.PrivateKey)
 
 			callbachCh := make(chan handlers.UserCallbackPayload)
@@ -144,11 +145,54 @@ func TestFunctionsHandler_HandleUserMessage_SecretsSet(t *testing.T) {
 	}
 }
 
+func TestFunctionsHandler_HandleUserMessage_Heartbeat(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		name                     string
+		nodeResults              []bool
+		expectedGatewayResult    bool
+		expectedNodeMessageCount int
+	}{
+		{"three successful", []bool{true, true, true, false}, true, 2},
+		{"two successful", []bool{false, true, false, true}, true, 2},
+		{"one successful", []bool{false, true, false, false}, true, 2},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			nodes, user := gc.NewTestNodes(t, 4), gc.NewTestNodes(t, 1)[0]
+			handler, don, allowlist, _ := newFunctionsHandlerForATestDON(t, nodes, time.Hour*24, user.Address)
+			userRequestMsg := newSignedMessage(t, "1234", "heartbeat", "don_id", user.PrivateKey)
+
+			callbachCh := make(chan handlers.UserCallbackPayload)
+			done := make(chan struct{})
+			go func() {
+				defer close(done)
+				// wait on a response from Gateway to the user
+				response := <-callbachCh
+				require.Equal(t, api.NoError, response.ErrCode)
+				require.Equal(t, userRequestMsg.Body.MessageId, response.Msg.Body.MessageId)
+				var payload functions.CombinedResponse
+				require.NoError(t, json.Unmarshal(response.Msg.Body.Payload, &payload))
+				require.Equal(t, test.expectedGatewayResult, payload.Success)
+				require.Equal(t, test.expectedNodeMessageCount, len(payload.NodeResponses))
+			}()
+
+			allowlist.On("Allow", common.HexToAddress(user.Address)).Return(true, nil)
+			don.On("SendToNode", mock.Anything, mock.Anything, mock.Anything).Return(nil)
+			require.NoError(t, handler.HandleUserMessage(testutils.Context(t), &userRequestMsg, callbachCh))
+			sendNodeReponses(t, handler, userRequestMsg, nodes, test.nodeResults)
+			<-done
+		})
+	}
+}
+
 func TestFunctionsHandler_HandleUserMessage_InvalidMethod(t *testing.T) {
 	t.Parallel()
 
 	nodes, user := gc.NewTestNodes(t, 4), gc.NewTestNodes(t, 1)[0]
-	handler, _, allowlist, _ := newFunctionsHandlerForATestDON(t, nodes, time.Hour*24)
+	handler, _, allowlist, _ := newFunctionsHandlerForATestDON(t, nodes, time.Hour*24, user.Address)
 	userRequestMsg := newSignedMessage(t, "1234", "secrets_reveal_all_please", "don_id", user.PrivateKey)
 
 	allowlist.On("Allow", common.HexToAddress(user.Address)).Return(true, nil)
@@ -160,7 +204,7 @@ func TestFunctionsHandler_HandleUserMessage_Timeout(t *testing.T) {
 	t.Parallel()
 
 	nodes, user := gc.NewTestNodes(t, 4), gc.NewTestNodes(t, 1)[0]
-	handler, don, allowlist, subscriptions := newFunctionsHandlerForATestDON(t, nodes, time.Millisecond*10)
+	handler, don, allowlist, subscriptions := newFunctionsHandlerForATestDON(t, nodes, time.Millisecond*10, user.Address)
 	userRequestMsg := newSignedMessage(t, "1234", "secrets_set", "don_id", user.PrivateKey)
 
 	callbachCh := make(chan handlers.UserCallbackPayload)
diff --git a/core/services/ocr2/plugins/functions/plugin.go b/core/services/ocr2/plugins/functions/plugin.go
index 475cf0a2af7..82280f527cd 100644
--- a/core/services/ocr2/plugins/functions/plugin.go
+++ b/core/services/ocr2/plugins/functions/plugin.go
@@ -146,7 +146,7 @@ func NewFunctionsServices(functionsOracleArgs, thresholdOracleArgs, s4OracleArgs
 			return nil, errors.Wrap(err, "failed to create a OnchainSubscriptions")
 		}
 		connectorLogger := conf.Logger.Named("GatewayConnector").With("jobName", conf.Job.PipelineSpec.JobName)
-		connector, err2 := NewConnector(pluginConfig.GatewayConnectorConfig, conf.EthKeystore, conf.Chain.ID(), s4Storage, allowlist, rateLimiter, subscriptions, pluginConfig.MinimumSubscriptionBalance, connectorLogger)
+		connector, err2 := NewConnector(pluginConfig.GatewayConnectorConfig, conf.EthKeystore, conf.Chain.ID(), s4Storage, allowlist, rateLimiter, subscriptions, functionsListener, offchainTransmitter, pluginConfig.MinimumSubscriptionBalance, connectorLogger)
 		if err2 != nil {
 			return nil, errors.Wrap(err, "failed to create a GatewayConnector")
 		}
@@ -173,7 +173,7 @@ func NewFunctionsServices(functionsOracleArgs, thresholdOracleArgs, s4OracleArgs
 	return allServices, nil
 }
 
-func NewConnector(gwcCfg *connector.ConnectorConfig, ethKeystore keystore.Eth, chainID *big.Int, s4Storage s4.Storage, allowlist gwFunctions.OnchainAllowlist, rateLimiter *hc.RateLimiter, subscriptions gwFunctions.OnchainSubscriptions, minimumBalance assets.Link, lggr logger.Logger) (connector.GatewayConnector, error) {
+func NewConnector(gwcCfg *connector.ConnectorConfig, ethKeystore keystore.Eth, chainID *big.Int, s4Storage s4.Storage, allowlist gwFunctions.OnchainAllowlist, rateLimiter *hc.RateLimiter, subscriptions gwFunctions.OnchainSubscriptions, listener functions.FunctionsListener, offchainTransmitter functions.OffchainTransmitter, minimumBalance assets.Link, lggr logger.Logger) (connector.GatewayConnector, error) {
 	enabledKeys, err := ethKeystore.EnabledKeysForChain(chainID)
 	if err != nil {
 		return nil, err
@@ -186,7 +186,7 @@ func NewConnector(gwcCfg *connector.ConnectorConfig, ethKeystore keystore.Eth, c
 	signerKey := enabledKeys[idx].ToEcdsaPrivKey()
 	nodeAddress := enabledKeys[idx].ID()
 
-	handler, err := functions.NewFunctionsConnectorHandler(nodeAddress, signerKey, s4Storage, allowlist, rateLimiter, subscriptions, minimumBalance, lggr)
+	handler, err := functions.NewFunctionsConnectorHandler(nodeAddress, signerKey, s4Storage, allowlist, rateLimiter, subscriptions, listener, offchainTransmitter, minimumBalance, lggr)
 	if err != nil {
 		return nil, err
 	}
diff --git a/core/services/ocr2/plugins/functions/plugin_test.go b/core/services/ocr2/plugins/functions/plugin_test.go
index 453d4b67aa8..d77fabcc437 100644
--- a/core/services/ocr2/plugins/functions/plugin_test.go
+++ b/core/services/ocr2/plugins/functions/plugin_test.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	sfmocks "github.com/smartcontractkit/chainlink/v2/core/services/functions/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/services/gateway/connector"
 	hc "github.com/smartcontractkit/chainlink/v2/core/services/gateway/handlers/common"
 	gfmocks "github.com/smartcontractkit/chainlink/v2/core/services/gateway/handlers/functions/mocks"
@@ -35,8 +36,10 @@ func TestNewConnector_Success(t *testing.T) {
 	subscriptions := gfmocks.NewOnchainSubscriptions(t)
 	rateLimiter, err := hc.NewRateLimiter(hc.RateLimiterConfig{GlobalRPS: 100.0, GlobalBurst: 100, PerSenderRPS: 100.0, PerSenderBurst: 100})
 	require.NoError(t, err)
+	listener := sfmocks.NewFunctionsListener(t)
+	offchainTransmitter := sfmocks.NewOffchainTransmitter(t)
 	ethKeystore.On("EnabledKeysForChain", mock.Anything).Return([]ethkey.KeyV2{keyV2}, nil)
-	_, err = functions.NewConnector(gwcCfg, ethKeystore, chainID, s4Storage, allowlist, rateLimiter, subscriptions, *assets.NewLinkFromJuels(0), logger.TestLogger(t))
+	_, err = functions.NewConnector(gwcCfg, ethKeystore, chainID, s4Storage, allowlist, rateLimiter, subscriptions, listener, offchainTransmitter, *assets.NewLinkFromJuels(0), logger.TestLogger(t))
 	require.NoError(t, err)
 }
 
@@ -58,7 +61,9 @@ func TestNewConnector_NoKeyForConfiguredAddress(t *testing.T) {
 	subscriptions := gfmocks.NewOnchainSubscriptions(t)
 	rateLimiter, err := hc.NewRateLimiter(hc.RateLimiterConfig{GlobalRPS: 100.0, GlobalBurst: 100, PerSenderRPS: 100.0, PerSenderBurst: 100})
 	require.NoError(t, err)
+	listener := sfmocks.NewFunctionsListener(t)
+	offchainTransmitter := sfmocks.NewOffchainTransmitter(t)
 	ethKeystore.On("EnabledKeysForChain", mock.Anything).Return([]ethkey.KeyV2{{Address: common.HexToAddress(addresses[1])}}, nil)
-	_, err = functions.NewConnector(gwcCfg, ethKeystore, chainID, s4Storage, allowlist, rateLimiter, subscriptions, *assets.NewLinkFromJuels(0), logger.TestLogger(t))
+	_, err = functions.NewConnector(gwcCfg, ethKeystore, chainID, s4Storage, allowlist, rateLimiter, subscriptions, listener, offchainTransmitter, *assets.NewLinkFromJuels(0), logger.TestLogger(t))
 	require.Error(t, err)
 }

From b490a850599820b56d59feed9175b275dada29f9 Mon Sep 17 00:00:00 2001
From: Dimitris Grigoriou <dimitris.grigoriou@smartcontract.com>
Date: Tue, 28 Nov 2023 01:52:02 +0200
Subject: [PATCH 015/130] Remove core logger from common (#11366)

* Remove core logger from common

* Remove core logger from evm

* Move legacy config to fix logger dependencies

* Fix lint

* Revert multinode trace removal

* Fix lint

* Fix testcase

* Fix arbgas command logging

* Fix imports

* Fix sendonly node logger

* Fix lint again

* Minor fixes

* bump chainlink-common

---------

Co-authored-by: Jordan Krage <jmank88@gmail.com>
---
 common/client/multi_node.go                   | 37 +++++------
 common/client/multi_node_test.go              | 20 +++---
 common/client/node.go                         |  7 ++-
 common/client/node_lifecycle.go               | 32 +++++-----
 common/client/node_lifecycle_test.go          | 44 ++++++-------
 common/client/node_test.go                    |  4 +-
 common/client/send_only_node.go               |  5 +-
 common/client/send_only_node_test.go          | 14 ++---
 common/fee/models.go                          |  2 +-
 common/headtracker/head_broadcaster.go        |  5 +-
 common/headtracker/head_listener.go           |  4 +-
 common/headtracker/head_tracker.go            |  8 +--
 common/txmgr/broadcaster.go                   | 55 ++++++++--------
 common/txmgr/confirmer.go                     | 17 ++---
 common/txmgr/reaper.go                        |  4 +-
 common/txmgr/resender.go                      |  5 +-
 common/txmgr/txmgr.go                         |  8 +--
 common/txmgr/types/client.go                  |  2 +-
 .../txmgr/types/mocks/tx_attempt_builder.go   |  2 +-
 common/txmgr/types/tx.go                      | 24 +++----
 common/txmgr/types/tx_attempt_builder.go      |  2 +-
 core/chains/evm/client/chain_client.go        |  3 +-
 core/chains/evm/client/client.go              |  3 +-
 core/chains/evm/client/errors.go              |  8 +--
 core/chains/evm/client/helpers_test.go        |  8 +--
 core/chains/evm/client/node.go                | 62 ++++++++++---------
 core/chains/evm/client/node_fsm_test.go       |  4 +-
 core/chains/evm/client/node_lifecycle.go      | 32 +++++-----
 core/chains/evm/client/node_lifecycle_test.go | 30 ++++-----
 core/chains/evm/client/null_client.go         |  6 +-
 core/chains/evm/client/null_client_test.go    |  8 +--
 core/chains/evm/client/pool.go                | 15 ++---
 core/chains/evm/client/pool_test.go           | 14 ++---
 core/chains/evm/client/rpc_client.go          | 62 ++++++++++---------
 core/chains/evm/client/send_only_node.go      |  7 ++-
 core/chains/evm/client/send_only_node_test.go | 18 +++---
 .../evm/client/simulated_backend_client.go    |  5 +-
 core/chains/evm/config/chain_scoped.go        |  3 +-
 .../evm/forwarders/forwarder_manager.go       |  4 +-
 .../evm/forwarders/forwarder_manager_test.go  | 10 +--
 core/chains/evm/forwarders/orm.go             |  2 +-
 core/chains/evm/forwarders/orm_test.go        |  4 +-
 core/chains/evm/gas/arbitrum_estimator.go     |  4 +-
 .../chains/evm/gas/arbitrum_estimator_test.go | 18 +++---
 .../chains/evm/gas/block_history_estimator.go | 21 ++++---
 .../evm/gas/block_history_estimator_test.go   | 44 ++++++-------
 core/chains/evm/gas/cmd/arbgas/main.go        | 10 +--
 core/chains/evm/gas/fixed_price_estimator.go  |  4 +-
 .../evm/gas/fixed_price_estimator_test.go     | 14 ++---
 core/chains/evm/gas/gas_test.go               | 14 ++---
 core/chains/evm/gas/models.go                 |  2 +-
 .../evm/gas/rollups/l1_gas_price_oracle.go    |  7 ++-
 .../gas/rollups/l1_gas_price_oracle_test.go   | 14 ++---
 .../evm/gas/suggested_price_estimator.go      |  5 +-
 .../evm/gas/suggested_price_estimator_test.go | 14 ++---
 .../evm/headtracker/head_broadcaster.go       |  2 +-
 .../evm/headtracker/head_broadcaster_test.go  |  8 +--
 core/chains/evm/headtracker/head_listener.go  |  2 +-
 .../evm/headtracker/head_listener_test.go     |  8 +--
 core/chains/evm/headtracker/head_saver.go     |  4 +-
 .../chains/evm/headtracker/head_saver_test.go |  4 +-
 core/chains/evm/headtracker/head_tracker.go   |  2 +-
 .../evm/headtracker/head_tracker_test.go      | 46 +++++++-------
 core/chains/evm/headtracker/orm.go            |  4 +-
 core/chains/evm/headtracker/orm_test.go       | 12 ++--
 core/chains/evm/log/broadcaster.go            |  6 +-
 core/chains/evm/log/eth_subscriber.go         |  6 +-
 core/chains/evm/log/helpers_internal_test.go  |  2 +-
 core/chains/evm/log/helpers_test.go           |  8 +--
 core/chains/evm/log/integration_test.go       | 16 ++---
 core/chains/evm/log/orm.go                    |  2 +-
 core/chains/evm/log/orm_test.go               | 10 +--
 core/chains/evm/log/pool.go                   |  4 +-
 core/chains/evm/log/pool_test.go              | 18 +++---
 core/chains/evm/log/registrations.go          | 22 +++----
 core/chains/evm/log/registrations_test.go     |  4 +-
 core/chains/evm/logpoller/helper_test.go      |  4 +-
 core/chains/evm/logpoller/log_poller.go       |  8 +--
 .../evm/logpoller/log_poller_internal_test.go | 15 ++---
 core/chains/evm/logpoller/log_poller_test.go  | 14 ++---
 core/chains/evm/logpoller/observability.go    |  2 +-
 .../evm/logpoller/observability_test.go       |  4 +-
 core/chains/evm/logpoller/orm.go              |  4 +-
 core/chains/evm/logpoller/orm_test.go         |  6 +-
 core/chains/evm/monitor/balance.go            |  9 +--
 core/chains/evm/monitor/balance_test.go       | 14 ++---
 core/chains/evm/txmgr/attempts.go             |  2 +-
 core/chains/evm/txmgr/attempts_test.go        | 10 +--
 core/chains/evm/txmgr/broadcaster_test.go     | 15 ++---
 core/chains/evm/txmgr/builder.go              |  2 +-
 core/chains/evm/txmgr/client.go               |  6 +-
 core/chains/evm/txmgr/common.go               |  2 +-
 core/chains/evm/txmgr/confirmer_test.go       | 10 +--
 core/chains/evm/txmgr/evm_tx_store.go         |  6 +-
 core/chains/evm/txmgr/evm_tx_store_test.go    | 10 +--
 core/chains/evm/txmgr/nonce_syncer.go         |  4 +-
 core/chains/evm/txmgr/nonce_syncer_test.go    | 10 +--
 core/chains/evm/txmgr/reaper_test.go          |  4 +-
 core/chains/evm/txmgr/resender_test.go        |  8 +--
 core/chains/evm/txmgr/transmitchecker.go      |  4 +-
 core/chains/evm/txmgr/transmitchecker_test.go |  5 +-
 core/chains/evm/txmgr/txmgr_test.go           | 18 +++---
 core/chains/{evm => legacyevm}/chain.go       |  2 +-
 core/chains/{evm => legacyevm}/chain_test.go  | 16 ++---
 core/chains/{evm => legacyevm}/evm_txm.go     |  2 +-
 core/chains/{evm => legacyevm}/mocks/chain.go |  0
 .../mocks/legacy_chain_container.go           | 30 ++++-----
 core/cmd/shell.go                             |  4 +-
 core/cmd/shell_local_test.go                  | 12 ++--
 core/internal/cltest/cltest.go                |  6 +-
 core/internal/cltest/mocks.go                 | 12 ++--
 core/internal/testutils/evmtest/evmtest.go    | 14 ++---
 core/scripts/go.mod                           |  2 +-
 core/scripts/go.sum                           |  4 +-
 core/services/blockhashstore/delegate.go      |  6 +-
 core/services/blockhashstore/delegate_test.go |  4 +-
 core/services/blockheaderfeeder/delegate.go   |  6 +-
 .../mocks/relayer_chain_interoperators.go     |  6 +-
 .../chainlink/relayer_chain_interoperators.go | 12 ++--
 .../relayer_chain_interoperators_test.go      |  6 +-
 core/services/chainlink/relayer_factory.go    |  8 +--
 core/services/directrequest/delegate.go       |  6 +-
 core/services/feeds/service.go                |  6 +-
 core/services/feeds/service_test.go           |  4 +-
 core/services/fluxmonitorv2/delegate.go       |  6 +-
 core/services/gateway/delegate.go             |  6 +-
 core/services/gateway/handler_factory.go      |  6 +-
 .../handlers/functions/handler.functions.go   |  4 +-
 core/services/keeper/delegate.go              |  6 +-
 core/services/keeper/upkeep_executer_test.go  |  4 +-
 core/services/ocr/delegate.go                 |  8 +--
 core/services/ocr/validate.go                 |  4 +-
 core/services/ocr2/delegate.go                |  8 +--
 .../services/ocr2/plugins/functions/plugin.go |  4 +-
 .../ocr2/plugins/ocr2keeper/evm20/registry.go |  4 +-
 .../ocr2/plugins/ocr2keeper/evm21/registry.go |  4 +-
 .../ocr2/plugins/ocr2keeper/evm21/services.go |  4 +-
 core/services/ocr2/plugins/ocr2keeper/util.go |  8 +--
 core/services/pipeline/helpers_test.go        |  6 +-
 core/services/pipeline/runner.go              |  6 +-
 core/services/pipeline/task.estimategas.go    |  4 +-
 core/services/pipeline/task.eth_call.go       |  4 +-
 core/services/pipeline/task.eth_call_test.go  |  4 +-
 core/services/pipeline/task.eth_tx.go         |  4 +-
 core/services/relay/evm/evm.go                | 12 ++--
 core/services/relay/evm/functions.go          |  6 +-
 core/services/relay/evm/loop_impl.go          |  6 +-
 core/services/relay/evm/median.go             |  4 +-
 .../relay/evm/mocks/loop_relay_adapter.go     | 11 ++--
 core/services/relay/evm/ocr2keeper.go         |  8 +--
 core/services/relay/evm/ocr2vrf.go            |  8 +--
 core/services/relay/evm/relayer_extender.go   | 29 +++++----
 core/services/vrf/delegate.go                 |  6 +-
 core/services/vrf/delegate_test.go            |  4 +-
 core/services/vrf/v1/listener_v1.go           |  4 +-
 core/services/vrf/v2/integration_v2_test.go   |  4 +-
 core/services/vrf/v2/listener_v2.go           |  6 +-
 core/services/vrf/v2/listener_v2_test.go      |  6 +-
 core/web/common.go                            |  4 +-
 core/web/eth_keys_controller.go               |  4 +-
 core/web/evm_transfer_controller.go           |  4 +-
 core/web/resolver/eth_key.go                  |  4 +-
 core/web/resolver/eth_key_test.go             |  6 +-
 core/web/resolver/resolver_test.go            |  9 +--
 go.mod                                        |  2 +-
 go.sum                                        |  4 +-
 integration-tests/go.mod                      |  2 +-
 integration-tests/go.sum                      |  4 +-
 168 files changed, 812 insertions(+), 783 deletions(-)
 rename core/chains/{evm => legacyevm}/chain.go (99%)
 rename core/chains/{evm => legacyevm}/chain_test.go (80%)
 rename core/chains/{evm => legacyevm}/evm_txm.go (99%)
 rename core/chains/{evm => legacyevm}/mocks/chain.go (100%)
 rename core/chains/{evm => legacyevm}/mocks/legacy_chain_container.go (73%)

diff --git a/common/client/multi_node.go b/common/client/multi_node.go
index 48a4d37ad8c..3f72d04124f 100644
--- a/common/client/multi_node.go
+++ b/common/client/multi_node.go
@@ -12,12 +12,12 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/assets"
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
 	"github.com/smartcontractkit/chainlink/v2/common/config"
 	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -87,7 +87,7 @@ type multiNode[
 	sendonlys           []SendOnlyNode[CHAIN_ID, RPC_CLIENT]
 	chainID             CHAIN_ID
 	chainType           config.ChainType
-	logger              logger.Logger
+	lggr                logger.Logger
 	selectionMode       string
 	noNewHeadsThreshold time.Duration
 	nodeSelector        NodeSelector[CHAIN_ID, HEAD, RPC_CLIENT]
@@ -119,7 +119,7 @@ func NewMultiNode[
 	HEAD types.Head[BLOCK_HASH],
 	RPC_CLIENT RPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD],
 ](
-	logger logger.Logger,
+	l logger.Logger,
 	selectionMode string,
 	leaseDuration time.Duration,
 	noNewHeadsThreshold time.Duration,
@@ -132,7 +132,8 @@ func NewMultiNode[
 ) MultiNode[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD, RPC_CLIENT] {
 	nodeSelector := newNodeSelector(selectionMode, nodes)
 
-	lggr := logger.Named("MultiNode").With("chainID", chainID.String())
+	lggr := logger.Named(l, "MultiNode")
+	lggr = logger.With(lggr, "chainID", chainID.String())
 
 	// Prometheus' default interval is 15s, set this to under 7.5s to avoid
 	// aliasing (see: https://en.wikipedia.org/wiki/Nyquist_frequency)
@@ -142,7 +143,7 @@ func NewMultiNode[
 		sendonlys:           sendonlys,
 		chainID:             chainID,
 		chainType:           chainType,
-		logger:              lggr,
+		lggr:                lggr,
 		selectionMode:       selectionMode,
 		noNewHeadsThreshold: noNewHeadsThreshold,
 		nodeSelector:        nodeSelector,
@@ -153,7 +154,7 @@ func NewMultiNode[
 		reportInterval:      reportInterval,
 	}
 
-	c.logger.Debugf("The MultiNode is configured to use NodeSelectionMode: %s", selectionMode)
+	c.lggr.Debugf("The MultiNode is configured to use NodeSelectionMode: %s", selectionMode)
 
 	return c
 }
@@ -197,11 +198,11 @@ func (c *multiNode[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OP
 		go c.runLoop()
 
 		if c.leaseDuration.Seconds() > 0 && c.selectionMode != NodeSelectionModeRoundRobin {
-			c.logger.Infof("The MultiNode will switch to best node every %s", c.leaseDuration.String())
+			c.lggr.Infof("The MultiNode will switch to best node every %s", c.leaseDuration.String())
 			c.wg.Add(1)
 			go c.checkLeaseLoop()
 		} else {
-			c.logger.Info("Best node switching is disabled")
+			c.lggr.Info("Best node switching is disabled")
 		}
 
 		return nil
@@ -249,7 +250,7 @@ func (c *multiNode[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OP
 	c.activeNode = c.nodeSelector.Select()
 
 	if c.activeNode == nil {
-		c.logger.Criticalw("No live RPC nodes available", "NodeSelectionMode", c.nodeSelector.Name())
+		logger.Criticalw(c.lggr, "No live RPC nodes available", "NodeSelectionMode", c.nodeSelector.Name())
 		errmsg := fmt.Errorf("no live nodes available for chain %s", c.chainID.String())
 		c.SvcErrBuffer.Append(errmsg)
 		err = ErroringNodeError
@@ -282,7 +283,7 @@ func (c *multiNode[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OP
 		// Terminate client subscriptions. Services are responsible for reconnecting, which will be routed to the new
 		// best node. Only terminate connections with more than 1 subscription to account for the aliveLoop subscription
 		if n.State() == nodeStateAlive && n != bestNode && n.SubscribersCount() > 1 {
-			c.logger.Infof("Switching to best node from %q to %q", n.String(), bestNode.String())
+			c.lggr.Infof("Switching to best node from %q to %q", n.String(), bestNode.String())
 			n.UnsubscribeAllExceptAliveLoop()
 		}
 	}
@@ -351,13 +352,13 @@ func (c *multiNode[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OP
 	}
 
 	live := total - dead
-	c.logger.Tracew(fmt.Sprintf("MultiNode state: %d/%d nodes are alive", live, total), "nodeStates", nodeStates)
+	logger.Tracew(c.lggr, fmt.Sprintf("MultiNode state: %d/%d nodes are alive", live, total), "nodeStates", nodeStates)
 	if total == dead {
 		rerr := fmt.Errorf("no primary nodes available: 0/%d nodes are alive", total)
-		c.logger.Criticalw(rerr.Error(), "nodeStates", nodeStates)
+		logger.Criticalw(c.lggr, rerr.Error(), "nodeStates", nodeStates)
 		c.SvcErrBuffer.Append(rerr)
 	} else if dead > 0 {
-		c.logger.Errorw(fmt.Sprintf("At least one primary node is dead: %d/%d nodes are alive", live, total), "nodeStates", nodeStates)
+		c.lggr.Errorw(fmt.Sprintf("At least one primary node is dead: %d/%d nodes are alive", live, total), "nodeStates", nodeStates)
 	}
 }
 
@@ -403,9 +404,9 @@ func (c *multiNode[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OP
 			defer wg.Done()
 			err := n.RPC().BatchCallContext(ctx, b)
 			if err != nil {
-				c.logger.Debugw("Secondary node BatchCallContext failed", "err", err)
+				c.lggr.Debugw("Secondary node BatchCallContext failed", "err", err)
 			} else {
-				c.logger.Trace("Secondary node BatchCallContext success")
+				logger.Trace(c.lggr, "Secondary node BatchCallContext success")
 			}
 		}(n)
 	}
@@ -572,15 +573,15 @@ func (c *multiNode[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OP
 				defer c.wg.Done()
 
 				txErr := n.RPC().SendTransaction(ctx, tx)
-				c.logger.Debugw("Sendonly node sent transaction", "name", n.String(), "tx", tx, "err", txErr)
+				c.lggr.Debugw("Sendonly node sent transaction", "name", n.String(), "tx", tx, "err", txErr)
 				sendOnlyError := c.sendOnlyErrorParser(txErr)
 				if sendOnlyError != Successful {
-					c.logger.Warnw("RPC returned error", "name", n.String(), "tx", tx, "err", txErr)
+					c.lggr.Warnw("RPC returned error", "name", n.String(), "tx", tx, "err", txErr)
 				}
 			}(n)
 		})
 		if !ok {
-			c.logger.Debug("Cannot send transaction on sendonly node; MultiNode is stopped", "node", n.String())
+			c.lggr.Debug("Cannot send transaction on sendonly node; MultiNode is stopped", "node", n.String())
 		}
 	}
 	if nodeError != nil {
diff --git a/common/client/multi_node_test.go b/common/client/multi_node_test.go
index 4c0ebb1db93..45ffb745370 100644
--- a/common/client/multi_node_test.go
+++ b/common/client/multi_node_test.go
@@ -12,11 +12,11 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
 
 	"github.com/smartcontractkit/chainlink/v2/common/config"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -43,7 +43,7 @@ type multiNodeOpts struct {
 
 func newTestMultiNode(t *testing.T, opts multiNodeOpts) testMultiNode {
 	if opts.logger == nil {
-		opts.logger = logger.TestLogger(t)
+		opts.logger = logger.Test(t)
 	}
 
 	result := NewMultiNode[types.ID, *utils.Big, Hashable, Hashable, any, Hashable, any, any,
@@ -211,7 +211,7 @@ func TestMultiNode_Report(t *testing.T) {
 		chainID := types.RandomID()
 		node1 := newHealthyNode(t, chainID)
 		node2 := newNodeWithState(t, chainID, nodeStateOutOfSync)
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.WarnLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.WarnLevel)
 		mn := newTestMultiNode(t, multiNodeOpts{
 			selectionMode: NodeSelectionModeRoundRobin,
 			chainID:       chainID,
@@ -228,7 +228,7 @@ func TestMultiNode_Report(t *testing.T) {
 		t.Parallel()
 		chainID := types.RandomID()
 		node := newNodeWithState(t, chainID, nodeStateOutOfSync)
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.WarnLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.WarnLevel)
 		mn := newTestMultiNode(t, multiNodeOpts{
 			selectionMode: NodeSelectionModeRoundRobin,
 			chainID:       chainID,
@@ -252,7 +252,7 @@ func TestMultiNode_CheckLease(t *testing.T) {
 		t.Parallel()
 		chainID := types.RandomID()
 		node := newHealthyNode(t, chainID)
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.InfoLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.InfoLevel)
 		mn := newTestMultiNode(t, multiNodeOpts{
 			selectionMode: NodeSelectionModeRoundRobin,
 			chainID:       chainID,
@@ -268,7 +268,7 @@ func TestMultiNode_CheckLease(t *testing.T) {
 		t.Parallel()
 		chainID := types.RandomID()
 		node := newHealthyNode(t, chainID)
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.InfoLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.InfoLevel)
 		mn := newTestMultiNode(t, multiNodeOpts{
 			selectionMode: NodeSelectionModeHighestHead,
 			chainID:       chainID,
@@ -290,7 +290,7 @@ func TestMultiNode_CheckLease(t *testing.T) {
 		bestNode := newHealthyNode(t, chainID)
 		nodeSelector := newMockNodeSelector[types.ID, types.Head[Hashable], multiNodeRPCClient](t)
 		nodeSelector.On("Select").Return(bestNode)
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.InfoLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.InfoLevel)
 		mn := newTestMultiNode(t, multiNodeOpts{
 			selectionMode: NodeSelectionModeHighestHead,
 			chainID:       chainID,
@@ -402,7 +402,7 @@ func TestMultiNode_selectNode(t *testing.T) {
 	t.Run("No active nodes - reports critical error", func(t *testing.T) {
 		t.Parallel()
 		chainID := types.RandomID()
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.InfoLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.InfoLevel)
 		mn := newTestMultiNode(t, multiNodeOpts{
 			selectionMode: NodeSelectionModeRoundRobin,
 			chainID:       chainID,
@@ -541,7 +541,7 @@ func TestMultiNode_BatchCallContextAll(t *testing.T) {
 		mainNode.On("RPC").Return(okRPC)
 		nodeSelector := newMockNodeSelector[types.ID, types.Head[Hashable], multiNodeRPCClient](t)
 		nodeSelector.On("Select").Return(mainNode).Once()
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.DebugLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.DebugLevel)
 		mn := newTestMultiNode(t, multiNodeOpts{
 			selectionMode: NodeSelectionModeRoundRobin,
 			chainID:       types.RandomID(),
@@ -610,7 +610,7 @@ func TestMultiNode_SendTransaction(t *testing.T) {
 		mainNode.On("RPC").Return(okRPC)
 		nodeSelector := newMockNodeSelector[types.ID, types.Head[Hashable], multiNodeRPCClient](t)
 		nodeSelector.On("Select").Return(mainNode).Once()
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.DebugLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.DebugLevel)
 		mn := newTestMultiNode(t, multiNodeOpts{
 			selectionMode: NodeSelectionModeRoundRobin,
 			chainID:       types.RandomID(),
diff --git a/common/client/node.go b/common/client/node.go
index 5faaa5da627..b2d3a33a5b8 100644
--- a/common/client/node.go
+++ b/common/client/node.go
@@ -11,10 +11,10 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -135,14 +135,15 @@ func NewNode[
 		n.http = httpuri
 	}
 	n.nodeCtx, n.cancelNodeCtx = context.WithCancel(context.Background())
-	lggr = lggr.Named("Node").With(
+	lggr = logger.Named(lggr, "Node")
+	lggr = logger.With(lggr,
 		"nodeTier", Primary.String(),
 		"nodeName", name,
 		"node", n.String(),
 		"chainID", chainID,
 		"nodeOrder", n.order,
 	)
-	n.lfcLog = lggr.Named("Lifecycle")
+	n.lfcLog = logger.Named(lggr, "Lifecycle")
 	n.stateLatestBlockNumber = -1
 	n.rpc = rpc
 	n.chainFamily = chainFamily
diff --git a/common/client/node_lifecycle.go b/common/client/node_lifecycle.go
index 4193560e296..9b47412766b 100644
--- a/common/client/node_lifecycle.go
+++ b/common/client/node_lifecycle.go
@@ -10,6 +10,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -88,8 +89,9 @@ func (n *node[CHAIN_ID, HEAD, RPC]) aliveLoop() {
 	pollFailureThreshold := n.nodePoolCfg.PollFailureThreshold()
 	pollInterval := n.nodePoolCfg.PollInterval()
 
-	lggr := n.lfcLog.Named("Alive").With("noNewHeadsTimeoutThreshold", noNewHeadsTimeoutThreshold, "pollInterval", pollInterval, "pollFailureThreshold", pollFailureThreshold)
-	lggr.Tracew("Alive loop starting", "nodeState", n.State())
+	lggr := logger.Named(n.lfcLog, "Alive")
+	lggr = logger.With(lggr, "noNewHeadsTimeoutThreshold", noNewHeadsTimeoutThreshold, "pollInterval", pollInterval, "pollFailureThreshold", pollFailureThreshold)
+	logger.Tracew(lggr, "Alive loop starting", "nodeState", n.State())
 
 	headsC := make(chan HEAD)
 	sub, err := n.rpc.Subscribe(n.nodeCtx, headsC, rpcSubscriptionMethodNewHeads)
@@ -140,7 +142,7 @@ func (n *node[CHAIN_ID, HEAD, RPC]) aliveLoop() {
 		case <-pollCh:
 			var version string
 			promPoolRPCNodePolls.WithLabelValues(n.chainID.String(), n.name).Inc()
-			lggr.Tracew("Polling for version", "nodeState", n.State(), "pollFailures", pollFailures)
+			logger.Tracew(lggr, "Polling for version", "nodeState", n.State(), "pollFailures", pollFailures)
 			ctx, cancel := context.WithTimeout(n.nodeCtx, pollInterval)
 			version, err := n.RPC().ClientVersion(ctx)
 			cancel()
@@ -160,7 +162,7 @@ func (n *node[CHAIN_ID, HEAD, RPC]) aliveLoop() {
 				lggr.Errorw(fmt.Sprintf("RPC endpoint failed to respond to %d consecutive polls", pollFailures), "pollFailures", pollFailures, "nodeState", n.State())
 				if n.nLiveNodes != nil {
 					if l, _, _ := n.nLiveNodes(); l < 2 {
-						lggr.Criticalf("RPC endpoint failed to respond to polls; %s %s", msgCannotDisable, msgDegradedState)
+						logger.Criticalf(lggr, "RPC endpoint failed to respond to polls; %s %s", msgCannotDisable, msgDegradedState)
 						continue
 					}
 				}
@@ -172,7 +174,7 @@ func (n *node[CHAIN_ID, HEAD, RPC]) aliveLoop() {
 				// note: there must be another live node for us to be out of sync
 				lggr.Errorw("RPC endpoint has fallen behind", "blockNumber", num, "totalDifficulty", td, "nodeState", n.State())
 				if liveNodes < 2 {
-					lggr.Criticalf("RPC endpoint has fallen behind; %s %s", msgCannotDisable, msgDegradedState)
+					logger.Criticalf(lggr, "RPC endpoint has fallen behind; %s %s", msgCannotDisable, msgDegradedState)
 					continue
 				}
 				n.declareOutOfSync(n.isOutOfSync)
@@ -185,13 +187,13 @@ func (n *node[CHAIN_ID, HEAD, RPC]) aliveLoop() {
 				return
 			}
 			promPoolRPCNodeNumSeenBlocks.WithLabelValues(n.chainID.String(), n.name).Inc()
-			lggr.Tracew("Got head", "head", bh)
+			logger.Tracew(lggr, "Got head", "head", bh)
 			if bh.BlockNumber() > highestReceivedBlockNumber {
 				promPoolRPCNodeHighestSeenBlock.WithLabelValues(n.chainID.String(), n.name).Set(float64(bh.BlockNumber()))
-				lggr.Tracew("Got higher block number, resetting timer", "latestReceivedBlockNumber", highestReceivedBlockNumber, "blockNumber", bh.BlockNumber(), "nodeState", n.State())
+				logger.Tracew(lggr, "Got higher block number, resetting timer", "latestReceivedBlockNumber", highestReceivedBlockNumber, "blockNumber", bh.BlockNumber(), "nodeState", n.State())
 				highestReceivedBlockNumber = bh.BlockNumber()
 			} else {
-				lggr.Tracew("Ignoring previously seen block number", "latestReceivedBlockNumber", highestReceivedBlockNumber, "blockNumber", bh.BlockNumber(), "nodeState", n.State())
+				logger.Tracew(lggr, "Ignoring previously seen block number", "latestReceivedBlockNumber", highestReceivedBlockNumber, "blockNumber", bh.BlockNumber(), "nodeState", n.State())
 			}
 			if outOfSyncT != nil {
 				outOfSyncT.Reset(noNewHeadsTimeoutThreshold)
@@ -207,7 +209,7 @@ func (n *node[CHAIN_ID, HEAD, RPC]) aliveLoop() {
 			lggr.Errorw(fmt.Sprintf("RPC endpoint detected out of sync; no new heads received for %s (last head received was %v)", noNewHeadsTimeoutThreshold, highestReceivedBlockNumber), "nodeState", n.State(), "latestReceivedBlockNumber", highestReceivedBlockNumber, "noNewHeadsTimeoutThreshold", noNewHeadsTimeoutThreshold)
 			if n.nLiveNodes != nil {
 				if l, _, _ := n.nLiveNodes(); l < 2 {
-					lggr.Criticalf("RPC endpoint detected out of sync; %s %s", msgCannotDisable, msgDegradedState)
+					logger.Criticalf(lggr, "RPC endpoint detected out of sync; %s %s", msgCannotDisable, msgDegradedState)
 					// We don't necessarily want to wait the full timeout to check again, we should
 					// check regularly and log noisily in this state
 					outOfSyncT.Reset(zombieNodeCheckInterval(n.noNewHeadsThreshold))
@@ -273,7 +275,7 @@ func (n *node[CHAIN_ID, HEAD, RPC]) outOfSyncLoop(isOutOfSync func(num int64, td
 
 	outOfSyncAt := time.Now()
 
-	lggr := n.lfcLog.Named("OutOfSync")
+	lggr := logger.Named(n.lfcLog, "OutOfSync")
 	lggr.Debugw("Trying to revive out-of-sync RPC node", "nodeState", n.State())
 
 	// Need to redial since out-of-sync nodes are automatically disconnected
@@ -290,7 +292,7 @@ func (n *node[CHAIN_ID, HEAD, RPC]) outOfSyncLoop(isOutOfSync func(num int64, td
 		return
 	}
 
-	lggr.Tracew("Successfully subscribed to heads feed on out-of-sync RPC node", "nodeState", n.State())
+	logger.Tracew(lggr, "Successfully subscribed to heads feed on out-of-sync RPC node", "nodeState", n.State())
 
 	ch := make(chan HEAD)
 	sub, err := n.rpc.Subscribe(n.nodeCtx, ch, rpcSubscriptionMethodNewHeads)
@@ -322,7 +324,7 @@ func (n *node[CHAIN_ID, HEAD, RPC]) outOfSyncLoop(isOutOfSync func(num int64, td
 		case <-time.After(zombieNodeCheckInterval(n.noNewHeadsThreshold)):
 			if n.nLiveNodes != nil {
 				if l, _, _ := n.nLiveNodes(); l < 1 {
-					lggr.Critical("RPC endpoint is still out of sync, but there are no other available nodes. This RPC node will be forcibly moved back into the live pool in a degraded state")
+					logger.Critical(lggr, "RPC endpoint is still out of sync, but there are no other available nodes. This RPC node will be forcibly moved back into the live pool in a degraded state")
 					n.declareInSync()
 					return
 				}
@@ -352,7 +354,7 @@ func (n *node[CHAIN_ID, HEAD, RPC]) unreachableLoop() {
 
 	unreachableAt := time.Now()
 
-	lggr := n.lfcLog.Named("Unreachable")
+	lggr := logger.Named(n.lfcLog, "Unreachable")
 	lggr.Debugw("Trying to revive unreachable RPC node", "nodeState", n.State())
 
 	dialRetryBackoff := utils.NewRedialBackoff()
@@ -362,7 +364,7 @@ func (n *node[CHAIN_ID, HEAD, RPC]) unreachableLoop() {
 		case <-n.nodeCtx.Done():
 			return
 		case <-time.After(dialRetryBackoff.Duration()):
-			lggr.Tracew("Trying to re-dial RPC node", "nodeState", n.State())
+			logger.Tracew(lggr, "Trying to re-dial RPC node", "nodeState", n.State())
 
 			err := n.rpc.Dial(n.nodeCtx)
 			if err != nil {
@@ -408,7 +410,7 @@ func (n *node[CHAIN_ID, HEAD, RPC]) invalidChainIDLoop() {
 
 	invalidAt := time.Now()
 
-	lggr := n.lfcLog.Named("InvalidChainID")
+	lggr := logger.Named(n.lfcLog, "InvalidChainID")
 	lggr.Debugw(fmt.Sprintf("Periodically re-checking RPC node %s with invalid chain ID", n.String()), "nodeState", n.State())
 
 	chainIDRecheckBackoff := utils.NewRedialBackoff()
diff --git a/common/client/node_lifecycle_test.go b/common/client/node_lifecycle_test.go
index 0dffe935fe0..51b44ac516d 100644
--- a/common/client/node_lifecycle_test.go
+++ b/common/client/node_lifecycle_test.go
@@ -11,11 +11,11 @@ import (
 	"github.com/stretchr/testify/mock"
 	"go.uber.org/zap"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
 
 	"github.com/smartcontractkit/chainlink/v2/common/types"
 	"github.com/smartcontractkit/chainlink/v2/common/types/mocks"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -60,7 +60,7 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 		t.Parallel()
 		rpc := newMockNodeClient[types.ID, Head](t)
 
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.WarnLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.WarnLevel)
 		node := newDialedNode(t, testNodeOpts{
 			rpc:  rpc,
 			lggr: lggr,
@@ -94,7 +94,7 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 	t.Run("Stays alive and waits for signal", func(t *testing.T) {
 		t.Parallel()
 		rpc := newMockNodeClient[types.ID, Head](t)
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.DebugLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.DebugLevel)
 		node := newSubscribedNode(t, testNodeOpts{
 			config: testNodeConfig{},
 			rpc:    rpc,
@@ -109,7 +109,7 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 	t.Run("stays alive while below pollFailureThreshold and resets counter on success", func(t *testing.T) {
 		t.Parallel()
 		rpc := newMockNodeClient[types.ID, Head](t)
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.DebugLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.DebugLevel)
 		const pollFailureThreshold = 3
 		node := newSubscribedNode(t, testNodeOpts{
 			config: testNodeConfig{
@@ -151,7 +151,7 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 	t.Run("with threshold poll failures, transitions to unreachable", func(t *testing.T) {
 		t.Parallel()
 		rpc := newMockNodeClient[types.ID, Head](t)
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.DebugLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.DebugLevel)
 		const pollFailureThreshold = 3
 		node := newSubscribedNode(t, testNodeOpts{
 			config: testNodeConfig{
@@ -177,7 +177,7 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 	t.Run("with threshold poll failures, but we are the last node alive, forcibly keeps it alive", func(t *testing.T) {
 		t.Parallel()
 		rpc := newMockNodeClient[types.ID, Head](t)
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.DebugLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.DebugLevel)
 		const pollFailureThreshold = 3
 		node := newSubscribedNode(t, testNodeOpts{
 			config: testNodeConfig{
@@ -200,7 +200,7 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 	t.Run("when behind more than SyncThreshold, transitions to out of sync", func(t *testing.T) {
 		t.Parallel()
 		rpc := newMockNodeClient[types.ID, Head](t)
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.DebugLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.DebugLevel)
 		const syncThreshold = 10
 		node := newSubscribedNode(t, testNodeOpts{
 			config: testNodeConfig{
@@ -231,7 +231,7 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 	t.Run("when behind more than SyncThreshold but we are the last live node, forcibly stays alive", func(t *testing.T) {
 		t.Parallel()
 		rpc := newMockNodeClient[types.ID, Head](t)
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.DebugLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.DebugLevel)
 		const syncThreshold = 10
 		node := newSubscribedNode(t, testNodeOpts{
 			config: testNodeConfig{
@@ -254,7 +254,7 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 	t.Run("when behind but SyncThreshold=0, stay alive", func(t *testing.T) {
 		t.Parallel()
 		rpc := newMockNodeClient[types.ID, Head](t)
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.DebugLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.DebugLevel)
 		node := newSubscribedNode(t, testNodeOpts{
 			config: testNodeConfig{
 				pollInterval:  tests.TestInterval,
@@ -302,7 +302,7 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 	t.Run("when no new heads received for threshold but we are the last live node, forcibly stays alive", func(t *testing.T) {
 		t.Parallel()
 		rpc := newMockNodeClient[types.ID, Head](t)
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.DebugLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.DebugLevel)
 		node := newSubscribedNode(t, testNodeOpts{
 			config:              testNodeConfig{},
 			lggr:                lggr,
@@ -329,7 +329,7 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 			close(ch)
 		}).Return(sub, nil).Once()
 		rpc.On("SetAliveLoopSub", sub).Once()
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.ErrorLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.ErrorLevel)
 		node := newDialedNode(t, testNodeOpts{
 			lggr:                lggr,
 			config:              testNodeConfig{},
@@ -426,7 +426,7 @@ func TestUnit_NodeLifecycle_outOfSyncLoop(t *testing.T) {
 		t.Parallel()
 		rpc := newMockNodeClient[types.ID, Head](t)
 		nodeChainID := types.RandomID()
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.DebugLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.DebugLevel)
 		node := newAliveNode(t, testNodeOpts{
 			rpc:     rpc,
 			chainID: nodeChainID,
@@ -531,7 +531,7 @@ func TestUnit_NodeLifecycle_outOfSyncLoop(t *testing.T) {
 		t.Parallel()
 		rpc := newMockNodeClient[types.ID, Head](t)
 		nodeChainID := types.RandomID()
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.ErrorLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.ErrorLevel)
 		node := newAliveNode(t, testNodeOpts{
 			rpc:     rpc,
 			chainID: nodeChainID,
@@ -560,7 +560,7 @@ func TestUnit_NodeLifecycle_outOfSyncLoop(t *testing.T) {
 		t.Parallel()
 		rpc := newMockNodeClient[types.ID, Head](t)
 		nodeChainID := types.RandomID()
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.ErrorLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.ErrorLevel)
 		node := newAliveNode(t, testNodeOpts{
 			rpc:     rpc,
 			chainID: nodeChainID,
@@ -591,7 +591,7 @@ func TestUnit_NodeLifecycle_outOfSyncLoop(t *testing.T) {
 		t.Parallel()
 		rpc := newMockNodeClient[types.ID, Head](t)
 		nodeChainID := types.RandomID()
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.DebugLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.DebugLevel)
 		node := newAliveNode(t, testNodeOpts{
 			rpc:     rpc,
 			chainID: nodeChainID,
@@ -627,7 +627,7 @@ func TestUnit_NodeLifecycle_outOfSyncLoop(t *testing.T) {
 		t.Parallel()
 		rpc := newMockNodeClient[types.ID, Head](t)
 		nodeChainID := types.RandomID()
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.DebugLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.DebugLevel)
 		node := newAliveNode(t, testNodeOpts{
 			noNewHeadsThreshold: tests.TestInterval,
 			rpc:                 rpc,
@@ -682,7 +682,7 @@ func TestUnit_NodeLifecycle_unreachableLoop(t *testing.T) {
 		t.Parallel()
 		rpc := newMockNodeClient[types.ID, Head](t)
 		nodeChainID := types.RandomID()
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.DebugLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.DebugLevel)
 		node := newAliveNode(t, testNodeOpts{
 			rpc:     rpc,
 			chainID: nodeChainID,
@@ -698,7 +698,7 @@ func TestUnit_NodeLifecycle_unreachableLoop(t *testing.T) {
 		t.Parallel()
 		rpc := newMockNodeClient[types.ID, Head](t)
 		nodeChainID := types.RandomID()
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.DebugLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.DebugLevel)
 		node := newAliveNode(t, testNodeOpts{
 			rpc:     rpc,
 			chainID: nodeChainID,
@@ -775,7 +775,7 @@ func TestUnit_NodeLifecycle_invalidChainIDLoop(t *testing.T) {
 		t.Parallel()
 		rpc := newMockNodeClient[types.ID, Head](t)
 		nodeChainID := types.RandomID()
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.DebugLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.DebugLevel)
 		node := newDialedNode(t, testNodeOpts{
 			rpc:     rpc,
 			chainID: nodeChainID,
@@ -797,7 +797,7 @@ func TestUnit_NodeLifecycle_invalidChainIDLoop(t *testing.T) {
 		rpc := newMockNodeClient[types.ID, Head](t)
 		nodeChainID := types.NewIDFromInt(10)
 		rpcChainID := types.NewIDFromInt(11)
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.DebugLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.DebugLevel)
 		node := newDialedNode(t, testNodeOpts{
 			rpc:     rpc,
 			chainID: nodeChainID,
@@ -846,7 +846,7 @@ func TestUnit_NodeLifecycle_start(t *testing.T) {
 		t.Parallel()
 		rpc := newMockNodeClient[types.ID, Head](t)
 		nodeChainID := types.RandomID()
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.DebugLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.DebugLevel)
 		node := newNode(t, testNodeOpts{
 			rpc:     rpc,
 			chainID: nodeChainID,
@@ -868,7 +868,7 @@ func TestUnit_NodeLifecycle_start(t *testing.T) {
 		t.Parallel()
 		rpc := newMockNodeClient[types.ID, Head](t)
 		nodeChainID := types.RandomID()
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.DebugLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.DebugLevel)
 		node := newNode(t, testNodeOpts{
 			rpc:     rpc,
 			chainID: nodeChainID,
diff --git a/common/client/node_test.go b/common/client/node_test.go
index 0438e11e612..7b6a38e3951 100644
--- a/common/client/node_test.go
+++ b/common/client/node_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 type testNodeConfig struct {
@@ -52,7 +52,7 @@ type testNodeOpts struct {
 
 func newTestNode(t *testing.T, opts testNodeOpts) testNode {
 	if opts.lggr == nil {
-		opts.lggr = logger.TestLogger(t)
+		opts.lggr = logger.Test(t)
 	}
 
 	if opts.name == "" {
diff --git a/common/client/send_only_node.go b/common/client/send_only_node.go
index 904916122f1..b63e93b703d 100644
--- a/common/client/send_only_node.go
+++ b/common/client/send_only_node.go
@@ -6,10 +6,10 @@ import (
 	"net/url"
 	"sync"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 //go:generate mockery --quiet --name sendOnlyClient --structname mockSendOnlyClient --filename "mock_send_only_client_test.go" --inpackage --case=underscore
@@ -75,7 +75,8 @@ func NewSendOnlyNode[
 ) SendOnlyNode[CHAIN_ID, RPC] {
 	s := new(sendOnlyNode[CHAIN_ID, RPC])
 	s.name = name
-	s.log = lggr.Named("SendOnlyNode").Named(name).With(
+	s.log = logger.Named(logger.Named(lggr, "SendOnlyNode"), name)
+	s.log = logger.With(s.log,
 		"nodeTier", "sendonly",
 	)
 	s.rpc = rpc
diff --git a/common/client/send_only_node_test.go b/common/client/send_only_node_test.go
index 3034b3f0a11..459f923cba8 100644
--- a/common/client/send_only_node_test.go
+++ b/common/client/send_only_node_test.go
@@ -11,10 +11,10 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
 
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 func TestNewSendOnlyNode(t *testing.T) {
@@ -25,7 +25,7 @@ func TestNewSendOnlyNode(t *testing.T) {
 	u, err := url.Parse(fmt.Sprintf(urlFormat, password))
 	require.NoError(t, err)
 	redacted := fmt.Sprintf(urlFormat, "xxxxx")
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	name := "TestNewSendOnlyNode"
 	chainID := types.RandomID()
 	client := newMockSendOnlyClient[types.ID](t)
@@ -42,7 +42,7 @@ func TestStartSendOnlyNode(t *testing.T) {
 	t.Parallel()
 	t.Run("becomes unusable if initial dial fails", func(t *testing.T) {
 		t.Parallel()
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.WarnLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.WarnLevel)
 		client := newMockSendOnlyClient[types.ID](t)
 		client.On("Close").Once()
 		expectedError := errors.New("some http error")
@@ -58,7 +58,7 @@ func TestStartSendOnlyNode(t *testing.T) {
 	})
 	t.Run("Default ChainID(0) produces warn and skips checks", func(t *testing.T) {
 		t.Parallel()
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.WarnLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.WarnLevel)
 		client := newMockSendOnlyClient[types.ID](t)
 		client.On("Close").Once()
 		client.On("DialHTTP").Return(nil).Once()
@@ -73,7 +73,7 @@ func TestStartSendOnlyNode(t *testing.T) {
 	})
 	t.Run("Can recover from chainID verification failure", func(t *testing.T) {
 		t.Parallel()
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.WarnLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.WarnLevel)
 		client := newMockSendOnlyClient[types.ID](t)
 		client.On("Close").Once()
 		client.On("DialHTTP").Return(nil)
@@ -97,7 +97,7 @@ func TestStartSendOnlyNode(t *testing.T) {
 	})
 	t.Run("Can recover from chainID mismatch", func(t *testing.T) {
 		t.Parallel()
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.WarnLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.WarnLevel)
 		client := newMockSendOnlyClient[types.ID](t)
 		client.On("Close").Once()
 		client.On("DialHTTP").Return(nil).Once()
@@ -120,7 +120,7 @@ func TestStartSendOnlyNode(t *testing.T) {
 	})
 	t.Run("Start with Random ChainID", func(t *testing.T) {
 		t.Parallel()
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.WarnLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.WarnLevel)
 		client := newMockSendOnlyClient[types.ID](t)
 		client.On("Close").Once()
 		client.On("DialHTTP").Return(nil).Once()
diff --git a/common/fee/models.go b/common/fee/models.go
index f980c73fc1b..1fcb55c5309 100644
--- a/common/fee/models.go
+++ b/common/fee/models.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/pkg/errors"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/common/chains/label"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	bigmath "github.com/smartcontractkit/chainlink/v2/core/utils/big_math"
 )
 
diff --git a/common/headtracker/head_broadcaster.go b/common/headtracker/head_broadcaster.go
index 62b2f47b68a..0e676f864fa 100644
--- a/common/headtracker/head_broadcaster.go
+++ b/common/headtracker/head_broadcaster.go
@@ -7,9 +7,10 @@ import (
 	"sync"
 	"time"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -45,7 +46,7 @@ func NewHeadBroadcaster[
 	lggr logger.Logger,
 ) *HeadBroadcaster[H, BLOCK_HASH] {
 	return &HeadBroadcaster[H, BLOCK_HASH]{
-		logger:    lggr.Named("HeadBroadcaster"),
+		logger:    logger.Named(lggr, "HeadBroadcaster"),
 		callbacks: make(callbackSet[H, BLOCK_HASH]),
 		mailbox:   utils.NewSingleMailbox[H](),
 		chClose:   make(chan struct{}),
diff --git a/common/headtracker/head_listener.go b/common/headtracker/head_listener.go
index a3f262f4b73..2013895d0b8 100644
--- a/common/headtracker/head_listener.go
+++ b/common/headtracker/head_listener.go
@@ -9,11 +9,11 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
 	htrktypes "github.com/smartcontractkit/chainlink/v2/common/headtracker/types"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -59,7 +59,7 @@ func NewHeadListener[
 	return &HeadListener[HTH, S, ID, BLOCK_HASH]{
 		config: config,
 		client: client,
-		logger: lggr.Named("HeadListener"),
+		logger: logger.Named(lggr, "HeadListener"),
 		chStop: chStop,
 	}
 }
diff --git a/common/headtracker/head_tracker.go b/common/headtracker/head_tracker.go
index 810e749a2dc..34a319e3c1c 100644
--- a/common/headtracker/head_tracker.go
+++ b/common/headtracker/head_tracker.go
@@ -10,12 +10,12 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
 	htrktypes "github.com/smartcontractkit/chainlink/v2/common/headtracker/types"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
 	"github.com/smartcontractkit/chainlink/v2/core/config"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -75,7 +75,7 @@ func NewHeadTracker[
 	getNilHead func() HTH,
 ) types.HeadTracker[HTH, BLOCK_HASH] {
 	chStop := make(chan struct{})
-	lggr = lggr.Named("HeadTracker")
+	lggr = logger.Named(lggr, "HeadTracker")
 	return &HeadTracker[HTH, S, ID, BLOCK_HASH]{
 		headBroadcaster: headBroadcaster,
 		client:          client,
@@ -229,7 +229,7 @@ func (ht *HeadTracker[HTH, S, ID, BLOCK_HASH]) handleNewHead(ctx context.Context
 		prevUnFinalizedHead := prevHead.BlockNumber() - int64(ht.config.FinalityDepth())
 		if head.BlockNumber() < prevUnFinalizedHead {
 			promOldHead.WithLabelValues(ht.chainID.String()).Inc()
-			ht.log.Criticalf("Got very old block with number %d (highest seen was %d). This is a problem and either means a very deep re-org occurred, one of the RPC nodes has gotten far out of sync, or the chain went backwards in block numbers. This node may not function correctly without manual intervention.", head.BlockNumber(), prevHead.BlockNumber())
+			logger.Criticalf(ht.log, "Got very old block with number %d (highest seen was %d). This is a problem and either means a very deep re-org occurred, one of the RPC nodes has gotten far out of sync, or the chain went backwards in block numbers. This node may not function correctly without manual intervention.", head.BlockNumber(), prevHead.BlockNumber())
 			ht.SvcErrBuffer.Append(errors.New("got very old block"))
 		}
 	}
@@ -312,7 +312,7 @@ func (ht *HeadTracker[HTH, S, ID, BLOCK_HASH]) backfill(ctx context.Context, hea
 	}
 	mark := time.Now()
 	fetched := 0
-	l := ht.log.With("blockNumber", headBlockNumber,
+	l := logger.With(ht.log, "blockNumber", headBlockNumber,
 		"n", headBlockNumber-baseHeight,
 		"fromBlockHeight", baseHeight,
 		"toBlockHeight", headBlockNumber-1)
diff --git a/common/txmgr/broadcaster.go b/common/txmgr/broadcaster.go
index d9a72e367ac..cff5746a9e0 100644
--- a/common/txmgr/broadcaster.go
+++ b/common/txmgr/broadcaster.go
@@ -16,12 +16,13 @@ import (
 	"gopkg.in/guregu/null.v4"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/chains/label"
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+
 	"github.com/smartcontractkit/chainlink/v2/common/client"
 	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -107,7 +108,7 @@ type Broadcaster[
 	FEE feetypes.Fee,
 ] struct {
 	services.StateMachine
-	logger  logger.Logger
+	lggr    logger.Logger
 	txStore txmgrtypes.TransactionStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	client  txmgrtypes.TransactionClient[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	txmgrtypes.TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
@@ -164,14 +165,14 @@ func NewBroadcaster[
 	keystore txmgrtypes.KeyStore[ADDR, CHAIN_ID, SEQ],
 	txAttemptBuilder txmgrtypes.TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE],
 	sequenceSyncer SequenceSyncer[ADDR, TX_HASH, BLOCK_HASH, SEQ],
-	logger logger.Logger,
+	lggr logger.Logger,
 	checkerFactory TransmitCheckerFactory[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE],
 	autoSyncSequence bool,
 	generateNextSequence types.GenerateNextSequenceFunc[SEQ],
 ) *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE] {
-	logger = logger.Named("Broadcaster")
+	lggr = logger.Named(lggr, "Broadcaster")
 	b := &Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]{
-		logger:           logger,
+		lggr:             lggr,
 		txStore:          txStore,
 		client:           client,
 		TxAttemptBuilder: txAttemptBuilder,
@@ -213,9 +214,9 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) star
 	}
 
 	if len(eb.enabledAddresses) > 0 {
-		eb.logger.Debugw(fmt.Sprintf("Booting with %d keys", len(eb.enabledAddresses)), "keys", eb.enabledAddresses)
+		eb.lggr.Debugw(fmt.Sprintf("Booting with %d keys", len(eb.enabledAddresses)), "keys", eb.enabledAddresses)
 	} else {
-		eb.logger.Warnf("Chain %s does not have any keys, no transactions will be sent on this chain", eb.chainID.String())
+		eb.lggr.Warnf("Chain %s does not have any keys, no transactions will be sent on this chain", eb.chainID.String())
 	}
 	eb.chStop = make(chan struct{})
 	eb.wg = sync.WaitGroup{}
@@ -259,7 +260,7 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) SetR
 }
 
 func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Name() string {
-	return eb.logger.Name()
+	return eb.lggr.Name()
 }
 
 func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) HealthReport() map[string]error {
@@ -280,7 +281,7 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Trig
 		default:
 		}
 	} else {
-		eb.logger.Debugf("Unstarted; ignoring trigger for %s", addr)
+		eb.lggr.Debugf("Unstarted; ignoring trigger for %s", addr)
 	}
 }
 
@@ -314,7 +315,7 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) getS
 	if err == nil {
 		return seq, nil
 	}
-	eb.logger.Criticalw("failed to retrieve next sequence from on-chain for address: ", "address", address.String())
+	logger.Criticalw(eb.lggr, "failed to retrieve next sequence from on-chain for address: ", "address", address.String())
 	return seq, err
 
 }
@@ -342,13 +343,13 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) moni
 	defer cancel()
 
 	if eb.autoSyncSequence {
-		eb.logger.Debugw("Auto-syncing sequence", "address", addr.String())
+		eb.lggr.Debugw("Auto-syncing sequence", "address", addr.String())
 		eb.SyncSequence(ctx, addr)
 		if ctx.Err() != nil {
 			return
 		}
 	} else {
-		eb.logger.Debugw("Skipping sequence auto-sync", "address", addr.String())
+		eb.lggr.Debugw("Skipping sequence auto-sync", "address", addr.String())
 	}
 
 	// errorRetryCh allows retry on exponential backoff in case of timeout or
@@ -361,7 +362,7 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) moni
 
 		retryable, err := eb.processUnstartedTxsImpl(ctx, addr)
 		if err != nil {
-			eb.logger.Errorw("Error occurred while handling tx queue in ProcessUnstartedTxs", "err", err)
+			eb.lggr.Errorw("Error occurred while handling tx queue in ProcessUnstartedTxs", "err", err)
 		}
 		// On retryable errors we implement exponential backoff retries. This
 		// handles intermittent connectivity, remote RPC races, timing issues etc
@@ -402,7 +403,7 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Sync
 	localSequence, err := eb.GetNextSequence(ctx, addr)
 	// Address not found in map so skip sync
 	if err != nil {
-		eb.logger.Criticalw("Failed to retrieve local next sequence for address", "address", addr.String(), "err", err)
+		logger.Criticalw(eb.lggr, "Failed to retrieve local next sequence for address", "address", addr.String(), "err", err)
 		return
 	}
 
@@ -417,16 +418,16 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Sync
 			newNextSequence, err := eb.sequenceSyncer.Sync(ctx, addr, localSequence)
 			if err != nil {
 				if attempt > 5 {
-					eb.logger.Criticalw("Failed to sync with on-chain sequence", "address", addr.String(), "attempt", attempt, "err", err)
+					logger.Criticalw(eb.lggr, "Failed to sync with on-chain sequence", "address", addr.String(), "attempt", attempt, "err", err)
 					eb.SvcErrBuffer.Append(err)
 				} else {
-					eb.logger.Warnw("Failed to sync with on-chain sequence", "address", addr.String(), "attempt", attempt, "err", err)
+					eb.lggr.Warnw("Failed to sync with on-chain sequence", "address", addr.String(), "attempt", attempt, "err", err)
 				}
 				continue
 			}
 			// Found new sequence to use from on-chain
 			if localSequence.String() != newNextSequence.String() {
-				eb.logger.Infow("Fast-forward sequence", "address", addr, "newNextSequence", newNextSequence, "oldNextSequence", localSequence)
+				eb.lggr.Infow("Fast-forward sequence", "address", addr, "newNextSequence", newNextSequence, "oldNextSequence", localSequence)
 				// Set new sequence in the map
 				eb.SetNextSequence(addr, newNextSequence)
 			}
@@ -451,7 +452,7 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) proc
 	mark := time.Now()
 	defer func() {
 		if n > 0 {
-			eb.logger.Debugw("Finished processUnstartedTxs", "address", fromAddress, "time", time.Since(mark), "n", n, "id", "broadcaster")
+			eb.lggr.Debugw("Finished processUnstartedTxs", "address", fromAddress, "time", time.Since(mark), "n", n, "id", "broadcaster")
 		}
 	}()
 
@@ -471,7 +472,7 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) proc
 				if err != nil {
 					return true, errors.Wrap(err, "CountUnstartedTransactions failed")
 				}
-				eb.logger.Warnw(fmt.Sprintf(`Transaction throttling; %d transactions in-flight and %d unstarted transactions pending (maximum number of in-flight transactions is %d per key). %s`, nUnconfirmed, nUnstarted, maxInFlightTransactions, label.MaxInFlightTransactionsWarning), "maxInFlightTransactions", maxInFlightTransactions, "nUnconfirmed", nUnconfirmed, "nUnstarted", nUnstarted)
+				eb.lggr.Warnw(fmt.Sprintf(`Transaction throttling; %d transactions in-flight and %d unstarted transactions pending (maximum number of in-flight transactions is %d per key). %s`, nUnconfirmed, nUnstarted, maxInFlightTransactions, label.MaxInFlightTransactionsWarning), "maxInFlightTransactions", maxInFlightTransactions, "nUnconfirmed", nUnconfirmed, "nUnstarted", nUnstarted)
 				select {
 				case <-time.After(InFlightTransactionRecheckInterval):
 				case <-ctx.Done():
@@ -490,13 +491,13 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) proc
 		n++
 		var a txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 		var retryable bool
-		a, _, _, retryable, err = eb.NewTxAttempt(ctx, *etx, eb.logger)
+		a, _, _, retryable, err = eb.NewTxAttempt(ctx, *etx, eb.lggr)
 		if err != nil {
 			return retryable, errors.Wrap(err, "processUnstartedTxs failed on NewAttempt")
 		}
 
 		if err := eb.txStore.UpdateTxUnstartedToInProgress(ctx, etx, &a); errors.Is(err, ErrTxRemoved) {
-			eb.logger.Debugw("tx removed", "txID", etx.ID, "subject", etx.Subject)
+			eb.lggr.Debugw("tx removed", "txID", etx.ID, "subject", etx.Subject)
 			continue
 		} else if err != nil {
 			return true, errors.Wrap(err, "processUnstartedTxs failed on UpdateTxUnstartedToInProgress")
@@ -540,7 +541,7 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) hand
 		return errors.Wrap(err, "building transmit checker"), false
 	}
 
-	lgr := etx.GetLogger(eb.logger.With("fee", attempt.TxFee))
+	lgr := etx.GetLogger(logger.With(eb.lggr, "fee", attempt.TxFee))
 
 	// If the transmit check does not complete within the timeout, the transaction will be sent
 	// anyway.
@@ -650,14 +651,14 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) hand
 		// If there is only one RPC node, or all RPC nodes have the same
 		// configured cap, this transaction will get stuck and keep repeating
 		// forever until the issue is resolved.
-		lgr.Criticalw(`RPC node rejected this tx as outside Fee Cap`)
+		logger.Criticalw(lgr, `RPC node rejected this tx as outside Fee Cap`)
 		fallthrough
 	default:
 		// Every error that doesn't fall under one of the above categories will be treated as Unknown.
 		fallthrough
 	case client.Unknown:
 		eb.SvcErrBuffer.Append(err)
-		lgr.Criticalw(`Unknown error occurred while handling tx queue in ProcessUnstartedTxs. This chain/RPC client may not be supported. `+
+		logger.Criticalw(lgr, `Unknown error occurred while handling tx queue in ProcessUnstartedTxs. This chain/RPC client may not be supported. `+
 			`Urgent resolution required, Chainlink is currently operating in a degraded state and may miss transactions`, "err", err, "etx", etx, "attempt", attempt)
 		nextSequence, e := eb.client.PendingSequenceAt(ctx, etx.FromAddress)
 		if e != nil {
@@ -717,7 +718,7 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) next
 }
 
 func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) tryAgainBumpingGas(ctx context.Context, lgr logger.Logger, txError error, etx txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], attempt txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], initialBroadcastAt time.Time) (err error, retryable bool) {
-	lgr.With(
+	logger.With(lgr,
 		"sendError", txError,
 		"attemptFee", attempt.TxFee,
 		"maxGasPriceConfig", eb.feeConfig.MaxFeePrice(),
@@ -738,7 +739,7 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) tryA
 func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) tryAgainWithNewEstimation(ctx context.Context, lgr logger.Logger, txError error, etx txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], attempt txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], initialBroadcastAt time.Time) (err error, retryable bool) {
 	if attempt.TxType == 0x2 {
 		err = errors.Errorf("re-estimation is not supported for EIP-1559 transactions. Node returned error: %v. This is a bug", txError.Error())
-		logger.Sugared(eb.logger).AssumptionViolation(err.Error())
+		logger.Sugared(eb.lggr).AssumptionViolation(err.Error())
 		return err, false
 	}
 
@@ -807,7 +808,7 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) GetN
 		return seq, nil
 	}
 
-	eb.logger.Infow("address not found in local next sequence map. Attempting to search and populate sequence.", "address", address.String())
+	eb.lggr.Infow("address not found in local next sequence map. Attempting to search and populate sequence.", "address", address.String())
 	// Check if address is in the enabled address list
 	if !slices.Contains(eb.enabledAddresses, address) {
 		return seq, fmt.Errorf("address disabled: %s", address)
diff --git a/common/txmgr/confirmer.go b/common/txmgr/confirmer.go
index bf356115828..a56768ce206 100644
--- a/common/txmgr/confirmer.go
+++ b/common/txmgr/confirmer.go
@@ -15,13 +15,14 @@ import (
 	"go.uber.org/multierr"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/chains/label"
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+
 	"github.com/smartcontractkit/chainlink/v2/common/client"
 	commonfee "github.com/smartcontractkit/chainlink/v2/common/fee"
 	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -160,7 +161,7 @@ func NewConfirmer[
 	lggr logger.Logger,
 	isReceiptNil func(R) bool,
 ) *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE] {
-	lggr = lggr.Named("Confirmer")
+	lggr = logger.Named(lggr, "Confirmer")
 	return &Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]{
 		txStore:          txStore,
 		lggr:             lggr,
@@ -517,7 +518,8 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) bat
 		}
 	}
 
-	lggr := ec.lggr.Named("BatchFetchReceipts").With("blockNum", blockNum)
+	lggr := logger.Named(ec.lggr, "BatchFetchReceipts")
+	lggr = logger.With(lggr, "blockNum", blockNum)
 
 	txReceipts, txErrs, err := ec.client.BatchGetReceipts(ctx, attempts)
 	if err != nil {
@@ -529,8 +531,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) bat
 		receipt := txReceipts[i]
 		err := txErrs[i]
 
-		l := logger.Sugared(attempt.Tx.GetLogger(lggr).With(
-			"txHash", attempt.Hash.String(), "txAttemptID", attempt.ID,
+		l := logger.Sugared(logger.With(attempt.Tx.GetLogger(lggr), "txHash", attempt.Hash.String(), "txAttemptID", attempt.ID,
 			"txID", attempt.TxID, "err", err, "sequence", attempt.Tx.Sequence,
 		))
 
@@ -551,7 +552,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) bat
 			continue
 		}
 
-		l = logger.Sugared(l.With("blockHash", receipt.GetBlockHash().String(), "status", receipt.GetStatus(), "transactionIndex", receipt.GetTransactionIndex()))
+		l = logger.Sugared(logger.With(l, "blockHash", receipt.GetBlockHash().String(), "status", receipt.GetStatus(), "transactionIndex", receipt.GetTransactionIndex()))
 
 		if receipt.IsUnmined() {
 			l.Debug("Got receipt for transaction but it's still in the mempool and not included in a block yet")
@@ -843,7 +844,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) han
 			return errors.Wrap(err, "could not bump gas for terminally underpriced transaction")
 		}
 		promNumGasBumps.WithLabelValues(ec.chainID.String()).Inc()
-		lggr.With(
+		logger.With(lggr,
 			"sendError", sendError,
 			"maxGasPriceConfig", ec.feeConfig.MaxFeePrice(),
 			"previousAttempt", attempt,
@@ -864,7 +865,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) han
 		// Should NEVER be fatal this is an invariant violation. The
 		// Broadcaster can never create a TxAttempt that will
 		// fatally error.
-		lggr.Criticalw("Invariant violation: fatal error while re-attempting transaction",
+		logger.Criticalw(lggr, "Invariant violation: fatal error while re-attempting transaction",
 			"err", sendError,
 			"fee", attempt.TxFee,
 			"feeLimit", etx.FeeLimit,
diff --git a/common/txmgr/reaper.go b/common/txmgr/reaper.go
index 7286efa3a80..385a9a17c3d 100644
--- a/common/txmgr/reaper.go
+++ b/common/txmgr/reaper.go
@@ -5,11 +5,11 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -33,7 +33,7 @@ func NewReaper[CHAIN_ID types.ID](lggr logger.Logger, store txmgrtypes.TxHistory
 		config,
 		txConfig,
 		chainID,
-		lggr.Named("Reaper"),
+		logger.Named(lggr, "Reaper"),
 		atomic.Int64{},
 		make(chan struct{}, 1),
 		make(services.StopChan),
diff --git a/common/txmgr/resender.go b/common/txmgr/resender.go
index e604a960bf8..ce770055609 100644
--- a/common/txmgr/resender.go
+++ b/common/txmgr/resender.go
@@ -7,11 +7,12 @@ import (
 	"time"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/chains/label"
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+
 	"github.com/smartcontractkit/chainlink/v2/common/client"
 	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -87,7 +88,7 @@ func NewResender[
 		pollInterval,
 		config,
 		txConfig,
-		lggr.Named("Resender"),
+		logger.Named(lggr, "Resender"),
 		make(map[string]time.Time),
 		ctx,
 		cancel,
diff --git a/common/txmgr/txmgr.go b/common/txmgr/txmgr.go
index b49c2b72f15..63bf039d8f7 100644
--- a/common/txmgr/txmgr.go
+++ b/common/txmgr/txmgr.go
@@ -11,12 +11,12 @@ import (
 
 	"github.com/google/uuid"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
 	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -331,7 +331,7 @@ func (b *Txm[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) runLoop()
 				select {
 				case <-time.After(backoff.Duration()):
 					if err := b.broadcaster.startInternal(); err != nil {
-						b.logger.Criticalw("Failed to start Broadcaster", "err", err)
+						logger.Criticalw(b.logger, "Failed to start Broadcaster", "err", err)
 						b.SvcErrBuffer.Append(err)
 						continue
 					}
@@ -350,7 +350,7 @@ func (b *Txm[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) runLoop()
 				select {
 				case <-time.After(backoff.Duration()):
 					if err := b.confirmer.startInternal(); err != nil {
-						b.logger.Criticalw("Failed to start Confirmer", "err", err)
+						logger.Criticalw(b.logger, "Failed to start Confirmer", "err", err)
 						b.SvcErrBuffer.Append(err)
 						continue
 					}
@@ -408,7 +408,7 @@ func (b *Txm[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) runLoop()
 			}
 			enabledAddresses, err := b.keyStore.EnabledAddressesForChain(b.chainID)
 			if err != nil {
-				b.logger.Criticalf("Failed to reload key states after key change")
+				logger.Criticalf(b.logger, "Failed to reload key states after key change")
 				b.SvcErrBuffer.Append(err)
 				continue
 			}
diff --git a/common/txmgr/types/client.go b/common/txmgr/types/client.go
index 58c1b6f6ad2..b44c41e4176 100644
--- a/common/txmgr/types/client.go
+++ b/common/txmgr/types/client.go
@@ -6,10 +6,10 @@ import (
 	"math/big"
 	"time"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/common/client"
 	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 // TxmClient is a superset of all the methods needed for the txm
diff --git a/common/txmgr/types/mocks/tx_attempt_builder.go b/common/txmgr/types/mocks/tx_attempt_builder.go
index f49b0025ae7..0f3d3e3fba1 100644
--- a/common/txmgr/types/mocks/tx_attempt_builder.go
+++ b/common/txmgr/types/mocks/tx_attempt_builder.go
@@ -5,8 +5,8 @@ package mocks
 import (
 	context "context"
 
+	logger "github.com/smartcontractkit/chainlink-common/pkg/logger"
 	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
-	logger "github.com/smartcontractkit/chainlink/v2/core/logger"
 
 	mock "github.com/stretchr/testify/mock"
 
diff --git a/common/txmgr/types/tx.go b/common/txmgr/types/tx.go
index 78f6fba4592..b8a16561d88 100644
--- a/common/txmgr/types/tx.go
+++ b/common/txmgr/types/tx.go
@@ -13,10 +13,10 @@ import (
 	"github.com/pkg/errors"
 	"gopkg.in/guregu/null.v4"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/sqlutil"
 	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	clnull "github.com/smartcontractkit/chainlink/v2/core/null"
 )
 
@@ -250,7 +250,7 @@ func (e *Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) GetMeta() (*TxMeta[A
 
 // GetLogger returns a new logger with metadata fields.
 func (e *Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) GetLogger(lgr logger.Logger) logger.Logger {
-	lgr = lgr.With(
+	lgr = logger.With(lgr,
 		"txID", e.ID,
 		"sequence", e.Sequence,
 		"checker", e.TransmitChecker,
@@ -264,15 +264,15 @@ func (e *Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) GetLogger(lgr logger
 	}
 
 	if meta != nil {
-		lgr = lgr.With("jobID", meta.JobID)
+		lgr = logger.With(lgr, "jobID", meta.JobID)
 
 		if meta.RequestTxHash != nil {
-			lgr = lgr.With("requestTxHash", *meta.RequestTxHash)
+			lgr = logger.With(lgr, "requestTxHash", *meta.RequestTxHash)
 		}
 
 		if meta.RequestID != nil {
 			id := *meta.RequestID
-			lgr = lgr.With("requestID", new(big.Int).SetBytes(id.Bytes()).String())
+			lgr = logger.With(lgr, "requestID", new(big.Int).SetBytes(id.Bytes()).String())
 		}
 
 		if len(meta.RequestIDs) != 0 {
@@ -280,33 +280,33 @@ func (e *Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) GetLogger(lgr logger
 			for _, id := range meta.RequestIDs {
 				ids = append(ids, new(big.Int).SetBytes(id.Bytes()).String())
 			}
-			lgr = lgr.With("requestIDs", strings.Join(ids, ","))
+			lgr = logger.With(lgr, "requestIDs", strings.Join(ids, ","))
 		}
 
 		if meta.UpkeepID != nil {
-			lgr = lgr.With("upkeepID", *meta.UpkeepID)
+			lgr = logger.With(lgr, "upkeepID", *meta.UpkeepID)
 		}
 
 		if meta.SubID != nil {
-			lgr = lgr.With("subID", *meta.SubID)
+			lgr = logger.With(lgr, "subID", *meta.SubID)
 		}
 
 		if meta.MaxLink != nil {
-			lgr = lgr.With("maxLink", *meta.MaxLink)
+			lgr = logger.With(lgr, "maxLink", *meta.MaxLink)
 		}
 
 		if meta.FwdrDestAddress != nil {
-			lgr = lgr.With("FwdrDestAddress", *meta.FwdrDestAddress)
+			lgr = logger.With(lgr, "FwdrDestAddress", *meta.FwdrDestAddress)
 		}
 
 		if len(meta.MessageIDs) > 0 {
 			for _, mid := range meta.MessageIDs {
-				lgr = lgr.With("messageID", mid)
+				lgr = logger.With(lgr, "messageID", mid)
 			}
 		}
 
 		if len(meta.SeqNumbers) > 0 {
-			lgr = lgr.With("SeqNumbers", meta.SeqNumbers)
+			lgr = logger.With(lgr, "SeqNumbers", meta.SeqNumbers)
 		}
 	}
 
diff --git a/common/txmgr/types/tx_attempt_builder.go b/common/txmgr/types/tx_attempt_builder.go
index 75712fc0c37..383b6d862f0 100644
--- a/common/txmgr/types/tx_attempt_builder.go
+++ b/common/txmgr/types/tx_attempt_builder.go
@@ -3,10 +3,10 @@ package types
 import (
 	"context"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 // TxAttemptBuilder takes the base unsigned transaction + optional parameters (tx type, gas parameters)
diff --git a/core/chains/evm/client/chain_client.go b/core/chains/evm/client/chain_client.go
index 0f15b35ee9e..d17c55f2e4f 100644
--- a/core/chains/evm/client/chain_client.go
+++ b/core/chains/evm/client/chain_client.go
@@ -11,11 +11,12 @@ import (
 	"github.com/ethereum/go-ethereum/rpc"
 
 	commonassets "github.com/smartcontractkit/chainlink-common/pkg/assets"
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+
 	commonclient "github.com/smartcontractkit/chainlink/v2/common/client"
 	"github.com/smartcontractkit/chainlink/v2/common/config"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 var _ Client = (*chainClient)(nil)
diff --git a/core/chains/evm/client/client.go b/core/chains/evm/client/client.go
index 5263c74de15..91c8659d8c5 100644
--- a/core/chains/evm/client/client.go
+++ b/core/chains/evm/client/client.go
@@ -7,11 +7,12 @@ import (
 	"time"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/assets"
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+
 	commonclient "github.com/smartcontractkit/chainlink/v2/common/client"
 	"github.com/smartcontractkit/chainlink/v2/common/config"
 	htrktypes "github.com/smartcontractkit/chainlink/v2/common/headtracker/types"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 
 	"github.com/ethereum/go-ethereum"
diff --git a/core/chains/evm/client/errors.go b/core/chains/evm/client/errors.go
index 4cb505dc9eb..143a5f8806f 100644
--- a/core/chains/evm/client/errors.go
+++ b/core/chains/evm/client/errors.go
@@ -10,9 +10,9 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/pkg/errors"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	commonclient "github.com/smartcontractkit/chainlink/v2/common/client"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/label"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 // fatal means this transaction can never be accepted even with a different nonce or higher gas price
@@ -419,7 +419,7 @@ func ClassifySendError(err error, lggr logger.Logger, tx *types.Transaction, fro
 		return commonclient.Successful, err
 	}
 	if sendError.Fatal() {
-		lggr.Criticalw("Fatal error sending transaction", "err", sendError, "etx", tx)
+		logger.Criticalw(lggr, "Fatal error sending transaction", "err", sendError, "etx", tx)
 		// Attempt is thrown away in this case; we don't need it since it never got accepted by a node
 		return commonclient.Fatal, err
 	}
@@ -462,7 +462,7 @@ func ClassifySendError(err error, lggr logger.Logger, tx *types.Transaction, fro
 		return commonclient.Retryable, err
 	}
 	if sendError.IsInsufficientEth() {
-		lggr.Criticalw(fmt.Sprintf("Tx %x with type 0x%d was rejected due to insufficient eth: %s\n"+
+		logger.Criticalw(lggr, fmt.Sprintf("Tx %x with type 0x%d was rejected due to insufficient eth: %s\n"+
 			"ACTION REQUIRED: Chainlink wallet with address 0x%x is OUT OF FUNDS",
 			tx.Hash(), tx.Type(), sendError.Error(), fromAddress,
 		), "err", sendError)
@@ -472,7 +472,7 @@ func ClassifySendError(err error, lggr logger.Logger, tx *types.Transaction, fro
 		return commonclient.Retryable, errors.Wrapf(sendError, "timeout while sending transaction %s", tx.Hash().Hex())
 	}
 	if sendError.IsTxFeeExceedsCap() {
-		lggr.Criticalw(fmt.Sprintf("Sending transaction failed: %s", label.RPCTxFeeCapConfiguredIncorrectlyWarning),
+		logger.Criticalw(lggr, fmt.Sprintf("Sending transaction failed: %s", label.RPCTxFeeCapConfiguredIncorrectlyWarning),
 			"etx", tx,
 			"err", sendError,
 			"id", "RPCTxFeeCapExceeded",
diff --git a/core/chains/evm/client/helpers_test.go b/core/chains/evm/client/helpers_test.go
index b1d477b1a29..dce825f4f71 100644
--- a/core/chains/evm/client/helpers_test.go
+++ b/core/chains/evm/client/helpers_test.go
@@ -9,11 +9,11 @@ import (
 
 	"github.com/pkg/errors"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	commonclient "github.com/smartcontractkit/chainlink/v2/common/client"
 	commonconfig "github.com/smartcontractkit/chainlink/v2/common/config"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -43,7 +43,7 @@ func NewClientWithTestNode(t *testing.T, nodePoolCfg config.NodePool, noNewHeads
 		return nil, errors.Errorf("ethereum url scheme must be websocket: %s", parsed.String())
 	}
 
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	n := NewNode(nodePoolCfg, noNewHeadsThreshold, lggr, *parsed, rpcHTTPURL, "eth-primary-0", id, chainID, 1)
 	n.(*node).setLatestReceived(0, utils.NewBigI(0))
 	primaries := []Node{n}
@@ -87,7 +87,7 @@ func NewChainClientWithTestNode(
 		return nil, errors.Errorf("ethereum url scheme must be websocket: %s", parsed.String())
 	}
 
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	rpc := NewRPCClient(lggr, *parsed, rpcHTTPURL, "eth-primary-rpc-0", id, chainID, commonclient.Primary)
 
 	n := commonclient.NewNode[*big.Int, *evmtypes.Head, RPCCLient](
@@ -120,7 +120,7 @@ func NewChainClientWithEmptyNode(
 	chainID *big.Int,
 ) Client {
 
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 
 	var chainType commonconfig.ChainType
 	c := NewChainClient(lggr, selectionMode, leaseDuration, noNewHeadsThreshold, nil, nil, chainID, chainType)
diff --git a/core/chains/evm/client/node.go b/core/chains/evm/client/node.go
index b3ce489cf50..8bae566e273 100644
--- a/core/chains/evm/client/node.go
+++ b/core/chains/evm/client/node.go
@@ -19,10 +19,11 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -192,7 +193,8 @@ func NewNode(nodeCfg config.NodePool, noNewHeadsThreshold time.Duration, lggr lo
 	}
 	n.chStopInFlight = make(chan struct{})
 	n.nodeCtx, n.cancelNodeCtx = context.WithCancel(context.Background())
-	lggr = lggr.Named("Node").With(
+	lggr = logger.Named(lggr, "Node")
+	lggr = logger.With(lggr,
 		"nodeTier", "primary",
 		"nodeName", name,
 		"node", n.String(),
@@ -200,8 +202,8 @@ func NewNode(nodeCfg config.NodePool, noNewHeadsThreshold time.Duration, lggr lo
 		"nodeOrder", n.order,
 		"mode", n.getNodeMode(),
 	)
-	n.lfcLog = lggr.Named("Lifecycle")
-	n.rpcLog = lggr.Named("RPC")
+	n.lfcLog = logger.Named(lggr, "Lifecycle")
+	n.rpcLog = logger.Named(lggr, "RPC")
 	n.stateLatestBlockNumber = -1
 
 	return n
@@ -259,9 +261,9 @@ func (n *node) dial(callerCtx context.Context) error {
 	defer cancel()
 
 	promEVMPoolRPCNodeDials.WithLabelValues(n.chainID.String(), n.name).Inc()
-	lggr := n.lfcLog.With("wsuri", n.ws.uri.Redacted())
+	lggr := logger.With(n.lfcLog, "wsuri", n.ws.uri.Redacted())
 	if n.http != nil {
-		lggr = lggr.With("httpuri", n.http.uri.Redacted())
+		lggr = logger.With(lggr, "httpuri", n.http.uri.Redacted())
 	}
 	lggr.Debugw("RPC dial: evmclient.Client#dial")
 
@@ -448,7 +450,7 @@ func (n *node) CallContext(ctx context.Context, result interface{}, method strin
 		return err
 	}
 	defer cancel()
-	lggr := n.newRqLggr().With(
+	lggr := logger.With(n.newRqLggr(),
 		"method", method,
 		"args", args,
 	)
@@ -473,9 +475,9 @@ func (n *node) BatchCallContext(ctx context.Context, b []rpc.BatchElem) error {
 		return err
 	}
 	defer cancel()
-	lggr := n.newRqLggr().With("nBatchElems", len(b), "batchElems", b)
+	lggr := logger.With(n.newRqLggr(), "nBatchElems", len(b), "batchElems", b)
 
-	lggr.Trace("RPC call: evmclient.Client#BatchCallContext")
+	logger.Trace(lggr, "RPC call: evmclient.Client#BatchCallContext")
 	start := time.Now()
 	if http != nil {
 		err = n.wrapHTTP(http.rpc.BatchCallContext(ctx, b))
@@ -495,7 +497,7 @@ func (n *node) EthSubscribe(ctx context.Context, channel chan<- *evmtypes.Head,
 		return nil, err
 	}
 	defer cancel()
-	lggr := n.newRqLggr().With("args", args)
+	lggr := logger.With(n.newRqLggr(), "args", args)
 
 	lggr.Debug("RPC call: evmclient.Client#EthSubscribe")
 	start := time.Now()
@@ -518,7 +520,7 @@ func (n *node) TransactionReceipt(ctx context.Context, txHash common.Hash) (rece
 		return nil, err
 	}
 	defer cancel()
-	lggr := n.newRqLggr().With("txHash", txHash)
+	lggr := logger.With(n.newRqLggr(), "txHash", txHash)
 
 	lggr.Debug("RPC call: evmclient.Client#TransactionReceipt")
 
@@ -545,7 +547,7 @@ func (n *node) TransactionByHash(ctx context.Context, txHash common.Hash) (tx *t
 		return nil, err
 	}
 	defer cancel()
-	lggr := n.newRqLggr().With("txHash", txHash)
+	lggr := logger.With(n.newRqLggr(), "txHash", txHash)
 
 	lggr.Debug("RPC call: evmclient.Client#TransactionByHash")
 
@@ -572,7 +574,7 @@ func (n *node) HeaderByNumber(ctx context.Context, number *big.Int) (header *typ
 		return nil, err
 	}
 	defer cancel()
-	lggr := n.newRqLggr().With("number", number)
+	lggr := logger.With(n.newRqLggr(), "number", number)
 
 	lggr.Debug("RPC call: evmclient.Client#HeaderByNumber")
 	start := time.Now()
@@ -596,7 +598,7 @@ func (n *node) HeaderByHash(ctx context.Context, hash common.Hash) (header *type
 		return nil, err
 	}
 	defer cancel()
-	lggr := n.newRqLggr().With("hash", hash)
+	lggr := logger.With(n.newRqLggr(), "hash", hash)
 
 	lggr.Debug("RPC call: evmclient.Client#HeaderByHash")
 	start := time.Now()
@@ -622,7 +624,7 @@ func (n *node) SendTransaction(ctx context.Context, tx *types.Transaction) error
 		return err
 	}
 	defer cancel()
-	lggr := n.newRqLggr().With("tx", tx)
+	lggr := logger.With(n.newRqLggr(), "tx", tx)
 
 	lggr.Debug("RPC call: evmclient.Client#SendTransaction")
 	start := time.Now()
@@ -645,7 +647,7 @@ func (n *node) PendingNonceAt(ctx context.Context, account common.Address) (nonc
 		return 0, err
 	}
 	defer cancel()
-	lggr := n.newRqLggr().With("account", account)
+	lggr := logger.With(n.newRqLggr(), "account", account)
 
 	lggr.Debug("RPC call: evmclient.Client#PendingNonceAt")
 	start := time.Now()
@@ -674,7 +676,7 @@ func (n *node) NonceAt(ctx context.Context, account common.Address, blockNumber
 		return 0, err
 	}
 	defer cancel()
-	lggr := n.newRqLggr().With("account", account, "blockNumber", blockNumber)
+	lggr := logger.With(n.newRqLggr(), "account", account, "blockNumber", blockNumber)
 
 	lggr.Debug("RPC call: evmclient.Client#NonceAt")
 	start := time.Now()
@@ -700,7 +702,7 @@ func (n *node) PendingCodeAt(ctx context.Context, account common.Address) (code
 		return nil, err
 	}
 	defer cancel()
-	lggr := n.newRqLggr().With("account", account)
+	lggr := logger.With(n.newRqLggr(), "account", account)
 
 	lggr.Debug("RPC call: evmclient.Client#PendingCodeAt")
 	start := time.Now()
@@ -726,7 +728,7 @@ func (n *node) CodeAt(ctx context.Context, account common.Address, blockNumber *
 		return nil, err
 	}
 	defer cancel()
-	lggr := n.newRqLggr().With("account", account, "blockNumber", blockNumber)
+	lggr := logger.With(n.newRqLggr(), "account", account, "blockNumber", blockNumber)
 
 	lggr.Debug("RPC call: evmclient.Client#CodeAt")
 	start := time.Now()
@@ -752,7 +754,7 @@ func (n *node) EstimateGas(ctx context.Context, call ethereum.CallMsg) (gas uint
 		return 0, err
 	}
 	defer cancel()
-	lggr := n.newRqLggr().With("call", call)
+	lggr := logger.With(n.newRqLggr(), "call", call)
 
 	lggr.Debug("RPC call: evmclient.Client#EstimateGas")
 	start := time.Now()
@@ -804,7 +806,7 @@ func (n *node) CallContract(ctx context.Context, msg ethereum.CallMsg, blockNumb
 		return nil, err
 	}
 	defer cancel()
-	lggr := n.newRqLggr().With("callMsg", msg, "blockNumber", blockNumber)
+	lggr := logger.With(n.newRqLggr(), "callMsg", msg, "blockNumber", blockNumber)
 
 	lggr.Debug("RPC call: evmclient.Client#CallContract")
 	start := time.Now()
@@ -831,7 +833,7 @@ func (n *node) BlockByNumber(ctx context.Context, number *big.Int) (b *types.Blo
 		return nil, err
 	}
 	defer cancel()
-	lggr := n.newRqLggr().With("number", number)
+	lggr := logger.With(n.newRqLggr(), "number", number)
 
 	lggr.Debug("RPC call: evmclient.Client#BlockByNumber")
 	start := time.Now()
@@ -857,7 +859,7 @@ func (n *node) BlockByHash(ctx context.Context, hash common.Hash) (b *types.Bloc
 		return nil, err
 	}
 	defer cancel()
-	lggr := n.newRqLggr().With("hash", hash)
+	lggr := logger.With(n.newRqLggr(), "hash", hash)
 
 	lggr.Debug("RPC call: evmclient.Client#BlockByHash")
 	start := time.Now()
@@ -909,7 +911,7 @@ func (n *node) BalanceAt(ctx context.Context, account common.Address, blockNumbe
 		return nil, err
 	}
 	defer cancel()
-	lggr := n.newRqLggr().With("account", account.Hex(), "blockNumber", blockNumber)
+	lggr := logger.With(n.newRqLggr(), "account", account.Hex(), "blockNumber", blockNumber)
 
 	lggr.Debug("RPC call: evmclient.Client#BalanceAt")
 	start := time.Now()
@@ -935,7 +937,7 @@ func (n *node) FilterLogs(ctx context.Context, q ethereum.FilterQuery) (l []type
 		return nil, err
 	}
 	defer cancel()
-	lggr := n.newRqLggr().With("q", q)
+	lggr := logger.With(n.newRqLggr(), "q", q)
 
 	lggr.Debug("RPC call: evmclient.Client#FilterLogs")
 	start := time.Now()
@@ -961,7 +963,7 @@ func (n *node) SubscribeFilterLogs(ctx context.Context, q ethereum.FilterQuery,
 		return nil, err
 	}
 	defer cancel()
-	lggr := n.newRqLggr().With("q", q)
+	lggr := logger.With(n.newRqLggr(), "q", q)
 
 	lggr.Debug("RPC call: evmclient.Client#SubscribeFilterLogs")
 	start := time.Now()
@@ -1007,7 +1009,7 @@ func (n *node) ChainID() (chainID *big.Int) { return n.chainID }
 
 // newRqLggr generates a new logger with a unique request ID
 func (n *node) newRqLggr() logger.Logger {
-	return n.rpcLog.With(
+	return logger.With(n.rpcLog,
 		"requestID", uuid.New(),
 	)
 }
@@ -1020,11 +1022,11 @@ func (n *node) logResult(
 	callName string,
 	results ...interface{},
 ) {
-	lggr = lggr.With("duration", callDuration, "rpcDomain", rpcDomain, "callName", callName)
+	lggr = logger.With(lggr, "duration", callDuration, "rpcDomain", rpcDomain, "callName", callName)
 	promEVMPoolRPCNodeCalls.WithLabelValues(n.chainID.String(), n.name).Inc()
 	if err == nil {
 		promEVMPoolRPCNodeCallsSuccess.WithLabelValues(n.chainID.String(), n.name).Inc()
-		lggr.Tracew(
+		logger.Tracew(lggr,
 			fmt.Sprintf("evmclient.Client#%s RPC call success", callName),
 			results...,
 		)
@@ -1057,7 +1059,7 @@ func (n *node) wrapHTTP(err error) error {
 	if err != nil {
 		n.rpcLog.Debugw("Call failed", "err", err)
 	} else {
-		n.rpcLog.Trace("Call succeeded")
+		logger.Trace(n.rpcLog, "Call succeeded")
 	}
 	return err
 }
diff --git a/core/chains/evm/client/node_fsm_test.go b/core/chains/evm/client/node_fsm_test.go
index ce63a62a8bd..321bbc7a309 100644
--- a/core/chains/evm/client/node_fsm_test.go
+++ b/core/chains/evm/client/node_fsm_test.go
@@ -8,8 +8,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 type fnMock struct{ calls int }
@@ -43,7 +43,7 @@ func TestUnit_Node_StateTransitions(t *testing.T) {
 	t.Parallel()
 
 	s := testutils.NewWSServer(t, testutils.FixtureChainID, nil)
-	iN := NewNode(TestNodePoolConfig{}, time.Second*0, logger.TestLogger(t), *s.WSURL(), nil, "test node", 42, nil, 1)
+	iN := NewNode(TestNodePoolConfig{}, time.Second*0, logger.Test(t), *s.WSURL(), nil, "test node", 42, nil, 1)
 	n := iN.(*node)
 
 	assert.Equal(t, NodeStateUndialed, n.State())
diff --git a/core/chains/evm/client/node_lifecycle.go b/core/chains/evm/client/node_lifecycle.go
index 609d1522ea5..11d03d97dd5 100644
--- a/core/chains/evm/client/node_lifecycle.go
+++ b/core/chains/evm/client/node_lifecycle.go
@@ -10,6 +10,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
@@ -87,8 +88,9 @@ func (n *node) aliveLoop() {
 	pollFailureThreshold := n.nodePoolCfg.PollFailureThreshold()
 	pollInterval := n.nodePoolCfg.PollInterval()
 
-	lggr := n.lfcLog.Named("Alive").With("noNewHeadsTimeoutThreshold", noNewHeadsTimeoutThreshold, "pollInterval", pollInterval, "pollFailureThreshold", pollFailureThreshold)
-	lggr.Tracew("Alive loop starting", "nodeState", n.State())
+	lggr := logger.Named(n.lfcLog, "Alive")
+	lggr = logger.With(lggr, "noNewHeadsTimeoutThreshold", noNewHeadsTimeoutThreshold, "pollInterval", pollInterval, "pollFailureThreshold", pollFailureThreshold)
+	logger.Tracew(lggr, "Alive loop starting", "nodeState", n.State())
 
 	headsC := make(chan *evmtypes.Head)
 	sub, err := n.EthSubscribe(n.nodeCtx, headsC, "newHeads")
@@ -137,7 +139,7 @@ func (n *node) aliveLoop() {
 		case <-pollCh:
 			var version string
 			promEVMPoolRPCNodePolls.WithLabelValues(n.chainID.String(), n.name).Inc()
-			lggr.Tracew("Polling for version", "nodeState", n.State(), "pollFailures", pollFailures)
+			logger.Tracew(lggr, "Polling for version", "nodeState", n.State(), "pollFailures", pollFailures)
 			ctx, cancel := context.WithTimeout(n.nodeCtx, pollInterval)
 			ctx, cancel2 := n.makeQueryCtx(ctx)
 			err := n.CallContext(ctx, &version, "web3_clientVersion")
@@ -159,7 +161,7 @@ func (n *node) aliveLoop() {
 				lggr.Errorw(fmt.Sprintf("RPC endpoint failed to respond to %d consecutive polls", pollFailures), "pollFailures", pollFailures, "nodeState", n.State())
 				if n.nLiveNodes != nil {
 					if l, _, _ := n.nLiveNodes(); l < 2 {
-						lggr.Criticalf("RPC endpoint failed to respond to polls; %s %s", msgCannotDisable, msgDegradedState)
+						logger.Criticalf(lggr, "RPC endpoint failed to respond to polls; %s %s", msgCannotDisable, msgDegradedState)
 						continue
 					}
 				}
@@ -171,7 +173,7 @@ func (n *node) aliveLoop() {
 				// note: there must be another live node for us to be out of sync
 				lggr.Errorw("RPC endpoint has fallen behind", "blockNumber", num, "totalDifficulty", td, "nodeState", n.State())
 				if liveNodes < 2 {
-					lggr.Criticalf("RPC endpoint has fallen behind; %s %s", msgCannotDisable, msgDegradedState)
+					logger.Criticalf(lggr, "RPC endpoint has fallen behind; %s %s", msgCannotDisable, msgDegradedState)
 					continue
 				}
 				n.declareOutOfSync(n.isOutOfSync)
@@ -184,13 +186,13 @@ func (n *node) aliveLoop() {
 				return
 			}
 			promEVMPoolRPCNodeNumSeenBlocks.WithLabelValues(n.chainID.String(), n.name).Inc()
-			lggr.Tracew("Got head", "head", bh)
+			logger.Tracew(lggr, "Got head", "head", bh)
 			if bh.Number > highestReceivedBlockNumber {
 				promEVMPoolRPCNodeHighestSeenBlock.WithLabelValues(n.chainID.String(), n.name).Set(float64(bh.Number))
-				lggr.Tracew("Got higher block number, resetting timer", "latestReceivedBlockNumber", highestReceivedBlockNumber, "blockNumber", bh.Number, "nodeState", n.State())
+				logger.Tracew(lggr, "Got higher block number, resetting timer", "latestReceivedBlockNumber", highestReceivedBlockNumber, "blockNumber", bh.Number, "nodeState", n.State())
 				highestReceivedBlockNumber = bh.Number
 			} else {
-				lggr.Tracew("Ignoring previously seen block number", "latestReceivedBlockNumber", highestReceivedBlockNumber, "blockNumber", bh.Number, "nodeState", n.State())
+				logger.Tracew(lggr, "Ignoring previously seen block number", "latestReceivedBlockNumber", highestReceivedBlockNumber, "blockNumber", bh.Number, "nodeState", n.State())
 			}
 			if outOfSyncT != nil {
 				outOfSyncT.Reset(noNewHeadsTimeoutThreshold)
@@ -206,7 +208,7 @@ func (n *node) aliveLoop() {
 			lggr.Errorw(fmt.Sprintf("RPC endpoint detected out of sync; no new heads received for %s (last head received was %v)", noNewHeadsTimeoutThreshold, highestReceivedBlockNumber), "nodeState", n.State(), "latestReceivedBlockNumber", highestReceivedBlockNumber, "noNewHeadsTimeoutThreshold", noNewHeadsTimeoutThreshold)
 			if n.nLiveNodes != nil {
 				if l, _, _ := n.nLiveNodes(); l < 2 {
-					lggr.Criticalf("RPC endpoint detected out of sync; %s %s", msgCannotDisable, msgDegradedState)
+					logger.Criticalf(lggr, "RPC endpoint detected out of sync; %s %s", msgCannotDisable, msgDegradedState)
 					// We don't necessarily want to wait the full timeout to check again, we should
 					// check regularly and log noisily in this state
 					outOfSyncT.Reset(zombieNodeCheckInterval(n.noNewHeadsThreshold))
@@ -272,7 +274,7 @@ func (n *node) outOfSyncLoop(isOutOfSync func(num int64, td *utils.Big) bool) {
 
 	outOfSyncAt := time.Now()
 
-	lggr := n.lfcLog.Named("OutOfSync")
+	lggr := logger.Named(n.lfcLog, "OutOfSync")
 	lggr.Debugw("Trying to revive out-of-sync RPC node", "nodeState", n.State())
 
 	// Need to redial since out-of-sync nodes are automatically disconnected
@@ -289,7 +291,7 @@ func (n *node) outOfSyncLoop(isOutOfSync func(num int64, td *utils.Big) bool) {
 		return
 	}
 
-	lggr.Tracew("Successfully subscribed to heads feed on out-of-sync RPC node", "nodeState", n.State())
+	logger.Tracew(lggr, "Successfully subscribed to heads feed on out-of-sync RPC node", "nodeState", n.State())
 
 	ch := make(chan *evmtypes.Head)
 	subCtx, cancel := n.makeQueryCtx(n.nodeCtx)
@@ -324,7 +326,7 @@ func (n *node) outOfSyncLoop(isOutOfSync func(num int64, td *utils.Big) bool) {
 		case <-time.After(zombieNodeCheckInterval(n.noNewHeadsThreshold)):
 			if n.nLiveNodes != nil {
 				if l, _, _ := n.nLiveNodes(); l < 1 {
-					lggr.Critical("RPC endpoint is still out of sync, but there are no other available nodes. This RPC node will be forcibly moved back into the live pool in a degraded state")
+					logger.Critical(lggr, "RPC endpoint is still out of sync, but there are no other available nodes. This RPC node will be forcibly moved back into the live pool in a degraded state")
 					n.declareInSync()
 					return
 				}
@@ -354,7 +356,7 @@ func (n *node) unreachableLoop() {
 
 	unreachableAt := time.Now()
 
-	lggr := n.lfcLog.Named("Unreachable")
+	lggr := logger.Named(n.lfcLog, "Unreachable")
 	lggr.Debugw("Trying to revive unreachable RPC node", "nodeState", n.State())
 
 	dialRetryBackoff := utils.NewRedialBackoff()
@@ -364,7 +366,7 @@ func (n *node) unreachableLoop() {
 		case <-n.nodeCtx.Done():
 			return
 		case <-time.After(dialRetryBackoff.Duration()):
-			lggr.Tracew("Trying to re-dial RPC node", "nodeState", n.State())
+			logger.Tracew(lggr, "Trying to re-dial RPC node", "nodeState", n.State())
 
 			err := n.dial(n.nodeCtx)
 			if err != nil {
@@ -410,7 +412,7 @@ func (n *node) invalidChainIDLoop() {
 
 	invalidAt := time.Now()
 
-	lggr := n.lfcLog.Named("InvalidChainID")
+	lggr := logger.Named(n.lfcLog, "InvalidChainID")
 	lggr.Debugw(fmt.Sprintf("Periodically re-checking RPC node %s with invalid chain ID", n.String()), "nodeState", n.State())
 
 	chainIDRecheckBackoff := utils.NewRedialBackoff()
diff --git a/core/chains/evm/client/node_lifecycle_test.go b/core/chains/evm/client/node_lifecycle_test.go
index 05b8af13ec5..42f813cc2b5 100644
--- a/core/chains/evm/client/node_lifecycle_test.go
+++ b/core/chains/evm/client/node_lifecycle_test.go
@@ -12,10 +12,10 @@ import (
 	"github.com/tidwall/gjson"
 	"go.uber.org/zap"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -34,7 +34,7 @@ func newTestNode(t *testing.T, cfg config.NodePool, noNewHeadsThresholds time.Du
 
 func newTestNodeWithCallback(t *testing.T, cfg config.NodePool, noNewHeadsThreshold time.Duration, callback testutils.JSONRPCHandler) *node {
 	s := testutils.NewWSServer(t, testutils.FixtureChainID, callback)
-	iN := NewNode(cfg, noNewHeadsThreshold, logger.TestLogger(t), *s.WSURL(), nil, "test node", 42, testutils.FixtureChainID, 1)
+	iN := NewNode(cfg, noNewHeadsThreshold, logger.Test(t), *s.WSURL(), nil, "test node", 42, testutils.FixtureChainID, 1)
 	n := iN.(*node)
 	return n
 }
@@ -222,7 +222,7 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 				return
 			})
 
-		iN := NewNode(cfg, testutils.WaitTimeout(t), logger.TestLogger(t), *s.WSURL(), nil, "test node", 42, testutils.FixtureChainID, 1)
+		iN := NewNode(cfg, testutils.WaitTimeout(t), logger.Test(t), *s.WSURL(), nil, "test node", 42, testutils.FixtureChainID, 1)
 		n := iN.(*node)
 
 		dial(t, n)
@@ -268,7 +268,7 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 				return
 			})
 
-		iN := NewNode(cfg, 1*time.Second, logger.TestLogger(t), *s.WSURL(), nil, "test node", 42, testutils.FixtureChainID, 1)
+		iN := NewNode(cfg, 1*time.Second, logger.Test(t), *s.WSURL(), nil, "test node", 42, testutils.FixtureChainID, 1)
 		n := iN.(*node)
 
 		dial(t, n)
@@ -288,7 +288,7 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 	})
 
 	t.Run("when no new heads received for threshold but we are the last live node, forcibly stays alive", func(t *testing.T) {
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.ErrorLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.ErrorLevel)
 		pollDisabledCfg := TestNodePoolConfig{}
 		s := testutils.NewWSServer(t, testutils.FixtureChainID,
 			func(method string, params gjson.Result) (resp testutils.JSONRPCResponse) {
@@ -351,7 +351,7 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 				return
 			})
 
-		iN := NewNode(cfg, 0*time.Second, logger.TestLogger(t), *s.WSURL(), nil, "test node", 42, testutils.FixtureChainID, 1)
+		iN := NewNode(cfg, 0*time.Second, logger.Test(t), *s.WSURL(), nil, "test node", 42, testutils.FixtureChainID, 1)
 		n := iN.(*node)
 		n.nLiveNodes = func() (count int, blockNumber int64, totalDifficulty *utils.Big) {
 			return 2, highestHead.Load(), nil
@@ -413,7 +413,7 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 				return
 			})
 
-		iN := NewNode(cfg, 0*time.Second, logger.TestLogger(t), *s.WSURL(), nil, "test node", 42, testutils.FixtureChainID, 1)
+		iN := NewNode(cfg, 0*time.Second, logger.Test(t), *s.WSURL(), nil, "test node", 42, testutils.FixtureChainID, 1)
 		n := iN.(*node)
 		n.nLiveNodes = func() (count int, blockNumber int64, totalDifficulty *utils.Big) {
 			return 2, highestHead.Load(), nil
@@ -439,7 +439,7 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 	})
 
 	t.Run("when behind more than SyncThreshold but we are the last live node, forcibly stays alive", func(t *testing.T) {
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.ErrorLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.ErrorLevel)
 		cfg := TestNodePoolConfig{NodeSyncThreshold: 5, NodePollFailureThreshold: 2, NodePollInterval: 100 * time.Millisecond, NodeSelectionMode: NodeSelectionMode_HighestHead}
 		chSubbed := make(chan struct{}, 1)
 		var highestHead atomic.Int64
@@ -557,7 +557,7 @@ func TestUnit_NodeLifecycle_outOfSyncLoop(t *testing.T) {
 				return
 			})
 
-		iN := NewNode(cfg, time.Duration(time.Second), logger.TestLogger(t), *s.WSURL(), nil, "test node", 42, testutils.FixtureChainID, 1)
+		iN := NewNode(cfg, time.Duration(time.Second), logger.Test(t), *s.WSURL(), nil, "test node", 42, testutils.FixtureChainID, 1)
 		n := iN.(*node)
 
 		dial(t, n)
@@ -584,7 +584,7 @@ func TestUnit_NodeLifecycle_outOfSyncLoop(t *testing.T) {
 		// NoNewHeadsThreshold needs to be positive but must be very large so
 		// we don't time out waiting for a new head before we have a chance to
 		// handle the server disconnect
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.DebugLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.DebugLevel)
 		cfg := TestNodePoolConfig{}
 		chSubbed := make(chan struct{}, 1)
 		s := testutils.NewWSServer(t, testutils.FixtureChainID,
@@ -638,7 +638,7 @@ func TestUnit_NodeLifecycle_outOfSyncLoop(t *testing.T) {
 	})
 
 	t.Run("transitions to alive if back in-sync", func(t *testing.T) {
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.DebugLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.DebugLevel)
 		cfg := TestNodePoolConfig{NodeSyncThreshold: 5, NodeSelectionMode: NodeSelectionMode_HighestHead}
 		chSubbed := make(chan struct{}, 1)
 		const stall = 42
@@ -715,7 +715,7 @@ func TestUnit_NodeLifecycle_outOfSyncLoop(t *testing.T) {
 				return
 			})
 
-		iN := NewNode(cfg, testutils.TestInterval, logger.TestLogger(t), *s.WSURL(), nil, "test node", 42, testutils.FixtureChainID, 1)
+		iN := NewNode(cfg, testutils.TestInterval, logger.Test(t), *s.WSURL(), nil, "test node", 42, testutils.FixtureChainID, 1)
 		n := iN.(*node)
 		n.nLiveNodes = func() (int, int64, *utils.Big) { return 0, 0, nil }
 
@@ -771,7 +771,7 @@ func TestUnit_NodeLifecycle_unreachableLoop(t *testing.T) {
 	t.Run("on successful redial but failed verify, transitions to invalid chain ID", func(t *testing.T) {
 		cfg := TestNodePoolConfig{}
 		s := testutils.NewWSServer(t, testutils.FixtureChainID, standardHandler)
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.ErrorLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.ErrorLevel)
 		iN := NewNode(cfg, time.Second*0, lggr, *s.WSURL(), nil, "test node", 0, big.NewInt(42), 1)
 		n := iN.(*node)
 		defer func() { assert.NoError(t, n.Close()) }()
@@ -790,7 +790,7 @@ func TestUnit_NodeLifecycle_unreachableLoop(t *testing.T) {
 
 	t.Run("on failed redial, keeps trying to redial", func(t *testing.T) {
 		cfg := TestNodePoolConfig{}
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.DebugLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.DebugLevel)
 		iN := NewNode(cfg, time.Second*0, lggr, *testutils.MustParseURL(t, "ws://test.invalid"), nil, "test node", 0, big.NewInt(42), 1)
 		n := iN.(*node)
 		defer func() { assert.NoError(t, n.Close()) }()
@@ -842,7 +842,7 @@ func TestUnit_NodeLifecycle_invalidChainIDLoop(t *testing.T) {
 	t.Run("on failed verify, keeps checking", func(t *testing.T) {
 		cfg := TestNodePoolConfig{}
 		s := testutils.NewWSServer(t, testutils.FixtureChainID, standardHandler)
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.ErrorLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.ErrorLevel)
 		iN := NewNode(cfg, time.Second*0, lggr, *s.WSURL(), nil, "test node", 0, big.NewInt(42), 1)
 		n := iN.(*node)
 		defer func() { assert.NoError(t, n.Close()) }()
diff --git a/core/chains/evm/client/null_client.go b/core/chains/evm/client/null_client.go
index e25fed6d964..e3bb1defd0d 100644
--- a/core/chains/evm/client/null_client.go
+++ b/core/chains/evm/client/null_client.go
@@ -10,9 +10,9 @@ import (
 	"github.com/ethereum/go-ethereum/rpc"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/assets"
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	commonclient "github.com/smartcontractkit/chainlink/v2/common/client"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 // NullClient satisfies the Client but has no side effects
@@ -22,7 +22,7 @@ type NullClient struct {
 }
 
 func NewNullClient(cid *big.Int, lggr logger.Logger) *NullClient {
-	return &NullClient{cid: cid, lggr: lggr.Named("NullClient")}
+	return &NullClient{cid: cid, lggr: logger.Named(lggr, "NullClient")}
 }
 
 // NullClientChainID the ChainID that nullclient will return
@@ -72,7 +72,7 @@ type nullSubscription struct {
 }
 
 func newNullSubscription(lggr logger.Logger) *nullSubscription {
-	return &nullSubscription{lggr: lggr.Named("NullSubscription")}
+	return &nullSubscription{lggr: logger.Named(lggr, "NullSubscription")}
 }
 
 func (ns *nullSubscription) Unsubscribe() {
diff --git a/core/chains/evm/client/null_client_test.go b/core/chains/evm/client/null_client_test.go
index 6b0f6e3d1b9..8f4ebd91c97 100644
--- a/core/chains/evm/client/null_client_test.go
+++ b/core/chains/evm/client/null_client_test.go
@@ -11,17 +11,17 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zapcore"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 func TestNullClient(t *testing.T) {
 	t.Parallel()
 
 	t.Run("chain id", func(t *testing.T) {
-		lggr := logger.TestLogger(t)
+		lggr := logger.Test(t)
 		cid := big.NewInt(123)
 		nc := client.NewNullClient(cid, lggr)
 		require.Equal(t, cid, nc.ConfiguredChainID())
@@ -31,7 +31,7 @@ func TestNullClient(t *testing.T) {
 	})
 
 	t.Run("CL client methods", func(t *testing.T) {
-		lggr, logs := logger.TestLoggerObserved(t, zapcore.DebugLevel)
+		lggr, logs := logger.TestObserved(t, zapcore.DebugLevel)
 		nc := client.NewNullClient(nil, lggr)
 		ctx := testutils.Context(t)
 
@@ -77,7 +77,7 @@ func TestNullClient(t *testing.T) {
 	})
 
 	t.Run("Geth client methods", func(t *testing.T) {
-		lggr, logs := logger.TestLoggerObserved(t, zapcore.DebugLevel)
+		lggr, logs := logger.TestObserved(t, zapcore.DebugLevel)
 		nc := client.NewNullClient(nil, lggr)
 		ctx := testutils.Context(t)
 
diff --git a/core/chains/evm/client/pool.go b/core/chains/evm/client/pool.go
index 289a402a1c6..ab190f8c6aa 100644
--- a/core/chains/evm/client/pool.go
+++ b/core/chains/evm/client/pool.go
@@ -15,11 +15,11 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
 	"github.com/smartcontractkit/chainlink/v2/common/config"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -76,7 +76,7 @@ type Pool struct {
 	wg     sync.WaitGroup
 }
 
-func NewPool(logger logger.Logger, selectionMode string, leaseDuration time.Duration, noNewHeadsTreshold time.Duration, nodes []Node, sendonlys []SendOnlyNode, chainID *big.Int, chainType config.ChainType) *Pool {
+func NewPool(lggr logger.Logger, selectionMode string, leaseDuration time.Duration, noNewHeadsTreshold time.Duration, nodes []Node, sendonlys []SendOnlyNode, chainID *big.Int, chainType config.ChainType) *Pool {
 	if chainID == nil {
 		panic("chainID is required")
 	}
@@ -96,7 +96,8 @@ func NewPool(logger logger.Logger, selectionMode string, leaseDuration time.Dura
 		}
 	}()
 
-	lggr := logger.Named("Pool").With("evmChainID", chainID.String())
+	lggr = logger.Named(lggr, "Pool")
+	lggr = logger.With(lggr, "evmChainID", chainID.String())
 
 	p := &Pool{
 		nodes:               nodes,
@@ -262,10 +263,10 @@ func (p *Pool) report() {
 	}
 
 	live := total - dead
-	p.logger.Tracew(fmt.Sprintf("Pool state: %d/%d nodes are alive", live, total), "nodeStates", nodeStates)
+	logger.Tracew(p.logger, fmt.Sprintf("Pool state: %d/%d nodes are alive", live, total), "nodeStates", nodeStates)
 	if total == dead {
 		rerr := fmt.Errorf("no EVM primary nodes available: 0/%d nodes are alive", total)
-		p.logger.Criticalw(rerr.Error(), "nodeStates", nodeStates)
+		logger.Criticalw(p.logger, rerr.Error(), "nodeStates", nodeStates)
 		p.SvcErrBuffer.Append(rerr)
 	} else if dead > 0 {
 		p.logger.Errorw(fmt.Sprintf("At least one EVM primary node is dead: %d/%d nodes are alive", live, total), "nodeStates", nodeStates)
@@ -310,7 +311,7 @@ func (p *Pool) selectNode() (node Node) {
 	p.activeNode = p.nodeSelector.Select()
 
 	if p.activeNode == nil {
-		p.logger.Criticalw("No live RPC nodes available", "NodeSelectionMode", p.nodeSelector.Name())
+		logger.Criticalw(p.logger, "No live RPC nodes available", "NodeSelectionMode", p.nodeSelector.Name())
 		errmsg := fmt.Errorf("no live nodes available for chain %s", p.chainID.String())
 		p.SvcErrBuffer.Append(errmsg)
 		return &erroringNode{errMsg: errmsg.Error()}
@@ -357,7 +358,7 @@ func (p *Pool) BatchCallContextAll(ctx context.Context, b []rpc.BatchElem) error
 			if err != nil {
 				p.logger.Debugw("Secondary node BatchCallContext failed", "err", err)
 			} else {
-				p.logger.Trace("Secondary node BatchCallContext success")
+				logger.Trace(p.logger, "Secondary node BatchCallContext success")
 			}
 		}(n)
 	}
diff --git a/core/chains/evm/client/pool_test.go b/core/chains/evm/client/pool_test.go
index 75d38d01a4f..462aeed43ee 100644
--- a/core/chains/evm/client/pool_test.go
+++ b/core/chains/evm/client/pool_test.go
@@ -18,11 +18,11 @@ import (
 	"github.com/tidwall/gjson"
 	"go.uber.org/zap"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmmocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 type poolConfig struct {
@@ -164,7 +164,7 @@ func TestPool_Dial(t *testing.T) {
 			for i, n := range test.sendNodes {
 				sendNodes[i] = n.newSendOnlyNode(t, test.sendNodeChainID)
 			}
-			p := evmclient.NewPool(logger.TestLogger(t), defaultConfig.NodeSelectionMode(), defaultConfig.LeaseDuration(), time.Second*0, nodes, sendNodes, test.poolChainID, "")
+			p := evmclient.NewPool(logger.Test(t), defaultConfig.NodeSelectionMode(), defaultConfig.LeaseDuration(), time.Second*0, nodes, sendNodes, test.poolChainID, "")
 			err := p.Dial(ctx)
 			if err == nil {
 				t.Cleanup(func() { assert.NoError(t, p.Close()) })
@@ -188,7 +188,7 @@ type chainIDResp struct {
 
 func (r *chainIDResp) newSendOnlyNode(t *testing.T, nodeChainID int64) evmclient.SendOnlyNode {
 	httpURL := r.newHTTPServer(t)
-	return evmclient.NewSendOnlyNode(logger.TestLogger(t), *httpURL, t.Name(), big.NewInt(nodeChainID))
+	return evmclient.NewSendOnlyNode(logger.Test(t), *httpURL, t.Name(), big.NewInt(nodeChainID))
 }
 
 func (r *chainIDResp) newHTTPServer(t *testing.T) *url.URL {
@@ -234,7 +234,7 @@ func (r *chainIDResps) newNode(t *testing.T, nodeChainID int64) evmclient.Node {
 	}
 
 	defer func() { r.id++ }()
-	return evmclient.NewNode(evmclient.TestNodePoolConfig{}, time.Second*0, logger.TestLogger(t), *wsURL, httpURL, t.Name(), r.id, big.NewInt(nodeChainID), 0)
+	return evmclient.NewNode(evmclient.TestNodePoolConfig{}, time.Second*0, logger.Test(t), *wsURL, httpURL, t.Name(), r.id, big.NewInt(nodeChainID), 0)
 }
 
 type chainIDService struct {
@@ -256,7 +256,7 @@ func TestUnit_Pool_RunLoop(t *testing.T) {
 	n3 := evmmocks.NewNode(t)
 	nodes := []evmclient.Node{n1, n2, n3}
 
-	lggr, observedLogs := logger.TestLoggerObserved(t, zap.ErrorLevel)
+	lggr, observedLogs := logger.TestObserved(t, zap.ErrorLevel)
 	p := evmclient.NewPool(lggr, defaultConfig.NodeSelectionMode(), defaultConfig.LeaseDuration(), time.Second*0, nodes, []evmclient.SendOnlyNode{}, &cltest.FixtureChainID, "")
 
 	n1.On("String").Maybe().Return("n1")
@@ -331,7 +331,7 @@ func TestUnit_Pool_BatchCallContextAll(t *testing.T) {
 		sendonlys = append(sendonlys, s)
 	}
 
-	p := evmclient.NewPool(logger.TestLogger(t), defaultConfig.NodeSelectionMode(), defaultConfig.LeaseDuration(), time.Second*0, nodes, sendonlys, &cltest.FixtureChainID, "")
+	p := evmclient.NewPool(logger.Test(t), defaultConfig.NodeSelectionMode(), defaultConfig.LeaseDuration(), time.Second*0, nodes, sendonlys, &cltest.FixtureChainID, "")
 
 	assert.True(t, p.ChainType().IsValid())
 	assert.False(t, p.ChainType().IsL2())
@@ -378,7 +378,7 @@ func TestUnit_Pool_LeaseDuration(t *testing.T) {
 	n2.On("Order").Return(int32(2))
 	n2.On("ChainID").Return(testutils.FixtureChainID).Once()
 
-	lggr, observedLogs := logger.TestLoggerObserved(t, zap.InfoLevel)
+	lggr, observedLogs := logger.TestObserved(t, zap.InfoLevel)
 	p := evmclient.NewPool(lggr, "PriorityLevel", time.Second*2, time.Second*0, nodes, []evmclient.SendOnlyNode{}, &cltest.FixtureChainID, "")
 	require.NoError(t, p.Dial(testutils.Context(t)))
 	t.Cleanup(func() { assert.NoError(t, p.Close()) })
diff --git a/core/chains/evm/client/rpc_client.go b/core/chains/evm/client/rpc_client.go
index 785acbb2b7d..fc9c348a572 100644
--- a/core/chains/evm/client/rpc_client.go
+++ b/core/chains/evm/client/rpc_client.go
@@ -18,11 +18,12 @@ import (
 	"github.com/pkg/errors"
 
 	commonassets "github.com/smartcontractkit/chainlink-common/pkg/assets"
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+
 	commonclient "github.com/smartcontractkit/chainlink/v2/common/client"
 	commontypes "github.com/smartcontractkit/chainlink/v2/common/types"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -97,13 +98,14 @@ func NewRPCClient(
 		r.http = &rawclient{uri: *httpuri}
 	}
 	r.chStopInFlight = make(chan struct{})
-	lggr = lggr.Named("Client").With(
+	lggr = logger.Named(lggr, "Client")
+	lggr = logger.With(lggr,
 		"clientTier", tier.String(),
 		"clientName", name,
 		"client", r.String(),
 		"evmChainID", chainID,
 	)
-	r.rpcLog = lggr.Named("RPC")
+	r.rpcLog = logger.Named(lggr, "RPC")
 
 	return r
 }
@@ -114,9 +116,9 @@ func (r *rpcClient) Dial(callerCtx context.Context) error {
 	defer cancel()
 
 	promEVMPoolRPCNodeDials.WithLabelValues(r.chainID.String(), r.name).Inc()
-	lggr := r.rpcLog.With("wsuri", r.ws.uri.Redacted())
+	lggr := logger.With(r.rpcLog, "wsuri", r.ws.uri.Redacted())
 	if r.http != nil {
-		lggr = lggr.With("httpuri", r.http.uri.Redacted())
+		lggr = logger.With(lggr, "httpuri", r.http.uri.Redacted())
 	}
 	lggr.Debugw("RPC dial: evmclient.Client#dial")
 
@@ -145,7 +147,7 @@ func (r *rpcClient) Dial(callerCtx context.Context) error {
 // It can only return error if the URL is malformed.
 func (r *rpcClient) DialHTTP() error {
 	promEVMPoolRPCNodeDials.WithLabelValues(r.chainID.String(), r.name).Inc()
-	lggr := r.rpcLog.With("httpuri", r.ws.uri.Redacted())
+	lggr := logger.With(r.rpcLog, "httpuri", r.ws.uri.Redacted())
 	lggr.Debugw("RPC dial: evmclient.Client#dial")
 
 	var httprpc *rpc.Client
@@ -199,11 +201,11 @@ func (r *rpcClient) logResult(
 	callName string,
 	results ...interface{},
 ) {
-	lggr = lggr.With("duration", callDuration, "rpcDomain", rpcDomain, "callName", callName)
+	lggr = logger.With(lggr, "duration", callDuration, "rpcDomain", rpcDomain, "callName", callName)
 	promEVMPoolRPCNodeCalls.WithLabelValues(r.chainID.String(), r.name).Inc()
 	if err == nil {
 		promEVMPoolRPCNodeCallsSuccess.WithLabelValues(r.chainID.String(), r.name).Inc()
-		lggr.Tracew(
+		logger.Tracew(lggr,
 			fmt.Sprintf("evmclient.Client#%s RPC call success", callName),
 			results...,
 		)
@@ -296,7 +298,7 @@ func (r *rpcClient) CallContext(ctx context.Context, result interface{}, method
 		return err
 	}
 	defer cancel()
-	lggr := r.newRqLggr().With(
+	lggr := logger.With(r.newRqLggr(),
 		"method", method,
 		"args", args,
 	)
@@ -325,9 +327,9 @@ func (r *rpcClient) BatchCallContext(ctx context.Context, b []any) error {
 		batch[i] = arg.(rpc.BatchElem)
 	}
 	defer cancel()
-	lggr := r.newRqLggr().With("nBatchElems", len(b), "batchElems", b)
+	lggr := logger.With(r.newRqLggr(), "nBatchElems", len(b), "batchElems", b)
 
-	lggr.Trace("RPC call: evmclient.Client#BatchCallContext")
+	logger.Trace(lggr, "RPC call: evmclient.Client#BatchCallContext")
 	start := time.Now()
 	if http != nil {
 		err = r.wrapHTTP(http.rpc.BatchCallContext(ctx, batch))
@@ -347,7 +349,7 @@ func (r *rpcClient) Subscribe(ctx context.Context, channel chan<- *evmtypes.Head
 		return nil, err
 	}
 	defer cancel()
-	lggr := r.newRqLggr().With("args", args)
+	lggr := logger.With(r.newRqLggr(), "args", args)
 
 	lggr.Debug("RPC call: evmclient.Client#EthSubscribe")
 	start := time.Now()
@@ -382,7 +384,7 @@ func (r *rpcClient) TransactionReceiptGeth(ctx context.Context, txHash common.Ha
 		return nil, err
 	}
 	defer cancel()
-	lggr := r.newRqLggr().With("txHash", txHash)
+	lggr := logger.With(r.newRqLggr(), "txHash", txHash)
 
 	lggr.Debug("RPC call: evmclient.Client#TransactionReceipt")
 
@@ -408,7 +410,7 @@ func (r *rpcClient) TransactionByHash(ctx context.Context, txHash common.Hash) (
 		return nil, err
 	}
 	defer cancel()
-	lggr := r.newRqLggr().With("txHash", txHash)
+	lggr := logger.With(r.newRqLggr(), "txHash", txHash)
 
 	lggr.Debug("RPC call: evmclient.Client#TransactionByHash")
 
@@ -435,7 +437,7 @@ func (r *rpcClient) HeaderByNumber(ctx context.Context, number *big.Int) (header
 		return nil, err
 	}
 	defer cancel()
-	lggr := r.newRqLggr().With("number", number)
+	lggr := logger.With(r.newRqLggr(), "number", number)
 
 	lggr.Debug("RPC call: evmclient.Client#HeaderByNumber")
 	start := time.Now()
@@ -459,7 +461,7 @@ func (r *rpcClient) HeaderByHash(ctx context.Context, hash common.Hash) (header
 		return nil, err
 	}
 	defer cancel()
-	lggr := r.newRqLggr().With("hash", hash)
+	lggr := logger.With(r.newRqLggr(), "hash", hash)
 
 	lggr.Debug("RPC call: evmclient.Client#HeaderByHash")
 	start := time.Now()
@@ -512,7 +514,7 @@ func (r *rpcClient) BlockByHashGeth(ctx context.Context, hash common.Hash) (bloc
 		return nil, err
 	}
 	defer cancel()
-	lggr := r.newRqLggr().With("hash", hash)
+	lggr := logger.With(r.newRqLggr(), "hash", hash)
 
 	lggr.Debug("RPC call: evmclient.Client#BlockByHash")
 	start := time.Now()
@@ -538,7 +540,7 @@ func (r *rpcClient) BlockByNumberGeth(ctx context.Context, number *big.Int) (blo
 		return nil, err
 	}
 	defer cancel()
-	lggr := r.newRqLggr().With("number", number)
+	lggr := logger.With(r.newRqLggr(), "number", number)
 
 	lggr.Debug("RPC call: evmclient.Client#BlockByNumber")
 	start := time.Now()
@@ -564,7 +566,7 @@ func (r *rpcClient) SendTransaction(ctx context.Context, tx *types.Transaction)
 		return err
 	}
 	defer cancel()
-	lggr := r.newRqLggr().With("tx", tx)
+	lggr := logger.With(r.newRqLggr(), "tx", tx)
 
 	lggr.Debug("RPC call: evmclient.Client#SendTransaction")
 	start := time.Now()
@@ -604,7 +606,7 @@ func (r *rpcClient) PendingSequenceAt(ctx context.Context, account common.Addres
 		return 0, err
 	}
 	defer cancel()
-	lggr := r.newRqLggr().With("account", account)
+	lggr := logger.With(r.newRqLggr(), "account", account)
 
 	lggr.Debug("RPC call: evmclient.Client#PendingNonceAt")
 	start := time.Now()
@@ -636,7 +638,7 @@ func (r *rpcClient) SequenceAt(ctx context.Context, account common.Address, bloc
 		return 0, err
 	}
 	defer cancel()
-	lggr := r.newRqLggr().With("account", account, "blockNumber", blockNumber)
+	lggr := logger.With(r.newRqLggr(), "account", account, "blockNumber", blockNumber)
 
 	lggr.Debug("RPC call: evmclient.Client#NonceAt")
 	start := time.Now()
@@ -665,7 +667,7 @@ func (r *rpcClient) PendingCodeAt(ctx context.Context, account common.Address) (
 		return nil, err
 	}
 	defer cancel()
-	lggr := r.newRqLggr().With("account", account)
+	lggr := logger.With(r.newRqLggr(), "account", account)
 
 	lggr.Debug("RPC call: evmclient.Client#PendingCodeAt")
 	start := time.Now()
@@ -691,7 +693,7 @@ func (r *rpcClient) CodeAt(ctx context.Context, account common.Address, blockNum
 		return nil, err
 	}
 	defer cancel()
-	lggr := r.newRqLggr().With("account", account, "blockNumber", blockNumber)
+	lggr := logger.With(r.newRqLggr(), "account", account, "blockNumber", blockNumber)
 
 	lggr.Debug("RPC call: evmclient.Client#CodeAt")
 	start := time.Now()
@@ -718,7 +720,7 @@ func (r *rpcClient) EstimateGas(ctx context.Context, c interface{}) (gas uint64,
 	}
 	defer cancel()
 	call := c.(ethereum.CallMsg)
-	lggr := r.newRqLggr().With("call", call)
+	lggr := logger.With(r.newRqLggr(), "call", call)
 
 	lggr.Debug("RPC call: evmclient.Client#EstimateGas")
 	start := time.Now()
@@ -770,7 +772,7 @@ func (r *rpcClient) CallContract(ctx context.Context, msg interface{}, blockNumb
 		return nil, err
 	}
 	defer cancel()
-	lggr := r.newRqLggr().With("callMsg", msg, "blockNumber", blockNumber)
+	lggr := logger.With(r.newRqLggr(), "callMsg", msg, "blockNumber", blockNumber)
 	message := msg.(ethereum.CallMsg)
 
 	lggr.Debug("RPC call: evmclient.Client#CallContract")
@@ -830,7 +832,7 @@ func (r *rpcClient) BalanceAt(ctx context.Context, account common.Address, block
 		return nil, err
 	}
 	defer cancel()
-	lggr := r.newRqLggr().With("account", account.Hex(), "blockNumber", blockNumber)
+	lggr := logger.With(r.newRqLggr(), "account", account.Hex(), "blockNumber", blockNumber)
 
 	lggr.Debug("RPC call: evmclient.Client#BalanceAt")
 	start := time.Now()
@@ -887,7 +889,7 @@ func (r *rpcClient) FilterLogs(ctx context.Context, q ethereum.FilterQuery) (l [
 		return nil, err
 	}
 	defer cancel()
-	lggr := r.newRqLggr().With("q", q)
+	lggr := logger.With(r.newRqLggr(), "q", q)
 
 	lggr.Debug("RPC call: evmclient.Client#FilterLogs")
 	start := time.Now()
@@ -918,7 +920,7 @@ func (r *rpcClient) SubscribeFilterLogs(ctx context.Context, q ethereum.FilterQu
 		return nil, err
 	}
 	defer cancel()
-	lggr := r.newRqLggr().With("q", q)
+	lggr := logger.With(r.newRqLggr(), "q", q)
 
 	lggr.Debug("RPC call: evmclient.Client#SubscribeFilterLogs")
 	start := time.Now()
@@ -979,7 +981,7 @@ func (r *rpcClient) ChainID(ctx context.Context) (chainID *big.Int, err error) {
 
 // newRqLggr generates a new logger with a unique request ID
 func (r *rpcClient) newRqLggr() logger.Logger {
-	return r.rpcLog.With(
+	return logger.With(r.rpcLog,
 		"requestID", uuid.New(),
 	)
 }
@@ -1004,7 +1006,7 @@ func (r *rpcClient) wrapHTTP(err error) error {
 	if err != nil {
 		r.rpcLog.Debugw("Call failed", "err", err)
 	} else {
-		r.rpcLog.Trace("Call succeeded")
+		logger.Trace(r.rpcLog, "Call succeeded")
 	}
 	return err
 }
diff --git a/core/chains/evm/client/send_only_node.go b/core/chains/evm/client/send_only_node.go
index 02f04881c44..62a22ee1937 100644
--- a/core/chains/evm/client/send_only_node.go
+++ b/core/chains/evm/client/send_only_node.go
@@ -14,8 +14,8 @@ import (
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/rpc"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 //go:generate mockery --quiet --name SendOnlyNode --output ../mocks/ --case=underscore
@@ -76,7 +76,8 @@ type sendOnlyNode struct {
 func NewSendOnlyNode(lggr logger.Logger, httpuri url.URL, name string, chainID *big.Int) SendOnlyNode {
 	s := new(sendOnlyNode)
 	s.name = name
-	s.log = lggr.Named("SendOnlyNode").Named(name).With(
+	s.log = logger.Named(logger.Named(lggr, "SendOnlyNode"), name)
+	s.log = logger.With(s.log,
 		"nodeTier", "sendonly",
 	)
 	s.uri = httpuri
@@ -206,7 +207,7 @@ func (s *sendOnlyNode) SendTransaction(parentCtx context.Context, tx *types.Tran
 
 func (s *sendOnlyNode) BatchCallContext(parentCtx context.Context, b []rpc.BatchElem) (err error) {
 	defer func(start time.Time) {
-		s.logTiming(s.log.With("nBatchElems", len(b)), time.Since(start), err, "BatchCallContext")
+		s.logTiming(logger.With(s.log, "nBatchElems", len(b)), time.Since(start), err, "BatchCallContext")
 	}(time.Now())
 
 	ctx, cancel := s.makeQueryCtx(parentCtx)
diff --git a/core/chains/evm/client/send_only_node_test.go b/core/chains/evm/client/send_only_node_test.go
index 876ae9bc4da..760f7f4d3eb 100644
--- a/core/chains/evm/client/send_only_node_test.go
+++ b/core/chains/evm/client/send_only_node_test.go
@@ -16,13 +16,13 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 func TestNewSendOnlyNode(t *testing.T) {
@@ -32,7 +32,7 @@ func TestNewSendOnlyNode(t *testing.T) {
 	password := "pass"
 	url := testutils.MustParseURL(t, fmt.Sprintf(urlFormat, password))
 	redacted := fmt.Sprintf(urlFormat, "xxxxx")
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	name := "TestNewSendOnlyNode"
 	chainID := testutils.NewRandomEVMChainID()
 
@@ -52,7 +52,7 @@ func TestStartSendOnlyNode(t *testing.T) {
 		chainID := testutils.NewRandomEVMChainID()
 		r := chainIDResp{chainID.Int64(), nil}
 		url := r.newHTTPServer(t)
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.WarnLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.WarnLevel)
 		s := evmclient.NewSendOnlyNode(lggr, *url, t.Name(), chainID)
 		defer func() { assert.NoError(t, s.Close()) }()
 		err := s.Start(testutils.Context(t))
@@ -62,7 +62,7 @@ func TestStartSendOnlyNode(t *testing.T) {
 
 	t.Run("Start with ChainID=0", func(t *testing.T) {
 		t.Parallel()
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.WarnLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.WarnLevel)
 		chainID := testutils.FixtureChainID
 		r := chainIDResp{chainID.Int64(), nil}
 		url := r.newHTTPServer(t)
@@ -77,7 +77,7 @@ func TestStartSendOnlyNode(t *testing.T) {
 
 	t.Run("becomes unusable (and remains undialed) if initial dial fails", func(t *testing.T) {
 		t.Parallel()
-		lggr, observedLogs := logger.TestLoggerObserved(t, zap.WarnLevel)
+		lggr, observedLogs := logger.TestObserved(t, zap.WarnLevel)
 		invalidURL := url.URL{Scheme: "some rubbish", Host: "not a valid host"}
 		s := evmclient.NewSendOnlyNode(lggr, invalidURL, t.Name(), testutils.FixtureChainID)
 
@@ -109,7 +109,7 @@ func TestSendTransaction(t *testing.T) {
 	t.Parallel()
 
 	chainID := testutils.FixtureChainID
-	lggr, observedLogs := logger.TestLoggerObserved(t, zap.DebugLevel)
+	lggr, observedLogs := logger.TestObserved(t, zap.DebugLevel)
 	url := testutils.MustParseURL(t, "http://place.holder")
 	s := evmclient.NewSendOnlyNode(lggr,
 		*url,
@@ -135,7 +135,7 @@ func TestSendTransaction(t *testing.T) {
 func TestBatchCallContext(t *testing.T) {
 	t.Parallel()
 
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	chainID := testutils.FixtureChainID
 	url := testutils.MustParseURL(t, "http://place.holder")
 	s := evmclient.NewSendOnlyNode(
diff --git a/core/chains/evm/client/simulated_backend_client.go b/core/chains/evm/client/simulated_backend_client.go
index e922715eb9c..10b2aae502a 100644
--- a/core/chains/evm/client/simulated_backend_client.go
+++ b/core/chains/evm/client/simulated_backend_client.go
@@ -19,9 +19,10 @@ import (
 	"github.com/ethereum/go-ethereum/rpc"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/assets"
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+
 	commonclient "github.com/smartcontractkit/chainlink/v2/common/client"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -347,7 +348,7 @@ func (c *SimulatedBackendClient) SendTransactionReturnCode(ctx context.Context,
 func (c *SimulatedBackendClient) SendTransaction(ctx context.Context, tx *types.Transaction) error {
 	sender, err := types.Sender(types.NewLondonSigner(c.chainId), tx)
 	if err != nil {
-		logger.TestLogger(c.t).Panic(fmt.Errorf("invalid transaction: %v (tx: %#v)", err, tx))
+		logger.Test(c.t).Panic(fmt.Errorf("invalid transaction: %v (tx: %#v)", err, tx))
 	}
 	pendingNonce, err := c.b.PendingNonceAt(ctx, sender)
 	if err != nil {
diff --git a/core/chains/evm/config/chain_scoped.go b/core/chains/evm/config/chain_scoped.go
index 804c354e0ef..fb6df26b1ad 100644
--- a/core/chains/evm/config/chain_scoped.go
+++ b/core/chains/evm/config/chain_scoped.go
@@ -10,10 +10,11 @@ import (
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting/types"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/assets"
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+
 	commonconfig "github.com/smartcontractkit/chainlink/v2/common/config"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
 	"github.com/smartcontractkit/chainlink/v2/core/config"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 func NewTOMLChainScopedConfig(appCfg config.AppConfig, tomlConfig *toml.EVMConfig, lggr logger.Logger) *ChainScoped {
diff --git a/core/chains/evm/forwarders/forwarder_manager.go b/core/chains/evm/forwarders/forwarder_manager.go
index 819fb31951e..eaf0c32afe3 100644
--- a/core/chains/evm/forwarders/forwarder_manager.go
+++ b/core/chains/evm/forwarders/forwarder_manager.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/jmoiron/sqlx"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
@@ -20,7 +21,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/authorized_forwarder"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/authorized_receiver"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/offchain_aggregator_wrapper"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
@@ -56,7 +56,7 @@ type FwdMgr struct {
 }
 
 func NewFwdMgr(db *sqlx.DB, client evmclient.Client, logpoller evmlogpoller.LogPoller, l logger.Logger, cfg Config, dbConfig pg.QConfig) *FwdMgr {
-	lggr := logger.Sugared(l.Named("EVMForwarderManager"))
+	lggr := logger.Sugared(logger.Named(l, "EVMForwarderManager"))
 	fwdMgr := FwdMgr{
 		logger:       lggr,
 		cfg:          cfg,
diff --git a/core/chains/evm/forwarders/forwarder_manager_test.go b/core/chains/evm/forwarders/forwarder_manager_test.go
index 082d329e385..1da638e743d 100644
--- a/core/chains/evm/forwarders/forwarder_manager_test.go
+++ b/core/chains/evm/forwarders/forwarder_manager_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/forwarders"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
@@ -22,7 +23,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
@@ -32,7 +32,7 @@ var GetAuthorisedSendersABI = evmtypes.MustGetABI(authorized_receiver.Authorized
 var SimpleOracleCallABI = evmtypes.MustGetABI(operator_wrapper.OperatorABI).Methods["getChainlinkToken"]
 
 func TestFwdMgr_MaybeForwardTransaction(t *testing.T) {
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	db := pgtest.NewSqlxDB(t)
 	cfg := configtest.NewTestGeneralConfig(t)
 	evmcfg := evmtest.NewChainScopedConfig(t, cfg)
@@ -60,7 +60,7 @@ func TestFwdMgr_MaybeForwardTransaction(t *testing.T) {
 	evmClient := client.NewSimulatedBackendClient(t, ec, testutils.FixtureChainID)
 	lp := logpoller.NewLogPoller(logpoller.NewORM(testutils.FixtureChainID, db, lggr, pgtest.NewQConfig(true)), evmClient, lggr, 100*time.Millisecond, false, 2, 3, 2, 1000)
 	fwdMgr := forwarders.NewFwdMgr(db, evmClient, lp, lggr, evmcfg.EVM(), evmcfg.Database())
-	fwdMgr.ORM = forwarders.NewORM(db, logger.TestLogger(t), cfg.Database())
+	fwdMgr.ORM = forwarders.NewORM(db, logger.Test(t), cfg.Database())
 
 	fwd, err := fwdMgr.ORM.CreateForwarder(forwarderAddr, utils.Big(*testutils.FixtureChainID))
 	require.NoError(t, err)
@@ -91,7 +91,7 @@ func TestFwdMgr_MaybeForwardTransaction(t *testing.T) {
 }
 
 func TestFwdMgr_AccountUnauthorizedToForward_SkipsForwarding(t *testing.T) {
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	db := pgtest.NewSqlxDB(t)
 	cfg := configtest.NewTestGeneralConfig(t)
 	evmcfg := evmtest.NewChainScopedConfig(t, cfg)
@@ -113,7 +113,7 @@ func TestFwdMgr_AccountUnauthorizedToForward_SkipsForwarding(t *testing.T) {
 	evmClient := client.NewSimulatedBackendClient(t, ec, testutils.FixtureChainID)
 	lp := logpoller.NewLogPoller(logpoller.NewORM(testutils.FixtureChainID, db, lggr, pgtest.NewQConfig(true)), evmClient, lggr, 100*time.Millisecond, false, 2, 3, 2, 1000)
 	fwdMgr := forwarders.NewFwdMgr(db, evmClient, lp, lggr, evmcfg.EVM(), evmcfg.Database())
-	fwdMgr.ORM = forwarders.NewORM(db, logger.TestLogger(t), cfg.Database())
+	fwdMgr.ORM = forwarders.NewORM(db, logger.Test(t), cfg.Database())
 
 	_, err = fwdMgr.ORM.CreateForwarder(forwarderAddr, utils.Big(*testutils.FixtureChainID))
 	require.NoError(t, err)
diff --git a/core/chains/evm/forwarders/orm.go b/core/chains/evm/forwarders/orm.go
index df89dbe29e9..104e2574252 100644
--- a/core/chains/evm/forwarders/orm.go
+++ b/core/chains/evm/forwarders/orm.go
@@ -7,7 +7,7 @@ import (
 	"github.com/jmoiron/sqlx"
 	"github.com/pkg/errors"
 
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
diff --git a/core/chains/evm/forwarders/orm_test.go b/core/chains/evm/forwarders/orm_test.go
index f6d63dc574f..ba9664c196a 100644
--- a/core/chains/evm/forwarders/orm_test.go
+++ b/core/chains/evm/forwarders/orm_test.go
@@ -9,9 +9,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 
@@ -28,7 +28,7 @@ func setupORM(t *testing.T) *TestORM {
 
 	var (
 		db   = pgtest.NewSqlxDB(t)
-		lggr = logger.TestLogger(t)
+		lggr = logger.Test(t)
 		orm  = NewORM(db, lggr, pgtest.NewQConfig(true))
 	)
 
diff --git a/core/chains/evm/gas/arbitrum_estimator.go b/core/chains/evm/gas/arbitrum_estimator.go
index 480abfe721d..ee020f67002 100644
--- a/core/chains/evm/gas/arbitrum_estimator.go
+++ b/core/chains/evm/gas/arbitrum_estimator.go
@@ -13,12 +13,12 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/pkg/errors"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
 	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -53,7 +53,7 @@ type arbitrumEstimator struct {
 }
 
 func NewArbitrumEstimator(lggr logger.Logger, cfg ArbConfig, rpcClient rpcClient, ethClient ethClient) EvmEstimator {
-	lggr = lggr.Named("ArbitrumEstimator")
+	lggr = logger.Named(lggr, "ArbitrumEstimator")
 	return &arbitrumEstimator{
 		cfg:            cfg,
 		EvmEstimator:   NewSuggestedPriceEstimator(lggr, rpcClient),
diff --git a/core/chains/evm/gas/arbitrum_estimator_test.go b/core/chains/evm/gas/arbitrum_estimator_test.go
index 894b531dc97..53f81617988 100644
--- a/core/chains/evm/gas/arbitrum_estimator_test.go
+++ b/core/chains/evm/gas/arbitrum_estimator_test.go
@@ -14,11 +14,11 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 type arbConfig struct {
@@ -41,7 +41,7 @@ func TestArbitrumEstimator(t *testing.T) {
 	t.Run("calling GetLegacyGas on unstarted estimator returns error", func(t *testing.T) {
 		rpcClient := mocks.NewRPCClient(t)
 		ethClient := mocks.NewETHClient(t)
-		o := gas.NewArbitrumEstimator(logger.TestLogger(t), &arbConfig{}, rpcClient, ethClient)
+		o := gas.NewArbitrumEstimator(logger.Test(t), &arbConfig{}, rpcClient, ethClient)
 		_, _, err := o.GetLegacyGas(testutils.Context(t), calldata, gasLimit, maxGasPrice)
 		assert.EqualError(t, err, "estimator is not started")
 	})
@@ -65,7 +65,7 @@ func TestArbitrumEstimator(t *testing.T) {
 			assert.Equal(t, big.NewInt(-1), blockNumber)
 		}).Return(zeros.Bytes(), nil)
 
-		o := gas.NewArbitrumEstimator(logger.TestLogger(t), &arbConfig{v: maxGasLimit}, rpcClient, ethClient)
+		o := gas.NewArbitrumEstimator(logger.Test(t), &arbConfig{v: maxGasLimit}, rpcClient, ethClient)
 		require.NoError(t, o.Start(testutils.Context(t)))
 		t.Cleanup(func() { assert.NoError(t, o.Close()) })
 		gasPrice, chainSpecificGasLimit, err := o.GetLegacyGas(testutils.Context(t), calldata, gasLimit, maxGasPrice)
@@ -78,7 +78,7 @@ func TestArbitrumEstimator(t *testing.T) {
 	t.Run("gas price is lower than user specified max gas price", func(t *testing.T) {
 		client := mocks.NewRPCClient(t)
 		ethClient := mocks.NewETHClient(t)
-		o := gas.NewArbitrumEstimator(logger.TestLogger(t), &arbConfig{}, client, ethClient)
+		o := gas.NewArbitrumEstimator(logger.Test(t), &arbConfig{}, client, ethClient)
 
 		client.On("CallContext", mock.Anything, mock.Anything, "eth_gasPrice").Return(nil).Run(func(args mock.Arguments) {
 			res := args.Get(1).(*hexutil.Big)
@@ -104,7 +104,7 @@ func TestArbitrumEstimator(t *testing.T) {
 	t.Run("gas price is lower than global max gas price", func(t *testing.T) {
 		ethClient := mocks.NewETHClient(t)
 		client := mocks.NewRPCClient(t)
-		o := gas.NewArbitrumEstimator(logger.TestLogger(t), &arbConfig{}, client, ethClient)
+		o := gas.NewArbitrumEstimator(logger.Test(t), &arbConfig{}, client, ethClient)
 
 		client.On("CallContext", mock.Anything, mock.Anything, "eth_gasPrice").Return(nil).Run(func(args mock.Arguments) {
 			res := args.Get(1).(*hexutil.Big)
@@ -129,7 +129,7 @@ func TestArbitrumEstimator(t *testing.T) {
 	t.Run("calling BumpLegacyGas always returns error", func(t *testing.T) {
 		rpcClient := mocks.NewRPCClient(t)
 		ethClient := mocks.NewETHClient(t)
-		o := gas.NewArbitrumEstimator(logger.TestLogger(t), &arbConfig{}, rpcClient, ethClient)
+		o := gas.NewArbitrumEstimator(logger.Test(t), &arbConfig{}, rpcClient, ethClient)
 		_, _, err := o.BumpLegacyGas(testutils.Context(t), assets.NewWeiI(42), gasLimit, assets.NewWeiI(10), nil)
 		assert.EqualError(t, err, "bump gas is not supported for this chain")
 	})
@@ -137,7 +137,7 @@ func TestArbitrumEstimator(t *testing.T) {
 	t.Run("calling GetLegacyGas on started estimator if initial call failed returns error", func(t *testing.T) {
 		client := mocks.NewRPCClient(t)
 		ethClient := mocks.NewETHClient(t)
-		o := gas.NewArbitrumEstimator(logger.TestLogger(t), &arbConfig{}, client, ethClient)
+		o := gas.NewArbitrumEstimator(logger.Test(t), &arbConfig{}, client, ethClient)
 
 		client.On("CallContext", mock.Anything, mock.Anything, "eth_gasPrice").Return(errors.New("kaboom"))
 		ethClient.On("CallContract", mock.Anything, mock.IsType(ethereum.CallMsg{}), mock.IsType(&big.Int{})).Run(func(args mock.Arguments) {
@@ -180,7 +180,7 @@ func TestArbitrumEstimator(t *testing.T) {
 			assert.Equal(t, big.NewInt(-1), blockNumber)
 		}).Return(b.Bytes(), nil)
 
-		o := gas.NewArbitrumEstimator(logger.TestLogger(t), &arbConfig{v: maxGasLimit}, rpcClient, ethClient)
+		o := gas.NewArbitrumEstimator(logger.Test(t), &arbConfig{v: maxGasLimit}, rpcClient, ethClient)
 		require.NoError(t, o.Start(testutils.Context(t)))
 		t.Cleanup(func() { assert.NoError(t, o.Close()) })
 		gasPrice, chainSpecificGasLimit, err := o.GetLegacyGas(testutils.Context(t), calldata, gasLimit, maxGasPrice)
@@ -215,7 +215,7 @@ func TestArbitrumEstimator(t *testing.T) {
 			assert.Equal(t, big.NewInt(-1), blockNumber)
 		}).Return(b.Bytes(), nil)
 
-		o := gas.NewArbitrumEstimator(logger.TestLogger(t), &arbConfig{v: maxGasLimit}, rpcClient, ethClient)
+		o := gas.NewArbitrumEstimator(logger.Test(t), &arbConfig{v: maxGasLimit}, rpcClient, ethClient)
 		require.NoError(t, o.Start(testutils.Context(t)))
 		t.Cleanup(func() { assert.NoError(t, o.Close()) })
 		gasPrice, chainSpecificGasLimit, err := o.GetLegacyGas(testutils.Context(t), calldata, gasLimit, maxGasPrice)
diff --git a/core/chains/evm/gas/block_history_estimator.go b/core/chains/evm/gas/block_history_estimator.go
index a3f3520b365..64dc331f657 100644
--- a/core/chains/evm/gas/block_history_estimator.go
+++ b/core/chains/evm/gas/block_history_estimator.go
@@ -15,14 +15,15 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+
 	"github.com/smartcontractkit/chainlink/v2/common/config"
 	commonfee "github.com/smartcontractkit/chainlink/v2/common/fee"
 	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 	"github.com/smartcontractkit/chainlink/v2/core/utils/mathutil"
 )
@@ -142,7 +143,7 @@ func NewBlockHistoryEstimator(lggr logger.Logger, ethClient evmclient.Client, cf
 		wg:        new(sync.WaitGroup),
 		ctx:       ctx,
 		ctxCancel: cancel,
-		logger:    logger.Sugared(lggr.Named("BlockHistoryEstimator")),
+		logger:    logger.Sugared(logger.Named(lggr, "BlockHistoryEstimator")),
 	}
 
 	return b
@@ -197,7 +198,7 @@ func (b *BlockHistoryEstimator) getBlocks() []evmtypes.Block {
 // The provided context can be used to terminate Start sequence.
 func (b *BlockHistoryEstimator) Start(ctx context.Context) error {
 	return b.StartOnce("BlockHistoryEstimator", func() error {
-		b.logger.Trace("Starting")
+		logger.Trace(b.logger, "Starting")
 
 		if b.bhConfig.CheckInclusionBlocks() > 0 {
 			b.logger.Infof("Inclusion checking enabled, bumping will be prevented on transactions that have been priced above the %d percentile for %d blocks", b.bhConfig.CheckInclusionPercentile(), b.bhConfig.CheckInclusionBlocks())
@@ -227,7 +228,7 @@ func (b *BlockHistoryEstimator) Start(ctx context.Context) error {
 		b.wg.Add(1)
 		go b.runLoop()
 
-		b.logger.Trace("Started")
+		logger.Trace(b.logger, "Started")
 		return nil
 	})
 }
@@ -290,7 +291,7 @@ func (b *BlockHistoryEstimator) BumpLegacyGas(_ context.Context, originalGasPric
 	if b.bhConfig.CheckInclusionBlocks() > 0 {
 		if err = b.checkConnectivity(attempts); err != nil {
 			if errors.Is(err, commonfee.ErrConnectivity) {
-				b.logger.Criticalw(BumpingHaltedLabel, "err", err)
+				logger.Criticalw(b.logger, BumpingHaltedLabel, "err", err)
 				b.SvcErrBuffer.Append(err)
 				promBlockHistoryEstimatorConnectivityFailureCount.WithLabelValues(b.chainID.String(), "legacy").Inc()
 			}
@@ -466,7 +467,7 @@ func (b *BlockHistoryEstimator) BumpDynamicFee(_ context.Context, originalFee Dy
 	if b.bhConfig.CheckInclusionBlocks() > 0 {
 		if err = b.checkConnectivity(attempts); err != nil {
 			if errors.Is(err, commonfee.ErrConnectivity) {
-				b.logger.Criticalw(BumpingHaltedLabel, "err", err)
+				logger.Criticalw(b.logger, BumpingHaltedLabel, "err", err)
 				b.SvcErrBuffer.Append(err)
 				promBlockHistoryEstimatorConnectivityFailureCount.WithLabelValues(b.chainID.String(), "eip1559").Inc()
 			}
@@ -507,7 +508,7 @@ func (b *BlockHistoryEstimator) FetchBlocksAndRecalculate(ctx context.Context, h
 func (b *BlockHistoryEstimator) Recalculate(head *evmtypes.Head) {
 	percentile := int(b.bhConfig.TransactionPercentile())
 
-	lggr := b.logger.With("head", head)
+	lggr := logger.With(b.logger, "head", head)
 
 	blockHistory := b.getBlocks()
 	if len(blockHistory) == 0 {
@@ -629,9 +630,9 @@ func (b *BlockHistoryEstimator) FetchBlocks(ctx context.Context, head *evmtypes.
 		reqs = append(reqs, req)
 	}
 
-	lggr := b.logger.With("head", head)
+	lggr := logger.With(b.logger, "head", head)
 
-	lggr.Tracew(fmt.Sprintf("Fetching %v blocks (%v in local history)", len(reqs), len(blocks)), "n", len(reqs), "inHistory", len(blocks), "blockNum", head.Number)
+	logger.Tracew(lggr, fmt.Sprintf("Fetching %v blocks (%v in local history)", len(reqs), len(blocks)), "n", len(reqs), "inHistory", len(blocks), "blockNum", head.Number)
 	if err := b.batchFetch(ctx, reqs); err != nil {
 		return err
 	}
@@ -712,7 +713,7 @@ func (b *BlockHistoryEstimator) batchFetch(ctx context.Context, reqs []rpc.Batch
 			j = len(reqs)
 		}
 
-		b.logger.Tracew(fmt.Sprintf("Batch fetching blocks %v thru %v", HexToInt64(reqs[i].Args[0]), HexToInt64(reqs[j-1].Args[0])))
+		logger.Tracew(b.logger, fmt.Sprintf("Batch fetching blocks %v thru %v", HexToInt64(reqs[i].Args[0]), HexToInt64(reqs[j-1].Args[0])))
 
 		err := b.ethClient.BatchCallContext(ctx, reqs[i:j])
 		if errors.Is(err, context.DeadlineExceeded) {
diff --git a/core/chains/evm/gas/block_history_estimator_test.go b/core/chains/evm/gas/block_history_estimator_test.go
index 2747ea067d6..d3edf212b6a 100644
--- a/core/chains/evm/gas/block_history_estimator_test.go
+++ b/core/chains/evm/gas/block_history_estimator_test.go
@@ -18,6 +18,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zapcore"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/common/config"
 	commonfee "github.com/smartcontractkit/chainlink/v2/common/fee"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
@@ -27,7 +28,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -42,7 +42,7 @@ func newBlockHistoryConfig() *gas.MockBlockHistoryConfig {
 }
 
 func newBlockHistoryEstimatorWithChainID(t *testing.T, c evmclient.Client, cfg gas.Config, gCfg gas.GasEstimatorConfig, bhCfg gas.BlockHistoryConfig, cid big.Int) gas.EvmEstimator {
-	return gas.NewBlockHistoryEstimator(logger.TestLogger(t), c, cfg, gCfg, bhCfg, cid)
+	return gas.NewBlockHistoryEstimator(logger.Test(t), c, cfg, gCfg, bhCfg, cid)
 }
 
 func newBlockHistoryEstimator(t *testing.T, c evmclient.Client, cfg gas.Config, gCfg gas.GasEstimatorConfig, bhCfg gas.BlockHistoryConfig) *gas.BlockHistoryEstimator {
@@ -1300,69 +1300,69 @@ func TestBlockHistoryEstimator_IsUsable(t *testing.T) {
 	}
 	t.Run("returns false if transaction has 0 gas limit", func(t *testing.T) {
 		tx := evmtypes.Transaction{Type: 0x0, GasPrice: assets.NewWeiI(10), GasLimit: 0, Hash: utils.NewHash()}
-		assert.Equal(t, false, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.TestLogger(t)))
+		assert.Equal(t, false, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.Test(t)))
 	})
 
 	t.Run("returns false if transaction gas limit is nil and tx type is 0x0", func(t *testing.T) {
 		tx := evmtypes.Transaction{Type: 0x0, GasPrice: nil, GasLimit: 42, Hash: utils.NewHash()}
-		assert.Equal(t, false, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.TestLogger(t)))
+		assert.Equal(t, false, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.Test(t)))
 	})
 
 	t.Run("returns false if transaction is of type 0x7e only on Optimism", func(t *testing.T) {
 		cfg.ChainTypeF = "optimismBedrock"
 		tx := evmtypes.Transaction{Type: 0x7e, GasPrice: assets.NewWeiI(10), GasLimit: 42, Hash: utils.NewHash()}
-		assert.Equal(t, false, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.TestLogger(t)))
+		assert.Equal(t, false, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.Test(t)))
 
 		cfg.ChainTypeF = ""
-		assert.Equal(t, true, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.TestLogger(t)))
+		assert.Equal(t, true, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.Test(t)))
 	})
 
 	t.Run("returns false if transaction is of type 0x7c or 0x7b only on Celo", func(t *testing.T) {
 		cfg.ChainTypeF = "celo"
 		tx := evmtypes.Transaction{Type: 0x7c, GasPrice: assets.NewWeiI(10), GasLimit: 42, Hash: utils.NewHash()}
-		assert.Equal(t, false, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.TestLogger(t)))
+		assert.Equal(t, false, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.Test(t)))
 
 		tx2 := evmtypes.Transaction{Type: 0x7b, GasPrice: assets.NewWeiI(10), GasLimit: 42, Hash: utils.NewHash()}
-		assert.Equal(t, false, bhe.IsUsable(tx2, block, cfg.ChainType(), geCfg.PriceMin(), logger.TestLogger(t)))
+		assert.Equal(t, false, bhe.IsUsable(tx2, block, cfg.ChainType(), geCfg.PriceMin(), logger.Test(t)))
 
 		cfg.ChainTypeF = ""
-		assert.Equal(t, true, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.TestLogger(t)))
-		assert.Equal(t, true, bhe.IsUsable(tx2, block, cfg.ChainType(), geCfg.PriceMin(), logger.TestLogger(t)))
+		assert.Equal(t, true, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.Test(t)))
+		assert.Equal(t, true, bhe.IsUsable(tx2, block, cfg.ChainType(), geCfg.PriceMin(), logger.Test(t)))
 	})
 
 	t.Run("returns false if transaction is of type 0x16 only on WeMix", func(t *testing.T) {
 		cfg.ChainTypeF = "wemix"
 		tx := evmtypes.Transaction{Type: 0x16, GasPrice: assets.NewWeiI(10), GasLimit: 42, Hash: utils.NewHash()}
-		assert.Equal(t, false, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.TestLogger(t)))
+		assert.Equal(t, false, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.Test(t)))
 	})
 
 	t.Run("returns false if transaction has base fee higher than the gas price only on Celo", func(t *testing.T) {
 		cfg.ChainTypeF = "celo"
 		tx := evmtypes.Transaction{Type: 0x0, GasPrice: assets.NewWeiI(10), GasLimit: 42, Hash: utils.NewHash()}
-		assert.Equal(t, false, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.TestLogger(t)))
+		assert.Equal(t, false, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.Test(t)))
 
 		tx2 := evmtypes.Transaction{Type: 0x2, MaxPriorityFeePerGas: assets.NewWeiI(200), MaxFeePerGas: assets.NewWeiI(250),
 			GasPrice: assets.NewWeiI(50), GasLimit: 42, Hash: utils.NewHash()}
-		assert.Equal(t, false, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.TestLogger(t)))
+		assert.Equal(t, false, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.Test(t)))
 
 		cfg.ChainTypeF = ""
-		assert.Equal(t, true, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.TestLogger(t)))
-		assert.Equal(t, true, bhe.IsUsable(tx2, block, cfg.ChainType(), geCfg.PriceMin(), logger.TestLogger(t)))
+		assert.Equal(t, true, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.Test(t)))
+		assert.Equal(t, true, bhe.IsUsable(tx2, block, cfg.ChainType(), geCfg.PriceMin(), logger.Test(t)))
 	})
 
 	t.Run("returns false if transaction is of type 0x71 or 0xff only on zkSync", func(t *testing.T) {
 		cfg.ChainTypeF = string(config.ChainZkSync)
 		tx := evmtypes.Transaction{Type: 0x71, GasPrice: assets.NewWeiI(10), GasLimit: 42, Hash: utils.NewHash()}
-		assert.Equal(t, false, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.TestLogger(t)))
+		assert.Equal(t, false, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.Test(t)))
 
 		tx.Type = 0x02
-		assert.Equal(t, true, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.TestLogger(t)))
+		assert.Equal(t, true, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.Test(t)))
 
 		tx.Type = 0xff
-		assert.Equal(t, false, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.TestLogger(t)))
+		assert.Equal(t, false, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.Test(t)))
 
 		cfg.ChainTypeF = ""
-		assert.Equal(t, true, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.TestLogger(t)))
+		assert.Equal(t, true, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.Test(t)))
 	})
 }
 
@@ -2040,7 +2040,7 @@ func TestBlockHistoryEstimator_CheckConnectivity(t *testing.T) {
 	cfg := gas.NewMockConfig()
 	bhCfg := newBlockHistoryConfig()
 	bhCfg.CheckInclusionBlocksF = uint16(4)
-	lggr, obs := logger.TestLoggerObserved(t, zapcore.DebugLevel)
+	lggr, obs := logger.TestObserved(t, zapcore.DebugLevel)
 	geCfg := &gas.MockGasEstimatorConfig{}
 	geCfg.EIP1559DynamicFeesF = false
 
@@ -2381,7 +2381,7 @@ func TestBlockHistoryEstimator_Bumps(t *testing.T) {
 			gasPrice, gasLimit, err := bhe.BumpLegacyGas(testutils.Context(t), assets.NewWeiI(42), 100000, maxGasPrice, nil)
 			require.NoError(t, err)
 
-			expectedGasPrice, expectedGasLimit, err := gas.BumpLegacyGasPriceOnly(geCfg, logger.TestLogger(t), nil, assets.NewWeiI(42), 100000, maxGasPrice)
+			expectedGasPrice, expectedGasLimit, err := gas.BumpLegacyGasPriceOnly(geCfg, logger.TestSugared(t), nil, assets.NewWeiI(42), 100000, maxGasPrice)
 			require.NoError(t, err)
 
 			assert.Equal(t, expectedGasLimit, gasLimit)
@@ -2395,7 +2395,7 @@ func TestBlockHistoryEstimator_Bumps(t *testing.T) {
 			massive := assets.NewWeiI(100000000000000)
 			gas.SetGasPrice(bhe, massive)
 
-			expectedGasPrice, expectedGasLimit, err := gas.BumpLegacyGasPriceOnly(geCfg, logger.TestLogger(t), massive, assets.NewWeiI(42), 100000, maxGasPrice)
+			expectedGasPrice, expectedGasLimit, err := gas.BumpLegacyGasPriceOnly(geCfg, logger.TestSugared(t), massive, assets.NewWeiI(42), 100000, maxGasPrice)
 			require.NoError(t, err)
 
 			assert.Equal(t, expectedGasLimit, gasLimit)
diff --git a/core/chains/evm/gas/cmd/arbgas/main.go b/core/chains/evm/gas/cmd/arbgas/main.go
index 6b79ff2f130..e4fb1b4e882 100644
--- a/core/chains/evm/gas/cmd/arbgas/main.go
+++ b/core/chains/evm/gas/cmd/arbgas/main.go
@@ -9,12 +9,11 @@ import (
 
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/rpc"
-	"go.uber.org/zap/zapcore"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 func main() {
@@ -22,9 +21,10 @@ func main() {
 		log.Fatal("Expected one URL argument but got", l-1)
 	}
 	url := os.Args[1]
-	lggr, sync := logger.NewLogger()
-	defer func() { _ = sync() }()
-	lggr.SetLogLevel(zapcore.DebugLevel)
+	lggr, err := logger.New()
+	if err != nil {
+		log.Fatal("Failed to create logger:", err)
+	}
 
 	ctx := context.Background()
 	withEstimator(ctx, logger.Sugared(lggr), url, func(e gas.EvmEstimator) {
diff --git a/core/chains/evm/gas/fixed_price_estimator.go b/core/chains/evm/gas/fixed_price_estimator.go
index 7eb7454dad9..4d9f45a1bd4 100644
--- a/core/chains/evm/gas/fixed_price_estimator.go
+++ b/core/chains/evm/gas/fixed_price_estimator.go
@@ -5,11 +5,11 @@ import (
 
 	"github.com/pkg/errors"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	commonfee "github.com/smartcontractkit/chainlink/v2/common/fee"
 	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 var _ EvmEstimator = (*fixedPriceEstimator)(nil)
@@ -45,7 +45,7 @@ type fixedPriceEstimatorBlockHistoryConfig interface {
 // NewFixedPriceEstimator returns a new "FixedPrice" estimator which will
 // always use the config default values for gas prices and limits
 func NewFixedPriceEstimator(cfg fixedPriceEstimatorConfig, bhCfg fixedPriceEstimatorBlockHistoryConfig, lggr logger.Logger) EvmEstimator {
-	return &fixedPriceEstimator{cfg, bhCfg, logger.Sugared(lggr.Named("FixedPriceEstimator"))}
+	return &fixedPriceEstimator{cfg, bhCfg, logger.Sugared(logger.Named(lggr, "FixedPriceEstimator"))}
 }
 
 func (f *fixedPriceEstimator) Start(context.Context) error {
diff --git a/core/chains/evm/gas/fixed_price_estimator_test.go b/core/chains/evm/gas/fixed_price_estimator_test.go
index 9fa0997c103..968275ace48 100644
--- a/core/chains/evm/gas/fixed_price_estimator_test.go
+++ b/core/chains/evm/gas/fixed_price_estimator_test.go
@@ -6,10 +6,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 type blockHistoryConfig struct {
@@ -26,7 +26,7 @@ func Test_FixedPriceEstimator(t *testing.T) {
 
 	t.Run("GetLegacyGas returns EvmGasPriceDefault from config, with multiplier applied", func(t *testing.T) {
 		config := &gas.MockGasEstimatorConfig{}
-		f := gas.NewFixedPriceEstimator(config, &blockHistoryConfig{}, logger.TestLogger(t))
+		f := gas.NewFixedPriceEstimator(config, &blockHistoryConfig{}, logger.Test(t))
 
 		config.PriceDefaultF = assets.NewWeiI(42)
 		config.LimitMultiplierF = float32(1.1)
@@ -43,7 +43,7 @@ func Test_FixedPriceEstimator(t *testing.T) {
 		config.PriceDefaultF = assets.NewWeiI(42)
 		config.LimitMultiplierF = float32(1.1)
 		config.PriceMaxF = assets.NewWeiI(35)
-		f := gas.NewFixedPriceEstimator(config, &blockHistoryConfig{}, logger.TestLogger(t))
+		f := gas.NewFixedPriceEstimator(config, &blockHistoryConfig{}, logger.Test(t))
 
 		gasPrice, gasLimit, err := f.GetLegacyGas(testutils.Context(t), nil, 100000, assets.NewWeiI(30))
 		require.NoError(t, err)
@@ -57,7 +57,7 @@ func Test_FixedPriceEstimator(t *testing.T) {
 		config.LimitMultiplierF = float32(1.1)
 		config.PriceMaxF = assets.NewWeiI(20)
 
-		f := gas.NewFixedPriceEstimator(config, &blockHistoryConfig{}, logger.TestLogger(t))
+		f := gas.NewFixedPriceEstimator(config, &blockHistoryConfig{}, logger.Test(t))
 		gasPrice, gasLimit, err := f.GetLegacyGas(testutils.Context(t), nil, 100000, assets.NewWeiI(30))
 		require.NoError(t, err)
 		assert.Equal(t, 110000, int(gasLimit))
@@ -72,7 +72,7 @@ func Test_FixedPriceEstimator(t *testing.T) {
 		config.BumpPercentF = uint16(10)
 		config.BumpMinF = assets.NewWeiI(150)
 
-		lggr := logger.TestLogger(t)
+		lggr := logger.TestSugared(t)
 		f := gas.NewFixedPriceEstimator(config, &blockHistoryConfig{}, lggr)
 
 		gasPrice, gasLimit, err := f.BumpLegacyGas(testutils.Context(t), assets.NewWeiI(42), 100000, maxGasPrice, nil)
@@ -93,7 +93,7 @@ func Test_FixedPriceEstimator(t *testing.T) {
 		config.FeeCapDefaultF = assets.NewWeiI(100)
 		config.BumpThresholdF = uint64(3)
 
-		lggr := logger.TestLogger(t)
+		lggr := logger.Test(t)
 		f := gas.NewFixedPriceEstimator(config, &blockHistoryConfig{}, lggr)
 
 		fee, gasLimit, err := f.GetDynamicFee(testutils.Context(t), 100000, maxGasPrice)
@@ -130,7 +130,7 @@ func Test_FixedPriceEstimator(t *testing.T) {
 		config.BumpMinF = assets.NewWeiI(150)
 		config.BumpPercentF = uint16(10)
 
-		lggr := logger.TestLogger(t)
+		lggr := logger.TestSugared(t)
 		f := gas.NewFixedPriceEstimator(config, &blockHistoryConfig{}, lggr)
 
 		originalFee := gas.DynamicFee{FeeCap: assets.NewWeiI(100), TipCap: assets.NewWeiI(25)}
diff --git a/core/chains/evm/gas/gas_test.go b/core/chains/evm/gas/gas_test.go
index a3f7224a094..355d39b6ce8 100644
--- a/core/chains/evm/gas/gas_test.go
+++ b/core/chains/evm/gas/gas_test.go
@@ -8,9 +8,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 func Test_BumpLegacyGasPriceOnly(t *testing.T) {
@@ -95,7 +95,7 @@ func Test_BumpLegacyGasPriceOnly(t *testing.T) {
 			cfg.BumpMinF = test.bumpMin
 			cfg.PriceMaxF = test.priceMax
 			cfg.LimitMultiplierF = test.limitMultiplierPercent
-			actual, limit, err := gas.BumpLegacyGasPriceOnly(cfg, logger.TestLogger(t), test.currentGasPrice, test.originalGasPrice, test.originalLimit, test.priceMax)
+			actual, limit, err := gas.BumpLegacyGasPriceOnly(cfg, logger.TestSugared(t), test.currentGasPrice, test.originalGasPrice, test.originalLimit, test.priceMax)
 			require.NoError(t, err)
 			if actual.Cmp(test.expectedGasPrice) != 0 {
 				t.Fatalf("Expected %s but got %s", test.expectedGasPrice.String(), actual.String())
@@ -115,7 +115,7 @@ func Test_BumpLegacyGasPriceOnly_HitsMaxError(t *testing.T) {
 	cfg.PriceMaxF = priceMax
 
 	originalGasPrice := toWei("3e10") // 30 GWei
-	_, _, err := gas.BumpLegacyGasPriceOnly(cfg, logger.TestLogger(t), nil, originalGasPrice, 42, priceMax)
+	_, _, err := gas.BumpLegacyGasPriceOnly(cfg, logger.TestSugared(t), nil, originalGasPrice, 42, priceMax)
 	require.Error(t, err)
 	require.Contains(t, err.Error(), "bumped gas price of 45 gwei would exceed configured max gas price of 40 gwei (original price was 30 gwei)")
 }
@@ -124,7 +124,7 @@ func Test_BumpLegacyGasPriceOnly_NoBumpError(t *testing.T) {
 	t.Parallel()
 
 	priceMax := assets.GWei(40)
-	lggr := logger.TestLogger(t)
+	lggr := logger.TestSugared(t)
 
 	cfg := &gas.MockGasEstimatorConfig{}
 	cfg.BumpPercentF = uint16(0)
@@ -298,7 +298,7 @@ func Test_BumpDynamicFeeOnly(t *testing.T) {
 			cfg.LimitMultiplierF = test.limitMultiplierPercent
 
 			bufferBlocks := uint16(4)
-			actual, limit, err := gas.BumpDynamicFeeOnly(cfg, bufferBlocks, logger.TestLogger(t), test.currentTipCap, test.currentBaseFee, test.originalFee, test.originalLimit, test.priceMax)
+			actual, limit, err := gas.BumpDynamicFeeOnly(cfg, bufferBlocks, logger.TestSugared(t), test.currentTipCap, test.currentBaseFee, test.originalFee, test.originalLimit, test.priceMax)
 			require.NoError(t, err)
 			if actual.TipCap.Cmp(test.expectedFee.TipCap) != 0 {
 				t.Fatalf("TipCap not equal, expected %s but got %s", test.expectedFee.TipCap.String(), actual.TipCap.String())
@@ -324,14 +324,14 @@ func Test_BumpDynamicFeeOnly_HitsMaxError(t *testing.T) {
 
 	t.Run("tip cap hits max", func(t *testing.T) {
 		originalFee := gas.DynamicFee{TipCap: assets.GWei(30), FeeCap: assets.GWei(100)}
-		_, _, err := gas.BumpDynamicFeeOnly(cfg, 0, logger.TestLogger(t), nil, nil, originalFee, 42, priceMax)
+		_, _, err := gas.BumpDynamicFeeOnly(cfg, 0, logger.TestSugared(t), nil, nil, originalFee, 42, priceMax)
 		require.Error(t, err)
 		require.Contains(t, err.Error(), "bumped tip cap of 45 gwei would exceed configured max gas price of 40 gwei (original fee: tip cap 30 gwei, fee cap 100 gwei)")
 	})
 
 	t.Run("fee cap hits max", func(t *testing.T) {
 		originalFee := gas.DynamicFee{TipCap: assets.GWei(10), FeeCap: assets.GWei(100)}
-		_, _, err := gas.BumpDynamicFeeOnly(cfg, 0, logger.TestLogger(t), nil, nil, originalFee, 42, priceMax)
+		_, _, err := gas.BumpDynamicFeeOnly(cfg, 0, logger.TestSugared(t), nil, nil, originalFee, 42, priceMax)
 		require.Error(t, err)
 		require.Contains(t, err.Error(), "bumped fee cap of 150 gwei would exceed configured max gas price of 40 gwei (original fee: tip cap 10 gwei, fee cap 100 gwei)")
 	})
diff --git a/core/chains/evm/gas/models.go b/core/chains/evm/gas/models.go
index b6f34ab87a5..4f9a5419702 100644
--- a/core/chains/evm/gas/models.go
+++ b/core/chains/evm/gas/models.go
@@ -9,6 +9,7 @@ import (
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/pkg/errors"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
 	"github.com/smartcontractkit/chainlink/v2/common/config"
@@ -21,7 +22,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas/rollups"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/label"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	bigmath "github.com/smartcontractkit/chainlink/v2/core/utils/big_math"
 )
 
diff --git a/core/chains/evm/gas/rollups/l1_gas_price_oracle.go b/core/chains/evm/gas/rollups/l1_gas_price_oracle.go
index 1a0fe8b8b24..6a384fa9c54 100644
--- a/core/chains/evm/gas/rollups/l1_gas_price_oracle.go
+++ b/core/chains/evm/gas/rollups/l1_gas_price_oracle.go
@@ -12,11 +12,12 @@ import (
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+
 	"github.com/smartcontractkit/chainlink/v2/common/config"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -93,7 +94,7 @@ func NewL1GasPriceOracle(lggr logger.Logger, ethClient ethClient, chainType conf
 	return &l1GasPriceOracle{
 		client:        ethClient,
 		pollPeriod:    PollPeriod,
-		logger:        lggr.Named(fmt.Sprintf("L1GasPriceOracle(%s)", chainType)),
+		logger:        logger.Named(lggr, fmt.Sprintf("L1GasPriceOracle(%s)", chainType)),
 		address:       address,
 		callArgs:      callArgs,
 		chInitialised: make(chan struct{}),
@@ -158,7 +159,7 @@ func (o *l1GasPriceOracle) refresh() (t *time.Timer) {
 	}
 
 	if len(b) != 32 { // returns uint256;
-		o.logger.Criticalf("return data length (%d) different than expected (%d)", len(b), 32)
+		logger.Criticalf(o.logger, "return data length (%d) different than expected (%d)", len(b), 32)
 		return
 	}
 	price := new(big.Int).SetBytes(b)
diff --git a/core/chains/evm/gas/rollups/l1_gas_price_oracle_test.go b/core/chains/evm/gas/rollups/l1_gas_price_oracle_test.go
index 801d72919e7..2defedd6b47 100644
--- a/core/chains/evm/gas/rollups/l1_gas_price_oracle_test.go
+++ b/core/chains/evm/gas/rollups/l1_gas_price_oracle_test.go
@@ -11,12 +11,12 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas/rollups/mocks"
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 
 	"github.com/smartcontractkit/chainlink/v2/common/config"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas/rollups/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 func TestL1GasPriceOracle(t *testing.T) {
@@ -25,13 +25,13 @@ func TestL1GasPriceOracle(t *testing.T) {
 	t.Run("Unsupported ChainType returns nil", func(t *testing.T) {
 		ethClient := mocks.NewETHClient(t)
 
-		assert.Panicsf(t, func() { NewL1GasPriceOracle(logger.TestLogger(t), ethClient, config.ChainCelo) }, "Received unspported chaintype %s", config.ChainCelo)
+		assert.Panicsf(t, func() { NewL1GasPriceOracle(logger.Test(t), ethClient, config.ChainCelo) }, "Received unspported chaintype %s", config.ChainCelo)
 	})
 
 	t.Run("Calling L1GasPrice on unstarted L1Oracle returns error", func(t *testing.T) {
 		ethClient := mocks.NewETHClient(t)
 
-		oracle := NewL1GasPriceOracle(logger.TestLogger(t), ethClient, config.ChainOptimismBedrock)
+		oracle := NewL1GasPriceOracle(logger.Test(t), ethClient, config.ChainOptimismBedrock)
 
 		_, err := oracle.GasPrice(testutils.Context(t))
 		assert.EqualError(t, err, "L1GasPriceOracle is not started; cannot estimate gas")
@@ -49,7 +49,7 @@ func TestL1GasPriceOracle(t *testing.T) {
 			assert.Nil(t, blockNumber)
 		}).Return(common.BigToHash(l1BaseFee).Bytes(), nil)
 
-		oracle := NewL1GasPriceOracle(logger.TestLogger(t), ethClient, config.ChainArbitrum)
+		oracle := NewL1GasPriceOracle(logger.Test(t), ethClient, config.ChainArbitrum)
 		require.NoError(t, oracle.Start(testutils.Context(t)))
 		t.Cleanup(func() { assert.NoError(t, oracle.Close()) })
 
@@ -71,7 +71,7 @@ func TestL1GasPriceOracle(t *testing.T) {
 			assert.Nil(t, blockNumber)
 		}).Return(common.BigToHash(l1BaseFee).Bytes(), nil)
 
-		oracle := NewL1GasPriceOracle(logger.TestLogger(t), ethClient, config.ChainKroma)
+		oracle := NewL1GasPriceOracle(logger.Test(t), ethClient, config.ChainKroma)
 		require.NoError(t, oracle.Start(testutils.Context(t)))
 		t.Cleanup(func() { assert.NoError(t, oracle.Close()) })
 
@@ -93,7 +93,7 @@ func TestL1GasPriceOracle(t *testing.T) {
 			assert.Nil(t, blockNumber)
 		}).Return(common.BigToHash(l1BaseFee).Bytes(), nil)
 
-		oracle := NewL1GasPriceOracle(logger.TestLogger(t), ethClient, config.ChainOptimismBedrock)
+		oracle := NewL1GasPriceOracle(logger.Test(t), ethClient, config.ChainOptimismBedrock)
 		require.NoError(t, oracle.Start(testutils.Context(t)))
 		t.Cleanup(func() { assert.NoError(t, oracle.Close()) })
 
diff --git a/core/chains/evm/gas/suggested_price_estimator.go b/core/chains/evm/gas/suggested_price_estimator.go
index cd5acbc6942..2e0d32bfc94 100644
--- a/core/chains/evm/gas/suggested_price_estimator.go
+++ b/core/chains/evm/gas/suggested_price_estimator.go
@@ -9,12 +9,13 @@ import (
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/pkg/errors"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+
 	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -49,7 +50,7 @@ func NewSuggestedPriceEstimator(lggr logger.Logger, client rpcClient) EvmEstimat
 	return &SuggestedPriceEstimator{
 		client:         client,
 		pollPeriod:     10 * time.Second,
-		logger:         lggr.Named("SuggestedPriceEstimator"),
+		logger:         logger.Named(lggr, "SuggestedPriceEstimator"),
 		chForceRefetch: make(chan (chan struct{})),
 		chInitialised:  make(chan struct{}),
 		chStop:         make(chan struct{}),
diff --git a/core/chains/evm/gas/suggested_price_estimator_test.go b/core/chains/evm/gas/suggested_price_estimator_test.go
index 3b6b8184e3e..304e5359107 100644
--- a/core/chains/evm/gas/suggested_price_estimator_test.go
+++ b/core/chains/evm/gas/suggested_price_estimator_test.go
@@ -10,11 +10,11 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 func TestSuggestedPriceEstimator(t *testing.T) {
@@ -27,7 +27,7 @@ func TestSuggestedPriceEstimator(t *testing.T) {
 
 	t.Run("calling GetLegacyGas on unstarted estimator returns error", func(t *testing.T) {
 		client := mocks.NewRPCClient(t)
-		o := gas.NewSuggestedPriceEstimator(logger.TestLogger(t), client)
+		o := gas.NewSuggestedPriceEstimator(logger.Test(t), client)
 		_, _, err := o.GetLegacyGas(testutils.Context(t), calldata, gasLimit, maxGasPrice)
 		assert.EqualError(t, err, "estimator is not started")
 	})
@@ -39,7 +39,7 @@ func TestSuggestedPriceEstimator(t *testing.T) {
 			(*big.Int)(res).SetInt64(42)
 		})
 
-		o := gas.NewSuggestedPriceEstimator(logger.TestLogger(t), client)
+		o := gas.NewSuggestedPriceEstimator(logger.Test(t), client)
 		require.NoError(t, o.Start(testutils.Context(t)))
 		t.Cleanup(func() { assert.NoError(t, o.Close()) })
 		gasPrice, chainSpecificGasLimit, err := o.GetLegacyGas(testutils.Context(t), calldata, gasLimit, maxGasPrice)
@@ -50,7 +50,7 @@ func TestSuggestedPriceEstimator(t *testing.T) {
 
 	t.Run("gas price is lower than user specified max gas price", func(t *testing.T) {
 		client := mocks.NewRPCClient(t)
-		o := gas.NewSuggestedPriceEstimator(logger.TestLogger(t), client)
+		o := gas.NewSuggestedPriceEstimator(logger.Test(t), client)
 
 		client.On("CallContext", mock.Anything, mock.Anything, "eth_gasPrice").Return(nil).Run(func(args mock.Arguments) {
 			res := args.Get(1).(*hexutil.Big)
@@ -68,7 +68,7 @@ func TestSuggestedPriceEstimator(t *testing.T) {
 
 	t.Run("gas price is lower than global max gas price", func(t *testing.T) {
 		client := mocks.NewRPCClient(t)
-		o := gas.NewSuggestedPriceEstimator(logger.TestLogger(t), client)
+		o := gas.NewSuggestedPriceEstimator(logger.Test(t), client)
 
 		client.On("CallContext", mock.Anything, mock.Anything, "eth_gasPrice").Return(nil).Run(func(args mock.Arguments) {
 			res := args.Get(1).(*hexutil.Big)
@@ -85,14 +85,14 @@ func TestSuggestedPriceEstimator(t *testing.T) {
 
 	t.Run("calling BumpLegacyGas always returns error", func(t *testing.T) {
 		client := mocks.NewRPCClient(t)
-		o := gas.NewSuggestedPriceEstimator(logger.TestLogger(t), client)
+		o := gas.NewSuggestedPriceEstimator(logger.Test(t), client)
 		_, _, err := o.BumpLegacyGas(testutils.Context(t), assets.NewWeiI(42), gasLimit, assets.NewWeiI(10), nil)
 		assert.EqualError(t, err, "bump gas is not supported for this chain")
 	})
 
 	t.Run("calling GetLegacyGas on started estimator if initial call failed returns error", func(t *testing.T) {
 		client := mocks.NewRPCClient(t)
-		o := gas.NewSuggestedPriceEstimator(logger.TestLogger(t), client)
+		o := gas.NewSuggestedPriceEstimator(logger.Test(t), client)
 
 		client.On("CallContext", mock.Anything, mock.Anything, "eth_gasPrice").Return(errors.New("kaboom"))
 
diff --git a/core/chains/evm/headtracker/head_broadcaster.go b/core/chains/evm/headtracker/head_broadcaster.go
index b47fbc2726f..9929646441a 100644
--- a/core/chains/evm/headtracker/head_broadcaster.go
+++ b/core/chains/evm/headtracker/head_broadcaster.go
@@ -3,10 +3,10 @@ package headtracker
 import (
 	"github.com/ethereum/go-ethereum/common"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/common/headtracker"
 	commontypes "github.com/smartcontractkit/chainlink/v2/common/types"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 type headBroadcaster = headtracker.HeadBroadcaster[*evmtypes.Head, common.Hash]
diff --git a/core/chains/evm/headtracker/head_broadcaster_test.go b/core/chains/evm/headtracker/head_broadcaster_test.go
index 5c2423f328a..6fb151bfe6c 100644
--- a/core/chains/evm/headtracker/head_broadcaster_test.go
+++ b/core/chains/evm/headtracker/head_broadcaster_test.go
@@ -10,6 +10,7 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	commonhtrk "github.com/smartcontractkit/chainlink/v2/common/headtracker"
 	commonmocks "github.com/smartcontractkit/chainlink/v2/common/types/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker"
@@ -20,7 +21,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
@@ -48,7 +48,7 @@ func TestHeadBroadcaster_Subscribe(t *testing.T) {
 	})
 	evmCfg := evmtest.NewChainScopedConfig(t, cfg)
 	db := pgtest.NewSqlxDB(t)
-	logger := logger.TestLogger(t)
+	logger := logger.Test(t)
 
 	sub := commonmocks.NewSubscription(t)
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
@@ -101,7 +101,7 @@ func TestHeadBroadcaster_BroadcastNewLongestChain(t *testing.T) {
 	t.Parallel()
 	g := gomega.NewWithT(t)
 
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	broadcaster := headtracker.NewHeadBroadcaster(lggr)
 
 	err := broadcaster.Start(testutils.Context(t))
@@ -143,7 +143,7 @@ func TestHeadBroadcaster_BroadcastNewLongestChain(t *testing.T) {
 func TestHeadBroadcaster_TrackableCallbackTimeout(t *testing.T) {
 	t.Parallel()
 
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	broadcaster := headtracker.NewHeadBroadcaster(lggr)
 
 	err := broadcaster.Start(testutils.Context(t))
diff --git a/core/chains/evm/headtracker/head_listener.go b/core/chains/evm/headtracker/head_listener.go
index 3c81c8895ea..242b59e9a82 100644
--- a/core/chains/evm/headtracker/head_listener.go
+++ b/core/chains/evm/headtracker/head_listener.go
@@ -6,11 +6,11 @@ import (
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/common/headtracker"
 	commontypes "github.com/smartcontractkit/chainlink/v2/common/types"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 type headListener = headtracker.HeadListener[*evmtypes.Head, ethereum.Subscription, *big.Int, common.Hash]
diff --git a/core/chains/evm/headtracker/head_listener_test.go b/core/chains/evm/headtracker/head_listener_test.go
index dff97f58436..8bb761bdfaa 100644
--- a/core/chains/evm/headtracker/head_listener_test.go
+++ b/core/chains/evm/headtracker/head_listener_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	commonmocks "github.com/smartcontractkit/chainlink/v2/common/types/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
@@ -19,7 +20,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
 )
@@ -35,7 +35,7 @@ func Test_HeadListener_HappyPath(t *testing.T) {
 	// - 3 heads is passed to callback
 	// - ethClient methods are invoked
 
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
 	cfg := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
 		// no need to test head timeouts here
@@ -96,7 +96,7 @@ func Test_HeadListener_NotReceivingHeads(t *testing.T) {
 	// - send one head, make sure ReceivingHeads() is true
 	// - do not send any heads within BlockEmissionIdleWarningThreshold and check ReceivingHeads() is false
 
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
 
 	cfg := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
@@ -162,7 +162,7 @@ func Test_HeadListener_SubscriptionErr(t *testing.T) {
 	for _, test := range tests {
 		test := test
 		t.Run(test.name, func(t *testing.T) {
-			l := logger.TestLogger(t)
+			l := logger.Test(t)
 			ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
 			cfg := configtest.NewGeneralConfig(t, nil)
 			evmcfg := evmtest.NewChainScopedConfig(t, cfg)
diff --git a/core/chains/evm/headtracker/head_saver.go b/core/chains/evm/headtracker/head_saver.go
index 6b4b20c89c5..92eedaf153e 100644
--- a/core/chains/evm/headtracker/head_saver.go
+++ b/core/chains/evm/headtracker/head_saver.go
@@ -5,10 +5,10 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	commontypes "github.com/smartcontractkit/chainlink/v2/common/types"
 	httypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker/types"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 type headSaver struct {
@@ -26,7 +26,7 @@ func NewHeadSaver(lggr logger.Logger, orm ORM, config Config, htConfig HeadTrack
 		orm:      orm,
 		config:   config,
 		htConfig: htConfig,
-		logger:   lggr.Named("HeadSaver"),
+		logger:   logger.Named(lggr, "HeadSaver"),
 		heads:    NewHeads(),
 	}
 }
diff --git a/core/chains/evm/headtracker/head_saver_test.go b/core/chains/evm/headtracker/head_saver_test.go
index 5ed85adc598..f541330bc98 100644
--- a/core/chains/evm/headtracker/head_saver_test.go
+++ b/core/chains/evm/headtracker/head_saver_test.go
@@ -6,13 +6,13 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker"
 	httypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker/types"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 type headTrackerConfig struct {
@@ -43,7 +43,7 @@ func (c *config) BlockEmissionIdleWarningThreshold() time.Duration {
 
 func configureSaver(t *testing.T) (httypes.HeadSaver, headtracker.ORM) {
 	db := pgtest.NewSqlxDB(t)
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	cfg := configtest.NewGeneralConfig(t, nil)
 	htCfg := &config{finalityDepth: uint32(1)}
 	orm := headtracker.NewORM(db, lggr, cfg.Database(), cltest.FixtureChainID)
diff --git a/core/chains/evm/headtracker/head_tracker.go b/core/chains/evm/headtracker/head_tracker.go
index dd94f96383b..b86a6b5fe22 100644
--- a/core/chains/evm/headtracker/head_tracker.go
+++ b/core/chains/evm/headtracker/head_tracker.go
@@ -8,12 +8,12 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"go.uber.org/zap/zapcore"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/common/headtracker"
 	commontypes "github.com/smartcontractkit/chainlink/v2/common/types"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	httypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker/types"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
diff --git a/core/chains/evm/headtracker/head_tracker_test.go b/core/chains/evm/headtracker/head_tracker_test.go
index d734b230e1b..4d3cebd24e2 100644
--- a/core/chains/evm/headtracker/head_tracker_test.go
+++ b/core/chains/evm/headtracker/head_tracker_test.go
@@ -20,6 +20,7 @@ import (
 
 	"github.com/jmoiron/sqlx"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
 	commonmocks "github.com/smartcontractkit/chainlink/v2/common/types/mocks"
@@ -32,7 +33,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
@@ -49,7 +49,7 @@ func TestHeadTracker_New(t *testing.T) {
 	t.Parallel()
 
 	db := pgtest.NewSqlxDB(t)
-	logger := logger.TestLogger(t)
+	logger := logger.Test(t)
 	config := configtest.NewGeneralConfig(t, nil)
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
 	ethClient.On("HeadByNumber", mock.Anything, (*big.Int)(nil)).Return(cltest.Head(0), nil)
@@ -73,7 +73,7 @@ func TestHeadTracker_Save_InsertsAndTrimsTable(t *testing.T) {
 	t.Parallel()
 
 	db := pgtest.NewSqlxDB(t)
-	logger := logger.TestLogger(t)
+	logger := logger.Test(t)
 	config := cltest.NewTestChainScopedConfig(t)
 
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
@@ -118,7 +118,7 @@ func TestHeadTracker_Get(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 			db := pgtest.NewSqlxDB(t)
-			logger := logger.TestLogger(t)
+			logger := logger.Test(t)
 			config := cltest.NewTestChainScopedConfig(t)
 			orm := headtracker.NewORM(db, logger, config.Database(), cltest.FixtureChainID)
 
@@ -165,7 +165,7 @@ func TestHeadTracker_Start_NewHeads(t *testing.T) {
 	t.Parallel()
 
 	db := pgtest.NewSqlxDB(t)
-	logger := logger.TestLogger(t)
+	logger := logger.Test(t)
 	config := cltest.NewTestChainScopedConfig(t)
 	orm := headtracker.NewORM(db, logger, config.Database(), cltest.FixtureChainID)
 
@@ -190,7 +190,7 @@ func TestHeadTracker_Start_CancelContext(t *testing.T) {
 	t.Parallel()
 
 	db := pgtest.NewSqlxDB(t)
-	logger := logger.TestLogger(t)
+	logger := logger.Test(t)
 	config := cltest.NewTestChainScopedConfig(t)
 	orm := headtracker.NewORM(db, logger, config.Database(), cltest.FixtureChainID)
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
@@ -230,7 +230,7 @@ func TestHeadTracker_CallsHeadTrackableCallbacks(t *testing.T) {
 	g := gomega.NewWithT(t)
 
 	db := pgtest.NewSqlxDB(t)
-	logger := logger.TestLogger(t)
+	logger := logger.Test(t)
 	config := cltest.NewTestChainScopedConfig(t)
 	orm := headtracker.NewORM(db, logger, config.Database(), cltest.FixtureChainID)
 
@@ -269,7 +269,7 @@ func TestHeadTracker_ReconnectOnError(t *testing.T) {
 	g := gomega.NewWithT(t)
 
 	db := pgtest.NewSqlxDB(t)
-	logger := logger.TestLogger(t)
+	logger := logger.Test(t)
 	config := cltest.NewTestChainScopedConfig(t)
 	orm := headtracker.NewORM(db, logger, config.Database(), cltest.FixtureChainID)
 
@@ -305,7 +305,7 @@ func TestHeadTracker_ResubscribeOnSubscriptionError(t *testing.T) {
 	g := gomega.NewWithT(t)
 
 	db := pgtest.NewSqlxDB(t)
-	logger := logger.TestLogger(t)
+	logger := logger.Test(t)
 	config := cltest.NewTestChainScopedConfig(t)
 	orm := headtracker.NewORM(db, logger, config.Database(), cltest.FixtureChainID)
 
@@ -352,7 +352,7 @@ func TestHeadTracker_Start_LoadsLatestChain(t *testing.T) {
 	t.Parallel()
 
 	db := pgtest.NewSqlxDB(t)
-	logger := logger.TestLogger(t)
+	logger := logger.Test(t)
 	config := cltest.NewTestChainScopedConfig(t)
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
 
@@ -417,7 +417,7 @@ func TestHeadTracker_SwitchesToLongestChainWithHeadSamplingEnabled(t *testing.T)
 	t.Parallel()
 
 	db := pgtest.NewSqlxDB(t)
-	logger := logger.TestLogger(t)
+	logger := logger.Test(t)
 
 	config := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
 		c.EVM[0].FinalityDepth = ptr[uint32](50)
@@ -545,7 +545,7 @@ func TestHeadTracker_SwitchesToLongestChainWithHeadSamplingDisabled(t *testing.T
 	t.Parallel()
 
 	db := pgtest.NewSqlxDB(t)
-	logger := logger.TestLogger(t)
+	logger := logger.Test(t)
 
 	config := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
 		c.EVM[0].FinalityDepth = ptr[uint32](50)
@@ -773,7 +773,7 @@ func TestHeadTracker_Backfill(t *testing.T) {
 	t.Run("does nothing if all the heads are in database", func(t *testing.T) {
 		db := pgtest.NewSqlxDB(t)
 		cfg := configtest.NewGeneralConfig(t, nil)
-		logger := logger.TestLogger(t)
+		logger := logger.Test(t)
 		orm := headtracker.NewORM(db, logger, cfg.Database(), cltest.FixtureChainID)
 		for i := range heads {
 			require.NoError(t, orm.IdempotentInsertHead(testutils.Context(t), &heads[i]))
@@ -790,7 +790,7 @@ func TestHeadTracker_Backfill(t *testing.T) {
 	t.Run("fetches a missing head", func(t *testing.T) {
 		db := pgtest.NewSqlxDB(t)
 		cfg := configtest.NewGeneralConfig(t, nil)
-		logger := logger.TestLogger(t)
+		logger := logger.Test(t)
 		orm := headtracker.NewORM(db, logger, cfg.Database(), cltest.FixtureChainID)
 		for i := range heads {
 			require.NoError(t, orm.IdempotentInsertHead(testutils.Context(t), &heads[i]))
@@ -826,7 +826,7 @@ func TestHeadTracker_Backfill(t *testing.T) {
 	t.Run("fetches only heads that are missing", func(t *testing.T) {
 		db := pgtest.NewSqlxDB(t)
 		cfg := configtest.NewGeneralConfig(t, nil)
-		logger := logger.TestLogger(t)
+		logger := logger.Test(t)
 		orm := headtracker.NewORM(db, logger, cfg.Database(), cltest.FixtureChainID)
 		for i := range heads {
 			require.NoError(t, orm.IdempotentInsertHead(testutils.Context(t), &heads[i]))
@@ -859,7 +859,7 @@ func TestHeadTracker_Backfill(t *testing.T) {
 	t.Run("does not backfill if chain length is already greater than or equal to depth", func(t *testing.T) {
 		db := pgtest.NewSqlxDB(t)
 		cfg := configtest.NewGeneralConfig(t, nil)
-		logger := logger.TestLogger(t)
+		logger := logger.Test(t)
 		orm := headtracker.NewORM(db, logger, cfg.Database(), cltest.FixtureChainID)
 		for i := range heads {
 			require.NoError(t, orm.IdempotentInsertHead(testutils.Context(t), &heads[i]))
@@ -880,7 +880,7 @@ func TestHeadTracker_Backfill(t *testing.T) {
 	t.Run("only backfills to height 0 if chain length would otherwise cause it to try and fetch a negative head", func(t *testing.T) {
 		db := pgtest.NewSqlxDB(t)
 		cfg := configtest.NewGeneralConfig(t, nil)
-		logger := logger.TestLogger(t)
+		logger := logger.Test(t)
 		orm := headtracker.NewORM(db, logger, cfg.Database(), cltest.FixtureChainID)
 
 		ethClient := evmtest.NewEthClientMock(t)
@@ -905,7 +905,7 @@ func TestHeadTracker_Backfill(t *testing.T) {
 	t.Run("abandons backfill and returns error if the eth node returns not found", func(t *testing.T) {
 		db := pgtest.NewSqlxDB(t)
 		cfg := configtest.NewGeneralConfig(t, nil)
-		logger := logger.TestLogger(t)
+		logger := logger.Test(t)
 		orm := headtracker.NewORM(db, logger, cfg.Database(), cltest.FixtureChainID)
 		for i := range heads {
 			require.NoError(t, orm.IdempotentInsertHead(testutils.Context(t), &heads[i]))
@@ -936,7 +936,7 @@ func TestHeadTracker_Backfill(t *testing.T) {
 	t.Run("abandons backfill and returns error if the context time budget is exceeded", func(t *testing.T) {
 		db := pgtest.NewSqlxDB(t)
 		cfg := configtest.NewGeneralConfig(t, nil)
-		logger := logger.TestLogger(t)
+		logger := logger.Test(t)
 		orm := headtracker.NewORM(db, logger, cfg.Database(), cltest.FixtureChainID)
 		for i := range heads {
 			require.NoError(t, orm.IdempotentInsertHead(testutils.Context(t), &heads[i]))
@@ -965,7 +965,7 @@ func TestHeadTracker_Backfill(t *testing.T) {
 	t.Run("abandons backfill and returns error when fetching a block by hash fails, indicating a reorg", func(t *testing.T) {
 		db := pgtest.NewSqlxDB(t)
 		cfg := configtest.NewGeneralConfig(t, nil)
-		logger := logger.TestLogger(t)
+		logger := logger.Test(t)
 		orm := headtracker.NewORM(db, logger, cfg.Database(), cltest.FixtureChainID)
 		ethClient := evmtest.NewEthClientMock(t)
 		ethClient.On("ConfiguredChainID", mock.Anything).Return(evmtest.MustGetDefaultChainID(t, cfg.EVMConfigs()), nil)
@@ -989,7 +989,7 @@ func TestHeadTracker_Backfill(t *testing.T) {
 }
 
 func createHeadTracker(t *testing.T, ethClient evmclient.Client, config headtracker.Config, htConfig headtracker.HeadTrackerConfig, orm headtracker.ORM) *headTrackerUniverse {
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	hb := headtracker.NewHeadBroadcaster(lggr)
 	hs := headtracker.NewHeadSaver(lggr, orm, config, htConfig)
 	mailMon := utils.NewMailboxMonitor(t.Name())
@@ -1004,7 +1004,7 @@ func createHeadTracker(t *testing.T, ethClient evmclient.Client, config headtrac
 
 func createHeadTrackerWithNeverSleeper(t *testing.T, ethClient evmclient.Client, cfg chainlink.GeneralConfig, orm headtracker.ORM) *headTrackerUniverse {
 	evmcfg := evmtest.NewChainScopedConfig(t, cfg)
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	hb := headtracker.NewHeadBroadcaster(lggr)
 	hs := headtracker.NewHeadSaver(lggr, orm, evmcfg.EVM(), evmcfg.EVM().HeadTracker())
 	mailMon := utils.NewMailboxMonitor(t.Name())
@@ -1021,7 +1021,7 @@ func createHeadTrackerWithNeverSleeper(t *testing.T, ethClient evmclient.Client,
 }
 
 func createHeadTrackerWithChecker(t *testing.T, ethClient evmclient.Client, config headtracker.Config, htConfig headtracker.HeadTrackerConfig, orm headtracker.ORM, checker httypes.HeadTrackable) *headTrackerUniverse {
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	hb := headtracker.NewHeadBroadcaster(lggr)
 	hs := headtracker.NewHeadSaver(lggr, orm, config, htConfig)
 	hb.Subscribe(checker)
diff --git a/core/chains/evm/headtracker/orm.go b/core/chains/evm/headtracker/orm.go
index 34f46ce44de..88d569b9a21 100644
--- a/core/chains/evm/headtracker/orm.go
+++ b/core/chains/evm/headtracker/orm.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/jmoiron/sqlx"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
@@ -36,7 +36,7 @@ type orm struct {
 }
 
 func NewORM(db *sqlx.DB, lggr logger.Logger, cfg pg.QConfig, chainID big.Int) ORM {
-	return &orm{pg.NewQ(db, lggr.Named("HeadTrackerORM"), cfg), utils.Big(chainID)}
+	return &orm{pg.NewQ(db, logger.Named(lggr, "HeadTrackerORM"), cfg), utils.Big(chainID)}
 }
 
 func (orm *orm) IdempotentInsertHead(ctx context.Context, head *evmtypes.Head) error {
diff --git a/core/chains/evm/headtracker/orm_test.go b/core/chains/evm/headtracker/orm_test.go
index 123478ff902..c9a2146daf2 100644
--- a/core/chains/evm/headtracker/orm_test.go
+++ b/core/chains/evm/headtracker/orm_test.go
@@ -11,17 +11,17 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 func TestORM_IdempotentInsertHead(t *testing.T) {
 	t.Parallel()
 
 	db := pgtest.NewSqlxDB(t)
-	logger := logger.TestLogger(t)
+	logger := logger.Test(t)
 	cfg := configtest.NewGeneralConfig(t, nil)
 	orm := headtracker.NewORM(db, logger, cfg.Database(), cltest.FixtureChainID)
 
@@ -47,7 +47,7 @@ func TestORM_TrimOldHeads(t *testing.T) {
 	t.Parallel()
 
 	db := pgtest.NewSqlxDB(t)
-	logger := logger.TestLogger(t)
+	logger := logger.Test(t)
 	cfg := configtest.NewGeneralConfig(t, nil)
 	orm := headtracker.NewORM(db, logger, cfg.Database(), cltest.FixtureChainID)
 
@@ -72,7 +72,7 @@ func TestORM_HeadByHash(t *testing.T) {
 	t.Parallel()
 
 	db := pgtest.NewSqlxDB(t)
-	logger := logger.TestLogger(t)
+	logger := logger.Test(t)
 	cfg := configtest.NewGeneralConfig(t, nil)
 	orm := headtracker.NewORM(db, logger, cfg.Database(), cltest.FixtureChainID)
 
@@ -95,7 +95,7 @@ func TestORM_HeadByHash_NotFound(t *testing.T) {
 	t.Parallel()
 
 	db := pgtest.NewSqlxDB(t)
-	logger := logger.TestLogger(t)
+	logger := logger.Test(t)
 	cfg := configtest.NewGeneralConfig(t, nil)
 	orm := headtracker.NewORM(db, logger, cfg.Database(), cltest.FixtureChainID)
 
@@ -110,7 +110,7 @@ func TestORM_LatestHeads_NoRows(t *testing.T) {
 	t.Parallel()
 
 	db := pgtest.NewSqlxDB(t)
-	logger := logger.TestLogger(t)
+	logger := logger.Test(t)
 	cfg := configtest.NewGeneralConfig(t, nil)
 	orm := headtracker.NewORM(db, logger, cfg.Database(), cltest.FixtureChainID)
 
diff --git a/core/chains/evm/log/broadcaster.go b/core/chains/evm/log/broadcaster.go
index d69fd696fd7..f4528396093 100644
--- a/core/chains/evm/log/broadcaster.go
+++ b/core/chains/evm/log/broadcaster.go
@@ -12,13 +12,13 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/pkg/errors"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	httypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker/types"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/null"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
@@ -167,7 +167,7 @@ var _ Broadcaster = (*broadcaster)(nil)
 // NewBroadcaster creates a new instance of the broadcaster
 func NewBroadcaster(orm ORM, ethClient evmclient.Client, config Config, lggr logger.Logger, highestSavedHead *evmtypes.Head, mailMon *utils.MailboxMonitor) *broadcaster {
 	chStop := make(chan struct{})
-	lggr = lggr.Named("LogBroadcaster")
+	lggr = logger.Named(lggr, "LogBroadcaster")
 	chainId := ethClient.ConfiguredChainID()
 	return &broadcaster{
 		orm:                    orm,
@@ -443,7 +443,7 @@ func (b *broadcaster) eventLoop(chRawLogs <-chan types.Log, chErr <-chan error)
 			// Do we have logs in the pool?
 			// They are are invalid, since we may have missed 'removed' logs.
 			if blockNum := b.invalidatePool(); blockNum > 0 {
-				lggr = lggr.With("blockNumber", blockNum)
+				lggr = logger.With(lggr, "blockNumber", blockNum)
 			}
 			lggr.Debugw("Subscription terminated. Backfilling after resubscribing")
 			return true, err
diff --git a/core/chains/evm/log/eth_subscriber.go b/core/chains/evm/log/eth_subscriber.go
index b4d386140e7..96a7a8248a6 100644
--- a/core/chains/evm/log/eth_subscriber.go
+++ b/core/chains/evm/log/eth_subscriber.go
@@ -10,10 +10,10 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/null"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
@@ -27,11 +27,11 @@ type (
 	}
 )
 
-func newEthSubscriber(ethClient evmclient.Client, config Config, logger logger.Logger, chStop chan struct{}) *ethSubscriber {
+func newEthSubscriber(ethClient evmclient.Client, config Config, lggr logger.Logger, chStop chan struct{}) *ethSubscriber {
 	return &ethSubscriber{
 		ethClient: ethClient,
 		config:    config,
-		logger:    logger.Named("EthSubscriber"),
+		logger:    logger.Named(lggr, "EthSubscriber"),
 		chStop:    chStop,
 	}
 }
diff --git a/core/chains/evm/log/helpers_internal_test.go b/core/chains/evm/log/helpers_internal_test.go
index b3b4890e360..38f40bd329e 100644
--- a/core/chains/evm/log/helpers_internal_test.go
+++ b/core/chains/evm/log/helpers_internal_test.go
@@ -3,9 +3,9 @@ package log
 import (
 	"github.com/ethereum/go-ethereum/core/types"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
diff --git a/core/chains/evm/log/helpers_test.go b/core/chains/evm/log/helpers_test.go
index f787002578e..ac7eb863e62 100644
--- a/core/chains/evm/log/helpers_test.go
+++ b/core/chains/evm/log/helpers_test.go
@@ -20,6 +20,7 @@ import (
 
 	"github.com/jmoiron/sqlx"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	evmconfig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config"
@@ -34,7 +35,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
@@ -88,7 +88,7 @@ func newBroadcasterHelperWithEthClient(t *testing.T, ethClient evmclient.Client,
 		}
 	})
 	config := evmtest.NewChainScopedConfig(t, globalConfig)
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	mailMon := srvctest.Start(t, utils.NewMailboxMonitor(t.Name()))
 
 	db := pgtest.NewSqlxDB(t)
@@ -265,7 +265,7 @@ func (helper *broadcasterHelper) newLogListenerWithJob(name string) *simpleLogLi
 	var rec received
 	return &simpleLogListener{
 		db:       db,
-		lggr:     logger.TestLogger(t),
+		lggr:     logger.Test(t),
 		cfg:      helper.config.Database(),
 		name:     name,
 		received: &rec,
@@ -281,7 +281,7 @@ func (listener *simpleLogListener) SkipMarkingConsumed(skip bool) {
 func (listener *simpleLogListener) HandleLog(lb log.Broadcast) {
 	listener.received.Lock()
 	defer listener.received.Unlock()
-	listener.lggr.Tracef("Listener %v HandleLog for block %v %v received at %v %v", listener.name, lb.RawLog().BlockNumber, lb.RawLog().BlockHash, lb.LatestBlockNumber(), lb.LatestBlockHash())
+	logger.Tracef(listener.lggr, "Listener %v HandleLog for block %v %v received at %v %v", listener.name, lb.RawLog().BlockNumber, lb.RawLog().BlockHash, lb.LatestBlockNumber(), lb.LatestBlockHash())
 
 	listener.received.logs = append(listener.received.logs, lb.RawLog())
 	listener.received.broadcasts = append(listener.received.broadcasts, lb)
diff --git a/core/chains/evm/log/integration_test.go b/core/chains/evm/log/integration_test.go
index 137b4c7292a..edc04a4ada4 100644
--- a/core/chains/evm/log/integration_test.go
+++ b/core/chains/evm/log/integration_test.go
@@ -16,6 +16,7 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
 	logmocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/log/mocks"
@@ -25,7 +26,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	"github.com/smartcontractkit/chainlink/v2/core/services/srvctest"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
@@ -266,7 +266,7 @@ func TestBroadcaster_BackfillUnconsumedAfterCrash(t *testing.T) {
 		helper := newBroadcasterHelper(t, 0, 1, logs, func(c *chainlink.Config, s *chainlink.Secrets) {
 			c.EVM[0].FinalityDepth = ptr[uint32](confs)
 		})
-		lggr := logger.TestLogger(t)
+		lggr := logger.Test(t)
 		orm := log.NewORM(helper.db, lggr, helper.config.Database(), cltest.FixtureChainID)
 
 		listener := helper.newLogListenerWithJob("one")
@@ -292,7 +292,7 @@ func TestBroadcaster_BackfillUnconsumedAfterCrash(t *testing.T) {
 		helper := newBroadcasterHelper(t, 2, 1, logs, func(c *chainlink.Config, s *chainlink.Secrets) {
 			c.EVM[0].FinalityDepth = ptr[uint32](confs)
 		})
-		lggr := logger.TestLogger(t)
+		lggr := logger.Test(t)
 		orm := log.NewORM(helper.db, lggr, helper.config.Database(), cltest.FixtureChainID)
 
 		listener := helper.newLogListenerWithJob("one")
@@ -317,7 +317,7 @@ func TestBroadcaster_BackfillUnconsumedAfterCrash(t *testing.T) {
 		helper := newBroadcasterHelper(t, 4, 1, logs, func(c *chainlink.Config, s *chainlink.Secrets) {
 			c.EVM[0].FinalityDepth = ptr[uint32](confs)
 		})
-		lggr := logger.TestLogger(t)
+		lggr := logger.Test(t)
 		orm := log.NewORM(helper.db, lggr, helper.config.Database(), cltest.FixtureChainID)
 
 		listener := helper.newLogListenerWithJob("one")
@@ -342,7 +342,7 @@ func TestBroadcaster_BackfillUnconsumedAfterCrash(t *testing.T) {
 		helper := newBroadcasterHelper(t, 7, 1, logs[1:], func(c *chainlink.Config, s *chainlink.Secrets) {
 			c.EVM[0].FinalityDepth = ptr[uint32](confs)
 		})
-		lggr := logger.TestLogger(t)
+		lggr := logger.Test(t)
 		orm := log.NewORM(helper.db, lggr, helper.config.Database(), cltest.FixtureChainID)
 		listener := helper.newLogListenerWithJob("one")
 		listener2 := helper.newLogListenerWithJob("two")
@@ -468,7 +468,7 @@ func TestBroadcaster_BackfillInBatches(t *testing.T) {
 
 	var backfillCount atomic.Int64
 
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	backfillStart := lastStoredBlockHeight - numConfirmations - int64(blockBackfillDepth)
 	// the first backfill should start from before the last stored head
 	mockEth.CheckFilterLogs = func(fromBlock int64, toBlock int64) {
@@ -539,7 +539,7 @@ func TestBroadcaster_BackfillALargeNumberOfLogs(t *testing.T) {
 
 	var backfillCount atomic.Int64
 
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	mockEth.CheckFilterLogs = func(fromBlock int64, toBlock int64) {
 		times := backfillCount.Add(1) - 1
 		lggr.Warnf("Log Batch: --------- times %v - %v, %v", times, fromBlock, toBlock)
@@ -1325,7 +1325,7 @@ func TestBroadcaster_AppendLogChannel(t *testing.T) {
 
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
 	mailMon := srvctest.Start(t, utils.NewMailboxMonitor(t.Name()))
-	lb := log.NewBroadcaster(nil, ethClient, nil, logger.TestLogger(t), nil, mailMon)
+	lb := log.NewBroadcaster(nil, ethClient, nil, logger.Test(t), nil, mailMon)
 	chCombined := lb.ExportedAppendLogChannel(ch1, ch2)
 	chCombined = lb.ExportedAppendLogChannel(chCombined, ch3)
 
diff --git a/core/chains/evm/log/orm.go b/core/chains/evm/log/orm.go
index d383419d728..a2bcab6e785 100644
--- a/core/chains/evm/log/orm.go
+++ b/core/chains/evm/log/orm.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/jmoiron/sqlx"
 
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
diff --git a/core/chains/evm/log/orm_test.go b/core/chains/evm/log/orm_test.go
index 48524896cf4..758cfa1d690 100644
--- a/core/chains/evm/log/orm_test.go
+++ b/core/chains/evm/log/orm_test.go
@@ -10,18 +10,18 @@ import (
 	"github.com/stretchr/testify/require"
 	"gopkg.in/guregu/null.v4"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 )
 
 func TestORM_broadcasts(t *testing.T) {
 	db := pgtest.NewSqlxDB(t)
 	cfg := configtest.NewGeneralConfig(t, nil)
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	ethKeyStore := cltest.NewKeyStore(t, db, cfg.Database()).Eth()
 
 	orm := log.NewORM(db, lggr, cfg.Database(), cltest.FixtureChainID)
@@ -134,7 +134,7 @@ func TestORM_broadcasts(t *testing.T) {
 func TestORM_pending(t *testing.T) {
 	db := pgtest.NewSqlxDB(t)
 	cfg := configtest.NewGeneralConfig(t, nil)
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	orm := log.NewORM(db, lggr, cfg.Database(), cltest.FixtureChainID)
 
 	num, err := orm.GetPendingMinBlock()
@@ -160,7 +160,7 @@ func TestORM_pending(t *testing.T) {
 func TestORM_MarkUnconsumed(t *testing.T) {
 	db := pgtest.NewSqlxDB(t)
 	cfg := configtest.NewGeneralConfig(t, nil)
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	ethKeyStore := cltest.NewKeyStore(t, db, cfg.Database()).Eth()
 
 	orm := log.NewORM(db, lggr, cfg.Database(), cltest.FixtureChainID)
@@ -259,7 +259,7 @@ func TestORM_Reinitialize(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			db := pgtest.NewSqlxDB(t)
 			cfg := configtest.NewGeneralConfig(t, nil)
-			lggr := logger.TestLogger(t)
+			lggr := logger.Test(t)
 			orm := log.NewORM(db, lggr, cfg.Database(), cltest.FixtureChainID)
 
 			jobID := cltest.MustInsertV2JobSpec(t, db, common.BigToAddress(big.NewInt(rand.Int63()))).ID
diff --git a/core/chains/evm/log/pool.go b/core/chains/evm/log/pool.go
index 4511c26eb60..7d534ff4103 100644
--- a/core/chains/evm/log/pool.go
+++ b/core/chains/evm/log/pool.go
@@ -8,7 +8,7 @@ import (
 	heaps "github.com/theodesp/go-heaps"
 	pairingHeap "github.com/theodesp/go-heaps/pairing"
 
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 )
 
 // The Log Pool interface.
@@ -59,7 +59,7 @@ func newLogPool(lggr logger.Logger) *logPool {
 		hashesByBlockNumbers: make(map[uint64]map[common.Hash]struct{}),
 		logsByBlockHash:      make(map[common.Hash]map[uint]map[uint]types.Log),
 		heap:                 pairingHeap.New(),
-		logger:               lggr.Named("LogPool"),
+		logger:               logger.Named(lggr, "LogPool"),
 	}
 }
 
diff --git a/core/chains/evm/log/pool_test.go b/core/chains/evm/log/pool_test.go
index 9e760f57262..c4789f5acd4 100644
--- a/core/chains/evm/log/pool_test.go
+++ b/core/chains/evm/log/pool_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
@@ -49,7 +49,7 @@ var (
 
 func TestUnit_AddLog(t *testing.T) {
 	t.Parallel()
-	var p iLogPool = newLogPool(logger.TestLogger(t))
+	var p iLogPool = newLogPool(logger.Test(t))
 
 	blockHash := common.BigToHash(big.NewInt(1))
 	l1 := types.Log{
@@ -105,7 +105,7 @@ func TestUnit_AddLog(t *testing.T) {
 
 func TestUnit_GetAndDeleteAll(t *testing.T) {
 	t.Parallel()
-	var p iLogPool = newLogPool(logger.TestLogger(t))
+	var p iLogPool = newLogPool(logger.Test(t))
 	p.addLog(L1)
 	p.addLog(L1) // duplicate an add
 	p.addLog(L21)
@@ -139,7 +139,7 @@ func TestUnit_GetAndDeleteAll(t *testing.T) {
 
 func TestUnit_GetLogsToSendWhenEmptyPool(t *testing.T) {
 	t.Parallel()
-	var p iLogPool = newLogPool(logger.TestLogger(t))
+	var p iLogPool = newLogPool(logger.Test(t))
 	logsOnBlocks, minBlockNumToSend := p.getLogsToSend(1)
 	assert.Equal(t, int64(0), minBlockNumToSend)
 	assert.ElementsMatch(t, []logsOnBlock{}, logsOnBlocks)
@@ -206,7 +206,7 @@ func TestUnit_GetLogsToSend(t *testing.T) {
 		},
 	}
 
-	var p iLogPool = newLogPool(logger.TestLogger(t))
+	var p iLogPool = newLogPool(logger.Test(t))
 	p.addLog(L1)
 	p.addLog(L21)
 	p.addLog(L3)
@@ -222,7 +222,7 @@ func TestUnit_GetLogsToSend(t *testing.T) {
 
 func TestUnit_DeleteOlderLogsWhenEmptyPool(t *testing.T) {
 	t.Parallel()
-	var p iLogPool = newLogPool(logger.TestLogger(t))
+	var p iLogPool = newLogPool(logger.Test(t))
 	keptDepth := p.deleteOlderLogs(1)
 	var expectedKeptDepth *int64
 	require.Equal(t, expectedKeptDepth, keptDepth)
@@ -286,7 +286,7 @@ func TestUnit_DeleteOlderLogs(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			var p iLogPool = newLogPool(logger.TestLogger(t))
+			var p iLogPool = newLogPool(logger.Test(t))
 			p.addLog(L1)
 			p.addLog(L21)
 			p.addLog(L3)
@@ -302,7 +302,7 @@ func TestUnit_DeleteOlderLogs(t *testing.T) {
 
 func TestUnit_RemoveBlockWhenEmptyPool(t *testing.T) {
 	t.Parallel()
-	var p iLogPool = newLogPool(logger.TestLogger(t))
+	var p iLogPool = newLogPool(logger.Test(t))
 	p.removeBlock(L1.BlockHash, L1.BlockNumber)
 }
 
@@ -343,7 +343,7 @@ func TestUnit_RemoveBlock(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			var p iLogPool = newLogPool(logger.TestLogger(t))
+			var p iLogPool = newLogPool(logger.Test(t))
 			p.addLog(L21)
 			p.addLog(L22)
 			p.addLog(L23)
diff --git a/core/chains/evm/log/registrations.go b/core/chains/evm/log/registrations.go
index f9cc933d0d0..73f197a6ab6 100644
--- a/core/chains/evm/log/registrations.go
+++ b/core/chains/evm/log/registrations.go
@@ -9,10 +9,10 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/pkg/errors"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 )
 
@@ -70,13 +70,13 @@ type (
 	subscribers map[*subscriber][][]Topic
 )
 
-func newRegistrations(logger logger.Logger, evmChainID big.Int) *registrations {
+func newRegistrations(lggr logger.Logger, evmChainID big.Int) *registrations {
 	return &registrations{
 		registeredSubs:  make(map[*subscriber]struct{}),
 		jobIDAddrs:      make(map[int32]map[common.Address]struct{}),
 		handlersByConfs: make(map[uint32]*handler),
 		evmChainID:      evmChainID,
-		logger:          logger.Named("Registrations"),
+		logger:          logger.Named(lggr, "Registrations"),
 	}
 }
 
@@ -85,7 +85,7 @@ func (r *registrations) addSubscriber(sub *subscriber) (needsResubscribe bool) {
 		r.logger.Panicw(err.Error(), "err", err, "addr", sub.opts.Contract.Hex(), "jobID", sub.listener.JobID())
 	}
 
-	r.logger.Tracef("Added subscription %p with job ID %v", sub, sub.listener.JobID())
+	logger.Tracef(r.logger, "Added subscription %p with job ID %v", sub, sub.listener.JobID())
 
 	handler, exists := r.handlersByConfs[sub.opts.MinIncomingConfirmations]
 	if !exists {
@@ -142,7 +142,7 @@ func (r *registrations) removeSubscriber(sub *subscriber) (needsResubscribe bool
 	if err := r.checkRemoveSubscriber(sub); err != nil {
 		r.logger.Panicw(err.Error(), "err", err, "addr", sub.opts.Contract.Hex(), "jobID", sub.listener.JobID())
 	}
-	r.logger.Tracef("Removed subscription %p with job ID %v", sub, sub.listener.JobID())
+	logger.Tracef(r.logger, "Removed subscription %p with job ID %v", sub, sub.listener.JobID())
 
 	handlers, exists := r.handlersByConfs[sub.opts.MinIncomingConfirmations]
 	if !exists {
@@ -284,7 +284,7 @@ func (r *handler) addSubscriber(sub *subscriber, handlersWithGreaterConfs []*han
 
 	for topic, topicValueFilters := range sub.opts.LogsWithTopics {
 		if _, exists := r.lookupSubs[addr][topic]; !exists {
-			r.logger.Tracef("No existing sub for addr %s and topic %s at this MinIncomingConfirmations of %v", addr.Hex(), topic.Hex(), sub.opts.MinIncomingConfirmations)
+			logger.Tracef(r.logger, "No existing sub for addr %s and topic %s at this MinIncomingConfirmations of %v", addr.Hex(), topic.Hex(), sub.opts.MinIncomingConfirmations)
 			r.lookupSubs[addr][topic] = make(subscribers)
 
 			func() {
@@ -295,11 +295,11 @@ func (r *handler) addSubscriber(sub *subscriber, handlersWithGreaterConfs []*han
 					// again since even the worst case lookback is already covered
 					for _, existingHandler := range handlersWithGreaterConfs {
 						if _, exists := existingHandler.lookupSubs[addr][topic]; exists {
-							r.logger.Tracef("Sub already exists for addr %s and topic %s at greater than this MinIncomingConfirmations of %v. Resubscribe is not required", addr.Hex(), topic.Hex(), sub.opts.MinIncomingConfirmations)
+							logger.Tracef(r.logger, "Sub already exists for addr %s and topic %s at greater than this MinIncomingConfirmations of %v. Resubscribe is not required", addr.Hex(), topic.Hex(), sub.opts.MinIncomingConfirmations)
 							return
 						}
 					}
-					r.logger.Tracef("No sub exists for addr %s and topic %s at this or greater MinIncomingConfirmations of %v. Resubscribe is required", addr.Hex(), topic.Hex(), sub.opts.MinIncomingConfirmations)
+					logger.Tracef(r.logger, "No sub exists for addr %s and topic %s at this or greater MinIncomingConfirmations of %v. Resubscribe is required", addr.Hex(), topic.Hex(), sub.opts.MinIncomingConfirmations)
 					needsResubscribe = true
 				}
 			}()
@@ -332,7 +332,7 @@ func (r *handler) removeSubscriber(sub *subscriber, allHandlers map[uint32]*hand
 
 		// cleanup and resubscribe if necessary
 		if len(topicMap) == 0 {
-			r.logger.Tracef("No subs left for addr %s and topic %s at this MinIncomingConfirmations of %v", addr.Hex(), topic.Hex(), sub.opts.MinIncomingConfirmations)
+			logger.Tracef(r.logger, "No subs left for addr %s and topic %s at this MinIncomingConfirmations of %v", addr.Hex(), topic.Hex(), sub.opts.MinIncomingConfirmations)
 
 			func() {
 				if !needsResubscribe {
@@ -344,12 +344,12 @@ func (r *handler) removeSubscriber(sub *subscriber, allHandlers map[uint32]*hand
 							continue
 						}
 						if _, exists := otherHandler.lookupSubs[addr][topic]; exists {
-							r.logger.Tracef("Sub still exists for addr %s and topic %s. Resubscribe will not be performed", addr.Hex(), topic.Hex())
+							logger.Tracef(r.logger, "Sub still exists for addr %s and topic %s. Resubscribe will not be performed", addr.Hex(), topic.Hex())
 							return
 						}
 					}
 
-					r.logger.Tracef("No sub exists for addr %s and topic %s. Resubscribe will be performed", addr.Hex(), topic.Hex())
+					logger.Tracef(r.logger, "No sub exists for addr %s and topic %s. Resubscribe will be performed", addr.Hex(), topic.Hex())
 					needsResubscribe = true
 				}
 			}()
diff --git a/core/chains/evm/log/registrations_test.go b/core/chains/evm/log/registrations_test.go
index c9d4eba5898..0682564fe72 100644
--- a/core/chains/evm/log/registrations_test.go
+++ b/core/chains/evm/log/registrations_test.go
@@ -7,8 +7,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -26,7 +26,7 @@ func newTestListener(t *testing.T, jobID int32) testListener {
 }
 
 func newTestRegistrations(t *testing.T) *registrations {
-	return newRegistrations(logger.TestLogger(t), *testutils.FixtureChainID)
+	return newRegistrations(logger.Test(t), *testutils.FixtureChainID)
 }
 
 func newTopic() Topic {
diff --git a/core/chains/evm/logpoller/helper_test.go b/core/chains/evm/logpoller/helper_test.go
index c61d3d5fad6..9e48690a249 100644
--- a/core/chains/evm/logpoller/helper_test.go
+++ b/core/chains/evm/logpoller/helper_test.go
@@ -19,12 +19,12 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/log_emitter"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 )
 
@@ -46,7 +46,7 @@ type TestHarness struct {
 }
 
 func SetupTH(t testing.TB, useFinalityTag bool, finalityDepth, backfillBatchSize, rpcBatchSize, keepFinalizedBlocksDepth int64) TestHarness {
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	chainID := testutils.NewRandomEVMChainID()
 	chainID2 := testutils.NewRandomEVMChainID()
 	db := pgtest.NewSqlxDB(t)
diff --git a/core/chains/evm/logpoller/log_poller.go b/core/chains/evm/logpoller/log_poller.go
index bb93db40378..7c4ea66cec7 100644
--- a/core/chains/evm/logpoller/log_poller.go
+++ b/core/chains/evm/logpoller/log_poller.go
@@ -20,11 +20,11 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/exp/maps"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 	"github.com/smartcontractkit/chainlink/v2/core/utils/mathutil"
@@ -136,7 +136,7 @@ func NewLogPoller(orm ORM, ec Client, lggr logger.Logger, pollPeriod time.Durati
 		cancel:                   cancel,
 		ec:                       ec,
 		orm:                      orm,
-		lggr:                     lggr.Named("LogPoller"),
+		lggr:                     logger.Named(lggr, "LogPoller"),
 		replayStart:              make(chan int64),
 		replayComplete:           make(chan error),
 		pollPeriod:               pollPeriod,
@@ -661,7 +661,7 @@ func (lp *logPoller) backfill(ctx context.Context, start, end int64) error {
 				}
 			}
 			if batchSize == 1 {
-				lp.lggr.Criticalw("Too many log results in a single block, failed to retrieve logs! Node may be running in a degraded state.", "err", err, "from", from, "to", to, "LogBackfillBatchSize", lp.backfillBatchSize)
+				logger.Criticalw(lp.lggr, "Too many log results in a single block, failed to retrieve logs! Node may be running in a degraded state.", "err", err, "from", from, "to", to, "LogBackfillBatchSize", lp.backfillBatchSize)
 				return err
 			}
 			batchSize /= 2
@@ -916,7 +916,7 @@ func (lp *logPoller) findBlockAfterLCA(ctx context.Context, current *evmtypes.He
 			return nil, err
 		}
 	}
-	lp.lggr.Criticalw("Reorg greater than finality depth detected", "finalityTag", lp.useFinalityTag, "current", current.Number, "latestFinalized", latestFinalizedBlockNumber)
+	logger.Criticalw(lp.lggr, "Reorg greater than finality depth detected", "finalityTag", lp.useFinalityTag, "current", current.Number, "latestFinalized", latestFinalizedBlockNumber)
 	rerr := errors.New("Reorg greater than finality depth")
 	lp.SvcErrBuffer.Append(rerr)
 	return nil, rerr
diff --git a/core/chains/evm/logpoller/log_poller_internal_test.go b/core/chains/evm/logpoller/log_poller_internal_test.go
index 2ef276802ba..e3ba8b655e8 100644
--- a/core/chains/evm/logpoller/log_poller_internal_test.go
+++ b/core/chains/evm/logpoller/log_poller_internal_test.go
@@ -20,13 +20,14 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zapcore"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/log_emitter"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
@@ -55,7 +56,7 @@ func TestLogPoller_RegisterFilter(t *testing.T) {
 	a1 := common.HexToAddress("0x2ab9a2dc53736b361b72d900cdf9f78f9406fbbb")
 	a2 := common.HexToAddress("0x2ab9a2dc53736b361b72d900cdf9f78f9406fbbc")
 
-	lggr, observedLogs := logger.TestLoggerObserved(t, zapcore.ErrorLevel)
+	lggr, observedLogs := logger.TestObserved(t, zapcore.ErrorLevel)
 	chainID := testutils.NewRandomEVMChainID()
 	db := pgtest.NewSqlxDB(t)
 
@@ -137,7 +138,7 @@ func TestLogPoller_RegisterFilter(t *testing.T) {
 
 func TestLogPoller_ConvertLogs(t *testing.T) {
 	t.Parallel()
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 
 	topics := []common.Hash{EmitterABI.Events["Log1"].ID}
 
@@ -192,7 +193,7 @@ func TestFilterName(t *testing.T) {
 
 func TestLogPoller_BackupPollerStartup(t *testing.T) {
 	addr := common.HexToAddress("0x2ab9a2dc53736b361b72d900cdf9f78f9406fbbc")
-	lggr, observedLogs := logger.TestLoggerObserved(t, zapcore.WarnLevel)
+	lggr, observedLogs := logger.TestObserved(t, zapcore.WarnLevel)
 	chainID := testutils.FixtureChainID
 	db := pgtest.NewSqlxDB(t)
 	orm := NewORM(chainID, db, lggr, pgtest.NewQConfig(true))
@@ -235,7 +236,7 @@ func TestLogPoller_Replay(t *testing.T) {
 	t.Parallel()
 	addr := common.HexToAddress("0x2ab9a2dc53736b361b72d900cdf9f78f9406fbbc")
 
-	lggr, observedLogs := logger.TestLoggerObserved(t, zapcore.ErrorLevel)
+	lggr, observedLogs := logger.TestObserved(t, zapcore.ErrorLevel)
 	chainID := testutils.FixtureChainID
 	db := pgtest.NewSqlxDB(t)
 	orm := NewORM(chainID, db, lggr, pgtest.NewQConfig(true))
@@ -437,7 +438,7 @@ func (lp *logPoller) reset() {
 }
 
 func Test_latestBlockAndFinalityDepth(t *testing.T) {
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	chainID := testutils.FixtureChainID
 	db := pgtest.NewSqlxDB(t)
 	orm := NewORM(chainID, db, lggr, pgtest.NewQConfig(true))
@@ -507,7 +508,7 @@ func Test_latestBlockAndFinalityDepth(t *testing.T) {
 }
 
 func benchmarkFilter(b *testing.B, nFilters, nAddresses, nEvents int) {
-	lggr := logger.TestLogger(b)
+	lggr := logger.Test(b)
 	lp := NewLogPoller(nil, nil, lggr, 1*time.Hour, false, 2, 3, 2, 1000)
 	for i := 0; i < nFilters; i++ {
 		var addresses []common.Address
diff --git a/core/chains/evm/logpoller/log_poller_test.go b/core/chains/evm/logpoller/log_poller_test.go
index 94589f505a6..82447bdb5f4 100644
--- a/core/chains/evm/logpoller/log_poller_test.go
+++ b/core/chains/evm/logpoller/log_poller_test.go
@@ -26,6 +26,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zapcore"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
@@ -34,7 +35,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
@@ -86,7 +86,7 @@ func populateDatabase(t testing.TB, o *logpoller.DbORM, chainID *big.Int) (commo
 func BenchmarkSelectLogsCreatedAfter(b *testing.B) {
 	chainId := big.NewInt(137)
 	_, db := heavyweight.FullTestDBV2(b, nil)
-	o := logpoller.NewORM(chainId, db, logger.TestLogger(b), pgtest.NewQConfig(false))
+	o := logpoller.NewORM(chainId, db, logger.Test(b), pgtest.NewQConfig(false))
 	event, address, _ := populateDatabase(b, o, chainId)
 
 	// Setting searchDate to pick around 5k logs
@@ -106,7 +106,7 @@ func TestPopulateLoadedDB(t *testing.T) {
 	_, db := heavyweight.FullTestDBV2(t, nil)
 	chainID := big.NewInt(137)
 
-	o := logpoller.NewORM(big.NewInt(137), db, logger.TestLogger(t), pgtest.NewQConfig(true))
+	o := logpoller.NewORM(big.NewInt(137), db, logger.Test(t), pgtest.NewQConfig(true))
 	event1, address1, address2 := populateDatabase(t, o, chainID)
 
 	func() {
@@ -651,7 +651,7 @@ func TestLogPoller_SynchronizedWithGeth(t *testing.T) {
 	p := gopter.NewProperties(testParams)
 	numChainInserts := 3
 	finalityDepth := 5
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	db := pgtest.NewSqlxDB(t)
 
 	owner := testutils.MustNewSimTransactor(t)
@@ -1264,7 +1264,7 @@ func TestGetReplayFromBlock(t *testing.T) {
 func TestLogPoller_DBErrorHandling(t *testing.T) {
 	t.Parallel()
 	ctx := testutils.Context(t)
-	lggr, observedLogs := logger.TestLoggerObserved(t, zapcore.WarnLevel)
+	lggr, observedLogs := logger.TestObserved(t, zapcore.WarnLevel)
 	chainID1 := testutils.NewRandomEVMChainID()
 	chainID2 := testutils.NewRandomEVMChainID()
 	db := pgtest.NewSqlxDB(t)
@@ -1332,7 +1332,7 @@ func TestNotifyAfterInsert(t *testing.T) {
 		dbURL = s.Database.URL.URL().String()
 	})
 
-	lggr, _ := logger.TestLoggerObserved(t, zapcore.WarnLevel)
+	lggr, _ := logger.TestObserved(t, zapcore.WarnLevel)
 	chainID := big.NewInt(1337)
 	o := logpoller.NewORM(chainID, sqlxDB, lggr, pgtest.NewQConfig(true))
 
@@ -1386,7 +1386,7 @@ type getLogErrData struct {
 func TestTooManyLogResults(t *testing.T) {
 	ctx := testutils.Context(t)
 	ec := evmtest.NewEthClientMockWithDefaultChain(t)
-	lggr, obs := logger.TestLoggerObserved(t, zapcore.DebugLevel)
+	lggr, obs := logger.TestObserved(t, zapcore.DebugLevel)
 	chainID := testutils.NewRandomEVMChainID()
 	db := pgtest.NewSqlxDB(t)
 	o := logpoller.NewORM(chainID, db, lggr, pgtest.NewQConfig(true))
diff --git a/core/chains/evm/logpoller/observability.go b/core/chains/evm/logpoller/observability.go
index 03f4b77be25..9826d503b9f 100644
--- a/core/chains/evm/logpoller/observability.go
+++ b/core/chains/evm/logpoller/observability.go
@@ -9,7 +9,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 )
diff --git a/core/chains/evm/logpoller/observability_test.go b/core/chains/evm/logpoller/observability_test.go
index ded3d7854dd..83bd60a5564 100644
--- a/core/chains/evm/logpoller/observability_test.go
+++ b/core/chains/evm/logpoller/observability_test.go
@@ -14,9 +14,9 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus/testutil"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 )
 
@@ -97,7 +97,7 @@ func TestMetricsAreProperlyPopulatedForWrites(t *testing.T) {
 }
 
 func createObservedORM(t *testing.T, chainId int64) *ObservedORM {
-	lggr, _ := logger.TestLoggerObserved(t, zapcore.ErrorLevel)
+	lggr, _ := logger.TestObserved(t, zapcore.ErrorLevel)
 	db := pgtest.NewSqlxDB(t)
 	return NewObservedORM(
 		big.NewInt(chainId), db, lggr, pgtest.NewQConfig(true),
diff --git a/core/chains/evm/logpoller/orm.go b/core/chains/evm/logpoller/orm.go
index a1b86d2cb2c..c6134ed4b69 100644
--- a/core/chains/evm/logpoller/orm.go
+++ b/core/chains/evm/logpoller/orm.go
@@ -11,7 +11,7 @@ import (
 	"github.com/jmoiron/sqlx"
 	"github.com/pkg/errors"
 
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
@@ -61,7 +61,7 @@ type DbORM struct {
 
 // NewORM creates a DbORM scoped to chainID.
 func NewORM(chainID *big.Int, db *sqlx.DB, lggr logger.Logger, cfg pg.QConfig) *DbORM {
-	namedLogger := lggr.Named("Configs")
+	namedLogger := logger.Named(lggr, "Configs")
 	q := pg.NewQ(db, namedLogger, cfg)
 	return &DbORM{
 		chainID: chainID,
diff --git a/core/chains/evm/logpoller/orm_test.go b/core/chains/evm/logpoller/orm_test.go
index 887984055ef..e55ebeccecf 100644
--- a/core/chains/evm/logpoller/orm_test.go
+++ b/core/chains/evm/logpoller/orm_test.go
@@ -14,12 +14,12 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest/heavyweight"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
@@ -1314,7 +1314,7 @@ func TestInsertLogsWithBlock(t *testing.T) {
 	// Using pgtest.NewSqlxDB(t) will run all tests in TXs which is not desired for this type of test
 	// (inner tx rollback will rollback outer tx, blocking rest of execution)
 	_, db := heavyweight.FullTestDBV2(t, nil)
-	o := logpoller.NewORM(chainID, db, logger.TestLogger(t), pgtest.NewQConfig(true))
+	o := logpoller.NewORM(chainID, db, logger.Test(t), pgtest.NewQConfig(true))
 
 	correctLog := GenLog(chainID, 1, 1, utils.RandomAddress().String(), event[:], address)
 	invalidLog := GenLog(chainID, -10, -10, utils.RandomAddress().String(), event[:], address)
@@ -1390,7 +1390,7 @@ func TestInsertLogsInTx(t *testing.T) {
 
 	// We need full db here, because we want to test transaction rollbacks.
 	_, db := heavyweight.FullTestDBV2(t, nil)
-	o := logpoller.NewORM(chainID, db, logger.TestLogger(t), pgtest.NewQConfig(true))
+	o := logpoller.NewORM(chainID, db, logger.Test(t), pgtest.NewQConfig(true))
 
 	logs := make([]logpoller.Log, maxLogsSize, maxLogsSize+1)
 	for i := 0; i < maxLogsSize; i++ {
diff --git a/core/chains/evm/monitor/balance.go b/core/chains/evm/monitor/balance.go
index b12346ac008..c3b9a49c7af 100644
--- a/core/chains/evm/monitor/balance.go
+++ b/core/chains/evm/monitor/balance.go
@@ -13,13 +13,13 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	httypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker/types"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
@@ -51,11 +51,11 @@ type (
 var _ BalanceMonitor = (*balanceMonitor)(nil)
 
 // NewBalanceMonitor returns a new balanceMonitor
-func NewBalanceMonitor(ethClient evmclient.Client, ethKeyStore keystore.Eth, logger logger.Logger) *balanceMonitor {
+func NewBalanceMonitor(ethClient evmclient.Client, ethKeyStore keystore.Eth, lggr logger.Logger) *balanceMonitor {
 	chainId := ethClient.ConfiguredChainID()
 	bm := &balanceMonitor{
 		services.StateMachine{},
-		logger.Named("BalanceMonitor"),
+		logger.Named(lggr, "BalanceMonitor"),
 		ethClient,
 		chainId,
 		chainId.String(),
@@ -119,7 +119,8 @@ func (bm *balanceMonitor) updateBalance(ethBal assets.Eth, address gethCommon.Ad
 	bm.ethBalances[address] = &ethBal
 	bm.ethBalancesMtx.Unlock()
 
-	lgr := bm.logger.Named("BalanceLog").With(
+	lgr := logger.Named(bm.logger, "BalanceLog")
+	lgr = logger.With(lgr,
 		"address", address.Hex(),
 		"ethBalance", ethBal.String(),
 		"weiBalance", ethBal.ToInt())
diff --git a/core/chains/evm/monitor/balance_test.go b/core/chains/evm/monitor/balance_test.go
index 6a62549e493..c2c976e78da 100644
--- a/core/chains/evm/monitor/balance_test.go
+++ b/core/chains/evm/monitor/balance_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/monitor"
@@ -20,7 +21,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 var nilBigInt *big.Int
@@ -43,7 +43,7 @@ func TestBalanceMonitor_Start(t *testing.T) {
 		_, k1Addr := cltest.MustInsertRandomKey(t, ethKeyStore)
 		_, k0Addr := cltest.MustInsertRandomKey(t, ethKeyStore)
 
-		bm := monitor.NewBalanceMonitor(ethClient, ethKeyStore, logger.TestLogger(t))
+		bm := monitor.NewBalanceMonitor(ethClient, ethKeyStore, logger.Test(t))
 		defer func() { assert.NoError(t, bm.Close()) }()
 
 		k0bal := big.NewInt(42)
@@ -71,7 +71,7 @@ func TestBalanceMonitor_Start(t *testing.T) {
 
 		_, k0Addr := cltest.MustInsertRandomKey(t, ethKeyStore)
 
-		bm := monitor.NewBalanceMonitor(ethClient, ethKeyStore, logger.TestLogger(t))
+		bm := monitor.NewBalanceMonitor(ethClient, ethKeyStore, logger.Test(t))
 		defer func() { assert.NoError(t, bm.Close()) }()
 		k0bal := big.NewInt(42)
 
@@ -91,7 +91,7 @@ func TestBalanceMonitor_Start(t *testing.T) {
 
 		_, k0Addr := cltest.MustInsertRandomKey(t, ethKeyStore)
 
-		bm := monitor.NewBalanceMonitor(ethClient, ethKeyStore, logger.TestLogger(t))
+		bm := monitor.NewBalanceMonitor(ethClient, ethKeyStore, logger.Test(t))
 		defer func() { assert.NoError(t, bm.Close()) }()
 		ctxCancelledAwaiter := cltest.NewAwaiter()
 
@@ -121,7 +121,7 @@ func TestBalanceMonitor_Start(t *testing.T) {
 
 		_, k0Addr := cltest.MustInsertRandomKey(t, ethKeyStore)
 
-		bm := monitor.NewBalanceMonitor(ethClient, ethKeyStore, logger.TestLogger(t))
+		bm := monitor.NewBalanceMonitor(ethClient, ethKeyStore, logger.Test(t))
 		defer func() { assert.NoError(t, bm.Close()) }()
 
 		ethClient.On("BalanceAt", mock.Anything, k0Addr, nilBigInt).
@@ -149,7 +149,7 @@ func TestBalanceMonitor_OnNewLongestChain_UpdatesBalance(t *testing.T) {
 		_, k0Addr := cltest.MustInsertRandomKey(t, ethKeyStore)
 		_, k1Addr := cltest.MustInsertRandomKey(t, ethKeyStore)
 
-		bm := monitor.NewBalanceMonitor(ethClient, ethKeyStore, logger.TestLogger(t))
+		bm := monitor.NewBalanceMonitor(ethClient, ethKeyStore, logger.Test(t))
 		k0bal := big.NewInt(42)
 		// Deliberately larger than a 64 bit unsigned integer to test overflow
 		k1bal := big.NewInt(0)
@@ -201,7 +201,7 @@ func TestBalanceMonitor_FewerRPCCallsWhenBehind(t *testing.T) {
 
 	ethClient := newEthClientMock(t)
 
-	bm := monitor.NewBalanceMonitor(ethClient, ethKeyStore, logger.TestLogger(t))
+	bm := monitor.NewBalanceMonitor(ethClient, ethKeyStore, logger.Test(t))
 	ethClient.On("BalanceAt", mock.Anything, mock.Anything, mock.Anything).
 		Once().
 		Return(big.NewInt(1), nil)
diff --git a/core/chains/evm/txmgr/attempts.go b/core/chains/evm/txmgr/attempts.go
index 06c1126b869..37626f4550e 100644
--- a/core/chains/evm/txmgr/attempts.go
+++ b/core/chains/evm/txmgr/attempts.go
@@ -9,13 +9,13 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/pkg/errors"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
 	commontypes "github.com/smartcontractkit/chainlink/v2/common/types"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 type TxAttemptSigner[ADDR commontypes.Hashable] interface {
diff --git a/core/chains/evm/txmgr/attempts_test.go b/core/chains/evm/txmgr/attempts_test.go
index 11304384ab8..131115e6fae 100644
--- a/core/chains/evm/txmgr/attempts_test.go
+++ b/core/chains/evm/txmgr/attempts_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
 	gasmocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas/mocks"
@@ -21,7 +22,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	ksmocks "github.com/smartcontractkit/chainlink/v2/core/services/keystore/mocks"
 )
@@ -93,7 +93,7 @@ func TestTxm_NewDynamicFeeTx(t *testing.T) {
 	kst := ksmocks.NewEth(t)
 	kst.On("SignTx", addr, mock.Anything, big.NewInt(1)).Return(tx, nil)
 	var n evmtypes.Nonce
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 
 	t.Run("creates attempt with fields", func(t *testing.T) {
 		feeCfg := newFeeConfig()
@@ -165,7 +165,7 @@ func TestTxm_NewLegacyAttempt(t *testing.T) {
 	gc.priceMin = assets.NewWeiI(10)
 	gc.priceMax = assets.NewWeiI(50)
 	cks := txmgr.NewEvmTxAttemptBuilder(*big.NewInt(1), gc, kst, nil)
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 
 	t.Run("creates attempt with fields", func(t *testing.T) {
 		var n evmtypes.Nonce
@@ -189,7 +189,7 @@ func TestTxm_NewCustomTxAttempt_NonRetryableErrors(t *testing.T) {
 	t.Parallel()
 
 	kst := ksmocks.NewEth(t)
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	cks := txmgr.NewEvmTxAttemptBuilder(*big.NewInt(1), newFeeConfig(), kst, nil)
 
 	dynamicFee := gas.DynamicFee{TipCap: assets.GWei(100), FeeCap: assets.GWei(200)}
@@ -222,7 +222,7 @@ func TestTxm_EvmTxAttemptBuilder_RetryableEstimatorError(t *testing.T) {
 	est.On("BumpFee", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(gas.EvmFee{}, uint32(0), errors.New("fail"))
 
 	kst := ksmocks.NewEth(t)
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	ctx := testutils.Context(t)
 	cks := txmgr.NewEvmTxAttemptBuilder(*big.NewInt(1), &feeConfig{eip1559DynamicFees: true}, kst, est)
 
diff --git a/core/chains/evm/txmgr/broadcaster_test.go b/core/chains/evm/txmgr/broadcaster_test.go
index 43f2fdb8cac..93b1093e795 100644
--- a/core/chains/evm/txmgr/broadcaster_test.go
+++ b/core/chains/evm/txmgr/broadcaster_test.go
@@ -22,7 +22,9 @@ import (
 	"go.uber.org/zap/zapcore"
 	"gopkg.in/guregu/null.v4"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/sqlutil"
+
 	commonclient "github.com/smartcontractkit/chainlink/v2/common/client"
 	txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr"
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
@@ -40,7 +42,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
 	ksmocks "github.com/smartcontractkit/chainlink/v2/core/services/keystore/mocks"
@@ -60,7 +61,7 @@ func NewTestEthBroadcaster(
 	t.Helper()
 	ctx := testutils.Context(t)
 
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	ge := config.EVM().GasEstimator()
 	estimator := gas.NewWrappedEvmEstimator(gas.NewFixedPriceEstimator(config.EVM().GasEstimator(), ge.BlockHistory(), lggr), ge.EIP1559DynamicFees(), nil)
 	txBuilder := txmgr.NewEvmTxAttemptBuilder(*ethClient.ConfiguredChainID(), ge, keyStore, estimator)
@@ -94,7 +95,7 @@ func TestEthBroadcaster_Lifecycle(t *testing.T) {
 		ethKeyStore,
 		txBuilder,
 		nil,
-		logger.TestLogger(t),
+		logger.Test(t),
 		&testCheckerFactory{},
 		false,
 	)
@@ -152,7 +153,7 @@ func TestEthBroadcaster_LoadNextSequenceMapFailure_StartupSuccess(t *testing.T)
 		ethKeyStore,
 		txBuilder,
 		nil,
-		logger.TestLogger(t),
+		logger.Test(t),
 		&testCheckerFactory{},
 		false,
 	)
@@ -625,7 +626,7 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_OptimisticLockingOnEthTx(t *testi
 		ethKeyStore,
 		txBuilder,
 		nil,
-		logger.TestLogger(t),
+		logger.Test(t),
 		&testCheckerFactory{},
 		false,
 	)
@@ -1132,7 +1133,7 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_Errors(t *testing.T) {
 
 				// same as the parent test, but callback is set by ctor
 				t.Run("callback set by ctor", func(t *testing.T) {
-					lggr := logger.TestLogger(t)
+					lggr := logger.Test(t)
 					estimator := gas.NewWrappedEvmEstimator(gas.NewFixedPriceEstimator(evmcfg.EVM().GasEstimator(), evmcfg.EVM().GasEstimator().BlockHistory(), lggr), evmcfg.EVM().GasEstimator().EIP1559DynamicFees(), nil)
 					txBuilder := txmgr.NewEvmTxAttemptBuilder(*ethClient.ConfiguredChainID(), evmcfg.EVM().GasEstimator(), ethKeyStore, estimator)
 					localNextNonce = getLocalNextNonce(t, eb, fromAddress)
@@ -1744,7 +1745,7 @@ func TestEthBroadcaster_SyncNonce(t *testing.T) {
 	db := pgtest.NewSqlxDB(t)
 	ctx := testutils.Context(t)
 
-	lggr, observed := logger.TestLoggerObserved(t, zapcore.DebugLevel)
+	lggr, observed := logger.TestObserved(t, zapcore.DebugLevel)
 	cfg := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
 		c.EVM[0].NonceAutoSync = ptr(true)
 	})
diff --git a/core/chains/evm/txmgr/builder.go b/core/chains/evm/txmgr/builder.go
index 5e3d61301ca..84aa21e4de2 100644
--- a/core/chains/evm/txmgr/builder.go
+++ b/core/chains/evm/txmgr/builder.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/jmoiron/sqlx"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/common/txmgr"
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
@@ -14,7 +15,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
 )
 
diff --git a/core/chains/evm/txmgr/client.go b/core/chains/evm/txmgr/client.go
index 8789f5f173e..d08274f74b6 100644
--- a/core/chains/evm/txmgr/client.go
+++ b/core/chains/evm/txmgr/client.go
@@ -13,11 +13,11 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/rpc"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	commonclient "github.com/smartcontractkit/chainlink/v2/common/client"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -62,7 +62,7 @@ func (c *evmTxmClient) BatchSendTransactions(
 	if len(reqs) != len(attempts) {
 		lenErr := fmt.Errorf("Returned request data length (%d) != number of tx attempts (%d)", len(reqs), len(attempts))
 		err = errors.Join(err, lenErr)
-		lggr.Criticalw("Mismatched length", "err", err)
+		logger.Criticalw(lggr, "Mismatched length", "err", err)
 		return
 	}
 
@@ -91,7 +91,7 @@ func (c *evmTxmClient) BatchSendTransactions(
 func (c *evmTxmClient) SendTransactionReturnCode(ctx context.Context, etx Tx, attempt TxAttempt, lggr logger.Logger) (commonclient.SendTxReturnCode, error) {
 	signedTx, err := GetGethSignedTx(attempt.SignedRawTx)
 	if err != nil {
-		lggr.Criticalw("Fatal error signing transaction", "err", err, "etx", etx)
+		logger.Criticalw(lggr, "Fatal error signing transaction", "err", err, "etx", etx)
 		return commonclient.Fatal, err
 	}
 	return c.client.SendTransactionReturnCode(ctx, signedTx, etx.FromAddress)
diff --git a/core/chains/evm/txmgr/common.go b/core/chains/evm/txmgr/common.go
index 37cc89dd7ac..1956476f8dd 100644
--- a/core/chains/evm/txmgr/common.go
+++ b/core/chains/evm/txmgr/common.go
@@ -10,8 +10,8 @@ import (
 	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/pkg/errors"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 // Tries to send transactions in batches. Even if some batch(es) fail to get sent, it tries all remaining batches,
diff --git a/core/chains/evm/txmgr/confirmer_test.go b/core/chains/evm/txmgr/confirmer_test.go
index f5889b06649..84c42cd00f1 100644
--- a/core/chains/evm/txmgr/confirmer_test.go
+++ b/core/chains/evm/txmgr/confirmer_test.go
@@ -20,6 +20,7 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	commonclient "github.com/smartcontractkit/chainlink/v2/common/client"
 	commonfee "github.com/smartcontractkit/chainlink/v2/common/fee"
 	txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr"
@@ -36,7 +37,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
 	ksmocks "github.com/smartcontractkit/chainlink/v2/core/services/keystore/mocks"
@@ -121,7 +121,7 @@ func TestEthConfirmer_Lifecycle(t *testing.T) {
 	cltest.MustInsertRandomKey(t, ethKeyStore)
 	cltest.MustInsertRandomKey(t, ethKeyStore)
 	estimator := gasmocks.NewEvmEstimator(t)
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	ge := config.EVM().GasEstimator()
 	feeEstimator := gas.NewWrappedEvmEstimator(estimator, ge.EIP1559DynamicFees(), nil)
 	txBuilder := txmgr.NewEvmTxAttemptBuilder(*ethClient.ConfiguredChainID(), ge, ethKeyStore, feeEstimator)
@@ -1353,7 +1353,7 @@ func TestEthConfirmer_FindTxsRequiringRebroadcast(t *testing.T) {
 	_, otherAddress := cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
 	evmOtherAddress := otherAddress
 
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 
 	ec := newEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, nil)
 
@@ -1619,7 +1619,7 @@ func TestEthConfirmer_FindTxsRequiringRebroadcast(t *testing.T) {
 
 func TestEthConfirmer_RebroadcastWhereNecessary_WithConnectivityCheck(t *testing.T) {
 	t.Parallel()
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 
 	db := pgtest.NewSqlxDB(t)
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
@@ -3074,7 +3074,7 @@ func TestEthConfirmer_ResumePendingRuns(t *testing.T) {
 func ptr[T any](t T) *T { return &t }
 
 func newEthConfirmer(t testing.TB, txStore txmgr.EvmTxStore, ethClient client.Client, config evmconfig.ChainScopedConfig, ks keystore.Eth, fn txmgrcommon.ResumeCallback) *txmgr.Confirmer {
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	ge := config.EVM().GasEstimator()
 	estimator := gas.NewWrappedEvmEstimator(gas.NewFixedPriceEstimator(ge, ge.BlockHistory(), lggr), ge.EIP1559DynamicFees(), nil)
 	txBuilder := txmgr.NewEvmTxAttemptBuilder(*ethClient.ConfiguredChainID(), ge, ks, estimator)
diff --git a/core/chains/evm/txmgr/evm_tx_store.go b/core/chains/evm/txmgr/evm_tx_store.go
index 84fe9a02c6a..2788c2fd1c9 100644
--- a/core/chains/evm/txmgr/evm_tx_store.go
+++ b/core/chains/evm/txmgr/evm_tx_store.go
@@ -18,6 +18,7 @@ import (
 	pkgerrors "github.com/pkg/errors"
 	nullv4 "gopkg.in/guregu/null.v4"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/sqlutil"
 	"github.com/smartcontractkit/chainlink/v2/common/txmgr"
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
@@ -25,7 +26,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/label"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/null"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
@@ -333,7 +333,7 @@ func NewTxStore(
 	lggr logger.Logger,
 	cfg pg.QConfig,
 ) *evmTxStore {
-	namedLogger := lggr.Named("TxmStore")
+	namedLogger := logger.Named(lggr, "TxmStore")
 	ctx, cancel := context.WithCancel(context.Background())
 	q := pg.NewQ(db, namedLogger, cfg, pg.WithParentCtx(ctx))
 	return &evmTxStore{
@@ -1371,7 +1371,7 @@ GROUP BY e.id
 				txHashesHex[i] = common.BytesToAddress(r.TxHashes[i])
 			}
 
-			o.logger.Criticalw(fmt.Sprintf("eth_tx with ID %v expired without ever getting a receipt for any of our attempts. "+
+			logger.Criticalw(o.logger, fmt.Sprintf("eth_tx with ID %v expired without ever getting a receipt for any of our attempts. "+
 				"Current block height is %v, transaction was broadcast before block height %v. This transaction may not have not been sent and will be marked as fatally errored. "+
 				"This can happen if there is another instance of chainlink running that is using the same private key, or if "+
 				"an external wallet has been used to send a transaction from account %s with nonce %v."+
diff --git a/core/chains/evm/txmgr/evm_tx_store_test.go b/core/chains/evm/txmgr/evm_tx_store_test.go
index 15417a43096..d2cafcb8efa 100644
--- a/core/chains/evm/txmgr/evm_tx_store_test.go
+++ b/core/chains/evm/txmgr/evm_tx_store_test.go
@@ -7,6 +7,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr"
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
@@ -18,7 +19,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
@@ -1117,7 +1117,7 @@ func TestORM_LoadEthTxesAttempts(t *testing.T) {
 		etx := mustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(t, txStore, 3, 9, time.Now(), fromAddress)
 		etx.TxAttempts = []txmgr.TxAttempt{}
 
-		q := pg.NewQ(db, logger.TestLogger(t), cfg.Database())
+		q := pg.NewQ(db, logger.Test(t), cfg.Database())
 
 		newAttempt := cltest.NewDynamicFeeEthTxAttempt(t, etx.ID)
 		var dbAttempt txmgr.DbEthTxAttempt
@@ -1258,7 +1258,7 @@ func TestORM_UpdateTxUnstartedToInProgress(t *testing.T) {
 	txStore := cltest.NewTestTxStore(t, db, cfg.Database())
 	ethKeyStore := cltest.NewKeyStore(t, db, cfg.Database()).Eth()
 	_, fromAddress := cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
-	q := pg.NewQ(db, logger.TestLogger(t), cfg.Database())
+	q := pg.NewQ(db, logger.Test(t), cfg.Database())
 	nonce := evmtypes.Nonce(123)
 
 	t.Run("update successful", func(t *testing.T) {
@@ -1293,7 +1293,7 @@ func TestORM_UpdateTxUnstartedToInProgress(t *testing.T) {
 	txStore = cltest.NewTestTxStore(t, db, cfg.Database())
 	ethKeyStore = cltest.NewKeyStore(t, db, cfg.Database()).Eth()
 	_, fromAddress = cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
-	q = pg.NewQ(db, logger.TestLogger(t), cfg.Database())
+	q = pg.NewQ(db, logger.Test(t), cfg.Database())
 
 	t.Run("update replaces abandoned tx with same hash", func(t *testing.T) {
 		etx := mustInsertInProgressEthTxWithAttempt(t, txStore, nonce, fromAddress)
@@ -1309,7 +1309,7 @@ func TestORM_UpdateTxUnstartedToInProgress(t *testing.T) {
 		ccfg := evmtest.NewChainScopedConfig(t, evmCfg)
 		evmTxmCfg := txmgr.NewEvmTxmConfig(ccfg.EVM())
 		ec := evmtest.NewEthClientMockWithDefaultChain(t)
-		txMgr := txmgr.NewEvmTxm(ec.ConfiguredChainID(), evmTxmCfg, ccfg.EVM().Transactions(), nil, logger.TestLogger(t), nil, nil,
+		txMgr := txmgr.NewEvmTxm(ec.ConfiguredChainID(), evmTxmCfg, ccfg.EVM().Transactions(), nil, logger.Test(t), nil, nil,
 			nil, txStore, nil, nil, nil, nil)
 		err := txMgr.XXXTestAbandon(fromAddress) // mark transaction as abandoned
 		require.NoError(t, err)
diff --git a/core/chains/evm/txmgr/nonce_syncer.go b/core/chains/evm/txmgr/nonce_syncer.go
index dc0d27e6414..2936736b3b3 100644
--- a/core/chains/evm/txmgr/nonce_syncer.go
+++ b/core/chains/evm/txmgr/nonce_syncer.go
@@ -8,10 +8,10 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/pkg/errors"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/common/txmgr"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 // NonceSyncer manages the delicate task of syncing the local nonce with the
@@ -61,7 +61,7 @@ func NewNonceSyncer(
 	lggr logger.Logger,
 	ethClient evmclient.Client,
 ) NonceSyncer {
-	lggr = lggr.Named("NonceSyncer")
+	lggr = logger.Named(lggr, "NonceSyncer")
 	return &nonceSyncerImpl{
 		txStore: txStore,
 		client:  NewEvmTxmClient(ethClient),
diff --git a/core/chains/evm/txmgr/nonce_syncer_test.go b/core/chains/evm/txmgr/nonce_syncer_test.go
index f6480b4c305..f757b8863d1 100644
--- a/core/chains/evm/txmgr/nonce_syncer_test.go
+++ b/core/chains/evm/txmgr/nonce_syncer_test.go
@@ -3,6 +3,7 @@ package txmgr_test
 import (
 	"testing"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
@@ -10,7 +11,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
@@ -30,7 +30,7 @@ func Test_NonceSyncer_Sync(t *testing.T) {
 
 		_, from := cltest.MustInsertRandomKey(t, ethKeyStore)
 
-		ns := txmgr.NewNonceSyncer(txStore, logger.TestLogger(t), ethClient)
+		ns := txmgr.NewNonceSyncer(txStore, logger.Test(t), ethClient)
 
 		ethClient.On("PendingNonceAt", mock.Anything, from).Return(uint64(0), errors.New("something exploded"))
 		_, err := ns.Sync(testutils.Context(t), from, types.Nonce(0))
@@ -50,7 +50,7 @@ func Test_NonceSyncer_Sync(t *testing.T) {
 
 		_, from := cltest.MustInsertRandomKey(t, ethKeyStore)
 
-		ns := txmgr.NewNonceSyncer(txStore, logger.TestLogger(t), ethClient)
+		ns := txmgr.NewNonceSyncer(txStore, logger.Test(t), ethClient)
 
 		ethClient.On("PendingNonceAt", mock.Anything, from).Return(uint64(0), nil)
 
@@ -72,7 +72,7 @@ func Test_NonceSyncer_Sync(t *testing.T) {
 
 		_, fromAddress := cltest.RandomKey{Nonce: 32}.MustInsert(t, ks)
 
-		ns := txmgr.NewNonceSyncer(txStore, logger.TestLogger(t), ethClient)
+		ns := txmgr.NewNonceSyncer(txStore, logger.Test(t), ethClient)
 
 		// Used to mock the chain nonce
 		ethClient.On("PendingNonceAt", mock.Anything, fromAddress).Return(uint64(5), nil)
@@ -97,7 +97,7 @@ func Test_NonceSyncer_Sync(t *testing.T) {
 		key1LocalNonce := types.Nonce(0)
 		key2LocalNonce := types.Nonce(32)
 
-		ns := txmgr.NewNonceSyncer(txStore, logger.TestLogger(t), ethClient)
+		ns := txmgr.NewNonceSyncer(txStore, logger.Test(t), ethClient)
 
 		// Used to mock the chain nonce
 		ethClient.On("PendingNonceAt", mock.Anything, key1).Return(uint64(5), nil).Once()
diff --git a/core/chains/evm/txmgr/reaper_test.go b/core/chains/evm/txmgr/reaper_test.go
index 67216c9fd15..2da8e7a93c8 100644
--- a/core/chains/evm/txmgr/reaper_test.go
+++ b/core/chains/evm/txmgr/reaper_test.go
@@ -8,18 +8,18 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
 	txmgrmocks "github.com/smartcontractkit/chainlink/v2/common/txmgr/types/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func newReaperWithChainID(t *testing.T, db txmgrtypes.TxHistoryReaper[*big.Int], cfg txmgrtypes.ReaperChainConfig, txConfig txmgrtypes.ReaperTransactionsConfig, cid *big.Int) *txmgr.Reaper {
-	return txmgr.NewEvmReaper(logger.TestLogger(t), db, cfg, txConfig, cid)
+	return txmgr.NewEvmReaper(logger.Test(t), db, cfg, txConfig, cid)
 }
 
 func newReaper(t *testing.T, db txmgrtypes.TxHistoryReaper[*big.Int], cfg txmgrtypes.ReaperChainConfig, txConfig txmgrtypes.ReaperTransactionsConfig) *txmgr.Reaper {
diff --git a/core/chains/evm/txmgr/resender_test.go b/core/chains/evm/txmgr/resender_test.go
index cc94511e3b0..d2eefdece59 100644
--- a/core/chains/evm/txmgr/resender_test.go
+++ b/core/chains/evm/txmgr/resender_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zapcore"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
@@ -20,7 +21,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
@@ -31,7 +31,7 @@ func Test_EthResender_resendUnconfirmed(t *testing.T) {
 
 	db := pgtest.NewSqlxDB(t)
 	logCfg := pgtest.NewQConfig(true)
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	ethKeyStore := cltest.NewKeyStore(t, db, logCfg).Eth()
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
 	cfg := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {})
@@ -102,7 +102,7 @@ func Test_EthResender_alertUnconfirmed(t *testing.T) {
 
 	db := pgtest.NewSqlxDB(t)
 	logCfg := pgtest.NewQConfig(true)
-	lggr, o := logger.TestLoggerObserved(t, zapcore.DebugLevel)
+	lggr, o := logger.TestObserved(t, zapcore.DebugLevel)
 	ethKeyStore := cltest.NewKeyStore(t, db, logCfg).Eth()
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
 	// Set this to the smallest non-zero value possible for the attempt to be eligible for resend
@@ -152,7 +152,7 @@ func Test_EthResender_Start(t *testing.T) {
 	ethKeyStore := cltest.NewKeyStore(t, db, cfg.Database()).Eth()
 	ccfg := evmtest.NewChainScopedConfig(t, cfg)
 	_, fromAddress := cltest.MustInsertRandomKey(t, ethKeyStore)
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 
 	t.Run("resends transactions that have been languishing unconfirmed for too long", func(t *testing.T) {
 		ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
diff --git a/core/chains/evm/txmgr/transmitchecker.go b/core/chains/evm/txmgr/transmitchecker.go
index eb6edd3f587..f210934adb1 100644
--- a/core/chains/evm/txmgr/transmitchecker.go
+++ b/core/chains/evm/txmgr/transmitchecker.go
@@ -11,6 +11,7 @@ import (
 	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/pkg/errors"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/common/txmgr"
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
@@ -20,7 +21,6 @@ import (
 	v1 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/solidity_vrf_coordinator_interface"
 	v2 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/vrf_coordinator_v2"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/vrf_coordinator_v2plus_interface"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 	bigmath "github.com/smartcontractkit/chainlink/v2/core/utils/big_math"
 )
@@ -147,7 +147,7 @@ func (s *SimulateChecker) Check(
 	err := s.Client.CallContext(ctx, &b, "eth_call", callArg, evmclient.ToBlockNumArg(nil))
 	if err != nil {
 		if jErr := evmclient.ExtractRPCErrorOrNil(err); jErr != nil {
-			l.Criticalw("Transaction reverted during simulation",
+			logger.Criticalw(l, "Transaction reverted during simulation",
 				"ethTxAttemptID", a.ID, "txHash", a.Hash, "err", err, "rpcErr", jErr.String(), "returnValue", b.String())
 			return errors.Errorf("transaction reverted during simulation: %s", jErr.String())
 		}
diff --git a/core/chains/evm/txmgr/transmitchecker_test.go b/core/chains/evm/txmgr/transmitchecker_test.go
index 5ebf5f32e38..6dd4edd91c6 100644
--- a/core/chains/evm/txmgr/transmitchecker_test.go
+++ b/core/chains/evm/txmgr/transmitchecker_test.go
@@ -15,6 +15,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/mock"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
 
@@ -29,7 +31,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 func TestFactory(t *testing.T) {
@@ -105,7 +106,7 @@ func TestFactory(t *testing.T) {
 
 func TestTransmitCheckers(t *testing.T) {
 	client := evmtest.NewEthClientMockWithDefaultChain(t)
-	log := logger.TestLogger(t)
+	log := logger.Test(t)
 	ctx := testutils.Context(t)
 
 	t.Run("no checker", func(t *testing.T) {
diff --git a/core/chains/evm/txmgr/txmgr_test.go b/core/chains/evm/txmgr/txmgr_test.go
index bab18f445bf..f82bc991d52 100644
--- a/core/chains/evm/txmgr/txmgr_test.go
+++ b/core/chains/evm/txmgr/txmgr_test.go
@@ -20,6 +20,7 @@ import (
 
 	"github.com/jmoiron/sqlx"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr"
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
 	commontxmmocks "github.com/smartcontractkit/chainlink/v2/common/txmgr/types/mocks"
@@ -36,7 +37,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
 	ksmocks "github.com/smartcontractkit/chainlink/v2/core/services/keystore/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
@@ -45,7 +45,7 @@ import (
 
 func makeTestEvmTxm(
 	t *testing.T, db *sqlx.DB, ethClient evmclient.Client, estimator gas.EvmFeeEstimator, ccfg txmgr.ChainConfig, fcfg txmgr.FeeConfig, txConfig evmconfig.Transactions, dbConfig txmgr.DatabaseConfig, listenerConfig txmgr.ListenerConfig, keyStore keystore.Eth) (txmgr.TxManager, error) {
-	lggr := logger.TestLogger(t)
+	lggr := logger.Test(t)
 	lp := logpoller.NewLogPoller(logpoller.NewORM(testutils.FixtureChainID, db, lggr, pgtest.NewQConfig(true)), ethClient, lggr, 100*time.Millisecond, false, 2, 3, 2, 1000)
 
 	// logic for building components (from evm/evm_txm.go) -------
@@ -83,7 +83,7 @@ func TestTxm_SendNativeToken_DoesNotSendToZero(t *testing.T) {
 
 	keyStore := cltest.NewKeyStore(t, db, dbConfig).Eth()
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
-	estimator := gas.NewEstimator(logger.TestLogger(t), ethClient, config, evmConfig.GasEstimator())
+	estimator := gas.NewEstimator(logger.Test(t), ethClient, config, evmConfig.GasEstimator())
 	txm, err := makeTestEvmTxm(t, db, ethClient, estimator, evmConfig, evmConfig.GasEstimator(), evmConfig.Transactions(), dbConfig, dbConfig.Listener(), keyStore)
 	require.NoError(t, err)
 
@@ -109,7 +109,7 @@ func TestTxm_CreateTransaction(t *testing.T) {
 
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
 
-	estimator := gas.NewEstimator(logger.TestLogger(t), ethClient, config, evmConfig.GasEstimator())
+	estimator := gas.NewEstimator(logger.Test(t), ethClient, config, evmConfig.GasEstimator())
 	txm, err := makeTestEvmTxm(t, db, ethClient, estimator, evmConfig, evmConfig.GasEstimator(), evmConfig.Transactions(), dbConfig, dbConfig.Listener(), kst.Eth())
 	require.NoError(t, err)
 
@@ -298,7 +298,7 @@ func TestTxm_CreateTransaction(t *testing.T) {
 		evmConfig.MaxQueued = uint64(1)
 
 		// Create mock forwarder, mock authorizedsenders call.
-		form := forwarders.NewORM(db, logger.TestLogger(t), cfg.Database())
+		form := forwarders.NewORM(db, logger.Test(t), cfg.Database())
 		fwdrAddr := testutils.NewAddress()
 		fwdr, err := form.CreateForwarder(fwdrAddr, utils.Big(cltest.FixtureChainID))
 		require.NoError(t, err)
@@ -391,7 +391,7 @@ func TestTxm_CreateTransaction_OutOfEth(t *testing.T) {
 	config, dbConfig, evmConfig := txmgr.MakeTestConfigs(t)
 
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
-	estimator := gas.NewEstimator(logger.TestLogger(t), ethClient, config, evmConfig.GasEstimator())
+	estimator := gas.NewEstimator(logger.Test(t), ethClient, config, evmConfig.GasEstimator())
 	txm, err := makeTestEvmTxm(t, db, ethClient, estimator, evmConfig, evmConfig.GasEstimator(), evmConfig.Transactions(), dbConfig, dbConfig.Listener(), etKeyStore)
 	require.NoError(t, err)
 
@@ -482,7 +482,7 @@ func TestTxm_Lifecycle(t *testing.T) {
 	keyChangeCh := make(chan struct{})
 	unsub := cltest.NewAwaiter()
 	kst.On("SubscribeToKeyChanges").Return(keyChangeCh, unsub.ItHappened)
-	estimator := gas.NewEstimator(logger.TestLogger(t), ethClient, config, evmConfig.GasEstimator())
+	estimator := gas.NewEstimator(logger.Test(t), ethClient, config, evmConfig.GasEstimator())
 	txm, err := makeTestEvmTxm(t, db, ethClient, estimator, evmConfig, evmConfig.GasEstimator(), evmConfig.Transactions(), dbConfig, dbConfig.Listener(), kst)
 	require.NoError(t, err)
 
@@ -535,7 +535,7 @@ func TestTxm_Reset(t *testing.T) {
 	ethClient.On("HeadByNumber", mock.Anything, (*big.Int)(nil)).Return(nil, nil)
 	ethClient.On("BatchCallContextAll", mock.Anything, mock.Anything).Return(nil).Maybe()
 
-	estimator := gas.NewEstimator(logger.TestLogger(t), ethClient, cfg.EVM(), cfg.EVM().GasEstimator())
+	estimator := gas.NewEstimator(logger.Test(t), ethClient, cfg.EVM(), cfg.EVM().GasEstimator())
 	txm, err := makeTestEvmTxm(t, db, ethClient, estimator, cfg.EVM(), cfg.EVM().GasEstimator(), cfg.EVM().Transactions(), cfg.Database(), cfg.Database().Listener(), kst.Eth())
 	require.NoError(t, err)
 
@@ -576,7 +576,7 @@ func TestTxm_Reset(t *testing.T) {
 }
 
 func newTxStore(t *testing.T, db *sqlx.DB, cfg pg.QConfig) txmgr.EvmTxStore {
-	return txmgr.NewTxStore(db, logger.TestLogger(t), cfg)
+	return txmgr.NewTxStore(db, logger.Test(t), cfg)
 }
 
 func newEthReceipt(blockNumber int64, blockHash common.Hash, txHash common.Hash, status uint64) txmgr.Receipt {
diff --git a/core/chains/evm/chain.go b/core/chains/legacyevm/chain.go
similarity index 99%
rename from core/chains/evm/chain.go
rename to core/chains/legacyevm/chain.go
index 1e52bed5cb6..0c35d929fc2 100644
--- a/core/chains/evm/chain.go
+++ b/core/chains/legacyevm/chain.go
@@ -1,4 +1,4 @@
-package evm
+package legacyevm
 
 import (
 	"context"
diff --git a/core/chains/evm/chain_test.go b/core/chains/legacyevm/chain_test.go
similarity index 80%
rename from core/chains/evm/chain_test.go
rename to core/chains/legacyevm/chain_test.go
index f25af87a35b..4fcd51c39d9 100644
--- a/core/chains/evm/chain_test.go
+++ b/core/chains/legacyevm/chain_test.go
@@ -1,4 +1,4 @@
-package evm_test
+package legacyevm_test
 
 import (
 	"math/big"
@@ -8,8 +8,8 @@ import (
 
 	"github.com/jmoiron/sqlx"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/mocks"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
@@ -17,13 +17,13 @@ import (
 )
 
 func TestLegacyChains(t *testing.T) {
-	evmCfg := configtest.NewGeneralConfig(t, nil)
+	legacyevmCfg := configtest.NewGeneralConfig(t, nil)
 
 	c := mocks.NewChain(t)
 	c.On("ID").Return(big.NewInt(7))
-	m := map[string]evm.Chain{c.ID().String(): c}
+	m := map[string]legacyevm.Chain{c.ID().String(): c}
 
-	l := evm.NewLegacyChains(m, evmCfg.EVMConfigs())
+	l := legacyevm.NewLegacyChains(m, legacyevmCfg.EVMConfigs())
 	assert.NotNil(t, l.ChainNodeConfigs())
 	got, err := l.Get(c.ID().String())
 	assert.NoError(t, err)
@@ -33,7 +33,7 @@ func TestLegacyChains(t *testing.T) {
 
 func TestChainOpts_Validate(t *testing.T) {
 	type fields struct {
-		AppConfig        evm.AppConfig
+		AppConfig        legacyevm.AppConfig
 		EventBroadcaster pg.EventBroadcaster
 		MailMon          *utils.MailboxMonitor
 		DB               *sqlx.DB
@@ -65,7 +65,7 @@ func TestChainOpts_Validate(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			o := evm.ChainOpts{
+			o := legacyevm.ChainOpts{
 				AppConfig:        tt.fields.AppConfig,
 				EventBroadcaster: tt.fields.EventBroadcaster,
 				MailMon:          tt.fields.MailMon,
diff --git a/core/chains/evm/evm_txm.go b/core/chains/legacyevm/evm_txm.go
similarity index 99%
rename from core/chains/evm/evm_txm.go
rename to core/chains/legacyevm/evm_txm.go
index bfc0f6378bf..1606ea1b244 100644
--- a/core/chains/evm/evm_txm.go
+++ b/core/chains/legacyevm/evm_txm.go
@@ -1,4 +1,4 @@
-package evm
+package legacyevm
 
 import (
 	"fmt"
diff --git a/core/chains/evm/mocks/chain.go b/core/chains/legacyevm/mocks/chain.go
similarity index 100%
rename from core/chains/evm/mocks/chain.go
rename to core/chains/legacyevm/mocks/chain.go
diff --git a/core/chains/evm/mocks/legacy_chain_container.go b/core/chains/legacyevm/mocks/legacy_chain_container.go
similarity index 73%
rename from core/chains/evm/mocks/legacy_chain_container.go
rename to core/chains/legacyevm/mocks/legacy_chain_container.go
index 9180a8a2fc5..9ebacb890aa 100644
--- a/core/chains/evm/mocks/legacy_chain_container.go
+++ b/core/chains/legacyevm/mocks/legacy_chain_container.go
@@ -3,7 +3,7 @@
 package mocks
 
 import (
-	evm "github.com/smartcontractkit/chainlink/v2/core/chains/evm"
+	legacyevm "github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	mock "github.com/stretchr/testify/mock"
 
 	types "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
@@ -31,19 +31,19 @@ func (_m *LegacyChainContainer) ChainNodeConfigs() types.Configs {
 }
 
 // Get provides a mock function with given fields: id
-func (_m *LegacyChainContainer) Get(id string) (evm.Chain, error) {
+func (_m *LegacyChainContainer) Get(id string) (legacyevm.Chain, error) {
 	ret := _m.Called(id)
 
-	var r0 evm.Chain
+	var r0 legacyevm.Chain
 	var r1 error
-	if rf, ok := ret.Get(0).(func(string) (evm.Chain, error)); ok {
+	if rf, ok := ret.Get(0).(func(string) (legacyevm.Chain, error)); ok {
 		return rf(id)
 	}
-	if rf, ok := ret.Get(0).(func(string) evm.Chain); ok {
+	if rf, ok := ret.Get(0).(func(string) legacyevm.Chain); ok {
 		r0 = rf(id)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(evm.Chain)
+			r0 = ret.Get(0).(legacyevm.Chain)
 		}
 	}
 
@@ -71,7 +71,7 @@ func (_m *LegacyChainContainer) Len() int {
 }
 
 // List provides a mock function with given fields: ids
-func (_m *LegacyChainContainer) List(ids ...string) ([]evm.Chain, error) {
+func (_m *LegacyChainContainer) List(ids ...string) ([]legacyevm.Chain, error) {
 	_va := make([]interface{}, len(ids))
 	for _i := range ids {
 		_va[_i] = ids[_i]
@@ -80,16 +80,16 @@ func (_m *LegacyChainContainer) List(ids ...string) ([]evm.Chain, error) {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
-	var r0 []evm.Chain
+	var r0 []legacyevm.Chain
 	var r1 error
-	if rf, ok := ret.Get(0).(func(...string) ([]evm.Chain, error)); ok {
+	if rf, ok := ret.Get(0).(func(...string) ([]legacyevm.Chain, error)); ok {
 		return rf(ids...)
 	}
-	if rf, ok := ret.Get(0).(func(...string) []evm.Chain); ok {
+	if rf, ok := ret.Get(0).(func(...string) []legacyevm.Chain); ok {
 		r0 = rf(ids...)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([]evm.Chain)
+			r0 = ret.Get(0).([]legacyevm.Chain)
 		}
 	}
 
@@ -103,15 +103,15 @@ func (_m *LegacyChainContainer) List(ids ...string) ([]evm.Chain, error) {
 }
 
 // Slice provides a mock function with given fields:
-func (_m *LegacyChainContainer) Slice() []evm.Chain {
+func (_m *LegacyChainContainer) Slice() []legacyevm.Chain {
 	ret := _m.Called()
 
-	var r0 []evm.Chain
-	if rf, ok := ret.Get(0).(func() []evm.Chain); ok {
+	var r0 []legacyevm.Chain
+	if rf, ok := ret.Get(0).(func() []legacyevm.Chain); ok {
 		r0 = rf()
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([]evm.Chain)
+			r0 = ret.Get(0).([]legacyevm.Chain)
 		}
 	}
 
diff --git a/core/cmd/shell.go b/core/cmd/shell.go
index b82bd85e3ed..35659aa7797 100644
--- a/core/cmd/shell.go
+++ b/core/cmd/shell.go
@@ -34,7 +34,7 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/loop"
 
 	"github.com/smartcontractkit/chainlink/v2/core/build"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/config"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/logger/audit"
@@ -166,7 +166,7 @@ func (n ChainlinkAppFactory) NewApplication(ctx context.Context, cfg chainlink.G
 
 	evmFactoryCfg := chainlink.EVMFactoryConfig{
 		CSAETHKeystore: keyStore,
-		ChainOpts:      evm.ChainOpts{AppConfig: cfg, EventBroadcaster: eventBroadcaster, MailMon: mailMon, DB: db},
+		ChainOpts:      legacyevm.ChainOpts{AppConfig: cfg, EventBroadcaster: eventBroadcaster, MailMon: mailMon, DB: db},
 	}
 	// evm always enabled for backward compatibility
 	// TODO BCF-2510 this needs to change in order to clear the path for EVM extraction
diff --git a/core/cmd/shell_local_test.go b/core/cmd/shell_local_test.go
index 2dc182944d3..1e030fa9e9e 100644
--- a/core/cmd/shell_local_test.go
+++ b/core/cmd/shell_local_test.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/smartcontractkit/chainlink/v2/common/client"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/cmd"
 	cmdMocks "github.com/smartcontractkit/chainlink/v2/core/cmd/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
@@ -39,7 +39,7 @@ import (
 	"github.com/urfave/cli"
 )
 
-func genTestEVMRelayers(t *testing.T, opts evm.ChainRelayExtenderConfig, ks evmrelayer.CSAETHKeystore) *chainlink.CoreRelayerChainInteroperators {
+func genTestEVMRelayers(t *testing.T, opts legacyevm.ChainRelayExtenderConfig, ks evmrelayer.CSAETHKeystore) *chainlink.CoreRelayerChainInteroperators {
 	f := chainlink.RelayerFactory{
 		Logger:       opts.Logger,
 		LoopRegistry: plugins.NewLoopRegistry(opts.Logger, opts.AppConfig.Tracing()),
@@ -83,10 +83,10 @@ func TestShell_RunNodeWithPasswords(t *testing.T) {
 
 			lggr := logger.TestLogger(t)
 
-			opts := evm.ChainRelayExtenderConfig{
+			opts := legacyevm.ChainRelayExtenderConfig{
 				Logger:   lggr,
 				KeyStore: keyStore.Eth(),
-				ChainOpts: evm.ChainOpts{
+				ChainOpts: legacyevm.ChainOpts{
 					AppConfig:        cfg,
 					EventBroadcaster: pg.NewNullEventBroadcaster(),
 					MailMon:          &utils.MailboxMonitor{},
@@ -188,10 +188,10 @@ func TestShell_RunNodeWithAPICredentialsFile(t *testing.T) {
 			ethClient.On("BalanceAt", mock.Anything, mock.Anything, mock.Anything).Return(big.NewInt(10), nil).Maybe()
 
 			lggr := logger.TestLogger(t)
-			opts := evm.ChainRelayExtenderConfig{
+			opts := legacyevm.ChainRelayExtenderConfig{
 				Logger:   lggr,
 				KeyStore: keyStore.Eth(),
-				ChainOpts: evm.ChainOpts{
+				ChainOpts: legacyevm.ChainOpts{
 					AppConfig:        cfg,
 					EventBroadcaster: pg.NewNullEventBroadcaster(),
 					MailMon:          &utils.MailboxMonitor{},
diff --git a/core/internal/cltest/cltest.go b/core/internal/cltest/cltest.go
index b1431bf0599..17a1d4fadd4 100644
--- a/core/internal/cltest/cltest.go
+++ b/core/internal/cltest/cltest.go
@@ -44,7 +44,6 @@ import (
 	commonmocks "github.com/smartcontractkit/chainlink/v2/common/types/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/auth"
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
@@ -52,6 +51,7 @@ import (
 	httypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker/types"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/cmd"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
@@ -173,7 +173,7 @@ type JobPipelineConfig interface {
 	MaxSuccessfulRuns() uint64
 }
 
-func NewJobPipelineV2(t testing.TB, cfg pipeline.BridgeConfig, jpcfg JobPipelineConfig, dbCfg pg.QConfig, legacyChains evm.LegacyChainContainer, db *sqlx.DB, keyStore keystore.Master, restrictedHTTPClient, unrestrictedHTTPClient *http.Client) JobPipelineV2TestHelper {
+func NewJobPipelineV2(t testing.TB, cfg pipeline.BridgeConfig, jpcfg JobPipelineConfig, dbCfg pg.QConfig, legacyChains legacyevm.LegacyChainContainer, db *sqlx.DB, keyStore keystore.Master, restrictedHTTPClient, unrestrictedHTTPClient *http.Client) JobPipelineV2TestHelper {
 	lggr := logger.TestLogger(t)
 	prm := pipeline.NewORM(db, lggr, dbCfg, jpcfg.MaxSuccessfulRuns())
 	btORM := bridges.NewORM(db, lggr, dbCfg)
@@ -349,7 +349,7 @@ func NewApplicationWithConfig(t testing.TB, cfg chainlink.GeneralConfig, flagsAn
 	}
 
 	evmOpts := chainlink.EVMFactoryConfig{
-		ChainOpts: evm.ChainOpts{
+		ChainOpts: legacyevm.ChainOpts{
 			AppConfig:        cfg,
 			EventBroadcaster: eventBroadcaster,
 			MailMon:          mailMon,
diff --git a/core/internal/cltest/mocks.go b/core/internal/cltest/mocks.go
index 540924d7f02..d49e94557e3 100644
--- a/core/internal/cltest/mocks.go
+++ b/core/internal/cltest/mocks.go
@@ -13,10 +13,10 @@ import (
 
 	"github.com/jmoiron/sqlx"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
-	evmmocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/mocks"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
+	evmmocks "github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/cmd"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
@@ -397,7 +397,7 @@ func (m MockPasswordPrompter) Prompt() string {
 	return m.Password
 }
 
-func NewLegacyChainsWithMockChain(t testing.TB, ethClient evmclient.Client, cfg evm.AppConfig) evm.LegacyChainContainer {
+func NewLegacyChainsWithMockChain(t testing.TB, ethClient evmclient.Client, cfg legacyevm.AppConfig) legacyevm.LegacyChainContainer {
 	ch := new(evmmocks.Chain)
 	ch.On("Client").Return(ethClient)
 	ch.On("Logger").Return(logger.TestLogger(t))
@@ -409,7 +409,7 @@ func NewLegacyChainsWithMockChain(t testing.TB, ethClient evmclient.Client, cfg
 
 }
 
-func NewLegacyChainsWithChain(ch evm.Chain, cfg evm.AppConfig) evm.LegacyChainContainer {
-	m := map[string]evm.Chain{ch.ID().String(): ch}
-	return evm.NewLegacyChains(m, cfg.EVMConfigs())
+func NewLegacyChainsWithChain(ch legacyevm.Chain, cfg legacyevm.AppConfig) legacyevm.LegacyChainContainer {
+	m := map[string]legacyevm.Chain{ch.ID().String(): ch}
+	return legacyevm.NewLegacyChains(m, cfg.EVMConfigs())
 }
diff --git a/core/internal/testutils/evmtest/evmtest.go b/core/internal/testutils/evmtest/evmtest.go
index 7674650c010..423615145e5 100644
--- a/core/internal/testutils/evmtest/evmtest.go
+++ b/core/internal/testutils/evmtest/evmtest.go
@@ -19,7 +19,6 @@ import (
 
 	commonmocks "github.com/smartcontractkit/chainlink/v2/common/types/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	evmconfig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config"
@@ -30,6 +29,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
@@ -40,7 +40,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
-func NewChainScopedConfig(t testing.TB, cfg evm.AppConfig) evmconfig.ChainScopedConfig {
+func NewChainScopedConfig(t testing.TB, cfg legacyevm.AppConfig) evmconfig.ChainScopedConfig {
 	var evmCfg *evmtoml.EVMConfig
 	if len(cfg.EVMConfigs()) > 0 {
 		evmCfg = cfg.EVMConfigs()[0]
@@ -60,7 +60,7 @@ type TestChainOpts struct {
 	Client         evmclient.Client
 	LogBroadcaster log.Broadcaster
 	LogPoller      logpoller.LogPoller
-	GeneralConfig  evm.AppConfig
+	GeneralConfig  legacyevm.AppConfig
 	HeadTracker    httypes.HeadTracker
 	DB             *sqlx.DB
 	TxManager      txmgr.TxManager
@@ -78,12 +78,12 @@ func NewChainRelayExtenders(t testing.TB, testopts TestChainOpts) *evmrelay.Chai
 	return cc
 }
 
-func NewChainRelayExtOpts(t testing.TB, testopts TestChainOpts) evm.ChainRelayExtenderConfig {
+func NewChainRelayExtOpts(t testing.TB, testopts TestChainOpts) legacyevm.ChainRelayExtenderConfig {
 	require.NotNil(t, testopts.KeyStore)
-	opts := evm.ChainRelayExtenderConfig{
+	opts := legacyevm.ChainRelayExtenderConfig{
 		Logger:   logger.TestLogger(t),
 		KeyStore: testopts.KeyStore,
-		ChainOpts: evm.ChainOpts{
+		ChainOpts: legacyevm.ChainOpts{
 			AppConfig:        testopts.GeneralConfig,
 			EventBroadcaster: pg.NewNullEventBroadcaster(),
 			MailMon:          testopts.MailMon,
@@ -138,7 +138,7 @@ func MustGetDefaultChainID(t testing.TB, evmCfgs evmtoml.EVMConfigs) *big.Int {
 }
 
 // Deprecated, this is a replacement function for tests for now removed default chain logic
-func MustGetDefaultChain(t testing.TB, cc evm.LegacyChainContainer) evm.Chain {
+func MustGetDefaultChain(t testing.TB, cc legacyevm.LegacyChainContainer) legacyevm.Chain {
 	if len(cc.Slice()) == 0 {
 		t.Fatalf("at least one evm chain container must be defined")
 	}
diff --git a/core/scripts/go.mod b/core/scripts/go.mod
index 43840f93ce8..d1795bbc846 100644
--- a/core/scripts/go.mod
+++ b/core/scripts/go.mod
@@ -304,7 +304,7 @@ require (
 	github.com/shirou/gopsutil/v3 v3.23.10 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231121180428-d7f28e91ccc3 // indirect
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f9248 // indirect
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 // indirect
 	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231117191230-aa6640f2edd1 // indirect
 	github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664 // indirect
diff --git a/core/scripts/go.sum b/core/scripts/go.sum
index d8e682c742d..cd7adf6bee3 100644
--- a/core/scripts/go.sum
+++ b/core/scripts/go.sum
@@ -1504,8 +1504,8 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
 github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
 github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231121180428-d7f28e91ccc3 h1:cyA1aW1PYrOLZAMaSmuH7U99QBTfrF59s+6uDxQgOr0=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231121180428-d7f28e91ccc3/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f9248 h1:HJCPvJ+ZjU9TSX4YD5rxBJqGAvqhDfzoJgI3WmfeWeI=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f9248/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 h1:oewYJtdRkJKUHCNDCj5C2LQe6Oq6qy975g931nfG0cc=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542/go.mod h1:EpvRoycRD+kniYlz+pCpRT5e+fmPm0mSD/vmND+0oMg=
 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231117191230-aa6640f2edd1 h1:D7yb4kgNGVAiD5lFYqm/LW8d5jU66TXyYvSskDiW9yg=
diff --git a/core/services/blockhashstore/delegate.go b/core/services/blockhashstore/delegate.go
index 1a84323b6f0..d6c27acd0b5 100644
--- a/core/services/blockhashstore/delegate.go
+++ b/core/services/blockhashstore/delegate.go
@@ -9,7 +9,7 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/blockhash_store"
 	v1 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/solidity_vrf_coordinator_interface"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/trusted_blockhash_store"
@@ -28,14 +28,14 @@ var _ job.ServiceCtx = &service{}
 // Delegate creates BlockhashStore feeder jobs.
 type Delegate struct {
 	logger       logger.Logger
-	legacyChains evm.LegacyChainContainer
+	legacyChains legacyevm.LegacyChainContainer
 	ks           keystore.Eth
 }
 
 // NewDelegate creates a new Delegate.
 func NewDelegate(
 	logger logger.Logger,
-	legacyChains evm.LegacyChainContainer,
+	legacyChains legacyevm.LegacyChainContainer,
 	ks keystore.Eth,
 ) *Delegate {
 	return &Delegate{
diff --git a/core/services/blockhashstore/delegate_test.go b/core/services/blockhashstore/delegate_test.go
index 011ab87ad6b..0096ac5ca9e 100644
--- a/core/services/blockhashstore/delegate_test.go
+++ b/core/services/blockhashstore/delegate_test.go
@@ -10,10 +10,10 @@ import (
 	"go.uber.org/zap/zapcore"
 	"go.uber.org/zap/zaptest/observer"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	mocklp "github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller/mocks"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
@@ -41,7 +41,7 @@ func TestDelegate_JobType(t *testing.T) {
 type testData struct {
 	ethClient    *mocks.Client
 	ethKeyStore  keystore.Eth
-	legacyChains evm.LegacyChainContainer
+	legacyChains legacyevm.LegacyChainContainer
 	sendingKey   ethkey.KeyV2
 	logs         *observer.ObservedLogs
 }
diff --git a/core/services/blockheaderfeeder/delegate.go b/core/services/blockheaderfeeder/delegate.go
index 3de42d7a9e9..53f514cee27 100644
--- a/core/services/blockheaderfeeder/delegate.go
+++ b/core/services/blockheaderfeeder/delegate.go
@@ -9,7 +9,7 @@ import (
 	"go.uber.org/multierr"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/batch_blockhash_store"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/blockhash_store"
 	v1 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/solidity_vrf_coordinator_interface"
@@ -27,13 +27,13 @@ var _ job.ServiceCtx = &service{}
 
 type Delegate struct {
 	logger       logger.Logger
-	legacyChains evm.LegacyChainContainer
+	legacyChains legacyevm.LegacyChainContainer
 	ks           keystore.Eth
 }
 
 func NewDelegate(
 	logger logger.Logger,
-	legacyChains evm.LegacyChainContainer,
+	legacyChains legacyevm.LegacyChainContainer,
 	ks keystore.Eth,
 ) *Delegate {
 	return &Delegate{
diff --git a/core/services/chainlink/mocks/relayer_chain_interoperators.go b/core/services/chainlink/mocks/relayer_chain_interoperators.go
index f778f61b0cb..74dc9dc1d45 100644
--- a/core/services/chainlink/mocks/relayer_chain_interoperators.go
+++ b/core/services/chainlink/mocks/relayer_chain_interoperators.go
@@ -7,7 +7,7 @@ import (
 	services2 "github.com/smartcontractkit/chainlink/v2/core/services"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/loop"
 
@@ -19,12 +19,12 @@ import (
 // FakeRelayerChainInteroperators is a fake chainlink.RelayerChainInteroperators.
 // This exists because mockery generation doesn't understand how to produce an alias instead of the underlying type (which is not exported in this case).
 type FakeRelayerChainInteroperators struct {
-	EVMChains evm.LegacyChainContainer
+	EVMChains legacyevm.LegacyChainContainer
 	Nodes     []types.NodeStatus
 	NodesErr  error
 }
 
-func (f *FakeRelayerChainInteroperators) LegacyEVMChains() evm.LegacyChainContainer {
+func (f *FakeRelayerChainInteroperators) LegacyEVMChains() legacyevm.LegacyChainContainer {
 	return f.EVMChains
 }
 
diff --git a/core/services/chainlink/relayer_chain_interoperators.go b/core/services/chainlink/relayer_chain_interoperators.go
index 3be1395694d..673f71e3c65 100644
--- a/core/services/chainlink/relayer_chain_interoperators.go
+++ b/core/services/chainlink/relayer_chain_interoperators.go
@@ -13,7 +13,7 @@ import (
 	"github.com/smartcontractkit/chainlink-cosmos/pkg/cosmos/adapters"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/services"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay"
@@ -46,7 +46,7 @@ type LoopRelayerStorer interface {
 // This will be deprecated/removed when products depend only
 // on the relayer interface.
 type LegacyChainer interface {
-	LegacyEVMChains() evm.LegacyChainContainer
+	LegacyEVMChains() legacyevm.LegacyChainContainer
 	LegacyCosmosChains() LegacyCosmosContainer
 }
 
@@ -106,14 +106,14 @@ func InitEVM(ctx context.Context, factory RelayerFactory, config EVMFactoryConfi
 			return fmt.Errorf("failed to setup EVM relayer: %w", err2)
 		}
 
-		legacyMap := make(map[string]evm.Chain)
+		legacyMap := make(map[string]legacyevm.Chain)
 		for id, a := range adapters {
 			// adapter is a service
 			op.srvs = append(op.srvs, a)
 			op.loopRelayers[id] = a
 			legacyMap[id.ChainID] = a.Chain()
 		}
-		op.legacyChains.EVMChains = evm.NewLegacyChains(legacyMap, config.AppConfig.EVMConfigs())
+		op.legacyChains.EVMChains = legacyevm.NewLegacyChains(legacyMap, config.AppConfig.EVMConfigs())
 		return nil
 	}
 }
@@ -185,7 +185,7 @@ func (rs *CoreRelayerChainInteroperators) Get(id relay.ID) (loop.Relayer, error)
 
 // LegacyEVMChains returns a container with all the evm chains
 // TODO BCF-2511
-func (rs *CoreRelayerChainInteroperators) LegacyEVMChains() evm.LegacyChainContainer {
+func (rs *CoreRelayerChainInteroperators) LegacyEVMChains() legacyevm.LegacyChainContainer {
 	rs.mu.Lock()
 	defer rs.mu.Unlock()
 	return rs.legacyChains.EVMChains
@@ -351,7 +351,7 @@ func (rs *CoreRelayerChainInteroperators) Services() (s []services.ServiceCtx) {
 // legacyChains encapsulates the chain-specific dependencies. Will be
 // deprecated when chain-specific logic is removed from products.
 type legacyChains struct {
-	EVMChains    evm.LegacyChainContainer
+	EVMChains    legacyevm.LegacyChainContainer
 	CosmosChains LegacyCosmosContainer
 }
 
diff --git a/core/services/chainlink/relayer_chain_interoperators_test.go b/core/services/chainlink/relayer_chain_interoperators_test.go
index da1246c7bfe..6a5445d9f21 100644
--- a/core/services/chainlink/relayer_chain_interoperators_test.go
+++ b/core/services/chainlink/relayer_chain_interoperators_test.go
@@ -16,7 +16,7 @@ import (
 	stkcfg "github.com/smartcontractkit/chainlink-starknet/relayer/pkg/chainlink/config"
 
 	"github.com/smartcontractkit/chainlink-solana/pkg/solana"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
@@ -203,7 +203,7 @@ func TestCoreRelayerChainInteroperators(t *testing.T) {
 		{name: "2 evm chains with 3 nodes",
 			initFuncs: []chainlink.CoreRelayerChainInitFunc{
 				chainlink.InitEVM(testctx, factory, chainlink.EVMFactoryConfig{
-					ChainOpts: evm.ChainOpts{
+					ChainOpts: legacyevm.ChainOpts{
 						AppConfig:        cfg,
 						EventBroadcaster: pg.NewNullEventBroadcaster(),
 						MailMon:          &utils.MailboxMonitor{},
@@ -277,7 +277,7 @@ func TestCoreRelayerChainInteroperators(t *testing.T) {
 				Keystore:    keyStore.Solana(),
 				TOMLConfigs: cfg.SolanaConfigs()}),
 				chainlink.InitEVM(testctx, factory, chainlink.EVMFactoryConfig{
-					ChainOpts: evm.ChainOpts{
+					ChainOpts: legacyevm.ChainOpts{
 						AppConfig:        cfg,
 						EventBroadcaster: pg.NewNullEventBroadcaster(),
 						MailMon:          &utils.MailboxMonitor{},
diff --git a/core/services/chainlink/relayer_factory.go b/core/services/chainlink/relayer_factory.go
index 6376839c700..c15643551e9 100644
--- a/core/services/chainlink/relayer_factory.go
+++ b/core/services/chainlink/relayer_factory.go
@@ -18,7 +18,7 @@ import (
 	starkchain "github.com/smartcontractkit/chainlink-starknet/relayer/pkg/chainlink/chain"
 	"github.com/smartcontractkit/chainlink-starknet/relayer/pkg/chainlink/config"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/config/env"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
@@ -35,7 +35,7 @@ type RelayerFactory struct {
 }
 
 type EVMFactoryConfig struct {
-	evm.ChainOpts
+	legacyevm.ChainOpts
 	evmrelay.CSAETHKeystore
 }
 
@@ -45,7 +45,7 @@ func (r *RelayerFactory) NewEVM(ctx context.Context, config EVMFactoryConfig) (m
 	relayers := make(map[relay.ID]evmrelay.LoopRelayAdapter)
 
 	// override some common opts with the factory values. this seems weird... maybe other signatures should change, or this should take a different type...
-	ccOpts := evm.ChainRelayExtenderConfig{
+	ccOpts := legacyevm.ChainRelayExtenderConfig{
 		Logger:    r.Logger.Named("EVM"),
 		KeyStore:  config.CSAETHKeystore.Eth(),
 		ChainOpts: config.ChainOpts,
@@ -69,7 +69,7 @@ func (r *RelayerFactory) NewEVM(ctx context.Context, config EVMFactoryConfig) (m
 			CSAETHKeystore:   config.CSAETHKeystore,
 			EventBroadcaster: ccOpts.EventBroadcaster,
 		}
-		relayer, err2 := evmrelay.NewRelayer(ccOpts.Logger.Named(relayID.ChainID), chain, relayerOpts)
+		relayer, err2 := evmrelay.NewRelayer(r.Logger.Named("EVM").Named(relayID.ChainID), chain, relayerOpts)
 		if err2 != nil {
 			err = errors.Join(err, err2)
 			continue
diff --git a/core/services/directrequest/delegate.go b/core/services/directrequest/delegate.go
index 687e1cea675..a21029ea177 100644
--- a/core/services/directrequest/delegate.go
+++ b/core/services/directrequest/delegate.go
@@ -12,9 +12,9 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/assets"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/operator_wrapper"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
@@ -30,7 +30,7 @@ type (
 		pipelineRunner pipeline.Runner
 		pipelineORM    pipeline.ORM
 		chHeads        chan *evmtypes.Head
-		legacyChains   evm.LegacyChainContainer
+		legacyChains   legacyevm.LegacyChainContainer
 		mailMon        *utils.MailboxMonitor
 	}
 
@@ -46,7 +46,7 @@ func NewDelegate(
 	logger logger.Logger,
 	pipelineRunner pipeline.Runner,
 	pipelineORM pipeline.ORM,
-	legacyChains evm.LegacyChainContainer,
+	legacyChains legacyevm.LegacyChainContainer,
 	mailMon *utils.MailboxMonitor,
 ) *Delegate {
 	return &Delegate{
diff --git a/core/services/feeds/service.go b/core/services/feeds/service.go
index 32a8432f876..ea6e6cae5ab 100644
--- a/core/services/feeds/service.go
+++ b/core/services/feeds/service.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	pb "github.com/smartcontractkit/chainlink/v2/core/services/feeds/proto"
 	"github.com/smartcontractkit/chainlink/v2/core/services/fluxmonitorv2"
@@ -115,7 +115,7 @@ type service struct {
 	ocrCfg       OCRConfig
 	ocr2cfg      OCR2Config
 	connMgr      ConnectionsManager
-	legacyChains evm.LegacyChainContainer
+	legacyChains legacyevm.LegacyChainContainer
 	lggr         logger.Logger
 	version      string
 }
@@ -132,7 +132,7 @@ func NewService(
 	ocrCfg OCRConfig,
 	ocr2Cfg OCR2Config,
 	dbCfg pg.QConfig,
-	legacyChains evm.LegacyChainContainer,
+	legacyChains legacyevm.LegacyChainContainer,
 	lggr logger.Logger,
 	version string,
 ) *service {
diff --git a/core/services/feeds/service_test.go b/core/services/feeds/service_test.go
index c94a75b3dd5..d811a4461fd 100644
--- a/core/services/feeds/service_test.go
+++ b/core/services/feeds/service_test.go
@@ -11,8 +11,8 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/pkg/errors"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
@@ -149,7 +149,7 @@ type TestService struct {
 	p2pKeystore  *ksmocks.P2P
 	ocr1Keystore *ksmocks.OCR
 	ocr2Keystore *ksmocks.OCR2
-	legacyChains evm.LegacyChainContainer
+	legacyChains legacyevm.LegacyChainContainer
 }
 
 func setupTestService(t *testing.T) *TestService {
diff --git a/core/services/fluxmonitorv2/delegate.go b/core/services/fluxmonitorv2/delegate.go
index e63f3556726..99e2b688f5d 100644
--- a/core/services/fluxmonitorv2/delegate.go
+++ b/core/services/fluxmonitorv2/delegate.go
@@ -6,8 +6,8 @@ import (
 	"github.com/jmoiron/sqlx"
 
 	txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
@@ -22,7 +22,7 @@ type Delegate struct {
 	jobORM         job.ORM
 	pipelineORM    pipeline.ORM
 	pipelineRunner pipeline.Runner
-	legacyChains   evm.LegacyChainContainer
+	legacyChains   legacyevm.LegacyChainContainer
 	lggr           logger.Logger
 }
 
@@ -35,7 +35,7 @@ func NewDelegate(
 	pipelineORM pipeline.ORM,
 	pipelineRunner pipeline.Runner,
 	db *sqlx.DB,
-	legacyChains evm.LegacyChainContainer,
+	legacyChains legacyevm.LegacyChainContainer,
 	lggr logger.Logger,
 ) *Delegate {
 	return &Delegate{
diff --git a/core/services/gateway/delegate.go b/core/services/gateway/delegate.go
index 909ca21ad73..d4180184aca 100644
--- a/core/services/gateway/delegate.go
+++ b/core/services/gateway/delegate.go
@@ -7,7 +7,7 @@ import (
 	"github.com/pelletier/go-toml"
 	"github.com/pkg/errors"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/gateway/config"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
@@ -16,14 +16,14 @@ import (
 )
 
 type Delegate struct {
-	legacyChains evm.LegacyChainContainer
+	legacyChains legacyevm.LegacyChainContainer
 	ks           keystore.Eth
 	lggr         logger.Logger
 }
 
 var _ job.Delegate = (*Delegate)(nil)
 
-func NewDelegate(legacyChains evm.LegacyChainContainer, ks keystore.Eth, lggr logger.Logger) *Delegate {
+func NewDelegate(legacyChains legacyevm.LegacyChainContainer, ks keystore.Eth, lggr logger.Logger) *Delegate {
 	return &Delegate{legacyChains: legacyChains, ks: ks, lggr: lggr}
 }
 
diff --git a/core/services/gateway/handler_factory.go b/core/services/gateway/handler_factory.go
index 519de608a0f..368bc64c872 100644
--- a/core/services/gateway/handler_factory.go
+++ b/core/services/gateway/handler_factory.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/gateway/config"
 	"github.com/smartcontractkit/chainlink/v2/core/services/gateway/handlers"
@@ -17,13 +17,13 @@ const (
 )
 
 type handlerFactory struct {
-	legacyChains evm.LegacyChainContainer
+	legacyChains legacyevm.LegacyChainContainer
 	lggr         logger.Logger
 }
 
 var _ HandlerFactory = (*handlerFactory)(nil)
 
-func NewHandlerFactory(legacyChains evm.LegacyChainContainer, lggr logger.Logger) HandlerFactory {
+func NewHandlerFactory(legacyChains legacyevm.LegacyChainContainer, lggr logger.Logger) HandlerFactory {
 	return &handlerFactory{legacyChains, lggr}
 }
 
diff --git a/core/services/gateway/handlers/functions/handler.functions.go b/core/services/gateway/handlers/functions/handler.functions.go
index b52c866a131..5277f9789d6 100644
--- a/core/services/gateway/handlers/functions/handler.functions.go
+++ b/core/services/gateway/handlers/functions/handler.functions.go
@@ -16,7 +16,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/assets"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/gateway/api"
 	"github.com/smartcontractkit/chainlink/v2/core/services/gateway/config"
@@ -96,7 +96,7 @@ type PendingRequest struct {
 
 var _ handlers.Handler = (*functionsHandler)(nil)
 
-func NewFunctionsHandlerFromConfig(handlerConfig json.RawMessage, donConfig *config.DONConfig, don handlers.DON, legacyChains evm.LegacyChainContainer, lggr logger.Logger) (handlers.Handler, error) {
+func NewFunctionsHandlerFromConfig(handlerConfig json.RawMessage, donConfig *config.DONConfig, don handlers.DON, legacyChains legacyevm.LegacyChainContainer, lggr logger.Logger) (handlers.Handler, error) {
 	var cfg FunctionsHandlerConfig
 	err := json.Unmarshal(handlerConfig, &cfg)
 	if err != nil {
diff --git a/core/services/keeper/delegate.go b/core/services/keeper/delegate.go
index 6d413624969..0dbf584c56f 100644
--- a/core/services/keeper/delegate.go
+++ b/core/services/keeper/delegate.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/jmoiron/sqlx"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
@@ -21,7 +21,7 @@ type Delegate struct {
 	db           *sqlx.DB
 	jrm          job.ORM
 	pr           pipeline.Runner
-	legacyChains evm.LegacyChainContainer
+	legacyChains legacyevm.LegacyChainContainer
 	mailMon      *utils.MailboxMonitor
 }
 
@@ -31,7 +31,7 @@ func NewDelegate(
 	jrm job.ORM,
 	pr pipeline.Runner,
 	logger logger.Logger,
-	legacyChains evm.LegacyChainContainer,
+	legacyChains legacyevm.LegacyChainContainer,
 	mailMon *utils.MailboxMonitor,
 ) *Delegate {
 	return &Delegate{
diff --git a/core/services/keeper/upkeep_executer_test.go b/core/services/keeper/upkeep_executer_test.go
index a064c3ed4b6..7bbecafa22d 100644
--- a/core/services/keeper/upkeep_executer_test.go
+++ b/core/services/keeper/upkeep_executer_test.go
@@ -15,7 +15,6 @@ import (
 
 	"github.com/jmoiron/sqlx"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
@@ -23,6 +22,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	txmmocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr/mocks"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
@@ -62,7 +62,7 @@ func setup(t *testing.T, estimator gas.EvmFeeEstimator, overrideFn func(c *chain
 	cltest.JobPipelineV2TestHelper,
 	*txmmocks.MockEvmTxManager,
 	keystore.Master,
-	evm.Chain,
+	legacyevm.Chain,
 	keeper.ORM,
 ) {
 	cfg := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
diff --git a/core/services/ocr/delegate.go b/core/services/ocr/delegate.go
index c8de3ec33c4..aa058d64979 100644
--- a/core/services/ocr/delegate.go
+++ b/core/services/ocr/delegate.go
@@ -19,8 +19,8 @@ import (
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting/types"
 
 	txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/offchain_aggregator_wrapper"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
@@ -41,7 +41,7 @@ type Delegate struct {
 	pipelineRunner        pipeline.Runner
 	peerWrapper           *ocrcommon.SingletonPeerWrapper
 	monitoringEndpointGen telemetry.MonitoringEndpointGenerator
-	legacyChains          evm.LegacyChainContainer
+	legacyChains          legacyevm.LegacyChainContainer
 	lggr                  logger.Logger
 	cfg                   Config
 	mailMon               *utils.MailboxMonitor
@@ -58,7 +58,7 @@ func NewDelegate(
 	pipelineRunner pipeline.Runner,
 	peerWrapper *ocrcommon.SingletonPeerWrapper,
 	monitoringEndpointGen telemetry.MonitoringEndpointGenerator,
-	legacyChains evm.LegacyChainContainer,
+	legacyChains legacyevm.LegacyChainContainer,
 	lggr logger.Logger,
 	cfg Config,
 	mailMon *utils.MailboxMonitor,
@@ -346,7 +346,7 @@ func (d *Delegate) ServicesForSpec(jb job.Job) (services []job.ServiceCtx, err e
 	return services, nil
 }
 
-func (d *Delegate) maybeCreateConfigOverrider(logger logger.Logger, chain evm.Chain, contractAddress ethkey.EIP55Address) (*ConfigOverriderImpl, error) {
+func (d *Delegate) maybeCreateConfigOverrider(logger logger.Logger, chain legacyevm.Chain, contractAddress ethkey.EIP55Address) (*ConfigOverriderImpl, error) {
 	flagsContractAddress := chain.Config().EVM().FlagsContractAddress()
 	if flagsContractAddress != "" {
 		flags, err := NewFlags(flagsContractAddress, chain.Client())
diff --git a/core/services/ocr/validate.go b/core/services/ocr/validate.go
index 145bb7597ec..a780ebb0821 100644
--- a/core/services/ocr/validate.go
+++ b/core/services/ocr/validate.go
@@ -11,8 +11,8 @@ import (
 	"github.com/smartcontractkit/libocr/offchainreporting"
 
 	"github.com/smartcontractkit/chainlink/v2/common/config"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
 	evmconfig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocrcommon"
@@ -37,7 +37,7 @@ type insecureConfig interface {
 }
 
 // ValidatedOracleSpecToml validates an oracle spec that came from TOML
-func ValidatedOracleSpecToml(legacyChains evm.LegacyChainContainer, tomlString string) (job.Job, error) {
+func ValidatedOracleSpecToml(legacyChains legacyevm.LegacyChainContainer, tomlString string) (job.Job, error) {
 	return ValidatedOracleSpecTomlCfg(func(id *big.Int) (evmconfig.ChainScopedConfig, error) {
 		c, err := legacyChains.Get(id.String())
 		if err != nil {
diff --git a/core/services/ocr2/delegate.go b/core/services/ocr2/delegate.go
index 7a90e3b07e4..45ee4e0f8fb 100644
--- a/core/services/ocr2/delegate.go
+++ b/core/services/ocr2/delegate.go
@@ -36,7 +36,7 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
 
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	coreconfig "github.com/smartcontractkit/chainlink/v2/core/config"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
@@ -118,7 +118,7 @@ type Delegate struct {
 	isNewlyCreatedJob bool // Set to true if this is a new job freshly added, false if job was present already on node boot.
 	mailMon           *utils.MailboxMonitor
 
-	legacyChains evm.LegacyChainContainer // legacy: use relayers instead
+	legacyChains legacyevm.LegacyChainContainer // legacy: use relayers instead
 }
 
 type DelegateConfig interface {
@@ -217,7 +217,7 @@ func NewDelegate(
 	pipelineRunner pipeline.Runner,
 	peerWrapper *ocrcommon.SingletonPeerWrapper,
 	monitoringEndpointGen telemetry.MonitoringEndpointGenerator,
-	legacyChains evm.LegacyChainContainer,
+	legacyChains legacyevm.LegacyChainContainer,
 	lggr logger.Logger,
 	cfg DelegateConfig,
 	ks keystore.OCR2,
@@ -462,7 +462,7 @@ func (d *Delegate) ServicesForSpec(jb job.Job) ([]job.ServiceCtx, error) {
 	}
 }
 
-func GetEVMEffectiveTransmitterID(jb *job.Job, chain evm.Chain, lggr logger.SugaredLogger) (string, error) {
+func GetEVMEffectiveTransmitterID(jb *job.Job, chain legacyevm.Chain, lggr logger.SugaredLogger) (string, error) {
 	spec := jb.OCR2OracleSpec
 	if spec.PluginType == types.Mercury {
 		return spec.TransmitterID.String, nil
diff --git a/core/services/ocr2/plugins/functions/plugin.go b/core/services/ocr2/plugins/functions/plugin.go
index 82280f527cd..2ebd7e30805 100644
--- a/core/services/ocr2/plugins/functions/plugin.go
+++ b/core/services/ocr2/plugins/functions/plugin.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/functions"
 	"github.com/smartcontractkit/chainlink/v2/core/services/gateway/connector"
@@ -39,7 +39,7 @@ type FunctionsServicesConfig struct {
 	BridgeORM         bridges.ORM
 	QConfig           pg.QConfig
 	DB                *sqlx.DB
-	Chain             evm.Chain
+	Chain             legacyevm.Chain
 	ContractID        string
 	Logger            logger.Logger
 	MailMon           *utils.MailboxMonitor
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm20/registry.go b/core/services/ocr2/plugins/ocr2keeper/evm20/registry.go
index 3cb91ab8dcb..682ebb6e2a3 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm20/registry.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evm20/registry.go
@@ -20,9 +20,9 @@ import (
 	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v2"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/keeper_registry_wrapper2_0"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
@@ -71,7 +71,7 @@ type LatestBlockGetter interface {
 	LatestBlock() int64
 }
 
-func NewEVMRegistryService(addr common.Address, client evm.Chain, lggr logger.Logger) (*EvmRegistry, error) {
+func NewEVMRegistryService(addr common.Address, client legacyevm.Chain, lggr logger.Logger) (*EvmRegistry, error) {
 	keeperRegistryABI, err := abi.JSON(strings.NewReader(keeper_registry_wrapper2_0.KeeperRegistryABI))
 	if err != nil {
 		return nil, fmt.Errorf("%w: %s", ErrABINotParsable, err)
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/registry.go b/core/services/ocr2/plugins/ocr2keeper/evm21/registry.go
index 18795eb0736..e6db3e66e69 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/registry.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evm21/registry.go
@@ -21,9 +21,9 @@ import (
 
 	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated"
 	iregistry21 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/i_keeper_registry_master_wrapper_2_1"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
@@ -79,7 +79,7 @@ type HttpClient interface {
 func NewEvmRegistry(
 	lggr logger.Logger,
 	addr common.Address,
-	client evm.Chain,
+	client legacyevm.Chain,
 	registry *iregistry21.IKeeperRegistryMaster,
 	mc *models.MercuryCredentials,
 	al ActiveUpkeepList,
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/services.go b/core/services/ocr2/plugins/ocr2keeper/evm21/services.go
index 18c9ed6d39d..35d2f82942b 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/services.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evm21/services.go
@@ -12,7 +12,7 @@ import (
 	"github.com/smartcontractkit/chainlink-automation/pkg/v3/plugin"
 	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	iregistry21 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/i_keeper_registry_master_wrapper_2_1"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/models"
@@ -36,7 +36,7 @@ type AutomationServices interface {
 	Keyring() ocr3types.OnchainKeyring[plugin.AutomationReportInfo]
 }
 
-func New(addr common.Address, client evm.Chain, mc *models.MercuryCredentials, keyring ocrtypes.OnchainKeyring, lggr logger.Logger, db *sqlx.DB, dbCfg pg.QConfig) (AutomationServices, error) {
+func New(addr common.Address, client legacyevm.Chain, mc *models.MercuryCredentials, keyring ocrtypes.OnchainKeyring, lggr logger.Logger, db *sqlx.DB, dbCfg pg.QConfig) (AutomationServices, error) {
 	registryContract, err := iregistry21.NewIKeeperRegistryMaster(addr, client.Client())
 	if err != nil {
 		return nil, fmt.Errorf("%w: failed to create caller for address and backend", ErrInitializationFailure)
diff --git a/core/services/ocr2/plugins/ocr2keeper/util.go b/core/services/ocr2/plugins/ocr2keeper/util.go
index 2c477e7a6a1..0c81b16f0fa 100644
--- a/core/services/ocr2/plugins/ocr2keeper/util.go
+++ b/core/services/ocr2/plugins/ocr2keeper/util.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
@@ -44,7 +44,7 @@ var (
 	ErrNoChainFromSpec = fmt.Errorf("could not create chain from spec")
 )
 
-func EVMProvider(db *sqlx.DB, chain evm.Chain, lggr logger.Logger, spec job.Job, pr pipeline.Runner) (evmrelay.OCR2KeeperProvider, error) {
+func EVMProvider(db *sqlx.DB, chain legacyevm.Chain, lggr logger.Logger, spec job.Job, pr pipeline.Runner) (evmrelay.OCR2KeeperProvider, error) {
 	oSpec := spec.OCR2OracleSpec
 	ocr2keeperRelayer := evmrelay.NewOCR2KeeperRelayer(db, chain, pr, spec, lggr.Named("OCR2KeeperRelayer"))
 
@@ -71,7 +71,7 @@ func EVMDependencies20(
 	spec job.Job,
 	db *sqlx.DB,
 	lggr logger.Logger,
-	chain evm.Chain,
+	chain legacyevm.Chain,
 	pr pipeline.Runner,
 ) (evmrelay.OCR2KeeperProvider, *kevm20.EvmRegistry, Encoder20, *kevm20.LogProvider, error) {
 	var err error
@@ -112,7 +112,7 @@ func EVMDependencies21(
 	spec job.Job,
 	db *sqlx.DB,
 	lggr logger.Logger,
-	chain evm.Chain,
+	chain legacyevm.Chain,
 	pr pipeline.Runner,
 	mc *models.MercuryCredentials,
 	keyring ocrtypes.OnchainKeyring,
diff --git a/core/services/pipeline/helpers_test.go b/core/services/pipeline/helpers_test.go
index 974ff29d11c..9ee2dc693f2 100644
--- a/core/services/pipeline/helpers_test.go
+++ b/core/services/pipeline/helpers_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/google/uuid"
 
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 )
 
 const (
@@ -50,14 +50,14 @@ func (t *HTTPTask) HelperSetDependencies(config Config, restrictedHTTPClient, un
 	t.unrestrictedHTTPClient = unrestrictedHTTPClient
 }
 
-func (t *ETHCallTask) HelperSetDependencies(legacyChains evm.LegacyChainContainer, config Config, specGasLimit *uint32, jobType string) {
+func (t *ETHCallTask) HelperSetDependencies(legacyChains legacyevm.LegacyChainContainer, config Config, specGasLimit *uint32, jobType string) {
 	t.legacyChains = legacyChains
 	t.config = config
 	t.specGasLimit = specGasLimit
 	t.jobType = jobType
 }
 
-func (t *ETHTxTask) HelperSetDependencies(legacyChains evm.LegacyChainContainer, keyStore ETHKeyStore, specGasLimit *uint32, jobType string) {
+func (t *ETHTxTask) HelperSetDependencies(legacyChains legacyevm.LegacyChainContainer, keyStore ETHKeyStore, specGasLimit *uint32, jobType string) {
 	t.legacyChains = legacyChains
 	t.keyStore = keyStore
 	t.specGasLimit = specGasLimit
diff --git a/core/services/pipeline/runner.go b/core/services/pipeline/runner.go
index 388f7358ef3..768f163f9b1 100644
--- a/core/services/pipeline/runner.go
+++ b/core/services/pipeline/runner.go
@@ -17,7 +17,7 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/recovery"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
@@ -57,7 +57,7 @@ type runner struct {
 	btORM                  bridges.ORM
 	config                 Config
 	bridgeConfig           BridgeConfig
-	legacyEVMChains        evm.LegacyChainContainer
+	legacyEVMChains        legacyevm.LegacyChainContainer
 	ethKeyStore            ETHKeyStore
 	vrfKeyStore            VRFKeyStore
 	runReaperWorker        utils.SleeperTask
@@ -102,7 +102,7 @@ var (
 	)
 )
 
-func NewRunner(orm ORM, btORM bridges.ORM, cfg Config, bridgeCfg BridgeConfig, legacyChains evm.LegacyChainContainer, ethks ETHKeyStore, vrfks VRFKeyStore, lggr logger.Logger, httpClient, unrestrictedHTTPClient *http.Client) *runner {
+func NewRunner(orm ORM, btORM bridges.ORM, cfg Config, bridgeCfg BridgeConfig, legacyChains legacyevm.LegacyChainContainer, ethks ETHKeyStore, vrfks VRFKeyStore, lggr logger.Logger, httpClient, unrestrictedHTTPClient *http.Client) *runner {
 	r := &runner{
 		orm:                    orm,
 		btORM:                  btORM,
diff --git a/core/services/pipeline/task.estimategas.go b/core/services/pipeline/task.estimategas.go
index 88c6f6facc3..1c0159819b4 100644
--- a/core/services/pipeline/task.estimategas.go
+++ b/core/services/pipeline/task.estimategas.go
@@ -12,7 +12,7 @@ import (
 	"github.com/shopspring/decimal"
 	"go.uber.org/multierr"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
@@ -30,7 +30,7 @@ type EstimateGasLimitTask struct {
 	EVMChainID string `json:"evmChainID" mapstructure:"evmChainID"`
 
 	specGasLimit *uint32
-	legacyChains evm.LegacyChainContainer
+	legacyChains legacyevm.LegacyChainContainer
 	jobType      string
 }
 
diff --git a/core/services/pipeline/task.eth_call.go b/core/services/pipeline/task.eth_call.go
index e877e1e90f4..3862ea10301 100644
--- a/core/services/pipeline/task.eth_call.go
+++ b/core/services/pipeline/task.eth_call.go
@@ -12,8 +12,8 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"go.uber.org/multierr"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
@@ -35,7 +35,7 @@ type ETHCallTask struct {
 	EVMChainID          string `json:"evmChainID" mapstructure:"evmChainID"`
 
 	specGasLimit *uint32
-	legacyChains evm.LegacyChainContainer
+	legacyChains legacyevm.LegacyChainContainer
 	config       Config
 	jobType      string
 }
diff --git a/core/services/pipeline/task.eth_call_test.go b/core/services/pipeline/task.eth_call_test.go
index 8fe8bec16c0..cb58a03a9df 100644
--- a/core/services/pipeline/task.eth_call_test.go
+++ b/core/services/pipeline/task.eth_call_test.go
@@ -12,9 +12,9 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	txmmocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr/mocks"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
@@ -257,7 +257,7 @@ func TestETHCallTask(t *testing.T) {
 			txManager := txmmocks.NewMockEvmTxManager(t)
 			db := pgtest.NewSqlxDB(t)
 
-			var legacyChains evm.LegacyChainContainer
+			var legacyChains legacyevm.LegacyChainContainer
 			if test.expectedErrorCause != nil || test.expectedErrorContains != "" {
 				exts := evmtest.NewChainRelayExtenders(t, evmtest.TestChainOpts{DB: db, GeneralConfig: cfg, TxManager: txManager, KeyStore: keyStore})
 				legacyChains = evmrelay.NewLegacyChainsFromRelayerExtenders(exts)
diff --git a/core/services/pipeline/task.eth_tx.go b/core/services/pipeline/task.eth_tx.go
index 384c86446e7..c421b340c91 100644
--- a/core/services/pipeline/task.eth_tx.go
+++ b/core/services/pipeline/task.eth_tx.go
@@ -14,8 +14,8 @@ import (
 	"gopkg.in/guregu/null.v4"
 
 	txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	clnull "github.com/smartcontractkit/chainlink/v2/core/null"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
@@ -42,7 +42,7 @@ type ETHTxTask struct {
 	forwardingAllowed bool
 	specGasLimit      *uint32
 	keyStore          ETHKeyStore
-	legacyChains      evm.LegacyChainContainer
+	legacyChains      legacyevm.LegacyChainContainer
 	jobType           string
 }
 
diff --git a/core/services/relay/evm/evm.go b/core/services/relay/evm/evm.go
index e8267c9a842..952c1869bfa 100644
--- a/core/services/relay/evm/evm.go
+++ b/core/services/relay/evm/evm.go
@@ -24,8 +24,8 @@ import (
 	commontypes "github.com/smartcontractkit/chainlink-common/pkg/types"
 
 	txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
 	txm "github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
@@ -48,7 +48,7 @@ var _ commontypes.Relayer = &Relayer{} //nolint:staticcheck
 
 type Relayer struct {
 	db               *sqlx.DB
-	chain            evm.Chain
+	chain            legacyevm.Chain
 	lggr             logger.Logger
 	ks               CSAETHKeystore
 	mercuryPool      wsrpc.Pool
@@ -89,7 +89,7 @@ func (c RelayerOpts) Validate() error {
 	return err
 }
 
-func NewRelayer(lggr logger.Logger, chain evm.Chain, opts RelayerOpts) (*Relayer, error) {
+func NewRelayer(lggr logger.Logger, chain legacyevm.Chain, opts RelayerOpts) (*Relayer, error) {
 	err := opts.Validate()
 	if err != nil {
 		return nil, fmt.Errorf("cannot create evm relayer: %w", err)
@@ -244,7 +244,7 @@ type configWatcher struct {
 	contractABI      abi.ABI
 	offchainDigester ocrtypes.OffchainConfigDigester
 	configPoller     types.ConfigPoller
-	chain            evm.Chain
+	chain            legacyevm.Chain
 	runReplay        bool
 	fromBlock        uint64
 	replayCtx        context.Context
@@ -257,7 +257,7 @@ func newConfigWatcher(lggr logger.Logger,
 	contractABI abi.ABI,
 	offchainDigester ocrtypes.OffchainConfigDigester,
 	configPoller types.ConfigPoller,
-	chain evm.Chain,
+	chain legacyevm.Chain,
 	fromBlock uint64,
 	runReplay bool,
 ) *configWatcher {
@@ -321,7 +321,7 @@ func (c *configWatcher) ContractConfigTracker() ocrtypes.ContractConfigTracker {
 	return c.configPoller
 }
 
-func newConfigProvider(lggr logger.Logger, chain evm.Chain, opts *types.RelayOpts, eventBroadcaster pg.EventBroadcaster) (*configWatcher, error) {
+func newConfigProvider(lggr logger.Logger, chain legacyevm.Chain, opts *types.RelayOpts, eventBroadcaster pg.EventBroadcaster) (*configWatcher, error) {
 	if !common.IsHexAddress(opts.ContractID) {
 		return nil, pkgerrors.Errorf("invalid contractID, expected hex address")
 	}
diff --git a/core/services/relay/evm/functions.go b/core/services/relay/evm/functions.go
index 88f9d22099e..10e5d543b1a 100644
--- a/core/services/relay/evm/functions.go
+++ b/core/services/relay/evm/functions.go
@@ -19,8 +19,8 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 	commontypes "github.com/smartcontractkit/chainlink-common/pkg/types"
 	txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
 	txm "github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/functions/config"
@@ -85,7 +85,7 @@ func (p *functionsProvider) Name() string {
 	return p.configWatcher.Name()
 }
 
-func NewFunctionsProvider(chain evm.Chain, rargs commontypes.RelayArgs, pargs commontypes.PluginArgs, lggr logger.Logger, ethKeystore keystore.Eth, pluginType functionsRelay.FunctionsPluginType) (evmRelayTypes.FunctionsProvider, error) {
+func NewFunctionsProvider(chain legacyevm.Chain, rargs commontypes.RelayArgs, pargs commontypes.PluginArgs, lggr logger.Logger, ethKeystore keystore.Eth, pluginType functionsRelay.FunctionsPluginType) (evmRelayTypes.FunctionsProvider, error) {
 	relayOpts := evmRelayTypes.NewRelayOpts(rargs)
 	relayConfig, err := relayOpts.RelayConfig()
 	if err != nil {
@@ -130,7 +130,7 @@ func NewFunctionsProvider(chain evm.Chain, rargs commontypes.RelayArgs, pargs co
 	}, nil
 }
 
-func newFunctionsConfigProvider(pluginType functionsRelay.FunctionsPluginType, chain evm.Chain, args commontypes.RelayArgs, fromBlock uint64, logPollerWrapper evmRelayTypes.LogPollerWrapper, lggr logger.Logger) (*configWatcher, error) {
+func newFunctionsConfigProvider(pluginType functionsRelay.FunctionsPluginType, chain legacyevm.Chain, args commontypes.RelayArgs, fromBlock uint64, logPollerWrapper evmRelayTypes.LogPollerWrapper, lggr logger.Logger) (*configWatcher, error) {
 	if !common.IsHexAddress(args.ContractID) {
 		return nil, errors.Errorf("invalid contractID, expected hex address")
 	}
diff --git a/core/services/relay/evm/loop_impl.go b/core/services/relay/evm/loop_impl.go
index 309b5e24f62..57a09dd49ae 100644
--- a/core/services/relay/evm/loop_impl.go
+++ b/core/services/relay/evm/loop_impl.go
@@ -3,14 +3,14 @@ package evm
 import (
 	"github.com/smartcontractkit/chainlink-common/pkg/loop"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay"
 )
 
 //go:generate mockery --quiet --name LoopRelayAdapter --output ./mocks/ --case=underscore
 type LoopRelayAdapter interface {
 	loop.Relayer
-	Chain() evm.Chain
+	Chain() legacyevm.Chain
 }
 type LoopRelayer struct {
 	loop.Relayer
@@ -27,6 +27,6 @@ func NewLoopRelayServerAdapter(r *Relayer, cs EVMChainRelayerExtender) *LoopRela
 	}
 }
 
-func (la *LoopRelayer) Chain() evm.Chain {
+func (la *LoopRelayer) Chain() legacyevm.Chain {
 	return la.ext.Chain()
 }
diff --git a/core/services/relay/evm/median.go b/core/services/relay/evm/median.go
index 5184326cf25..db521a97208 100644
--- a/core/services/relay/evm/median.go
+++ b/core/services/relay/evm/median.go
@@ -14,7 +14,7 @@ import (
 	"github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	offchain_aggregator_wrapper "github.com/smartcontractkit/chainlink/v2/core/internal/gethwrappers2/generated/offchainaggregator"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
@@ -27,7 +27,7 @@ type medianContract struct {
 	requestRoundTracker *RequestRoundTracker
 }
 
-func newMedianContract(configTracker types.ContractConfigTracker, contractAddress common.Address, chain evm.Chain, specID int32, db *sqlx.DB, lggr logger.Logger) (*medianContract, error) {
+func newMedianContract(configTracker types.ContractConfigTracker, contractAddress common.Address, chain legacyevm.Chain, specID int32, db *sqlx.DB, lggr logger.Logger) (*medianContract, error) {
 	contract, err := offchain_aggregator_wrapper.NewOffchainAggregator(contractAddress, chain.Client())
 	if err != nil {
 		return nil, errors.Wrap(err, "could not instantiate NewOffchainAggregator")
diff --git a/core/services/relay/evm/mocks/loop_relay_adapter.go b/core/services/relay/evm/mocks/loop_relay_adapter.go
index 13a73036a1d..0376c9f27a4 100644
--- a/core/services/relay/evm/mocks/loop_relay_adapter.go
+++ b/core/services/relay/evm/mocks/loop_relay_adapter.go
@@ -6,7 +6,8 @@ import (
 	context "context"
 	big "math/big"
 
-	evm "github.com/smartcontractkit/chainlink/v2/core/chains/evm"
+	legacyevm "github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
+
 	mock "github.com/stretchr/testify/mock"
 
 	types "github.com/smartcontractkit/chainlink-common/pkg/types"
@@ -18,15 +19,15 @@ type LoopRelayAdapter struct {
 }
 
 // Chain provides a mock function with given fields:
-func (_m *LoopRelayAdapter) Chain() evm.Chain {
+func (_m *LoopRelayAdapter) Chain() legacyevm.Chain {
 	ret := _m.Called()
 
-	var r0 evm.Chain
-	if rf, ok := ret.Get(0).(func() evm.Chain); ok {
+	var r0 legacyevm.Chain
+	if rf, ok := ret.Get(0).(func() legacyevm.Chain); ok {
 		r0 = rf()
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(evm.Chain)
+			r0 = ret.Get(0).(legacyevm.Chain)
 		}
 	}
 
diff --git a/core/services/relay/evm/ocr2keeper.go b/core/services/relay/evm/ocr2keeper.go
index 2b484edb798..3b3bfeb652d 100644
--- a/core/services/relay/evm/ocr2keeper.go
+++ b/core/services/relay/evm/ocr2keeper.go
@@ -20,7 +20,7 @@ import (
 
 	commontypes "github.com/smartcontractkit/chainlink-common/pkg/types"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
@@ -52,14 +52,14 @@ type OCR2KeeperRelayer interface {
 // ocr2keeperRelayer is the relayer with added DKG and OCR2Keeper provider functions.
 type ocr2keeperRelayer struct {
 	db    *sqlx.DB
-	chain evm.Chain
+	chain legacyevm.Chain
 	pr    pipeline.Runner
 	spec  job.Job
 	lggr  logger.Logger
 }
 
 // NewOCR2KeeperRelayer is the constructor of ocr2keeperRelayer
-func NewOCR2KeeperRelayer(db *sqlx.DB, chain evm.Chain, pr pipeline.Runner, spec job.Job, lggr logger.Logger) OCR2KeeperRelayer {
+func NewOCR2KeeperRelayer(db *sqlx.DB, chain legacyevm.Chain, pr pipeline.Runner, spec job.Job, lggr logger.Logger) OCR2KeeperRelayer {
 	return &ocr2keeperRelayer{
 		db:    db,
 		chain: chain,
@@ -130,7 +130,7 @@ func (c *ocr2keeperProvider) ContractTransmitter() ocrtypes.ContractTransmitter
 	return c.contractTransmitter
 }
 
-func newOCR2KeeperConfigProvider(lggr logger.Logger, chain evm.Chain, rargs commontypes.RelayArgs) (*configWatcher, error) {
+func newOCR2KeeperConfigProvider(lggr logger.Logger, chain legacyevm.Chain, rargs commontypes.RelayArgs) (*configWatcher, error) {
 	var relayConfig types.RelayConfig
 	err := json.Unmarshal(rargs.RelayConfig, &relayConfig)
 	if err != nil {
diff --git a/core/services/relay/evm/ocr2vrf.go b/core/services/relay/evm/ocr2vrf.go
index 66ce42b7d8d..b7a2220588b 100644
--- a/core/services/relay/evm/ocr2vrf.go
+++ b/core/services/relay/evm/ocr2vrf.go
@@ -16,7 +16,7 @@ import (
 
 	commontypes "github.com/smartcontractkit/chainlink-common/pkg/types"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/dkg/config"
@@ -48,12 +48,12 @@ var (
 // Relayer with added DKG and OCR2VRF provider functions.
 type ocr2vrfRelayer struct {
 	db          *sqlx.DB
-	chain       evm.Chain
+	chain       legacyevm.Chain
 	lggr        logger.Logger
 	ethKeystore keystore.Eth
 }
 
-func NewOCR2VRFRelayer(db *sqlx.DB, chain evm.Chain, lggr logger.Logger, ethKeystore keystore.Eth) OCR2VRFRelayer {
+func NewOCR2VRFRelayer(db *sqlx.DB, chain legacyevm.Chain, lggr logger.Logger, ethKeystore keystore.Eth) OCR2VRFRelayer {
 	return &ocr2vrfRelayer{
 		db:          db,
 		chain:       chain,
@@ -119,7 +119,7 @@ func (c *ocr2vrfProvider) ContractTransmitter() ocrtypes.ContractTransmitter {
 	return c.contractTransmitter
 }
 
-func newOCR2VRFConfigProvider(lggr logger.Logger, chain evm.Chain, rargs commontypes.RelayArgs) (*configWatcher, error) {
+func newOCR2VRFConfigProvider(lggr logger.Logger, chain legacyevm.Chain, rargs commontypes.RelayArgs) (*configWatcher, error) {
 	var relayConfig types.RelayConfig
 	err := json.Unmarshal(rargs.RelayConfig, &relayConfig)
 	if err != nil {
diff --git a/core/services/relay/evm/relayer_extender.go b/core/services/relay/evm/relayer_extender.go
index 43626037a17..83f03b47f9e 100644
--- a/core/services/relay/evm/relayer_extender.go
+++ b/core/services/relay/evm/relayer_extender.go
@@ -11,9 +11,8 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/loop"
 	commontypes "github.com/smartcontractkit/chainlink-common/pkg/types"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
-	evmchain "github.com/smartcontractkit/chainlink/v2/core/chains/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 )
 
 // ErrNoChains indicates that no EVM chains have been started
@@ -21,31 +20,31 @@ var ErrNoChains = errors.New("no EVM chains loaded")
 
 type EVMChainRelayerExtender interface {
 	loop.RelayerExt
-	Chain() evmchain.Chain
+	Chain() legacyevm.Chain
 }
 
 type EVMChainRelayerExtenderSlicer interface {
 	Slice() []EVMChainRelayerExtender
 	Len() int
-	AppConfig() evmchain.AppConfig
+	AppConfig() legacyevm.AppConfig
 }
 
 type ChainRelayerExtenders struct {
 	exts []EVMChainRelayerExtender
-	cfg  evmchain.AppConfig
+	cfg  legacyevm.AppConfig
 }
 
 var _ EVMChainRelayerExtenderSlicer = &ChainRelayerExtenders{}
 
-func NewLegacyChainsFromRelayerExtenders(exts EVMChainRelayerExtenderSlicer) *evmchain.LegacyChains {
-	m := make(map[string]evmchain.Chain)
+func NewLegacyChainsFromRelayerExtenders(exts EVMChainRelayerExtenderSlicer) *legacyevm.LegacyChains {
+	m := make(map[string]legacyevm.Chain)
 	for _, r := range exts.Slice() {
 		m[r.Chain().ID().String()] = r.Chain()
 	}
-	return evmchain.NewLegacyChains(m, exts.AppConfig().EVMConfigs())
+	return legacyevm.NewLegacyChains(m, exts.AppConfig().EVMConfigs())
 }
 
-func newChainRelayerExtsFromSlice(exts []*ChainRelayerExt, appConfig evm.AppConfig) *ChainRelayerExtenders {
+func newChainRelayerExtsFromSlice(exts []*ChainRelayerExt, appConfig legacyevm.AppConfig) *ChainRelayerExtenders {
 	temp := make([]EVMChainRelayerExtender, len(exts))
 	for i := range exts {
 		temp[i] = exts[i]
@@ -56,7 +55,7 @@ func newChainRelayerExtsFromSlice(exts []*ChainRelayerExt, appConfig evm.AppConf
 	}
 }
 
-func (c *ChainRelayerExtenders) AppConfig() evmchain.AppConfig {
+func (c *ChainRelayerExtenders) AppConfig() legacyevm.AppConfig {
 	return c.cfg
 }
 
@@ -70,7 +69,7 @@ func (c *ChainRelayerExtenders) Len() int {
 
 // implements OneChain
 type ChainRelayerExt struct {
-	chain evmchain.Chain
+	chain legacyevm.Chain
 }
 
 var _ EVMChainRelayerExtender = &ChainRelayerExt{}
@@ -91,7 +90,7 @@ func (s *ChainRelayerExt) ID() string {
 	return s.chain.ID().String()
 }
 
-func (s *ChainRelayerExt) Chain() evmchain.Chain {
+func (s *ChainRelayerExt) Chain() legacyevm.Chain {
 	return s.chain
 }
 
@@ -117,7 +116,7 @@ func (s *ChainRelayerExt) Ready() (err error) {
 	return s.chain.Ready()
 }
 
-func NewChainRelayerExtenders(ctx context.Context, opts evmchain.ChainRelayExtenderConfig) (*ChainRelayerExtenders, error) {
+func NewChainRelayerExtenders(ctx context.Context, opts legacyevm.ChainRelayExtenderConfig) (*ChainRelayerExtenders, error) {
 	if err := opts.Validate(); err != nil {
 		return nil, err
 	}
@@ -142,14 +141,14 @@ func NewChainRelayerExtenders(ctx context.Context, opts evmchain.ChainRelayExten
 	for i := range enabled {
 
 		cid := enabled[i].ChainID.String()
-		privOpts := evmchain.ChainRelayExtenderConfig{
+		privOpts := legacyevm.ChainRelayExtenderConfig{
 			Logger:    opts.Logger.Named(cid),
 			ChainOpts: opts.ChainOpts,
 			KeyStore:  opts.KeyStore,
 		}
 
 		privOpts.Logger.Infow(fmt.Sprintf("Loading chain %s", cid), "evmChainID", cid)
-		chain, err2 := evmchain.NewTOMLChain(ctx, enabled[i], privOpts)
+		chain, err2 := legacyevm.NewTOMLChain(ctx, enabled[i], privOpts)
 		if err2 != nil {
 			err = multierr.Combine(err, fmt.Errorf("failed to create chain %s: %w", cid, err2))
 			continue
diff --git a/core/services/vrf/delegate.go b/core/services/vrf/delegate.go
index 3b91f783b4a..f739d112ab9 100644
--- a/core/services/vrf/delegate.go
+++ b/core/services/vrf/delegate.go
@@ -12,9 +12,9 @@ import (
 
 	"github.com/jmoiron/sqlx"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/aggregator_v3_interface"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/batch_vrf_coordinator_v2"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/solidity_vrf_coordinator_interface"
@@ -37,7 +37,7 @@ type Delegate struct {
 	pr           pipeline.Runner
 	porm         pipeline.ORM
 	ks           keystore.Master
-	legacyChains evm.LegacyChainContainer
+	legacyChains legacyevm.LegacyChainContainer
 	lggr         logger.Logger
 	mailMon      *utils.MailboxMonitor
 }
@@ -47,7 +47,7 @@ func NewDelegate(
 	ks keystore.Master,
 	pr pipeline.Runner,
 	porm pipeline.ORM,
-	legacyChains evm.LegacyChainContainer,
+	legacyChains legacyevm.LegacyChainContainer,
 	lggr logger.Logger,
 	cfg pg.QConfig,
 	mailMon *utils.MailboxMonitor) *Delegate {
diff --git a/core/services/vrf/delegate_test.go b/core/services/vrf/delegate_test.go
index 3d544027d40..3c297026004 100644
--- a/core/services/vrf/delegate_test.go
+++ b/core/services/vrf/delegate_test.go
@@ -9,7 +9,6 @@ import (
 	"github.com/jmoiron/sqlx"
 
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker"
@@ -18,6 +17,7 @@ import (
 	log_mocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/log/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/solidity_vrf_coordinator_interface"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
@@ -60,7 +60,7 @@ type vrfUniverse struct {
 	submitter    common.Address
 	txm          *txmgr.TxManager
 	hb           httypes.HeadBroadcaster
-	legacyChains evm.LegacyChainContainer
+	legacyChains legacyevm.LegacyChainContainer
 	cid          big.Int
 }
 
diff --git a/core/services/vrf/v1/listener_v1.go b/core/services/vrf/v1/listener_v1.go
index 3e958801cdf..494847797fa 100644
--- a/core/services/vrf/v1/listener_v1.go
+++ b/core/services/vrf/v1/listener_v1.go
@@ -17,9 +17,9 @@ import (
 	"github.com/theodesp/go-heaps/pairing"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/solidity_vrf_coordinator_interface"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/recovery"
@@ -63,7 +63,7 @@ type Listener struct {
 	NewHead        chan struct{}
 	LatestHead     uint64
 	LatestHeadMu   sync.RWMutex
-	Chain          evm.Chain
+	Chain          legacyevm.Chain
 
 	// We can keep these pending logs in memory because we
 	// only mark them confirmed once we send a corresponding fulfillment transaction.
diff --git a/core/services/vrf/v2/integration_v2_test.go b/core/services/vrf/v2/integration_v2_test.go
index f57cb640f67..c1376eafebb 100644
--- a/core/services/vrf/v2/integration_v2_test.go
+++ b/core/services/vrf/v2/integration_v2_test.go
@@ -33,7 +33,6 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/sqlutil"
 	txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr"
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
@@ -41,6 +40,7 @@ import (
 	evmlogger "github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/batch_blockhash_store"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/batch_vrf_coordinator_v2"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/blockhash_store"
@@ -1604,7 +1604,7 @@ func TestIntegrationVRFV2(t *testing.T) {
 	require.Zero(t, key.Cmp(keys[0]))
 
 	require.NoError(t, app.Start(testutils.Context(t)))
-	var chain evm.Chain
+	var chain legacyevm.Chain
 	chain, err = app.GetRelayers().LegacyEVMChains().Get(testutils.SimulatedChainID.String())
 	require.NoError(t, err)
 	listenerV2 := v22.MakeTestListenerV2(chain)
diff --git a/core/services/vrf/v2/listener_v2.go b/core/services/vrf/v2/listener_v2.go
index 7f23e022771..e0f8ff9a5bf 100644
--- a/core/services/vrf/v2/listener_v2.go
+++ b/core/services/vrf/v2/listener_v2.go
@@ -28,11 +28,11 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 	txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr"
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/aggregator_v3_interface"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/batch_vrf_coordinator_v2"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/batch_vrf_coordinator_v2plus"
@@ -98,7 +98,7 @@ func New(
 	cfg vrfcommon.Config,
 	feeCfg vrfcommon.FeeConfig,
 	l logger.Logger,
-	chain evm.Chain,
+	chain legacyevm.Chain,
 	chainID *big.Int,
 	q pg.Q,
 	coordinator CoordinatorV2_X,
@@ -170,7 +170,7 @@ type listenerV2 struct {
 	cfg     vrfcommon.Config
 	feeCfg  vrfcommon.FeeConfig
 	l       logger.SugaredLogger
-	chain   evm.Chain
+	chain   legacyevm.Chain
 	chainID *big.Int
 	mailMon *utils.MailboxMonitor
 
diff --git a/core/services/vrf/v2/listener_v2_test.go b/core/services/vrf/v2/listener_v2_test.go
index 513aa01ef65..8a7b9ce3fef 100644
--- a/core/services/vrf/v2/listener_v2_test.go
+++ b/core/services/vrf/v2/listener_v2_test.go
@@ -22,13 +22,13 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/sqlutil"
 	txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr"
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log/mocks"
-	evmmocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
+	evmmocks "github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
@@ -49,7 +49,7 @@ func makeTestTxm(t *testing.T, txStore txmgr.TestEvmTxStore, keyStore keystore.M
 	return txm
 }
 
-func MakeTestListenerV2(chain evm.Chain) *listenerV2 {
+func MakeTestListenerV2(chain legacyevm.Chain) *listenerV2 {
 	return &listenerV2{chainID: chain.Client().ConfiguredChainID(), chain: chain}
 }
 
diff --git a/core/web/common.go b/core/web/common.go
index ae2158d153b..66159d8b60a 100644
--- a/core/web/common.go
+++ b/core/web/common.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 )
 
 var (
@@ -15,7 +15,7 @@ var (
 	ErrMultipleChains = errors.New("more than one chain available, you must specify chain id parameter")
 )
 
-func getChain(legacyChains evm.LegacyChainContainer, chainIDstr string) (chain evm.Chain, err error) {
+func getChain(legacyChains legacyevm.LegacyChainContainer, chainIDstr string) (chain legacyevm.Chain, err error) {
 
 	if chainIDstr != "" && chainIDstr != "<nil>" {
 		// evm keys are expected to be parsable as a big int
diff --git a/core/web/eth_keys_controller.go b/core/web/eth_keys_controller.go
index b202d90f21e..d99992c0f56 100644
--- a/core/web/eth_keys_controller.go
+++ b/core/web/eth_keys_controller.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 
 	commonassets "github.com/smartcontractkit/chainlink-common/pkg/assets"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/config/toml"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/logger/audit"
@@ -412,7 +412,7 @@ func (ekc *ETHKeysController) getKeyMaxGasPriceWei(state ethkey.State, keyAddres
 
 // getChain is a convenience wrapper to retrieve a chain for a given request
 // and call the corresponding API response error function for 400, 404 and 500 results
-func (ekc *ETHKeysController) getChain(c *gin.Context, chainIDstr string) (chain evm.Chain, ok bool) {
+func (ekc *ETHKeysController) getChain(c *gin.Context, chainIDstr string) (chain legacyevm.Chain, ok bool) {
 	chain, err := getChain(ekc.app.GetRelayers().LegacyEVMChains(), chainIDstr)
 	if err != nil {
 		if errors.Is(err, ErrInvalidChainID) || errors.Is(err, ErrMultipleChains) {
diff --git a/core/web/evm_transfer_controller.go b/core/web/evm_transfer_controller.go
index 7f09bc9fdc6..6ab621661a6 100644
--- a/core/web/evm_transfer_controller.go
+++ b/core/web/evm_transfer_controller.go
@@ -11,9 +11,9 @@ import (
 	"github.com/pkg/errors"
 
 	commontxmgr "github.com/smartcontractkit/chainlink/v2/common/txmgr"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/logger/audit"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
@@ -92,7 +92,7 @@ func (tc *EVMTransfersController) Create(c *gin.Context) {
 }
 
 // ValidateEthBalanceForTransfer validates that the current balance can cover the transaction amount
-func ValidateEthBalanceForTransfer(c *gin.Context, chain evm.Chain, fromAddr common.Address, amount assets.Eth) error {
+func ValidateEthBalanceForTransfer(c *gin.Context, chain legacyevm.Chain, fromAddr common.Address, amount assets.Eth) error {
 	var err error
 	var balance *big.Int
 
diff --git a/core/web/resolver/eth_key.go b/core/web/resolver/eth_key.go
index 868d53565dd..a9c060ef0c1 100644
--- a/core/web/resolver/eth_key.go
+++ b/core/web/resolver/eth_key.go
@@ -6,7 +6,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/graph-gophers/graphql-go"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
 	"github.com/smartcontractkit/chainlink/v2/core/web/loader"
 )
@@ -14,7 +14,7 @@ import (
 type ETHKey struct {
 	state ethkey.State
 	addr  ethkey.EIP55Address
-	chain evm.Chain
+	chain legacyevm.Chain
 }
 
 type ETHKeyResolver struct {
diff --git a/core/web/resolver/eth_key_test.go b/core/web/resolver/eth_key_test.go
index d75282e0fbd..ea106a4b30c 100644
--- a/core/web/resolver/eth_key_test.go
+++ b/core/web/resolver/eth_key_test.go
@@ -10,11 +10,11 @@ import (
 	"github.com/stretchr/testify/mock"
 
 	commonassets "github.com/smartcontractkit/chainlink-common/pkg/assets"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config"
 	mocks2 "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
 
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
@@ -90,8 +90,8 @@ func TestResolver_ETHKeys(t *testing.T) {
 				linkAddr := common.HexToAddress("0x5431F5F973781809D18643b87B44921b11355d81")
 
 				cfg := configtest.NewGeneralConfig(t, nil)
-				m := map[string]evm.Chain{states[0].EVMChainID.String(): f.Mocks.chain}
-				legacyEVMChains := evm.NewLegacyChains(m, cfg.EVMConfigs())
+				m := map[string]legacyevm.Chain{states[0].EVMChainID.String(): f.Mocks.chain}
+				legacyEVMChains := legacyevm.NewLegacyChains(m, cfg.EVMConfigs())
 
 				f.Mocks.ethKs.On("GetStatesForKeys", keys).Return(states, nil)
 				f.Mocks.ethKs.On("Get", keys[0].Address.Hex()).Return(keys[0], nil)
diff --git a/core/web/resolver/resolver_test.go b/core/web/resolver/resolver_test.go
index 85c495faaae..d5906d99aff 100644
--- a/core/web/resolver/resolver_test.go
+++ b/core/web/resolver/resolver_test.go
@@ -15,6 +15,7 @@ import (
 	evmConfigMocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/mocks"
 	evmORMMocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/mocks"
 	evmtxmgrmocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr/mocks"
+	legacyEvmORMMocks "github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm/mocks"
 	coremocks "github.com/smartcontractkit/chainlink/v2/core/internal/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
@@ -50,8 +51,8 @@ type mocks struct {
 	p2p                  *keystoreMocks.P2P
 	vrf                  *keystoreMocks.VRF
 	solana               *keystoreMocks.Solana
-	chain                *evmORMMocks.Chain
-	legacyEVMChains      *evmORMMocks.LegacyChainContainer
+	chain                *legacyEvmORMMocks.Chain
+	legacyEVMChains      *legacyEvmORMMocks.LegacyChainContainer
 	relayerChainInterops *chainlinkMocks.FakeRelayerChainInteroperators
 	ethClient            *evmClientMocks.Client
 	eIMgr                *webhookmocks.ExternalInitiatorManager
@@ -109,8 +110,8 @@ func setupFramework(t *testing.T) *gqlTestFramework {
 		p2p:                  keystoreMocks.NewP2P(t),
 		vrf:                  keystoreMocks.NewVRF(t),
 		solana:               keystoreMocks.NewSolana(t),
-		chain:                evmORMMocks.NewChain(t),
-		legacyEVMChains:      evmORMMocks.NewLegacyChainContainer(t),
+		chain:                legacyEvmORMMocks.NewChain(t),
+		legacyEVMChains:      legacyEvmORMMocks.NewLegacyChainContainer(t),
 		relayerChainInterops: &chainlinkMocks.FakeRelayerChainInteroperators{},
 		ethClient:            evmClientMocks.NewClient(t),
 		eIMgr:                webhookmocks.NewExternalInitiatorManager(t),
diff --git a/go.mod b/go.mod
index 0f75e120fe6..b2afd2e2111 100644
--- a/go.mod
+++ b/go.mod
@@ -66,7 +66,7 @@ require (
 	github.com/shopspring/decimal v1.3.1
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704
 	github.com/smartcontractkit/chainlink-automation v1.0.1
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231121180428-d7f28e91ccc3
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f9248
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542
 	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231117191230-aa6640f2edd1
 	github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664
diff --git a/go.sum b/go.sum
index fc8cab806a9..98371af2e2f 100644
--- a/go.sum
+++ b/go.sum
@@ -1507,8 +1507,8 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
 github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
 github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231121180428-d7f28e91ccc3 h1:cyA1aW1PYrOLZAMaSmuH7U99QBTfrF59s+6uDxQgOr0=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231121180428-d7f28e91ccc3/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f9248 h1:HJCPvJ+ZjU9TSX4YD5rxBJqGAvqhDfzoJgI3WmfeWeI=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f9248/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 h1:oewYJtdRkJKUHCNDCj5C2LQe6Oq6qy975g931nfG0cc=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542/go.mod h1:EpvRoycRD+kniYlz+pCpRT5e+fmPm0mSD/vmND+0oMg=
 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231117191230-aa6640f2edd1 h1:D7yb4kgNGVAiD5lFYqm/LW8d5jU66TXyYvSskDiW9yg=
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index ca77d3730e2..4cf6a502c49 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/segmentio/ksuid v1.0.4
 	github.com/slack-go/slack v0.12.2
 	github.com/smartcontractkit/chainlink-automation v1.0.1
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231121180428-d7f28e91ccc3
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f9248
 	github.com/smartcontractkit/chainlink-testing-framework v1.19.5
 	github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
 	github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index f117bf73e81..ef0a5b66ffb 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -2376,8 +2376,8 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
 github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
 github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231121180428-d7f28e91ccc3 h1:cyA1aW1PYrOLZAMaSmuH7U99QBTfrF59s+6uDxQgOr0=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231121180428-d7f28e91ccc3/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f9248 h1:HJCPvJ+ZjU9TSX4YD5rxBJqGAvqhDfzoJgI3WmfeWeI=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f9248/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 h1:oewYJtdRkJKUHCNDCj5C2LQe6Oq6qy975g931nfG0cc=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542/go.mod h1:EpvRoycRD+kniYlz+pCpRT5e+fmPm0mSD/vmND+0oMg=
 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231117191230-aa6640f2edd1 h1:D7yb4kgNGVAiD5lFYqm/LW8d5jU66TXyYvSskDiW9yg=

From bb46971a7eae2421d4329ee8cdddc0db7ca26058 Mon Sep 17 00:00:00 2001
From: Dimitris Grigoriou <dimitris.grigoriou@smartcontract.com>
Date: Tue, 28 Nov 2023 13:51:25 +0200
Subject: [PATCH 016/130] Remove FriendlyNumber function (#11376)

---
 common/headtracker/head_tracker.go |  6 ++----
 core/config/presenters.go          | 14 --------------
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 core/config/presenters.go

diff --git a/common/headtracker/head_tracker.go b/common/headtracker/head_tracker.go
index 34a319e3c1c..6e379776c0f 100644
--- a/common/headtracker/head_tracker.go
+++ b/common/headtracker/head_tracker.go
@@ -15,7 +15,6 @@ import (
 
 	htrktypes "github.com/smartcontractkit/chainlink/v2/common/headtracker/types"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/config"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -103,7 +102,7 @@ func (ht *HeadTracker[HTH, S, ID, BLOCK_HASH]) Start(ctx context.Context) error
 		}
 		if latestChain.IsValid() {
 			ht.log.Debugw(
-				fmt.Sprintf("HeadTracker: Tracking logs from last block %v with hash %s", config.FriendlyNumber(latestChain.BlockNumber()), latestChain.BlockHash()),
+				fmt.Sprintf("HeadTracker: Tracking logs from last block %v with hash %s", latestChain.BlockNumber(), latestChain.BlockHash()),
 				"blockNumber", latestChain.BlockNumber(),
 				"blockHash", latestChain.BlockHash(),
 			)
@@ -193,8 +192,7 @@ func (ht *HeadTracker[HTH, S, ID, BLOCK_HASH]) getInitialHead(ctx context.Contex
 func (ht *HeadTracker[HTH, S, ID, BLOCK_HASH]) handleNewHead(ctx context.Context, head HTH) error {
 	prevHead := ht.headSaver.LatestChain()
 
-	ht.log.Debugw(fmt.Sprintf("Received new head %v", config.FriendlyNumber(head.BlockNumber())),
-		"blockHeight", head.BlockNumber(),
+	ht.log.Debugw(fmt.Sprintf("Received new head %v", head.BlockNumber()),
 		"blockHash", head.BlockHash(),
 		"parentHeadHash", head.GetParentHash(),
 		"blockTs", head.GetTimestamp(),
diff --git a/core/config/presenters.go b/core/config/presenters.go
deleted file mode 100644
index f4da66fd151..00000000000
--- a/core/config/presenters.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package config
-
-import (
-	"fmt"
-	"math/big"
-
-	"golang.org/x/exp/constraints"
-)
-
-// FriendlyNumber returns a string printing the integer or big.Int in both
-// decimal and hexadecimal formats.
-func FriendlyNumber[N constraints.Integer | *big.Int](n N) string {
-	return fmt.Sprintf("#%[1]v (0x%[1]x)", n)
-}

From 956148be2d0f2a4f6ec2af756c35fe12d0c10142 Mon Sep 17 00:00:00 2001
From: Makram <makramkd@users.noreply.github.com>
Date: Tue, 28 Nov 2023 15:05:06 +0200
Subject: [PATCH 017/130] feat: log poller for vrf v2/v2+ (#11174)

* feat: log poller for vrf v2/+

* chore: address PR comments

* fix: RLock() instead of Lock()

* fix: test

* fix: tests still flakey

* fix: lint

* fix: build

* chore: PR comments

* chore: time out old requests

* chore: skip EOA tests

these tests have questionable value; we should probably remove them or
find a better way to test this particular functionality. Perhaps this
should even be removed.

* remove concurrency in processing

seems unnecessary

* fix build

* fix build

* fix lint

* fix test

* fix tests
---
 core/services/vrf/delegate.go                 |   57 +-
 core/services/vrf/v2/bhs_feeder_test.go       |   26 +-
 .../vrf/v2/coordinator_v2x_interface.go       |   37 +
 .../vrf/v2/integration_helpers_test.go        |   35 +-
 .../vrf/v2/integration_v2_plus_test.go        |   16 +-
 core/services/vrf/v2/integration_v2_test.go   |   13 +-
 core/services/vrf/v2/listener_v2.go           | 1608 +----------------
 core/services/vrf/v2/listener_v2_helpers.go   |  103 ++
 .../vrf/v2/listener_v2_log_listener.go        |  451 +++++
 .../vrf/v2/listener_v2_log_processor.go       | 1214 +++++++++++++
 core/services/vrf/v2/listener_v2_test.go      |   79 -
 core/services/vrf/v2/listener_v2_types.go     |  114 +-
 .../services/vrf/v2/listener_v2_types_test.go |    5 -
 core/services/vrf/vrfcommon/inflight_cache.go |   85 +
 .../services/vrf/vrfcommon/log_dedupe_test.go |   22 +-
 core/services/vrf/vrftesthelpers/helpers.go   |    2 +-
 core/testdata/testspecs/v2_specs.go           |   10 +-
 .../actions/vrfv2plus/vrfv2plus_steps.go      |    4 +-
 integration-tests/client/chainlink_models.go  |    1 +
 integration-tests/types/config/node/core.go   |    6 +
 20 files changed, 2140 insertions(+), 1748 deletions(-)
 create mode 100644 core/services/vrf/v2/listener_v2_helpers.go
 create mode 100644 core/services/vrf/v2/listener_v2_log_listener.go
 create mode 100644 core/services/vrf/v2/listener_v2_log_processor.go
 create mode 100644 core/services/vrf/vrfcommon/inflight_cache.go

diff --git a/core/services/vrf/delegate.go b/core/services/vrf/delegate.go
index f739d112ab9..a13df71d9a3 100644
--- a/core/services/vrf/delegate.go
+++ b/core/services/vrf/delegate.go
@@ -66,10 +66,10 @@ func (d *Delegate) JobType() job.Type {
 	return job.VRF
 }
 
-func (d *Delegate) BeforeJobCreated(spec job.Job)                {}
-func (d *Delegate) AfterJobCreated(spec job.Job)                 {}
-func (d *Delegate) BeforeJobDeleted(spec job.Job)                {}
-func (d *Delegate) OnDeleteJob(spec job.Job, q pg.Queryer) error { return nil }
+func (d *Delegate) BeforeJobCreated(job.Job)              {}
+func (d *Delegate) AfterJobCreated(job.Job)               {}
+func (d *Delegate) BeforeJobDeleted(job.Job)              {}
+func (d *Delegate) OnDeleteJob(job.Job, pg.Queryer) error { return nil }
 
 // ServicesForSpec satisfies the job.Delegate interface.
 func (d *Delegate) ServicesForSpec(jb job.Job) ([]job.ServiceCtx, error) {
@@ -160,24 +160,28 @@ func (d *Delegate) ServicesForSpec(jb job.Job) ([]job.ServiceCtx, error) {
 				return nil, errors.Wrap(err2, "NewAggregatorV3Interface")
 			}
 
-			return []job.ServiceCtx{v2.New(
-				chain.Config().EVM(),
-				chain.Config().EVM().GasEstimator(),
-				lV2Plus,
-				chain,
-				chain.ID(),
-				d.q,
-				v2.NewCoordinatorV2_5(coordinatorV2Plus),
-				batchCoordinatorV2,
-				vrfOwner,
-				aggregator,
-				d.pr,
-				d.ks.Eth(),
-				jb,
-				d.mailMon,
-				utils.NewHighCapacityMailbox[log.Broadcast](),
-				func() {},
-				vrfcommon.NewLogDeduper(int(chain.Config().EVM().FinalityDepth())))}, nil
+			return []job.ServiceCtx{
+				v2.New(
+					chain.Config().EVM(),
+					chain.Config().EVM().GasEstimator(),
+					lV2Plus,
+					chain,
+					chain.ID(),
+					d.q,
+					v2.NewCoordinatorV2_5(coordinatorV2Plus),
+					batchCoordinatorV2,
+					vrfOwner,
+					aggregator,
+					d.pr,
+					d.ks.Eth(),
+					jb,
+					func() {},
+					// the lookback in the deduper must be >= the lookback specified for the log poller
+					// otherwise we will end up re-delivering logs that were already delivered.
+					vrfcommon.NewInflightCache(int(chain.Config().EVM().FinalityDepth())),
+					vrfcommon.NewLogDeduper(int(chain.Config().EVM().FinalityDepth())),
+				),
+			}, nil
 		}
 		if _, ok := task.(*pipeline.VRFTaskV2); ok {
 			if err2 := CheckFromAddressesExist(jb, d.ks.Eth()); err != nil {
@@ -225,10 +229,13 @@ func (d *Delegate) ServicesForSpec(jb job.Job) ([]job.ServiceCtx, error) {
 				d.pr,
 				d.ks.Eth(),
 				jb,
-				d.mailMon,
-				utils.NewHighCapacityMailbox[log.Broadcast](),
 				func() {},
-				vrfcommon.NewLogDeduper(int(chain.Config().EVM().FinalityDepth())))}, nil
+				// the lookback in the deduper must be >= the lookback specified for the log poller
+				// otherwise we will end up re-delivering logs that were already delivered.
+				vrfcommon.NewInflightCache(int(chain.Config().EVM().FinalityDepth())),
+				vrfcommon.NewLogDeduper(int(chain.Config().EVM().FinalityDepth())),
+			),
+			}, nil
 		}
 		if _, ok := task.(*pipeline.VRFTask); ok {
 			return []job.ServiceCtx{&v1.Listener{
diff --git a/core/services/vrf/v2/bhs_feeder_test.go b/core/services/vrf/v2/bhs_feeder_test.go
index f388f80f561..31a4ff815a9 100644
--- a/core/services/vrf/v2/bhs_feeder_test.go
+++ b/core/services/vrf/v2/bhs_feeder_test.go
@@ -10,7 +10,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest/heavyweight"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
-	"github.com/smartcontractkit/chainlink/v2/core/services/vrf/vrfcommon"
 	"github.com/smartcontractkit/chainlink/v2/core/services/vrf/vrftesthelpers"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
 
@@ -63,26 +62,12 @@ func TestStartHeartbeats(t *testing.T) {
 	heartbeatPeriod := 5 * time.Second
 
 	t.Run("bhs_feeder_startheartbeats_happy_path", func(tt *testing.T) {
-		coordinatorAddress := uni.rootContractAddress
-		vrfVersion := vrfcommon.V2
-
 		app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, keys...)
 		require.NoError(t, app.Start(testutils.Context(t)))
 
-		var (
-			v2CoordinatorAddress     string
-			v2PlusCoordinatorAddress string
-		)
-
-		if vrfVersion == vrfcommon.V2 {
-			v2CoordinatorAddress = coordinatorAddress.String()
-		} else if vrfVersion == vrfcommon.V2Plus {
-			v2PlusCoordinatorAddress = coordinatorAddress.String()
-		}
-
 		_ = vrftesthelpers.CreateAndStartBHSJob(
 			t, bhsKeyAddresses, app, uni.bhsContractAddress.String(), "",
-			v2CoordinatorAddress, v2PlusCoordinatorAddress, "", 0, 200, heartbeatPeriod, 100)
+			uni.rootContractAddress.String(), "", "", 0, 200, heartbeatPeriod, 100)
 
 		// Ensure log poller is ready and has all logs.
 		require.NoError(t, app.GetRelayers().LegacyEVMChains().Slice()[0].LogPoller().Ready())
@@ -97,9 +82,10 @@ func TestStartHeartbeats(t *testing.T) {
 		t.Logf("Sleeping %.2f seconds before checking blockhash in BHS added by BHS_Heartbeats_Service\n", diff.Seconds())
 		time.Sleep(diff)
 		// storeEarliest in BHS contract stores blocktip - 256 in the Blockhash Store (BHS)
-		// before the initTxns:260 txns sent by the loop above, 18 txns are sent by
-		// newVRFCoordinatorV2Universe method. block tip is initTxns + 18
-		blockTip := initTxns + 18
-		verifyBlockhashStored(t, uni.coordinatorV2UniverseCommon, uint64(blockTip-256))
+		tipHeader, err := uni.backend.HeaderByNumber(testutils.Context(t), nil)
+		require.NoError(t, err)
+		// the storeEarliest transaction will end up in a new block, hence the + 1 below.
+		blockNumberStored := tipHeader.Number.Uint64() - 256 + 1
+		verifyBlockhashStored(t, uni.coordinatorV2UniverseCommon, blockNumberStored)
 	})
 }
diff --git a/core/services/vrf/v2/coordinator_v2x_interface.go b/core/services/vrf/v2/coordinator_v2x_interface.go
index b090c4ad5af..e20500cca89 100644
--- a/core/services/vrf/v2/coordinator_v2x_interface.go
+++ b/core/services/vrf/v2/coordinator_v2x_interface.go
@@ -28,6 +28,7 @@ var (
 type CoordinatorV2_X interface {
 	Address() common.Address
 	ParseRandomWordsRequested(log types.Log) (RandomWordsRequested, error)
+	ParseRandomWordsFulfilled(log types.Log) (RandomWordsFulfilled, error)
 	RequestRandomWords(opts *bind.TransactOpts, keyHash [32]byte, subID *big.Int, requestConfirmations uint16, callbackGasLimit uint32, numWords uint32, payInEth bool) (*types.Transaction, error)
 	AddConsumer(opts *bind.TransactOpts, subID *big.Int, consumer common.Address) (*types.Transaction, error)
 	CreateSubscription(opts *bind.TransactOpts) (*types.Transaction, error)
@@ -47,6 +48,10 @@ type CoordinatorV2_X interface {
 	GetCommitment(opts *bind.CallOpts, requestID *big.Int) ([32]byte, error)
 	Migrate(opts *bind.TransactOpts, subID *big.Int, newCoordinator common.Address) (*types.Transaction, error)
 	FundSubscriptionWithNative(opts *bind.TransactOpts, subID *big.Int, amount *big.Int) (*types.Transaction, error)
+	// RandomWordsRequestedTopic returns the log topic of the RandomWordsRequested log
+	RandomWordsRequestedTopic() common.Hash
+	// RandomWordsFulfilledTopic returns the log topic of the RandomWordsFulfilled log
+	RandomWordsFulfilledTopic() common.Hash
 }
 
 type coordinatorV2 struct {
@@ -61,6 +66,14 @@ func NewCoordinatorV2(c *vrf_coordinator_v2.VRFCoordinatorV2) CoordinatorV2_X {
 	}
 }
 
+func (c *coordinatorV2) RandomWordsRequestedTopic() common.Hash {
+	return vrf_coordinator_v2.VRFCoordinatorV2RandomWordsRequested{}.Topic()
+}
+
+func (c *coordinatorV2) RandomWordsFulfilledTopic() common.Hash {
+	return vrf_coordinator_v2.VRFCoordinatorV2RandomWordsFulfilled{}.Topic()
+}
+
 func (c *coordinatorV2) Address() common.Address {
 	return c.coordinator.Address()
 }
@@ -73,6 +86,14 @@ func (c *coordinatorV2) ParseRandomWordsRequested(log types.Log) (RandomWordsReq
 	return NewV2RandomWordsRequested(parsed), nil
 }
 
+func (c *coordinatorV2) ParseRandomWordsFulfilled(log types.Log) (RandomWordsFulfilled, error) {
+	parsed, err := c.coordinator.ParseRandomWordsFulfilled(log)
+	if err != nil {
+		return nil, err
+	}
+	return NewV2RandomWordsFulfilled(parsed), nil
+}
+
 func (c *coordinatorV2) RequestRandomWords(opts *bind.TransactOpts, keyHash [32]byte, subID *big.Int, requestConfirmations uint16, callbackGasLimit uint32, numWords uint32, payInEth bool) (*types.Transaction, error) {
 	return c.coordinator.RequestRandomWords(opts, keyHash, subID.Uint64(), requestConfirmations, callbackGasLimit, numWords)
 }
@@ -187,6 +208,14 @@ func NewCoordinatorV2_5(c vrf_coordinator_v2_5.VRFCoordinatorV25Interface) Coord
 	}
 }
 
+func (c *coordinatorV2_5) RandomWordsRequestedTopic() common.Hash {
+	return vrf_coordinator_v2plus_interface.IVRFCoordinatorV2PlusInternalRandomWordsRequested{}.Topic()
+}
+
+func (c *coordinatorV2_5) RandomWordsFulfilledTopic() common.Hash {
+	return vrf_coordinator_v2plus_interface.IVRFCoordinatorV2PlusInternalRandomWordsFulfilled{}.Topic()
+}
+
 func (c *coordinatorV2_5) Address() common.Address {
 	return c.coordinator.Address()
 }
@@ -199,6 +228,14 @@ func (c *coordinatorV2_5) ParseRandomWordsRequested(log types.Log) (RandomWordsR
 	return NewV2_5RandomWordsRequested(parsed), nil
 }
 
+func (c *coordinatorV2_5) ParseRandomWordsFulfilled(log types.Log) (RandomWordsFulfilled, error) {
+	parsed, err := c.coordinator.ParseRandomWordsFulfilled(log)
+	if err != nil {
+		return nil, err
+	}
+	return NewV2_5RandomWordsFulfilled(parsed), nil
+}
+
 func (c *coordinatorV2_5) RequestRandomWords(opts *bind.TransactOpts, keyHash [32]byte, subID *big.Int, requestConfirmations uint16, callbackGasLimit uint32, numWords uint32, payInEth bool) (*types.Transaction, error) {
 	extraArgs, err := extraargs.ExtraArgsV1(payInEth)
 	if err != nil {
diff --git a/core/services/vrf/v2/integration_helpers_test.go b/core/services/vrf/v2/integration_helpers_test.go
index a5737371919..03d96cadf20 100644
--- a/core/services/vrf/v2/integration_helpers_test.go
+++ b/core/services/vrf/v2/integration_helpers_test.go
@@ -72,6 +72,8 @@ func testSingleConsumerHappyPath(
 			GasEstimator: toml.KeySpecificGasEstimator{PriceMax: gasLanePriceWei},
 		})(c, s)
 		c.EVM[0].MinIncomingConfirmations = ptr[uint32](2)
+		c.Feature.LogPoller = ptr(true)
+		c.EVM[0].LogPollInterval = models.MustNewDuration(1 * time.Second)
 	})
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, ownerKey, key1, key2)
 
@@ -205,8 +207,8 @@ func testMultipleConsumersNeedBHS(
 		simulatedOverrides(t, assets.GWei(10), keySpecificOverrides...)(c, s)
 		c.EVM[0].MinIncomingConfirmations = ptr[uint32](2)
 		c.Feature.LogPoller = ptr(true)
+		c.EVM[0].LogPollInterval = models.MustNewDuration(1 * time.Second)
 		c.EVM[0].FinalityDepth = ptr[uint32](2)
-		c.EVM[0].LogPollInterval = models.MustNewDuration(time.Second)
 	})
 	keys = append(keys, ownerKey, vrfKey)
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, keys...)
@@ -353,8 +355,8 @@ func testMultipleConsumersNeedTrustedBHS(
 		c.EVM[0].MinIncomingConfirmations = ptr[uint32](2)
 		c.EVM[0].GasEstimator.LimitDefault = ptr(uint32(5_000_000))
 		c.Feature.LogPoller = ptr(true)
+		c.EVM[0].LogPollInterval = models.MustNewDuration(1 * time.Second)
 		c.EVM[0].FinalityDepth = ptr[uint32](2)
-		c.EVM[0].LogPollInterval = models.MustNewDuration(time.Second)
 	})
 	keys = append(keys, ownerKey, vrfKey)
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, keys...)
@@ -539,6 +541,8 @@ func testSingleConsumerHappyPathBatchFulfillment(
 		c.EVM[0].GasEstimator.LimitDefault = ptr[uint32](5_000_000)
 		c.EVM[0].MinIncomingConfirmations = ptr[uint32](2)
 		c.EVM[0].ChainID = (*utils.Big)(testutils.SimulatedChainID)
+		c.Feature.LogPoller = ptr(true)
+		c.EVM[0].LogPollInterval = models.MustNewDuration(1 * time.Second)
 	})
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, ownerKey, key1)
 
@@ -641,6 +645,8 @@ func testSingleConsumerNeedsTopUp(
 			GasEstimator: toml.KeySpecificGasEstimator{PriceMax: gasLanePriceWei},
 		})(c, s)
 		c.EVM[0].MinIncomingConfirmations = ptr[uint32](2)
+		c.Feature.LogPoller = ptr(true)
+		c.EVM[0].LogPollInterval = models.MustNewDuration(1 * time.Second)
 	})
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, ownerKey, key)
 
@@ -746,8 +752,8 @@ func testBlockHeaderFeeder(
 		})(c, s)
 		c.EVM[0].MinIncomingConfirmations = ptr[uint32](2)
 		c.Feature.LogPoller = ptr(true)
+		c.EVM[0].LogPollInterval = models.MustNewDuration(1 * time.Second)
 		c.EVM[0].FinalityDepth = ptr[uint32](2)
-		c.EVM[0].LogPollInterval = models.MustNewDuration(time.Second)
 	})
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, ownerKey, vrfKey, bhfKey)
 	require.NoError(t, app.Start(testutils.Context(t)))
@@ -904,6 +910,8 @@ func testSingleConsumerForcedFulfillment(
 			GasEstimator: toml.KeySpecificGasEstimator{PriceMax: gasLanePriceWei},
 		})(c, s)
 		c.EVM[0].MinIncomingConfirmations = ptr[uint32](2)
+		c.Feature.LogPoller = ptr(true)
+		c.EVM[0].LogPollInterval = models.MustNewDuration(1 * time.Second)
 	})
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, ownerKey, key1, key2)
 
@@ -1053,10 +1061,7 @@ func testSingleConsumerEIP150(
 	vrfVersion vrfcommon.Version,
 	nativePayment bool,
 ) {
-	callBackGasLimit := int64(2_500_000)            // base callback gas.
-	eip150Fee := callBackGasLimit / 64              // premium needed for callWithExactGas
-	coordinatorFulfillmentOverhead := int64(90_000) // fixed gas used in coordinator fulfillment
-	gasLimit := callBackGasLimit + eip150Fee + coordinatorFulfillmentOverhead
+	callBackGasLimit := int64(2_500_000) // base callback gas.
 
 	key1 := cltest.MustGenerateRandomKey(t)
 	gasLanePriceWei := assets.GWei(10)
@@ -1066,8 +1071,10 @@ func testSingleConsumerEIP150(
 			Key:          ptr(key1.EIP55Address),
 			GasEstimator: v2.KeySpecificGasEstimator{PriceMax: gasLanePriceWei},
 		})(c, s)
-		c.EVM[0].GasEstimator.LimitDefault = ptr(uint32(gasLimit))
+		c.EVM[0].GasEstimator.LimitDefault = ptr(uint32(3.5e6))
 		c.EVM[0].MinIncomingConfirmations = ptr[uint32](2)
+		c.Feature.LogPoller = ptr(true)
+		c.EVM[0].LogPollInterval = models.MustNewDuration(1 * time.Second)
 	})
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, ownerKey, key1)
 	consumer := uni.vrfConsumers[0]
@@ -1136,6 +1143,8 @@ func testSingleConsumerEIP150Revert(
 		})(c, s)
 		c.EVM[0].GasEstimator.LimitDefault = ptr(uint32(gasLimit))
 		c.EVM[0].MinIncomingConfirmations = ptr[uint32](2)
+		c.Feature.LogPoller = ptr(true)
+		c.EVM[0].LogPollInterval = models.MustNewDuration(1 * time.Second)
 	})
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, ownerKey, key1)
 	consumer := uni.vrfConsumers[0]
@@ -1199,6 +1208,8 @@ func testSingleConsumerBigGasCallbackSandwich(
 		})(c, s)
 		c.EVM[0].GasEstimator.LimitDefault = ptr[uint32](5_000_000)
 		c.EVM[0].MinIncomingConfirmations = ptr[uint32](2)
+		c.Feature.LogPoller = ptr(true)
+		c.EVM[0].LogPollInterval = models.MustNewDuration(1 * time.Second)
 	})
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, ownerKey, key1)
 	consumer := uni.vrfConsumers[0]
@@ -1319,6 +1330,8 @@ func testSingleConsumerMultipleGasLanes(
 		})(c, s)
 		c.EVM[0].MinIncomingConfirmations = ptr[uint32](2)
 		c.EVM[0].GasEstimator.LimitDefault = ptr[uint32](5_000_000)
+		c.Feature.LogPoller = ptr(true)
+		c.EVM[0].LogPollInterval = models.MustNewDuration(1 * time.Second)
 	})
 
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, ownerKey, cheapKey, expensiveKey)
@@ -1434,6 +1447,8 @@ func testSingleConsumerAlwaysRevertingCallbackStillFulfilled(
 			GasEstimator: v2.KeySpecificGasEstimator{PriceMax: gasLanePriceWei},
 		})(c, s)
 		c.EVM[0].MinIncomingConfirmations = ptr[uint32](2)
+		c.Feature.LogPoller = ptr(true)
+		c.EVM[0].LogPollInterval = models.MustNewDuration(1 * time.Second)
 	})
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, ownerKey, key)
 	consumer := uni.reverter
@@ -1505,6 +1520,8 @@ func testConsumerProxyHappyPath(
 			GasEstimator: v2.KeySpecificGasEstimator{PriceMax: gasLanePriceWei},
 		})(c, s)
 		c.EVM[0].MinIncomingConfirmations = ptr[uint32](2)
+		c.Feature.LogPoller = ptr(true)
+		c.EVM[0].LogPollInterval = models.MustNewDuration(1 * time.Second)
 	})
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, ownerKey, key1, key2)
 	consumerOwner := uni.neil
@@ -1629,6 +1646,8 @@ func testMaliciousConsumer(
 		c.EVM[0].GasEstimator.PriceDefault = assets.GWei(1)
 		c.EVM[0].GasEstimator.FeeCapDefault = assets.GWei(1)
 		c.EVM[0].ChainID = (*utils.Big)(testutils.SimulatedChainID)
+		c.Feature.LogPoller = ptr(true)
+		c.EVM[0].LogPollInterval = models.MustNewDuration(1 * time.Second)
 	})
 	carol := uni.vrfConsumers[0]
 
diff --git a/core/services/vrf/v2/integration_v2_plus_test.go b/core/services/vrf/v2/integration_v2_plus_test.go
index e45e650dc8d..1564f0f6343 100644
--- a/core/services/vrf/v2/integration_v2_plus_test.go
+++ b/core/services/vrf/v2/integration_v2_plus_test.go
@@ -50,6 +50,7 @@ import (
 	v22 "github.com/smartcontractkit/chainlink/v2/core/services/vrf/v2"
 	"github.com/smartcontractkit/chainlink/v2/core/services/vrf/vrfcommon"
 	"github.com/smartcontractkit/chainlink/v2/core/services/vrf/vrftesthelpers"
+	"github.com/smartcontractkit/chainlink/v2/core/store/models"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -107,6 +108,10 @@ func newVRFCoordinatorV2PlusUniverse(t *testing.T, key ethkey.KeyV2, numConsumer
 		vrf_coordinator_v2plus_interface.IVRFCoordinatorV2PlusInternalABI))
 	require.NoError(t, err)
 	backend := cltest.NewSimulatedBackend(t, genesisData, gasLimit)
+	blockTime := time.UnixMilli(int64(backend.Blockchain().CurrentHeader().Time))
+	err = backend.AdjustTime(time.Since(blockTime) - 24*time.Hour)
+	require.NoError(t, err)
+	backend.Commit()
 	// Deploy link
 	linkAddress, _, linkContract, err := link_token_interface.DeployLinkToken(
 		sergey, backend)
@@ -259,6 +264,10 @@ func newVRFCoordinatorV2PlusUniverse(t *testing.T, key ethkey.KeyV2, numConsumer
 	require.NoError(t, err, "failed to set coordinator configuration")
 	backend.Commit()
 
+	for i := 0; i < 200; i++ {
+		backend.Commit()
+	}
+
 	return coordinatorV2PlusUniverse{
 		coordinatorV2UniverseCommon: coordinatorV2UniverseCommon{
 			vrfConsumers:              vrfConsumers,
@@ -304,7 +313,6 @@ func newVRFCoordinatorV2PlusUniverse(t *testing.T, key ethkey.KeyV2, numConsumer
 }
 
 func TestVRFV2PlusIntegration_SingleConsumer_HappyPath_BatchFulfillment(t *testing.T) {
-	testutils.SkipFlakey(t, "https://smartcontract-it.atlassian.net/browse/BCF-2745")
 	t.Parallel()
 	ownerKey := cltest.MustGenerateRandomKey(t)
 	uni := newVRFCoordinatorV2PlusUniverse(t, ownerKey, 1, false)
@@ -457,7 +465,7 @@ func TestVRFV2PlusIntegration_SingleConsumer_HappyPath(t *testing.T) {
 }
 
 func TestVRFV2PlusIntegration_SingleConsumer_EOA_Request(t *testing.T) {
-	testutils.SkipFlakey(t, "https://smartcontract-it.atlassian.net/browse/BCF-2744")
+	t.Skip("questionable value of this test")
 	t.Parallel()
 	ownerKey := cltest.MustGenerateRandomKey(t)
 	uni := newVRFCoordinatorV2PlusUniverse(t, ownerKey, 1, false)
@@ -473,6 +481,7 @@ func TestVRFV2PlusIntegration_SingleConsumer_EOA_Request(t *testing.T) {
 }
 
 func TestVRFV2PlusIntegration_SingleConsumer_EOA_Request_Batching_Enabled(t *testing.T) {
+	t.Skip("questionable value of this test")
 	t.Parallel()
 	ownerKey := cltest.MustGenerateRandomKey(t)
 	uni := newVRFCoordinatorV2PlusUniverse(t, ownerKey, 1, false)
@@ -488,7 +497,6 @@ func TestVRFV2PlusIntegration_SingleConsumer_EOA_Request_Batching_Enabled(t *tes
 }
 
 func TestVRFV2PlusIntegration_SingleConsumer_EIP150_HappyPath(t *testing.T) {
-	testutils.SkipFlakey(t, "https://smartcontract-it.atlassian.net/browse/VRF-589")
 	t.Parallel()
 	ownerKey := cltest.MustGenerateRandomKey(t)
 	uni := newVRFCoordinatorV2PlusUniverse(t, ownerKey, 1, false)
@@ -1149,6 +1157,8 @@ func TestVRFV2PlusIntegration_Migration(t *testing.T) {
 		})(c, s)
 		c.EVM[0].GasEstimator.LimitDefault = ptr[uint32](5_000_000)
 		c.EVM[0].MinIncomingConfirmations = ptr[uint32](2)
+		c.Feature.LogPoller = ptr(true)
+		c.EVM[0].LogPollInterval = models.MustNewDuration(1 * time.Second)
 	})
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, ownerKey, key1)
 
diff --git a/core/services/vrf/v2/integration_v2_test.go b/core/services/vrf/v2/integration_v2_test.go
index c1376eafebb..74d923ce09f 100644
--- a/core/services/vrf/v2/integration_v2_test.go
+++ b/core/services/vrf/v2/integration_v2_test.go
@@ -183,6 +183,10 @@ func newVRFCoordinatorV2Universe(t *testing.T, key ethkey.KeyV2, numConsumers in
 		vrf_coordinator_v2.VRFCoordinatorV2ABI))
 	require.NoError(t, err)
 	backend := cltest.NewSimulatedBackend(t, genesisData, gasLimit)
+	blockTime := time.UnixMilli(int64(backend.Blockchain().CurrentHeader().Time))
+	err = backend.AdjustTime(time.Since(blockTime) - 24*time.Hour)
+	require.NoError(t, err)
+	backend.Commit()
 	// Deploy link
 	linkAddress, _, linkContract, err := link_token_interface.DeployLinkToken(
 		sergey, backend)
@@ -925,6 +929,7 @@ func TestVRFV2Integration_SingleConsumer_HappyPath(t *testing.T) {
 }
 
 func TestVRFV2Integration_SingleConsumer_EOA_Request(t *testing.T) {
+	t.Skip("questionable value of this test")
 	t.Parallel()
 	ownerKey := cltest.MustGenerateRandomKey(t)
 	uni := newVRFCoordinatorV2Universe(t, ownerKey, 1)
@@ -940,6 +945,7 @@ func TestVRFV2Integration_SingleConsumer_EOA_Request(t *testing.T) {
 }
 
 func TestVRFV2Integration_SingleConsumer_EOA_Request_Batching_Enabled(t *testing.T) {
+	t.Skip("questionable value of this test")
 	t.Parallel()
 	ownerKey := cltest.MustGenerateRandomKey(t)
 	uni := newVRFCoordinatorV2Universe(t, ownerKey, 1)
@@ -1217,6 +1223,8 @@ func TestVRFV2Integration_Wrapper_High_Gas(t *testing.T) {
 		})(c, s)
 		c.EVM[0].GasEstimator.LimitDefault = ptr[uint32](3_500_000)
 		c.EVM[0].MinIncomingConfirmations = ptr[uint32](2)
+		c.Feature.LogPoller = ptr(true)
+		c.EVM[0].LogPollInterval = models.MustNewDuration(1 * time.Second)
 	})
 	ownerKey := cltest.MustGenerateRandomKey(t)
 	uni := newVRFCoordinatorV2Universe(t, ownerKey, 1)
@@ -1452,7 +1460,10 @@ func simulatedOverrides(t *testing.T, defaultGasPrice *assets.Wei, ks ...toml.Ke
 		if defaultGasPrice != nil {
 			c.EVM[0].GasEstimator.PriceDefault = defaultGasPrice
 		}
-		c.EVM[0].GasEstimator.LimitDefault = ptr[uint32](2_000_000)
+		c.EVM[0].GasEstimator.LimitDefault = ptr[uint32](3_500_000)
+
+		c.Feature.LogPoller = ptr(true)
+		c.EVM[0].LogPollInterval = models.MustNewDuration(1 * time.Second)
 
 		c.EVM[0].HeadTracker.MaxBufferSize = ptr[uint32](100)
 		c.EVM[0].HeadTracker.SamplingInterval = models.MustNewDuration(0) // Head sampling disabled
diff --git a/core/services/vrf/v2/listener_v2.go b/core/services/vrf/v2/listener_v2.go
index e0f8ff9a5bf..5878bf54763 100644
--- a/core/services/vrf/v2/listener_v2.go
+++ b/core/services/vrf/v2/listener_v2.go
@@ -1,36 +1,22 @@
 package v2
 
 import (
-	"cmp"
 	"context"
-	"database/sql"
 	"encoding/hex"
-	"fmt"
-	"math"
 	"math/big"
-	"slices"
 	"strings"
 	"sync"
 	"time"
 
 	"github.com/avast/retry-go/v4"
-	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/rpc"
-	"github.com/google/uuid"
 	"github.com/pkg/errors"
-	heaps "github.com/theodesp/go-heaps"
 	"github.com/theodesp/go-heaps/pairing"
-	"go.uber.org/multierr"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 	txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr"
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/aggregator_v3_interface"
@@ -45,12 +31,9 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
 	"github.com/smartcontractkit/chainlink/v2/core/services/vrf/vrfcommon"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
-	bigmath "github.com/smartcontractkit/chainlink/v2/core/utils/big_math"
 )
 
 var (
-	_                         log.Listener   = &listenerV2{}
 	_                         job.ServiceCtx = &listenerV2{}
 	coordinatorV2ABI                         = evmtypes.MustGetABI(vrf_coordinator_v2.VRFCoordinatorV2ABI)
 	coordinatorV2PlusABI                     = evmtypes.MustGetABI(vrf_coordinator_v2plus_interface.IVRFCoordinatorV2PlusInternalABI)
@@ -78,22 +61,8 @@ const (
 
 	txMetaFieldSubId  = "SubId"
 	txMetaGlobalSubId = "GlobalSubId"
-
-	CouldNotDetermineIfLogConsumedMsg = "Could not determine if log was already consumed"
 )
 
-type errPossiblyInsufficientFunds struct{}
-
-func (errPossiblyInsufficientFunds) Error() string {
-	return "Simulation errored, possibly insufficient funds. Request will remain unprocessed until funds are available"
-}
-
-type errBlockhashNotInStore struct{}
-
-func (errBlockhashNotInStore) Error() string {
-	return "Blockhash not in store"
-}
-
 func New(
 	cfg vrfcommon.Config,
 	feeCfg vrfcommon.FeeConfig,
@@ -108,63 +77,34 @@ func New(
 	pipelineRunner pipeline.Runner,
 	gethks keystore.Eth,
 	job job.Job,
-	mailMon *utils.MailboxMonitor,
-	reqLogs *utils.Mailbox[log.Broadcast],
 	reqAdded func(),
-	deduper *vrfcommon.LogDeduper,
+	inflightCache vrfcommon.InflightCache,
+	fulfillmentDeduper *vrfcommon.LogDeduper,
 ) job.ServiceCtx {
 	return &listenerV2{
-		cfg:                cfg,
-		feeCfg:             feeCfg,
-		l:                  logger.Sugared(l),
-		chain:              chain,
-		chainID:            chainID,
-		mailMon:            mailMon,
-		coordinator:        coordinator,
-		batchCoordinator:   batchCoordinator,
-		vrfOwner:           vrfOwner,
-		pipelineRunner:     pipelineRunner,
-		job:                job,
-		q:                  q,
-		gethks:             gethks,
-		reqLogs:            reqLogs,
-		chStop:             make(services.StopChan),
-		reqAdded:           reqAdded,
-		blockNumberToReqID: pairing.New(),
-		latestHeadMu:       sync.RWMutex{},
-		wg:                 &sync.WaitGroup{},
-		aggregator:         aggregator,
-		deduper:            deduper,
+		cfg:                   cfg,
+		feeCfg:                feeCfg,
+		l:                     logger.Sugared(l),
+		chain:                 chain,
+		chainID:               chainID,
+		coordinator:           coordinator,
+		batchCoordinator:      batchCoordinator,
+		vrfOwner:              vrfOwner,
+		pipelineRunner:        pipelineRunner,
+		job:                   job,
+		q:                     q,
+		gethks:                gethks,
+		chStop:                make(chan struct{}),
+		reqAdded:              reqAdded,
+		blockNumberToReqID:    pairing.New(),
+		latestHeadMu:          sync.RWMutex{},
+		wg:                    &sync.WaitGroup{},
+		aggregator:            aggregator,
+		inflightCache:         inflightCache,
+		fulfillmentLogDeduper: fulfillmentDeduper,
 	}
 }
 
-type pendingRequest struct {
-	confirmedAtBlock uint64
-	req              RandomWordsRequested
-	lb               log.Broadcast
-	utcTimestamp     time.Time
-
-	// used for exponential backoff when retrying
-	attempts int
-	lastTry  time.Time
-}
-
-type vrfPipelineResult struct {
-	err error
-	// maxFee indicates how much juels (link) or wei (ether) would be paid for the VRF request
-	// if it were to be fulfilled at the maximum gas price (i.e gas lane gas price).
-	maxFee *big.Int
-	// fundsNeeded indicates a "minimum balance" in juels or wei that must be held in the
-	// subscription's account in order to fulfill the request.
-	fundsNeeded   *big.Int
-	run           *pipeline.Run
-	payload       string
-	gasLimit      uint32
-	req           pendingRequest
-	proof         VRFProof
-	reqCommitment RequestCommitment
-}
-
 type listenerV2 struct {
 	services.StateMachine
 	cfg     vrfcommon.Config
@@ -172,7 +112,6 @@ type listenerV2 struct {
 	l       logger.SugaredLogger
 	chain   legacyevm.Chain
 	chainID *big.Int
-	mailMon *utils.MailboxMonitor
 
 	coordinator      CoordinatorV2_X
 	batchCoordinator batch_vrf_coordinator_v2.BatchVRFCoordinatorV2Interface
@@ -182,19 +121,13 @@ type listenerV2 struct {
 	job            job.Job
 	q              pg.Q
 	gethks         keystore.Eth
-	reqLogs        *utils.Mailbox[log.Broadcast]
 	chStop         services.StopChan
-	// We can keep these pending logs in memory because we
-	// only mark them confirmed once we send a corresponding fulfillment transaction.
-	// So on node restart in the middle of processing, the lb will resend them.
-	reqsMu   sync.Mutex // Both the log listener and the request handler write to reqs
-	reqs     []pendingRequest
+
 	reqAdded func() // A simple debug helper
 
 	// Data structures for reorg attack protection
 	// We want a map so we can do an O(1) count update every fulfillment log we get.
-	respCountMu sync.Mutex
-	respCount   map[string]uint64
+	respCount map[string]uint64
 	// This auxiliary heap is used when we need to purge the
 	// respCount map - we repeatedly want to remove the minimum log.
 	// You could use a sorted list if the completed logs arrive in order, but they may not.
@@ -210,8 +143,14 @@ type listenerV2 struct {
 	// aggregator client to get link/eth feed prices from chain. Can be nil for VRF V2 plus
 	aggregator aggregator_v3_interface.AggregatorV3InterfaceInterface
 
-	// deduper prevents processing duplicate requests from the log broadcaster.
-	deduper *vrfcommon.LogDeduper
+	// fulfillmentLogDeduper prevents re-processing fulfillment logs.
+	// fulfillment logs are used to increment counts in the respCount map
+	// and to update the blockNumberToReqID heap.
+	fulfillmentLogDeduper *vrfcommon.LogDeduper
+
+	// inflightCache is a cache of in-flight requests, used to prevent
+	// re-processing of requests that are in-flight or already fulfilled.
+	inflightCache vrfcommon.InflightCache
 }
 
 func (lsn *listenerV2) HealthReport() map[string]error {
@@ -234,7 +173,7 @@ func (lsn *listenerV2) Start(ctx context.Context) error {
 		}
 		if err != nil {
 			lsn.l.Criticalw("Error getting coordinator config for gas limit check, starting anyway.", "err", err)
-		} else if conf.MaxGasLimit()+(GasProofVerification*2) > uint32(gasLimit) {
+		} else if conf.MaxGasLimit()+(GasProofVerification*2) > gasLimit {
 			lsn.l.Criticalw("Node gas limit setting may not be high enough to fulfill all requests; it should be increased. Starting anyway.",
 				"currentGasLimit", gasLimit,
 				"neededGasLimit", conf.MaxGasLimit()+(GasProofVerification*2),
@@ -244,24 +183,6 @@ func (lsn *listenerV2) Start(ctx context.Context) error {
 
 		spec := job.LoadDefaultVRFPollPeriod(*lsn.job.VRFSpec)
 
-		unsubscribeLogs := lsn.chain.LogBroadcaster().Register(lsn, log.ListenerOpts{
-			Contract:       lsn.coordinator.Address(),
-			ParseLog:       lsn.coordinator.ParseLog,
-			LogsWithTopics: lsn.coordinator.LogsWithTopics(spec.PublicKey.MustHash()),
-			// Specify a min incoming confirmations of 1 so that we can receive a request log
-			// right away. We set the real number of confirmations on a per-request basis in
-			// the getConfirmedAt method.
-			MinIncomingConfirmations: 1,
-			ReplayStartedCallback:    lsn.ReplayStartedCallback,
-		})
-
-		latestHead, unsubscribeHeadBroadcaster := lsn.chain.HeadBroadcaster().Subscribe(lsn)
-		if latestHead != nil {
-			lsn.setLatestHead(latestHead)
-		}
-
-		lsn.respCountMu.Lock()
-		defer lsn.respCountMu.Unlock()
 		var respCount map[string]uint64
 		respCount, err = lsn.GetStartingResponseCountsV2(ctx)
 		if err != nil {
@@ -269,19 +190,13 @@ func (lsn *listenerV2) Start(ctx context.Context) error {
 		}
 		lsn.respCount = respCount
 
-		// Log listener gathers request logs
-		lsn.wg.Add(1)
-		go func() {
-			lsn.runLogListener([]func(){unsubscribeLogs, unsubscribeHeadBroadcaster}, spec.MinIncomingConfirmations, lsn.wg)
-		}()
-
-		// Request handler periodically computes a set of logs which can be fulfilled.
+		// Log listener gathers request logs and processes them
 		lsn.wg.Add(1)
 		go func() {
-			lsn.runRequestHandler(spec.PollPeriod, lsn.wg)
+			defer lsn.wg.Done()
+			lsn.runLogListener(spec.PollPeriod, spec.MinIncomingConfirmations)
 		}()
 
-		lsn.mailMon.Monitor(lsn.reqLogs, "VRFListenerV2", "RequestLogs", fmt.Sprint(lsn.job.ID))
 		return nil
 	})
 }
@@ -326,1466 +241,27 @@ func (lsn *listenerV2) GetStartingResponseCountsV2(ctx context.Context) (respCou
 	return respCounts, nil
 }
 
-func (lsn *listenerV2) setLatestHead(head *evmtypes.Head) {
+func (lsn *listenerV2) setLatestHead(head logpoller.LogPollerBlock) {
 	lsn.latestHeadMu.Lock()
 	defer lsn.latestHeadMu.Unlock()
-	num := uint64(head.Number)
+	num := uint64(head.BlockNumber)
 	if num > lsn.latestHeadNumber {
 		lsn.latestHeadNumber = num
 	}
 }
 
-// OnNewLongestChain is called by the head broadcaster when a new head is available.
-func (lsn *listenerV2) OnNewLongestChain(ctx context.Context, head *evmtypes.Head) {
-	lsn.setLatestHead(head)
-}
-
 func (lsn *listenerV2) getLatestHead() uint64 {
 	lsn.latestHeadMu.RLock()
 	defer lsn.latestHeadMu.RUnlock()
-	return uint64(lsn.latestHeadNumber)
-}
-
-// Returns all the confirmed logs from
-// the pending queue by subscription
-func (lsn *listenerV2) getAndRemoveConfirmedLogsBySub(latestHead uint64) map[string][]pendingRequest {
-	lsn.reqsMu.Lock()
-	defer lsn.reqsMu.Unlock()
-	vrfcommon.UpdateQueueSize(lsn.job.Name.ValueOrZero(), lsn.job.ExternalJobID, lsn.coordinator.Version(), uniqueReqs(lsn.reqs))
-	var toProcess = make(map[string][]pendingRequest)
-	var toKeep []pendingRequest
-	for i := 0; i < len(lsn.reqs); i++ {
-		if r := lsn.reqs[i]; lsn.ready(r, latestHead) {
-			toProcess[r.req.SubID().String()] = append(toProcess[r.req.SubID().String()], r)
-		} else {
-			toKeep = append(toKeep, lsn.reqs[i])
-		}
-	}
-	lsn.reqs = toKeep
-	return toProcess
-}
-
-func (lsn *listenerV2) ready(req pendingRequest, latestHead uint64) bool {
-	// Request is not eligible for fulfillment yet
-	if req.confirmedAtBlock > latestHead {
-		return false
-	}
-
-	if lsn.job.VRFSpec.BackoffInitialDelay == 0 || req.attempts == 0 {
-		// Backoff is disabled, or this is the first try
-		return true
-	}
-
-	return time.Now().UTC().After(
-		nextTry(
-			req.attempts,
-			lsn.job.VRFSpec.BackoffInitialDelay,
-			lsn.job.VRFSpec.BackoffMaxDelay,
-			req.lastTry))
-}
-
-func nextTry(retries int, initial, max time.Duration, last time.Time) time.Time {
-	expBackoffFactor := math.Pow(backoffFactor, float64(retries-1))
-
-	var delay time.Duration
-	if expBackoffFactor > float64(max/initial) {
-		delay = max
-	} else {
-		delay = time.Duration(float64(initial) * expBackoffFactor)
-	}
-	return last.Add(delay)
-}
-
-// Remove all entries 10000 blocks or older
-// to avoid a memory leak.
-func (lsn *listenerV2) pruneConfirmedRequestCounts() {
-	lsn.respCountMu.Lock()
-	defer lsn.respCountMu.Unlock()
-	min := lsn.blockNumberToReqID.FindMin()
-	for min != nil {
-		m := min.(fulfilledReqV2)
-		if m.blockNumber > (lsn.getLatestHead() - 10000) {
-			break
-		}
-		delete(lsn.respCount, m.reqID)
-		lsn.blockNumberToReqID.DeleteMin()
-		min = lsn.blockNumberToReqID.FindMin()
-	}
-}
-
-// Determine a set of logs that are confirmed
-// and the subscription has sufficient balance to fulfill,
-// given a eth call with the max gas price.
-// Note we have to consider the pending reqs already in the txm as already "spent" link or native,
-// using a max link or max native consumed in their metadata.
-// A user will need a minBalance capable of fulfilling a single req at the max gas price or nothing will happen.
-// This is acceptable as users can choose different keyhashes which have different max gas prices.
-// Other variables which can change the bill amount between our eth call simulation and tx execution:
-// - Link/eth price fluctuation
-// - Falling back to BHS
-// However the likelihood is vanishingly small as
-// 1) the window between simulation and tx execution is tiny.
-// 2) the max gas price provides a very large buffer most of the time.
-// Its easier to optimistically assume it will go though and in the rare case of a reversion
-// we simply retry TODO: follow up where if we see a fulfillment revert, return log to the queue.
-func (lsn *listenerV2) processPendingVRFRequests(ctx context.Context) {
-	confirmed := lsn.getAndRemoveConfirmedLogsBySub(lsn.getLatestHead())
-	processed := make(map[string]struct{})
-	start := time.Now()
-
-	// Add any unprocessed requests back to lsn.reqs after request processing is complete.
-	defer func() {
-		var toKeep []pendingRequest
-		for _, subReqs := range confirmed {
-			for _, req := range subReqs {
-				if _, ok := processed[req.req.RequestID().String()]; !ok {
-					req.attempts++
-					req.lastTry = time.Now().UTC()
-					toKeep = append(toKeep, req)
-					if lsn.job.VRFSpec.BackoffInitialDelay != 0 {
-						lsn.l.Infow("Request failed, next retry will be delayed.",
-							"reqID", req.req.RequestID().String(),
-							"subID", req.req.SubID(),
-							"attempts", req.attempts,
-							"lastTry", req.lastTry.String(),
-							"nextTry", nextTry(
-								req.attempts,
-								lsn.job.VRFSpec.BackoffInitialDelay,
-								lsn.job.VRFSpec.BackoffMaxDelay,
-								req.lastTry))
-					}
-				} else {
-					lsn.markLogAsConsumed(req.lb)
-				}
-			}
-		}
-		// There could be logs accumulated to this slice while request processor is running,
-		// so we merged the new ones with the ones that need to be requeued.
-		lsn.reqsMu.Lock()
-		lsn.reqs = append(lsn.reqs, toKeep...)
-		lsn.l.Infow("Finished processing pending requests",
-			"totalProcessed", len(processed),
-			"totalFailed", len(toKeep),
-			"total", len(lsn.reqs),
-			"time", time.Since(start).String())
-		lsn.reqsMu.Unlock() // unlock here since len(lsn.reqs) is a read, to avoid a data race.
-	}()
-
-	if len(confirmed) == 0 {
-		lsn.l.Infow("No pending requests ready for processing")
-		return
-	}
-	for subID, reqs := range confirmed {
-		l := lsn.l.With("subID", subID, "startTime", time.Now(), "numReqsForSub", len(reqs))
-		// Get the balance of the subscription and also it's active status.
-		// The reason we need both is that we cannot determine if a subscription
-		// is active solely by it's balance, since an active subscription could legitimately
-		// have a zero balance.
-		var (
-			startLinkBalance *big.Int
-			startEthBalance  *big.Int
-			subIsActive      bool
-		)
-		sID, ok := new(big.Int).SetString(subID, 10)
-		if !ok {
-			l.Criticalw("Unable to convert %s to Int", subID)
-			continue
-		}
-		sub, err := lsn.coordinator.GetSubscription(&bind.CallOpts{
-			Context: ctx}, sID)
-
-		if err != nil {
-			if strings.Contains(err.Error(), "execution reverted") {
-				// "execution reverted" indicates that the subscription no longer exists.
-				// We can no longer just mark these as processed and continue,
-				// since it could be that the subscription was canceled while there
-				// were still unfulfilled requests.
-				// The simplest approach to handle this is to enter the processRequestsPerSub
-				// loop rather than create a bunch of largely duplicated code
-				// to handle this specific situation, since we need to run the pipeline to get
-				// the VRF proof, abi-encode it, etc.
-				l.Warnw("Subscription not found - setting start balance to zero", "subID", subID, "err", err)
-				startLinkBalance = big.NewInt(0)
-			} else {
-				// Most likely this is an RPC error, so we re-try later.
-				l.Errorw("Unable to read subscription balance", "err", err)
-				continue
-			}
-		} else {
-			// Happy path - sub is active.
-			startLinkBalance = sub.Balance()
-			if sub.Version() == vrfcommon.V2Plus {
-				startEthBalance = sub.NativeBalance()
-			}
-			subIsActive = true
-		}
-
-		// Sort requests in ascending order by CallbackGasLimit
-		// so that we process the "cheapest" requests for each subscription
-		// first. This allows us to break out of the processing loop as early as possible
-		// in the event that a subscription is too underfunded to have it's
-		// requests processed.
-		slices.SortFunc(reqs, func(a, b pendingRequest) int {
-			return cmp.Compare(a.req.CallbackGasLimit(), b.req.CallbackGasLimit())
-		})
-
-		p := lsn.processRequestsPerSub(ctx, sID, startLinkBalance, startEthBalance, reqs, subIsActive)
-		for reqID := range p {
-			processed[reqID] = struct{}{}
-		}
-	}
-	lsn.pruneConfirmedRequestCounts()
-}
-
-// MaybeSubtractReservedLink figures out how much LINK is reserved for other VRF requests that
-// have not been fully confirmed yet on-chain, and subtracts that from the given startBalance,
-// and returns that value if there are no errors.
-func (lsn *listenerV2) MaybeSubtractReservedLink(ctx context.Context, startBalance *big.Int, chainID *big.Int, subID *big.Int, vrfVersion vrfcommon.Version) (*big.Int, error) {
-	var metaField string
-	if vrfVersion == vrfcommon.V2Plus {
-		metaField = txMetaGlobalSubId
-	} else if vrfVersion == vrfcommon.V2 {
-		metaField = txMetaFieldSubId
-	} else {
-		return nil, errors.Errorf("unsupported vrf version %s", vrfVersion)
-	}
-
-	txes, err := lsn.chain.TxManager().FindTxesByMetaFieldAndStates(ctx, metaField, subID.String(), reserveEthLinkQueryStates, chainID)
-	if err != nil && !errors.Is(err, sql.ErrNoRows) {
-		return nil, errors.Wrap(err, "TXM FindTxesByMetaFieldAndStates failed")
-	}
-
-	reservedLinkSum := big.NewInt(0)
-	// Aggregate non-null MaxLink from all txes returned
-	for _, tx := range txes {
-		var meta *txmgrtypes.TxMeta[common.Address, common.Hash]
-		meta, err = tx.GetMeta()
-		if err != nil {
-			return nil, errors.Wrap(err, "GetMeta for Tx failed")
-		}
-		if meta != nil && meta.MaxLink != nil {
-			txMaxLink, success := new(big.Int).SetString(*meta.MaxLink, 10)
-			if !success {
-				return nil, fmt.Errorf("converting reserved LINK %s", *meta.MaxLink)
-			}
-
-			reservedLinkSum.Add(reservedLinkSum, txMaxLink)
-		}
-	}
-
-	return new(big.Int).Sub(startBalance, reservedLinkSum), nil
-}
-
-// MaybeSubtractReservedEth figures out how much ether is reserved for other VRF requests that
-// have not been fully confirmed yet on-chain, and subtracts that from the given startBalance,
-// and returns that value if there are no errors.
-func (lsn *listenerV2) MaybeSubtractReservedEth(ctx context.Context, startBalance *big.Int, chainID *big.Int, subID *big.Int, vrfVersion vrfcommon.Version) (*big.Int, error) {
-	var metaField string
-	if vrfVersion == vrfcommon.V2Plus {
-		metaField = txMetaGlobalSubId
-	} else if vrfVersion == vrfcommon.V2 {
-		// native payment is not supported for v2, so returning 0 reserved ETH
-		return big.NewInt(0), nil
-	} else {
-		return nil, errors.Errorf("unsupported vrf version %s", vrfVersion)
-	}
-	txes, err := lsn.chain.TxManager().FindTxesByMetaFieldAndStates(ctx, metaField, subID.String(), reserveEthLinkQueryStates, chainID)
-	if err != nil && !errors.Is(err, sql.ErrNoRows) {
-		return nil, errors.Wrap(err, "TXM FindTxesByMetaFieldAndStates failed")
-	}
-
-	reservedEthSum := big.NewInt(0)
-	// Aggregate non-null MaxEth from all txes returned
-	for _, tx := range txes {
-		var meta *txmgrtypes.TxMeta[common.Address, common.Hash]
-		meta, err = tx.GetMeta()
-		if err != nil {
-			return nil, errors.Wrap(err, "GetMeta for Tx failed")
-		}
-		if meta != nil && meta.MaxEth != nil {
-			txMaxEth, success := new(big.Int).SetString(*meta.MaxEth, 10)
-			if !success {
-				return nil, fmt.Errorf("converting reserved ETH %s", *meta.MaxEth)
-			}
-
-			reservedEthSum.Add(reservedEthSum, txMaxEth)
-		}
-	}
-
-	if startBalance != nil {
-		return new(big.Int).Sub(startBalance, reservedEthSum), nil
-	}
-	return big.NewInt(0), nil
-}
-
-type fulfilledReqV2 struct {
-	blockNumber uint64
-	reqID       string
-}
-
-func (a fulfilledReqV2) Compare(b heaps.Item) int {
-	a1 := a
-	a2 := b.(fulfilledReqV2)
-	switch {
-	case a1.blockNumber > a2.blockNumber:
-		return 1
-	case a1.blockNumber < a2.blockNumber:
-		return -1
-	default:
-		return 0
-	}
-}
-
-func (lsn *listenerV2) processRequestsPerSubBatchHelper(
-	ctx context.Context,
-	subID *big.Int,
-	startBalance *big.Int,
-	startBalanceNoReserved *big.Int,
-	reqs []pendingRequest,
-	subIsActive bool,
-	nativePayment bool,
-) (processed map[string]struct{}) {
-	start := time.Now()
-	processed = make(map[string]struct{})
-
-	// Base the max gas for a batch on the max gas limit for a single callback.
-	// Since the max gas limit for a single callback is usually quite large already,
-	// we probably don't want to exceed it too much so that we can reliably get
-	// batch fulfillments included, while also making sure that the biggest gas guzzler
-	// callbacks are included.
-	config, err := lsn.coordinator.GetConfig(&bind.CallOpts{
-		Context: ctx,
-	})
-	if err != nil {
-		lsn.l.Errorw("Couldn't get config from coordinator", "err", err)
-		return processed
-	}
-
-	// Add very conservative upper bound estimate on verification costs.
-	batchMaxGas := uint32(config.MaxGasLimit() + 400_000)
-
-	l := lsn.l.With(
-		"subID", subID,
-		"eligibleSubReqs", len(reqs),
-		"startBalance", startBalance.String(),
-		"startBalanceNoReserved", startBalanceNoReserved.String(),
-		"batchMaxGas", batchMaxGas,
-		"subIsActive", subIsActive,
-		"nativePayment", nativePayment,
-	)
-
-	defer func() {
-		l.Infow("Finished processing for sub",
-			"endBalance", startBalanceNoReserved.String(),
-			"totalProcessed", len(processed),
-			"totalUnique", uniqueReqs(reqs),
-			"time", time.Since(start).String())
-	}()
-
-	l.Infow("Processing requests for subscription with batching")
-
-	// Check for already consumed or expired reqs
-	unconsumed, processedReqs := lsn.getUnconsumed(l, reqs)
-	for _, reqID := range processedReqs {
-		processed[reqID] = struct{}{}
-	}
-
-	// Process requests in chunks in order to kick off as many jobs
-	// as configured in parallel. Then we can combine into fulfillment
-	// batches afterwards.
-	for chunkStart := 0; chunkStart < len(unconsumed); chunkStart += int(lsn.job.VRFSpec.ChunkSize) {
-		chunkEnd := chunkStart + int(lsn.job.VRFSpec.ChunkSize)
-		if chunkEnd > len(unconsumed) {
-			chunkEnd = len(unconsumed)
-		}
-		chunk := unconsumed[chunkStart:chunkEnd]
-
-		var unfulfilled []pendingRequest
-		alreadyFulfilled, err := lsn.checkReqsFulfilled(ctx, l, chunk)
-		if errors.Is(err, context.Canceled) {
-			l.Infow("Context canceled, stopping request processing", "err", err)
-			return processed
-		} else if err != nil {
-			l.Errorw("Error checking for already fulfilled requests, proceeding anyway", "err", err)
-		}
-		for i, a := range alreadyFulfilled {
-			if a {
-				processed[chunk[i].req.RequestID().String()] = struct{}{}
-			} else {
-				unfulfilled = append(unfulfilled, chunk[i])
-			}
-		}
-
-		// All fromAddresses passed to the VRFv2 job have the same KeySpecific-MaxPrice value.
-		fromAddresses := lsn.fromAddresses()
-		maxGasPriceWei := lsn.feeCfg.PriceMaxKey(fromAddresses[0])
-
-		// Cases:
-		// 1. Never simulated: in this case, we want to observe the time until simulated
-		// on the utcTimestamp field of the pending request.
-		// 2. Simulated before: in this case, lastTry will be set to a non-zero time value,
-		// in which case we'd want to use that as a relative point from when we last tried
-		// the request.
-		observeRequestSimDuration(lsn.job.Name.ValueOrZero(), lsn.job.ExternalJobID, lsn.coordinator.Version(), unfulfilled)
-
-		pipelines := lsn.runPipelines(ctx, l, maxGasPriceWei, unfulfilled)
-		batches := newBatchFulfillments(batchMaxGas, lsn.coordinator.Version())
-		outOfBalance := false
-		for _, p := range pipelines {
-			ll := l.With("reqID", p.req.req.RequestID().String(),
-				"txHash", p.req.req.Raw().TxHash,
-				"maxGasPrice", maxGasPriceWei.String(),
-				"fundsNeeded", p.fundsNeeded.String(),
-				"maxFee", p.maxFee.String(),
-				"gasLimit", p.gasLimit,
-				"attempts", p.req.attempts,
-				"remainingBalance", startBalanceNoReserved.String(),
-				"consumerAddress", p.req.req.Sender(),
-				"blockNumber", p.req.req.Raw().BlockNumber,
-				"blockHash", p.req.req.Raw().BlockHash,
-			)
-			fromAddresses := lsn.fromAddresses()
-			fromAddress, err := lsn.gethks.GetRoundRobinAddress(lsn.chainID, fromAddresses...)
-			if err != nil {
-				l.Errorw("Couldn't get next from address", "err", err)
-				continue
-			}
-			ll = ll.With("fromAddress", fromAddress)
-
-			if p.err != nil {
-				if errors.Is(p.err, errBlockhashNotInStore{}) {
-					// Running the blockhash store feeder in backwards mode will be required to
-					// resolve this.
-					ll.Criticalw("Pipeline error", "err", p.err)
-				} else {
-					ll.Errorw("Pipeline error", "err", p.err)
-					if !subIsActive {
-						ll.Warnw("Force-fulfilling a request with insufficient funds on a cancelled sub")
-						etx, err := lsn.enqueueForceFulfillment(ctx, p, fromAddress)
-						if err != nil {
-							ll.Errorw("Error enqueuing force-fulfillment, re-queueing request", "err", err)
-							continue
-						}
-						ll.Infow("Successfully enqueued force-fulfillment", "ethTxID", etx.ID)
-						processed[p.req.req.RequestID().String()] = struct{}{}
-
-						// Need to put a continue here, otherwise the next if statement will be hit
-						// and we'd break out of the loop prematurely.
-						// If a sub is canceled, we want to force-fulfill ALL of it's pending requests
-						// before saying we're done with it.
-						continue
-					}
-
-					if startBalanceNoReserved.Cmp(p.fundsNeeded) < 0 && errors.Is(p.err, errPossiblyInsufficientFunds{}) {
-						ll.Infow("Insufficient balance to fulfill a request based on estimate, breaking", "err", p.err)
-						outOfBalance = true
-
-						// break out of this inner loop to process the currently constructed batch
-						break
-					}
-
-					// Ensure consumer is valid, otherwise drop the request.
-					if !lsn.isConsumerValidAfterFinalityDepthElapsed(ctx, p.req) {
-						lsn.l.Infow(
-							"Dropping request that was made by an invalid consumer.",
-							"consumerAddress", p.req.req.Sender(),
-							"reqID", p.req.req.RequestID(),
-							"blockNumber", p.req.req.Raw().BlockNumber,
-							"blockHash", p.req.req.Raw().BlockHash,
-						)
-						lsn.markLogAsConsumed(p.req.lb)
-					}
-				}
-				continue
-			}
-
-			if startBalanceNoReserved.Cmp(p.maxFee) < 0 {
-				// Insufficient funds, have to wait for a user top up.
-				// Break out of the loop now and process what we are able to process
-				// in the constructed batches.
-				ll.Infow("Insufficient balance to fulfill a request, breaking")
-				break
-			}
-
-			batches.addRun(p, fromAddress)
-
-			startBalanceNoReserved.Sub(startBalanceNoReserved, p.maxFee)
-		}
-
-		var processedRequestIDs []string
-		for _, batch := range batches.fulfillments {
-			l.Debugw("Processing batch", "batchSize", len(batch.proofs))
-			p := lsn.processBatch(l, subID, startBalanceNoReserved, batchMaxGas, batch, batch.fromAddress)
-			processedRequestIDs = append(processedRequestIDs, p...)
-		}
-
-		for _, reqID := range processedRequestIDs {
-			processed[reqID] = struct{}{}
-		}
-
-		// outOfBalance is set to true if the current sub we are processing
-		// has run out of funds to process any remaining requests. After enqueueing
-		// this constructed batch, we break out of this outer loop in order to
-		// avoid unnecessarily processing the remaining requests.
-		if outOfBalance {
-			break
-		}
-	}
-
-	return
-}
-
-func (lsn *listenerV2) processRequestsPerSubBatch(
-	ctx context.Context,
-	subID *big.Int,
-	startLinkBalance *big.Int,
-	startEthBalance *big.Int,
-	reqs []pendingRequest,
-	subIsActive bool,
-) map[string]struct{} {
-	var processed = make(map[string]struct{})
-	startBalanceNoReserveLink, err := lsn.MaybeSubtractReservedLink(
-		ctx, startLinkBalance, lsn.chainID, subID, lsn.coordinator.Version())
-	if err != nil {
-		lsn.l.Errorw("Couldn't get reserved LINK for subscription", "sub", reqs[0].req.SubID(), "err", err)
-		return processed
-	}
-	startBalanceNoReserveEth, err := lsn.MaybeSubtractReservedEth(
-		ctx, startEthBalance, lsn.chainID, subID, lsn.coordinator.Version())
-	if err != nil {
-		lsn.l.Errorw("Couldn't get reserved ether for subscription", "sub", reqs[0].req.SubID(), "err", err)
-		return processed
-	}
-
-	// Split the requests into native and LINK requests.
-	var (
-		nativeRequests []pendingRequest
-		linkRequests   []pendingRequest
-	)
-	for _, req := range reqs {
-		if req.req.NativePayment() {
-			nativeRequests = append(nativeRequests, req)
-		} else {
-			linkRequests = append(linkRequests, req)
-		}
-	}
-	// process the native and link requests in parallel
-	var wg sync.WaitGroup
-	var nativeProcessed, linkProcessed map[string]struct{}
-	wg.Add(2)
-	go func() {
-		defer wg.Done()
-		nativeProcessed = lsn.processRequestsPerSubBatchHelper(ctx, subID, startEthBalance, startBalanceNoReserveEth, nativeRequests, subIsActive, true)
-	}()
-	go func() {
-		defer wg.Done()
-		linkProcessed = lsn.processRequestsPerSubBatchHelper(ctx, subID, startLinkBalance, startBalanceNoReserveLink, linkRequests, subIsActive, false)
-	}()
-	wg.Wait()
-	// combine the processed link and native requests into the processed map
-	for k, v := range nativeProcessed {
-		processed[k] = v
-	}
-	for k, v := range linkProcessed {
-		processed[k] = v
-	}
-
-	return processed
-}
-
-// enqueueForceFulfillment enqueues a forced fulfillment through the
-// VRFOwner contract. It estimates gas again on the transaction due
-// to the extra steps taken within VRFOwner.fulfillRandomWords.
-func (lsn *listenerV2) enqueueForceFulfillment(
-	ctx context.Context,
-	p vrfPipelineResult,
-	fromAddress common.Address,
-) (etx txmgr.Tx, err error) {
-	if lsn.job.VRFSpec.VRFOwnerAddress == nil {
-		err = errors.New("vrf owner address not set in job spec, recreate job and provide it to force-fulfill")
-		return
-	}
-
-	if p.payload == "" {
-		// should probably never happen
-		// a critical log will be logged if this is the case in simulateFulfillment
-		err = errors.New("empty payload in vrfPipelineResult")
-		return
-	}
-
-	// fulfill the request through the VRF owner
-	err = lsn.q.Transaction(func(tx pg.Queryer) error {
-		if err = lsn.chain.LogBroadcaster().MarkConsumed(p.req.lb, pg.WithQueryer(tx)); err != nil {
-			return err
-		}
-
-		lsn.l.Infow("VRFOwner.fulfillRandomWords vs. VRFCoordinatorV2.fulfillRandomWords",
-			"vrf_owner.fulfillRandomWords", hexutil.Encode(vrfOwnerABI.Methods["fulfillRandomWords"].ID),
-			"vrf_coordinator_v2.fulfillRandomWords", hexutil.Encode(coordinatorV2ABI.Methods["fulfillRandomWords"].ID),
-		)
-
-		vrfOwnerAddress1 := lsn.vrfOwner.Address()
-		vrfOwnerAddressSpec := lsn.job.VRFSpec.VRFOwnerAddress.Address()
-		lsn.l.Infow("addresses diff", "wrapper_address", vrfOwnerAddress1, "spec_address", vrfOwnerAddressSpec)
-
-		lsn.l.Infow("fulfillRandomWords payload", "proof", p.proof, "commitment", p.reqCommitment.Get(), "payload", p.payload)
-		txData := hexutil.MustDecode(p.payload)
-		if err != nil {
-			return errors.Wrap(err, "abi pack VRFOwner.fulfillRandomWords")
-		}
-		estimateGasLimit, err := lsn.chain.Client().EstimateGas(ctx, ethereum.CallMsg{
-			From: fromAddress,
-			To:   &vrfOwnerAddressSpec,
-			Data: txData,
-		})
-		if err != nil {
-			return errors.Wrap(err, "failed to estimate gas on VRFOwner.fulfillRandomWords")
-		}
-
-		lsn.l.Infow("Estimated gas limit on force fulfillment",
-			"estimateGasLimit", estimateGasLimit, "pipelineGasLimit", p.gasLimit)
-		if estimateGasLimit < uint64(p.gasLimit) {
-			estimateGasLimit = uint64(p.gasLimit)
-		}
-
-		requestID := common.BytesToHash(p.req.req.RequestID().Bytes())
-		subID := p.req.req.SubID()
-		requestTxHash := p.req.req.Raw().TxHash
-		etx, err = lsn.chain.TxManager().CreateTransaction(ctx, txmgr.TxRequest{
-			FromAddress:    fromAddress,
-			ToAddress:      lsn.vrfOwner.Address(),
-			EncodedPayload: txData,
-			FeeLimit:       uint32(estimateGasLimit),
-			Strategy:       txmgrcommon.NewSendEveryStrategy(),
-			Meta: &txmgr.TxMeta{
-				RequestID:     &requestID,
-				SubID:         ptr(subID.Uint64()),
-				RequestTxHash: &requestTxHash,
-				// No max link since simulation failed
-			},
-		})
-		return err
-	})
-	return
-}
-
-// For an errored pipeline run, wait until the finality depth of the chain to have elapsed,
-// then check if the failing request is being called by an invalid sender. Return false if this is the case,
-// otherwise true.
-func (lsn *listenerV2) isConsumerValidAfterFinalityDepthElapsed(ctx context.Context, req pendingRequest) bool {
-	latestHead := lsn.getLatestHead()
-	if latestHead-req.req.Raw().BlockNumber > uint64(lsn.cfg.FinalityDepth()) {
-		code, err := lsn.chain.Client().CodeAt(ctx, req.req.Sender(), big.NewInt(int64(latestHead)))
-		if err != nil {
-			lsn.l.Warnw("Failed to fetch contract code", "err", err)
-			return true // error fetching code, give the benefit of doubt to the consumer
-		}
-		if len(code) == 0 {
-			return false // invalid consumer
-		}
-	}
-
-	return true // valid consumer, or finality depth has not elapsed
-}
-
-// processRequestsPerSubHelper processes a set of pending requests for the provided sub id.
-// It returns a set of request IDs that were processed.
-// Note that the provided startBalanceNoReserve is the balance of the subscription
-// minus any pending requests that have already been processed and not yet fulfilled onchain.
-func (lsn *listenerV2) processRequestsPerSubHelper(
-	ctx context.Context,
-	subID *big.Int,
-	startBalance *big.Int,
-	startBalanceNoReserved *big.Int,
-	reqs []pendingRequest,
-	subIsActive bool,
-	nativePayment bool,
-) (processed map[string]struct{}) {
-	start := time.Now()
-	processed = make(map[string]struct{})
-
-	l := lsn.l.With(
-		"subID", subID,
-		"eligibleSubReqs", len(reqs),
-		"startBalance", startBalance.String(),
-		"startBalanceNoReserved", startBalanceNoReserved.String(),
-		"subIsActive", subIsActive,
-		"nativePayment", nativePayment,
-	)
-
-	defer func() {
-		l.Infow("Finished processing for sub",
-			"endBalance", startBalanceNoReserved.String(),
-			"totalProcessed", len(processed),
-			"totalUnique", uniqueReqs(reqs),
-			"time", time.Since(start).String())
-	}()
-
-	l.Infow("Processing requests for subscription")
-
-	// Check for already consumed or expired reqs
-	unconsumed, processedReqs := lsn.getUnconsumed(l, reqs)
-	for _, reqID := range processedReqs {
-		processed[reqID] = struct{}{}
-	}
-
-	// Process requests in chunks
-	for chunkStart := 0; chunkStart < len(unconsumed); chunkStart += int(lsn.job.VRFSpec.ChunkSize) {
-		chunkEnd := chunkStart + int(lsn.job.VRFSpec.ChunkSize)
-		if chunkEnd > len(unconsumed) {
-			chunkEnd = len(unconsumed)
-		}
-		chunk := unconsumed[chunkStart:chunkEnd]
-
-		var unfulfilled []pendingRequest
-		alreadyFulfilled, err := lsn.checkReqsFulfilled(ctx, l, chunk)
-		if errors.Is(err, context.Canceled) {
-			l.Infow("Context canceled, stopping request processing", "err", err)
-			return processed
-		} else if err != nil {
-			l.Errorw("Error checking for already fulfilled requests, proceeding anyway", "err", err)
-		}
-		for i, a := range alreadyFulfilled {
-			if a {
-				processed[chunk[i].req.RequestID().String()] = struct{}{}
-			} else {
-				unfulfilled = append(unfulfilled, chunk[i])
-			}
-		}
-
-		// All fromAddresses passed to the VRFv2 job have the same KeySpecific-MaxPrice value.
-		fromAddresses := lsn.fromAddresses()
-		maxGasPriceWei := lsn.feeCfg.PriceMaxKey(fromAddresses[0])
-		observeRequestSimDuration(lsn.job.Name.ValueOrZero(), lsn.job.ExternalJobID, lsn.coordinator.Version(), unfulfilled)
-		pipelines := lsn.runPipelines(ctx, l, maxGasPriceWei, unfulfilled)
-		for _, p := range pipelines {
-			ll := l.With("reqID", p.req.req.RequestID().String(),
-				"txHash", p.req.req.Raw().TxHash,
-				"maxGasPrice", maxGasPriceWei.String(),
-				"fundsNeeded", p.fundsNeeded.String(),
-				"maxFee", p.maxFee.String(),
-				"gasLimit", p.gasLimit,
-				"attempts", p.req.attempts,
-				"remainingBalance", startBalanceNoReserved.String(),
-				"consumerAddress", p.req.req.Sender(),
-				"blockNumber", p.req.req.Raw().BlockNumber,
-				"blockHash", p.req.req.Raw().BlockHash,
-			)
-			fromAddress, err := lsn.gethks.GetRoundRobinAddress(lsn.chainID, fromAddresses...)
-			if err != nil {
-				l.Errorw("Couldn't get next from address", "err", err)
-				continue
-			}
-			ll = ll.With("fromAddress", fromAddress)
-
-			if p.err != nil {
-				if errors.Is(p.err, errBlockhashNotInStore{}) {
-					// Running the blockhash store feeder in backwards mode will be required to
-					// resolve this.
-					ll.Criticalw("Pipeline error", "err", p.err)
-				} else {
-					ll.Errorw("Pipeline error", "err", p.err)
-
-					if !subIsActive {
-						lsn.l.Warnw("Force-fulfilling a request with insufficient funds on a cancelled sub")
-						etx, err2 := lsn.enqueueForceFulfillment(ctx, p, fromAddress)
-						if err2 != nil {
-							ll.Errorw("Error enqueuing force-fulfillment, re-queueing request", "err", err2)
-							continue
-						}
-						ll.Infow("Enqueued force-fulfillment", "ethTxID", etx.ID)
-						processed[p.req.req.RequestID().String()] = struct{}{}
-
-						// Need to put a continue here, otherwise the next if statement will be hit
-						// and we'd break out of the loop prematurely.
-						// If a sub is canceled, we want to force-fulfill ALL of it's pending requests
-						// before saying we're done with it.
-						continue
-					}
-
-					if startBalanceNoReserved.Cmp(p.fundsNeeded) < 0 {
-						ll.Infow("Insufficient balance to fulfill a request based on estimate, returning", "err", p.err)
-						return processed
-					}
-
-					// Ensure consumer is valid, otherwise drop the request.
-					if !lsn.isConsumerValidAfterFinalityDepthElapsed(ctx, p.req) {
-						lsn.l.Infow(
-							"Dropping request that was made by an invalid consumer.",
-							"consumerAddress", p.req.req.Sender(),
-							"reqID", p.req.req.RequestID(),
-							"blockNumber", p.req.req.Raw().BlockNumber,
-							"blockHash", p.req.req.Raw().BlockHash,
-						)
-						lsn.markLogAsConsumed(p.req.lb)
-					}
-				}
-				continue
-			}
-
-			if startBalanceNoReserved.Cmp(p.maxFee) < 0 {
-				// Insufficient funds, have to wait for a user top up. Leave it unprocessed for now
-				ll.Infow("Insufficient balance to fulfill a request, returning")
-				return processed
-			}
-
-			ll.Infow("Enqueuing fulfillment")
-			var transaction txmgr.Tx
-			err = lsn.q.Transaction(func(tx pg.Queryer) error {
-				if err = lsn.pipelineRunner.InsertFinishedRun(p.run, true, pg.WithQueryer(tx)); err != nil {
-					return err
-				}
-				if err = lsn.chain.LogBroadcaster().MarkConsumed(p.req.lb, pg.WithQueryer(tx)); err != nil {
-					return err
-				}
-
-				var maxLink, maxEth *string
-				tmp := p.maxFee.String()
-				if p.reqCommitment.NativePayment() {
-					maxEth = &tmp
-				} else {
-					maxLink = &tmp
-				}
-				var (
-					txMetaSubID       *uint64
-					txMetaGlobalSubID *string
-				)
-				if lsn.coordinator.Version() == vrfcommon.V2Plus {
-					txMetaGlobalSubID = ptr(p.req.req.SubID().String())
-				} else if lsn.coordinator.Version() == vrfcommon.V2 {
-					txMetaSubID = ptr(p.req.req.SubID().Uint64())
-				}
-				requestID := common.BytesToHash(p.req.req.RequestID().Bytes())
-				coordinatorAddress := lsn.coordinator.Address()
-				requestTxHash := p.req.req.Raw().TxHash
-				transaction, err = lsn.chain.TxManager().CreateTransaction(ctx, txmgr.TxRequest{
-					FromAddress:    fromAddress,
-					ToAddress:      lsn.coordinator.Address(),
-					EncodedPayload: hexutil.MustDecode(p.payload),
-					FeeLimit:       p.gasLimit,
-					Meta: &txmgr.TxMeta{
-						RequestID:     &requestID,
-						MaxLink:       maxLink,
-						MaxEth:        maxEth,
-						SubID:         txMetaSubID,
-						GlobalSubID:   txMetaGlobalSubID,
-						RequestTxHash: &requestTxHash,
-					},
-					Strategy: txmgrcommon.NewSendEveryStrategy(),
-					Checker: txmgr.TransmitCheckerSpec{
-						CheckerType:           lsn.transmitCheckerType(),
-						VRFCoordinatorAddress: &coordinatorAddress,
-						VRFRequestBlockNumber: new(big.Int).SetUint64(p.req.req.Raw().BlockNumber),
-					},
-				})
-				return err
-			})
-			if err != nil {
-				ll.Errorw("Error enqueuing fulfillment, requeuing request", "err", err)
-				continue
-			}
-			ll.Infow("Enqueued fulfillment", "ethTxID", transaction.GetID())
-
-			// If we successfully enqueued for the txm, subtract that balance
-			// And loop to attempt to enqueue another fulfillment
-			startBalanceNoReserved.Sub(startBalanceNoReserved, p.maxFee)
-			processed[p.req.req.RequestID().String()] = struct{}{}
-			vrfcommon.IncProcessedReqs(lsn.job.Name.ValueOrZero(), lsn.job.ExternalJobID, lsn.coordinator.Version())
-		}
-	}
-
-	return
-}
-
-func (lsn *listenerV2) transmitCheckerType() txmgrtypes.TransmitCheckerType {
-	if lsn.coordinator.Version() == vrfcommon.V2 {
-		return txmgr.TransmitCheckerTypeVRFV2
-	}
-	return txmgr.TransmitCheckerTypeVRFV2Plus
-}
-
-func (lsn *listenerV2) processRequestsPerSub(
-	ctx context.Context,
-	subID *big.Int,
-	startLinkBalance *big.Int,
-	startEthBalance *big.Int,
-	reqs []pendingRequest,
-	subIsActive bool,
-) map[string]struct{} {
-	if lsn.job.VRFSpec.BatchFulfillmentEnabled && lsn.batchCoordinator != nil {
-		return lsn.processRequestsPerSubBatch(ctx, subID, startLinkBalance, startEthBalance, reqs, subIsActive)
-	}
-
-	var processed = make(map[string]struct{})
-	chainId := lsn.chain.Client().ConfiguredChainID()
-	startBalanceNoReserveLink, err := lsn.MaybeSubtractReservedLink(
-		ctx, startLinkBalance, chainId, subID, lsn.coordinator.Version())
-	if err != nil {
-		lsn.l.Errorw("Couldn't get reserved LINK for subscription", "sub", reqs[0].req.SubID(), "err", err)
-		return processed
-	}
-	startBalanceNoReserveEth, err := lsn.MaybeSubtractReservedEth(
-		ctx, startEthBalance, lsn.chainID, subID, lsn.coordinator.Version())
-	if err != nil {
-		lsn.l.Errorw("Couldn't get reserved ETH for subscription", "sub", reqs[0].req.SubID(), "err", err)
-		return processed
-	}
-
-	// Split the requests into native and LINK requests.
-	var (
-		nativeRequests []pendingRequest
-		linkRequests   []pendingRequest
-	)
-	for _, req := range reqs {
-		if req.req.NativePayment() {
-			nativeRequests = append(nativeRequests, req)
-		} else {
-			linkRequests = append(linkRequests, req)
-		}
-	}
-	// process the native and link requests in parallel
-	var (
-		wg                             sync.WaitGroup
-		nativeProcessed, linkProcessed map[string]struct{}
-	)
-	wg.Add(2)
-	go func() {
-		defer wg.Done()
-		nativeProcessed = lsn.processRequestsPerSubHelper(
-			ctx,
-			subID,
-			startEthBalance,
-			startBalanceNoReserveEth,
-			nativeRequests,
-			subIsActive,
-			true)
-	}()
-	go func() {
-		defer wg.Done()
-		linkProcessed = lsn.processRequestsPerSubHelper(
-			ctx,
-			subID,
-			startLinkBalance,
-			startBalanceNoReserveLink,
-			linkRequests,
-			subIsActive,
-			false)
-	}()
-	wg.Wait()
-	// combine the native and link processed requests into the processed map
-	for k, v := range nativeProcessed {
-		processed[k] = v
-	}
-	for k, v := range linkProcessed {
-		processed[k] = v
-	}
-
-	return processed
-}
-
-func (lsn *listenerV2) requestCommitmentPayload(requestID *big.Int) (payload []byte, err error) {
-	if lsn.coordinator.Version() == vrfcommon.V2Plus {
-		return coordinatorV2PlusABI.Pack("s_requestCommitments", requestID)
-	} else if lsn.coordinator.Version() == vrfcommon.V2 {
-		return coordinatorV2ABI.Pack("getCommitment", requestID)
-	}
-	return nil, errors.Errorf("unsupported coordinator version: %s", lsn.coordinator.Version())
-}
-
-// checkReqsFulfilled returns a bool slice the same size of the given reqs slice
-// where each slice element indicates whether that request was already fulfilled
-// or not.
-func (lsn *listenerV2) checkReqsFulfilled(ctx context.Context, l logger.Logger, reqs []pendingRequest) ([]bool, error) {
-	var (
-		start     = time.Now()
-		calls     = make([]rpc.BatchElem, len(reqs))
-		fulfilled = make([]bool, len(reqs))
-	)
-
-	for i, req := range reqs {
-		payload, err := lsn.requestCommitmentPayload(req.req.RequestID())
-		if err != nil {
-			// This shouldn't happen
-			return fulfilled, errors.Wrap(err, "creating getCommitment payload")
-		}
-
-		reqBlockNumber := new(big.Int).SetUint64(req.req.Raw().BlockNumber)
-
-		// Subtract 5 since the newest block likely isn't indexed yet and will cause "header not
-		// found" errors.
-		currBlock := new(big.Int).SetUint64(lsn.getLatestHead() - 5)
-		m := bigmath.Max(reqBlockNumber, currBlock)
-
-		var result string
-		calls[i] = rpc.BatchElem{
-			Method: "eth_call",
-			Args: []interface{}{
-				map[string]interface{}{
-					"to":   lsn.coordinator.Address(),
-					"data": hexutil.Bytes(payload),
-				},
-				// The block at which we want to make the call
-				hexutil.EncodeBig(m),
-			},
-			Result: &result,
-		}
-	}
-
-	err := lsn.chain.Client().BatchCallContext(ctx, calls)
-	if err != nil {
-		return fulfilled, errors.Wrap(err, "making batch call")
-	}
-
-	var errs error
-	for i, call := range calls {
-		if call.Error != nil {
-			errs = multierr.Append(errs, fmt.Errorf("checking request %s with hash %s: %w",
-				reqs[i].req.RequestID().String(), reqs[i].req.Raw().TxHash.String(), call.Error))
-			continue
-		}
-
-		rString, ok := call.Result.(*string)
-		if !ok {
-			errs = multierr.Append(errs,
-				fmt.Errorf("unexpected result %+v on request %s with hash %s",
-					call.Result, reqs[i].req.RequestID().String(), reqs[i].req.Raw().TxHash.String()))
-			continue
-		}
-		result, err := hexutil.Decode(*rString)
-		if err != nil {
-			errs = multierr.Append(errs,
-				fmt.Errorf("decoding batch call result %+v %s request %s with hash %s: %w",
-					call.Result, *rString, reqs[i].req.RequestID().String(), reqs[i].req.Raw().TxHash.String(), err))
-			continue
-		}
-
-		if utils.IsEmpty(result) {
-			l.Infow("Request already fulfilled",
-				"reqID", reqs[i].req.RequestID().String(),
-				"attempts", reqs[i].attempts,
-				"txHash", reqs[i].req.Raw().TxHash)
-			fulfilled[i] = true
-		}
-	}
-
-	l.Debugw("Done checking fulfillment status",
-		"numChecked", len(reqs), "time", time.Since(start).String())
-	return fulfilled, errs
-}
-
-func (lsn *listenerV2) runPipelines(
-	ctx context.Context,
-	l logger.Logger,
-	maxGasPriceWei *assets.Wei,
-	reqs []pendingRequest,
-) []vrfPipelineResult {
-	var (
-		start   = time.Now()
-		results = make([]vrfPipelineResult, len(reqs))
-		wg      = sync.WaitGroup{}
-	)
-
-	for i, req := range reqs {
-		wg.Add(1)
-		go func(i int, req pendingRequest) {
-			defer wg.Done()
-			results[i] = lsn.simulateFulfillment(ctx, maxGasPriceWei, req, l)
-		}(i, req)
-	}
-	wg.Wait()
-
-	l.Debugw("Finished running pipelines",
-		"count", len(reqs), "time", time.Since(start).String())
-	return results
-}
-
-func (lsn *listenerV2) estimateFee(
-	ctx context.Context,
-	req RandomWordsRequested,
-	maxGasPriceWei *assets.Wei,
-) (*big.Int, error) {
-	// NativePayment() returns true if and only if the version is V2+ and the
-	// request was made in ETH.
-	if req.NativePayment() {
-		return EstimateFeeWei(req.CallbackGasLimit(), maxGasPriceWei.ToInt())
-	}
-
-	// In the event we are using LINK we need to estimate the fee in juels
-	// Don't use up too much time to get this info, it's not critical for operating vrf.
-	callCtx, cancel := context.WithTimeout(ctx, 1*time.Second)
-	defer cancel()
-	roundData, err := lsn.aggregator.LatestRoundData(&bind.CallOpts{Context: callCtx})
-	if err != nil {
-		return nil, errors.Wrap(err, "get aggregator latestAnswer")
-	}
-
-	return EstimateFeeJuels(
-		req.CallbackGasLimit(),
-		maxGasPriceWei.ToInt(),
-		roundData.Answer,
-	)
-}
-
-// Here we use the pipeline to parse the log, generate a vrf response
-// then simulate the transaction at the max gas price to determine its maximum link cost.
-func (lsn *listenerV2) simulateFulfillment(
-	ctx context.Context,
-	maxGasPriceWei *assets.Wei,
-	req pendingRequest,
-	lg logger.Logger,
-) vrfPipelineResult {
-	var (
-		res = vrfPipelineResult{req: req}
-		err error
-	)
-	// estimate how much funds are needed so that we can log it if the simulation fails.
-	res.fundsNeeded, err = lsn.estimateFee(ctx, req.req, maxGasPriceWei)
-	if err != nil {
-		// not critical, just log and continue
-		lg.Warnw("unable to estimate funds needed for request, continuing anyway",
-			"reqID", req.req.RequestID(),
-			"err", err)
-		res.fundsNeeded = big.NewInt(0)
-	}
-
-	vars := pipeline.NewVarsFrom(map[string]interface{}{
-		"jobSpec": map[string]interface{}{
-			"databaseID":    lsn.job.ID,
-			"externalJobID": lsn.job.ExternalJobID,
-			"name":          lsn.job.Name.ValueOrZero(),
-			"publicKey":     lsn.job.VRFSpec.PublicKey[:],
-			"maxGasPrice":   maxGasPriceWei.ToInt().String(),
-			"evmChainID":    lsn.job.VRFSpec.EVMChainID.String(),
-		},
-		"jobRun": map[string]interface{}{
-			"logBlockHash":   req.req.Raw().BlockHash.Bytes(),
-			"logBlockNumber": req.req.Raw().BlockNumber,
-			"logTxHash":      req.req.Raw().TxHash,
-			"logTopics":      req.req.Raw().Topics,
-			"logData":        req.req.Raw().Data,
-		},
-	})
-	var trrs pipeline.TaskRunResults
-	res.run, trrs, err = lsn.pipelineRunner.ExecuteRun(ctx, *lsn.job.PipelineSpec, vars, lg)
-	if err != nil {
-		res.err = errors.Wrap(err, "executing run")
-		return res
-	}
-	// The call task will fail if there are insufficient funds
-	if res.run.AllErrors.HasError() {
-		res.err = errors.WithStack(res.run.AllErrors.ToError())
-
-		if strings.Contains(res.err.Error(), "blockhash not found in store") {
-			res.err = multierr.Combine(res.err, errBlockhashNotInStore{})
-		} else if strings.Contains(res.err.Error(), "execution reverted") {
-			// Even if the simulation fails, we want to get the
-			// txData for the fulfillRandomWords call, in case
-			// we need to force fulfill.
-			for _, trr := range trrs {
-				if trr.Task.Type() == pipeline.TaskTypeVRFV2 {
-					if trr.Result.Error != nil {
-						// error in VRF proof generation
-						// this means that we won't be able to force-fulfill in the event of a
-						// canceled sub and active requests.
-						// since this would be an extraordinary situation,
-						// we can log loudly here.
-						lg.Criticalw("failed to generate VRF proof", "err", trr.Result.Error)
-						break
-					}
-
-					// extract the abi-encoded tx data to fulfillRandomWords from the VRF task.
-					// that's all we need in the event of a force-fulfillment.
-					m := trr.Result.Value.(map[string]any)
-					res.payload = m["output"].(string)
-					res.proof = FromV2Proof(m["proof"].(vrf_coordinator_v2.VRFProof))
-					res.reqCommitment = NewRequestCommitment(m["requestCommitment"])
-				}
-			}
-			res.err = multierr.Combine(res.err, errPossiblyInsufficientFunds{})
-		}
-
-		return res
-	}
-	finalResult := trrs.FinalResult(lg)
-	if len(finalResult.Values) != 1 {
-		res.err = errors.Errorf("unexpected number of outputs, expected 1, was %d", len(finalResult.Values))
-		return res
-	}
-
-	// Run succeeded, we expect a byte array representing the billing amount
-	b, ok := finalResult.Values[0].([]uint8)
-	if !ok {
-		res.err = errors.New("expected []uint8 final result")
-		return res
-	}
-	res.maxFee = utils.HexToBig(hexutil.Encode(b)[2:])
-	for _, trr := range trrs {
-		if trr.Task.Type() == pipeline.TaskTypeVRFV2 {
-			m := trr.Result.Value.(map[string]interface{})
-			res.payload = m["output"].(string)
-			res.proof = FromV2Proof(m["proof"].(vrf_coordinator_v2.VRFProof))
-			res.reqCommitment = NewRequestCommitment(m["requestCommitment"])
-		}
-
-		if trr.Task.Type() == pipeline.TaskTypeVRFV2Plus {
-			m := trr.Result.Value.(map[string]interface{})
-			res.payload = m["output"].(string)
-			res.proof = FromV2PlusProof(m["proof"].(vrf_coordinator_v2plus_interface.IVRFCoordinatorV2PlusInternalProof))
-			res.reqCommitment = NewRequestCommitment(m["requestCommitment"])
-		}
-
-		if trr.Task.Type() == pipeline.TaskTypeEstimateGasLimit {
-			res.gasLimit = trr.Result.Value.(uint32)
-		}
-	}
-	return res
-}
-
-func (lsn *listenerV2) runRequestHandler(pollPeriod time.Duration, wg *sync.WaitGroup) {
-	defer wg.Done()
-	tick := time.NewTicker(pollPeriod)
-	defer tick.Stop()
-	ctx, cancel := lsn.chStop.NewCtx()
-	defer cancel()
-	for {
-		select {
-		case <-lsn.chStop:
-			return
-		case <-tick.C:
-			lsn.processPendingVRFRequests(ctx)
-		}
-	}
-}
-
-func (lsn *listenerV2) runLogListener(unsubscribes []func(), minConfs uint32, wg *sync.WaitGroup) {
-	defer wg.Done()
-	lsn.l.Infow("Listening for run requests",
-		"minConfs", minConfs)
-	for {
-		select {
-		case <-lsn.chStop:
-			for _, f := range unsubscribes {
-				f()
-			}
-			return
-		case <-lsn.reqLogs.Notify():
-			// Process all the logs in the queue if one is added
-			for {
-				lb, exists := lsn.reqLogs.Retrieve()
-				if !exists {
-					break
-				}
-				lsn.handleLog(lb, minConfs)
-			}
-		}
-	}
-}
-
-func (lsn *listenerV2) getConfirmedAt(req RandomWordsRequested, nodeMinConfs uint32) uint64 {
-	lsn.respCountMu.Lock()
-	defer lsn.respCountMu.Unlock()
-	// Take the max(nodeMinConfs, requestedConfs + requestedConfsDelay).
-	// Add the requested confs delay if provided in the jobspec so that we avoid an edge case
-	// where the primary and backup VRF v2 nodes submit a proof at the same time.
-	minConfs := nodeMinConfs
-	if uint32(req.MinimumRequestConfirmations())+uint32(lsn.job.VRFSpec.RequestedConfsDelay) > nodeMinConfs {
-		minConfs = uint32(req.MinimumRequestConfirmations()) + uint32(lsn.job.VRFSpec.RequestedConfsDelay)
-	}
-	newConfs := uint64(minConfs) * (1 << lsn.respCount[req.RequestID().String()])
-	// We cap this at 200 because solidity only supports the most recent 256 blocks
-	// in the contract so if it was older than that, fulfillments would start failing
-	// without the blockhash store feeder. We use 200 to give the node plenty of time
-	// to fulfill even on fast chains.
-	if newConfs > 200 {
-		newConfs = 200
-	}
-	if lsn.respCount[req.RequestID().String()] > 0 {
-		lsn.l.Warnw("Duplicate request found after fulfillment, doubling incoming confirmations",
-			"txHash", req.Raw().TxHash,
-			"blockNumber", req.Raw().BlockNumber,
-			"blockHash", req.Raw().BlockHash,
-			"reqID", req.RequestID().String(),
-			"newConfs", newConfs)
-		vrfcommon.IncDupeReqs(lsn.job.Name.ValueOrZero(), lsn.job.ExternalJobID, lsn.coordinator.Version())
-	}
-	return req.Raw().BlockNumber + newConfs
-}
-
-func (lsn *listenerV2) handleLog(lb log.Broadcast, minConfs uint32) {
-	if v, ok := lb.DecodedLog().(*vrf_coordinator_v2.VRFCoordinatorV2RandomWordsFulfilled); ok {
-		lsn.l.Debugw("Received fulfilled log", "reqID", v.RequestId, "success", v.Success)
-		consumed, err := lsn.chain.LogBroadcaster().WasAlreadyConsumed(lb)
-		if err != nil {
-			lsn.l.Errorw(CouldNotDetermineIfLogConsumedMsg, "err", err, "txHash", lb.RawLog().TxHash)
-			return
-		} else if consumed {
-			return
-		}
-		lsn.respCountMu.Lock()
-		lsn.respCount[v.RequestId.String()]++
-		lsn.respCountMu.Unlock()
-		lsn.blockNumberToReqID.Insert(fulfilledReqV2{
-			blockNumber: v.Raw.BlockNumber,
-			reqID:       v.RequestId.String(),
-		})
-		lsn.markLogAsConsumed(lb)
-		return
-	}
-
-	if v, ok := lb.DecodedLog().(*vrf_coordinator_v2plus_interface.IVRFCoordinatorV2PlusInternalRandomWordsFulfilled); ok {
-		lsn.l.Debugw("Received fulfilled log", "reqID", v.RequestId, "success", v.Success)
-		consumed, err := lsn.chain.LogBroadcaster().WasAlreadyConsumed(lb)
-		if err != nil {
-			lsn.l.Errorw(CouldNotDetermineIfLogConsumedMsg, "err", err, "txHash", lb.RawLog().TxHash)
-			return
-		} else if consumed {
-			return
-		}
-		lsn.respCountMu.Lock()
-		lsn.respCount[v.RequestId.String()]++
-		lsn.respCountMu.Unlock()
-		lsn.blockNumberToReqID.Insert(fulfilledReqV2{
-			blockNumber: v.Raw.BlockNumber,
-			reqID:       v.RequestId.String(),
-		})
-		lsn.markLogAsConsumed(lb)
-		return
-	}
-
-	req, err := lsn.coordinator.ParseRandomWordsRequested(lb.RawLog())
-	if err != nil {
-		lsn.l.Errorw("Failed to parse log", "err", err, "txHash", lb.RawLog().TxHash)
-		consumed, err := lsn.chain.LogBroadcaster().WasAlreadyConsumed(lb)
-		if err != nil {
-			lsn.l.Errorw(CouldNotDetermineIfLogConsumedMsg, "err", err, "txHash", lb.RawLog().TxHash)
-			return
-		} else if consumed {
-			return
-		}
-		lsn.markLogAsConsumed(lb)
-		return
-	}
-
-	confirmedAt := lsn.getConfirmedAt(req, minConfs)
-	lsn.l.Infow("VRFListenerV2: Received log request", "reqID", req.RequestID(), "confirmedAt", confirmedAt, "subID", req.SubID(), "sender", req.Sender())
-	lsn.reqsMu.Lock()
-	lsn.reqs = append(lsn.reqs, pendingRequest{
-		confirmedAtBlock: confirmedAt,
-		req:              req,
-		lb:               lb,
-		utcTimestamp:     time.Now().UTC(),
-	})
-	lsn.reqAdded()
-	lsn.reqsMu.Unlock()
-}
-
-func (lsn *listenerV2) markLogAsConsumed(lb log.Broadcast) {
-	err := lsn.chain.LogBroadcaster().MarkConsumed(lb)
-	lsn.l.ErrorIf(err, fmt.Sprintf("Unable to mark log %v as consumed", lb.String()))
+	return lsn.latestHeadNumber
 }
 
 // Close complies with job.Service
 func (lsn *listenerV2) Close() error {
 	return lsn.StopOnce("VRFListenerV2", func() error {
 		close(lsn.chStop)
-		// wait on the request handler, log listener, and head listener to stop
+		// wait on the request handler, log listener
 		lsn.wg.Wait()
-		return lsn.reqLogs.Close()
+		return nil
 	})
 }
-
-func (lsn *listenerV2) HandleLog(lb log.Broadcast) {
-	if !lsn.deduper.ShouldDeliver(lb.RawLog()) {
-		lsn.l.Tracew("skipping duplicate log broadcast", "log", lb.RawLog())
-		return
-	}
-
-	wasOverCapacity := lsn.reqLogs.Deliver(lb)
-	if wasOverCapacity {
-		lsn.l.Error("Log mailbox is over capacity - dropped the oldest log")
-		vrfcommon.IncDroppedReqs(lsn.job.Name.ValueOrZero(), lsn.job.ExternalJobID, lsn.coordinator.Version(), vrfcommon.ReasonMailboxSize)
-	}
-}
-
-// JobID complies with log.Listener
-func (lsn *listenerV2) JobID() int32 {
-	return lsn.job.ID
-}
-
-// ReplayStartedCallback is called by the log broadcaster when a replay is about to start.
-func (lsn *listenerV2) ReplayStartedCallback() {
-	// Clear the log deduper cache so that we don't incorrectly ignore logs that have been sent that
-	// are already in the cache.
-	lsn.deduper.Clear()
-}
-
-func (lsn *listenerV2) fromAddresses() []common.Address {
-	var addresses []common.Address
-	for _, a := range lsn.job.VRFSpec.FromAddresses {
-		addresses = append(addresses, a.Address())
-	}
-	return addresses
-}
-
-func uniqueReqs(reqs []pendingRequest) int {
-	s := map[string]struct{}{}
-	for _, r := range reqs {
-		s[r.req.RequestID().String()] = struct{}{}
-	}
-	return len(s)
-}
-
-// GasProofVerification is an upper limit on the gas used for verifying the VRF proof on-chain.
-// It can be used to estimate the amount of LINK or native needed to fulfill a request.
-const GasProofVerification uint32 = 200_000
-
-// EstimateFeeJuels estimates the amount of link needed to fulfill a request
-// given the callback gas limit, the gas price, and the wei per unit link.
-// An error is returned if the wei per unit link provided is zero.
-func EstimateFeeJuels(callbackGasLimit uint32, maxGasPriceWei, weiPerUnitLink *big.Int) (*big.Int, error) {
-	if weiPerUnitLink.Cmp(big.NewInt(0)) == 0 {
-		return nil, errors.New("wei per unit link is zero")
-	}
-	maxGasUsed := big.NewInt(int64(callbackGasLimit + GasProofVerification))
-	costWei := maxGasUsed.Mul(maxGasUsed, maxGasPriceWei)
-	// Multiply by 1e18 first so that we don't lose a ton of digits due to truncation when we divide
-	// by weiPerUnitLink
-	numerator := costWei.Mul(costWei, big.NewInt(1e18))
-	costJuels := numerator.Quo(numerator, weiPerUnitLink)
-	return costJuels, nil
-}
-
-// EstimateFeeWei estimates the amount of wei needed to fulfill a request
-func EstimateFeeWei(callbackGasLimit uint32, maxGasPriceWei *big.Int) (*big.Int, error) {
-	maxGasUsed := big.NewInt(int64(callbackGasLimit + GasProofVerification))
-	costWei := maxGasUsed.Mul(maxGasUsed, maxGasPriceWei)
-	return costWei, nil
-}
-
-// observeRequestSimDuration records the time between the given requests simulations or
-// the time until it's first simulation, whichever is applicable.
-// Cases:
-// 1. Never simulated: in this case, we want to observe the time until simulated
-// on the utcTimestamp field of the pending request.
-// 2. Simulated before: in this case, lastTry will be set to a non-zero time value,
-// in which case we'd want to use that as a relative point from when we last tried
-// the request.
-func observeRequestSimDuration(jobName string, extJobID uuid.UUID, vrfVersion vrfcommon.Version, pendingReqs []pendingRequest) {
-	now := time.Now().UTC()
-	for _, request := range pendingReqs {
-		// First time around lastTry will be zero because the request has not been
-		// simulated yet. It will be updated every time the request is simulated (in the event
-		// the request is simulated multiple times, due to it being underfunded).
-		if request.lastTry.IsZero() {
-			vrfcommon.MetricTimeUntilInitialSim.
-				WithLabelValues(jobName, extJobID.String(), string(vrfVersion)).
-				Observe(float64(now.Sub(request.utcTimestamp)))
-		} else {
-			vrfcommon.MetricTimeBetweenSims.
-				WithLabelValues(jobName, extJobID.String(), string(vrfVersion)).
-				Observe(float64(now.Sub(request.lastTry)))
-		}
-	}
-}
-
-func ptr[T any](t T) *T { return &t }
diff --git a/core/services/vrf/v2/listener_v2_helpers.go b/core/services/vrf/v2/listener_v2_helpers.go
new file mode 100644
index 00000000000..b3a3675e296
--- /dev/null
+++ b/core/services/vrf/v2/listener_v2_helpers.go
@@ -0,0 +1,103 @@
+package v2
+
+import (
+	"math/big"
+	"strings"
+	"time"
+
+	"github.com/google/uuid"
+	"github.com/pkg/errors"
+
+	"github.com/smartcontractkit/chainlink/v2/core/services/vrf/vrfcommon"
+)
+
+func uniqueReqs(reqs []pendingRequest) int {
+	s := map[string]struct{}{}
+	for _, r := range reqs {
+		s[r.req.RequestID().String()] = struct{}{}
+	}
+	return len(s)
+}
+
+// GasProofVerification is an upper limit on the gas used for verifying the VRF proof on-chain.
+// It can be used to estimate the amount of LINK or native needed to fulfill a request.
+const GasProofVerification uint32 = 200_000
+
+// EstimateFeeJuels estimates the amount of link needed to fulfill a request
+// given the callback gas limit, the gas price, and the wei per unit link.
+// An error is returned if the wei per unit link provided is zero.
+func EstimateFeeJuels(callbackGasLimit uint32, maxGasPriceWei, weiPerUnitLink *big.Int) (*big.Int, error) {
+	if weiPerUnitLink.Cmp(big.NewInt(0)) == 0 {
+		return nil, errors.New("wei per unit link is zero")
+	}
+	maxGasUsed := big.NewInt(int64(callbackGasLimit + GasProofVerification))
+	costWei := maxGasUsed.Mul(maxGasUsed, maxGasPriceWei)
+	// Multiply by 1e18 first so that we don't lose a ton of digits due to truncation when we divide
+	// by weiPerUnitLink
+	numerator := costWei.Mul(costWei, big.NewInt(1e18))
+	costJuels := numerator.Quo(numerator, weiPerUnitLink)
+	return costJuels, nil
+}
+
+// EstimateFeeWei estimates the amount of wei needed to fulfill a request
+func EstimateFeeWei(callbackGasLimit uint32, maxGasPriceWei *big.Int) (*big.Int, error) {
+	maxGasUsed := big.NewInt(int64(callbackGasLimit + GasProofVerification))
+	costWei := maxGasUsed.Mul(maxGasUsed, maxGasPriceWei)
+	return costWei, nil
+}
+
+// observeRequestSimDuration records the time between the given requests simulations or
+// the time until it's first simulation, whichever is applicable.
+// Cases:
+// 1. Never simulated: in this case, we want to observe the time until simulated
+// on the utcTimestamp field of the pending request.
+// 2. Simulated before: in this case, lastTry will be set to a non-zero time value,
+// in which case we'd want to use that as a relative point from when we last tried
+// the request.
+func observeRequestSimDuration(jobName string, extJobID uuid.UUID, vrfVersion vrfcommon.Version, pendingReqs []pendingRequest) {
+	now := time.Now().UTC()
+	for _, request := range pendingReqs {
+		// First time around lastTry will be zero because the request has not been
+		// simulated yet. It will be updated every time the request is simulated (in the event
+		// the request is simulated multiple times, due to it being underfunded).
+		if request.lastTry.IsZero() {
+			vrfcommon.MetricTimeUntilInitialSim.
+				WithLabelValues(jobName, extJobID.String(), string(vrfVersion)).
+				Observe(float64(now.Sub(request.utcTimestamp)))
+		} else {
+			vrfcommon.MetricTimeBetweenSims.
+				WithLabelValues(jobName, extJobID.String(), string(vrfVersion)).
+				Observe(float64(now.Sub(request.lastTry)))
+		}
+	}
+}
+
+func ptr[T any](t T) *T { return &t }
+
+func isProofVerificationError(errMsg string) bool {
+	// See VRF.sol for all these messages
+	// NOTE: it's unclear which of these errors are impossible and which
+	// may actually happen, so including them all to be safe.
+	errMessages := []string{
+		"invalid x-ordinate",
+		"invalid y-ordinate",
+		"zero scalar",
+		"invZ must be inverse of z",
+		"bad witness",
+		"points in sum must be distinct",
+		"First mul check failed",
+		"Second mul check failed",
+		"public key is not on curve",
+		"gamma is not on curve",
+		"cGammaWitness is not on curve",
+		"sHashWitness is not on curve",
+		"addr(c*pk+s*g)!=_uWitness",
+		"invalid proof",
+	}
+	for _, msg := range errMessages {
+		if strings.Contains(errMsg, msg) {
+			return true
+		}
+	}
+	return false
+}
diff --git a/core/services/vrf/v2/listener_v2_log_listener.go b/core/services/vrf/v2/listener_v2_log_listener.go
new file mode 100644
index 00000000000..b35593bd1ca
--- /dev/null
+++ b/core/services/vrf/v2/listener_v2_log_listener.go
@@ -0,0 +1,451 @@
+package v2
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"math/big"
+	"time"
+
+	"github.com/ethereum/go-ethereum/common"
+	"go.uber.org/multierr"
+
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
+	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
+	"github.com/smartcontractkit/chainlink/v2/core/services/vrf/vrfcommon"
+	"github.com/smartcontractkit/chainlink/v2/core/utils/mathutil"
+)
+
+func (lsn *listenerV2) runLogListener(
+	pollPeriod time.Duration,
+	minConfs uint32,
+) {
+	lsn.l.Infow("Listening for run requests via log poller",
+		"minConfs", minConfs)
+	ticker := time.NewTicker(pollPeriod)
+	defer ticker.Stop()
+	var (
+		lastProcessedBlock int64
+		startingUp         = true
+	)
+	ctx, cancel := lsn.chStop.NewCtx()
+	defer cancel()
+	for {
+		select {
+		case <-lsn.chStop:
+			return
+		case <-ticker.C:
+			start := time.Now()
+			lsn.l.Debugw("log listener loop")
+			// Filter registration is idempotent, so we can just call it every time
+			// and retry on errors using the ticker.
+			err := lsn.chain.LogPoller().RegisterFilter(logpoller.Filter{
+				Name: logpoller.FilterName(
+					"VRFListener",
+					"version", lsn.coordinator.Version(),
+					"keyhash", lsn.job.VRFSpec.PublicKey.MustHash(),
+					"coordinatorAddress", lsn.coordinator.Address()),
+				EventSigs: evmtypes.HashArray{
+					lsn.coordinator.RandomWordsFulfilledTopic(),
+					lsn.coordinator.RandomWordsRequestedTopic(),
+				},
+				Addresses: evmtypes.AddressArray{
+					lsn.coordinator.Address(),
+				},
+			})
+			if err != nil {
+				lsn.l.Errorw("error registering filter in log poller, retrying",
+					"err", err,
+					"elapsed", time.Since(start))
+				continue
+			}
+
+			// on startup we want to initialize the last processed block
+			if startingUp {
+				lsn.l.Debugw("initializing last processed block on startup")
+				lastProcessedBlock, err = lsn.initializeLastProcessedBlock(ctx)
+				if err != nil {
+					lsn.l.Errorw("error initializing last processed block, retrying",
+						"err", err,
+						"elapsed", time.Since(start))
+					continue
+				}
+				startingUp = false
+				lsn.l.Debugw("initialized last processed block", "lastProcessedBlock", lastProcessedBlock)
+			}
+
+			pending, err := lsn.pollLogs(ctx, minConfs, lastProcessedBlock)
+			if err != nil {
+				lsn.l.Errorw("error polling vrf logs, retrying",
+					"err", err,
+					"elapsed", time.Since(start))
+				continue
+			}
+
+			// process pending requests and insert any fulfillments into the inflight cache
+			lsn.processPendingVRFRequests(ctx, pending)
+
+			lastProcessedBlock, err = lsn.updateLastProcessedBlock(ctx, lastProcessedBlock)
+			if err != nil {
+				lsn.l.Errorw("error updating last processed block, continuing anyway", "err", err)
+			} else {
+				lsn.l.Debugw("updated last processed block", "lastProcessedBlock", lastProcessedBlock)
+			}
+			lsn.l.Debugw("log listener loop done", "elapsed", time.Since(start))
+		}
+	}
+}
+
+// initializeLastProcessedBlock returns the earliest block number that we need to
+// process requests for. This is the block number of the earliest unfulfilled request
+// or the latest finalized block, if there are no unfulfilled requests.
+// TODO: add tests
+func (lsn *listenerV2) initializeLastProcessedBlock(ctx context.Context) (lastProcessedBlock int64, err error) {
+	lp := lsn.chain.LogPoller()
+	start := time.Now()
+
+	// will retry on error in the runLogListener loop
+	latestBlock, err := lp.LatestBlock()
+	if err != nil {
+		return 0, fmt.Errorf("LogPoller.LatestBlock(): %w", err)
+	}
+	fromTimestamp := time.Now().UTC().Add(-lsn.job.VRFSpec.RequestTimeout)
+	ll := lsn.l.With(
+		"latestFinalizedBlock", latestBlock.FinalizedBlockNumber,
+		"latestBlock", latestBlock.BlockNumber,
+		"fromTimestamp", fromTimestamp)
+	ll.Debugw("Initializing last processed block")
+	defer func() {
+		ll.Debugw("Done initializing last processed block", "elapsed", time.Since(start))
+	}()
+
+	numBlocksToReplay := numReplayBlocks(lsn.job.VRFSpec.RequestTimeout, lsn.chain.ID())
+	ll.Debugw("running replay on log poller")
+	err = lp.Replay(ctx, mathutil.Max(latestBlock.FinalizedBlockNumber-numBlocksToReplay, 1))
+	if err != nil {
+		return 0, fmt.Errorf("LogPoller.Replay: %w", err)
+	}
+
+	// get randomness requested logs with the appropriate keyhash
+	// keyhash is specified in topic1
+	requests, err := lp.IndexedLogsCreatedAfter(
+		lsn.coordinator.RandomWordsRequestedTopic(), // event sig
+		lsn.coordinator.Address(),                   // address
+		1,                                           // topic index
+		[]common.Hash{lsn.job.VRFSpec.PublicKey.MustHash()}, // topic values
+		fromTimestamp,       // from time
+		logpoller.Finalized, // confs
+	)
+	if err != nil {
+		return 0, fmt.Errorf("LogPoller.LogsCreatedAfter RandomWordsRequested logs: %w", err)
+	}
+
+	// fulfillments don't have keyhash indexed, we'll have to get all of them
+	// TODO: can we instead write a single query that joins on request id's somehow?
+	fulfillments, err := lp.LogsCreatedAfter(
+		lsn.coordinator.RandomWordsFulfilledTopic(), // event sig
+		lsn.coordinator.Address(),                   // address
+		fromTimestamp,                               // from time
+		logpoller.Finalized,                         // confs
+	)
+	if err != nil {
+		return 0, fmt.Errorf("LogPoller.LogsCreatedAfter RandomWordsFulfilled logs: %w", err)
+	}
+
+	unfulfilled, _, _ := lsn.getUnfulfilled(append(requests, fulfillments...), ll)
+	// find request block of earliest unfulfilled request
+	// even if this block is > latest finalized, we use latest finalized as earliest unprocessed
+	// because re-orgs can occur on any unfinalized block.
+	var earliestUnfulfilledBlock = latestBlock.FinalizedBlockNumber
+	for _, req := range unfulfilled {
+		if req.Raw().BlockNumber < uint64(earliestUnfulfilledBlock) {
+			earliestUnfulfilledBlock = int64(req.Raw().BlockNumber)
+		}
+	}
+
+	return earliestUnfulfilledBlock, nil
+}
+
+func (lsn *listenerV2) updateLastProcessedBlock(ctx context.Context, currLastProcessedBlock int64) (lastProcessedBlock int64, err error) {
+	lp := lsn.chain.LogPoller()
+	start := time.Now()
+
+	latestBlock, err := lp.LatestBlock(pg.WithParentCtx(ctx))
+	if err != nil {
+		lsn.l.Errorw("error getting latest block", "err", err)
+		return 0, fmt.Errorf("LogPoller.LatestBlock(): %w", err)
+	}
+	ll := lsn.l.With(
+		"currLastProcessedBlock", currLastProcessedBlock,
+		"latestBlock", latestBlock.BlockNumber,
+		"latestFinalizedBlock", latestBlock.FinalizedBlockNumber)
+	ll.Debugw("updating last processed block")
+	defer func() {
+		ll.Debugw("done updating last processed block", "elapsed", time.Since(start))
+	}()
+
+	logs, err := lp.LogsWithSigs(
+		currLastProcessedBlock,
+		latestBlock.FinalizedBlockNumber,
+		[]common.Hash{lsn.coordinator.RandomWordsFulfilledTopic(), lsn.coordinator.RandomWordsRequestedTopic()},
+		lsn.coordinator.Address(),
+		pg.WithParentCtx(ctx),
+	)
+	if err != nil {
+		return currLastProcessedBlock, fmt.Errorf("LogPoller.LogsWithSigs: %w", err)
+	}
+
+	unfulfilled, unfulfilledLP, _ := lsn.getUnfulfilled(logs, ll)
+	// find request block of earliest unfulfilled request
+	// even if this block is > latest finalized, we use latest finalized as earliest unprocessed
+	// because re-orgs can occur on any unfinalized block.
+	var earliestUnprocessedRequestBlock = latestBlock.FinalizedBlockNumber
+	for i, req := range unfulfilled {
+		// need to drop requests that have timed out otherwise the earliestUnprocessedRequestBlock
+		// will be unnecessarily far back and our queries will be slower.
+		if unfulfilledLP[i].CreatedAt.Before(time.Now().UTC().Add(-lsn.job.VRFSpec.RequestTimeout)) {
+			// request timed out, don't process
+			lsn.l.Debugw("request timed out, skipping",
+				"reqID", req.RequestID(),
+			)
+			continue
+		}
+		if req.Raw().BlockNumber < uint64(earliestUnprocessedRequestBlock) {
+			earliestUnprocessedRequestBlock = int64(req.Raw().BlockNumber)
+		}
+	}
+
+	return earliestUnprocessedRequestBlock, nil
+}
+
+// pollLogs uses the log poller to poll for the latest VRF logs
+func (lsn *listenerV2) pollLogs(ctx context.Context, minConfs uint32, lastProcessedBlock int64) (pending []pendingRequest, err error) {
+	start := time.Now()
+	lp := lsn.chain.LogPoller()
+
+	// latest unfinalized block used on purpose to get bleeding edge logs
+	// we don't really have the luxury to wait for finalization on most chains
+	// if we want to fulfill on time.
+	latestBlock, err := lp.LatestBlock()
+	if err != nil {
+		return nil, fmt.Errorf("LogPoller.LatestBlock(): %w", err)
+	}
+	lsn.setLatestHead(latestBlock)
+	ll := lsn.l.With(
+		"lastProcessedBlock", lastProcessedBlock,
+		"minConfs", minConfs,
+		"latestBlock", latestBlock.BlockNumber,
+		"latestFinalizedBlock", latestBlock.FinalizedBlockNumber)
+	ll.Debugw("polling for logs")
+	defer func() {
+		ll.Debugw("done polling for logs", "elapsed", time.Since(start))
+	}()
+
+	// We don't specify confs because each request can have a different conf above
+	// the minimum. So we do all conf handling in getConfirmedAt.
+	logs, err := lp.LogsWithSigs(
+		lastProcessedBlock,
+		latestBlock.BlockNumber,
+		[]common.Hash{lsn.coordinator.RandomWordsFulfilledTopic(), lsn.coordinator.RandomWordsRequestedTopic()},
+		lsn.coordinator.Address(),
+		pg.WithParentCtx(ctx),
+	)
+	if err != nil {
+		return nil, fmt.Errorf("LogPoller.LogsWithSigs: %w", err)
+	}
+
+	unfulfilled, unfulfilledLP, fulfilled := lsn.getUnfulfilled(logs, ll)
+	if len(unfulfilled) > 0 {
+		ll.Debugw("found unfulfilled logs", "unfulfilled", len(unfulfilled))
+	} else {
+		ll.Debugw("no unfulfilled logs found")
+	}
+
+	lsn.handleFulfilled(fulfilled)
+
+	return lsn.handleRequested(unfulfilled, unfulfilledLP, minConfs), nil
+}
+
+func (lsn *listenerV2) getUnfulfilled(logs []logpoller.Log, ll logger.Logger) (unfulfilled []RandomWordsRequested, unfulfilledLP []logpoller.Log, fulfilled map[string]RandomWordsFulfilled) {
+	var (
+		requested       = make(map[string]RandomWordsRequested)
+		requestedLP     = make(map[string]logpoller.Log)
+		errs            error
+		expectedKeyHash = lsn.job.VRFSpec.PublicKey.MustHash()
+	)
+	fulfilled = make(map[string]RandomWordsFulfilled)
+	for _, l := range logs {
+		if l.EventSig == lsn.coordinator.RandomWordsFulfilledTopic() {
+			parsed, err2 := lsn.coordinator.ParseRandomWordsFulfilled(l.ToGethLog())
+			if err2 != nil {
+				// should never happen
+				errs = multierr.Append(errs, err2)
+				continue
+			}
+			fulfilled[parsed.RequestID().String()] = parsed
+		} else if l.EventSig == lsn.coordinator.RandomWordsRequestedTopic() {
+			parsed, err2 := lsn.coordinator.ParseRandomWordsRequested(l.ToGethLog())
+			if err2 != nil {
+				// should never happen
+				errs = multierr.Append(errs, err2)
+				continue
+			}
+			keyHash := parsed.KeyHash()
+			if !bytes.Equal(keyHash[:], expectedKeyHash[:]) {
+				// wrong keyhash, can ignore
+				continue
+			}
+			requested[parsed.RequestID().String()] = parsed
+			requestedLP[parsed.RequestID().String()] = l
+		}
+	}
+	// should never happen, unsure if recoverable
+	// may be worth a panic
+	if errs != nil {
+		ll.Errorw("encountered parse errors", "err", errs)
+	}
+
+	if len(fulfilled) > 0 || len(requested) > 0 {
+		ll.Infow("found logs", "fulfilled", len(fulfilled), "requested", len(requested))
+	} else {
+		ll.Debugw("no logs found")
+	}
+
+	// find unfulfilled requests by comparing requested events with the fulfilled events
+	for reqID, req := range requested {
+		if _, isFulfilled := fulfilled[reqID]; !isFulfilled {
+			unfulfilled = append(unfulfilled, req)
+			unfulfilledLP = append(unfulfilledLP, requestedLP[reqID])
+		}
+	}
+
+	return unfulfilled, unfulfilledLP, fulfilled
+}
+
+func (lsn *listenerV2) getConfirmedAt(req RandomWordsRequested, nodeMinConfs uint32) uint64 {
+	// Take the max(nodeMinConfs, requestedConfs + requestedConfsDelay).
+	// Add the requested confs delay if provided in the jobspec so that we avoid an edge case
+	// where the primary and backup VRF v2 nodes submit a proof at the same time.
+	minConfs := nodeMinConfs
+	if uint32(req.MinimumRequestConfirmations())+uint32(lsn.job.VRFSpec.RequestedConfsDelay) > nodeMinConfs {
+		minConfs = uint32(req.MinimumRequestConfirmations()) + uint32(lsn.job.VRFSpec.RequestedConfsDelay)
+	}
+	newConfs := uint64(minConfs) * (1 << lsn.respCount[req.RequestID().String()])
+	// We cap this at 200 because solidity only supports the most recent 256 blocks
+	// in the contract so if it was older than that, fulfillments would start failing
+	// without the blockhash store feeder. We use 200 to give the node plenty of time
+	// to fulfill even on fast chains.
+	if newConfs > 200 {
+		newConfs = 200
+	}
+	if lsn.respCount[req.RequestID().String()] > 0 {
+		lsn.l.Warnw("Duplicate request found after fulfillment, doubling incoming confirmations",
+			"txHash", req.Raw().TxHash,
+			"blockNumber", req.Raw().BlockNumber,
+			"blockHash", req.Raw().BlockHash,
+			"reqID", req.RequestID().String(),
+			"newConfs", newConfs)
+		vrfcommon.IncDupeReqs(lsn.job.Name.ValueOrZero(), lsn.job.ExternalJobID, lsn.coordinator.Version())
+	}
+	return req.Raw().BlockNumber + newConfs
+}
+
+func (lsn *listenerV2) handleFulfilled(fulfilled map[string]RandomWordsFulfilled) {
+	for _, v := range fulfilled {
+		// don't process same log over again
+		// log key includes block number and blockhash, so on re-orgs it would return true
+		// and we would re-process the re-orged request.
+		if !lsn.fulfillmentLogDeduper.ShouldDeliver(v.Raw()) {
+			continue
+		}
+		lsn.l.Debugw("Received fulfilled log", "reqID", v.RequestID(), "success", v.Success())
+		lsn.respCount[v.RequestID().String()]++
+		lsn.blockNumberToReqID.Insert(fulfilledReqV2{
+			blockNumber: v.Raw().BlockNumber,
+			reqID:       v.RequestID().String(),
+		})
+	}
+}
+
+func (lsn *listenerV2) handleRequested(requested []RandomWordsRequested, requestedLP []logpoller.Log, minConfs uint32) (pendingRequests []pendingRequest) {
+	for i, req := range requested {
+		// don't process same log over again
+		// log key includes block number and blockhash, so on re-orgs it would return true
+		// and we would re-process the re-orged request.
+		if lsn.inflightCache.Contains(req.Raw()) {
+			continue
+		}
+
+		confirmedAt := lsn.getConfirmedAt(req, minConfs)
+		lsn.l.Debugw("VRFListenerV2: Received log request",
+			"reqID", req.RequestID(),
+			"reqBlockNumber", req.Raw().BlockNumber,
+			"reqBlockHash", req.Raw().BlockHash,
+			"reqTxHash", req.Raw().TxHash,
+			"confirmedAt", confirmedAt,
+			"subID", req.SubID(),
+			"sender", req.Sender())
+		pendingRequests = append(pendingRequests, pendingRequest{
+			confirmedAtBlock: confirmedAt,
+			req:              req,
+			utcTimestamp:     requestedLP[i].CreatedAt.UTC(),
+		})
+		lsn.reqAdded()
+	}
+
+	return pendingRequests
+}
+
+// numReplayBlocks returns the number of blocks to replay on startup
+// given the request timeout and the chain ID.
+// if the chain ID is not recognized it assumes a block time of 1 second
+// and returns the number of blocks in a day.
+func numReplayBlocks(requestTimeout time.Duration, chainID *big.Int) int64 {
+	var timeoutSeconds = int64(requestTimeout.Seconds())
+	switch chainID.String() {
+	case "1": // eth mainnet
+	case "3": // eth ropsten
+	case "4": // eth rinkeby
+	case "5": // eth goerli
+	case "11155111": // eth sepolia
+		// block time is 12s
+		return timeoutSeconds / 12
+	case "137": // polygon mainnet
+	case "80001": // polygon mumbai
+		// block time is 2s
+		return timeoutSeconds / 2
+	case "56": // bsc mainnet
+	case "97": // bsc testnet
+		// block time is 2s
+		return timeoutSeconds / 2
+	case "43114": // avalanche mainnet
+	case "43113": // avalanche fuji
+		// block time is 1s
+		return timeoutSeconds
+	case "250": // fantom mainnet
+	case "4002": // fantom testnet
+		// block time is 1s
+		return timeoutSeconds
+	case "42161": // arbitrum mainnet
+	case "421613": // arbitrum goerli
+	case "421614": // arbitrum sepolia
+		// block time is 0.25s in the worst case
+		return timeoutSeconds * 4
+	case "10": // optimism mainnet
+	case "69": // optimism kovan
+	case "420": // optimism goerli
+	case "11155420": // optimism sepolia
+	case "8453": // base mainnet
+	case "84531": // base goerli
+	case "84532": // base sepolia
+		// block time is 2s
+		return timeoutSeconds / 2
+	default:
+		// assume block time of 1s
+		return timeoutSeconds
+	}
+	// assume block time of 1s
+	return timeoutSeconds
+}
diff --git a/core/services/vrf/v2/listener_v2_log_processor.go b/core/services/vrf/v2/listener_v2_log_processor.go
new file mode 100644
index 00000000000..004ab4c4905
--- /dev/null
+++ b/core/services/vrf/v2/listener_v2_log_processor.go
@@ -0,0 +1,1214 @@
+package v2
+
+import (
+	"cmp"
+	"context"
+	"database/sql"
+	"fmt"
+	"math"
+	"math/big"
+	"slices"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/ethereum/go-ethereum"
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/pkg/errors"
+	"go.uber.org/multierr"
+
+	txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr"
+	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
+	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/vrf_coordinator_v2"
+	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/vrf_coordinator_v2plus_interface"
+	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
+	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
+	"github.com/smartcontractkit/chainlink/v2/core/services/vrf/vrfcommon"
+	"github.com/smartcontractkit/chainlink/v2/core/utils"
+	bigmath "github.com/smartcontractkit/chainlink/v2/core/utils/big_math"
+)
+
+// Returns all the confirmed logs from the provided pending queue by subscription
+func (lsn *listenerV2) getConfirmedLogsBySub(latestHead uint64, pendingRequests []pendingRequest) map[string][]pendingRequest {
+	vrfcommon.UpdateQueueSize(lsn.job.Name.ValueOrZero(), lsn.job.ExternalJobID, lsn.coordinator.Version(), uniqueReqs(pendingRequests))
+	var toProcess = make(map[string][]pendingRequest)
+	for _, request := range pendingRequests {
+		if lsn.ready(request, latestHead) {
+			toProcess[request.req.SubID().String()] = append(toProcess[request.req.SubID().String()], request)
+		}
+	}
+	return toProcess
+}
+
+func (lsn *listenerV2) ready(req pendingRequest, latestHead uint64) bool {
+	// Request is not eligible for fulfillment yet
+	if req.confirmedAtBlock > latestHead {
+		return false
+	}
+
+	if lsn.job.VRFSpec.BackoffInitialDelay == 0 || req.attempts == 0 {
+		// Backoff is disabled, or this is the first try
+		return true
+	}
+
+	return time.Now().UTC().After(
+		nextTry(
+			req.attempts,
+			lsn.job.VRFSpec.BackoffInitialDelay,
+			lsn.job.VRFSpec.BackoffMaxDelay,
+			req.lastTry))
+}
+
+func nextTry(retries int, initial, max time.Duration, last time.Time) time.Time {
+	expBackoffFactor := math.Pow(backoffFactor, float64(retries-1))
+
+	var delay time.Duration
+	if expBackoffFactor > float64(max/initial) {
+		delay = max
+	} else {
+		delay = time.Duration(float64(initial) * expBackoffFactor)
+	}
+	return last.Add(delay)
+}
+
+// Remove all entries 10000 blocks or older
+// to avoid a memory leak.
+func (lsn *listenerV2) pruneConfirmedRequestCounts() {
+	min := lsn.blockNumberToReqID.FindMin()
+	for min != nil {
+		m := min.(fulfilledReqV2)
+		if m.blockNumber > (lsn.getLatestHead() - 10000) {
+			break
+		}
+		delete(lsn.respCount, m.reqID)
+		lsn.blockNumberToReqID.DeleteMin()
+		min = lsn.blockNumberToReqID.FindMin()
+	}
+}
+
+// Determine a set of logs that are confirmed
+// and the subscription has sufficient balance to fulfill,
+// given a eth call with the max gas price.
+// Note we have to consider the pending reqs already in the txm as already "spent" link or native,
+// using a max link or max native consumed in their metadata.
+// A user will need a minBalance capable of fulfilling a single req at the max gas price or nothing will happen.
+// This is acceptable as users can choose different keyhashes which have different max gas prices.
+// Other variables which can change the bill amount between our eth call simulation and tx execution:
+// - Link/eth price fluctuation
+// - Falling back to BHS
+// However the likelihood is vanishingly small as
+// 1) the window between simulation and tx execution is tiny.
+// 2) the max gas price provides a very large buffer most of the time.
+// Its easier to optimistically assume it will go though and in the rare case of a reversion
+// we simply retry TODO: follow up where if we see a fulfillment revert, return log to the queue.
+func (lsn *listenerV2) processPendingVRFRequests(ctx context.Context, pendingRequests []pendingRequest) {
+	confirmed := lsn.getConfirmedLogsBySub(lsn.getLatestHead(), pendingRequests)
+	var processedMu sync.Mutex
+	processed := make(map[string]struct{})
+	start := time.Now()
+
+	defer func() {
+		for _, subReqs := range confirmed {
+			for _, req := range subReqs {
+				if _, ok := processed[req.req.RequestID().String()]; ok {
+					// add to the inflight cache so that we don't re-process this request
+					lsn.inflightCache.Add(req.req.Raw())
+				}
+			}
+		}
+		lsn.l.Infow("Finished processing pending requests",
+			"totalProcessed", len(processed),
+			"totalFailed", len(pendingRequests)-len(processed),
+			"total", len(pendingRequests),
+			"time", time.Since(start).String(),
+			"inflightCacheSize", lsn.inflightCache.Size())
+	}()
+
+	if len(confirmed) == 0 {
+		lsn.l.Infow("No pending requests ready for processing")
+		return
+	}
+	for subID, reqs := range confirmed {
+		l := lsn.l.With("subID", subID, "startTime", time.Now(), "numReqsForSub", len(reqs))
+		// Get the balance of the subscription and also it's active status.
+		// The reason we need both is that we cannot determine if a subscription
+		// is active solely by it's balance, since an active subscription could legitimately
+		// have a zero balance.
+		var (
+			startLinkBalance *big.Int
+			startEthBalance  *big.Int
+			subIsActive      bool
+		)
+		sID, ok := new(big.Int).SetString(subID, 10)
+		if !ok {
+			l.Criticalw("Unable to convert %s to Int", subID)
+			return
+		}
+		sub, err := lsn.coordinator.GetSubscription(&bind.CallOpts{
+			Context: ctx}, sID)
+
+		if err != nil {
+			if strings.Contains(err.Error(), "execution reverted") {
+				// "execution reverted" indicates that the subscription no longer exists.
+				// We can no longer just mark these as processed and continue,
+				// since it could be that the subscription was canceled while there
+				// were still unfulfilled requests.
+				// The simplest approach to handle this is to enter the processRequestsPerSub
+				// loop rather than create a bunch of largely duplicated code
+				// to handle this specific situation, since we need to run the pipeline to get
+				// the VRF proof, abi-encode it, etc.
+				l.Warnw("Subscription not found - setting start balance to zero", "subID", subID, "err", err)
+				startLinkBalance = big.NewInt(0)
+			} else {
+				// Most likely this is an RPC error, so we re-try later.
+				l.Errorw("Unable to read subscription balance", "err", err)
+				return
+			}
+		} else {
+			// Happy path - sub is active.
+			startLinkBalance = sub.Balance()
+			if sub.Version() == vrfcommon.V2Plus {
+				startEthBalance = sub.NativeBalance()
+			}
+			subIsActive = true
+		}
+
+		// Sort requests in ascending order by CallbackGasLimit
+		// so that we process the "cheapest" requests for each subscription
+		// first. This allows us to break out of the processing loop as early as possible
+		// in the event that a subscription is too underfunded to have it's
+		// requests processed.
+		slices.SortFunc(reqs, func(a, b pendingRequest) int {
+			return cmp.Compare(a.req.CallbackGasLimit(), b.req.CallbackGasLimit())
+		})
+
+		p := lsn.processRequestsPerSub(ctx, sID, startLinkBalance, startEthBalance, reqs, subIsActive)
+		processedMu.Lock()
+		for reqID := range p {
+			processed[reqID] = struct{}{}
+		}
+		processedMu.Unlock()
+	}
+	lsn.pruneConfirmedRequestCounts()
+}
+
+// MaybeSubtractReservedLink figures out how much LINK is reserved for other VRF requests that
+// have not been fully confirmed yet on-chain, and subtracts that from the given startBalance,
+// and returns that value if there are no errors.
+func (lsn *listenerV2) MaybeSubtractReservedLink(ctx context.Context, startBalance *big.Int, chainID *big.Int, subID *big.Int, vrfVersion vrfcommon.Version) (*big.Int, error) {
+	var metaField string
+	if vrfVersion == vrfcommon.V2Plus {
+		metaField = txMetaGlobalSubId
+	} else if vrfVersion == vrfcommon.V2 {
+		metaField = txMetaFieldSubId
+	} else {
+		return nil, errors.Errorf("unsupported vrf version %s", vrfVersion)
+	}
+
+	txes, err := lsn.chain.TxManager().FindTxesByMetaFieldAndStates(ctx, metaField, subID.String(), reserveEthLinkQueryStates, chainID)
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return nil, fmt.Errorf("TXM FindTxesByMetaFieldAndStates failed: %w", err)
+	}
+
+	reservedLinkSum := big.NewInt(0)
+	// Aggregate non-null MaxLink from all txes returned
+	for _, tx := range txes {
+		var meta *txmgrtypes.TxMeta[common.Address, common.Hash]
+		meta, err = tx.GetMeta()
+		if err != nil {
+			return nil, fmt.Errorf("GetMeta for Tx failed: %w", err)
+		}
+		if meta != nil && meta.MaxLink != nil {
+			txMaxLink, success := new(big.Int).SetString(*meta.MaxLink, 10)
+			if !success {
+				return nil, fmt.Errorf("converting reserved LINK %s", *meta.MaxLink)
+			}
+
+			reservedLinkSum.Add(reservedLinkSum, txMaxLink)
+		}
+	}
+
+	return new(big.Int).Sub(startBalance, reservedLinkSum), nil
+}
+
+// MaybeSubtractReservedEth figures out how much ether is reserved for other VRF requests that
+// have not been fully confirmed yet on-chain, and subtracts that from the given startBalance,
+// and returns that value if there are no errors.
+func (lsn *listenerV2) MaybeSubtractReservedEth(ctx context.Context, startBalance *big.Int, chainID *big.Int, subID *big.Int, vrfVersion vrfcommon.Version) (*big.Int, error) {
+	var metaField string
+	if vrfVersion == vrfcommon.V2Plus {
+		metaField = txMetaGlobalSubId
+	} else if vrfVersion == vrfcommon.V2 {
+		// native payment is not supported for v2, so returning 0 reserved ETH
+		return big.NewInt(0), nil
+	} else {
+		return nil, errors.Errorf("unsupported vrf version %s", vrfVersion)
+	}
+	txes, err := lsn.chain.TxManager().FindTxesByMetaFieldAndStates(ctx, metaField, subID.String(), reserveEthLinkQueryStates, chainID)
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return nil, fmt.Errorf("TXM FindTxesByMetaFieldAndStates failed: %w", err)
+	}
+
+	reservedEthSum := big.NewInt(0)
+	// Aggregate non-null MaxEth from all txes returned
+	for _, tx := range txes {
+		var meta *txmgrtypes.TxMeta[common.Address, common.Hash]
+		meta, err = tx.GetMeta()
+		if err != nil {
+			return nil, fmt.Errorf("GetMeta for Tx failed: %w", err)
+		}
+		if meta != nil && meta.MaxEth != nil {
+			txMaxEth, success := new(big.Int).SetString(*meta.MaxEth, 10)
+			if !success {
+				return nil, fmt.Errorf("converting reserved ETH %s", *meta.MaxEth)
+			}
+
+			reservedEthSum.Add(reservedEthSum, txMaxEth)
+		}
+	}
+
+	if startBalance != nil {
+		return new(big.Int).Sub(startBalance, reservedEthSum), nil
+	}
+	return big.NewInt(0), nil
+}
+
+func (lsn *listenerV2) processRequestsPerSubBatchHelper(
+	ctx context.Context,
+	subID *big.Int,
+	startBalance *big.Int,
+	startBalanceNoReserved *big.Int,
+	reqs []pendingRequest,
+	subIsActive bool,
+	nativePayment bool,
+) (processed map[string]struct{}) {
+	start := time.Now()
+	processed = make(map[string]struct{})
+
+	// Base the max gas for a batch on the max gas limit for a single callback.
+	// Since the max gas limit for a single callback is usually quite large already,
+	// we probably don't want to exceed it too much so that we can reliably get
+	// batch fulfillments included, while also making sure that the biggest gas guzzler
+	// callbacks are included.
+	config, err := lsn.coordinator.GetConfig(&bind.CallOpts{
+		Context: ctx,
+	})
+	if err != nil {
+		lsn.l.Errorw("Couldn't get config from coordinator", "err", err)
+		return processed
+	}
+
+	// Add very conservative upper bound estimate on verification costs.
+	batchMaxGas := config.MaxGasLimit() + 400_000
+
+	l := lsn.l.With(
+		"subID", subID,
+		"eligibleSubReqs", len(reqs),
+		"startBalance", startBalance.String(),
+		"startBalanceNoReserved", startBalanceNoReserved.String(),
+		"batchMaxGas", batchMaxGas,
+		"subIsActive", subIsActive,
+		"nativePayment", nativePayment,
+	)
+
+	defer func() {
+		l.Infow("Finished processing for sub",
+			"endBalance", startBalanceNoReserved.String(),
+			"totalProcessed", len(processed),
+			"totalUnique", uniqueReqs(reqs),
+			"time", time.Since(start).String())
+	}()
+
+	l.Infow("Processing requests for subscription with batching")
+
+	ready, expired := lsn.getReadyAndExpired(l, reqs)
+	for _, reqID := range expired {
+		processed[reqID] = struct{}{}
+	}
+
+	// Process requests in chunks in order to kick off as many jobs
+	// as configured in parallel. Then we can combine into fulfillment
+	// batches afterwards.
+	for chunkStart := 0; chunkStart < len(ready); chunkStart += int(lsn.job.VRFSpec.ChunkSize) {
+		chunkEnd := chunkStart + int(lsn.job.VRFSpec.ChunkSize)
+		if chunkEnd > len(ready) {
+			chunkEnd = len(ready)
+		}
+		chunk := ready[chunkStart:chunkEnd]
+
+		var unfulfilled []pendingRequest
+		alreadyFulfilled, err := lsn.checkReqsFulfilled(ctx, l, chunk)
+		if errors.Is(err, context.Canceled) {
+			l.Infow("Context canceled, stopping request processing", "err", err)
+			return processed
+		} else if err != nil {
+			l.Errorw("Error checking for already fulfilled requests, proceeding anyway", "err", err)
+		}
+		for i, a := range alreadyFulfilled {
+			if a {
+				processed[chunk[i].req.RequestID().String()] = struct{}{}
+			} else {
+				unfulfilled = append(unfulfilled, chunk[i])
+			}
+		}
+
+		// All fromAddresses passed to the VRFv2 job have the same KeySpecific-MaxPrice value.
+		fromAddresses := lsn.fromAddresses()
+		maxGasPriceWei := lsn.feeCfg.PriceMaxKey(fromAddresses[0])
+
+		// Cases:
+		// 1. Never simulated: in this case, we want to observe the time until simulated
+		// on the utcTimestamp field of the pending request.
+		// 2. Simulated before: in this case, lastTry will be set to a non-zero time value,
+		// in which case we'd want to use that as a relative point from when we last tried
+		// the request.
+		observeRequestSimDuration(lsn.job.Name.ValueOrZero(), lsn.job.ExternalJobID, lsn.coordinator.Version(), unfulfilled)
+
+		pipelines := lsn.runPipelines(ctx, l, maxGasPriceWei, unfulfilled)
+		batches := newBatchFulfillments(batchMaxGas, lsn.coordinator.Version())
+		outOfBalance := false
+		for _, p := range pipelines {
+			ll := l.With("reqID", p.req.req.RequestID().String(),
+				"txHash", p.req.req.Raw().TxHash,
+				"maxGasPrice", maxGasPriceWei.String(),
+				"fundsNeeded", p.fundsNeeded.String(),
+				"maxFee", p.maxFee.String(),
+				"gasLimit", p.gasLimit,
+				"attempts", p.req.attempts,
+				"remainingBalance", startBalanceNoReserved.String(),
+				"consumerAddress", p.req.req.Sender(),
+				"blockNumber", p.req.req.Raw().BlockNumber,
+				"blockHash", p.req.req.Raw().BlockHash,
+			)
+			fromAddresses := lsn.fromAddresses()
+			fromAddress, err := lsn.gethks.GetRoundRobinAddress(lsn.chainID, fromAddresses...)
+			if err != nil {
+				l.Errorw("Couldn't get next from address", "err", err)
+				continue
+			}
+			ll = ll.With("fromAddress", fromAddress)
+
+			if p.err != nil {
+				if errors.Is(p.err, errBlockhashNotInStore{}) {
+					// Running the blockhash store feeder in backwards mode will be required to
+					// resolve this.
+					ll.Criticalw("Pipeline error", "err", p.err)
+				} else if errors.Is(p.err, errProofVerificationFailed{}) {
+					// This occurs when the proof reverts in the simulation
+					// This is almost always (if not always) due to a proof generated with an out-of-date
+					// blockhash
+					// we can simply mark as processed and move on, since we will eventually
+					// process the request with the right blockhash
+					ll.Infow("proof reverted in simulation, likely stale blockhash")
+					processed[p.req.req.RequestID().String()] = struct{}{}
+				} else {
+					ll.Errorw("Pipeline error", "err", p.err)
+					if !subIsActive {
+						ll.Warnw("Force-fulfilling a request with insufficient funds on a cancelled sub")
+						etx, err := lsn.enqueueForceFulfillment(ctx, p, fromAddress)
+						if err != nil {
+							ll.Errorw("Error enqueuing force-fulfillment, re-queueing request", "err", err)
+							continue
+						}
+						ll.Infow("Successfully enqueued force-fulfillment", "ethTxID", etx.ID)
+						processed[p.req.req.RequestID().String()] = struct{}{}
+
+						// Need to put a continue here, otherwise the next if statement will be hit
+						// and we'd break out of the loop prematurely.
+						// If a sub is canceled, we want to force-fulfill ALL of it's pending requests
+						// before saying we're done with it.
+						continue
+					}
+
+					if startBalanceNoReserved.Cmp(p.fundsNeeded) < 0 && errors.Is(p.err, errPossiblyInsufficientFunds{}) {
+						ll.Infow("Insufficient balance to fulfill a request based on estimate, breaking", "err", p.err)
+						outOfBalance = true
+
+						// break out of this inner loop to process the currently constructed batch
+						break
+					}
+
+					// Ensure consumer is valid, otherwise drop the request.
+					if !lsn.isConsumerValidAfterFinalityDepthElapsed(ctx, p.req) {
+						lsn.l.Infow(
+							"Dropping request that was made by an invalid consumer.",
+							"consumerAddress", p.req.req.Sender(),
+							"reqID", p.req.req.RequestID(),
+							"blockNumber", p.req.req.Raw().BlockNumber,
+							"blockHash", p.req.req.Raw().BlockHash,
+						)
+						processed[p.req.req.RequestID().String()] = struct{}{}
+						continue
+					}
+				}
+				continue
+			}
+
+			if startBalanceNoReserved.Cmp(p.maxFee) < 0 {
+				// Insufficient funds, have to wait for a user top up.
+				// Break out of the loop now and process what we are able to process
+				// in the constructed batches.
+				ll.Infow("Insufficient balance to fulfill a request, breaking")
+				break
+			}
+
+			batches.addRun(p, fromAddress)
+
+			startBalanceNoReserved.Sub(startBalanceNoReserved, p.maxFee)
+		}
+
+		var processedRequestIDs []string
+		for _, batch := range batches.fulfillments {
+			l.Debugw("Processing batch", "batchSize", len(batch.proofs))
+			p := lsn.processBatch(l, subID, startBalanceNoReserved, batchMaxGas, batch, batch.fromAddress)
+			processedRequestIDs = append(processedRequestIDs, p...)
+		}
+
+		for _, reqID := range processedRequestIDs {
+			processed[reqID] = struct{}{}
+		}
+
+		// outOfBalance is set to true if the current sub we are processing
+		// has run out of funds to process any remaining requests. After enqueueing
+		// this constructed batch, we break out of this outer loop in order to
+		// avoid unnecessarily processing the remaining requests.
+		if outOfBalance {
+			break
+		}
+	}
+
+	return
+}
+
+func (lsn *listenerV2) processRequestsPerSubBatch(
+	ctx context.Context,
+	subID *big.Int,
+	startLinkBalance *big.Int,
+	startEthBalance *big.Int,
+	reqs []pendingRequest,
+	subIsActive bool,
+) map[string]struct{} {
+	var processed = make(map[string]struct{})
+	startBalanceNoReserveLink, err := lsn.MaybeSubtractReservedLink(
+		ctx, startLinkBalance, lsn.chainID, subID, lsn.coordinator.Version())
+	if err != nil {
+		lsn.l.Errorw("Couldn't get reserved LINK for subscription", "sub", reqs[0].req.SubID(), "err", err)
+		return processed
+	}
+	startBalanceNoReserveEth, err := lsn.MaybeSubtractReservedEth(
+		ctx, startEthBalance, lsn.chainID, subID, lsn.coordinator.Version())
+	if err != nil {
+		lsn.l.Errorw("Couldn't get reserved ether for subscription", "sub", reqs[0].req.SubID(), "err", err)
+		return processed
+	}
+
+	// Split the requests into native and LINK requests.
+	var (
+		nativeRequests []pendingRequest
+		linkRequests   []pendingRequest
+	)
+	for _, req := range reqs {
+		if req.req.NativePayment() {
+			nativeRequests = append(nativeRequests, req)
+		} else {
+			linkRequests = append(linkRequests, req)
+		}
+	}
+	// process the native and link requests in parallel
+	var wg sync.WaitGroup
+	var nativeProcessed, linkProcessed map[string]struct{}
+	wg.Add(2)
+	go func() {
+		defer wg.Done()
+		nativeProcessed = lsn.processRequestsPerSubBatchHelper(ctx, subID, startEthBalance, startBalanceNoReserveEth, nativeRequests, subIsActive, true)
+	}()
+	go func() {
+		defer wg.Done()
+		linkProcessed = lsn.processRequestsPerSubBatchHelper(ctx, subID, startLinkBalance, startBalanceNoReserveLink, linkRequests, subIsActive, false)
+	}()
+	wg.Wait()
+	// combine the processed link and native requests into the processed map
+	for k, v := range nativeProcessed {
+		processed[k] = v
+	}
+	for k, v := range linkProcessed {
+		processed[k] = v
+	}
+
+	return processed
+}
+
+// enqueueForceFulfillment enqueues a forced fulfillment through the
+// VRFOwner contract. It estimates gas again on the transaction due
+// to the extra steps taken within VRFOwner.fulfillRandomWords.
+func (lsn *listenerV2) enqueueForceFulfillment(
+	ctx context.Context,
+	p vrfPipelineResult,
+	fromAddress common.Address,
+) (etx txmgr.Tx, err error) {
+	if lsn.job.VRFSpec.VRFOwnerAddress == nil {
+		err = errors.New("vrf owner address not set in job spec, recreate job and provide it to force-fulfill")
+		return
+	}
+
+	if p.payload == "" {
+		// should probably never happen
+		// a critical log will be logged if this is the case in simulateFulfillment
+		err = errors.New("empty payload in vrfPipelineResult")
+		return
+	}
+
+	// fulfill the request through the VRF owner
+	err = lsn.q.Transaction(func(tx pg.Queryer) error {
+		lsn.l.Infow("VRFOwner.fulfillRandomWords vs. VRFCoordinatorV2.fulfillRandomWords",
+			"vrf_owner.fulfillRandomWords", hexutil.Encode(vrfOwnerABI.Methods["fulfillRandomWords"].ID),
+			"vrf_coordinator_v2.fulfillRandomWords", hexutil.Encode(coordinatorV2ABI.Methods["fulfillRandomWords"].ID),
+		)
+
+		vrfOwnerAddress1 := lsn.vrfOwner.Address()
+		vrfOwnerAddressSpec := lsn.job.VRFSpec.VRFOwnerAddress.Address()
+		lsn.l.Infow("addresses diff", "wrapper_address", vrfOwnerAddress1, "spec_address", vrfOwnerAddressSpec)
+
+		lsn.l.Infow("fulfillRandomWords payload", "proof", p.proof, "commitment", p.reqCommitment.Get(), "payload", p.payload)
+		txData := hexutil.MustDecode(p.payload)
+		if err != nil {
+			return fmt.Errorf("abi pack VRFOwner.fulfillRandomWords: %w", err)
+		}
+		estimateGasLimit, err := lsn.chain.Client().EstimateGas(ctx, ethereum.CallMsg{
+			From: fromAddress,
+			To:   &vrfOwnerAddressSpec,
+			Data: txData,
+		})
+		if err != nil {
+			return fmt.Errorf("failed to estimate gas on VRFOwner.fulfillRandomWords: %w", err)
+		}
+
+		lsn.l.Infow("Estimated gas limit on force fulfillment",
+			"estimateGasLimit", estimateGasLimit, "pipelineGasLimit", p.gasLimit)
+		if estimateGasLimit < uint64(p.gasLimit) {
+			estimateGasLimit = uint64(p.gasLimit)
+		}
+
+		requestID := common.BytesToHash(p.req.req.RequestID().Bytes())
+		subID := p.req.req.SubID()
+		requestTxHash := p.req.req.Raw().TxHash
+		etx, err = lsn.chain.TxManager().CreateTransaction(ctx, txmgr.TxRequest{
+			FromAddress:    fromAddress,
+			ToAddress:      lsn.vrfOwner.Address(),
+			EncodedPayload: txData,
+			FeeLimit:       uint32(estimateGasLimit),
+			Strategy:       txmgrcommon.NewSendEveryStrategy(),
+			Meta: &txmgr.TxMeta{
+				RequestID:     &requestID,
+				SubID:         ptr(subID.Uint64()),
+				RequestTxHash: &requestTxHash,
+				// No max link since simulation failed
+			},
+		})
+		return err
+	})
+	return
+}
+
+// For an errored pipeline run, wait until the finality depth of the chain to have elapsed,
+// then check if the failing request is being called by an invalid sender. Return false if this is the case,
+// otherwise true.
+func (lsn *listenerV2) isConsumerValidAfterFinalityDepthElapsed(ctx context.Context, req pendingRequest) bool {
+	latestHead := lsn.getLatestHead()
+	if latestHead-req.req.Raw().BlockNumber > uint64(lsn.cfg.FinalityDepth()) {
+		code, err := lsn.chain.Client().CodeAt(ctx, req.req.Sender(), big.NewInt(int64(latestHead)))
+		if err != nil {
+			lsn.l.Warnw("Failed to fetch contract code", "err", err)
+			return true // error fetching code, give the benefit of doubt to the consumer
+		}
+		if len(code) == 0 {
+			return false // invalid consumer
+		}
+	}
+
+	return true // valid consumer, or finality depth has not elapsed
+}
+
+// processRequestsPerSubHelper processes a set of pending requests for the provided sub id.
+// It returns a set of request IDs that were processed.
+// Note that the provided startBalanceNoReserve is the balance of the subscription
+// minus any pending requests that have already been processed and not yet fulfilled onchain.
+func (lsn *listenerV2) processRequestsPerSubHelper(
+	ctx context.Context,
+	subID *big.Int,
+	startBalance *big.Int,
+	startBalanceNoReserved *big.Int,
+	reqs []pendingRequest,
+	subIsActive bool,
+	nativePayment bool,
+) (processed map[string]struct{}) {
+	start := time.Now()
+	processed = make(map[string]struct{})
+
+	l := lsn.l.With(
+		"subID", subID,
+		"eligibleSubReqs", len(reqs),
+		"startBalance", startBalance.String(),
+		"startBalanceNoReserved", startBalanceNoReserved.String(),
+		"subIsActive", subIsActive,
+		"nativePayment", nativePayment,
+	)
+
+	defer func() {
+		l.Infow("Finished processing for sub",
+			"endBalance", startBalanceNoReserved.String(),
+			"totalProcessed", len(processed),
+			"totalUnique", uniqueReqs(reqs),
+			"time", time.Since(start).String())
+	}()
+
+	l.Infow("Processing requests for subscription")
+
+	ready, expired := lsn.getReadyAndExpired(l, reqs)
+	for _, reqID := range expired {
+		processed[reqID] = struct{}{}
+	}
+
+	// Process requests in chunks
+	for chunkStart := 0; chunkStart < len(ready); chunkStart += int(lsn.job.VRFSpec.ChunkSize) {
+		chunkEnd := chunkStart + int(lsn.job.VRFSpec.ChunkSize)
+		if chunkEnd > len(ready) {
+			chunkEnd = len(ready)
+		}
+		chunk := ready[chunkStart:chunkEnd]
+
+		var unfulfilled []pendingRequest
+		alreadyFulfilled, err := lsn.checkReqsFulfilled(ctx, l, chunk)
+		if errors.Is(err, context.Canceled) {
+			l.Infow("Context canceled, stopping request processing", "err", err)
+			return processed
+		} else if err != nil {
+			l.Errorw("Error checking for already fulfilled requests, proceeding anyway", "err", err)
+		}
+		for i, a := range alreadyFulfilled {
+			if a {
+				processed[chunk[i].req.RequestID().String()] = struct{}{}
+			} else {
+				unfulfilled = append(unfulfilled, chunk[i])
+			}
+		}
+
+		// All fromAddresses passed to the VRFv2 job have the same KeySpecific-MaxPrice value.
+		fromAddresses := lsn.fromAddresses()
+		maxGasPriceWei := lsn.feeCfg.PriceMaxKey(fromAddresses[0])
+		observeRequestSimDuration(lsn.job.Name.ValueOrZero(), lsn.job.ExternalJobID, lsn.coordinator.Version(), unfulfilled)
+		pipelines := lsn.runPipelines(ctx, l, maxGasPriceWei, unfulfilled)
+		for _, p := range pipelines {
+			ll := l.With("reqID", p.req.req.RequestID().String(),
+				"txHash", p.req.req.Raw().TxHash,
+				"maxGasPrice", maxGasPriceWei.String(),
+				"fundsNeeded", p.fundsNeeded.String(),
+				"maxFee", p.maxFee.String(),
+				"gasLimit", p.gasLimit,
+				"attempts", p.req.attempts,
+				"remainingBalance", startBalanceNoReserved.String(),
+				"consumerAddress", p.req.req.Sender(),
+				"blockNumber", p.req.req.Raw().BlockNumber,
+				"blockHash", p.req.req.Raw().BlockHash,
+			)
+			fromAddress, err := lsn.gethks.GetRoundRobinAddress(lsn.chainID, fromAddresses...)
+			if err != nil {
+				l.Errorw("Couldn't get next from address", "err", err)
+				continue
+			}
+			ll = ll.With("fromAddress", fromAddress)
+
+			if p.err != nil {
+				if errors.Is(p.err, errBlockhashNotInStore{}) {
+					// Running the blockhash store feeder in backwards mode will be required to
+					// resolve this.
+					ll.Criticalw("Pipeline error", "err", p.err)
+				} else if errors.Is(p.err, errProofVerificationFailed{}) {
+					// This occurs when the proof reverts in the simulation
+					// This is almost always (if not always) due to a proof generated with an out-of-date
+					// blockhash
+					// we can simply mark as processed and move on, since we will eventually
+					// process the request with the right blockhash
+					ll.Infow("proof reverted in simulation, likely stale blockhash")
+					processed[p.req.req.RequestID().String()] = struct{}{}
+				} else {
+					ll.Errorw("Pipeline error", "err", p.err)
+
+					if !subIsActive {
+						lsn.l.Warnw("Force-fulfilling a request with insufficient funds on a cancelled sub")
+						etx, err2 := lsn.enqueueForceFulfillment(ctx, p, fromAddress)
+						if err2 != nil {
+							ll.Errorw("Error enqueuing force-fulfillment, re-queueing request", "err", err2)
+							continue
+						}
+						ll.Infow("Enqueued force-fulfillment", "ethTxID", etx.ID)
+						processed[p.req.req.RequestID().String()] = struct{}{}
+
+						// Need to put a continue here, otherwise the next if statement will be hit
+						// and we'd break out of the loop prematurely.
+						// If a sub is canceled, we want to force-fulfill ALL of it's pending requests
+						// before saying we're done with it.
+						continue
+					}
+
+					if startBalanceNoReserved.Cmp(p.fundsNeeded) < 0 {
+						ll.Infow("Insufficient balance to fulfill a request based on estimate, returning", "err", p.err)
+						return processed
+					}
+
+					// Ensure consumer is valid, otherwise drop the request.
+					if !lsn.isConsumerValidAfterFinalityDepthElapsed(ctx, p.req) {
+						lsn.l.Infow(
+							"Dropping request that was made by an invalid consumer.",
+							"consumerAddress", p.req.req.Sender(),
+							"reqID", p.req.req.RequestID(),
+							"blockNumber", p.req.req.Raw().BlockNumber,
+							"blockHash", p.req.req.Raw().BlockHash,
+						)
+						processed[p.req.req.RequestID().String()] = struct{}{}
+						continue
+					}
+				}
+				continue
+			}
+
+			if startBalanceNoReserved.Cmp(p.maxFee) < 0 {
+				// Insufficient funds, have to wait for a user top up. Leave it unprocessed for now
+				ll.Infow("Insufficient balance to fulfill a request, returning")
+				return processed
+			}
+
+			ll.Infow("Enqueuing fulfillment")
+			var transaction txmgr.Tx
+			err = lsn.q.Transaction(func(tx pg.Queryer) error {
+				if err = lsn.pipelineRunner.InsertFinishedRun(p.run, true, pg.WithQueryer(tx)); err != nil {
+					return err
+				}
+
+				var maxLink, maxEth *string
+				tmp := p.maxFee.String()
+				if p.reqCommitment.NativePayment() {
+					maxEth = &tmp
+				} else {
+					maxLink = &tmp
+				}
+				var (
+					txMetaSubID       *uint64
+					txMetaGlobalSubID *string
+				)
+				if lsn.coordinator.Version() == vrfcommon.V2Plus {
+					txMetaGlobalSubID = ptr(p.req.req.SubID().String())
+				} else if lsn.coordinator.Version() == vrfcommon.V2 {
+					txMetaSubID = ptr(p.req.req.SubID().Uint64())
+				}
+				requestID := common.BytesToHash(p.req.req.RequestID().Bytes())
+				coordinatorAddress := lsn.coordinator.Address()
+				requestTxHash := p.req.req.Raw().TxHash
+				transaction, err = lsn.chain.TxManager().CreateTransaction(ctx, txmgr.TxRequest{
+					FromAddress:    fromAddress,
+					ToAddress:      lsn.coordinator.Address(),
+					EncodedPayload: hexutil.MustDecode(p.payload),
+					FeeLimit:       p.gasLimit,
+					Meta: &txmgr.TxMeta{
+						RequestID:     &requestID,
+						MaxLink:       maxLink,
+						MaxEth:        maxEth,
+						SubID:         txMetaSubID,
+						GlobalSubID:   txMetaGlobalSubID,
+						RequestTxHash: &requestTxHash,
+					},
+					Strategy: txmgrcommon.NewSendEveryStrategy(),
+					Checker: txmgr.TransmitCheckerSpec{
+						CheckerType:           lsn.transmitCheckerType(),
+						VRFCoordinatorAddress: &coordinatorAddress,
+						VRFRequestBlockNumber: new(big.Int).SetUint64(p.req.req.Raw().BlockNumber),
+					},
+				})
+				return err
+			})
+			if err != nil {
+				ll.Errorw("Error enqueuing fulfillment, requeuing request", "err", err)
+				continue
+			}
+			ll.Infow("Enqueued fulfillment", "ethTxID", transaction.GetID())
+
+			// If we successfully enqueued for the txm, subtract that balance
+			// And loop to attempt to enqueue another fulfillment
+			startBalanceNoReserved.Sub(startBalanceNoReserved, p.maxFee)
+			processed[p.req.req.RequestID().String()] = struct{}{}
+			vrfcommon.IncProcessedReqs(lsn.job.Name.ValueOrZero(), lsn.job.ExternalJobID, lsn.coordinator.Version())
+		}
+	}
+
+	return
+}
+
+func (lsn *listenerV2) transmitCheckerType() txmgrtypes.TransmitCheckerType {
+	if lsn.coordinator.Version() == vrfcommon.V2 {
+		return txmgr.TransmitCheckerTypeVRFV2
+	}
+	return txmgr.TransmitCheckerTypeVRFV2Plus
+}
+
+func (lsn *listenerV2) processRequestsPerSub(
+	ctx context.Context,
+	subID *big.Int,
+	startLinkBalance *big.Int,
+	startEthBalance *big.Int,
+	reqs []pendingRequest,
+	subIsActive bool,
+) map[string]struct{} {
+	if lsn.job.VRFSpec.BatchFulfillmentEnabled && lsn.batchCoordinator != nil {
+		return lsn.processRequestsPerSubBatch(ctx, subID, startLinkBalance, startEthBalance, reqs, subIsActive)
+	}
+
+	var processed = make(map[string]struct{})
+	chainId := lsn.chain.Client().ConfiguredChainID()
+	startBalanceNoReserveLink, err := lsn.MaybeSubtractReservedLink(
+		ctx, startLinkBalance, chainId, subID, lsn.coordinator.Version())
+	if err != nil {
+		lsn.l.Errorw("Couldn't get reserved LINK for subscription", "sub", reqs[0].req.SubID(), "err", err)
+		return processed
+	}
+	startBalanceNoReserveEth, err := lsn.MaybeSubtractReservedEth(
+		ctx, startEthBalance, lsn.chainID, subID, lsn.coordinator.Version())
+	if err != nil {
+		lsn.l.Errorw("Couldn't get reserved ETH for subscription", "sub", reqs[0].req.SubID(), "err", err)
+		return processed
+	}
+
+	// Split the requests into native and LINK requests.
+	var (
+		nativeRequests []pendingRequest
+		linkRequests   []pendingRequest
+	)
+	for _, req := range reqs {
+		if req.req.NativePayment() {
+			if !lsn.inflightCache.Contains(req.req.Raw()) {
+				nativeRequests = append(nativeRequests, req)
+			} else {
+				lsn.l.Debugw("Skipping native request because it is already inflight",
+					"reqID", req.req.RequestID())
+			}
+		} else {
+			if !lsn.inflightCache.Contains(req.req.Raw()) {
+				linkRequests = append(linkRequests, req)
+			} else {
+				lsn.l.Debugw("Skipping link request because it is already inflight",
+					"reqID", req.req.RequestID())
+			}
+		}
+	}
+	// process the native and link requests in parallel
+	var (
+		wg                             sync.WaitGroup
+		nativeProcessed, linkProcessed map[string]struct{}
+	)
+	wg.Add(2)
+	go func() {
+		defer wg.Done()
+		nativeProcessed = lsn.processRequestsPerSubHelper(
+			ctx,
+			subID,
+			startEthBalance,
+			startBalanceNoReserveEth,
+			nativeRequests,
+			subIsActive,
+			true)
+	}()
+	go func() {
+		defer wg.Done()
+		linkProcessed = lsn.processRequestsPerSubHelper(
+			ctx,
+			subID,
+			startLinkBalance,
+			startBalanceNoReserveLink,
+			linkRequests,
+			subIsActive,
+			false)
+	}()
+	wg.Wait()
+	// combine the native and link processed requests into the processed map
+	for k, v := range nativeProcessed {
+		processed[k] = v
+	}
+	for k, v := range linkProcessed {
+		processed[k] = v
+	}
+
+	return processed
+}
+
+func (lsn *listenerV2) requestCommitmentPayload(requestID *big.Int) (payload []byte, err error) {
+	if lsn.coordinator.Version() == vrfcommon.V2Plus {
+		return coordinatorV2PlusABI.Pack("s_requestCommitments", requestID)
+	} else if lsn.coordinator.Version() == vrfcommon.V2 {
+		return coordinatorV2ABI.Pack("getCommitment", requestID)
+	}
+	return nil, errors.Errorf("unsupported coordinator version: %s", lsn.coordinator.Version())
+}
+
+// checkReqsFulfilled returns a bool slice the same size of the given reqs slice
+// where each slice element indicates whether that request was already fulfilled
+// or not.
+func (lsn *listenerV2) checkReqsFulfilled(ctx context.Context, l logger.Logger, reqs []pendingRequest) ([]bool, error) {
+	var (
+		start     = time.Now()
+		calls     = make([]rpc.BatchElem, len(reqs))
+		fulfilled = make([]bool, len(reqs))
+	)
+
+	for i, req := range reqs {
+		payload, err := lsn.requestCommitmentPayload(req.req.RequestID())
+		if err != nil {
+			// This shouldn't happen
+			return fulfilled, fmt.Errorf("creating getCommitment payload: %w", err)
+		}
+
+		reqBlockNumber := new(big.Int).SetUint64(req.req.Raw().BlockNumber)
+
+		// Subtract 5 since the newest block likely isn't indexed yet and will cause "header not
+		// found" errors.
+		currBlock := new(big.Int).SetUint64(lsn.getLatestHead() - 5)
+		m := bigmath.Max(reqBlockNumber, currBlock)
+
+		var result string
+		calls[i] = rpc.BatchElem{
+			Method: "eth_call",
+			Args: []interface{}{
+				map[string]interface{}{
+					"to":   lsn.coordinator.Address(),
+					"data": hexutil.Bytes(payload),
+				},
+				// The block at which we want to make the call
+				hexutil.EncodeBig(m),
+			},
+			Result: &result,
+		}
+	}
+
+	err := lsn.chain.Client().BatchCallContext(ctx, calls)
+	if err != nil {
+		return fulfilled, fmt.Errorf("making batch call: %w", err)
+	}
+
+	var errs error
+	for i, call := range calls {
+		if call.Error != nil {
+			errs = multierr.Append(errs, fmt.Errorf("checking request %s with hash %s: %w",
+				reqs[i].req.RequestID().String(), reqs[i].req.Raw().TxHash.String(), call.Error))
+			continue
+		}
+
+		rString, ok := call.Result.(*string)
+		if !ok {
+			errs = multierr.Append(errs,
+				fmt.Errorf("unexpected result %+v on request %s with hash %s",
+					call.Result, reqs[i].req.RequestID().String(), reqs[i].req.Raw().TxHash.String()))
+			continue
+		}
+		result, err := hexutil.Decode(*rString)
+		if err != nil {
+			errs = multierr.Append(errs,
+				fmt.Errorf("decoding batch call result %+v %s request %s with hash %s: %w",
+					call.Result, *rString, reqs[i].req.RequestID().String(), reqs[i].req.Raw().TxHash.String(), err))
+			continue
+		}
+
+		if utils.IsEmpty(result) {
+			l.Infow("Request already fulfilled",
+				"reqID", reqs[i].req.RequestID().String(),
+				"attempts", reqs[i].attempts,
+				"txHash", reqs[i].req.Raw().TxHash)
+			fulfilled[i] = true
+		}
+	}
+
+	l.Debugw("Done checking fulfillment status",
+		"numChecked", len(reqs), "time", time.Since(start).String())
+	return fulfilled, errs
+}
+
+func (lsn *listenerV2) runPipelines(
+	ctx context.Context,
+	l logger.Logger,
+	maxGasPriceWei *assets.Wei,
+	reqs []pendingRequest,
+) []vrfPipelineResult {
+	var (
+		start   = time.Now()
+		results = make([]vrfPipelineResult, len(reqs))
+		wg      = sync.WaitGroup{}
+	)
+
+	for i, req := range reqs {
+		wg.Add(1)
+		go func(i int, req pendingRequest) {
+			defer wg.Done()
+			results[i] = lsn.simulateFulfillment(ctx, maxGasPriceWei, req, l)
+		}(i, req)
+	}
+	wg.Wait()
+
+	l.Debugw("Finished running pipelines",
+		"count", len(reqs), "time", time.Since(start).String())
+	return results
+}
+
+func (lsn *listenerV2) estimateFee(
+	ctx context.Context,
+	req RandomWordsRequested,
+	maxGasPriceWei *assets.Wei,
+) (*big.Int, error) {
+	// NativePayment() returns true if and only if the version is V2+ and the
+	// request was made in ETH.
+	if req.NativePayment() {
+		return EstimateFeeWei(req.CallbackGasLimit(), maxGasPriceWei.ToInt())
+	}
+
+	// In the event we are using LINK we need to estimate the fee in juels
+	// Don't use up too much time to get this info, it's not critical for operating vrf.
+	callCtx, cancel := context.WithTimeout(ctx, 1*time.Second)
+	defer cancel()
+	roundData, err := lsn.aggregator.LatestRoundData(&bind.CallOpts{Context: callCtx})
+	if err != nil {
+		return nil, fmt.Errorf("get aggregator latestAnswer: %w", err)
+	}
+
+	return EstimateFeeJuels(
+		req.CallbackGasLimit(),
+		maxGasPriceWei.ToInt(),
+		roundData.Answer,
+	)
+}
+
+// Here we use the pipeline to parse the log, generate a vrf response
+// then simulate the transaction at the max gas price to determine its maximum link cost.
+func (lsn *listenerV2) simulateFulfillment(
+	ctx context.Context,
+	maxGasPriceWei *assets.Wei,
+	req pendingRequest,
+	lg logger.Logger,
+) vrfPipelineResult {
+	var (
+		res = vrfPipelineResult{req: req}
+		err error
+	)
+	// estimate how much funds are needed so that we can log it if the simulation fails.
+	res.fundsNeeded, err = lsn.estimateFee(ctx, req.req, maxGasPriceWei)
+	if err != nil {
+		// not critical, just log and continue
+		lg.Warnw("unable to estimate funds needed for request, continuing anyway",
+			"reqID", req.req.RequestID(),
+			"err", err)
+		res.fundsNeeded = big.NewInt(0)
+	}
+
+	vars := pipeline.NewVarsFrom(map[string]interface{}{
+		"jobSpec": map[string]interface{}{
+			"databaseID":    lsn.job.ID,
+			"externalJobID": lsn.job.ExternalJobID,
+			"name":          lsn.job.Name.ValueOrZero(),
+			"publicKey":     lsn.job.VRFSpec.PublicKey[:],
+			"maxGasPrice":   maxGasPriceWei.ToInt().String(),
+			"evmChainID":    lsn.job.VRFSpec.EVMChainID.String(),
+		},
+		"jobRun": map[string]interface{}{
+			"logBlockHash":   req.req.Raw().BlockHash.Bytes(),
+			"logBlockNumber": req.req.Raw().BlockNumber,
+			"logTxHash":      req.req.Raw().TxHash,
+			"logTopics":      req.req.Raw().Topics,
+			"logData":        req.req.Raw().Data,
+		},
+	})
+	var trrs pipeline.TaskRunResults
+	res.run, trrs, err = lsn.pipelineRunner.ExecuteRun(ctx, *lsn.job.PipelineSpec, vars, lg)
+	if err != nil {
+		res.err = fmt.Errorf("executing run: %w", err)
+		return res
+	}
+	// The call task will fail if there are insufficient funds
+	if res.run.AllErrors.HasError() {
+		res.err = errors.WithStack(res.run.AllErrors.ToError())
+
+		if strings.Contains(res.err.Error(), "blockhash not found in store") {
+			res.err = multierr.Combine(res.err, errBlockhashNotInStore{})
+		} else if isProofVerificationError(res.err.Error()) {
+			res.err = multierr.Combine(res.err, errProofVerificationFailed{})
+		} else if strings.Contains(res.err.Error(), "execution reverted") {
+			// Even if the simulation fails, we want to get the
+			// txData for the fulfillRandomWords call, in case
+			// we need to force fulfill.
+			for _, trr := range trrs {
+				if trr.Task.Type() == pipeline.TaskTypeVRFV2 {
+					if trr.Result.Error != nil {
+						// error in VRF proof generation
+						// this means that we won't be able to force-fulfill in the event of a
+						// canceled sub and active requests.
+						// since this would be an extraordinary situation,
+						// we can log loudly here.
+						lg.Criticalw("failed to generate VRF proof", "err", trr.Result.Error)
+						break
+					}
+
+					// extract the abi-encoded tx data to fulfillRandomWords from the VRF task.
+					// that's all we need in the event of a force-fulfillment.
+					m := trr.Result.Value.(map[string]any)
+					res.payload = m["output"].(string)
+					res.proof = FromV2Proof(m["proof"].(vrf_coordinator_v2.VRFProof))
+					res.reqCommitment = NewRequestCommitment(m["requestCommitment"])
+				}
+			}
+			res.err = multierr.Combine(res.err, errPossiblyInsufficientFunds{})
+		}
+
+		return res
+	}
+	finalResult := trrs.FinalResult(lg)
+	if len(finalResult.Values) != 1 {
+		res.err = errors.Errorf("unexpected number of outputs, expected 1, was %d", len(finalResult.Values))
+		return res
+	}
+
+	// Run succeeded, we expect a byte array representing the billing amount
+	b, ok := finalResult.Values[0].([]uint8)
+	if !ok {
+		res.err = errors.New("expected []uint8 final result")
+		return res
+	}
+	res.maxFee = utils.HexToBig(hexutil.Encode(b)[2:])
+	for _, trr := range trrs {
+		if trr.Task.Type() == pipeline.TaskTypeVRFV2 {
+			m := trr.Result.Value.(map[string]interface{})
+			res.payload = m["output"].(string)
+			res.proof = FromV2Proof(m["proof"].(vrf_coordinator_v2.VRFProof))
+			res.reqCommitment = NewRequestCommitment(m["requestCommitment"])
+		}
+
+		if trr.Task.Type() == pipeline.TaskTypeVRFV2Plus {
+			m := trr.Result.Value.(map[string]interface{})
+			res.payload = m["output"].(string)
+			res.proof = FromV2PlusProof(m["proof"].(vrf_coordinator_v2plus_interface.IVRFCoordinatorV2PlusInternalProof))
+			res.reqCommitment = NewRequestCommitment(m["requestCommitment"])
+		}
+
+		if trr.Task.Type() == pipeline.TaskTypeEstimateGasLimit {
+			res.gasLimit = trr.Result.Value.(uint32)
+		}
+	}
+	return res
+}
+
+func (lsn *listenerV2) fromAddresses() []common.Address {
+	var addresses []common.Address
+	for _, a := range lsn.job.VRFSpec.FromAddresses {
+		addresses = append(addresses, a.Address())
+	}
+	return addresses
+}
diff --git a/core/services/vrf/v2/listener_v2_test.go b/core/services/vrf/v2/listener_v2_test.go
index 8a7b9ce3fef..bcc85b3700d 100644
--- a/core/services/vrf/v2/listener_v2_test.go
+++ b/core/services/vrf/v2/listener_v2_test.go
@@ -3,7 +3,6 @@ package v2
 import (
 	"encoding/json"
 	"math/big"
-	"sync"
 	"testing"
 	"time"
 
@@ -12,10 +11,8 @@ import (
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/theodesp/go-heaps/pairing"
 
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/vrf_coordinator_v2"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/vrf_coordinator_v2plus_interface"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/vrf/vrfcommon"
 
@@ -23,8 +20,6 @@ import (
 	txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr"
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
@@ -502,77 +497,3 @@ func TestListener_Backoff(t *testing.T) {
 		})
 	}
 }
-
-func TestListener_handleLog(tt *testing.T) {
-	lb := mocks.NewBroadcaster(tt)
-	chainID := int64(2)
-	minConfs := uint32(3)
-	blockNumber := uint64(5)
-	requestID := int64(6)
-	tt.Run("v2", func(t *testing.T) {
-		j, err := vrfcommon.ValidatedVRFSpec(testspecs.GenerateVRFSpec(testspecs.VRFSpecParams{
-			VRFVersion:          vrfcommon.V2,
-			RequestedConfsDelay: 10,
-			FromAddresses:       []string{"0xF2982b7Ef6E3D8BB738f8Ea20502229781f6Ad97"},
-		}).Toml())
-		require.NoError(t, err)
-		fulfilledLog := vrf_coordinator_v2.VRFCoordinatorV2RandomWordsFulfilled{
-			RequestId: big.NewInt(requestID),
-			Raw:       types.Log{BlockNumber: blockNumber},
-		}
-		log := log.NewLogBroadcast(types.Log{}, *big.NewInt(chainID), &fulfilledLog)
-		lb.On("WasAlreadyConsumed", log).Return(false, nil).Once()
-		lb.On("MarkConsumed", log).Return(nil).Once()
-		defer lb.AssertExpectations(t)
-		chain := evmmocks.NewChain(t)
-		chain.On("LogBroadcaster").Return(lb)
-		listener := &listenerV2{
-			respCount:          map[string]uint64{},
-			job:                j,
-			blockNumberToReqID: pairing.New(),
-			latestHeadMu:       sync.RWMutex{},
-			chain:              chain,
-			l:                  logger.TestLogger(t),
-		}
-		listener.handleLog(log, minConfs)
-		require.Equal(t, listener.respCount[fulfilledLog.RequestId.String()], uint64(1))
-		req, ok := listener.blockNumberToReqID.FindMin().(fulfilledReqV2)
-		require.True(t, ok)
-		require.Equal(t, req.blockNumber, blockNumber)
-		require.Equal(t, req.reqID, "6")
-	})
-
-	tt.Run("v2 plus", func(t *testing.T) {
-		j, err := vrfcommon.ValidatedVRFSpec(testspecs.GenerateVRFSpec(testspecs.VRFSpecParams{
-			VRFVersion:          vrfcommon.V2Plus,
-			RequestedConfsDelay: 10,
-			FromAddresses:       []string{"0xF2982b7Ef6E3D8BB738f8Ea20502229781f6Ad97"},
-		}).Toml())
-		require.NoError(t, err)
-		fulfilledLog := vrf_coordinator_v2plus_interface.IVRFCoordinatorV2PlusInternalRandomWordsFulfilled{
-			RequestId: big.NewInt(requestID),
-			Raw:       types.Log{BlockNumber: blockNumber},
-		}
-		log := log.NewLogBroadcast(types.Log{}, *big.NewInt(chainID), &fulfilledLog)
-		lb.On("WasAlreadyConsumed", log).Return(false, nil).Once()
-		lb.On("MarkConsumed", log).Return(nil).Once()
-		defer lb.AssertExpectations(t)
-		chain := evmmocks.NewChain(t)
-		chain.On("LogBroadcaster").Return(lb)
-		listener := &listenerV2{
-			respCount:          map[string]uint64{},
-			job:                j,
-			blockNumberToReqID: pairing.New(),
-			latestHeadMu:       sync.RWMutex{},
-			chain:              chain,
-			l:                  logger.TestLogger(t),
-		}
-		listener.handleLog(log, minConfs)
-		require.Equal(t, listener.respCount[fulfilledLog.RequestId.String()], uint64(1))
-		req, ok := listener.blockNumberToReqID.FindMin().(fulfilledReqV2)
-		require.True(t, ok)
-		require.Equal(t, req.blockNumber, blockNumber)
-		require.Equal(t, req.reqID, "6")
-	})
-
-}
diff --git a/core/services/vrf/v2/listener_v2_types.go b/core/services/vrf/v2/listener_v2_types.go
index 5ad44c31a8b..b3cbbff4713 100644
--- a/core/services/vrf/v2/listener_v2_types.go
+++ b/core/services/vrf/v2/listener_v2_types.go
@@ -1,14 +1,14 @@
 package v2
 
 import (
+	"fmt"
 	"math/big"
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/pkg/errors"
+	heaps "github.com/theodesp/go-heaps"
 
 	txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
@@ -16,6 +16,68 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/vrf/vrfcommon"
 )
 
+type errPossiblyInsufficientFunds struct{}
+
+func (errPossiblyInsufficientFunds) Error() string {
+	return "Simulation errored, possibly insufficient funds. Request will remain unprocessed until funds are available"
+}
+
+type errBlockhashNotInStore struct{}
+
+func (errBlockhashNotInStore) Error() string {
+	return "Blockhash not in store"
+}
+
+type errProofVerificationFailed struct{}
+
+func (errProofVerificationFailed) Error() string {
+	return "Proof verification failed"
+}
+
+type fulfilledReqV2 struct {
+	blockNumber uint64
+	reqID       string
+}
+
+func (a fulfilledReqV2) Compare(b heaps.Item) int {
+	a1 := a
+	a2 := b.(fulfilledReqV2)
+	switch {
+	case a1.blockNumber > a2.blockNumber:
+		return 1
+	case a1.blockNumber < a2.blockNumber:
+		return -1
+	default:
+		return 0
+	}
+}
+
+type pendingRequest struct {
+	confirmedAtBlock uint64
+	req              RandomWordsRequested
+	utcTimestamp     time.Time
+
+	// used for exponential backoff when retrying
+	attempts int
+	lastTry  time.Time
+}
+
+type vrfPipelineResult struct {
+	err error
+	// maxFee indicates how much juels (link) or wei (ether) would be paid for the VRF request
+	// if it were to be fulfilled at the maximum gas price (i.e gas lane gas price).
+	maxFee *big.Int
+	// fundsNeeded indicates a "minimum balance" in juels or wei that must be held in the
+	// subscription's account in order to fulfill the request.
+	fundsNeeded   *big.Int
+	run           *pipeline.Run
+	payload       string
+	gasLimit      uint32
+	req           pendingRequest
+	proof         VRFProof
+	reqCommitment RequestCommitment
+}
+
 // batchFulfillment contains all the information needed in order to
 // perform a batch fulfillment operation on the batch VRF coordinator.
 type batchFulfillment struct {
@@ -24,7 +86,6 @@ type batchFulfillment struct {
 	totalGasLimit uint32
 	runs          []*pipeline.Run
 	reqIDs        []*big.Int
-	lbs           []log.Broadcast
 	maxFees       []*big.Int
 	txHashes      []common.Hash
 	fromAddress   common.Address
@@ -46,9 +107,6 @@ func newBatchFulfillment(result vrfPipelineResult, fromAddress common.Address, v
 		reqIDs: []*big.Int{
 			result.req.req.RequestID(),
 		},
-		lbs: []log.Broadcast{
-			result.req.lb,
-		},
 		maxFees: []*big.Int{
 			result.maxFee,
 		},
@@ -97,7 +155,6 @@ func (b *batchFulfillments) addRun(result vrfPipelineResult, fromAddress common.
 			currBatch.totalGasLimit += result.gasLimit
 			currBatch.runs = append(currBatch.runs, result.run)
 			currBatch.reqIDs = append(currBatch.reqIDs, result.req.req.RequestID())
-			currBatch.lbs = append(currBatch.lbs, result.req.lb)
 			currBatch.maxFees = append(currBatch.maxFees, result.maxFee)
 			currBatch.txHashes = append(currBatch.txHashes, result.req.req.Raw().TxHash)
 		}
@@ -167,17 +224,15 @@ func (lsn *listenerV2) processBatch(
 	var ethTX txmgr.Tx
 	err = lsn.q.Transaction(func(tx pg.Queryer) error {
 		if err = lsn.pipelineRunner.InsertFinishedRuns(batch.runs, true, pg.WithQueryer(tx)); err != nil {
-			return errors.Wrap(err, "inserting finished pipeline runs")
-		}
-
-		if err = lsn.chain.LogBroadcaster().MarkManyConsumed(batch.lbs, pg.WithQueryer(tx)); err != nil {
-			return errors.Wrap(err, "mark logs consumed")
+			return fmt.Errorf("inserting finished pipeline runs: %w", err)
 		}
 
 		maxLink, maxEth := accumulateMaxLinkAndMaxEth(batch)
-		txHashes := []common.Hash{}
+		var (
+			txHashes    []common.Hash
+			reqIDHashes []common.Hash
+		)
 		copy(txHashes, batch.txHashes)
-		reqIDHashes := []common.Hash{}
 		for _, reqID := range batch.reqIDs {
 			reqIDHashes = append(reqIDHashes, common.BytesToHash(reqID.Bytes()))
 		}
@@ -196,8 +251,11 @@ func (lsn *listenerV2) processBatch(
 				RequestTxHashes: txHashes,
 			},
 		})
+		if err != nil {
+			return fmt.Errorf("create batch fulfillment eth transaction: %w", err)
+		}
 
-		return errors.Wrap(err, "create batch fulfillment eth transaction")
+		return nil
 	})
 	if err != nil {
 		ll.Errorw("Error enqueuing batch fulfillments, requeuing requests", "err", err)
@@ -217,35 +275,21 @@ func (lsn *listenerV2) processBatch(
 	return
 }
 
-// getUnconsumed returns the requests in the given slice that are not expired
-// and not marked consumed in the log broadcaster.
-func (lsn *listenerV2) getUnconsumed(l logger.Logger, reqs []pendingRequest) (unconsumed []pendingRequest, processed []string) {
+// getReadyAndExpired filters out requests that are expired from the given pendingRequest slice
+// and returns requests that are ready for processing.
+func (lsn *listenerV2) getReadyAndExpired(l logger.Logger, reqs []pendingRequest) (ready []pendingRequest, expired []string) {
 	for _, req := range reqs {
 		// Check if we can ignore the request due to its age.
 		if time.Now().UTC().Sub(req.utcTimestamp) >= lsn.job.VRFSpec.RequestTimeout {
 			l.Infow("Request too old, dropping it",
 				"reqID", req.req.RequestID().String(),
 				"txHash", req.req.Raw().TxHash)
-			lsn.markLogAsConsumed(req.lb)
-			processed = append(processed, req.req.RequestID().String())
+			expired = append(expired, req.req.RequestID().String())
 			vrfcommon.IncDroppedReqs(lsn.job.Name.ValueOrZero(), lsn.job.ExternalJobID, vrfcommon.V2, vrfcommon.ReasonAge)
 			continue
 		}
-
-		// This check to see if the log was consumed needs to be in the same
-		// goroutine as the mark consumed to avoid processing duplicates.
-		consumed, err := lsn.chain.LogBroadcaster().WasAlreadyConsumed(req.lb)
-		if err != nil {
-			// Do not process for now, retry on next iteration.
-			l.Errorw("Could not determine if log was already consumed",
-				"reqID", req.req.RequestID().String(),
-				"txHash", req.req.Raw().TxHash,
-				"error", err)
-		} else if consumed {
-			processed = append(processed, req.req.RequestID().String())
-		} else {
-			unconsumed = append(unconsumed, req)
-		}
+		// we always check if the requests are already fulfilled prior to trying to fulfill them again
+		ready = append(ready, req)
 	}
 	return
 }
diff --git a/core/services/vrf/v2/listener_v2_types_test.go b/core/services/vrf/v2/listener_v2_types_test.go
index 5391e18589b..c66270210b9 100644
--- a/core/services/vrf/v2/listener_v2_types_test.go
+++ b/core/services/vrf/v2/listener_v2_types_test.go
@@ -8,7 +8,6 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/stretchr/testify/require"
 
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/vrf_coordinator_v2"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/vrf_coordinator_v2_5"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
@@ -30,7 +29,6 @@ func Test_BatchFulfillments_AddRun(t *testing.T) {
 						TxHash: common.HexToHash("0xd8d7ecc4800d25fa53ce0372f13a416d98907a7ef3d8d3bdd79cf4fe75529c65"),
 					},
 				}),
-				lb: mocks.NewBroadcast(t),
 			},
 			run: pipeline.NewRun(pipeline.Spec{}, pipeline.Vars{}),
 		}, fromAddress)
@@ -49,7 +47,6 @@ func Test_BatchFulfillments_AddRun(t *testing.T) {
 					TxHash: common.HexToHash("0xd8d7ecc4800d25fa53ce0372f13a416d98907a7ef3d8d3bdd79cf4fe75529c65"),
 				},
 			}),
-			lb: mocks.NewBroadcast(t),
 		},
 		run: pipeline.NewRun(pipeline.Spec{}, pipeline.Vars{}),
 	}, fromAddress)
@@ -70,7 +67,6 @@ func Test_BatchFulfillments_AddRun_V2Plus(t *testing.T) {
 						TxHash: common.HexToHash("0xd8d7ecc4800d25fa53ce0372f13a416d98907a7ef3d8d3bdd79cf4fe75529c65"),
 					},
 				}),
-				lb: mocks.NewBroadcast(t),
 			},
 			run: pipeline.NewRun(pipeline.Spec{}, pipeline.Vars{}),
 		}, fromAddress)
@@ -89,7 +85,6 @@ func Test_BatchFulfillments_AddRun_V2Plus(t *testing.T) {
 					TxHash: common.HexToHash("0xd8d7ecc4800d25fa53ce0372f13a416d98907a7ef3d8d3bdd79cf4fe75529c65"),
 				},
 			}),
-			lb: mocks.NewBroadcast(t),
 		},
 		run: pipeline.NewRun(pipeline.Spec{}, pipeline.Vars{}),
 	}, fromAddress)
diff --git a/core/services/vrf/vrfcommon/inflight_cache.go b/core/services/vrf/vrfcommon/inflight_cache.go
new file mode 100644
index 00000000000..e5bd0e8870c
--- /dev/null
+++ b/core/services/vrf/vrfcommon/inflight_cache.go
@@ -0,0 +1,85 @@
+package vrfcommon
+
+import (
+	"sync"
+
+	"github.com/ethereum/go-ethereum/core/types"
+)
+
+type InflightCache interface {
+	Add(lg types.Log)
+	Contains(lg types.Log) bool
+	Size() int
+}
+
+var _ InflightCache = (*inflightCache)(nil)
+
+const cachePruneInterval = 1000
+
+type inflightCache struct {
+	// cache stores the logs whose fulfillments are currently in flight or already fulfilled.
+	cache map[logKey]struct{}
+
+	// lookback defines how long state should be kept for. Logs included in blocks older than
+	// lookback may or may not be redelivered.
+	lookback int
+
+	// lastPruneHeight is the blockheight at which logs were last pruned.
+	lastPruneHeight uint64
+
+	// mu synchronizes access to the delivered map.
+	mu sync.RWMutex
+}
+
+func NewInflightCache(lookback int) InflightCache {
+	return &inflightCache{
+		cache:    make(map[logKey]struct{}),
+		lookback: lookback,
+		mu:       sync.RWMutex{},
+	}
+}
+
+func (c *inflightCache) Size() int {
+	c.mu.RLock()
+	defer c.mu.RUnlock()
+	return len(c.cache)
+}
+
+func (c *inflightCache) Add(lg types.Log) {
+	c.mu.Lock()
+	defer c.mu.Unlock() // unlock in the last defer, so that we hold the lock when pruning.
+	defer c.prune(lg.BlockNumber)
+
+	c.cache[logKey{
+		blockHash:   lg.BlockHash,
+		blockNumber: lg.BlockNumber,
+		logIndex:    lg.Index,
+	}] = struct{}{}
+}
+
+func (c *inflightCache) Contains(lg types.Log) bool {
+	c.mu.RLock()
+	defer c.mu.RUnlock()
+
+	_, ok := c.cache[logKey{
+		blockHash:   lg.BlockHash,
+		blockNumber: lg.BlockNumber,
+		logIndex:    lg.Index,
+	}]
+	return ok
+}
+
+func (c *inflightCache) prune(logBlock uint64) {
+	// Only prune every pruneInterval blocks
+	if int(logBlock)-int(c.lastPruneHeight) < cachePruneInterval {
+		return
+	}
+
+	for key := range c.cache {
+		if int(key.blockNumber) < int(logBlock)-c.lookback {
+			delete(c.cache, key)
+		}
+	}
+
+	c.lastPruneHeight = logBlock
+}
diff --git a/core/services/vrf/vrfcommon/log_dedupe_test.go b/core/services/vrf/vrfcommon/log_dedupe_test.go
index 757842a3f65..f606b95e2a4 100644
--- a/core/services/vrf/vrfcommon/log_dedupe_test.go
+++ b/core/services/vrf/vrfcommon/log_dedupe_test.go
@@ -30,6 +30,22 @@ func TestLogDeduper(t *testing.T) {
 			},
 			results: []bool{true, false},
 		},
+		{
+			name: "different block number",
+			logs: []types.Log{
+				{
+					BlockNumber: 10,
+					BlockHash:   common.Hash{0x1},
+					Index:       3,
+				},
+				{
+					BlockNumber: 11,
+					BlockHash:   common.Hash{0x2},
+					Index:       3,
+				},
+			},
+			results: []bool{true, true},
+		},
 		{
 			name: "same block number different hash",
 			logs: []types.Log{
@@ -128,11 +144,11 @@ func TestLogDeduper(t *testing.T) {
 					Index:       11,
 				},
 				{
-					BlockNumber: 115,
+					BlockNumber: 1015,
 					BlockHash:   common.Hash{0x1, 0x1, 0x5},
 					Index:       0,
 				},
-				// Now the logs at blocks 10 and 11 should be pruned, and therefor redelivered.
+				// Now the logs at blocks 10 and 11 should be pruned, and therefore redelivered.
 				// The log at block 115 should not be redelivered.
 				{
 					BlockNumber: 10,
@@ -145,7 +161,7 @@ func TestLogDeduper(t *testing.T) {
 					Index:       11,
 				},
 				{
-					BlockNumber: 115,
+					BlockNumber: 1015,
 					BlockHash:   common.Hash{0x1, 0x1, 0x5},
 					Index:       0,
 				},
diff --git a/core/services/vrf/vrftesthelpers/helpers.go b/core/services/vrf/vrftesthelpers/helpers.go
index 2f269fbff03..77d3f33a653 100644
--- a/core/services/vrf/vrftesthelpers/helpers.go
+++ b/core/services/vrf/vrftesthelpers/helpers.go
@@ -67,7 +67,7 @@ func CreateAndStartBHSJob(
 		TrustedBlockhashStoreAddress:   trustedBlockhashStoreAddress,
 		TrustedBlockhashStoreBatchSize: trustedBlockhashStoreBatchSize,
 		PollPeriod:                     time.Second,
-		RunTimeout:                     100 * time.Millisecond,
+		RunTimeout:                     10 * time.Second,
 		EVMChainID:                     1337,
 		FromAddresses:                  fromAddresses,
 	})
diff --git a/core/testdata/testspecs/v2_specs.go b/core/testdata/testspecs/v2_specs.go
index 0155dc0a53a..0ecb85f1e49 100644
--- a/core/testdata/testspecs/v2_specs.go
+++ b/core/testdata/testspecs/v2_specs.go
@@ -247,6 +247,7 @@ type VRFSpecParams struct {
 	BackoffInitialDelay           time.Duration
 	BackoffMaxDelay               time.Duration
 	GasLanePrice                  *assets.Wei
+	PollPeriod                    time.Duration
 }
 
 type VRFSpec struct {
@@ -283,6 +284,10 @@ func GenerateVRFSpec(params VRFSpecParams) VRFSpec {
 	if params.VRFOwnerAddress != "" && vrfVersion == vrfcommon.V2 {
 		vrfOwnerAddress = params.VRFOwnerAddress
 	}
+	pollPeriod := 5 * time.Second
+	if params.PollPeriod > 0 && (vrfVersion == vrfcommon.V2 || vrfVersion == vrfcommon.V2Plus) {
+		pollPeriod = params.PollPeriod
+	}
 	batchFulfillmentGasMultiplier := 1.0
 	if params.BatchFulfillmentGasMultiplier >= 1.0 {
 		batchFulfillmentGasMultiplier = params.BatchFulfillmentGasMultiplier
@@ -406,6 +411,7 @@ chunkSize = %d
 backoffInitialDelay = "%s"
 backoffMaxDelay = "%s"
 gasLanePrice = "%s"
+pollPeriod = "%s"
 observationSource = """
 %s
 """
@@ -414,7 +420,8 @@ observationSource = """
 		jobID, name, coordinatorAddress, params.EVMChainID, batchCoordinatorAddress,
 		params.BatchFulfillmentEnabled, strconv.FormatFloat(batchFulfillmentGasMultiplier, 'f', 2, 64),
 		confirmations, params.RequestedConfsDelay, requestTimeout.String(), publicKey, chunkSize,
-		params.BackoffInitialDelay.String(), params.BackoffMaxDelay.String(), gasLanePrice.String(), observationSource)
+		params.BackoffInitialDelay.String(), params.BackoffMaxDelay.String(), gasLanePrice.String(),
+		pollPeriod.String(), observationSource)
 	if len(params.FromAddresses) != 0 {
 		var addresses []string
 		for _, address := range params.FromAddresses {
@@ -443,6 +450,7 @@ observationSource = """
 		BackoffMaxDelay:          params.BackoffMaxDelay,
 		VRFOwnerAddress:          vrfOwnerAddress,
 		VRFVersion:               vrfVersion,
+		PollPeriod:               pollPeriod,
 	}, toml: toml}
 }
 
diff --git a/integration-tests/actions/vrfv2plus/vrfv2plus_steps.go b/integration-tests/actions/vrfv2plus/vrfv2plus_steps.go
index 0e3c8096f0c..70320530aa8 100644
--- a/integration-tests/actions/vrfv2plus/vrfv2plus_steps.go
+++ b/integration-tests/actions/vrfv2plus/vrfv2plus_steps.go
@@ -136,6 +136,7 @@ func CreateVRFV2PlusJob(
 		ExternalJobID:            jobUUID.String(),
 		ObservationSource:        ost,
 		BatchFulfillmentEnabled:  false,
+		PollPeriod:               time.Second,
 	})
 	if err != nil {
 		return nil, fmt.Errorf("%s, err %w", ErrCreatingVRFv2PlusJob, err)
@@ -301,9 +302,10 @@ func SetupVRFV2_5Environment(
 	// [[EVM.KeySpecific]]
 	//	Key = '...'
 	nodeConfig := node.NewConfig(env.ClCluster.Nodes[0].NodeConfig,
+		node.WithLogPollInterval(1*time.Second),
 		node.WithVRFv2EVMEstimator(allNativeTokenKeyAddresses, vrfv2PlusConfig.CLNodeMaxGasPriceGWei),
 	)
-	l.Info().Msg("Restarting Node with new sending key PriceMax configuration")
+	l.Info().Msg("Restarting Node with new sending key PriceMax configuration and log poll period configuration")
 	err = env.ClCluster.Nodes[0].Restart(nodeConfig)
 	if err != nil {
 		return nil, nil, nil, fmt.Errorf("%s, err %w", ErrRestartCLNode, err)
diff --git a/integration-tests/client/chainlink_models.go b/integration-tests/client/chainlink_models.go
index 8ff8494155b..abc6ef30e41 100644
--- a/integration-tests/client/chainlink_models.go
+++ b/integration-tests/client/chainlink_models.go
@@ -1128,6 +1128,7 @@ type VRFV2PlusJobSpec struct {
 	BatchFulfillmentEnabled  bool          `toml:"batchFulfillmentEnabled"`
 	BackOffInitialDelay      time.Duration `toml:"backOffInitialDelay"`
 	BackOffMaxDelay          time.Duration `toml:"backOffMaxDelay"`
+	PollPeriod               time.Duration `toml:"pollPeriod"`
 }
 
 // Type returns the type of the job
diff --git a/integration-tests/types/config/node/core.go b/integration-tests/types/config/node/core.go
index 5934809bace..ccbbce87a2e 100644
--- a/integration-tests/types/config/node/core.go
+++ b/integration-tests/types/config/node/core.go
@@ -246,3 +246,9 @@ func WithVRFv2EVMEstimator(addresses []string, maxGasPriceGWei int64) NodeConfig
 
 	}
 }
+
+func WithLogPollInterval(interval time.Duration) NodeConfigOpt {
+	return func(c *chainlink.Config) {
+		c.EVM[0].Chain.LogPollInterval = models.MustNewDuration(interval)
+	}
+}

From 6883879170d064396cd8dd1b7ef82f5229859295 Mon Sep 17 00:00:00 2001
From: Jordan Krage <jmank88@gmail.com>
Date: Tue, 28 Nov 2023 08:43:12 -0600
Subject: [PATCH 018/130] plugins/cmd/chainlink-median: move to chainlink-feeds
 (#11270)

---
 .github/workflows/integration-tests.yml       |  4 ++
 GNUmakefile                                   |  4 --
 core/scripts/go.mod                           |  3 +-
 core/scripts/go.sum                           |  2 +
 core/services/ocr2/plugins/median/plugin.go   | 67 -------------------
 core/services/ocr2/plugins/median/services.go |  3 +-
 go.mod                                        |  3 +-
 go.sum                                        |  2 +
 integration-tests/go.mod                      |  3 +-
 integration-tests/go.sum                      |  2 +
 plugins/chainlink.Dockerfile                  | 12 ++--
 plugins/cmd/chainlink-median/main.go          | 41 ------------
 12 files changed, 26 insertions(+), 120 deletions(-)
 delete mode 100644 core/services/ocr2/plugins/median/plugin.go
 delete mode 100644 plugins/cmd/chainlink-median/main.go

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 9550be83ced..855e4ea9365 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -615,6 +615,10 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           ref: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
+      - name: Setup Go
+        uses: ./.github/actions/setup-go
+        with:
+          only-modules: "true"
       - name: Get the sha from go mod
         id: getshortsha
         run: |
diff --git a/GNUmakefile b/GNUmakefile
index cb665498a3a..6cd5ab7143e 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -57,10 +57,6 @@ chainlink-test: operator-ui ## Build a test build of chainlink binary.
 chainlink-local-start:
 	./chainlink -c /etc/node-secrets-volume/default.toml -c /etc/node-secrets-volume/overrides.toml -secrets /etc/node-secrets-volume/secrets.toml node start -d -p /etc/node-secrets-volume/node-password -a /etc/node-secrets-volume/apicredentials --vrfpassword=/etc/node-secrets-volume/apicredentials
 
-.PHONY: install-median
-install-median: ## Build & install the chainlink-median binary.
-	go install $(GOFLAGS) ./plugins/cmd/chainlink-median
-
 .PHONY: install-medianpoc
 install-medianpoc: ## Build & install the chainlink-medianpoc binary.
 	go install $(GOFLAGS) ./plugins/cmd/chainlink-medianpoc
diff --git a/core/scripts/go.mod b/core/scripts/go.mod
index d1795bbc846..7fa6055b161 100644
--- a/core/scripts/go.mod
+++ b/core/scripts/go.mod
@@ -1,6 +1,6 @@
 module github.com/smartcontractkit/chainlink/core/scripts
 
-go 1.21
+go 1.21.3
 
 // Make sure we're working with the latest chainlink libs
 replace github.com/smartcontractkit/chainlink/v2 => ../../
@@ -306,6 +306,7 @@ require (
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect
 	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f9248 // indirect
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 // indirect
+	github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d // indirect
 	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231117191230-aa6640f2edd1 // indirect
 	github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664 // indirect
 	github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 // indirect
diff --git a/core/scripts/go.sum b/core/scripts/go.sum
index cd7adf6bee3..7706fa15f19 100644
--- a/core/scripts/go.sum
+++ b/core/scripts/go.sum
@@ -1508,6 +1508,8 @@ github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f924
 github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f9248/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 h1:oewYJtdRkJKUHCNDCj5C2LQe6Oq6qy975g931nfG0cc=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542/go.mod h1:EpvRoycRD+kniYlz+pCpRT5e+fmPm0mSD/vmND+0oMg=
+github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d h1:w4MsbOtNk6nD/mcXLstHWk9hB6g7QLtcAfhPjhwvOaQ=
+github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d/go.mod h1:YPAfLNowdBwiKiYOwgwtbJHi8AJWbcxkbOY0ItAvkfc=
 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231117191230-aa6640f2edd1 h1:D7yb4kgNGVAiD5lFYqm/LW8d5jU66TXyYvSskDiW9yg=
 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231117191230-aa6640f2edd1/go.mod h1:UfW7/PZKon+iDEHtrHOfvMnS5GfYOW/SdMZ6P97rPEk=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664 h1:yxaHuDTtj2xxtsR8b+LJw8xDvyr6v/F6GP3InsP4wPI=
diff --git a/core/services/ocr2/plugins/median/plugin.go b/core/services/ocr2/plugins/median/plugin.go
deleted file mode 100644
index 11197f09175..00000000000
--- a/core/services/ocr2/plugins/median/plugin.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package median
-
-import (
-	"context"
-
-	"github.com/smartcontractkit/libocr/offchainreporting2/reportingplugin/median"
-	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
-
-	"github.com/smartcontractkit/chainlink-common/pkg/logger"
-	"github.com/smartcontractkit/chainlink-common/pkg/loop"
-	"github.com/smartcontractkit/chainlink-common/pkg/services"
-	"github.com/smartcontractkit/chainlink-common/pkg/types"
-)
-
-type Plugin struct {
-	loop.Plugin
-	stop services.StopChan
-}
-
-func NewPlugin(lggr logger.Logger) *Plugin {
-	return &Plugin{Plugin: loop.Plugin{Logger: lggr}, stop: make(services.StopChan)}
-}
-
-func (p *Plugin) NewMedianFactory(ctx context.Context, provider types.MedianProvider, dataSource, juelsPerFeeCoin median.DataSource, errorLog loop.ErrorLog) (loop.ReportingPluginFactory, error) {
-	var ctxVals loop.ContextValues
-	ctxVals.SetValues(ctx)
-	lggr := logger.With(p.Logger, ctxVals.Args()...)
-	factory := median.NumericalMedianFactory{
-		ContractTransmitter:       provider.MedianContract(),
-		DataSource:                dataSource,
-		JuelsPerFeeCoinDataSource: juelsPerFeeCoin,
-		Logger: logger.NewOCRWrapper(lggr, true, func(msg string) {
-			ctx, cancelFn := p.stop.NewCtx()
-			defer cancelFn()
-			if err := errorLog.SaveError(ctx, msg); err != nil {
-				lggr.Errorw("Unable to save error", "err", msg)
-			}
-		}),
-		OnchainConfigCodec: provider.OnchainConfigCodec(),
-		ReportCodec:        provider.ReportCodec(),
-	}
-	s := &reportingPluginFactoryService{lggr: logger.Named(lggr, "ReportingPluginFactory"), ReportingPluginFactory: factory}
-
-	p.SubService(s)
-
-	return s, nil
-}
-
-type reportingPluginFactoryService struct {
-	services.StateMachine
-	lggr logger.Logger
-	ocrtypes.ReportingPluginFactory
-}
-
-func (r *reportingPluginFactoryService) Name() string { return r.lggr.Name() }
-
-func (r *reportingPluginFactoryService) Start(ctx context.Context) error {
-	return r.StartOnce("ReportingPluginFactory", func() error { return nil })
-}
-
-func (r *reportingPluginFactoryService) Close() error {
-	return r.StopOnce("ReportingPluginFactory", func() error { return nil })
-}
-
-func (r *reportingPluginFactoryService) HealthReport() map[string]error {
-	return map[string]error{r.Name(): r.Healthy()}
-}
diff --git a/core/services/ocr2/plugins/median/services.go b/core/services/ocr2/plugins/median/services.go
index 9d65921ef2b..896bbacb419 100644
--- a/core/services/ocr2/plugins/median/services.go
+++ b/core/services/ocr2/plugins/median/services.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/loop"
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
+	"github.com/smartcontractkit/chainlink-feeds/median"
 
 	"github.com/smartcontractkit/chainlink/v2/core/config/env"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
@@ -125,7 +126,7 @@ func NewMedianServices(ctx context.Context,
 		argsNoPlugin.ReportingPluginFactory = median
 		srvs = append(srvs, median)
 	} else {
-		argsNoPlugin.ReportingPluginFactory, err = NewPlugin(lggr).NewMedianFactory(ctx, medianProvider, dataSource, juelsPerFeeCoinSource, errorLog)
+		argsNoPlugin.ReportingPluginFactory, err = median.NewPlugin(lggr).NewMedianFactory(ctx, medianProvider, dataSource, juelsPerFeeCoinSource, errorLog)
 		if err != nil {
 			err = fmt.Errorf("failed to create median factory: %w", err)
 			abort()
diff --git a/go.mod b/go.mod
index b2afd2e2111..0133011813e 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/smartcontractkit/chainlink/v2
 
-go 1.21
+go 1.21.3
 
 require (
 	github.com/Depado/ginprom v1.7.11
@@ -68,6 +68,7 @@ require (
 	github.com/smartcontractkit/chainlink-automation v1.0.1
 	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f9248
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542
+	github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d
 	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231117191230-aa6640f2edd1
 	github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664
 	github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
diff --git a/go.sum b/go.sum
index 98371af2e2f..504f2ba8073 100644
--- a/go.sum
+++ b/go.sum
@@ -1511,6 +1511,8 @@ github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f924
 github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f9248/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 h1:oewYJtdRkJKUHCNDCj5C2LQe6Oq6qy975g931nfG0cc=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542/go.mod h1:EpvRoycRD+kniYlz+pCpRT5e+fmPm0mSD/vmND+0oMg=
+github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d h1:w4MsbOtNk6nD/mcXLstHWk9hB6g7QLtcAfhPjhwvOaQ=
+github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d/go.mod h1:YPAfLNowdBwiKiYOwgwtbJHi8AJWbcxkbOY0ItAvkfc=
 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231117191230-aa6640f2edd1 h1:D7yb4kgNGVAiD5lFYqm/LW8d5jU66TXyYvSskDiW9yg=
 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231117191230-aa6640f2edd1/go.mod h1:UfW7/PZKon+iDEHtrHOfvMnS5GfYOW/SdMZ6P97rPEk=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664 h1:yxaHuDTtj2xxtsR8b+LJw8xDvyr6v/F6GP3InsP4wPI=
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index 4cf6a502c49..63bf5e9e55f 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -1,6 +1,6 @@
 module github.com/smartcontractkit/chainlink/integration-tests
 
-go 1.21
+go 1.21.3
 
 // Make sure we're working with the latest chainlink libs
 replace github.com/smartcontractkit/chainlink/v2 => ../
@@ -390,6 +390,7 @@ require (
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 // indirect
+	github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d // indirect
 	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231117191230-aa6640f2edd1 // indirect
 	github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664 // indirect
 	github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 // indirect
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index ef0a5b66ffb..a1a272c0b8b 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -2380,6 +2380,8 @@ github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f924
 github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f9248/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 h1:oewYJtdRkJKUHCNDCj5C2LQe6Oq6qy975g931nfG0cc=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542/go.mod h1:EpvRoycRD+kniYlz+pCpRT5e+fmPm0mSD/vmND+0oMg=
+github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d h1:w4MsbOtNk6nD/mcXLstHWk9hB6g7QLtcAfhPjhwvOaQ=
+github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d/go.mod h1:YPAfLNowdBwiKiYOwgwtbJHi8AJWbcxkbOY0ItAvkfc=
 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231117191230-aa6640f2edd1 h1:D7yb4kgNGVAiD5lFYqm/LW8d5jU66TXyYvSskDiW9yg=
 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231117191230-aa6640f2edd1/go.mod h1:UfW7/PZKon+iDEHtrHOfvMnS5GfYOW/SdMZ6P97rPEk=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664 h1:yxaHuDTtj2xxtsR8b+LJw8xDvyr6v/F6GP3InsP4wPI=
diff --git a/plugins/chainlink.Dockerfile b/plugins/chainlink.Dockerfile
index f07fab48122..2f3e46e9ce1 100644
--- a/plugins/chainlink.Dockerfile
+++ b/plugins/chainlink.Dockerfile
@@ -16,12 +16,12 @@ COPY . .
 
 # Build the golang binaries
 RUN make install-chainlink
-# Build LOOP Plugins
-RUN make install-median
 
 # Install medianpoc binary
 RUN make install-medianpoc
 
+# Link LOOP Plugin source dirs with simple names
+RUN go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-feeds | xargs -I % ln -s % /chainlink-feeds
 RUN go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-solana | xargs -I % ln -s % /chainlink-solana
 RUN mkdir /chainlink-starknet
 RUN go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-starknet/relayer | xargs -I % ln -s % /chainlink-starknet/relayer
@@ -30,6 +30,10 @@ RUN go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-starknet/rela
 FROM golang:1.21-bullseye as buildplugins
 RUN go version
 
+WORKDIR /chainlink-feeds
+COPY --from=buildgo /chainlink-feeds .
+RUN go install ./cmd/chainlink-feeds
+
 WORKDIR /chainlink-solana
 COPY --from=buildgo /chainlink-solana .
 RUN go install ./pkg/solana/cmd/chainlink-solana
@@ -53,9 +57,9 @@ RUN curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
 
 COPY --from=buildgo /go/bin/chainlink /usr/local/bin/
 COPY --from=buildgo /go/bin/chainlink-medianpoc /usr/local/bin/
-COPY --from=buildgo /go/bin/chainlink-median /usr/local/bin/
-ENV CL_MEDIAN_CMD chainlink-median
 
+COPY --from=buildplugins /go/bin/chainlink-feeds /usr/local/bin/
+ENV CL_MEDIAN_CMD chainlink-feeds
 COPY --from=buildplugins /go/bin/chainlink-solana /usr/local/bin/
 ENV CL_SOLANA_CMD chainlink-solana
 COPY --from=buildplugins /go/bin/chainlink-starknet /usr/local/bin/
diff --git a/plugins/cmd/chainlink-median/main.go b/plugins/cmd/chainlink-median/main.go
deleted file mode 100644
index e95bfbb221b..00000000000
--- a/plugins/cmd/chainlink-median/main.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package main
-
-import (
-	"github.com/hashicorp/go-plugin"
-
-	"github.com/smartcontractkit/chainlink-common/pkg/loop"
-
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/median"
-)
-
-const (
-	loggerName = "PluginMedian"
-)
-
-func main() {
-	s := loop.MustNewStartedServer(loggerName)
-	defer s.Stop()
-
-	p := median.NewPlugin(s.Logger)
-	defer s.Logger.ErrorIfFn(p.Close, "Failed to close")
-
-	s.MustRegister(p)
-
-	stop := make(chan struct{})
-	defer close(stop)
-
-	plugin.Serve(&plugin.ServeConfig{
-		HandshakeConfig: loop.PluginMedianHandshakeConfig(),
-		Plugins: map[string]plugin.Plugin{
-			loop.PluginMedianName: &loop.GRPCPluginMedian{
-				PluginServer: p,
-				BrokerConfig: loop.BrokerConfig{
-					StopCh:   stop,
-					Logger:   s.Logger,
-					GRPCOpts: s.GRPCOpts,
-				},
-			},
-		},
-		GRPCServer: s.GRPCOpts.NewServer,
-	})
-}

From f64ec3a5e4a397abd664aba8a0a2a7db40836eda Mon Sep 17 00:00:00 2001
From: Dmytro Haidashenko <34754799+dhaidashenko@users.noreply.github.com>
Date: Tue, 28 Nov 2023 17:07:18 +0100
Subject: [PATCH 019/130] Soft migration to Generalize Multinode client for EVM
 BCI-2286 (#11369)

* Allow switching to Generalized MultiNode EVM client via feature flag

* test how linter reacts to deprecation

* deprecate evm.client

* address review comments

* revert adding feature flag

* create new client

* fix call context

* unwrapp CallContext args

* deprecation msg improvements
---
 core/chains/evm/client/chain_client.go        |  2 +-
 core/chains/evm/client/client.go              |  2 +
 core/chains/evm/client/node.go                |  4 ++
 core/chains/evm/client/node_fsm.go            |  2 +
 .../evm/client/node_selector_highest_head.go  |  1 +
 .../client/node_selector_priority_level.go    |  1 +
 .../evm/client/node_selector_round_robin.go   |  1 +
 .../client/node_selector_total_difficulty.go  |  1 +
 core/chains/evm/client/pool.go                |  9 +++
 core/chains/evm/client/send_only_node.go      |  4 ++
 core/chains/legacyevm/chain.go                | 60 ++++++-------------
 11 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/core/chains/evm/client/chain_client.go b/core/chains/evm/client/chain_client.go
index d17c55f2e4f..3efc5645e22 100644
--- a/core/chains/evm/client/chain_client.go
+++ b/core/chains/evm/client/chain_client.go
@@ -120,7 +120,7 @@ func (c *chainClient) BlockByNumber(ctx context.Context, number *big.Int) (b *ty
 }
 
 func (c *chainClient) CallContext(ctx context.Context, result interface{}, method string, args ...interface{}) error {
-	return c.multiNode.CallContext(ctx, result, method)
+	return c.multiNode.CallContext(ctx, result, method, args...)
 }
 
 func (c *chainClient) CallContract(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) ([]byte, error) {
diff --git a/core/chains/evm/client/client.go b/core/chains/evm/client/client.go
index 91c8659d8c5..cccda9914fc 100644
--- a/core/chains/evm/client/client.go
+++ b/core/chains/evm/client/client.go
@@ -109,6 +109,8 @@ var _ htrktypes.Client[*evmtypes.Head, ethereum.Subscription, *big.Int, common.H
 
 // NewClientWithNodes instantiates a client from a list of nodes
 // Currently only supports one primary
+//
+// Deprecated: use [NewChainClient]
 func NewClientWithNodes(logger logger.Logger, selectionMode string, leaseDuration time.Duration, noNewHeadsThreshold time.Duration, primaryNodes []Node, sendOnlyNodes []SendOnlyNode, chainID *big.Int, chainType config.ChainType) (*client, error) {
 	pool := NewPool(logger, selectionMode, leaseDuration, noNewHeadsThreshold, primaryNodes, sendOnlyNodes, chainID, chainType)
 	return &client{
diff --git a/core/chains/evm/client/node.go b/core/chains/evm/client/node.go
index 8bae566e273..e2da78b502a 100644
--- a/core/chains/evm/client/node.go
+++ b/core/chains/evm/client/node.go
@@ -84,6 +84,8 @@ var (
 //go:generate mockery --quiet --name Node --output ../mocks/ --case=underscore
 
 // Node represents a client that connects to an ethereum-compatible RPC node
+//
+// Deprecated: use [pkg/github.com/smartcontractkit/chainlink/v2/common/client.Node]
 type Node interface {
 	Start(ctx context.Context) error
 	Close() error
@@ -179,6 +181,8 @@ type node struct {
 }
 
 // NewNode returns a new *node as Node
+//
+// Deprecated: use [pkg/github.com/smartcontractkit/chainlink/v2/common/client.NewNode]
 func NewNode(nodeCfg config.NodePool, noNewHeadsThreshold time.Duration, lggr logger.Logger, wsuri url.URL, httpuri *url.URL, name string, id int32, chainID *big.Int, nodeOrder int32) Node {
 	n := new(node)
 	n.name = name
diff --git a/core/chains/evm/client/node_fsm.go b/core/chains/evm/client/node_fsm.go
index 2d74512eac9..10694eb7fc4 100644
--- a/core/chains/evm/client/node_fsm.go
+++ b/core/chains/evm/client/node_fsm.go
@@ -38,6 +38,8 @@ var (
 
 // NodeState represents the current state of the node
 // Node is a FSM (finite state machine)
+//
+// Deprecated: to be removed. It is now internal in common/client
 type NodeState int
 
 func (n NodeState) String() string {
diff --git a/core/chains/evm/client/node_selector_highest_head.go b/core/chains/evm/client/node_selector_highest_head.go
index 9e88674fac5..2ed41486cff 100644
--- a/core/chains/evm/client/node_selector_highest_head.go
+++ b/core/chains/evm/client/node_selector_highest_head.go
@@ -6,6 +6,7 @@ import (
 
 type highestHeadNodeSelector []Node
 
+// Deprecated: use [pkg/github.com/smartcontractkit/chainlink/v2/common/client.NewHighestHeadNodeSelector]
 func NewHighestHeadNodeSelector(nodes []Node) NodeSelector {
 	return highestHeadNodeSelector(nodes)
 }
diff --git a/core/chains/evm/client/node_selector_priority_level.go b/core/chains/evm/client/node_selector_priority_level.go
index 7a5516dcd42..fba6d403327 100644
--- a/core/chains/evm/client/node_selector_priority_level.go
+++ b/core/chains/evm/client/node_selector_priority_level.go
@@ -16,6 +16,7 @@ type nodeWithPriority struct {
 	priority int32
 }
 
+// Deprecated: use [pkg/github.com/smartcontractkit/chainlink/v2/common/client.NewPriorityLevelNodeSelector]
 func NewPriorityLevelNodeSelector(nodes []Node) NodeSelector {
 	return &priorityLevelNodeSelector{
 		nodes:           nodes,
diff --git a/core/chains/evm/client/node_selector_round_robin.go b/core/chains/evm/client/node_selector_round_robin.go
index 9b2fa7508a7..3bd19f0ede4 100644
--- a/core/chains/evm/client/node_selector_round_robin.go
+++ b/core/chains/evm/client/node_selector_round_robin.go
@@ -7,6 +7,7 @@ type roundRobinSelector struct {
 	roundRobinCount atomic.Uint32
 }
 
+// Deprecated: use [pkg/github.com/smartcontractkit/chainlink/v2/common/client.NewRoundRobinSelector]
 func NewRoundRobinSelector(nodes []Node) NodeSelector {
 	return &roundRobinSelector{
 		nodes: nodes,
diff --git a/core/chains/evm/client/node_selector_total_difficulty.go b/core/chains/evm/client/node_selector_total_difficulty.go
index a368422e49f..99a1c89dd4f 100644
--- a/core/chains/evm/client/node_selector_total_difficulty.go
+++ b/core/chains/evm/client/node_selector_total_difficulty.go
@@ -6,6 +6,7 @@ import (
 
 type totalDifficultyNodeSelector []Node
 
+// Deprecated: use [pkg/github.com/smartcontractkit/chainlink/v2/common/client.NewTotalDifficultyNodeSelector]
 func NewTotalDifficultyNodeSelector(nodes []Node) NodeSelector {
 	return totalDifficultyNodeSelector(nodes)
 }
diff --git a/core/chains/evm/client/pool.go b/core/chains/evm/client/pool.go
index ab190f8c6aa..9217f633dc3 100644
--- a/core/chains/evm/client/pool.go
+++ b/core/chains/evm/client/pool.go
@@ -39,6 +39,8 @@ const (
 )
 
 // NodeSelector represents a strategy to select the next node from the pool.
+//
+// Deprecated: use [pkg/github.com/smartcontractkit/chainlink/v2/common/client.NodeSelector]
 type NodeSelector interface {
 	// Select returns a Node, or nil if none can be selected.
 	// Implementation must be thread-safe.
@@ -48,6 +50,8 @@ type NodeSelector interface {
 }
 
 // PoolConfig represents settings for the Pool
+//
+// Deprecated: to be removed
 type PoolConfig interface {
 	NodeSelectionMode() string
 	NodeNoNewHeadsThreshold() time.Duration
@@ -56,6 +60,8 @@ type PoolConfig interface {
 
 // Pool represents an abstraction over one or more primary nodes
 // It is responsible for liveness checking and balancing queries across live nodes
+//
+// Deprecated: use [pkg/github.com/smartcontractkit/chainlink/v2/common/client.MultiNode]
 type Pool struct {
 	services.StateMachine
 	nodes               []Node
@@ -76,6 +82,9 @@ type Pool struct {
 	wg     sync.WaitGroup
 }
 
+// NewPool - creates new instance of [Pool]
+//
+// Deprecated: use [pkg/github.com/smartcontractkit/chainlink/v2/common/client.NewMultiNode]
 func NewPool(lggr logger.Logger, selectionMode string, leaseDuration time.Duration, noNewHeadsTreshold time.Duration, nodes []Node, sendonlys []SendOnlyNode, chainID *big.Int, chainType config.ChainType) *Pool {
 	if chainID == nil {
 		panic("chainID is required")
diff --git a/core/chains/evm/client/send_only_node.go b/core/chains/evm/client/send_only_node.go
index 62a22ee1937..b6ad26696fc 100644
--- a/core/chains/evm/client/send_only_node.go
+++ b/core/chains/evm/client/send_only_node.go
@@ -21,6 +21,8 @@ import (
 //go:generate mockery --quiet --name SendOnlyNode --output ../mocks/ --case=underscore
 
 // SendOnlyNode represents one ethereum node used as a sendonly
+//
+// Deprecated: use [pkg/github.com/smartcontractkit/chainlink/v2/common/client.SendOnlyNode]
 type SendOnlyNode interface {
 	// Start may attempt to connect to the node, but should only return error for misconfiguration - never for temporary errors.
 	Start(context.Context) error
@@ -73,6 +75,8 @@ type sendOnlyNode struct {
 }
 
 // NewSendOnlyNode returns a new sendonly node
+//
+// Deprecated: use [pkg/github.com/smartcontractkit/chainlink/v2/common/client.NewSendOnlyNode]
 func NewSendOnlyNode(lggr logger.Logger, httpuri url.URL, name string, chainID *big.Int) SendOnlyNode {
 	s := new(sendOnlyNode)
 	s.name = name
diff --git a/core/chains/legacyevm/chain.go b/core/chains/legacyevm/chain.go
index 0c35d929fc2..4b4c69f1ab6 100644
--- a/core/chains/legacyevm/chain.go
+++ b/core/chains/legacyevm/chain.go
@@ -17,6 +17,7 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
 
+	commonclient "github.com/smartcontractkit/chainlink/v2/common/client"
 	commonconfig "github.com/smartcontractkit/chainlink/v2/common/config"
 	"github.com/smartcontractkit/chainlink/v2/core/chains"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
@@ -220,11 +221,7 @@ func newChain(ctx context.Context, cfg *evmconfig.ChainScoped, nodes []*toml.Nod
 	if !cfg.EVMRPCEnabled() {
 		client = evmclient.NewNullClient(chainID, l)
 	} else if opts.GenEthClient == nil {
-		var err2 error
-		client, err2 = newEthClientFromChain(cfg.EVM().NodePool(), cfg.EVM().NodeNoNewHeadsThreshold(), l, chainID, chainType, nodes)
-		if err2 != nil {
-			return nil, fmt.Errorf("failed to instantiate eth client for chain with ID %s: %w", cfg.EVM().ChainID().String(), err2)
-		}
+		client = newEthClientFromCfg(cfg.EVM().NodePool(), cfg.EVM().NodeNoNewHeadsThreshold(), l, chainID, chainType, nodes)
 	} else {
 		client = opts.GenEthClient(chainID)
 	}
@@ -474,46 +471,27 @@ func (c *chain) Logger() logger.Logger                    { return c.logger }
 func (c *chain) BalanceMonitor() monitor.BalanceMonitor   { return c.balanceMonitor }
 func (c *chain) GasEstimator() gas.EvmFeeEstimator        { return c.gasEstimator }
 
-func newEthClientFromChain(cfg evmconfig.NodePool, noNewHeadsThreshold time.Duration, lggr logger.Logger, chainID *big.Int, chainType commonconfig.ChainType, nodes []*toml.Node) (evmclient.Client, error) {
-	var primaries []evmclient.Node
-	var sendonlys []evmclient.SendOnlyNode
+func newEthClientFromCfg(cfg evmconfig.NodePool, noNewHeadsThreshold time.Duration, lggr logger.Logger, chainID *big.Int, chainType commonconfig.ChainType, nodes []*toml.Node) evmclient.Client {
+	var empty url.URL
+	var primaries []commonclient.Node[*big.Int, *evmtypes.Head, evmclient.RPCCLient]
+	var sendonlys []commonclient.SendOnlyNode[*big.Int, evmclient.RPCCLient]
 	for i, node := range nodes {
 		if node.SendOnly != nil && *node.SendOnly {
-			sendonly := evmclient.NewSendOnlyNode(lggr, (url.URL)(*node.HTTPURL), *node.Name, chainID)
+			name := fmt.Sprintf("eth-sendonly-rpc-%d", i)
+			rpc := evmclient.NewRPCClient(lggr, empty, (*url.URL)(node.HTTPURL), name, int32(i), chainID,
+				commonclient.Secondary)
+			sendonly := commonclient.NewSendOnlyNode[*big.Int, evmclient.RPCCLient](lggr, (url.URL)(*node.HTTPURL),
+				*node.Name, chainID, rpc)
 			sendonlys = append(sendonlys, sendonly)
 		} else {
-			primary, err := newPrimary(cfg, noNewHeadsThreshold, lggr, node, int32(i), chainID)
-			if err != nil {
-				return nil, err
-			}
-			primaries = append(primaries, primary)
+			name := fmt.Sprintf("eth-primary-rpc-%d", i)
+			rpc := evmclient.NewRPCClient(lggr, (url.URL)(*node.WSURL), (*url.URL)(node.HTTPURL), name, int32(i),
+				chainID, commonclient.Primary)
+			primaryNode := commonclient.NewNode[*big.Int, *evmtypes.Head, evmclient.RPCCLient](cfg, noNewHeadsThreshold,
+				lggr, (url.URL)(*node.WSURL), (*url.URL)(node.HTTPURL), *node.Name, int32(i), chainID, *node.Order,
+				rpc, "EVM")
+			primaries = append(primaries, primaryNode)
 		}
 	}
-	return evmclient.NewClientWithNodes(lggr, cfg.SelectionMode(), cfg.LeaseDuration(), noNewHeadsThreshold, primaries, sendonlys, chainID, chainType)
+	return evmclient.NewChainClient(lggr, cfg.SelectionMode(), cfg.LeaseDuration(), noNewHeadsThreshold, primaries, sendonlys, chainID, chainType)
 }
-
-func newPrimary(cfg evmconfig.NodePool, noNewHeadsThreshold time.Duration, lggr logger.Logger, n *toml.Node, id int32, chainID *big.Int) (evmclient.Node, error) {
-	if n.SendOnly != nil && *n.SendOnly {
-		return nil, errors.New("cannot cast send-only node to primary")
-	}
-
-	return evmclient.NewNode(cfg, noNewHeadsThreshold, lggr, (url.URL)(*n.WSURL), (*url.URL)(n.HTTPURL), *n.Name, id, chainID, *n.Order), nil
-}
-
-// TODO-1663: replace newEthClientFromChain with the function below once client.go is deprecated.
-//func newEthClientFromChain(cfg evmconfig.NodePool, noNewHeadsThreshold time.Duration, lggr logger.Logger, chainID *big.Int, chainType config.ChainType, nodes []*toml.Node) evmclient.Client {
-//	var empty url.URL
-//	var primaries []commonclient.Node[*big.Int, *evmtypes.Head, evmclient.RPCCLient]
-//	var sendonlys []commonclient.SendOnlyNode[*big.Int, evmclient.RPCCLient]
-//	for i, node := range nodes {
-//		if node.SendOnly != nil && *node.SendOnly {
-//			rpc := evmclient.NewRPCClient(lggr, empty, (*url.URL)(node.HTTPURL), fmt.Sprintf("eth-sendonly-rpc-%d", i), int32(i), chainID, commontypes.Primary)
-//			sendonly := commonclient.NewSendOnlyNode[*big.Int, evmclient.RPCCLient](lggr, (url.URL)(*node.HTTPURL), *node.Name, chainID, rpc)
-//			sendonlys = append(sendonlys, sendonly)
-//		} else {
-//			rpc := evmclient.NewRPCClient(lggr, (url.URL)(*node.WSURL), (*url.URL)(node.HTTPURL), fmt.Sprintf("eth-sendonly-rpc-%d", i), int32(i), chainID, commontypes.Primary)
-//			primaries = append(primaries, commonclient.NewNode[*big.Int, *evmtypes.Head, evmclient.RPCCLient](cfg, noNewHeadsThreshold, lggr, (url.URL)(*node.WSURL), (*url.URL)(node.HTTPURL), *node.Name, int32(i), chainID, *node.Order, rpc, "EVM"))
-//		}
-//	}
-//	return evmclient.NewChainClient(lggr, cfg.SelectionMode(), cfg.LeaseDuration(), noNewHeadsThreshold, primaries, sendonlys, chainID, chainType)
-//}

From b48e81eba991b1b56c4db835744ed47bd43ebbcc Mon Sep 17 00:00:00 2001
From: Tate <tate.exon@smartcontract.com>
Date: Tue, 28 Nov 2023 09:37:38 -0700
Subject: [PATCH 020/130] Add loud error for failure to get the solana sha
 (#11400)

---
 .github/workflows/integration-tests.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 855e4ea9365..5a505ce01ca 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -623,6 +623,10 @@ jobs:
         id: getshortsha
         run: |
           sol_ver=$(go list -m -json github.com/smartcontractkit/chainlink-solana  | jq -r .Version)
+          if [ -z "${sol_ver}" ]; then
+              echo "Error: could not get the solana version from the go.mod file, look above for error(s)"
+              exit 1
+          fi
           short_sha="${sol_ver##*-}"
           echo "short sha is: ${short_sha}"
           echo "short_sha=${short_sha}" >> "$GITHUB_OUTPUT"
@@ -638,6 +642,10 @@ jobs:
         run: |
           cd solanapath
           full_sha=$(git rev-parse ${{steps.getshortsha.outputs.short_sha}})
+          if [ -z "${full_sha}" ]; then
+              echo "Error: could not get the full sha from the short sha using git, look above for error(s)"
+              exit 1
+          fi
           echo "sha is: ${full_sha}"
           echo "sha=${full_sha}" >> "$GITHUB_OUTPUT"
 

From 12a3b3f80d4d3eb96a099ba54927095af0e51354 Mon Sep 17 00:00:00 2001
From: Sam <samsondav@protonmail.com>
Date: Tue, 28 Nov 2023 11:45:47 -0500
Subject: [PATCH 021/130] Feed LatestPrice query cache (#11326)

* Price retrieval cache for Mercury

Problem: Core nodes are querying LatestReport a lot (~70rps). This is not only wasteful, it potentially increases latency if Mercury server falls behind and is also completely unnecessary. We do not need such up-to-the-millisecond accuracy for billing,

Proposed solution: Introduce a price cache for mercury with a TTL e.g. of 1 minute or whatever tolerance we have for billing price and only fetch from the server when the cache becomes stale.

* fix

* Some PR comments

* Fix more PR comments

* PR comments

* lint
---
 core/cmd/shell.go                             |  11 +
 core/config/docs/core.toml                    |  23 +
 core/config/mercury_config.go                 |  13 +-
 core/config/toml/types.go                     |  28 ++
 core/internal/cltest/cltest.go                |  11 +
 core/services/chainlink/application.go        |   8 +
 core/services/chainlink/config_general.go     |   2 +-
 core/services/chainlink/config_mercury.go     |  24 ++
 core/services/chainlink/config_test.go        |  13 +
 core/services/chainlink/relayer_factory.go    |   3 +
 .../testdata/config-empty-effective.toml      |   6 +
 .../chainlink/testdata/config-full.toml       |   6 +
 .../config-multi-chain-effective.toml         |   6 +
 core/services/ocr2/delegate.go                |   1 +
 core/services/relay/evm/evm.go                |   8 +-
 .../services/relay/evm/mercury/utils/feeds.go |   4 +
 .../relay/evm/mercury/wsrpc/cache/cache.go    | 395 ++++++++++++++++++
 .../evm/mercury/wsrpc/cache/cache_set.go      | 120 ++++++
 .../evm/mercury/wsrpc/cache/cache_set_test.go |  48 +++
 .../evm/mercury/wsrpc/cache/cache_test.go     | 199 +++++++++
 .../evm/mercury/wsrpc/cache/helpers_test.go   |  38 ++
 .../relay/evm/mercury/wsrpc/client.go         |  49 ++-
 .../relay/evm/mercury/wsrpc/client_test.go    | 144 ++++++-
 .../relay/evm/mercury/wsrpc/mocks/mocks.go    |   3 +
 core/services/relay/evm/mercury/wsrpc/pool.go |  15 +-
 .../relay/evm/mercury/wsrpc/pool_test.go      |  16 +-
 core/utils/hash.go                            |  20 +
 .../testdata/config-empty-effective.toml      |   6 +
 core/web/resolver/testdata/config-full.toml   |   6 +
 .../config-multi-chain-effective.toml         |   6 +
 docs/CHANGELOG.md                             |  33 +-
 docs/CONFIG.md                                |  45 ++
 testdata/scripts/node/validate/default.txtar  |   6 +
 .../disk-based-logging-disabled.txtar         |   6 +
 .../validate/disk-based-logging-no-dir.txtar  |   6 +
 .../node/validate/disk-based-logging.txtar    |   6 +
 testdata/scripts/node/validate/invalid.txtar  |   6 +
 testdata/scripts/node/validate/valid.txtar    |   6 +
 testdata/scripts/node/validate/warnings.txtar |   6 +
 39 files changed, 1322 insertions(+), 30 deletions(-)
 create mode 100644 core/services/relay/evm/mercury/wsrpc/cache/cache.go
 create mode 100644 core/services/relay/evm/mercury/wsrpc/cache/cache_set.go
 create mode 100644 core/services/relay/evm/mercury/wsrpc/cache/cache_set_test.go
 create mode 100644 core/services/relay/evm/mercury/wsrpc/cache/cache_test.go
 create mode 100644 core/services/relay/evm/mercury/wsrpc/cache/helpers_test.go

diff --git a/core/cmd/shell.go b/core/cmd/shell.go
index 35659aa7797..daf936b36c8 100644
--- a/core/cmd/shell.go
+++ b/core/cmd/shell.go
@@ -43,6 +43,8 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
 	"github.com/smartcontractkit/chainlink/v2/core/services/periodicbackup"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
+	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/wsrpc"
+	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/wsrpc/cache"
 	"github.com/smartcontractkit/chainlink/v2/core/services/versioning"
 	"github.com/smartcontractkit/chainlink/v2/core/services/webhook"
 	"github.com/smartcontractkit/chainlink/v2/core/sessions"
@@ -157,11 +159,19 @@ func (n ChainlinkAppFactory) NewApplication(ctx context.Context, cfg chainlink.G
 	eventBroadcaster := pg.NewEventBroadcaster(cfg.Database().URL(), dbListener.MinReconnectInterval(), dbListener.MaxReconnectDuration(), appLggr, cfg.AppID())
 	loopRegistry := plugins.NewLoopRegistry(appLggr, cfg.Tracing())
 
+	mercuryPool := wsrpc.NewPool(appLggr, cache.Config{
+		Logger:               appLggr,
+		LatestReportTTL:      cfg.Mercury().Cache().LatestReportTTL(),
+		MaxStaleAge:          cfg.Mercury().Cache().MaxStaleAge(),
+		LatestReportDeadline: cfg.Mercury().Cache().LatestReportDeadline(),
+	})
+
 	// create the relayer-chain interoperators from application configuration
 	relayerFactory := chainlink.RelayerFactory{
 		Logger:       appLggr,
 		LoopRegistry: loopRegistry,
 		GRPCOpts:     grpcOpts,
+		MercuryPool:  mercuryPool,
 	}
 
 	evmFactoryCfg := chainlink.EVMFactoryConfig{
@@ -227,6 +237,7 @@ func (n ChainlinkAppFactory) NewApplication(ctx context.Context, cfg chainlink.G
 		SecretGenerator:            chainlink.FilePersistedSecretGenerator{},
 		LoopRegistry:               loopRegistry,
 		GRPCOpts:                   grpcOpts,
+		MercuryPool:                mercuryPool,
 	})
 }
 
diff --git a/core/config/docs/core.toml b/core/config/docs/core.toml
index 79801c2c52b..e438f4553fe 100644
--- a/core/config/docs/core.toml
+++ b/core/config/docs/core.toml
@@ -601,3 +601,26 @@ TLSCertPath = '/path/to/cert.pem' # Example
 [Tracing.Attributes]
 # env is an example user specified key-value pair
 env = 'test' # Example
+
+[Mercury]
+
+# Mercury.Cache controls settings for the price retrieval cache querying a mercury server
+[Mercury.Cache]
+# LatestReportTTL controls how "stale" we will allow a price to be e.g. if
+# set to 1s, a new price will always be fetched if the last result was
+# from 1 second ago or older.
+# 
+# Another way of looking at it is such: the cache will _never_ return a
+# price that was queried from now-LatestReportTTL or before.
+# 
+# Setting to zero disables caching entirely.
+LatestReportTTL = "1s" # Default
+# MaxStaleAge is that maximum amount of time that a value can be stale
+# before it is deleted from the cache (a form of garbage collection).
+# 
+# This should generally be set to something much larger than
+# LatestReportTTL. Setting to zero disables garbage collection.
+MaxStaleAge = "1h" # Default
+# LatestReportDeadline controls how long to wait for a response from the
+# mercury server before retrying. Setting this to zero will wait indefinitely.
+LatestReportDeadline = "5s" # Default
diff --git a/core/config/mercury_config.go b/core/config/mercury_config.go
index d7e985d14e6..e530af6338f 100644
--- a/core/config/mercury_config.go
+++ b/core/config/mercury_config.go
@@ -1,7 +1,18 @@
 package config
 
-import ocr2models "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/models"
+import (
+	"time"
+
+	ocr2models "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/models"
+)
+
+type MercuryCache interface {
+	LatestReportTTL() time.Duration
+	MaxStaleAge() time.Duration
+	LatestReportDeadline() time.Duration
+}
 
 type Mercury interface {
 	Credentials(credName string) *ocr2models.MercuryCredentials
+	Cache() MercuryCache
 }
diff --git a/core/config/toml/types.go b/core/config/toml/types.go
index 31076c1f1de..c420d7f3f47 100644
--- a/core/config/toml/types.go
+++ b/core/config/toml/types.go
@@ -54,6 +54,7 @@ type Core struct {
 	Sentry           Sentry           `toml:",omitempty"`
 	Insecure         Insecure         `toml:",omitempty"`
 	Tracing          Tracing          `toml:",omitempty"`
+	Mercury          Mercury          `toml:",omitempty"`
 }
 
 // SetFrom updates c with any non-nil values from f. (currently TOML field only!)
@@ -82,6 +83,7 @@ func (c *Core) SetFrom(f *Core) {
 	c.OCR.setFrom(&f.OCR)
 	c.P2P.setFrom(&f.P2P)
 	c.Keeper.setFrom(&f.Keeper)
+	c.Mercury.setFrom(&f.Mercury)
 
 	c.AutoPprof.setFrom(&f.AutoPprof)
 	c.Pyroscope.setFrom(&f.Pyroscope)
@@ -1358,6 +1360,32 @@ func (ins *Insecure) setFrom(f *Insecure) {
 	}
 }
 
+type MercuryCache struct {
+	LatestReportTTL      *models.Duration
+	MaxStaleAge          *models.Duration
+	LatestReportDeadline *models.Duration
+}
+
+func (mc *MercuryCache) setFrom(f *MercuryCache) {
+	if v := f.LatestReportTTL; v != nil {
+		mc.LatestReportTTL = v
+	}
+	if v := f.MaxStaleAge; v != nil {
+		mc.MaxStaleAge = v
+	}
+	if v := f.LatestReportDeadline; v != nil {
+		mc.LatestReportDeadline = v
+	}
+}
+
+type Mercury struct {
+	Cache MercuryCache `toml:",omitempty"`
+}
+
+func (m *Mercury) setFrom(f *Mercury) {
+	m.Cache.setFrom(&f.Cache)
+}
+
 type MercuryCredentials struct {
 	// LegacyURL is the legacy base URL for mercury v0.2 API
 	LegacyURL *models.SecretURL
diff --git a/core/internal/cltest/cltest.go b/core/internal/cltest/cltest.go
index 17a1d4fadd4..fc648486a03 100644
--- a/core/internal/cltest/cltest.go
+++ b/core/internal/cltest/cltest.go
@@ -76,6 +76,8 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/vrfkey"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
+	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/wsrpc"
+	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/wsrpc/cache"
 	"github.com/smartcontractkit/chainlink/v2/core/services/webhook"
 	clsessions "github.com/smartcontractkit/chainlink/v2/core/sessions"
 	"github.com/smartcontractkit/chainlink/v2/core/static"
@@ -342,10 +344,18 @@ func NewApplicationWithConfig(t testing.TB, cfg chainlink.GeneralConfig, flagsAn
 	mailMon := utils.NewMailboxMonitor(cfg.AppID().String())
 	loopRegistry := plugins.NewLoopRegistry(lggr, nil)
 
+	mercuryPool := wsrpc.NewPool(lggr, cache.Config{
+		Logger:               lggr,
+		LatestReportTTL:      cfg.Mercury().Cache().LatestReportTTL(),
+		MaxStaleAge:          cfg.Mercury().Cache().MaxStaleAge(),
+		LatestReportDeadline: cfg.Mercury().Cache().LatestReportDeadline(),
+	})
+
 	relayerFactory := chainlink.RelayerFactory{
 		Logger:       lggr,
 		LoopRegistry: loopRegistry,
 		GRPCOpts:     loop.GRPCOpts{},
+		MercuryPool:  mercuryPool,
 	}
 
 	evmOpts := chainlink.EVMFactoryConfig{
@@ -419,6 +429,7 @@ func NewApplicationWithConfig(t testing.TB, cfg chainlink.GeneralConfig, flagsAn
 		UnrestrictedHTTPClient:     c,
 		SecretGenerator:            MockSecretGenerator{},
 		LoopRegistry:               plugins.NewLoopRegistry(lggr, nil),
+		MercuryPool:                mercuryPool,
 	})
 	require.NoError(t, err)
 	app := appInstance.(*chainlink.ChainlinkApplication)
diff --git a/core/services/chainlink/application.go b/core/services/chainlink/application.go
index 29679ee92fb..1ecf95d3a5e 100644
--- a/core/services/chainlink/application.go
+++ b/core/services/chainlink/application.go
@@ -48,6 +48,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
 	"github.com/smartcontractkit/chainlink/v2/core/services/promreporter"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury"
+	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/wsrpc"
 	"github.com/smartcontractkit/chainlink/v2/core/services/telemetry"
 	"github.com/smartcontractkit/chainlink/v2/core/services/vrf"
 	"github.com/smartcontractkit/chainlink/v2/core/services/webhook"
@@ -160,6 +161,7 @@ type ApplicationOpts struct {
 	SecretGenerator            SecretGenerator
 	LoopRegistry               *plugins.LoopRegistry
 	GRPCOpts                   loop.GRPCOpts
+	MercuryPool                wsrpc.Pool
 }
 
 // NewApplication initializes a new store if one is not already
@@ -241,6 +243,9 @@ func NewApplication(opts ApplicationOpts) (Application, error) {
 	promReporter := promreporter.NewPromReporter(db.DB, globalLogger)
 	srvcs = append(srvcs, promReporter)
 
+	// pool must be started before all relayers and stopped after them
+	srvcs = append(srvcs, opts.MercuryPool)
+
 	// EVM chains are used all over the place. This will need to change for fully EVM extraction
 	// TODO: BCF-2510, BCF-2511
 
@@ -457,6 +462,9 @@ func NewApplication(opts ApplicationOpts) (Application, error) {
 	}
 
 	for _, s := range srvcs {
+		if s == nil {
+			panic("service unexpectedly nil")
+		}
 		if err := healthChecker.Register(s); err != nil {
 			return nil, err
 		}
diff --git a/core/services/chainlink/config_general.go b/core/services/chainlink/config_general.go
index fff7822a814..c7d9cc6ce5d 100644
--- a/core/services/chainlink/config_general.go
+++ b/core/services/chainlink/config_general.go
@@ -507,7 +507,7 @@ func (g *generalConfig) Prometheus() coreconfig.Prometheus {
 }
 
 func (g *generalConfig) Mercury() coreconfig.Mercury {
-	return &mercuryConfig{s: g.secrets.Mercury}
+	return &mercuryConfig{c: g.c.Mercury, s: g.secrets.Mercury}
 }
 
 func (g *generalConfig) Threshold() coreconfig.Threshold {
diff --git a/core/services/chainlink/config_mercury.go b/core/services/chainlink/config_mercury.go
index 1a20dd069d8..61e48d340e4 100644
--- a/core/services/chainlink/config_mercury.go
+++ b/core/services/chainlink/config_mercury.go
@@ -1,11 +1,31 @@
 package chainlink
 
 import (
+	"time"
+
+	"github.com/smartcontractkit/chainlink/v2/core/config"
 	"github.com/smartcontractkit/chainlink/v2/core/config/toml"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/models"
 )
 
+var _ config.MercuryCache = (*mercuryCacheConfig)(nil)
+
+type mercuryCacheConfig struct {
+	c toml.MercuryCache
+}
+
+func (m *mercuryCacheConfig) LatestReportTTL() time.Duration {
+	return m.c.LatestReportTTL.Duration()
+}
+func (m *mercuryCacheConfig) MaxStaleAge() time.Duration {
+	return m.c.MaxStaleAge.Duration()
+}
+func (m *mercuryCacheConfig) LatestReportDeadline() time.Duration {
+	return m.c.LatestReportDeadline.Duration()
+}
+
 type mercuryConfig struct {
+	c toml.Mercury
 	s toml.MercurySecrets
 }
 
@@ -23,3 +43,7 @@ func (m *mercuryConfig) Credentials(credName string) *models.MercuryCredentials
 	}
 	return nil
 }
+
+func (m *mercuryConfig) Cache() config.MercuryCache {
+	return &mercuryCacheConfig{c: m.c.Cache}
+}
diff --git a/core/services/chainlink/config_test.go b/core/services/chainlink/config_test.go
index 33fda221285..d777e34abf7 100644
--- a/core/services/chainlink/config_test.go
+++ b/core/services/chainlink/config_test.go
@@ -668,6 +668,13 @@ func TestConfig_Marshal(t *testing.T) {
 			},
 		},
 	}
+	full.Mercury = toml.Mercury{
+		Cache: toml.MercuryCache{
+			LatestReportTTL:      models.MustNewDuration(100 * time.Second),
+			MaxStaleAge:          models.MustNewDuration(101 * time.Second),
+			LatestReportDeadline: models.MustNewDuration(102 * time.Second),
+		},
+	}
 
 	for _, tt := range []struct {
 		name   string
@@ -1103,6 +1110,12 @@ ConfirmationPoll = '42s'
 [[Starknet.Nodes]]
 Name = 'primary'
 URL = 'http://stark.node'
+`},
+		{"Mercury", Config{Core: toml.Core{Mercury: full.Mercury}}, `[Mercury]
+[Mercury.Cache]
+LatestReportTTL = '1m40s'
+MaxStaleAge = '1m41s'
+LatestReportDeadline = '1m42s'
 `},
 		{"full", full, fullTOML},
 		{"multi-chain", multiChain, multiChainTOML},
diff --git a/core/services/chainlink/relayer_factory.go b/core/services/chainlink/relayer_factory.go
index c15643551e9..8b8749013fc 100644
--- a/core/services/chainlink/relayer_factory.go
+++ b/core/services/chainlink/relayer_factory.go
@@ -25,6 +25,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay"
 	evmrelay "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
+	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/wsrpc"
 	"github.com/smartcontractkit/chainlink/v2/plugins"
 )
 
@@ -32,6 +33,7 @@ type RelayerFactory struct {
 	logger.Logger
 	*plugins.LoopRegistry
 	loop.GRPCOpts
+	MercuryPool wsrpc.Pool
 }
 
 type EVMFactoryConfig struct {
@@ -68,6 +70,7 @@ func (r *RelayerFactory) NewEVM(ctx context.Context, config EVMFactoryConfig) (m
 			QConfig:          ccOpts.AppConfig.Database(),
 			CSAETHKeystore:   config.CSAETHKeystore,
 			EventBroadcaster: ccOpts.EventBroadcaster,
+			MercuryPool:      r.MercuryPool,
 		}
 		relayer, err2 := evmrelay.NewRelayer(r.Logger.Named("EVM").Named(relayID.ChainID), chain, relayerOpts)
 		if err2 != nil {
diff --git a/core/services/chainlink/testdata/config-empty-effective.toml b/core/services/chainlink/testdata/config-empty-effective.toml
index 8f3135b34e4..2531e7c281d 100644
--- a/core/services/chainlink/testdata/config-empty-effective.toml
+++ b/core/services/chainlink/testdata/config-empty-effective.toml
@@ -234,3 +234,9 @@ NodeID = ''
 SamplingRatio = 0.0
 Mode = 'tls'
 TLSCertPath = ''
+
+[Mercury]
+[Mercury.Cache]
+LatestReportTTL = '1s'
+MaxStaleAge = '1h0m0s'
+LatestReportDeadline = '5s'
diff --git a/core/services/chainlink/testdata/config-full.toml b/core/services/chainlink/testdata/config-full.toml
index eca5f6f96d2..8036165d6e8 100644
--- a/core/services/chainlink/testdata/config-full.toml
+++ b/core/services/chainlink/testdata/config-full.toml
@@ -245,6 +245,12 @@ TLSCertPath = '/path/to/cert.pem'
 env = 'dev'
 test = 'load'
 
+[Mercury]
+[Mercury.Cache]
+LatestReportTTL = '1m40s'
+MaxStaleAge = '1m41s'
+LatestReportDeadline = '1m42s'
+
 [[EVM]]
 ChainID = '1'
 Enabled = false
diff --git a/core/services/chainlink/testdata/config-multi-chain-effective.toml b/core/services/chainlink/testdata/config-multi-chain-effective.toml
index 6a60dfd419a..371cc50a170 100644
--- a/core/services/chainlink/testdata/config-multi-chain-effective.toml
+++ b/core/services/chainlink/testdata/config-multi-chain-effective.toml
@@ -235,6 +235,12 @@ SamplingRatio = 0.0
 Mode = 'tls'
 TLSCertPath = ''
 
+[Mercury]
+[Mercury.Cache]
+LatestReportTTL = '1s'
+MaxStaleAge = '1h0m0s'
+LatestReportDeadline = '5s'
+
 [[EVM]]
 ChainID = '1'
 AutoCreateKey = true
diff --git a/core/services/ocr2/delegate.go b/core/services/ocr2/delegate.go
index 45ee4e0f8fb..eebc95903ed 100644
--- a/core/services/ocr2/delegate.go
+++ b/core/services/ocr2/delegate.go
@@ -189,6 +189,7 @@ type jobPipelineConfig interface {
 
 type mercuryConfig interface {
 	Credentials(credName string) *models.MercuryCredentials
+	Cache() coreconfig.MercuryCache
 }
 
 type thresholdConfig interface {
diff --git a/core/services/relay/evm/evm.go b/core/services/relay/evm/evm.go
index 952c1869bfa..088a69a2582 100644
--- a/core/services/relay/evm/evm.go
+++ b/core/services/relay/evm/evm.go
@@ -66,6 +66,7 @@ type RelayerOpts struct {
 	pg.QConfig
 	CSAETHKeystore
 	pg.EventBroadcaster
+	MercuryPool wsrpc.Pool
 }
 
 func (c RelayerOpts) Validate() error {
@@ -100,7 +101,7 @@ func NewRelayer(lggr logger.Logger, chain legacyevm.Chain, opts RelayerOpts) (*R
 		chain:            chain,
 		lggr:             lggr,
 		ks:               opts.CSAETHKeystore,
-		mercuryPool:      wsrpc.NewPool(lggr),
+		mercuryPool:      opts.MercuryPool,
 		eventBroadcaster: opts.EventBroadcaster,
 		pgCfg:            opts.QConfig,
 	}, nil
@@ -116,17 +117,16 @@ func (r *Relayer) Start(context.Context) error {
 }
 
 func (r *Relayer) Close() error {
-	return r.mercuryPool.Close()
+	return nil
 }
 
 // Ready does noop: always ready
 func (r *Relayer) Ready() error {
-	return r.mercuryPool.Ready()
+	return nil
 }
 
 func (r *Relayer) HealthReport() (report map[string]error) {
 	report = make(map[string]error)
-	services.CopyHealth(report, r.mercuryPool.HealthReport())
 	return
 }
 
diff --git a/core/services/relay/evm/mercury/utils/feeds.go b/core/services/relay/evm/mercury/utils/feeds.go
index b1a20618ef6..6f8978bbf0d 100644
--- a/core/services/relay/evm/mercury/utils/feeds.go
+++ b/core/services/relay/evm/mercury/utils/feeds.go
@@ -88,6 +88,10 @@ const (
 
 type FeedID [32]byte
 
+func BytesToFeedID(b []byte) FeedID {
+	return (FeedID)(utils.BytesToHash(b))
+}
+
 func (f FeedID) Hex() string { return (utils.Hash)(f).Hex() }
 
 func (f FeedID) String() string { return (utils.Hash)(f).String() }
diff --git a/core/services/relay/evm/mercury/wsrpc/cache/cache.go b/core/services/relay/evm/mercury/wsrpc/cache/cache.go
new file mode 100644
index 00000000000..4962210d58f
--- /dev/null
+++ b/core/services/relay/evm/mercury/wsrpc/cache/cache.go
@@ -0,0 +1,395 @@
+package cache
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"sync"
+	"time"
+
+	"github.com/jpillora/backoff"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
+
+	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	mercuryutils "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/utils"
+	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/wsrpc/pb"
+	"github.com/smartcontractkit/chainlink/v2/core/utils"
+)
+
+var (
+	promFetchFailedCount = promauto.NewCounterVec(prometheus.CounterOpts{
+		Name: "mercury_cache_fetch_failure_count",
+		Help: "Number of times we tried to call LatestReport from the mercury server, but some kind of error occurred",
+	},
+		[]string{"serverURL", "feedID"},
+	)
+	promCacheHitCount = promauto.NewCounterVec(prometheus.CounterOpts{
+		Name: "mercury_cache_hit_count",
+		Help: "Running count of cache hits",
+	},
+		[]string{"serverURL", "feedID"},
+	)
+	promCacheWaitCount = promauto.NewCounterVec(prometheus.CounterOpts{
+		Name: "mercury_cache_wait_count",
+		Help: "Running count of times that we had to wait for a fetch to complete before reading from cache",
+	},
+		[]string{"serverURL", "feedID"},
+	)
+	promCacheMissCount = promauto.NewCounterVec(prometheus.CounterOpts{
+		Name: "mercury_cache_miss_count",
+		Help: "Running count of cache misses",
+	},
+		[]string{"serverURL", "feedID"},
+	)
+)
+
+type Fetcher interface {
+	LatestReport(ctx context.Context, req *pb.LatestReportRequest) (resp *pb.LatestReportResponse, err error)
+}
+
+type Client interface {
+	Fetcher
+	ServerURL() string
+	RawClient() pb.MercuryClient
+}
+
+// Cache is scoped to one particular mercury server
+// Use CacheSet to hold lookups for multiple servers
+type Cache interface {
+	Fetcher
+	services.Service
+}
+
+type Config struct {
+	Logger logger.Logger
+	// LatestReportTTL controls how "stale" we will allow a price to be e.g. if
+	// set to 1s, a new price will always be fetched if the last result was
+	// from more than 1 second ago.
+	//
+	// Another way of looking at it is such: the cache will _never_ return a
+	// price that was queried from before now-LatestReportTTL.
+	//
+	// Setting to zero disables caching entirely.
+	LatestReportTTL time.Duration
+	// MaxStaleAge is that maximum amount of time that a value can be stale
+	// before it is deleted from the cache (a form of garbage collection).
+	//
+	// This should generally be set to something much larger than
+	// LatestReportTTL. Setting to zero disables garbage collection.
+	MaxStaleAge time.Duration
+	// LatestReportDeadline controls how long to wait for a response before
+	// retrying. Setting this to zero will wait indefinitely.
+	LatestReportDeadline time.Duration
+}
+
+func NewCache(client Client, cfg Config) Cache {
+	return newMemCache(client, cfg)
+}
+
+type cacheVal struct {
+	sync.RWMutex
+
+	fetching bool
+	fetchCh  chan (struct{})
+
+	val *pb.LatestReportResponse
+	err error
+
+	expiresAt time.Time
+}
+
+func (v *cacheVal) read() (*pb.LatestReportResponse, error) {
+	v.RLock()
+	defer v.RUnlock()
+	return v.val, v.err
+}
+
+// caller expected to hold lock
+func (v *cacheVal) initiateFetch() <-chan struct{} {
+	if v.fetching {
+		panic("cannot initiateFetch on cache val that is already fetching")
+	}
+	v.fetching = true
+	v.fetchCh = make(chan struct{})
+	return v.fetchCh
+}
+
+func (v *cacheVal) setError(err error) {
+	v.Lock()
+	defer v.Unlock()
+	v.err = err
+}
+
+func (v *cacheVal) completeFetch(val *pb.LatestReportResponse, err error, expiresAt time.Time) {
+	v.Lock()
+	defer v.Unlock()
+	if !v.fetching {
+		panic("can only completeFetch on cache val that is fetching")
+	}
+	v.val = val
+	v.err = err
+	if err == nil {
+		v.expiresAt = expiresAt
+	}
+	close(v.fetchCh)
+	v.fetchCh = nil
+	v.fetching = false
+}
+
+func (v *cacheVal) abandonFetch(err error) {
+	v.completeFetch(nil, err, time.Now())
+}
+
+func (v *cacheVal) waitForResult(ctx context.Context, chResult <-chan struct{}, chStop <-chan struct{}) (*pb.LatestReportResponse, error) {
+	select {
+	case <-ctx.Done():
+		_, err := v.read()
+		return nil, errors.Join(err, ctx.Err())
+	case <-chStop:
+		return nil, errors.New("stopped")
+	case <-chResult:
+		return v.read()
+	}
+}
+
+// memCache stores values in memory
+// it will never return a stale value older than latestPriceTTL, instead
+// waiting for a successful fetch or caller context cancels, whichever comes
+// first
+type memCache struct {
+	services.StateMachine
+	lggr logger.Logger
+
+	client Client
+
+	latestPriceTTL       time.Duration
+	maxStaleAge          time.Duration
+	latestReportDeadline time.Duration
+
+	cache sync.Map
+
+	wg     sync.WaitGroup
+	chStop services.StopChan
+}
+
+func newMemCache(client Client, cfg Config) *memCache {
+	return &memCache{
+		services.StateMachine{},
+		cfg.Logger.Named("MercuryMemCache"),
+		client,
+		cfg.LatestReportTTL,
+		cfg.MaxStaleAge,
+		cfg.LatestReportDeadline,
+		sync.Map{},
+		sync.WaitGroup{},
+		make(chan (struct{})),
+	}
+}
+
+// LatestReport
+// NOTE: This will actually block on all types of errors, even non-timeouts.
+// Context should be set carefully and timed to be the maximum time we are
+// willing to wait for a result, the background thread will keep re-querying
+// until it gets one even on networking errors etc.
+func (m *memCache) LatestReport(ctx context.Context, req *pb.LatestReportRequest) (resp *pb.LatestReportResponse, err error) {
+	if req == nil {
+		return nil, errors.New("req must not be nil")
+	}
+	if m.latestPriceTTL <= 0 {
+		return m.client.RawClient().LatestReport(ctx, req)
+	}
+	vi, _ := m.cache.LoadOrStore(req, &cacheVal{
+		sync.RWMutex{},
+		false,
+		nil,
+		nil,
+		nil,
+		time.Now(), // first result is always "expired" and requires fetch
+	})
+	v := vi.(*cacheVal)
+
+	// HOT PATH
+	v.RLock()
+	if time.Now().Before(v.expiresAt) {
+		// CACHE HIT
+		promCacheHitCount.WithLabelValues(m.client.ServerURL(), mercuryutils.BytesToFeedID(req.FeedId).String()).Inc()
+
+		defer v.RUnlock()
+		return v.val, nil
+	} else if v.fetching {
+		// CACHE WAIT
+		promCacheWaitCount.WithLabelValues(m.client.ServerURL(), mercuryutils.BytesToFeedID(req.FeedId).String()).Inc()
+		// if someone else is fetching then wait for the fetch to complete
+		ch := v.fetchCh
+		v.RUnlock()
+		return v.waitForResult(ctx, ch, m.chStop)
+	}
+	// CACHE MISS
+	promCacheMissCount.WithLabelValues(m.client.ServerURL(), mercuryutils.BytesToFeedID(req.FeedId).String()).Inc()
+	// fallthrough to cold path and fetch
+	v.RUnlock()
+
+	// COLD PATH
+	v.Lock()
+	if time.Now().Before(v.expiresAt) {
+		// CACHE HIT
+		promCacheHitCount.WithLabelValues(m.client.ServerURL(), mercuryutils.BytesToFeedID(req.FeedId).String()).Inc()
+		defer v.RUnlock()
+		return v.val, nil
+	} else if v.fetching {
+		// CACHE WAIT
+		promCacheWaitCount.WithLabelValues(m.client.ServerURL(), mercuryutils.BytesToFeedID(req.FeedId).String()).Inc()
+		// if someone else is fetching then wait for the fetch to complete
+		ch := v.fetchCh
+		v.Unlock()
+		return v.waitForResult(ctx, ch, m.chStop)
+	}
+	// CACHE MISS
+	promCacheMissCount.WithLabelValues(m.client.ServerURL(), mercuryutils.BytesToFeedID(req.FeedId).String()).Inc()
+	// initiate the fetch and wait for result
+	ch := v.initiateFetch()
+	v.Unlock()
+
+	ok := m.IfStarted(func() {
+		m.wg.Add(1)
+		go m.fetch(req, v)
+	})
+	if !ok {
+		err := fmt.Errorf("memCache must be started, but is: %v", m.State())
+		v.abandonFetch(err)
+		return nil, err
+	}
+	return v.waitForResult(ctx, ch, m.chStop)
+}
+
+const minBackoffRetryInterval = 50 * time.Millisecond
+
+// newBackoff creates a backoff for retrying
+func (m *memCache) newBackoff() backoff.Backoff {
+	min := minBackoffRetryInterval
+	max := m.latestPriceTTL / 2
+	if min > max {
+		// avoid setting a min that is greater than max
+		min = max
+	}
+	return backoff.Backoff{
+		Min:    min,
+		Max:    max,
+		Factor: 2,
+		Jitter: true,
+	}
+}
+
+// fetch continually tries to call FetchLatestReport and write the result to v
+// it writes errors as they come up
+func (m *memCache) fetch(req *pb.LatestReportRequest, v *cacheVal) {
+	defer m.wg.Done()
+	b := m.newBackoff()
+	memcacheCtx, cancel := m.chStop.NewCtx()
+	defer cancel()
+	var t time.Time
+	var val *pb.LatestReportResponse
+	var err error
+	defer func() {
+		v.completeFetch(val, err, t.Add(m.latestPriceTTL))
+	}()
+
+	for {
+		t = time.Now()
+
+		ctx := memcacheCtx
+		cancel := func() {}
+		if m.latestReportDeadline > 0 {
+			ctx, cancel = context.WithTimeoutCause(memcacheCtx, m.latestReportDeadline, errors.New("latest report fetch deadline exceeded"))
+		}
+
+		// NOTE: must drop down to RawClient here otherwise we enter an
+		// infinite loop of calling a client that calls back to this same cache
+		// and on and on
+		val, err = m.client.RawClient().LatestReport(ctx, req)
+		cancel()
+		v.setError(err)
+		if memcacheCtx.Err() != nil {
+			// stopped
+			return
+		} else if err != nil {
+			m.lggr.Warnw("FetchLatestReport failed", "err", err)
+			promFetchFailedCount.WithLabelValues(m.client.ServerURL(), mercuryutils.BytesToFeedID(req.FeedId).String()).Inc()
+			select {
+			case <-m.chStop:
+				return
+			case <-time.After(b.Duration()):
+				continue
+			}
+		}
+		return
+	}
+}
+
+func (m *memCache) Start(context.Context) error {
+	return m.StartOnce(m.Name(), func() error {
+		m.wg.Add(1)
+		go m.runloop()
+		return nil
+	})
+}
+
+func (m *memCache) runloop() {
+	defer m.wg.Done()
+
+	if m.maxStaleAge == 0 {
+		return
+	}
+	t := time.NewTicker(utils.WithJitter(m.maxStaleAge))
+
+	for {
+		select {
+		case <-t.C:
+			m.cleanup()
+			t.Reset(utils.WithJitter(m.maxStaleAge))
+		case <-m.chStop:
+			return
+		}
+	}
+}
+
+// remove anything that has been stale for longer than maxStaleAge so that
+// cache doesn't grow forever and cause memory leaks
+//
+// NOTE: This should be concurrent-safe with LatestReport. The only time they
+// can race is if the cache item has expired past the stale age between
+// creation of the cache item and start of fetch. This is unlikely, and even if
+// it does occur, the worst case is that we discard a cache item early and
+// double fetch, which isn't bad at all.
+func (m *memCache) cleanup() {
+	m.cache.Range(func(k, vi any) bool {
+		v := vi.(*cacheVal)
+		v.RLock()
+		defer v.RUnlock()
+		if v.fetching {
+			// skip cleanup if fetching
+			return true
+		}
+		if time.Now().After(v.expiresAt.Add(m.maxStaleAge)) {
+			// garbage collection
+			m.cache.Delete(k)
+		}
+		return true
+	})
+}
+
+func (m *memCache) Close() error {
+	return m.StopOnce(m.Name(), func() error {
+		close(m.chStop)
+		m.wg.Wait()
+		return nil
+	})
+}
+func (m *memCache) HealthReport() map[string]error {
+	return map[string]error{
+		m.Name(): m.Ready(),
+	}
+}
+func (m *memCache) Name() string { return m.lggr.Name() }
diff --git a/core/services/relay/evm/mercury/wsrpc/cache/cache_set.go b/core/services/relay/evm/mercury/wsrpc/cache/cache_set.go
new file mode 100644
index 00000000000..f06f1137fb3
--- /dev/null
+++ b/core/services/relay/evm/mercury/wsrpc/cache/cache_set.go
@@ -0,0 +1,120 @@
+package cache
+
+import (
+	"context"
+	"fmt"
+	"sync"
+	"time"
+
+	"golang.org/x/exp/maps"
+
+	"github.com/smartcontractkit/chainlink-common/pkg/services"
+
+	"github.com/smartcontractkit/chainlink/v2/core/logger"
+)
+
+// CacheSet holds a set of mercury caches keyed by server URL
+type CacheSet interface {
+	services.Service
+	Get(ctx context.Context, client Client) (Fetcher, error)
+}
+
+var _ CacheSet = (*cacheSet)(nil)
+
+type cacheSet struct {
+	sync.RWMutex
+	services.StateMachine
+
+	lggr   logger.Logger
+	caches map[string]Cache
+
+	latestPriceTTL time.Duration
+	maxStaleAge    time.Duration
+}
+
+func NewCacheSet(cfg Config) CacheSet {
+	return newCacheSet(cfg)
+}
+
+func newCacheSet(cfg Config) *cacheSet {
+	return &cacheSet{
+		sync.RWMutex{},
+		services.StateMachine{},
+		cfg.Logger.Named("CacheSet"),
+		make(map[string]Cache),
+		cfg.LatestReportTTL,
+		cfg.MaxStaleAge,
+	}
+}
+
+func (cs *cacheSet) Start(context.Context) error {
+	return cs.StartOnce("CacheSet", func() error {
+		return nil
+	})
+}
+
+func (cs *cacheSet) Close() error {
+	return cs.StopOnce("CacheSet", func() error {
+		cs.Lock()
+		defer cs.Unlock()
+		caches := maps.Values(cs.caches)
+		if err := services.MultiCloser(caches).Close(); err != nil {
+			return err
+		}
+		cs.caches = nil
+		return nil
+	})
+}
+
+func (cs *cacheSet) Get(ctx context.Context, client Client) (f Fetcher, err error) {
+	ok := cs.IfStarted(func() {
+		f, err = cs.get(ctx, client)
+	})
+	if !ok {
+		return nil, fmt.Errorf("cacheSet must be started, but is: %v", cs.State())
+	}
+	return
+}
+
+func (cs *cacheSet) get(ctx context.Context, client Client) (Fetcher, error) {
+	sURL := client.ServerURL()
+	// HOT PATH
+	cs.RLock()
+	c, exists := cs.caches[sURL]
+	cs.RUnlock()
+	if exists {
+		return c, nil
+	}
+
+	// COLD PATH
+	cs.Lock()
+	defer cs.Unlock()
+	c, exists = cs.caches[sURL]
+	if exists {
+		return c, nil
+	}
+	cfg := Config{
+		Logger:          cs.lggr.With("serverURL", sURL),
+		LatestReportTTL: cs.latestPriceTTL,
+		MaxStaleAge:     cs.maxStaleAge,
+	}
+	c = newMemCache(client, cfg)
+	if err := c.Start(ctx); err != nil {
+		return nil, err
+	}
+	cs.caches[sURL] = c
+	return c, nil
+}
+
+func (cs *cacheSet) HealthReport() map[string]error {
+	report := map[string]error{
+		cs.Name(): cs.Ready(),
+	}
+	cs.RLock()
+	defer cs.RUnlock()
+	for _, c := range cs.caches {
+		services.CopyHealth(report, c.HealthReport())
+	}
+	return report
+}
+func (cs *cacheSet) Name() string { return cs.lggr.Name() }
diff --git a/core/services/relay/evm/mercury/wsrpc/cache/cache_set_test.go b/core/services/relay/evm/mercury/wsrpc/cache/cache_set_test.go
new file mode 100644
index 00000000000..9262fb52d31
--- /dev/null
+++ b/core/services/relay/evm/mercury/wsrpc/cache/cache_set_test.go
@@ -0,0 +1,48 @@
+package cache
+
+import (
+	"testing"
+
+	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
+	"github.com/smartcontractkit/chainlink/v2/core/logger"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func Test_CacheSet(t *testing.T) {
+	lggr := logger.TestLogger(t)
+	cs := newCacheSet(Config{Logger: lggr})
+	ctx := testutils.Context(t)
+	require.NoError(t, cs.Start(ctx))
+	t.Cleanup(func() {
+		assert.NoError(t, cs.Close())
+	})
+
+	t.Run("Get", func(t *testing.T) {
+		c := &mockClient{}
+
+		var err error
+		var f Fetcher
+		t.Run("with virgin cacheset, makes new entry and returns it", func(t *testing.T) {
+			assert.Len(t, cs.caches, 0)
+
+			f, err = cs.Get(ctx, c)
+			require.NoError(t, err)
+
+			assert.IsType(t, f, &memCache{})
+			assert.Len(t, cs.caches, 1)
+		})
+		t.Run("with existing cache for value, returns that", func(t *testing.T) {
+			var f2 Fetcher
+			assert.Len(t, cs.caches, 1)
+
+			f2, err = cs.Get(ctx, c)
+			require.NoError(t, err)
+
+			assert.IsType(t, f, &memCache{})
+			assert.Equal(t, f, f2)
+			assert.Len(t, cs.caches, 1)
+		})
+	})
+}
diff --git a/core/services/relay/evm/mercury/wsrpc/cache/cache_test.go b/core/services/relay/evm/mercury/wsrpc/cache/cache_test.go
new file mode 100644
index 00000000000..71f74b3b3cb
--- /dev/null
+++ b/core/services/relay/evm/mercury/wsrpc/cache/cache_test.go
@@ -0,0 +1,199 @@
+package cache
+
+import (
+	"context"
+	"errors"
+	"strconv"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
+	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/wsrpc/pb"
+)
+
+const neverExpireTTL = 1000 * time.Hour // some massive value that will never expire during a test
+
+func Test_Cache(t *testing.T) {
+	client := &mockClient{}
+	cfg := Config{
+		Logger: logger.TestLogger(t),
+	}
+	ctx := testutils.Context(t)
+
+	req1 := &pb.LatestReportRequest{FeedId: []byte{1}}
+	req2 := &pb.LatestReportRequest{FeedId: []byte{2}}
+	req3 := &pb.LatestReportRequest{FeedId: []byte{3}}
+
+	t.Run("errors with nil req", func(t *testing.T) {
+		c := newMemCache(client, cfg)
+
+		_, err := c.LatestReport(ctx, nil)
+		assert.EqualError(t, err, "req must not be nil")
+	})
+
+	t.Run("with LatestReportTTL=0 does no caching", func(t *testing.T) {
+		c := newMemCache(client, cfg)
+
+		req := &pb.LatestReportRequest{}
+		for i := 0; i < 5; i++ {
+			client.resp = &pb.LatestReportResponse{Report: &pb.Report{Price: []byte(strconv.Itoa(i))}}
+
+			resp, err := c.LatestReport(ctx, req)
+			require.NoError(t, err)
+			assert.Equal(t, client.resp, resp)
+		}
+
+		client.resp = nil
+		client.err = errors.New("something exploded")
+
+		resp, err := c.LatestReport(ctx, req)
+		assert.EqualError(t, err, "something exploded")
+		assert.Nil(t, resp)
+	})
+
+	t.Run("caches repeated calls to LatestReport, keyed by request", func(t *testing.T) {
+		cfg.LatestReportTTL = neverExpireTTL
+		client.err = nil
+		c := newMemCache(client, cfg)
+
+		t.Run("if cache is unstarted, returns error", func(t *testing.T) {
+			// starting the cache is required for state management if we
+			// actually cache results, since fetches are initiated async and
+			// need to be cleaned up properly on close
+			_, err := c.LatestReport(ctx, &pb.LatestReportRequest{})
+			assert.EqualError(t, err, "memCache must be started, but is: Unstarted")
+		})
+
+		err := c.StartOnce("test start", func() error { return nil })
+		require.NoError(t, err)
+
+		t.Run("returns cached value for key", func(t *testing.T) {
+			var firstResp *pb.LatestReportResponse
+			for i := 0; i < 5; i++ {
+				client.resp = &pb.LatestReportResponse{Report: &pb.Report{Price: []byte(strconv.Itoa(i))}}
+				if firstResp == nil {
+					firstResp = client.resp
+				}
+
+				resp, err := c.LatestReport(ctx, req1)
+				require.NoError(t, err)
+				assert.Equal(t, firstResp, resp)
+			}
+		})
+
+		t.Run("cache keys do not conflict", func(t *testing.T) {
+			var firstResp1 *pb.LatestReportResponse
+			for i := 5; i < 10; i++ {
+				client.resp = &pb.LatestReportResponse{Report: &pb.Report{Price: []byte(strconv.Itoa(i))}}
+				if firstResp1 == nil {
+					firstResp1 = client.resp
+				}
+
+				resp, err := c.LatestReport(ctx, req2)
+				require.NoError(t, err)
+				assert.Equal(t, firstResp1, resp)
+			}
+
+			var firstResp2 *pb.LatestReportResponse
+			for i := 10; i < 15; i++ {
+				client.resp = &pb.LatestReportResponse{Report: &pb.Report{Price: []byte(strconv.Itoa(i))}}
+				if firstResp2 == nil {
+					firstResp2 = client.resp
+				}
+
+				resp, err := c.LatestReport(ctx, req3)
+				require.NoError(t, err)
+				assert.Equal(t, firstResp2, resp)
+			}
+
+			// req1 key still has same value
+			resp, err := c.LatestReport(ctx, req1)
+			require.NoError(t, err)
+			assert.Equal(t, []byte(strconv.Itoa(0)), resp.Report.Price)
+
+			// req2 key still has same value
+			resp, err = c.LatestReport(ctx, req2)
+			require.NoError(t, err)
+			assert.Equal(t, []byte(strconv.Itoa(5)), resp.Report.Price)
+		})
+
+		t.Run("re-queries when a cache item has expired", func(t *testing.T) {
+			vi, exists := c.cache.Load(req1)
+			assert.True(t, exists)
+			v := vi.(*cacheVal)
+			v.expiresAt = time.Now().Add(-1 * time.Second)
+
+			client.resp = &pb.LatestReportResponse{Report: &pb.Report{Price: []byte(strconv.Itoa(15))}}
+
+			resp, err := c.LatestReport(ctx, req1)
+			require.NoError(t, err)
+			assert.Equal(t, client.resp, resp)
+
+			// querying again yields the same cached item
+			resp, err = c.LatestReport(ctx, req1)
+			require.NoError(t, err)
+			assert.Equal(t, client.resp, resp)
+		})
+	})
+
+	t.Run("complete fetch", func(t *testing.T) {
+		t.Run("does not change expiry if fetch returns error", func(t *testing.T) {
+			expires := time.Now().Add(-1 * time.Second)
+			v := &cacheVal{
+				fetching:  true,
+				fetchCh:   make(chan (struct{})),
+				val:       nil,
+				err:       nil,
+				expiresAt: expires,
+			}
+			v.completeFetch(nil, errors.New("foo"), time.Now().Add(neverExpireTTL))
+			assert.Equal(t, expires, v.expiresAt)
+
+			v = &cacheVal{
+				fetching:  true,
+				fetchCh:   make(chan (struct{})),
+				val:       nil,
+				err:       nil,
+				expiresAt: expires,
+			}
+			expires = time.Now().Add(neverExpireTTL)
+			v.completeFetch(nil, nil, expires)
+			assert.Equal(t, expires, v.expiresAt)
+		})
+	})
+
+	t.Run("timeouts", func(t *testing.T) {
+		c := newMemCache(client, cfg)
+		// simulate fetch already executing in background
+		v := &cacheVal{
+			fetching:  true,
+			fetchCh:   make(chan (struct{})),
+			val:       nil,
+			err:       nil,
+			expiresAt: time.Now().Add(-1 * time.Second),
+		}
+		c.cache.Store(req1, v)
+
+		canceledCtx, cancel := context.WithCancel(testutils.Context(t))
+		cancel()
+
+		t.Run("returns context deadline exceeded error if fetch takes too long", func(t *testing.T) {
+			_, err := c.LatestReport(canceledCtx, req1)
+			require.Error(t, err)
+			assert.True(t, errors.Is(err, context.Canceled))
+			assert.EqualError(t, err, "context canceled")
+		})
+		t.Run("returns wrapped context deadline exceeded error if fetch has errored and is in the retry loop", func(t *testing.T) {
+			v.err = errors.New("some background fetch error")
+
+			_, err := c.LatestReport(canceledCtx, req1)
+			require.Error(t, err)
+			assert.True(t, errors.Is(err, context.Canceled))
+			assert.EqualError(t, err, "some background fetch error\ncontext canceled")
+		})
+	})
+}
diff --git a/core/services/relay/evm/mercury/wsrpc/cache/helpers_test.go b/core/services/relay/evm/mercury/wsrpc/cache/helpers_test.go
new file mode 100644
index 00000000000..4cc08bdd52e
--- /dev/null
+++ b/core/services/relay/evm/mercury/wsrpc/cache/helpers_test.go
@@ -0,0 +1,38 @@
+package cache
+
+import (
+	"context"
+
+	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/wsrpc/pb"
+)
+
+var _ Client = &mockClient{}
+
+type mockClient struct {
+	resp *pb.LatestReportResponse
+	err  error
+}
+
+func (m *mockClient) LatestReport(ctx context.Context, req *pb.LatestReportRequest) (resp *pb.LatestReportResponse, err error) {
+	return m.resp, m.err
+}
+
+func (m *mockClient) ServerURL() string {
+	return "mock client url"
+}
+
+func (m *mockClient) RawClient() pb.MercuryClient {
+	return &mockRawClient{m.resp, m.err}
+}
+
+type mockRawClient struct {
+	resp *pb.LatestReportResponse
+	err  error
+}
+
+func (m *mockRawClient) Transmit(ctx context.Context, in *pb.TransmitRequest) (*pb.TransmitResponse, error) {
+	return nil, nil
+}
+func (m *mockRawClient) LatestReport(ctx context.Context, in *pb.LatestReportRequest) (*pb.LatestReportResponse, error) {
+	return m.resp, m.err
+}
diff --git a/core/services/relay/evm/mercury/wsrpc/client.go b/core/services/relay/evm/mercury/wsrpc/client.go
index c04c00074a2..5cdf1f44e96 100644
--- a/core/services/relay/evm/mercury/wsrpc/client.go
+++ b/core/services/relay/evm/mercury/wsrpc/client.go
@@ -19,6 +19,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/csakey"
+	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/wsrpc/cache"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/wsrpc/pb"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
@@ -63,6 +64,8 @@ var (
 type Client interface {
 	services.Service
 	pb.MercuryClient
+	ServerURL() string
+	RawClient() pb.MercuryClient
 }
 
 type Conn interface {
@@ -78,15 +81,18 @@ type client struct {
 	serverPubKey []byte
 	serverURL    string
 
-	logger logger.Logger
-	conn   Conn
-	client pb.MercuryClient
+	logger    logger.Logger
+	conn      Conn
+	rawClient pb.MercuryClient
 
 	consecutiveTimeoutCnt atomic.Int32
 	wg                    sync.WaitGroup
 	chStop                services.StopChan
 	chResetTransport      chan struct{}
 
+	cacheSet cache.CacheSet
+	cache    cache.Fetcher
+
 	timeoutCountMetric         prometheus.Counter
 	dialCountMetric            prometheus.Counter
 	dialSuccessCountMetric     prometheus.Counter
@@ -95,17 +101,18 @@ type client struct {
 }
 
 // Consumers of wsrpc package should not usually call NewClient directly, but instead use the Pool
-func NewClient(lggr logger.Logger, clientPrivKey csakey.KeyV2, serverPubKey []byte, serverURL string) Client {
-	return newClient(lggr, clientPrivKey, serverPubKey, serverURL)
+func NewClient(lggr logger.Logger, clientPrivKey csakey.KeyV2, serverPubKey []byte, serverURL string, cacheSet cache.CacheSet) Client {
+	return newClient(lggr, clientPrivKey, serverPubKey, serverURL, cacheSet)
 }
 
-func newClient(lggr logger.Logger, clientPrivKey csakey.KeyV2, serverPubKey []byte, serverURL string) *client {
+func newClient(lggr logger.Logger, clientPrivKey csakey.KeyV2, serverPubKey []byte, serverURL string, cacheSet cache.CacheSet) *client {
 	return &client{
 		csaKey:                     clientPrivKey,
 		serverPubKey:               serverPubKey,
 		serverURL:                  serverURL,
 		logger:                     lggr.Named("WSRPC").With("mercuryServerURL", serverURL),
 		chResetTransport:           make(chan struct{}, 1),
+		cacheSet:                   cacheSet,
 		chStop:                     make(services.StopChan),
 		timeoutCountMetric:         timeoutCount.WithLabelValues(serverURL),
 		dialCountMetric:            dialCount.WithLabelValues(serverURL),
@@ -115,9 +122,15 @@ func newClient(lggr logger.Logger, clientPrivKey csakey.KeyV2, serverPubKey []by
 	}
 }
 
-func (w *client) Start(_ context.Context) error {
-	return w.StartOnce("WSRPC Client", func() error {
-		if err := w.dial(context.Background()); err != nil {
+func (w *client) Start(ctx context.Context) error {
+	return w.StartOnce("WSRPC Client", func() (err error) {
+		// NOTE: This is not a mistake, dial is non-blocking so it should use a
+		// background context, not the Start context
+		if err = w.dial(context.Background()); err != nil {
+			return err
+		}
+		w.cache, err = w.cacheSet.Get(ctx, w)
+		if err != nil {
 			return err
 		}
 		w.wg.Add(1)
@@ -148,7 +161,7 @@ func (w *client) dial(ctx context.Context, opts ...wsrpc.DialOption) error {
 	w.dialSuccessCountMetric.Inc()
 	setLivenessMetric(true)
 	w.conn = conn
-	w.client = pb.NewMercuryClient(conn)
+	w.rawClient = pb.NewMercuryClient(conn)
 	return nil
 }
 
@@ -242,7 +255,7 @@ func (w *client) Transmit(ctx context.Context, req *pb.TransmitRequest) (resp *p
 	if err = w.waitForReady(ctx); err != nil {
 		return nil, errors.Wrap(err, "Transmit call failed")
 	}
-	resp, err = w.client.Transmit(ctx, req)
+	resp, err = w.rawClient.Transmit(ctx, req)
 	if errors.Is(err, context.DeadlineExceeded) {
 		w.timeoutCountMetric.Inc()
 		cnt := w.consecutiveTimeoutCnt.Add(1)
@@ -290,7 +303,11 @@ func (w *client) LatestReport(ctx context.Context, req *pb.LatestReportRequest)
 	if err = w.waitForReady(ctx); err != nil {
 		return nil, errors.Wrap(err, "LatestReport failed")
 	}
-	resp, err = w.client.LatestReport(ctx, req)
+	if w.cache == nil {
+		resp, err = w.rawClient.LatestReport(ctx, req)
+	} else {
+		resp, err = w.cache.LatestReport(ctx, req)
+	}
 	if err != nil {
 		lggr.Errorw("LatestReport failed", "err", err, "resp", resp)
 	} else if resp.Error != "" {
@@ -300,3 +317,11 @@ func (w *client) LatestReport(ctx context.Context, req *pb.LatestReportRequest)
 	}
 	return
 }
+
+func (w *client) ServerURL() string {
+	return w.serverURL
+}
+
+func (w *client) RawClient() pb.MercuryClient {
+	return w.rawClient
+}
diff --git a/core/services/relay/evm/mercury/wsrpc/client_test.go b/core/services/relay/evm/mercury/wsrpc/client_test.go
index 2410cbc52f1..d5d1b1b5ee5 100644
--- a/core/services/relay/evm/mercury/wsrpc/client_test.go
+++ b/core/services/relay/evm/mercury/wsrpc/client_test.go
@@ -3,6 +3,7 @@ package wsrpc
 import (
 	"context"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -10,15 +11,48 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/csakey"
+	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/wsrpc/cache"
 	mocks "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/wsrpc/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/wsrpc/pb"
 )
 
+var _ cache.CacheSet = &mockCacheSet{}
+
+type mockCacheSet struct{}
+
+func (m *mockCacheSet) Get(ctx context.Context, client cache.Client) (cache.Fetcher, error) {
+	return nil, nil
+}
+func (m *mockCacheSet) Start(context.Context) error    { return nil }
+func (m *mockCacheSet) Ready() error                   { return nil }
+func (m *mockCacheSet) HealthReport() map[string]error { return nil }
+func (m *mockCacheSet) Name() string                   { return "" }
+func (m *mockCacheSet) Close() error                   { return nil }
+
+var _ cache.Cache = &mockCache{}
+
+type mockCache struct{}
+
+func (m *mockCache) LatestReport(ctx context.Context, req *pb.LatestReportRequest) (resp *pb.LatestReportResponse, err error) {
+	return nil, nil
+}
+func (m *mockCache) Start(context.Context) error    { return nil }
+func (m *mockCache) Ready() error                   { return nil }
+func (m *mockCache) HealthReport() map[string]error { return nil }
+func (m *mockCache) Name() string                   { return "" }
+func (m *mockCache) Close() error                   { return nil }
+
+func newNoopCacheSet() cache.CacheSet {
+	return &mockCacheSet{}
+}
+
 func Test_Client_Transmit(t *testing.T) {
 	lggr := logger.TestLogger(t)
 	ctx := testutils.Context(t)
 	req := &pb.TransmitRequest{}
 
+	noopCacheSet := newNoopCacheSet()
+
 	t.Run("sends on reset channel after MaxConsecutiveTransmitFailures timed out transmits", func(t *testing.T) {
 		calls := 0
 		transmitErr := context.DeadlineExceeded
@@ -31,9 +65,9 @@ func Test_Client_Transmit(t *testing.T) {
 		conn := &mocks.MockConn{
 			Ready: true,
 		}
-		c := newClient(lggr, csakey.KeyV2{}, nil, "")
+		c := newClient(lggr, csakey.KeyV2{}, nil, "", noopCacheSet)
 		c.conn = conn
-		c.client = wsrpcClient
+		c.rawClient = wsrpcClient
 		require.NoError(t, c.StartOnce("Mock WSRPC Client", func() error { return nil }))
 		for i := 1; i < MaxConsecutiveTransmitFailures; i++ {
 			_, err := c.Transmit(ctx, req)
@@ -73,3 +107,109 @@ func Test_Client_Transmit(t *testing.T) {
 		})
 	})
 }
+
+func Test_Client_LatestReport(t *testing.T) {
+	lggr := logger.TestLogger(t)
+	ctx := testutils.Context(t)
+
+	t.Run("with nil cache", func(t *testing.T) {
+		req := &pb.LatestReportRequest{}
+		noopCacheSet := newNoopCacheSet()
+		resp := &pb.LatestReportResponse{}
+
+		wsrpcClient := &mocks.MockWSRPCClient{
+			LatestReportF: func(ctx context.Context, in *pb.LatestReportRequest) (*pb.LatestReportResponse, error) {
+				assert.Equal(t, req, in)
+				return resp, nil
+			},
+		}
+
+		conn := &mocks.MockConn{
+			Ready: true,
+		}
+		c := newClient(lggr, csakey.KeyV2{}, nil, "", noopCacheSet)
+		c.conn = conn
+		c.rawClient = wsrpcClient
+		require.NoError(t, c.StartOnce("Mock WSRPC Client", func() error { return nil }))
+
+		r, err := c.LatestReport(ctx, req)
+
+		require.NoError(t, err)
+		assert.Equal(t, resp, r)
+	})
+
+	t.Run("with cache disabled", func(t *testing.T) {
+		req := &pb.LatestReportRequest{}
+		cacheSet := cache.NewCacheSet(cache.Config{LatestReportTTL: 0, Logger: lggr})
+		resp := &pb.LatestReportResponse{}
+
+		var calls int
+		wsrpcClient := &mocks.MockWSRPCClient{
+			LatestReportF: func(ctx context.Context, in *pb.LatestReportRequest) (*pb.LatestReportResponse, error) {
+				calls++
+				assert.Equal(t, req, in)
+				return resp, nil
+			},
+		}
+
+		conn := &mocks.MockConn{
+			Ready: true,
+		}
+		c := newClient(lggr, csakey.KeyV2{}, nil, "", cacheSet)
+		c.conn = conn
+		c.rawClient = wsrpcClient
+
+		// simulate start without dialling
+		require.NoError(t, c.StartOnce("Mock WSRPC Client", func() error { return nil }))
+		var err error
+		require.NoError(t, cacheSet.Start(ctx))
+		c.cache, err = cacheSet.Get(ctx, c)
+		require.NoError(t, err)
+
+		for i := 0; i < 5; i++ {
+			r, err := c.LatestReport(ctx, req)
+
+			require.NoError(t, err)
+			assert.Equal(t, resp, r)
+		}
+		assert.Equal(t, 5, calls, "expected 5 calls to LatestReport but it was called %d times", calls)
+	})
+
+	t.Run("with caching", func(t *testing.T) {
+		req := &pb.LatestReportRequest{}
+		const neverExpireTTL = 1000 * time.Hour // some massive value that will never expire during a test
+		cacheSet := cache.NewCacheSet(cache.Config{LatestReportTTL: neverExpireTTL, Logger: lggr})
+		resp := &pb.LatestReportResponse{}
+
+		var calls int
+		wsrpcClient := &mocks.MockWSRPCClient{
+			LatestReportF: func(ctx context.Context, in *pb.LatestReportRequest) (*pb.LatestReportResponse, error) {
+				calls++
+				assert.Equal(t, req, in)
+				return resp, nil
+			},
+		}
+
+		conn := &mocks.MockConn{
+			Ready: true,
+		}
+		c := newClient(lggr, csakey.KeyV2{}, nil, "", cacheSet)
+		c.conn = conn
+		c.rawClient = wsrpcClient
+
+		// simulate start without dialling
+		require.NoError(t, c.StartOnce("Mock WSRPC Client", func() error { return nil }))
+		var err error
+		require.NoError(t, cacheSet.Start(ctx))
+		c.cache, err = cacheSet.Get(ctx, c)
+		require.NoError(t, err)
+
+		for i := 0; i < 5; i++ {
+			r, err := c.LatestReport(ctx, req)
+
+			require.NoError(t, err)
+			assert.Equal(t, resp, r)
+		}
+		assert.Equal(t, 1, calls, "expected only 1 call to LatestReport but it was called %d times", calls)
+	})
+}
diff --git a/core/services/relay/evm/mercury/wsrpc/mocks/mocks.go b/core/services/relay/evm/mercury/wsrpc/mocks/mocks.go
index d764143c5fc..c0caf0dee12 100644
--- a/core/services/relay/evm/mercury/wsrpc/mocks/mocks.go
+++ b/core/services/relay/evm/mercury/wsrpc/mocks/mocks.go
@@ -24,6 +24,9 @@ func (m MockWSRPCClient) Transmit(ctx context.Context, in *pb.TransmitRequest) (
 func (m MockWSRPCClient) LatestReport(ctx context.Context, in *pb.LatestReportRequest) (*pb.LatestReportResponse, error) {
 	return m.LatestReportF(ctx, in)
 }
+func (m MockWSRPCClient) ServerURL() string { return "mock server url" }
+
+func (m MockWSRPCClient) RawClient() pb.MercuryClient { return nil }
 
 type MockConn struct {
 	State  connectivity.State
diff --git a/core/services/relay/evm/mercury/wsrpc/pool.go b/core/services/relay/evm/mercury/wsrpc/pool.go
index 6630a78437e..6c525741ddc 100644
--- a/core/services/relay/evm/mercury/wsrpc/pool.go
+++ b/core/services/relay/evm/mercury/wsrpc/pool.go
@@ -10,6 +10,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/csakey"
+	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/wsrpc/cache"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -58,7 +59,7 @@ func (conn *connection) checkout(ctx context.Context) (cco *clientCheckout, err
 // not thread-safe, access must be serialized
 func (conn *connection) ensureStartedClient(ctx context.Context) error {
 	if len(conn.checkouts) == 0 {
-		conn.Client = conn.pool.newClient(conn.lggr, conn.clientPrivKey, conn.serverPubKey, conn.serverURL)
+		conn.Client = conn.pool.newClient(conn.lggr, conn.clientPrivKey, conn.serverPubKey, conn.serverURL, conn.pool.cacheSet)
 		return conn.Client.Start(ctx)
 	}
 	return nil
@@ -119,16 +120,19 @@ type pool struct {
 	connections map[string]map[credentials.StaticSizedPublicKey]*connection
 
 	// embedding newClient makes testing/mocking easier
-	newClient func(lggr logger.Logger, privKey csakey.KeyV2, serverPubKey []byte, serverURL string) Client
+	newClient func(lggr logger.Logger, privKey csakey.KeyV2, serverPubKey []byte, serverURL string, cacheSet cache.CacheSet) Client
 
 	mu sync.RWMutex
 
+	cacheSet cache.CacheSet
+
 	closed bool
 }
 
-func NewPool(lggr logger.Logger) Pool {
+func NewPool(lggr logger.Logger, cacheCfg cache.Config) Pool {
 	p := newPool(lggr.Named("Mercury.WSRPCPool"))
 	p.newClient = NewClient
+	p.cacheSet = cache.NewCacheSet(cacheCfg)
 	return p
 }
 
@@ -188,7 +192,9 @@ func (p *pool) newConnection(lggr logger.Logger, clientPrivKey csakey.KeyV2, ser
 	}
 }
 
-func (p *pool) Start(_ context.Context) error { return nil }
+func (p *pool) Start(ctx context.Context) error {
+	return p.cacheSet.Start(ctx)
+}
 
 func (p *pool) Close() (merr error) {
 	p.mu.Lock()
@@ -199,6 +205,7 @@ func (p *pool) Close() (merr error) {
 			merr = errors.Join(merr, conn.forceCloseAll())
 		}
 	}
+	merr = errors.Join(merr, p.cacheSet.Close())
 	return
 }
 
diff --git a/core/services/relay/evm/mercury/wsrpc/pool_test.go b/core/services/relay/evm/mercury/wsrpc/pool_test.go
index 980b9f4d742..3d418d39d87 100644
--- a/core/services/relay/evm/mercury/wsrpc/pool_test.go
+++ b/core/services/relay/evm/mercury/wsrpc/pool_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/csakey"
+	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/wsrpc/cache"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/wsrpc/pb"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
@@ -19,8 +20,9 @@ import (
 var _ Client = &mockClient{}
 
 type mockClient struct {
-	started bool
-	closed  bool
+	started   bool
+	closed    bool
+	rawClient pb.MercuryClient
 }
 
 func (c *mockClient) Transmit(ctx context.Context, in *pb.TransmitRequest) (out *pb.TransmitResponse, err error) {
@@ -40,6 +42,8 @@ func (c *mockClient) Close() error {
 func (c *mockClient) Name() string                   { return "mock client" }
 func (c *mockClient) Ready() error                   { return nil }
 func (c *mockClient) HealthReport() map[string]error { return nil }
+func (c *mockClient) ServerURL() string              { return "mock client url" }
+func (c *mockClient) RawClient() pb.MercuryClient    { return c.rawClient }
 
 func newMockClient(lggr logger.Logger) *mockClient {
 	return &mockClient{}
@@ -52,6 +56,7 @@ func Test_Pool(t *testing.T) {
 
 	t.Run("Checkout", func(t *testing.T) {
 		p := newPool(lggr)
+		p.cacheSet = &mockCacheSet{}
 
 		t.Run("checks out one started client", func(t *testing.T) {
 			clientPrivKey := csakey.MustNewV2XXXTestingOnly(big.NewInt(rand.Int63()))
@@ -59,7 +64,7 @@ func Test_Pool(t *testing.T) {
 			serverURL := "example.com:443/ws"
 
 			client := newMockClient(lggr)
-			p.newClient = func(lggr logger.Logger, cprivk csakey.KeyV2, spubk []byte, surl string) Client {
+			p.newClient = func(lggr logger.Logger, cprivk csakey.KeyV2, spubk []byte, surl string, cs cache.CacheSet) Client {
 				assert.Equal(t, clientPrivKey, cprivk)
 				assert.Equal(t, serverPubKey, spubk)
 				assert.Equal(t, serverURL, surl)
@@ -105,7 +110,7 @@ func Test_Pool(t *testing.T) {
 				"example.invalid:8000/ws",
 			}
 
-			p.newClient = func(lggr logger.Logger, cprivk csakey.KeyV2, spubk []byte, surl string) Client {
+			p.newClient = func(lggr logger.Logger, cprivk csakey.KeyV2, spubk []byte, surl string, cs cache.CacheSet) Client {
 				return newMockClient(lggr)
 			}
 
@@ -199,6 +204,7 @@ func Test_Pool(t *testing.T) {
 	})
 
 	p := newPool(lggr)
+	p.cacheSet = &mockCacheSet{}
 
 	t.Run("Name", func(t *testing.T) {
 		assert.Equal(t, "PoolTestLogger", p.Name())
@@ -220,7 +226,7 @@ func Test_Pool(t *testing.T) {
 		}
 
 		var clients []*mockClient
-		p.newClient = func(lggr logger.Logger, cprivk csakey.KeyV2, spubk []byte, surl string) Client {
+		p.newClient = func(lggr logger.Logger, cprivk csakey.KeyV2, spubk []byte, surl string, cs cache.CacheSet) Client {
 			c := newMockClient(lggr)
 			clients = append(clients, c)
 			return c
diff --git a/core/utils/hash.go b/core/utils/hash.go
index bcae823770e..b0a32454e2f 100644
--- a/core/utils/hash.go
+++ b/core/utils/hash.go
@@ -8,12 +8,32 @@ import (
 	"github.com/pkg/errors"
 )
 
+const HashLength = 32
+
 // Hash is a simplified version of go-ethereum's common.Hash to avoid
 // go-ethereum dependency
 // It represents a 32 byte fixed size array that marshals/unmarshals assuming a
 // 0x prefix
 type Hash [32]byte
 
+// BytesToHash sets b to hash.
+// If b is larger than len(h), b will be cropped from the left.
+func BytesToHash(b []byte) Hash {
+	var h Hash
+	h.SetBytes(b)
+	return h
+}
+
+// SetBytes sets the hash to the value of b.
+// If b is larger than len(h), b will be cropped from the left.
+func (h *Hash) SetBytes(b []byte) {
+	if len(b) > len(h) {
+		b = b[len(b)-HashLength:]
+	}
+
+	copy(h[HashLength-len(b):], b)
+}
+
 // Hex converts a hash to a hex string.
 func (h Hash) Hex() string { return fmt.Sprintf("0x%s", hex.EncodeToString(h[:])) }
 
diff --git a/core/web/resolver/testdata/config-empty-effective.toml b/core/web/resolver/testdata/config-empty-effective.toml
index 8f3135b34e4..2531e7c281d 100644
--- a/core/web/resolver/testdata/config-empty-effective.toml
+++ b/core/web/resolver/testdata/config-empty-effective.toml
@@ -234,3 +234,9 @@ NodeID = ''
 SamplingRatio = 0.0
 Mode = 'tls'
 TLSCertPath = ''
+
+[Mercury]
+[Mercury.Cache]
+LatestReportTTL = '1s'
+MaxStaleAge = '1h0m0s'
+LatestReportDeadline = '5s'
diff --git a/core/web/resolver/testdata/config-full.toml b/core/web/resolver/testdata/config-full.toml
index 7e9872e9554..cd0bce3cc73 100644
--- a/core/web/resolver/testdata/config-full.toml
+++ b/core/web/resolver/testdata/config-full.toml
@@ -245,6 +245,12 @@ TLSCertPath = '/path/to/cert.pem'
 env = 'dev'
 test = 'load'
 
+[Mercury]
+[Mercury.Cache]
+LatestReportTTL = '1m40s'
+MaxStaleAge = '1m41s'
+LatestReportDeadline = '1m42s'
+
 [[EVM]]
 ChainID = '1'
 Enabled = false
diff --git a/core/web/resolver/testdata/config-multi-chain-effective.toml b/core/web/resolver/testdata/config-multi-chain-effective.toml
index 6a60dfd419a..371cc50a170 100644
--- a/core/web/resolver/testdata/config-multi-chain-effective.toml
+++ b/core/web/resolver/testdata/config-multi-chain-effective.toml
@@ -235,6 +235,12 @@ SamplingRatio = 0.0
 Mode = 'tls'
 TLSCertPath = ''
 
+[Mercury]
+[Mercury.Cache]
+LatestReportTTL = '1s'
+MaxStaleAge = '1h0m0s'
+LatestReportDeadline = '5s'
+
 [[EVM]]
 ChainID = '1'
 AutoCreateKey = true
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 265222c8bec..d9a785ff518 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -13,11 +13,42 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Added distributed tracing in the OpenTelemetry trace format to the node, currently focused at the LOOPP Plugin development effort. This includes a new set of `Tracing` TOML configurations. The default for collecting traces is off - you must explicitly enable traces and setup a valid OpenTelemetry collector. Refer to `.github/tracing/README.md` for more details.
 - Added a new, optional WebServer authentication option that supports LDAP as a user identity provider. This enables user login access and user roles to be managed and provisioned via a centralized remote server that supports the LDAP protocol, which can be helpful when running multiple nodes. See the documentation for more information and config setup instructions. There is a new `[WebServer].AuthenticationMethod` config option, when set to `ldap` requires the new `[WebServer.LDAP]` config section to be defined, see the reference `docs/core.toml`.
-- New prom metrics for mercury:
+- New prom metrics for mercury transmit queue:
     `mercury_transmit_queue_delete_error_count`
     `mercury_transmit_queue_insert_error_count`
     `mercury_transmit_queue_push_error_count`
     Nops should consider alerting on these.
+- Mercury now implements a local cache for fetching prices for fees, which ought to reduce latency and load on the mercury server, as well as increasing performance. It is enabled by default and can be configured with the following new config variables:
+```
+[Mercury]
+
+# Mercury.Cache controls settings for the price retrieval cache querying a mercury server
+[Mercury.Cache]
+# LatestReportTTL controls how "stale" we will allow a price to be e.g. if
+# set to 1s, a new price will always be fetched if the last result was
+# from 1 second ago or older.
+# 
+# Another way of looking at it is such: the cache will _never_ return a
+# price that was queried from now-LatestReportTTL or before.
+# 
+# Setting to zero disables caching entirely.
+LatestReportTTL = "1s" # Default
+# MaxStaleAge is that maximum amount of time that a value can be stale
+# before it is deleted from the cache (a form of garbage collection).
+# 
+# This should generally be set to something much larger than
+# LatestReportTTL. Setting to zero disables garbage collection.
+MaxStaleAge = "1h" # Default
+# LatestReportDeadline controls how long to wait for a response from the
+# mercury server before retrying. Setting this to zero will wait indefinitely.
+LatestReportDeadline = "5s" # Default
+```
+- New prom metrics for the mercury cache:
+    `mercury_cache_fetch_failure_count`
+    `mercury_cache_hit_count`
+    `mercury_cache_wait_count`
+    `mercury_cache_miss_count`
+
 
 
 ### Changed
diff --git a/docs/CONFIG.md b/docs/CONFIG.md
index 63c20bdf4a5..61d079fa4a6 100644
--- a/docs/CONFIG.md
+++ b/docs/CONFIG.md
@@ -1652,6 +1652,51 @@ env = 'test' # Example
 ```
 env is an example user specified key-value pair
 
+## Mercury
+```toml
+[Mercury]
+```
+
+
+## Mercury.Cache
+```toml
+[Mercury.Cache]
+LatestReportTTL = "1s" # Default
+MaxStaleAge = "1h" # Default
+LatestReportDeadline = "5s" # Default
+```
+Mercury.Cache controls settings for the price retrieval cache querying a mercury server
+
+### LatestReportTTL
+```toml
+LatestReportTTL = "1s" # Default
+```
+LatestReportTTL controls how "stale" we will allow a price to be e.g. if
+set to 1s, a new price will always be fetched if the last result was
+from 1 second ago or older.
+
+Another way of looking at it is such: the cache will _never_ return a
+price that was queried from now-LatestReportTTL or before.
+
+Setting to zero disables caching entirely.
+
+### MaxStaleAge
+```toml
+MaxStaleAge = "1h" # Default
+```
+MaxStaleAge is that maximum amount of time that a value can be stale
+before it is deleted from the cache (a form of garbage collection).
+
+This should generally be set to something much larger than
+LatestReportTTL. Setting to zero disables garbage collection.
+
+### LatestReportDeadline
+```toml
+LatestReportDeadline = "5s" # Default
+```
+LatestReportDeadline controls how long to wait for a response from the
+mercury server before retrying. Setting this to zero will wait indefinitely.
+
 ## EVM
 EVM defaults depend on ChainID:
 
diff --git a/testdata/scripts/node/validate/default.txtar b/testdata/scripts/node/validate/default.txtar
index 267a760f08c..0b841f694be 100644
--- a/testdata/scripts/node/validate/default.txtar
+++ b/testdata/scripts/node/validate/default.txtar
@@ -247,6 +247,12 @@ SamplingRatio = 0.0
 Mode = 'tls'
 TLSCertPath = ''
 
+[Mercury]
+[Mercury.Cache]
+LatestReportTTL = '1s'
+MaxStaleAge = '1h0m0s'
+LatestReportDeadline = '5s'
+
 Invalid configuration: invalid secrets: 2 errors:
 	- Database.URL: empty: must be provided and non-empty
 	- Password.Keystore: empty: must be provided and non-empty
diff --git a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar
index e6281e8d221..45b08f0e52f 100644
--- a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar
+++ b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar
@@ -291,6 +291,12 @@ SamplingRatio = 0.0
 Mode = 'tls'
 TLSCertPath = ''
 
+[Mercury]
+[Mercury.Cache]
+LatestReportTTL = '1s'
+MaxStaleAge = '1h0m0s'
+LatestReportDeadline = '5s'
+
 [[EVM]]
 ChainID = '1'
 AutoCreateKey = true
diff --git a/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar b/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar
index 65d832aa82e..2869af3e2de 100644
--- a/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar
+++ b/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar
@@ -291,6 +291,12 @@ SamplingRatio = 0.0
 Mode = 'tls'
 TLSCertPath = ''
 
+[Mercury]
+[Mercury.Cache]
+LatestReportTTL = '1s'
+MaxStaleAge = '1h0m0s'
+LatestReportDeadline = '5s'
+
 [[EVM]]
 ChainID = '1'
 AutoCreateKey = true
diff --git a/testdata/scripts/node/validate/disk-based-logging.txtar b/testdata/scripts/node/validate/disk-based-logging.txtar
index 6b9e3d56ce6..fb705819fc2 100644
--- a/testdata/scripts/node/validate/disk-based-logging.txtar
+++ b/testdata/scripts/node/validate/disk-based-logging.txtar
@@ -291,6 +291,12 @@ SamplingRatio = 0.0
 Mode = 'tls'
 TLSCertPath = ''
 
+[Mercury]
+[Mercury.Cache]
+LatestReportTTL = '1s'
+MaxStaleAge = '1h0m0s'
+LatestReportDeadline = '5s'
+
 [[EVM]]
 ChainID = '1'
 AutoCreateKey = true
diff --git a/testdata/scripts/node/validate/invalid.txtar b/testdata/scripts/node/validate/invalid.txtar
index aa2036413c7..7b82d3323b1 100644
--- a/testdata/scripts/node/validate/invalid.txtar
+++ b/testdata/scripts/node/validate/invalid.txtar
@@ -281,6 +281,12 @@ SamplingRatio = 0.0
 Mode = 'tls'
 TLSCertPath = ''
 
+[Mercury]
+[Mercury.Cache]
+LatestReportTTL = '1s'
+MaxStaleAge = '1h0m0s'
+LatestReportDeadline = '5s'
+
 [[EVM]]
 ChainID = '1'
 AutoCreateKey = true
diff --git a/testdata/scripts/node/validate/valid.txtar b/testdata/scripts/node/validate/valid.txtar
index 4ceb9d5df35..91fe0952dd8 100644
--- a/testdata/scripts/node/validate/valid.txtar
+++ b/testdata/scripts/node/validate/valid.txtar
@@ -288,6 +288,12 @@ SamplingRatio = 0.0
 Mode = 'tls'
 TLSCertPath = ''
 
+[Mercury]
+[Mercury.Cache]
+LatestReportTTL = '1s'
+MaxStaleAge = '1h0m0s'
+LatestReportDeadline = '5s'
+
 [[EVM]]
 ChainID = '1'
 AutoCreateKey = true
diff --git a/testdata/scripts/node/validate/warnings.txtar b/testdata/scripts/node/validate/warnings.txtar
index e4ff2aa35ea..a10d6df537c 100644
--- a/testdata/scripts/node/validate/warnings.txtar
+++ b/testdata/scripts/node/validate/warnings.txtar
@@ -296,6 +296,12 @@ SamplingRatio = 0.0
 Mode = 'unencrypted'
 TLSCertPath = 'something'
 
+[Mercury]
+[Mercury.Cache]
+LatestReportTTL = '1s'
+MaxStaleAge = '1h0m0s'
+LatestReportDeadline = '5s'
+
 # Configuration warning:
 3 errors:
 	- P2P.V1: is deprecated and will be removed in a future version

From 0001b8114c0c350bf9a6e1562ab28e010b447bcb Mon Sep 17 00:00:00 2001
From: chainchad <96362174+chainchad@users.noreply.github.com>
Date: Tue, 28 Nov 2023 14:29:47 -0500
Subject: [PATCH 022/130] Make job names less dynamic for required checks
 (#11403)

---
 .github/workflows/solidity-foundry.yml | 2 +-
 .github/workflows/solidity.yml         | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/solidity-foundry.yml b/.github/workflows/solidity-foundry.yml
index 90d18ecac2e..7f6fa4f482e 100644
--- a/.github/workflows/solidity-foundry.yml
+++ b/.github/workflows/solidity-foundry.yml
@@ -34,7 +34,7 @@ jobs:
       matrix:
         product: [vrf, automation, llo-feeds, functions, shared]
     needs: [changes]
-    name: Foundry Tests ${{ matrix.product }} ${{ fromJSON('["(skipped)", ""]')[needs.changes.outputs.changes == 'true'] }}
+    name: Foundry Tests ${{ matrix.product }}
     # See https://github.com/foundry-rs/foundry/issues/3827
     runs-on: ubuntu-22.04
 
diff --git a/.github/workflows/solidity.yml b/.github/workflows/solidity.yml
index 5699657fa5d..90429a8c526 100644
--- a/.github/workflows/solidity.yml
+++ b/.github/workflows/solidity.yml
@@ -32,7 +32,6 @@ jobs:
               - 'contracts/src/v0.6/**/*'
               - 'contracts/src/v0.7/**/*'
 
-
       - name: Fail if read-only files have changed
         if: ${{ steps.changes.outputs.old_sol == 'true' }}
         run: |
@@ -42,8 +41,6 @@ jobs:
           done
           exit 1
 
-
-
   prepublish-test:
     needs: [changes]
     if: needs.changes.outputs.changes == 'true'
@@ -117,7 +114,7 @@ jobs:
       run:
         working-directory: contracts
     needs: [changes]
-    name: Lint ${{ fromJSON('["(skipped)", ""]')[needs.changes.outputs.changes == 'true'] }}
+    name: Solidity Lint
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repo

From d5de32c0cd5b7477293bbc5d3e075dc79221e60a Mon Sep 17 00:00:00 2001
From: Jordan Krage <jmank88@gmail.com>
Date: Tue, 28 Nov 2023 14:39:28 -0600
Subject: [PATCH 023/130] core/logger: sanitize escape chars in console logs
 (#11402)

---
 .../internal/colortest/prettyconsole_test.go  |  6 ++++
 core/logger/prettyconsole.go                  | 29 +++++++++++++++++--
 docs/CHANGELOG.md                             |  1 +
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/core/logger/internal/colortest/prettyconsole_test.go b/core/logger/internal/colortest/prettyconsole_test.go
index fd2ea3f0b17..125f5a2ea50 100644
--- a/core/logger/internal/colortest/prettyconsole_test.go
+++ b/core/logger/internal/colortest/prettyconsole_test.go
@@ -61,6 +61,12 @@ func TestPrettyConsole_Write(t *testing.T) {
 			"2018-04-12T12:55:28Z \x1b[91m[FATAL] \x1b[0mtop level                                          \x1b[34m\x1b[0m                        \n",
 			false,
 		},
+		{
+			"control",
+			`{"ts":1523537728, "level":"fatal", "msg":"\u0008\t\n\r\u000b\u000c\ufffd\ufffd", "hash":"nuances"}`,
+			"2018-04-12T12:55:28Z \x1b[91m[FATAL] \x1b[0m\\b\t\n\r\\v\\f��                                        \x1b[34m\x1b[0m                        \n",
+			false,
+		},
 		{"broken", `{"broken":}`, `{}`, true},
 	}
 
diff --git a/core/logger/prettyconsole.go b/core/logger/prettyconsole.go
index 69427f74715..5150f1f3d69 100644
--- a/core/logger/prettyconsole.go
+++ b/core/logger/prettyconsole.go
@@ -6,8 +6,10 @@ import (
 	"net/url"
 	"os"
 	"sort"
+	"strconv"
 	"strings"
 	"time"
+	"unicode"
 
 	"github.com/fatih/color"
 	"github.com/tidwall/gjson"
@@ -72,7 +74,7 @@ func generateHeadline(js gjson.Result) string {
 		tsStr,
 		" ",
 		coloredLevel(js.Get("level")),
-		fmt.Sprintf("%-50s", js.Get("msg")),
+		fmt.Sprintf("%-50s", sanitized(js.Get("msg").String())),
 		" ",
 		fmt.Sprintf("%-32s", blue(js.Get("caller"))),
 	}
@@ -105,7 +107,7 @@ func generateDetails(js gjson.Result) string {
 	var details strings.Builder
 
 	for _, v := range keys {
-		details.WriteString(fmt.Sprintf("%s=%v ", green(v), data[v]))
+		details.WriteString(fmt.Sprintf("%s=%v ", green(sanitized(v)), sanitized(data[v].String())))
 	}
 
 	return details.String()
@@ -129,3 +131,26 @@ func prettyConsoleSink(s zap.Sink) func(*url.URL) (zap.Sink, error) {
 		return PrettyConsole{s}, nil
 	}
 }
+
+type sanitized string
+
+// String replaces control characters with Go escape sequences, except for newlines and tabs.
+// See strconv.QuoteRune.
+func (s sanitized) String() string {
+	var out string
+	for _, r := range s {
+		switch r {
+		case '\n', '\r', '\t':
+			// allowed
+		default:
+			// escape others
+			if unicode.IsControl(r) {
+				q := strconv.QuoteRune(r)
+				out += q[1 : len(q)-1] // trim quotes
+				continue
+			}
+		}
+		out += string(r)
+	}
+	return out
+}
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index d9a785ff518..64f9472319f 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -54,6 +54,7 @@ LatestReportDeadline = "5s" # Default
 ### Changed
 
 - `L2Suggested` mode is now called `SuggestedPrice`
+- Console logs will now escape (non-whitespace) control characters
 
 ### Removed
 

From deb72f61937c21df5224c6e3f4af6dc81c88fc2b Mon Sep 17 00:00:00 2001
From: Jordan Krage <jmank88@gmail.com>
Date: Tue, 28 Nov 2023 15:35:25 -0600
Subject: [PATCH 024/130] core/config: add EVM.OCR DeltaCOverride and
 DeltaCJitterOverride (#11250)

* core/config: add EVM.OCR OverrideDeltaC and OverrideDeltaCJitter

* update changelog
---
 core/chains/evm/config/chain_scoped_ocr.go    |   8 ++
 core/chains/evm/config/config.go              |   2 +
 core/chains/evm/config/toml/config.go         |   8 ++
 .../evm/config/toml/defaults/fallback.toml    |   2 +
 core/config/docs/chains-evm.toml              |   8 ++
 core/services/chainlink/config_test.go        |   4 +
 .../chainlink/testdata/config-full.toml       |   2 +
 .../config-multi-chain-effective.toml         |   6 +
 core/services/ocr/config_overrider.go         |  12 +-
 core/services/ocr/config_overrider_test.go    |  21 +++-
 core/services/ocr/delegate.go                 |   2 +-
 core/web/resolver/testdata/config-full.toml   |   2 +
 .../config-multi-chain-effective.toml         |   6 +
 docs/CHANGELOG.md                             |  50 ++++----
 docs/CONFIG.md                                | 112 ++++++++++++++++++
 .../disk-based-logging-disabled.txtar         |   2 +
 .../validate/disk-based-logging-no-dir.txtar  |   2 +
 .../node/validate/disk-based-logging.txtar    |   2 +
 testdata/scripts/node/validate/invalid.txtar  |   2 +
 testdata/scripts/node/validate/valid.txtar    |   2 +
 20 files changed, 221 insertions(+), 34 deletions(-)

diff --git a/core/chains/evm/config/chain_scoped_ocr.go b/core/chains/evm/config/chain_scoped_ocr.go
index 0cdec34e388..f8e171cf632 100644
--- a/core/chains/evm/config/chain_scoped_ocr.go
+++ b/core/chains/evm/config/chain_scoped_ocr.go
@@ -25,3 +25,11 @@ func (o *ocrConfig) ObservationGracePeriod() time.Duration {
 func (o *ocrConfig) DatabaseTimeout() time.Duration {
 	return o.c.DatabaseTimeout.Duration()
 }
+
+func (o *ocrConfig) DeltaCOverride() time.Duration {
+	return o.c.DeltaCOverride.Duration()
+}
+
+func (o *ocrConfig) DeltaCJitterOverride() time.Duration {
+	return o.c.DeltaCJitterOverride.Duration()
+}
diff --git a/core/chains/evm/config/config.go b/core/chains/evm/config/config.go
index 2dd2d4704c3..33e2c85eee5 100644
--- a/core/chains/evm/config/config.go
+++ b/core/chains/evm/config/config.go
@@ -50,6 +50,8 @@ type OCR interface {
 	ContractTransmitterTransmitTimeout() time.Duration
 	ObservationGracePeriod() time.Duration
 	DatabaseTimeout() time.Duration
+	DeltaCOverride() time.Duration
+	DeltaCJitterOverride() time.Duration
 }
 
 type OCR2 interface {
diff --git a/core/chains/evm/config/toml/config.go b/core/chains/evm/config/toml/config.go
index 26587cd3b0e..9e51d5be790 100644
--- a/core/chains/evm/config/toml/config.go
+++ b/core/chains/evm/config/toml/config.go
@@ -715,6 +715,8 @@ type OCR struct {
 	ContractConfirmations              *uint16
 	ContractTransmitterTransmitTimeout *models.Duration
 	DatabaseTimeout                    *models.Duration
+	DeltaCOverride                     *models.Duration
+	DeltaCJitterOverride               *models.Duration
 	ObservationGracePeriod             *models.Duration
 }
 
@@ -728,6 +730,12 @@ func (o *OCR) setFrom(f *OCR) {
 	if v := f.DatabaseTimeout; v != nil {
 		o.DatabaseTimeout = v
 	}
+	if v := f.DeltaCOverride; v != nil {
+		o.DeltaCOverride = v
+	}
+	if v := f.DeltaCJitterOverride; v != nil {
+		o.DeltaCJitterOverride = v
+	}
 	if v := f.ObservationGracePeriod; v != nil {
 		o.ObservationGracePeriod = v
 	}
diff --git a/core/chains/evm/config/toml/defaults/fallback.toml b/core/chains/evm/config/toml/defaults/fallback.toml
index a75cfa0bf3b..b19423fd13a 100644
--- a/core/chains/evm/config/toml/defaults/fallback.toml
+++ b/core/chains/evm/config/toml/defaults/fallback.toml
@@ -64,6 +64,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h'
+DeltaCJitterOverride = '1h'
 ObservationGracePeriod = '1s'
 
 [OCR2.Automation]
diff --git a/core/config/docs/chains-evm.toml b/core/config/docs/chains-evm.toml
index 381ab794d60..711889b3fa5 100644
--- a/core/config/docs/chains-evm.toml
+++ b/core/config/docs/chains-evm.toml
@@ -335,6 +335,14 @@ ContractConfirmations = 4 # Default
 ContractTransmitterTransmitTimeout = '10s' # Default
 # DatabaseTimeout sets `OCR.DatabaseTimeout` for this EVM chain.
 DatabaseTimeout = '10s' # Default
+# **ADVANCED**
+# DeltaCOverride (and `DeltaCJitterOverride`) determine the config override DeltaC.
+# DeltaC is the maximum age of the latest report in the contract. If the maximum age is exceeded, a new report will be
+# created by the report generation protocol.
+DeltaCOverride = "168h" # Default
+# **ADVANCED**
+# DeltaCJitterOverride is the range for jitter to add to `DeltaCOverride`.
+DeltaCJitterOverride = "1h" # Default
 # ObservationGracePeriod sets `OCR.ObservationGracePeriod` for this EVM chain.
 ObservationGracePeriod = '1s' # Default
 
diff --git a/core/services/chainlink/config_test.go b/core/services/chainlink/config_test.go
index d777e34abf7..2966a896902 100644
--- a/core/services/chainlink/config_test.go
+++ b/core/services/chainlink/config_test.go
@@ -574,6 +574,8 @@ func TestConfig_Marshal(t *testing.T) {
 					ContractConfirmations:              ptr[uint16](11),
 					ContractTransmitterTransmitTimeout: &minute,
 					DatabaseTimeout:                    &second,
+					DeltaCOverride:                     models.MustNewDuration(time.Hour),
+					DeltaCJitterOverride:               models.MustNewDuration(time.Second),
 					ObservationGracePeriod:             &second,
 				},
 				OCR2: evmcfg.OCR2{
@@ -1019,6 +1021,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 11
 ContractTransmitterTransmitTimeout = '1m0s'
 DatabaseTimeout = '1s'
+DeltaCOverride = '1h0m0s'
+DeltaCJitterOverride = '1s'
 ObservationGracePeriod = '1s'
 
 [EVM.OCR2]
diff --git a/core/services/chainlink/testdata/config-full.toml b/core/services/chainlink/testdata/config-full.toml
index 8036165d6e8..46d9dc2c239 100644
--- a/core/services/chainlink/testdata/config-full.toml
+++ b/core/services/chainlink/testdata/config-full.toml
@@ -340,6 +340,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 11
 ContractTransmitterTransmitTimeout = '1m0s'
 DatabaseTimeout = '1s'
+DeltaCOverride = '1h0m0s'
+DeltaCJitterOverride = '1s'
 ObservationGracePeriod = '1s'
 
 [EVM.OCR2]
diff --git a/core/services/chainlink/testdata/config-multi-chain-effective.toml b/core/services/chainlink/testdata/config-multi-chain-effective.toml
index 371cc50a170..74d83035cd5 100644
--- a/core/services/chainlink/testdata/config-multi-chain-effective.toml
+++ b/core/services/chainlink/testdata/config-multi-chain-effective.toml
@@ -311,6 +311,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [EVM.OCR2]
@@ -396,6 +398,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [EVM.OCR2]
@@ -475,6 +479,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [EVM.OCR2]
diff --git a/core/services/ocr/config_overrider.go b/core/services/ocr/config_overrider.go
index b1acf9a7d73..ac87d0e3924 100644
--- a/core/services/ocr/config_overrider.go
+++ b/core/services/ocr/config_overrider.go
@@ -13,6 +13,7 @@ import (
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting/types"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
@@ -40,8 +41,14 @@ type ConfigOverriderImpl struct {
 // InitialHibernationStatus - hibernation state set until the first successful update from the chain
 const InitialHibernationStatus = false
 
+type DeltaCConfig interface {
+	DeltaCOverride() time.Duration
+	DeltaCJitterOverride() time.Duration
+}
+
 func NewConfigOverriderImpl(
 	logger logger.Logger,
+	cfg DeltaCConfig,
 	contractAddress ethkey.EIP55Address,
 	flags *ContractFlags,
 	pollTicker utils.TickerBase,
@@ -53,8 +60,9 @@ func NewConfigOverriderImpl(
 	}
 
 	addressBig := contractAddress.Big()
-	addressSeconds := addressBig.Mod(addressBig, big.NewInt(3600)).Uint64()
-	deltaC := 23*time.Hour + time.Duration(addressSeconds)*time.Second
+	jitterSeconds := int64(cfg.DeltaCJitterOverride() / time.Second)
+	addressSeconds := addressBig.Mod(addressBig, big.NewInt(jitterSeconds)).Uint64()
+	deltaC := cfg.DeltaCOverride() + time.Duration(addressSeconds)*time.Second
 
 	ctx, cancel := context.WithCancel(context.Background())
 	co := ConfigOverriderImpl{
diff --git a/core/services/ocr/config_overrider_test.go b/core/services/ocr/config_overrider_test.go
index bb680189b10..245d6348765 100644
--- a/core/services/ocr/config_overrider_test.go
+++ b/core/services/ocr/config_overrider_test.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/onsi/gomega"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
@@ -27,6 +28,12 @@ type configOverriderUni struct {
 	contractAddress ethkey.EIP55Address
 }
 
+type deltaCConfig struct{}
+
+func (d deltaCConfig) DeltaCOverride() time.Duration { return time.Hour * 24 * 7 }
+
+func (d deltaCConfig) DeltaCJitterOverride() time.Duration { return time.Hour }
+
 func newConfigOverriderUni(t *testing.T, pollITicker utils.TickerBase, flagsContract *mocks.Flags) (uni configOverriderUni) {
 	var testLogger = logger.TestLogger(t)
 	contractAddress := cltest.NewEIP55Address()
@@ -35,6 +42,7 @@ func newConfigOverriderUni(t *testing.T, pollITicker utils.TickerBase, flagsCont
 	var err error
 	uni.overrider, err = ocr.NewConfigOverriderImpl(
 		testLogger,
+		deltaCConfig{},
 		contractAddress,
 		flags,
 		pollITicker,
@@ -141,6 +149,7 @@ func Test_OCRConfigOverrider(t *testing.T) {
 		flags := &ocr.ContractFlags{FlagsInterface: nil}
 		_, err := ocr.NewConfigOverriderImpl(
 			testLogger,
+			deltaCConfig{},
 			contractAddress,
 			flags,
 			nil,
@@ -160,18 +169,18 @@ func Test_OCRConfigOverrider(t *testing.T) {
 		address2, err := ethkey.NewEIP55Address(common.BigToAddress(big.NewInt(1234567890)).Hex())
 		require.NoError(t, err)
 
-		overrider1a, err := ocr.NewConfigOverriderImpl(testLogger, address1, flags, nil)
+		overrider1a, err := ocr.NewConfigOverriderImpl(testLogger, deltaCConfig{}, address1, flags, nil)
 		require.NoError(t, err)
 
-		overrider1b, err := ocr.NewConfigOverriderImpl(testLogger, address1, flags, nil)
+		overrider1b, err := ocr.NewConfigOverriderImpl(testLogger, deltaCConfig{}, address1, flags, nil)
 		require.NoError(t, err)
 
-		overrider2, err := ocr.NewConfigOverriderImpl(testLogger, address2, flags, nil)
+		overrider2, err := ocr.NewConfigOverriderImpl(testLogger, deltaCConfig{}, address2, flags, nil)
 		require.NoError(t, err)
 
-		require.Equal(t, overrider1a.DeltaCFromAddress, time.Duration(85600000000000))
-		require.Equal(t, overrider1b.DeltaCFromAddress, time.Duration(85600000000000))
-		require.Equal(t, overrider2.DeltaCFromAddress, time.Duration(84690000000000))
+		assert.Equal(t, cltest.MustParseDuration(t, "168h46m40s"), overrider1a.DeltaCFromAddress)
+		assert.Equal(t, cltest.MustParseDuration(t, "168h46m40s"), overrider1b.DeltaCFromAddress)
+		assert.Equal(t, cltest.MustParseDuration(t, "168h31m30s"), overrider2.DeltaCFromAddress)
 	})
 }
 
diff --git a/core/services/ocr/delegate.go b/core/services/ocr/delegate.go
index aa058d64979..ac78002d450 100644
--- a/core/services/ocr/delegate.go
+++ b/core/services/ocr/delegate.go
@@ -358,7 +358,7 @@ func (d *Delegate) maybeCreateConfigOverrider(logger logger.Logger, chain legacy
 		}
 
 		ticker := utils.NewPausableTicker(ConfigOverriderPollInterval)
-		return NewConfigOverriderImpl(logger, contractAddress, flags, &ticker)
+		return NewConfigOverriderImpl(logger, chain.Config().EVM().OCR(), contractAddress, flags, &ticker)
 	}
 	return nil, nil
 }
diff --git a/core/web/resolver/testdata/config-full.toml b/core/web/resolver/testdata/config-full.toml
index cd0bce3cc73..e98f8602a0c 100644
--- a/core/web/resolver/testdata/config-full.toml
+++ b/core/web/resolver/testdata/config-full.toml
@@ -339,6 +339,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 11
 ContractTransmitterTransmitTimeout = '1m0s'
 DatabaseTimeout = '1s'
+DeltaCOverride = '1h0m0s'
+DeltaCJitterOverride = '1s'
 ObservationGracePeriod = '1s'
 
 [EVM.OCR2]
diff --git a/core/web/resolver/testdata/config-multi-chain-effective.toml b/core/web/resolver/testdata/config-multi-chain-effective.toml
index 371cc50a170..74d83035cd5 100644
--- a/core/web/resolver/testdata/config-multi-chain-effective.toml
+++ b/core/web/resolver/testdata/config-multi-chain-effective.toml
@@ -311,6 +311,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [EVM.OCR2]
@@ -396,6 +398,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [EVM.OCR2]
@@ -475,6 +479,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [EVM.OCR2]
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 64f9472319f..727f5ad30dd 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -19,36 +19,36 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     `mercury_transmit_queue_push_error_count`
     Nops should consider alerting on these.
 - Mercury now implements a local cache for fetching prices for fees, which ought to reduce latency and load on the mercury server, as well as increasing performance. It is enabled by default and can be configured with the following new config variables:
-```
-[Mercury]
-
-# Mercury.Cache controls settings for the price retrieval cache querying a mercury server
-[Mercury.Cache]
-# LatestReportTTL controls how "stale" we will allow a price to be e.g. if
-# set to 1s, a new price will always be fetched if the last result was
-# from 1 second ago or older.
-# 
-# Another way of looking at it is such: the cache will _never_ return a
-# price that was queried from now-LatestReportTTL or before.
-# 
-# Setting to zero disables caching entirely.
-LatestReportTTL = "1s" # Default
-# MaxStaleAge is that maximum amount of time that a value can be stale
-# before it is deleted from the cache (a form of garbage collection).
-# 
-# This should generally be set to something much larger than
-# LatestReportTTL. Setting to zero disables garbage collection.
-MaxStaleAge = "1h" # Default
-# LatestReportDeadline controls how long to wait for a response from the
-# mercury server before retrying. Setting this to zero will wait indefinitely.
-LatestReportDeadline = "5s" # Default
-```
+    ```
+    [Mercury]
+    
+    # Mercury.Cache controls settings for the price retrieval cache querying a mercury server
+    [Mercury.Cache]
+    # LatestReportTTL controls how "stale" we will allow a price to be e.g. if
+    # set to 1s, a new price will always be fetched if the last result was
+    # from 1 second ago or older.
+    # 
+    # Another way of looking at it is such: the cache will _never_ return a
+    # price that was queried from now-LatestReportTTL or before.
+    # 
+    # Setting to zero disables caching entirely.
+    LatestReportTTL = "1s" # Default
+    # MaxStaleAge is that maximum amount of time that a value can be stale
+    # before it is deleted from the cache (a form of garbage collection).
+    # 
+    # This should generally be set to something much larger than
+    # LatestReportTTL. Setting to zero disables garbage collection.
+    MaxStaleAge = "1h" # Default
+    # LatestReportDeadline controls how long to wait for a response from the
+    # mercury server before retrying. Setting this to zero will wait indefinitely.
+    LatestReportDeadline = "5s" # Default
+    ```
 - New prom metrics for the mercury cache:
     `mercury_cache_fetch_failure_count`
     `mercury_cache_hit_count`
     `mercury_cache_wait_count`
     `mercury_cache_miss_count`
-
+- Added new `EVM.OCR` TOML config fields `DeltaCOverride` and `DeltaCJitterOverride` for overriding the config DeltaC.
 
 
 ### Changed
diff --git a/docs/CONFIG.md b/docs/CONFIG.md
index 61d079fa4a6..38aac7085e8 100644
--- a/docs/CONFIG.md
+++ b/docs/CONFIG.md
@@ -1771,6 +1771,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -1850,6 +1852,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -1929,6 +1933,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -2008,6 +2014,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -2088,6 +2096,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 1
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -2167,6 +2177,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -2246,6 +2258,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -2326,6 +2340,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -2405,6 +2421,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '2s'
 DatabaseTimeout = '2s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '500ms'
 
 [OCR2]
@@ -2483,6 +2501,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -2561,6 +2581,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -2640,6 +2662,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '2s'
 DatabaseTimeout = '2s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '500ms'
 
 [OCR2]
@@ -2720,6 +2744,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -2799,6 +2825,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '2s'
 DatabaseTimeout = '2s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '500ms'
 
 [OCR2]
@@ -2878,6 +2906,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -2957,6 +2987,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -3036,6 +3068,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 1
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -3115,6 +3149,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -3194,6 +3230,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -3274,6 +3312,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 1
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -3353,6 +3393,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 1
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -3431,6 +3473,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 1
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -3510,6 +3554,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 1
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -3589,6 +3635,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 1
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -3668,6 +3716,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 1
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -3746,6 +3796,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 1
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -3825,6 +3877,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 1
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -3904,6 +3958,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -3982,6 +4038,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 1
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -4061,6 +4119,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 1
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -4141,6 +4201,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 1
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -4220,6 +4282,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 1
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -4299,6 +4363,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 1
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -4378,6 +4444,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 1
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -4457,6 +4525,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 1
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -4535,6 +4605,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -4613,6 +4685,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -4692,6 +4766,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -4771,6 +4847,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 1
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -4851,6 +4929,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 1
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -4931,6 +5011,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 1
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -5010,6 +5092,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 1
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -5088,6 +5172,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 1
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -5166,6 +5252,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 1
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -5245,6 +5333,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -5324,6 +5414,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -5403,6 +5495,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [OCR2]
@@ -6077,6 +6171,8 @@ Set to '0s' to disable
 ContractConfirmations = 4 # Default
 ContractTransmitterTransmitTimeout = '10s' # Default
 DatabaseTimeout = '10s' # Default
+DeltaCOverride = "168h" # Default
+DeltaCJitterOverride = "1h" # Default
 ObservationGracePeriod = '1s' # Default
 ```
 
@@ -6099,6 +6195,22 @@ DatabaseTimeout = '10s' # Default
 ```
 DatabaseTimeout sets `OCR.DatabaseTimeout` for this EVM chain.
 
+### DeltaCOverride
+:warning: **_ADVANCED_**: _Do not change this setting unless you know what you are doing._
+```toml
+DeltaCOverride = "168h" # Default
+```
+DeltaCOverride (and `DeltaCJitterOverride`) determine the config override DeltaC.
+DeltaC is the maximum age of the latest report in the contract. If the maximum age is exceeded, a new report will be
+created by the report generation protocol.
+
+### DeltaCJitterOverride
+:warning: **_ADVANCED_**: _Do not change this setting unless you know what you are doing._
+```toml
+DeltaCJitterOverride = "1h" # Default
+```
+DeltaCJitterOverride is the range for jitter to add to `DeltaCOverride`.
+
 ### ObservationGracePeriod
 ```toml
 ObservationGracePeriod = '1s' # Default
diff --git a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar
index 45b08f0e52f..c1ac26c8d02 100644
--- a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar
+++ b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar
@@ -367,6 +367,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [EVM.OCR2]
diff --git a/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar b/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar
index 2869af3e2de..5ae75ffca68 100644
--- a/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar
+++ b/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar
@@ -367,6 +367,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [EVM.OCR2]
diff --git a/testdata/scripts/node/validate/disk-based-logging.txtar b/testdata/scripts/node/validate/disk-based-logging.txtar
index fb705819fc2..c8b3eb4b98b 100644
--- a/testdata/scripts/node/validate/disk-based-logging.txtar
+++ b/testdata/scripts/node/validate/disk-based-logging.txtar
@@ -367,6 +367,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [EVM.OCR2]
diff --git a/testdata/scripts/node/validate/invalid.txtar b/testdata/scripts/node/validate/invalid.txtar
index 7b82d3323b1..fd591212d08 100644
--- a/testdata/scripts/node/validate/invalid.txtar
+++ b/testdata/scripts/node/validate/invalid.txtar
@@ -357,6 +357,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [EVM.OCR2]
diff --git a/testdata/scripts/node/validate/valid.txtar b/testdata/scripts/node/validate/valid.txtar
index 91fe0952dd8..020e66da527 100644
--- a/testdata/scripts/node/validate/valid.txtar
+++ b/testdata/scripts/node/validate/valid.txtar
@@ -364,6 +364,8 @@ LeaseDuration = '0s'
 ContractConfirmations = 4
 ContractTransmitterTransmitTimeout = '10s'
 DatabaseTimeout = '10s'
+DeltaCOverride = '168h0m0s'
+DeltaCJitterOverride = '1h0m0s'
 ObservationGracePeriod = '1s'
 
 [EVM.OCR2]

From cd4dff5b384a1493298de4fe16554627f8cd7010 Mon Sep 17 00:00:00 2001
From: Sneha Agnihotri <180277+snehaagni@users.noreply.github.com>
Date: Tue, 28 Nov 2023 15:41:52 -0800
Subject: [PATCH 025/130] release/2.7.1 -> develop (#11370)

* Bump version and update CHANGELOG for core v2.7.0

* core: log a warning when deprecated P2P.V1 config is set in TOML (#11073)

* core: log a warning when deprecated P2P.V1 config is set in TOML

* change default P2P from V1 to V2

* bump operator ui

(cherry picked from commit 5808e734cf024a5e8c5450e939e1f2d5b3cba546)

* operator-ui deprecation warnings (#11104)

Co-authored-by: app-token-issuer-infra-releng[bot] <120227048+app-token-issuer-infra-releng[bot]@users.noreply.github.com>
Co-authored-by: github-merge-queue[bot] <github-merge-queue[bot]@users.noreply.github.com>
Co-authored-by: Jordan Krage <jmank88@gmail.com>

* chore: bump sigstore/cosign-installer from 2.1.0 to 3.1.2

* Finalize date on changelog for 2.7.0

* Bump version and update CHANGELOG for core v2.7.1

Signed-off-by: Sneha Agnihotri <sneha.agnihotri@smartcontract.com>

* [Hotfix] Update loading next sequence map to avoid startup failure (#11319)

* Finalize date on changelog for 2.7.1

* fix failing CI tests for 2.7.1

* bump solana version in tests built

---------

Signed-off-by: Sneha Agnihotri <sneha.agnihotri@smartcontract.com>
Co-authored-by: Jordan Krage <jmank88@gmail.com>
Co-authored-by: chainchad <96362174+chainchad@users.noreply.github.com>
Co-authored-by: george-dorin <120329946+george-dorin@users.noreply.github.com>
Co-authored-by: app-token-issuer-infra-releng[bot] <120227048+app-token-issuer-infra-releng[bot]@users.noreply.github.com>
Co-authored-by: github-merge-queue[bot] <github-merge-queue[bot]@users.noreply.github.com>
Co-authored-by: Erik Burton <erikburt@users.noreply.github.com>
Co-authored-by: amit-momin <108959691+amit-momin@users.noreply.github.com>
Co-authored-by: anirudhwarrier <12178754+anirudhwarrier@users.noreply.github.com>
Co-authored-by: Tate <tate.exon@smartcontract.com>
---
 VERSION           | 2 +-
 docs/CHANGELOG.md | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/VERSION b/VERSION
index 24ba9a38de6..860487ca19c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.7.0
+2.7.1
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 727f5ad30dd..c5f243626d2 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -50,7 +50,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     `mercury_cache_miss_count`
 - Added new `EVM.OCR` TOML config fields `DeltaCOverride` and `DeltaCJitterOverride` for overriding the config DeltaC.
 
-
 ### Changed
 
 - `L2Suggested` mode is now called `SuggestedPrice`
@@ -71,13 +70,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- unreleasedstop -->
 
-## 2.7.1 - UNRELEASED
+## 2.7.1 - 2023-11-21
 
 ### Fixed
 
 - Fixed a bug that causes the node to shutdown if all configured RPC's are unreachable during startup.
 
-## 2.7.0 - UNRELEASED
+## 2.7.0 - 2023-11-14
 
 ### Added
 

From 2651da76a8c910f38e4a86b2be6aa344bd781037 Mon Sep 17 00:00:00 2001
From: Dylan Tinianov <dylantinianov@gmail.com>
Date: Tue, 28 Nov 2023 19:32:15 -0500
Subject: [PATCH 026/130] [BCI-2235] Abandoned Transaction Tracking (#11143)

* Create Abandoned Tracker

* Handle abandoned transactions

* Update abandoned_tracker.go

* fix tabbing

* Query for non-finalized txes

* fix tracker

* Resend abandoned txes

* Add evm_tx_store test

* Resend abandoned transactions

* add tracker testing

* presubmit

* tidy

* generate

* fix test

* lint

* tidy

* fix txmgr tests

* generate

* Get tx by ID

* generate

* ensure tx attemps

* Confirm abandoned txes

* tracker reset

* lint

* Update tracker.go

* Get Tx by ID

* Update text

* Make tracker its own component

* check finality_depth

* remove TxAbandoned state

* generate

* Fix race conditions

* Update db functions

* Add state machine to tracker

* Delete coverage.txt

* lint

* count receipts in query

* add context

* update cltest

* Add tracker description

* filter chainID

* update logger

* generate

* Update CHANGELOG.md

* Test unstarted txes

* lint

* undo imports

---------

Co-authored-by: amit-momin <108959691+amit-momin@users.noreply.github.com>
---
 common/txmgr/resender.go                      |  27 +-
 common/txmgr/test_helpers.go                  |  11 +-
 common/txmgr/tracker.go                       | 336 ++++++++++++++++++
 common/txmgr/txmgr.go                         |  19 +-
 common/txmgr/types/mocks/tx_store.go          |  76 ++++
 common/txmgr/types/tx_store.go                |   3 +
 core/chains/evm/txmgr/builder.go              |  30 +-
 core/chains/evm/txmgr/evm_tx_store.go         |  85 +++++
 core/chains/evm/txmgr/evm_tx_store_test.go    | 102 +++++-
 core/chains/evm/txmgr/mocks/evm_tx_store.go   |  76 ++++
 core/chains/evm/txmgr/models.go               |   3 +-
 core/chains/evm/txmgr/resender_test.go        |   6 +-
 core/chains/evm/txmgr/tracker_test.go         | 161 +++++++++
 core/internal/cltest/factories.go             |   1 +
 core/scripts/common/vrf/model/model.go        |   3 +-
 core/services/vrf/v2/integration_v2_test.go   |   2 +-
 core/services/vrf/v2/listener_v2_test.go      |   2 +-
 ...10_remove_evm_key_states_fk_constraint.sql |   4 +
 docs/CHANGELOG.md                             |   1 +
 19 files changed, 920 insertions(+), 28 deletions(-)
 create mode 100644 common/txmgr/tracker.go
 create mode 100644 core/chains/evm/txmgr/tracker_test.go
 create mode 100644 core/store/migrate/migrations/0210_remove_evm_key_states_fk_constraint.sql

diff --git a/common/txmgr/resender.go b/common/txmgr/resender.go
index ce770055609..06c466e1730 100644
--- a/common/txmgr/resender.go
+++ b/common/txmgr/resender.go
@@ -41,11 +41,13 @@ type Resender[
 	ADDR types.Hashable,
 	TX_HASH types.Hashable,
 	BLOCK_HASH types.Hashable,
+	R txmgrtypes.ChainReceipt[TX_HASH, BLOCK_HASH],
 	SEQ types.Sequence,
 	FEE feetypes.Fee,
 ] struct {
 	txStore             txmgrtypes.TransactionStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	client              txmgrtypes.TransactionClient[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
+	tracker             *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]
 	ks                  txmgrtypes.KeyStore[ADDR, CHAIN_ID, SEQ]
 	chainID             CHAIN_ID
 	interval            time.Duration
@@ -64,25 +66,28 @@ func NewResender[
 	ADDR types.Hashable,
 	TX_HASH types.Hashable,
 	BLOCK_HASH types.Hashable,
+	R txmgrtypes.ChainReceipt[TX_HASH, BLOCK_HASH],
 	SEQ types.Sequence,
 	FEE feetypes.Fee,
 ](
 	lggr logger.Logger,
 	txStore txmgrtypes.TransactionStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, SEQ, FEE],
 	client txmgrtypes.TransactionClient[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE],
+	tracker *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE],
 	ks txmgrtypes.KeyStore[ADDR, CHAIN_ID, SEQ],
 	pollInterval time.Duration,
 	config txmgrtypes.ResenderChainConfig,
 	txConfig txmgrtypes.ResenderTransactionsConfig,
-) *Resender[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE] {
+) *Resender[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE] {
 	if txConfig.ResendAfterThreshold() == 0 {
 		panic("Resender requires a non-zero threshold")
 	}
 	// todo: add context to txStore https://smartcontract-it.atlassian.net/browse/BCI-1585
 	ctx, cancel := context.WithCancel(context.Background())
-	return &Resender[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]{
+	return &Resender[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]{
 		txStore,
 		client,
+		tracker,
 		ks,
 		client.ConfiguredChainID(),
 		pollInterval,
@@ -97,18 +102,18 @@ func NewResender[
 }
 
 // Start is a comment which satisfies the linter
-func (er *Resender[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Start() {
+func (er *Resender[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) Start() {
 	er.logger.Debugf("Enabled with poll interval of %s and age threshold of %s", er.interval, er.txConfig.ResendAfterThreshold())
 	go er.runLoop()
 }
 
 // Stop is a comment which satisfies the linter
-func (er *Resender[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Stop() {
+func (er *Resender[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) Stop() {
 	er.cancel()
 	<-er.chDone
 }
 
-func (er *Resender[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) runLoop() {
+func (er *Resender[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) runLoop() {
 	defer close(er.chDone)
 
 	if err := er.resendUnconfirmed(); err != nil {
@@ -129,16 +134,20 @@ func (er *Resender[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) runLoop() {
 	}
 }
 
-func (er *Resender[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) resendUnconfirmed() error {
-	enabledAddresses, err := er.ks.EnabledAddressesForChain(er.chainID)
+func (er *Resender[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) resendUnconfirmed() error {
+	resendAddresses, err := er.ks.EnabledAddressesForChain(er.chainID)
 	if err != nil {
 		return fmt.Errorf("Resender failed getting enabled keys for chain %s: %w", er.chainID.String(), err)
 	}
+
+	resendAddresses = append(resendAddresses, er.tracker.GetAbandonedAddresses()...)
+
 	ageThreshold := er.txConfig.ResendAfterThreshold()
 	maxInFlightTransactions := er.txConfig.MaxInFlight()
 	olderThan := time.Now().Add(-ageThreshold)
 	var allAttempts []txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
-	for _, k := range enabledAddresses {
+
+	for _, k := range resendAddresses {
 		var attempts []txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 		attempts, err = er.txStore.FindTxAttemptsRequiringResend(er.ctx, olderThan, maxInFlightTransactions, er.chainID, k)
 		if err != nil {
@@ -189,7 +198,7 @@ func logResendResult(lggr logger.Logger, codes []client.SendTxReturnCode) {
 	lggr.Debugw("Completed", "n", len(codes), "nNew", nNew, "nFatal", nFatal)
 }
 
-func (er *Resender[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) logStuckAttempts(attempts []txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], fromAddress ADDR) {
+func (er *Resender[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) logStuckAttempts(attempts []txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], fromAddress ADDR) {
 	if time.Since(er.lastAlertTimestamps[fromAddress.String()]) >= unconfirmedTxAlertLogFrequency {
 		oldestAttempt, exists := findOldestUnconfirmedAttempt(attempts)
 		if exists {
diff --git a/common/txmgr/test_helpers.go b/common/txmgr/test_helpers.go
index 95d08c2e953..0f128a23af4 100644
--- a/common/txmgr/test_helpers.go
+++ b/common/txmgr/test_helpers.go
@@ -2,6 +2,7 @@ package txmgr
 
 import (
 	"context"
+	"time"
 
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
 )
@@ -13,6 +14,14 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) XXX
 	ec.client = client
 }
 
+func (tr *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) XXXTestSetTTL(ttl time.Duration) {
+	tr.ttl = ttl
+}
+
+func (tr *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) XXXDeliverBlock(blockHeight int64) {
+	tr.mb.Deliver(blockHeight)
+}
+
 func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) XXXTestStartInternal() error {
 	return eb.startInternal()
 }
@@ -33,7 +42,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) XXX
 	return ec.closeInternal()
 }
 
-func (er *Resender[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) XXXTestResendUnconfirmed() error {
+func (er *Resender[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) XXXTestResendUnconfirmed() error {
 	return er.resendUnconfirmed()
 }
 
diff --git a/common/txmgr/tracker.go b/common/txmgr/tracker.go
new file mode 100644
index 00000000000..1a24dd5b5fe
--- /dev/null
+++ b/common/txmgr/tracker.go
@@ -0,0 +1,336 @@
+package txmgr
+
+import (
+	"context"
+	"fmt"
+	"sync"
+	"time"
+
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
+	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
+	"github.com/smartcontractkit/chainlink/v2/common/types"
+
+	"github.com/smartcontractkit/chainlink/v2/core/utils"
+)
+
+const (
+	// defaultTTL is the default time to live for abandoned transactions
+	// After this TTL, the TXM stops tracking abandoned Txs.
+	defaultTTL = 6 * time.Hour
+	// handleTxesTimeout represents a sanity limit on how long handleTxesByState
+	// should take to complete
+	handleTxesTimeout = 10 * time.Minute
+)
+
+// AbandonedTx is a transaction who's 'FromAddress' was removed from the KeyStore(by the Node Operator).
+// Thus, any new attempts for this Tx can't be signed/created. This means no fee bumping can be done.
+// However, the Tx may still have live attempts in the chain's mempool, and could get confirmed on the
+// chain as-is. Thus, the TXM should not directly discard this Tx.
+type AbandonedTx[ADDR types.Hashable] struct {
+	id          int64
+	fromAddress ADDR
+}
+
+// Tracker tracks all transactions which have abandoned fromAddresses.
+// The fromAddresses can be deleted by Node Operators from the KeyStore. In such cases,
+// existing in-flight transactions for these fromAddresses are considered abandoned too.
+// Since such Txs can still have attempts on chain's mempool, these could still be confirmed.
+// This tracker just tracks such Txs for some time, in case they get confirmed as-is.
+type Tracker[
+	CHAIN_ID types.ID,
+	ADDR types.Hashable,
+	TX_HASH types.Hashable,
+	BLOCK_HASH types.Hashable,
+	R txmgrtypes.ChainReceipt[TX_HASH, BLOCK_HASH],
+	SEQ types.Sequence,
+	FEE feetypes.Fee,
+] struct {
+	services.StateMachine
+	txStore      txmgrtypes.TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]
+	keyStore     txmgrtypes.KeyStore[ADDR, CHAIN_ID, SEQ]
+	chainID      CHAIN_ID
+	lggr         logger.Logger
+	enabledAddrs map[ADDR]bool
+	txCache      map[int64]AbandonedTx[ADDR]
+	ttl          time.Duration
+	lock         sync.Mutex
+	mb           *utils.Mailbox[int64]
+	wg           sync.WaitGroup
+	isStarted    bool
+	ctx          context.Context
+	ctxCancel    context.CancelFunc
+}
+
+func NewTracker[
+	CHAIN_ID types.ID,
+	ADDR types.Hashable,
+	TX_HASH types.Hashable,
+	BLOCK_HASH types.Hashable,
+	R txmgrtypes.ChainReceipt[TX_HASH, BLOCK_HASH],
+	SEQ types.Sequence,
+	FEE feetypes.Fee,
+](
+	txStore txmgrtypes.TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE],
+	keyStore txmgrtypes.KeyStore[ADDR, CHAIN_ID, SEQ],
+	chainID CHAIN_ID,
+	lggr logger.Logger,
+) *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE] {
+	return &Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]{
+		txStore:      txStore,
+		keyStore:     keyStore,
+		chainID:      chainID,
+		lggr:         logger.Named(lggr, "TxMgrTracker"),
+		enabledAddrs: map[ADDR]bool{},
+		txCache:      map[int64]AbandonedTx[ADDR]{},
+		ttl:          defaultTTL,
+		mb:           utils.NewSingleMailbox[int64](),
+		lock:         sync.Mutex{},
+		wg:           sync.WaitGroup{},
+	}
+}
+
+func (tr *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) Start(_ context.Context) (err error) {
+	tr.lock.Lock()
+	defer tr.lock.Unlock()
+	return tr.StartOnce("Tracker", func() error {
+		return tr.startInternal()
+	})
+}
+
+func (tr *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) startInternal() (err error) {
+	tr.ctx, tr.ctxCancel = context.WithCancel(context.Background())
+
+	if err := tr.setEnabledAddresses(); err != nil {
+		return fmt.Errorf("failed to set enabled addresses: %w", err)
+	}
+
+	if err := tr.trackAbandonedTxes(tr.ctx); err != nil {
+		return fmt.Errorf("failed to track abandoned txes: %w", err)
+	}
+
+	tr.isStarted = true
+	if len(tr.txCache) == 0 {
+		tr.lggr.Infow("no abandoned txes found, skipping runLoop")
+		return nil
+	}
+	tr.wg.Add(1)
+	go tr.runLoop()
+	return nil
+}
+
+func (tr *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) Close() error {
+	tr.lock.Lock()
+	defer tr.lock.Unlock()
+	return tr.StopOnce("Tracker", func() error {
+		return tr.closeInternal()
+	})
+}
+
+func (tr *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) closeInternal() error {
+	tr.lggr.Infow("stopping tracker")
+	if !tr.isStarted {
+		return fmt.Errorf("tracker not started")
+	}
+	tr.ctxCancel()
+	tr.wg.Wait()
+	tr.isStarted = false
+	return nil
+}
+
+func (tr *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) runLoop() {
+	defer tr.wg.Done()
+	ttlExceeded := time.NewTicker(tr.ttl)
+	defer ttlExceeded.Stop()
+	for {
+		select {
+		case <-tr.mb.Notify():
+			for {
+				if tr.ctx.Err() != nil {
+					return
+				}
+				blockHeight, exists := tr.mb.Retrieve()
+				if !exists {
+					break
+				}
+				if err := tr.HandleTxesByState(tr.ctx, blockHeight); err != nil {
+					tr.lggr.Errorw(fmt.Errorf("failed to handle txes by state: %w", err).Error())
+				}
+			}
+		case <-ttlExceeded.C:
+			tr.lggr.Infow("ttl exceeded")
+			tr.MarkAllTxesFatal(tr.ctx)
+			return
+		case <-tr.ctx.Done():
+			return
+		}
+	}
+}
+
+func (tr *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) GetAbandonedAddresses() []ADDR {
+	tr.lock.Lock()
+	defer tr.lock.Unlock()
+
+	if !tr.isStarted {
+		return []ADDR{}
+	}
+
+	abandonedAddrs := make([]ADDR, len(tr.txCache))
+	for _, atx := range tr.txCache {
+		abandonedAddrs = append(abandonedAddrs, atx.fromAddress)
+	}
+	return abandonedAddrs
+}
+
+func (tr *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) IsStarted() bool {
+	tr.lock.Lock()
+	defer tr.lock.Unlock()
+	return tr.isStarted
+}
+
+func (tr *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) setEnabledAddresses() error {
+	enabledAddrs, err := tr.keyStore.EnabledAddressesForChain(tr.chainID)
+	if err != nil {
+		return fmt.Errorf("failed to get enabled addresses for chain: %w", err)
+	}
+
+	if len(enabledAddrs) == 0 {
+		tr.lggr.Warnf("enabled address list is empty")
+	}
+
+	for _, addr := range enabledAddrs {
+		tr.enabledAddrs[addr] = true
+	}
+	return nil
+}
+
+// trackAbandonedTxes called once to find and insert all abandoned txes into the tracker.
+func (tr *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) trackAbandonedTxes(ctx context.Context) (err error) {
+	if tr.isStarted {
+		return fmt.Errorf("tracker already started")
+	}
+
+	nonFatalTxes, err := tr.txStore.GetNonFatalTransactions(ctx, tr.chainID)
+	if err != nil {
+		return fmt.Errorf("failed to get non fatal txes from txStore: %w", err)
+	}
+
+	// insert abandoned txes
+	for _, tx := range nonFatalTxes {
+		if !tr.enabledAddrs[tx.FromAddress] {
+			tr.insertTx(tx)
+		}
+	}
+
+	if err := tr.handleTxesByState(ctx, 0); err != nil {
+		return fmt.Errorf("failed to handle txes by state: %w", err)
+	}
+
+	return nil
+}
+
+func (tr *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) HandleTxesByState(ctx context.Context, blockHeight int64) error {
+	tr.lock.Lock()
+	defer tr.lock.Unlock()
+	tr.ctx, tr.ctxCancel = context.WithTimeout(ctx, handleTxesTimeout)
+	defer tr.ctxCancel()
+	return tr.handleTxesByState(ctx, blockHeight)
+}
+
+func (tr *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) handleTxesByState(ctx context.Context, blockHeight int64) error {
+	for id, atx := range tr.txCache {
+		tx, err := tr.txStore.GetTxByID(ctx, atx.id)
+		if err != nil {
+			return fmt.Errorf("failed to get tx by ID: %w", err)
+		}
+
+		switch tx.State {
+		case TxConfirmed:
+			if err := tr.handleConfirmedTx(tx, blockHeight); err != nil {
+				return fmt.Errorf("failed to handle confirmed txes: %w", err)
+			}
+		case TxConfirmedMissingReceipt, TxUnconfirmed:
+			// Keep tracking tx
+		case TxInProgress, TxUnstarted:
+			// Tx could never be sent on chain even once. That means that we need to sign
+			// an attempt to even broadcast this Tx to the chain. Since the fromAddress
+			// is deleted, we can't sign it.
+			errMsg := "The FromAddress for this Tx was deleted before this Tx could be broadcast to the chain."
+			if err := tr.markTxFatal(ctx, tx, errMsg); err != nil {
+				return fmt.Errorf("failed to mark tx as fatal: %w", err)
+			}
+			delete(tr.txCache, id)
+		case TxFatalError:
+			delete(tr.txCache, id)
+		default:
+			tr.lggr.Errorw(fmt.Sprintf("unhandled transaction state: %v", tx.State))
+		}
+	}
+
+	return nil
+}
+
+// handleConfirmedTx removes a transaction from the tracker if it's been finalized on chain
+func (tr *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) handleConfirmedTx(
+	tx *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE],
+	blockHeight int64,
+) error {
+	finalized, err := tr.txStore.IsTxFinalized(tr.ctx, blockHeight, tx.ID, tr.chainID)
+	if err != nil {
+		return fmt.Errorf("failed to check if tx is finalized: %w", err)
+	}
+
+	if finalized {
+		delete(tr.txCache, tx.ID)
+	}
+
+	return nil
+}
+
+// insertTx inserts a transaction into the tracker as an AbandonedTx
+func (tr *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) insertTx(
+	tx *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) {
+	if _, contains := tr.txCache[tx.ID]; contains {
+		return
+	}
+
+	tr.txCache[tx.ID] = AbandonedTx[ADDR]{
+		id:          tx.ID,
+		fromAddress: tx.FromAddress,
+	}
+	tr.lggr.Debugw(fmt.Sprintf("inserted tx %v", tx.ID))
+}
+
+func (tr *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) markTxFatal(ctx context.Context,
+	tx *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE],
+	errMsg string) error {
+	tx.Error.SetValid(errMsg)
+
+	// Set state to TxInProgress so the tracker can attempt to mark it as fatal
+	tx.State = TxInProgress
+	if err := tr.txStore.UpdateTxFatalError(ctx, tx); err != nil {
+		return fmt.Errorf("failed to mark tx %v as abandoned: %w", tx.ID, err)
+	}
+	return nil
+}
+
+func (tr *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) MarkAllTxesFatal(ctx context.Context) {
+	tr.lock.Lock()
+	defer tr.lock.Unlock()
+	errMsg := fmt.Sprintf(
+		"fromAddress for this Tx was deleted, and existing attempts onchain didn't finalize within %d hours, thus this Tx was abandoned.",
+		int(tr.ttl.Hours()))
+
+	for _, atx := range tr.txCache {
+		tx, err := tr.txStore.GetTxByID(ctx, atx.id)
+		if err != nil {
+			tr.lggr.Errorw(fmt.Errorf("failed to get tx by ID: %w", err).Error())
+			continue
+		}
+
+		if err := tr.markTxFatal(ctx, tx, errMsg); err != nil {
+			tr.lggr.Errorw(fmt.Errorf("failed to mark tx as abandoned: %w", err).Error())
+		}
+	}
+}
diff --git a/common/txmgr/txmgr.go b/common/txmgr/txmgr.go
index 63bf039d8f7..3aac88e2f4b 100644
--- a/common/txmgr/txmgr.go
+++ b/common/txmgr/txmgr.go
@@ -95,9 +95,10 @@ type Txm[
 	wg       sync.WaitGroup
 
 	reaper           *Reaper[CHAIN_ID]
-	resender         *Resender[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
+	resender         *Resender[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]
 	broadcaster      *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	confirmer        *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]
+	tracker          *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]
 	fwdMgr           txmgrtypes.ForwarderManager[ADDR]
 	txAttemptBuilder txmgrtypes.TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	sequenceSyncer   SequenceSyncer[ADDR, TX_HASH, BLOCK_HASH, SEQ]
@@ -132,7 +133,8 @@ func NewTxm[
 	sequenceSyncer SequenceSyncer[ADDR, TX_HASH, BLOCK_HASH, SEQ],
 	broadcaster *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE],
 	confirmer *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE],
-	resender *Resender[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE],
+	resender *Resender[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE],
+	tracker *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE],
 ) *Txm[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE] {
 	b := Txm[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]{
 		logger:           lggr,
@@ -153,6 +155,7 @@ func NewTxm[
 		broadcaster:      broadcaster,
 		confirmer:        confirmer,
 		resender:         resender,
+		tracker:          tracker,
 	}
 
 	if txCfg.ResendAfterThreshold() <= 0 {
@@ -183,6 +186,10 @@ func (b *Txm[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) Start(ctx
 			return fmt.Errorf("Txm: Estimator failed to start: %w", err)
 		}
 
+		if err := ms.Start(ctx, b.tracker); err != nil {
+			return fmt.Errorf("Txm: Tracker failed to start: %w", err)
+		}
+
 		b.wg.Add(1)
 		go b.runLoop()
 		<-b.chSubbed
@@ -260,6 +267,10 @@ func (b *Txm[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) Close() (m
 			merr = errors.Join(merr, fmt.Errorf("Txm: failed to close TxAttemptBuilder: %w", err))
 		}
 
+		if err := b.tracker.Close(); err != nil {
+			merr = errors.Join(merr, fmt.Errorf("Txm: failed to close Tracker: %w", err))
+		}
+
 		return nil
 	})
 }
@@ -371,6 +382,7 @@ func (b *Txm[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) runLoop()
 			b.broadcaster.Trigger(address)
 		case head := <-b.chHeads:
 			b.confirmer.mb.Deliver(head)
+			b.tracker.mb.Deliver(head.BlockNumber())
 		case reset := <-b.reset:
 			// This check prevents the weird edge-case where you can select
 			// into this block after chStop has already been closed and the
@@ -396,6 +408,9 @@ func (b *Txm[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) runLoop()
 			if err := utils.EnsureClosed(b.confirmer); err != nil {
 				b.logger.Panicw(fmt.Sprintf("Failed to Close Confirmer: %v", err), "err", err)
 			}
+			if err := utils.EnsureClosed(b.tracker); err != nil {
+				b.logger.Panicw(fmt.Sprintf("Failed to Close Tracker: %v", err), "err", err)
+			}
 			return
 		case <-keysChanged:
 			// This check prevents the weird edge-case where you can select
diff --git a/common/txmgr/types/mocks/tx_store.go b/common/txmgr/types/mocks/tx_store.go
index 0e344b9b6f9..0a7738fd68a 100644
--- a/common/txmgr/types/mocks/tx_store.go
+++ b/common/txmgr/types/mocks/tx_store.go
@@ -544,6 +544,58 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) GetInProgre
 	return r0, r1
 }
 
+// GetNonFatalTransactions provides a mock function with given fields: ctx, chainID
+func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) GetNonFatalTransactions(ctx context.Context, chainID CHAIN_ID) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
+	ret := _m.Called(ctx, chainID)
+
+	var r0 []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, CHAIN_ID) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
+		return rf(ctx, chainID)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, CHAIN_ID) []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]); ok {
+		r0 = rf(ctx, chainID)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, CHAIN_ID) error); ok {
+		r1 = rf(ctx, chainID)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// GetTxByID provides a mock function with given fields: ctx, id
+func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) GetTxByID(ctx context.Context, id int64) (*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
+	ret := _m.Called(ctx, id)
+
+	var r0 *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, int64) (*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
+		return rf(ctx, id)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, int64) *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]); ok {
+		r0 = rf(ctx, id)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, int64) error); ok {
+		r1 = rf(ctx, id)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // GetTxInProgress provides a mock function with given fields: ctx, fromAddress
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) GetTxInProgress(ctx context.Context, fromAddress ADDR) (*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, fromAddress)
@@ -594,6 +646,30 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) HasInProgre
 	return r0, r1
 }
 
+// IsTxFinalized provides a mock function with given fields: ctx, blockHeight, txID, chainID
+func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) IsTxFinalized(ctx context.Context, blockHeight int64, txID int64, chainID CHAIN_ID) (bool, error) {
+	ret := _m.Called(ctx, blockHeight, txID, chainID)
+
+	var r0 bool
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, int64, int64, CHAIN_ID) (bool, error)); ok {
+		return rf(ctx, blockHeight, txID, chainID)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, int64, int64, CHAIN_ID) bool); ok {
+		r0 = rf(ctx, blockHeight, txID, chainID)
+	} else {
+		r0 = ret.Get(0).(bool)
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, int64, int64, CHAIN_ID) error); ok {
+		r1 = rf(ctx, blockHeight, txID, chainID)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // LoadTxAttempts provides a mock function with given fields: ctx, etx
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) LoadTxAttempts(ctx context.Context, etx *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error {
 	ret := _m.Called(ctx, etx)
diff --git a/common/txmgr/types/tx_store.go b/common/txmgr/types/tx_store.go
index f731031f926..251135795fd 100644
--- a/common/txmgr/types/tx_store.go
+++ b/common/txmgr/types/tx_store.go
@@ -81,6 +81,8 @@ type TransactionStore[
 	FindTransactionsConfirmedInBlockRange(ctx context.Context, highBlockNumber, lowBlockNumber int64, chainID CHAIN_ID) (etxs []*Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], err error)
 	GetTxInProgress(ctx context.Context, fromAddress ADDR) (etx *Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], err error)
 	GetInProgressTxAttempts(ctx context.Context, address ADDR, chainID CHAIN_ID) (attempts []TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], err error)
+	GetNonFatalTransactions(ctx context.Context, chainID CHAIN_ID) (txs []*Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], err error)
+	GetTxByID(ctx context.Context, id int64) (tx *Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], err error)
 	HasInProgressTransaction(ctx context.Context, account ADDR, chainID CHAIN_ID) (exists bool, err error)
 	LoadTxAttempts(ctx context.Context, etx *Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error
 	MarkAllConfirmedMissingReceipt(ctx context.Context, chainID CHAIN_ID) (err error)
@@ -100,6 +102,7 @@ type TransactionStore[
 	UpdateTxUnstartedToInProgress(ctx context.Context, etx *Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], attempt *TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error
 	UpdateTxFatalError(ctx context.Context, etx *Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error
 	UpdateTxForRebroadcast(ctx context.Context, etx Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], etxAttempt TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error
+	IsTxFinalized(ctx context.Context, blockHeight int64, txID int64, chainID CHAIN_ID) (finalized bool, err error)
 }
 
 type TxHistoryReaper[CHAIN_ID types.ID] interface {
diff --git a/core/chains/evm/txmgr/builder.go b/core/chains/evm/txmgr/builder.go
index 84aa21e4de2..f0cbcbf8d92 100644
--- a/core/chains/evm/txmgr/builder.go
+++ b/core/chains/evm/txmgr/builder.go
@@ -50,13 +50,15 @@ func NewTxm(
 	txmCfg := NewEvmTxmConfig(chainConfig) // wrap Evm specific config
 	feeCfg := NewEvmTxmFeeConfig(fCfg)     // wrap Evm specific config
 	txmClient := NewEvmTxmClient(client)   // wrap Evm specific client
-	ethBroadcaster := NewEvmBroadcaster(txStore, txmClient, txmCfg, feeCfg, txConfig, listenerConfig, keyStore, txAttemptBuilder, txNonceSyncer, lggr, checker, chainConfig.NonceAutoSync())
-	ethConfirmer := NewEvmConfirmer(txStore, txmClient, txmCfg, feeCfg, txConfig, dbConfig, keyStore, txAttemptBuilder, lggr)
-	var ethResender *Resender
+	chainID := txmClient.ConfiguredChainID()
+	evmBroadcaster := NewEvmBroadcaster(txStore, txmClient, txmCfg, feeCfg, txConfig, listenerConfig, keyStore, txAttemptBuilder, txNonceSyncer, lggr, checker, chainConfig.NonceAutoSync())
+	evmTracker := NewEvmTracker(txStore, keyStore, chainID, lggr)
+	evmConfirmer := NewEvmConfirmer(txStore, txmClient, txmCfg, feeCfg, txConfig, dbConfig, keyStore, txAttemptBuilder, lggr)
+	var evmResender *Resender
 	if txConfig.ResendAfterThreshold() > 0 {
-		ethResender = NewEvmResender(lggr, txStore, txmClient, keyStore, txmgr.DefaultResenderPollInterval, chainConfig, txConfig)
+		evmResender = NewEvmResender(lggr, txStore, txmClient, evmTracker, keyStore, txmgr.DefaultResenderPollInterval, chainConfig, txConfig)
 	}
-	txm = NewEvmTxm(txmClient.ConfiguredChainID(), txmCfg, txConfig, keyStore, lggr, checker, fwdMgr, txAttemptBuilder, txStore, txNonceSyncer, ethBroadcaster, ethConfirmer, ethResender)
+	txm = NewEvmTxm(chainID, txmCfg, txConfig, keyStore, lggr, checker, fwdMgr, txAttemptBuilder, txStore, txNonceSyncer, evmBroadcaster, evmConfirmer, evmResender, evmTracker)
 	return txm, nil
 }
 
@@ -75,21 +77,23 @@ func NewEvmTxm(
 	broadcaster *Broadcaster,
 	confirmer *Confirmer,
 	resender *Resender,
+	tracker *Tracker,
 ) *Txm {
-	return txmgr.NewTxm(chainId, cfg, txCfg, keyStore, lggr, checkerFactory, fwdMgr, txAttemptBuilder, txStore, nonceSyncer, broadcaster, confirmer, resender)
+	return txmgr.NewTxm(chainId, cfg, txCfg, keyStore, lggr, checkerFactory, fwdMgr, txAttemptBuilder, txStore, nonceSyncer, broadcaster, confirmer, resender, tracker)
 }
 
-// NewEvnResender creates a new concrete EvmResender
+// NewEvmResender creates a new concrete EvmResender
 func NewEvmResender(
 	lggr logger.Logger,
 	txStore TransactionStore,
 	client TransactionClient,
+	tracker *Tracker,
 	ks KeyStore,
 	pollInterval time.Duration,
 	config EvmResenderConfig,
 	txConfig txmgrtypes.ResenderTransactionsConfig,
 ) *Resender {
-	return txmgr.NewResender(lggr, txStore, client, ks, pollInterval, config, txConfig)
+	return txmgr.NewResender(lggr, txStore, client, tracker, ks, pollInterval, config, txConfig)
 }
 
 // NewEvmReaper instantiates a new EVM-specific reaper object
@@ -112,6 +116,16 @@ func NewEvmConfirmer(
 	return txmgr.NewConfirmer(txStore, client, chainConfig, feeConfig, txConfig, dbConfig, keystore, txAttemptBuilder, lggr, func(r *evmtypes.Receipt) bool { return r == nil })
 }
 
+// NewEvmTracker instantiates a new EVM tracker for abandoned transactions
+func NewEvmTracker(
+	txStore TxStore,
+	keyStore KeyStore,
+	chainID *big.Int,
+	lggr logger.Logger,
+) *Tracker {
+	return txmgr.NewTracker(txStore, keyStore, chainID, lggr)
+}
+
 // NewEvmBroadcaster returns a new concrete EvmBroadcaster
 func NewEvmBroadcaster(
 	txStore TransactionStore,
diff --git a/core/chains/evm/txmgr/evm_tx_store.go b/core/chains/evm/txmgr/evm_tx_store.go
index 2788c2fd1c9..51c9f98e884 100644
--- a/core/chains/evm/txmgr/evm_tx_store.go
+++ b/core/chains/evm/txmgr/evm_tx_store.go
@@ -69,6 +69,7 @@ type TestEvmTxStore interface {
 	FindTxAttemptsByTxIDs(ids []int64) ([]TxAttempt, error)
 	InsertTxAttempt(attempt *TxAttempt) error
 	LoadTxesAttempts(etxs []*Tx, qopts ...pg.QOpt) error
+	GetFatalTransactions(ctx context.Context) (txes []*Tx, err error)
 }
 
 type evmTxStore struct {
@@ -552,6 +553,26 @@ func (o *evmTxStore) InsertReceipt(receipt *evmtypes.Receipt) (int64, error) {
 	return r.ID, pkgerrors.Wrap(err, "InsertReceipt failed")
 }
 
+func (o *evmTxStore) GetFatalTransactions(ctx context.Context) (txes []*Tx, err error) {
+	var cancel context.CancelFunc
+	ctx, cancel = o.mergeContexts(ctx)
+	defer cancel()
+	qq := o.q.WithOpts(pg.WithParentCtx(ctx))
+	err = qq.Transaction(func(tx pg.Queryer) error {
+		stmt := `SELECT * FROM evm.txes WHERE state = 'fatal_error'`
+		var dbEtxs []DbEthTx
+		if err = tx.Select(&dbEtxs, stmt); err != nil {
+			return fmt.Errorf("failed to load evm.txes: %w", err)
+		}
+		txes = make([]*Tx, len(dbEtxs))
+		dbEthTxsToEvmEthTxPtrs(dbEtxs, txes)
+		err = o.LoadTxesAttempts(txes, pg.WithParentCtx(ctx), pg.WithQueryer(tx))
+		return fmt.Errorf("failed to load evm.tx_attempts: %w", err)
+	}, pg.OptReadOnlyTx())
+
+	return txes, nil
+}
+
 // FindTxWithAttempts finds the Tx with its attempts and receipts preloaded
 func (o *evmTxStore) FindTxWithAttempts(etxID int64) (etx Tx, err error) {
 	err = o.q.Transaction(func(tx pg.Queryer) error {
@@ -1107,6 +1128,25 @@ ORDER BY nonce ASC
 	return etxs, pkgerrors.Wrap(err, "FindTransactionsConfirmedInBlockRange failed")
 }
 
+func (o *evmTxStore) IsTxFinalized(ctx context.Context, blockHeight int64, txID int64, chainID *big.Int) (finalized bool, err error) {
+	var cancel context.CancelFunc
+	ctx, cancel = o.mergeContexts(ctx)
+	defer cancel()
+
+	var count int32
+	qq := o.q.WithOpts(pg.WithParentCtx(ctx))
+	err = qq.GetContext(ctx, &count, `
+    SELECT COUNT(evm.receipts.receipt) FROM evm.txes
+    INNER JOIN evm.tx_attempts ON evm.txes.id = evm.tx_attempts.eth_tx_id
+    INNER JOIN evm.receipts ON evm.tx_attempts.hash = evm.receipts.tx_hash
+    WHERE evm.receipts.block_number <= ($1 - evm.txes.min_confirmations)
+    AND evm.txes.id = $2 AND evm.txes.evm_chain_id = $3`, blockHeight, txID, chainID.String())
+	if err != nil {
+		return false, fmt.Errorf("failed to retrieve transaction reciepts: %w", err)
+	}
+	return count > 0, nil
+}
+
 func saveAttemptWithNewState(ctx context.Context, q pg.Queryer, logger logger.Logger, attempt TxAttempt, broadcastAt time.Time) error {
 	var dbAttempt DbEthTxAttempt
 	dbAttempt.FromTxAttempt(&attempt)
@@ -1223,6 +1263,51 @@ func (o *evmTxStore) SaveInProgressAttempt(ctx context.Context, attempt *TxAttem
 	return nil
 }
 
+func (o *evmTxStore) GetNonFatalTransactions(ctx context.Context, chainID *big.Int) (txes []*Tx, err error) {
+	var cancel context.CancelFunc
+	ctx, cancel = o.mergeContexts(ctx)
+	defer cancel()
+	qq := o.q.WithOpts(pg.WithParentCtx(ctx))
+	err = qq.Transaction(func(tx pg.Queryer) error {
+		stmt := `SELECT * FROM evm.txes WHERE state <> 'fatal_error' AND evm_chain_id = $1`
+		var dbEtxs []DbEthTx
+		if err = tx.Select(&dbEtxs, stmt, chainID.String()); err != nil {
+			return fmt.Errorf("failed to load evm.txes: %w", err)
+		}
+		txes = make([]*Tx, len(dbEtxs))
+		dbEthTxsToEvmEthTxPtrs(dbEtxs, txes)
+		err = o.LoadTxesAttempts(txes, pg.WithParentCtx(ctx), pg.WithQueryer(tx))
+		return fmt.Errorf("failed to load evm.txes: %w", err)
+	}, pg.OptReadOnlyTx())
+
+	return txes, nil
+}
+
+func (o *evmTxStore) GetTxByID(ctx context.Context, id int64) (txe *Tx, err error) {
+	var cancel context.CancelFunc
+	ctx, cancel = o.mergeContexts(ctx)
+	defer cancel()
+	qq := o.q.WithOpts(pg.WithParentCtx(ctx))
+
+	err = qq.Transaction(func(tx pg.Queryer) error {
+		stmt := `SELECT * FROM evm.txes WHERE id = $1`
+		var dbEtxs []DbEthTx
+		if err = tx.Select(&dbEtxs, stmt, id); err != nil {
+			return fmt.Errorf("failed to load evm.txes: %w", err)
+		}
+		txes := make([]*Tx, len(dbEtxs))
+		dbEthTxsToEvmEthTxPtrs(dbEtxs, txes)
+		if len(txes) != 1 {
+			return fmt.Errorf("failed to get tx with id %v", id)
+		}
+		txe = txes[0]
+		err = o.LoadTxesAttempts(txes, pg.WithParentCtx(ctx), pg.WithQueryer(tx))
+		return fmt.Errorf("failed to load evm.tx_attempts: %w", err)
+	}, pg.OptReadOnlyTx())
+
+	return txe, nil
+}
+
 // FindTxsRequiringGasBump returns transactions that have all
 // attempts which are unconfirmed for at least gasBumpThreshold blocks,
 // limited by limit pending transactions
diff --git a/core/chains/evm/txmgr/evm_tx_store_test.go b/core/chains/evm/txmgr/evm_tx_store_test.go
index d2cafcb8efa..e68641735ee 100644
--- a/core/chains/evm/txmgr/evm_tx_store_test.go
+++ b/core/chains/evm/txmgr/evm_tx_store_test.go
@@ -786,6 +786,31 @@ func TestORM_UpdateTxForRebroadcast(t *testing.T) {
 	})
 }
 
+func TestORM_IsTxFinalized(t *testing.T) {
+	t.Parallel()
+
+	db := pgtest.NewSqlxDB(t)
+	cfg := newTestChainScopedConfig(t)
+	txStore := cltest.NewTestTxStore(t, db, cfg.Database())
+	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
+
+	t.Run("confirmed tx not past finality_depth", func(t *testing.T) {
+		confirmedAddr := cltest.MustGenerateRandomKey(t).Address
+		tx := mustInsertConfirmedEthTxWithReceipt(t, txStore, confirmedAddr, 123, 1)
+		finalized, err := txStore.IsTxFinalized(testutils.Context(t), 2, tx.ID, ethClient.ConfiguredChainID())
+		require.NoError(t, err)
+		require.False(t, finalized)
+	})
+
+	t.Run("confirmed tx past finality_depth", func(t *testing.T) {
+		confirmedAddr := cltest.MustGenerateRandomKey(t).Address
+		tx := mustInsertConfirmedEthTxWithReceipt(t, txStore, confirmedAddr, 123, 1)
+		finalized, err := txStore.IsTxFinalized(testutils.Context(t), 10, tx.ID, ethClient.ConfiguredChainID())
+		require.NoError(t, err)
+		require.True(t, finalized)
+	})
+}
+
 func TestORM_FindTransactionsConfirmedInBlockRange(t *testing.T) {
 	t.Parallel()
 
@@ -1310,7 +1335,7 @@ func TestORM_UpdateTxUnstartedToInProgress(t *testing.T) {
 		evmTxmCfg := txmgr.NewEvmTxmConfig(ccfg.EVM())
 		ec := evmtest.NewEthClientMockWithDefaultChain(t)
 		txMgr := txmgr.NewEvmTxm(ec.ConfiguredChainID(), evmTxmCfg, ccfg.EVM().Transactions(), nil, logger.Test(t), nil, nil,
-			nil, txStore, nil, nil, nil, nil)
+			nil, txStore, nil, nil, nil, nil, nil)
 		err := txMgr.XXXTestAbandon(fromAddress) // mark transaction as abandoned
 		require.NoError(t, err)
 
@@ -1365,6 +1390,81 @@ func TestORM_GetTxInProgress(t *testing.T) {
 	})
 }
 
+func TestORM_GetNonFatalTransactions(t *testing.T) {
+	t.Parallel()
+
+	db := pgtest.NewSqlxDB(t)
+	cfg := newTestChainScopedConfig(t)
+	txStore := cltest.NewTestTxStore(t, db, cfg.Database())
+	ethKeyStore := cltest.NewKeyStore(t, db, cfg.Database()).Eth()
+	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
+	_, fromAddress := cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
+
+	t.Run("gets 0 non finalized eth transaction", func(t *testing.T) {
+		txes, err := txStore.GetNonFatalTransactions(testutils.Context(t), ethClient.ConfiguredChainID())
+		require.NoError(t, err)
+		require.Empty(t, txes)
+	})
+
+	t.Run("get in progress, unstarted, and unconfirmed eth transactions", func(t *testing.T) {
+		inProgressTx := mustInsertInProgressEthTxWithAttempt(t, txStore, 123, fromAddress)
+		unstartedTx := mustCreateUnstartedGeneratedTx(t, txStore, fromAddress, ethClient.ConfiguredChainID())
+
+		txes, err := txStore.GetNonFatalTransactions(testutils.Context(t), ethClient.ConfiguredChainID())
+		require.NoError(t, err)
+
+		for _, tx := range txes {
+			require.True(t, tx.ID == inProgressTx.ID || tx.ID == unstartedTx.ID)
+		}
+	})
+}
+
+func TestORM_GetTxByID(t *testing.T) {
+	t.Parallel()
+
+	db := pgtest.NewSqlxDB(t)
+	cfg := newTestChainScopedConfig(t)
+	txStore := cltest.NewTestTxStore(t, db, cfg.Database())
+	ethKeyStore := cltest.NewKeyStore(t, db, cfg.Database()).Eth()
+	_, fromAddress := cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
+
+	t.Run("no transaction", func(t *testing.T) {
+		tx, err := txStore.GetTxByID(testutils.Context(t), int64(0))
+		require.NoError(t, err)
+		require.Nil(t, tx)
+	})
+
+	t.Run("get transaction by ID", func(t *testing.T) {
+		insertedTx := mustInsertInProgressEthTxWithAttempt(t, txStore, 123, fromAddress)
+		tx, err := txStore.GetTxByID(testutils.Context(t), insertedTx.ID)
+		require.NoError(t, err)
+		require.NotNil(t, tx)
+	})
+}
+
+func TestORM_GetFatalTransactions(t *testing.T) {
+	t.Parallel()
+
+	db := pgtest.NewSqlxDB(t)
+	cfg := newTestChainScopedConfig(t)
+	txStore := cltest.NewTestTxStore(t, db, cfg.Database())
+	ethKeyStore := cltest.NewKeyStore(t, db, cfg.Database()).Eth()
+	_, fromAddress := cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
+
+	t.Run("gets 0 fatal eth transactions", func(t *testing.T) {
+		txes, err := txStore.GetFatalTransactions(testutils.Context(t))
+		require.NoError(t, err)
+		require.Empty(t, txes)
+	})
+
+	t.Run("get fatal transactions", func(t *testing.T) {
+		fatalTx := mustInsertFatalErrorEthTx(t, txStore, fromAddress)
+		txes, err := txStore.GetFatalTransactions(testutils.Context(t))
+		require.NoError(t, err)
+		require.Equal(t, txes[0].ID, fatalTx.ID)
+	})
+}
+
 func TestORM_HasInProgressTransaction(t *testing.T) {
 	t.Parallel()
 
diff --git a/core/chains/evm/txmgr/mocks/evm_tx_store.go b/core/chains/evm/txmgr/mocks/evm_tx_store.go
index f491bda40bb..00efc1add98 100644
--- a/core/chains/evm/txmgr/mocks/evm_tx_store.go
+++ b/core/chains/evm/txmgr/mocks/evm_tx_store.go
@@ -649,6 +649,58 @@ func (_m *EvmTxStore) GetInProgressTxAttempts(ctx context.Context, address commo
 	return r0, r1
 }
 
+// GetNonFatalTransactions provides a mock function with given fields: ctx, chainID
+func (_m *EvmTxStore) GetNonFatalTransactions(ctx context.Context, chainID *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
+	ret := _m.Called(ctx, chainID)
+
+	var r0 []*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
+		return rf(ctx, chainID)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) []*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]); ok {
+		r0 = rf(ctx, chainID)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *big.Int) error); ok {
+		r1 = rf(ctx, chainID)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// GetTxByID provides a mock function with given fields: ctx, id
+func (_m *EvmTxStore) GetTxByID(ctx context.Context, id int64) (*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
+	ret := _m.Called(ctx, id)
+
+	var r0 *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, int64) (*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
+		return rf(ctx, id)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, int64) *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]); ok {
+		r0 = rf(ctx, id)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee])
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, int64) error); ok {
+		r1 = rf(ctx, id)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // GetTxInProgress provides a mock function with given fields: ctx, fromAddress
 func (_m *EvmTxStore) GetTxInProgress(ctx context.Context, fromAddress common.Address) (*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, fromAddress)
@@ -699,6 +751,30 @@ func (_m *EvmTxStore) HasInProgressTransaction(ctx context.Context, account comm
 	return r0, r1
 }
 
+// IsTxFinalized provides a mock function with given fields: ctx, blockHeight, txID, chainID
+func (_m *EvmTxStore) IsTxFinalized(ctx context.Context, blockHeight int64, txID int64, chainID *big.Int) (bool, error) {
+	ret := _m.Called(ctx, blockHeight, txID, chainID)
+
+	var r0 bool
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, int64, int64, *big.Int) (bool, error)); ok {
+		return rf(ctx, blockHeight, txID, chainID)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, int64, int64, *big.Int) bool); ok {
+		r0 = rf(ctx, blockHeight, txID, chainID)
+	} else {
+		r0 = ret.Get(0).(bool)
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, int64, int64, *big.Int) error); ok {
+		r1 = rf(ctx, blockHeight, txID, chainID)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // LoadTxAttempts provides a mock function with given fields: ctx, etx
 func (_m *EvmTxStore) LoadTxAttempts(ctx context.Context, etx *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error {
 	ret := _m.Called(ctx, etx)
diff --git a/core/chains/evm/txmgr/models.go b/core/chains/evm/txmgr/models.go
index 9044c52c9ae..4c622ec945a 100644
--- a/core/chains/evm/txmgr/models.go
+++ b/core/chains/evm/txmgr/models.go
@@ -19,7 +19,8 @@ import (
 type (
 	Confirmer              = txmgr.Confirmer[*big.Int, *evmtypes.Head, common.Address, common.Hash, common.Hash, *evmtypes.Receipt, evmtypes.Nonce, gas.EvmFee]
 	Broadcaster            = txmgr.Broadcaster[*big.Int, *evmtypes.Head, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
-	Resender               = txmgr.Resender[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
+	Resender               = txmgr.Resender[*big.Int, common.Address, common.Hash, common.Hash, *evmtypes.Receipt, evmtypes.Nonce, gas.EvmFee]
+	Tracker                = txmgr.Tracker[*big.Int, common.Address, common.Hash, common.Hash, *evmtypes.Receipt, evmtypes.Nonce, gas.EvmFee]
 	Reaper                 = txmgr.Reaper[*big.Int]
 	TxStore                = txmgrtypes.TxStore[common.Address, *big.Int, common.Hash, common.Hash, *evmtypes.Receipt, evmtypes.Nonce, gas.EvmFee]
 	TransactionStore       = txmgrtypes.TransactionStore[common.Address, *big.Int, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
diff --git a/core/chains/evm/txmgr/resender_test.go b/core/chains/evm/txmgr/resender_test.go
index d2eefdece59..0e86c0d4f8c 100644
--- a/core/chains/evm/txmgr/resender_test.go
+++ b/core/chains/evm/txmgr/resender_test.go
@@ -65,7 +65,7 @@ func Test_EthResender_resendUnconfirmed(t *testing.T) {
 		addr3TxesRawHex = append(addr3TxesRawHex, hexutil.Encode(etx.TxAttempts[0].SignedRawTx))
 	}
 
-	er := txmgr.NewEvmResender(lggr, txStore, txmgr.NewEvmTxmClient(ethClient), ethKeyStore, 100*time.Millisecond, ccfg.EVM(), ccfg.EVM().Transactions())
+	er := txmgr.NewEvmResender(lggr, txStore, txmgr.NewEvmTxmClient(ethClient), txmgr.NewEvmTracker(txStore, ethKeyStore, big.NewInt(0), lggr), ethKeyStore, 100*time.Millisecond, ccfg.EVM(), ccfg.EVM().Transactions())
 
 	var resentHex = make(map[string]struct{})
 	ethClient.On("BatchCallContextAll", mock.Anything, mock.MatchedBy(func(elems []rpc.BatchElem) bool {
@@ -121,7 +121,7 @@ func Test_EthResender_alertUnconfirmed(t *testing.T) {
 	txStore := cltest.NewTestTxStore(t, db, logCfg)
 
 	originalBroadcastAt := time.Unix(1616509100, 0)
-	er := txmgr.NewEvmResender(lggr, txStore, txmgr.NewEvmTxmClient(ethClient), ethKeyStore, 100*time.Millisecond, ccfg.EVM(), ccfg.EVM().Transactions())
+	er := txmgr.NewEvmResender(lggr, txStore, txmgr.NewEvmTxmClient(ethClient), txmgr.NewEvmTracker(txStore, ethKeyStore, big.NewInt(0), lggr), ethKeyStore, 100*time.Millisecond, ccfg.EVM(), ccfg.EVM().Transactions())
 
 	t.Run("alerts only once for unconfirmed transaction attempt within the unconfirmedTxAlertDelay duration", func(t *testing.T) {
 		_ = cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, txStore, int64(1), fromAddress, originalBroadcastAt)
@@ -157,7 +157,7 @@ func Test_EthResender_Start(t *testing.T) {
 	t.Run("resends transactions that have been languishing unconfirmed for too long", func(t *testing.T) {
 		ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
 
-		er := txmgr.NewEvmResender(lggr, txStore, txmgr.NewEvmTxmClient(ethClient), ethKeyStore, 100*time.Millisecond, ccfg.EVM(), ccfg.EVM().Transactions())
+		er := txmgr.NewEvmResender(lggr, txStore, txmgr.NewEvmTxmClient(ethClient), txmgr.NewEvmTracker(txStore, ethKeyStore, big.NewInt(0), lggr), ethKeyStore, 100*time.Millisecond, ccfg.EVM(), ccfg.EVM().Transactions())
 
 		originalBroadcastAt := time.Unix(1616509100, 0)
 		etx := cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, txStore, 0, fromAddress, originalBroadcastAt)
diff --git a/core/chains/evm/txmgr/tracker_test.go b/core/chains/evm/txmgr/tracker_test.go
new file mode 100644
index 00000000000..a31187f04e8
--- /dev/null
+++ b/core/chains/evm/txmgr/tracker_test.go
@@ -0,0 +1,161 @@
+package txmgr_test
+
+import (
+	"context"
+	"math/big"
+	"testing"
+	"time"
+
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
+	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
+	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
+	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
+	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
+	"github.com/smartcontractkit/chainlink/v2/core/utils"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/stretchr/testify/require"
+)
+
+const waitTime = 5 * time.Millisecond
+
+func newTestEvmTrackerSetup(t *testing.T) (*txmgr.Tracker, txmgr.TestEvmTxStore, keystore.Eth, []common.Address) {
+	db := pgtest.NewSqlxDB(t)
+	cfg := newTestChainScopedConfig(t)
+	txStore := cltest.NewTestTxStore(t, db, cfg.Database())
+	ethKeyStore := cltest.NewKeyStore(t, db, cfg.Database()).Eth()
+	chainID := big.NewInt(0)
+	enabledAddresses := generateEnabledAddresses(t, ethKeyStore, chainID)
+	lggr := logger.TestLogger(t)
+	return txmgr.NewEvmTracker(txStore, ethKeyStore, chainID, lggr), txStore, ethKeyStore, enabledAddresses
+}
+
+func generateEnabledAddresses(t *testing.T, keyStore keystore.Eth, chainID *big.Int) []common.Address {
+	var enabledAddresses []common.Address
+	_, addr1 := cltest.MustInsertRandomKey(t, keyStore, *utils.NewBigI(chainID.Int64()))
+	_, addr2 := cltest.MustInsertRandomKey(t, keyStore, *utils.NewBigI(chainID.Int64()))
+	enabledAddresses = append(enabledAddresses, addr1, addr2)
+	return enabledAddresses
+}
+
+func containsID(txes []*txmgr.Tx, id int64) bool {
+	for _, tx := range txes {
+		if tx.ID == id {
+			return true
+		}
+	}
+	return false
+}
+
+func TestEvmTracker_Initialization(t *testing.T) {
+	t.Parallel()
+
+	tracker, _, _, _ := newTestEvmTrackerSetup(t)
+
+	err := tracker.Start(context.Background())
+	require.NoError(t, err)
+	require.True(t, tracker.IsStarted())
+
+	t.Run("stop tracker", func(t *testing.T) {
+		err := tracker.Close()
+		require.NoError(t, err)
+		require.False(t, tracker.IsStarted())
+	})
+}
+
+func TestEvmTracker_AddressTracking(t *testing.T) {
+	t.Parallel()
+
+	t.Run("track abandoned addresses", func(t *testing.T) {
+		ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
+		tracker, txStore, _, _ := newTestEvmTrackerSetup(t)
+		inProgressAddr := cltest.MustGenerateRandomKey(t).Address
+		unstartedAddr := cltest.MustGenerateRandomKey(t).Address
+		unconfirmedAddr := cltest.MustGenerateRandomKey(t).Address
+		confirmedAddr := cltest.MustGenerateRandomKey(t).Address
+		_ = mustInsertInProgressEthTxWithAttempt(t, txStore, 123, inProgressAddr)
+		_ = cltest.MustInsertUnconfirmedEthTx(t, txStore, 123, unconfirmedAddr)
+		_ = mustInsertConfirmedEthTxWithReceipt(t, txStore, confirmedAddr, 123, 1)
+		_ = mustCreateUnstartedTx(t, txStore, unstartedAddr, cltest.MustGenerateRandomKey(t).Address, []byte{}, 0, big.Int{}, ethClient.ConfiguredChainID())
+
+		err := tracker.Start(context.Background())
+		require.NoError(t, err)
+		defer func(tracker *txmgr.Tracker) {
+			err = tracker.Close()
+			require.NoError(t, err)
+		}(tracker)
+
+		addrs := tracker.GetAbandonedAddresses()
+		require.NotContains(t, addrs, inProgressAddr)
+		require.NotContains(t, addrs, unstartedAddr)
+		require.Contains(t, addrs, confirmedAddr)
+		require.Contains(t, addrs, unconfirmedAddr)
+	})
+
+	t.Run("stop tracking finalized tx", func(t *testing.T) {
+		tracker, txStore, _, _ := newTestEvmTrackerSetup(t)
+		confirmedAddr := cltest.MustGenerateRandomKey(t).Address
+		_ = mustInsertConfirmedEthTxWithReceipt(t, txStore, confirmedAddr, 123, 1)
+
+		err := tracker.Start(context.Background())
+		require.NoError(t, err)
+		defer func(tracker *txmgr.Tracker) {
+			err = tracker.Close()
+			require.NoError(t, err)
+		}(tracker)
+
+		addrs := tracker.GetAbandonedAddresses()
+		require.Contains(t, addrs, confirmedAddr)
+
+		// deliver block past minConfirmations to finalize tx
+		tracker.XXXDeliverBlock(10)
+		time.Sleep(waitTime)
+
+		addrs = tracker.GetAbandonedAddresses()
+		require.NotContains(t, addrs, confirmedAddr)
+	})
+}
+
+func TestEvmTracker_ExceedingTTL(t *testing.T) {
+	t.Parallel()
+
+	t.Run("confirmed but unfinalized transaction still tracked", func(t *testing.T) {
+		tracker, txStore, _, _ := newTestEvmTrackerSetup(t)
+		addr1 := cltest.MustGenerateRandomKey(t).Address
+		_ = mustInsertConfirmedEthTxWithReceipt(t, txStore, addr1, 123, 1)
+
+		err := tracker.Start(context.Background())
+		require.NoError(t, err)
+		defer func(tracker *txmgr.Tracker) {
+			err = tracker.Close()
+			require.NoError(t, err)
+		}(tracker)
+
+		require.Contains(t, tracker.GetAbandonedAddresses(), addr1)
+	})
+
+	t.Run("exceeding ttl", func(t *testing.T) {
+		tracker, txStore, _, _ := newTestEvmTrackerSetup(t)
+		addr1 := cltest.MustGenerateRandomKey(t).Address
+		addr2 := cltest.MustGenerateRandomKey(t).Address
+		tx1 := mustInsertInProgressEthTxWithAttempt(t, txStore, 123, addr1)
+		tx2 := cltest.MustInsertUnconfirmedEthTx(t, txStore, 123, addr2)
+
+		tracker.XXXTestSetTTL(time.Nanosecond)
+		err := tracker.Start(context.Background())
+		require.NoError(t, err)
+		defer func(tracker *txmgr.Tracker) {
+			err = tracker.Close()
+			require.NoError(t, err)
+		}(tracker)
+
+		time.Sleep(waitTime)
+		require.NotContains(t, tracker.GetAbandonedAddresses(), addr1, addr2)
+
+		fatalTxes, err := txStore.GetFatalTransactions(context.Background())
+		require.NoError(t, err)
+		require.True(t, containsID(fatalTxes, tx1.ID))
+		require.True(t, containsID(fatalTxes, tx2.ID))
+	})
+}
diff --git a/core/internal/cltest/factories.go b/core/internal/cltest/factories.go
index 46014c4e04f..f0ce8c4ff66 100644
--- a/core/internal/cltest/factories.go
+++ b/core/internal/cltest/factories.go
@@ -193,6 +193,7 @@ func MustInsertConfirmedEthTxWithLegacyAttempt(t *testing.T, txStore txmgr.TestE
 	n := evmtypes.Nonce(nonce)
 	etx.Sequence = &n
 	etx.State = txmgrcommon.TxConfirmed
+	etx.MinConfirmations.SetValid(6)
 	require.NoError(t, txStore.InsertTx(&etx))
 	attempt := NewLegacyEthTxAttempt(t, etx.ID)
 	attempt.BroadcastBeforeBlockNum = &broadcastBeforeBlockNum
diff --git a/core/scripts/common/vrf/model/model.go b/core/scripts/common/vrf/model/model.go
index 42deb424536..0972c47e618 100644
--- a/core/scripts/common/vrf/model/model.go
+++ b/core/scripts/common/vrf/model/model.go
@@ -1,8 +1,9 @@
 package model
 
 import (
-	"github.com/ethereum/go-ethereum/common"
 	"math/big"
+
+	"github.com/ethereum/go-ethereum/common"
 )
 
 var (
diff --git a/core/services/vrf/v2/integration_v2_test.go b/core/services/vrf/v2/integration_v2_test.go
index 74d923ce09f..fa95b694f98 100644
--- a/core/services/vrf/v2/integration_v2_test.go
+++ b/core/services/vrf/v2/integration_v2_test.go
@@ -137,7 +137,7 @@ func makeTestTxm(t *testing.T, txStore txmgr.TestEvmTxStore, keyStore keystore.M
 	_, _, evmConfig := txmgr.MakeTestConfigs(t)
 	txmConfig := txmgr.NewEvmTxmConfig(evmConfig)
 	txm := txmgr.NewEvmTxm(ec.ConfiguredChainID(), txmConfig, evmConfig.Transactions(), keyStore.Eth(), logger.TestLogger(t), nil, nil,
-		nil, txStore, nil, nil, nil, nil)
+		nil, txStore, nil, nil, nil, nil, nil)
 
 	return txm
 }
diff --git a/core/services/vrf/v2/listener_v2_test.go b/core/services/vrf/v2/listener_v2_test.go
index bcc85b3700d..6192db95dfe 100644
--- a/core/services/vrf/v2/listener_v2_test.go
+++ b/core/services/vrf/v2/listener_v2_test.go
@@ -39,7 +39,7 @@ func makeTestTxm(t *testing.T, txStore txmgr.TestEvmTxStore, keyStore keystore.M
 	ec := evmtest.NewEthClientMockWithDefaultChain(t)
 	txmConfig := txmgr.NewEvmTxmConfig(evmConfig)
 	txm := txmgr.NewEvmTxm(ec.ConfiguredChainID(), txmConfig, evmConfig.Transactions(), keyStore.Eth(), logger.TestLogger(t), nil, nil,
-		nil, txStore, nil, nil, nil, nil)
+		nil, txStore, nil, nil, nil, nil, nil)
 
 	return txm
 }
diff --git a/core/store/migrate/migrations/0210_remove_evm_key_states_fk_constraint.sql b/core/store/migrate/migrations/0210_remove_evm_key_states_fk_constraint.sql
new file mode 100644
index 00000000000..119de9d260e
--- /dev/null
+++ b/core/store/migrate/migrations/0210_remove_evm_key_states_fk_constraint.sql
@@ -0,0 +1,4 @@
+-- +goose Up
+ALTER TABLE evm.txes DROP CONSTRAINT eth_txes_evm_chain_id_from_address_fkey;
+-- +goose Down
+ALTER TABLE evm.txes ADD CONSTRAINT eth_txes_evm_chain_id_from_address_fkey FOREIGN KEY (evm_chain_id, from_address) REFERENCES evm.key_states(evm_chain_id, address) ON DELETE CASCADE DEFERRABLE INITIALLY IMMEDIATE NOT VALID;
\ No newline at end of file
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index c5f243626d2..e8013d3617a 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Added a tracker component to the txmgr for tracking and gracefully handling abandoned transactions. Abandoned transactions occur when a fromAddress is removed from the keystore by a node operator. The tracker gives abandoned transactions a chance to be finalized on chain, or marks them as fatal_error if they are not finalized within a specified time to live (default 6hrs).
 - Added distributed tracing in the OpenTelemetry trace format to the node, currently focused at the LOOPP Plugin development effort. This includes a new set of `Tracing` TOML configurations. The default for collecting traces is off - you must explicitly enable traces and setup a valid OpenTelemetry collector. Refer to `.github/tracing/README.md` for more details.
 - Added a new, optional WebServer authentication option that supports LDAP as a user identity provider. This enables user login access and user roles to be managed and provisioned via a centralized remote server that supports the LDAP protocol, which can be helpful when running multiple nodes. See the documentation for more information and config setup instructions. There is a new `[WebServer].AuthenticationMethod` config option, when set to `ldap` requires the new `[WebServer.LDAP]` config section to be defined, see the reference `docs/core.toml`.
 - New prom metrics for mercury transmit queue:

From 795d62e57ee594c848fd97443b4dfc1501395e49 Mon Sep 17 00:00:00 2001
From: Domino Valdano <2644901+reductionista@users.noreply.github.com>
Date: Tue, 28 Nov 2023 17:01:55 -0800
Subject: [PATCH 027/130] Change UseFinalityTags to FinalityTagEnabled in
 CHANGELOG.md to avoid confusion (#11404)

The name of the param LogPoller accepts is useFinalityTag, but the externally-facing name of the toml config param it's set based on is FinalityTagEnabled. There is also a toml config param named UseFinalityTag but it's only used for integration tests, there is no such thing in the main production toml config. Also, adding EVM prefix for clarity.
---
 docs/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index e8013d3617a..e282d047892 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -93,7 +93,7 @@ ServerPubKey = '...'
 These will eventually replace `TelemetryIngress.URL` and `TelemetryIngress.ServerPubKey`. Setting `TelemetryIngress.URL` and `TelemetryIngress.ServerPubKey` alongside `[[TelemetryIngress.Endpoints]]` will prevent the node from booting. Only one way of configuring telemetry endpoints is supported.
 - Added bridge_name label to `pipeline_tasks_total_finished` prometheus metric. This should make it easier to see directly what bridge was failing out from the CL NODE perspective.
 
-- LogPoller will now use finality tags to dynamically determine finality on evm chains if `UseFinalityTags=true`, rather than the fixed `FinalityDepth` specified in toml config
+- LogPoller will now use finality tags to dynamically determine finality on evm chains if `EVM.FinalityTagEnabled=true`, rather than the fixed `EVM.FinalityDepth` specified in toml config
 
 ### Changed
 

From deec7e6b57e8234cf4c8025184c92d76af7095d9 Mon Sep 17 00:00:00 2001
From: Rens Rooimans <github@rensrooimans.nl>
Date: Wed, 29 Nov 2023 12:57:35 +0100
Subject: [PATCH 028/130] Add callWithExactGas lib (#11009)

* add callWithExactGas lib

* add fuzz test

* dup code to make it more safe

* add _callWithExactGasEvenIfTargetIsNoContract

* make args order consistent

* add callWithExactGasEvenIfTargetIsNoContract tests

* improve tests

* update snapshot

* properly name fuzz test

* fix comments

* improve testing logic

* return gas used in _callWithExactGasSafeReturnData (#11106)

* fix function selector blacklist in fuzz test

* Update shared.gas-snapshot

* use constant revert reasons

* fix solhint

* fix ref

* style nits and let all return success

* fix solhint
---
 contracts/GNUmakefile                         |   5 +
 contracts/gas-snapshots/shared.gas-snapshot   |  16 +
 contracts/package.json                        |   2 +-
 .../src/v0.8/shared/call/CallWithExactGas.sol | 162 +++++++
 .../shared/test/call/CallWithExactGas.t.sol   | 459 ++++++++++++++++++
 .../test/call/CallWithExactGasHelper.sol      |  35 ++
 .../test/testhelpers/GenericReceiver.sol      |  29 ++
 7 files changed, 707 insertions(+), 1 deletion(-)
 create mode 100644 contracts/src/v0.8/shared/call/CallWithExactGas.sol
 create mode 100644 contracts/src/v0.8/shared/test/call/CallWithExactGas.t.sol
 create mode 100644 contracts/src/v0.8/shared/test/call/CallWithExactGasHelper.sol
 create mode 100644 contracts/src/v0.8/shared/test/testhelpers/GenericReceiver.sol

diff --git a/contracts/GNUmakefile b/contracts/GNUmakefile
index e8808138673..f5be193249c 100644
--- a/contracts/GNUmakefile
+++ b/contracts/GNUmakefile
@@ -18,6 +18,11 @@ ALL_FOUNDRY_PRODUCTS = llo-feeds functions shared
 snapshot: ## Make a snapshot for a specific product.
 	export FOUNDRY_PROFILE=$(FOUNDRY_PROFILE) && forge snapshot --nmt "testFuzz_\w{1,}?" --snap gas-snapshots/$(FOUNDRY_PROFILE).gas-snapshot
 
+.PHONY: snapshot-diff
+snapshot-diff: ## Make a snapshot for a specific product.
+	export FOUNDRY_PROFILE=$(FOUNDRY_PROFILE) && forge snapshot --nmt "testFuzz_\w{1,}?" --diff gas-snapshots/$(FOUNDRY_PROFILE).gas-snapshot
+
+
 .PHONY: snapshot-all
 snapshot-all: ## Make a snapshot for all products.
 	for foundry_profile in $(ALL_FOUNDRY_PRODUCTS) ; do \
diff --git a/contracts/gas-snapshots/shared.gas-snapshot b/contracts/gas-snapshots/shared.gas-snapshot
index cf003c5a26d..6f307d257f5 100644
--- a/contracts/gas-snapshots/shared.gas-snapshot
+++ b/contracts/gas-snapshots/shared.gas-snapshot
@@ -25,6 +25,22 @@ BurnMintERC677_mint:testSenderNotMinterReverts() (gas: 11195)
 BurnMintERC677_supportsInterface:testConstructorSuccess() (gas: 8685)
 BurnMintERC677_transfer:testInvalidAddressReverts() (gas: 10639)
 BurnMintERC677_transfer:testTransferSuccess() (gas: 39462)
+CallWithExactGas__callWithExactGas:test_CallWithExactGasReceiverErrorSuccess() (gas: 66918)
+CallWithExactGas__callWithExactGas:test_CallWithExactGasSafeReturnDataExactGas() (gas: 22615)
+CallWithExactGas__callWithExactGas:test_NoContractReverts() (gas: 11559)
+CallWithExactGas__callWithExactGas:test_NoGasForCallExactCheckReverts() (gas: 12908)
+CallWithExactGas__callWithExactGas:test_NotEnoughGasForCallReverts() (gas: 13361)
+CallWithExactGas__callWithExactGas:test_callWithExactGasSuccess(bytes,bytes4) (runs: 256, μ: 15477, ~: 15418)
+CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_CallWithExactGasEvenIfTargetIsNoContractExactGasSuccess() (gas: 19147)
+CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_CallWithExactGasEvenIfTargetIsNoContractReceiverErrorSuccess() (gas: 67096)
+CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_CallWithExactGasEvenIfTargetIsNoContractSuccess(bytes,bytes4) (runs: 256, μ: 15675, ~: 15616)
+CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_NoContractSuccess() (gas: 9816)
+CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_NoGasForCallExactCheckReturnFalseSuccess() (gas: 9578)
+CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract:test_NotEnoughGasForCallReturnsFalseSuccess() (gas: 9890)
+CallWithExactGas__callWithExactGasSafeReturnData:test_CallWithExactGasSafeReturnDataExactGas() (gas: 19017)
+CallWithExactGas__callWithExactGasSafeReturnData:test_NoContractReverts() (gas: 13949)
+CallWithExactGas__callWithExactGasSafeReturnData:test_NoGasForCallExactCheckReverts() (gas: 13239)
+CallWithExactGas__callWithExactGasSafeReturnData:test_NotEnoughGasForCallReverts() (gas: 13670)
 OpStackBurnMintERC677_constructor:testConstructorSuccess() (gas: 1739317)
 OpStackBurnMintERC677_interfaceCompatibility:testBurnCompatibility() (gas: 263373)
 OpStackBurnMintERC677_interfaceCompatibility:testMintCompatibility() (gas: 137957)
diff --git a/contracts/package.json b/contracts/package.json
index 2ceb1602dca..1503c822ea4 100644
--- a/contracts/package.json
+++ b/contracts/package.json
@@ -18,7 +18,7 @@
     "prepublishOnly": "pnpm compile && ./scripts/prepublish_generate_abi_folder",
     "publish-beta": "pnpm publish --tag beta",
     "publish-prod": "npm dist-tag add @chainlink/contracts@0.8.0 latest",
-    "solhint": "solhint --max-warnings 369 \"./src/v0.8/**/*.sol\""
+    "solhint": "solhint --max-warnings 376 \"./src/v0.8/**/*.sol\""
   },
   "files": [
     "src/v0.8",
diff --git a/contracts/src/v0.8/shared/call/CallWithExactGas.sol b/contracts/src/v0.8/shared/call/CallWithExactGas.sol
new file mode 100644
index 00000000000..6716dc15953
--- /dev/null
+++ b/contracts/src/v0.8/shared/call/CallWithExactGas.sol
@@ -0,0 +1,162 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+/// @notice This library contains various callWithExactGas functions. All of them are
+/// safe from gas bomb attacks.
+/// @dev There is code duplication in this library. This is done to not leave the assembly
+/// the blocks.
+library CallWithExactGas {
+  error NoContract();
+  error NoGasForCallExactCheck();
+  error NotEnoughGasForCall();
+
+  bytes4 internal constant NO_CONTRACT_SIG = 0x0c3b563c;
+  bytes4 internal constant NO_GAS_FOR_CALL_EXACT_CHECK_SIG = 0xafa32a2c;
+  bytes4 internal constant NOT_ENOUGH_GAS_FOR_CALL_SIG = 0x37c3be29;
+
+  /// @notice calls target address with exactly gasAmount gas and payload as calldata.
+  /// Accounts for gasForCallExactCheck gas that will be used by this function. Will revert
+  /// if the target is not a contact. Will revert when there is not enough gas to call the
+  /// target with gasAmount gas.
+  /// @dev Ignores the return data, which makes it immune to gas bomb attacks.
+  /// @return success whether the call succeeded
+  function _callWithExactGas(
+    bytes memory payload,
+    address target,
+    uint256 gasLimit,
+    uint16 gasForCallExactCheck
+  ) internal returns (bool success) {
+    assembly {
+      // solidity calls check that a contract actually exists at the destination, so we do the same
+      // Note we do this check prior to measuring gas so gasForCallExactCheck (our "cushion")
+      // doesn't need to account for it.
+      if iszero(extcodesize(target)) {
+        mstore(0x0, NO_CONTRACT_SIG)
+        revert(0x0, 0x4)
+      }
+
+      let g := gas()
+      // Compute g -= gasForCallExactCheck and check for underflow
+      // The gas actually passed to the callee is _min(gasAmount, 63//64*gas available).
+      // We want to ensure that we revert if gasAmount >  63//64*gas available
+      // as we do not want to provide them with less, however that check itself costs
+      // gas. gasForCallExactCheck ensures we have at least enough gas to be able
+      // to revert if gasAmount >  63//64*gas available.
+      if lt(g, gasForCallExactCheck) {
+        mstore(0x0, NO_GAS_FOR_CALL_EXACT_CHECK_SIG)
+        revert(0x0, 0x4)
+      }
+      g := sub(g, gasForCallExactCheck)
+      // if g - g//64 <= gasAmount, revert. We subtract g//64 because of EIP-150
+      if iszero(gt(sub(g, div(g, 64)), gasLimit)) {
+        mstore(0x0, NOT_ENOUGH_GAS_FOR_CALL_SIG)
+        revert(0x0, 0x4)
+      }
+
+      // call and return whether we succeeded. ignore return data
+      // call(gas,addr,value,argsOffset,argsLength,retOffset,retLength)
+      success := call(gasLimit, target, 0, add(payload, 0x20), mload(payload), 0x0, 0x0)
+    }
+    return success;
+  }
+
+  /// @notice calls target address with exactly gasAmount gas and payload as calldata.
+  /// Account for gasForCallExactCheck gas that will be used by this function. Will revert
+  /// if the target is not a contact. Will revert when there is not enough gas to call the
+  /// target with gasAmount gas.
+  /// @dev Caps the return data length, which makes it immune to gas bomb attacks.
+  /// @dev Return data cap logic borrowed from
+  /// https://github.com/nomad-xyz/ExcessivelySafeCall/blob/main/src/ExcessivelySafeCall.sol.
+  /// @return success whether the call succeeded
+  /// @return retData the return data from the call, capped at maxReturnBytes bytes
+  /// @return gasUsed the gas used by the external call. Does not include the overhead of this function.
+  function _callWithExactGasSafeReturnData(
+    bytes memory payload,
+    address target,
+    uint256 gasLimit,
+    uint16 gasForCallExactCheck,
+    uint16 maxReturnBytes
+  ) internal returns (bool success, bytes memory retData, uint256 gasUsed) {
+    // allocate retData memory ahead of time
+    retData = new bytes(maxReturnBytes);
+
+    assembly {
+      // solidity calls check that a contract actually exists at the destination, so we do the same
+      // Note we do this check prior to measuring gas so gasForCallExactCheck (our "cushion")
+      // doesn't need to account for it.
+      if iszero(extcodesize(target)) {
+        mstore(0x0, NO_CONTRACT_SIG)
+        revert(0x0, 0x4)
+      }
+
+      let g := gas()
+      // Compute g -= gasForCallExactCheck and check for underflow
+      // The gas actually passed to the callee is _min(gasAmount, 63//64*gas available).
+      // We want to ensure that we revert if gasAmount >  63//64*gas available
+      // as we do not want to provide them with less, however that check itself costs
+      // gas. gasForCallExactCheck ensures we have at least enough gas to be able
+      // to revert if gasAmount >  63//64*gas available.
+      if lt(g, gasForCallExactCheck) {
+        mstore(0x0, NO_GAS_FOR_CALL_EXACT_CHECK_SIG)
+        revert(0x0, 0x4)
+      }
+      g := sub(g, gasForCallExactCheck)
+      // if g - g//64 <= gasAmount, revert. We subtract g//64 because of EIP-150
+      if iszero(gt(sub(g, div(g, 64)), gasLimit)) {
+        mstore(0x0, NOT_ENOUGH_GAS_FOR_CALL_SIG)
+        revert(0x0, 0x4)
+      }
+
+      // We save the gas before the call so we can calculate how much gas the call used
+      let gasBeforeCall := gas()
+      // call and return whether we succeeded. ignore return data
+      // call(gas,addr,value,argsOffset,argsLength,retOffset,retLength)
+      success := call(gasLimit, target, 0, add(payload, 0x20), mload(payload), 0x0, 0x0)
+      gasUsed := sub(gasBeforeCall, gas())
+
+      // limit our copy to maxReturnBytes bytes
+      let toCopy := returndatasize()
+      if gt(toCopy, maxReturnBytes) {
+        toCopy := maxReturnBytes
+      }
+      // Store the length of the copied bytes
+      mstore(retData, toCopy)
+      // copy the bytes from retData[0:_toCopy]
+      returndatacopy(add(retData, 0x20), 0x0, toCopy)
+    }
+    return (success, retData, gasUsed);
+  }
+
+  /// @notice Calls target address with exactly gasAmount gas and payload as calldata
+  /// or reverts if at least gasLimit gas is not available.
+  /// @dev Does not check if target is a contract. If it is not a contract, the low-level
+  /// call will still be made and it will succeed.
+  /// @dev Ignores the return data, which makes it immune to gas bomb attacks.
+  /// @return success whether the call succeeded
+  /// @return sufficientGas Whether there was enough gas to make the call
+  function _callWithExactGasEvenIfTargetIsNoContract(
+    bytes memory payload,
+    address target,
+    uint256 gasLimit,
+    uint16 gasForCallExactCheck
+  ) internal returns (bool success, bool sufficientGas) {
+    assembly {
+      let g := gas()
+      // Compute g -= CALL_WITH_EXACT_GAS_CUSHION and check for underflow. We
+      // need the cushion since the logic following the above call to gas also
+      // costs gas which we cannot account for exactly. So cushion is a
+      // conservative upper bound for the cost of this logic.
+      if iszero(lt(g, gasForCallExactCheck)) {
+        g := sub(g, gasForCallExactCheck)
+        // If g - g//64 <= gasAmount, we don't have enough gas. We subtract g//64 because of EIP-150.
+        if gt(sub(g, div(g, 64)), gasLimit) {
+          // Call and ignore success/return data. Note that we did not check
+          // whether a contract actually exists at the target address.
+          success := call(gasLimit, target, 0, add(payload, 0x20), mload(payload), 0x0, 0x0)
+          sufficientGas := true
+        }
+      }
+    }
+    return (success, sufficientGas);
+  }
+}
diff --git a/contracts/src/v0.8/shared/test/call/CallWithExactGas.t.sol b/contracts/src/v0.8/shared/test/call/CallWithExactGas.t.sol
new file mode 100644
index 00000000000..e5c90b172cd
--- /dev/null
+++ b/contracts/src/v0.8/shared/test/call/CallWithExactGas.t.sol
@@ -0,0 +1,459 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.19;
+
+import {CallWithExactGas} from "../../call/CallWithExactGas.sol";
+import {CallWithExactGasHelper} from "./CallWithExactGasHelper.sol";
+import {BaseTest} from "../BaseTest.t.sol";
+import {GenericReceiver} from "../testhelpers/GenericReceiver.sol";
+
+contract CallWithExactGasSetup is BaseTest {
+  GenericReceiver internal s_receiver;
+  CallWithExactGasHelper internal s_caller;
+  uint256 internal constant DEFAULT_GAS_LIMIT = 20_000;
+  uint16 internal constant DEFAULT_GAS_FOR_CALL_EXACT_CHECK = 5000;
+  uint256 internal constant EXTCODESIZE_GAS_COST = 2600;
+
+  function setUp() public virtual override {
+    BaseTest.setUp();
+
+    s_receiver = new GenericReceiver(false);
+    s_caller = new CallWithExactGasHelper();
+  }
+}
+
+contract CallWithExactGas__callWithExactGas is CallWithExactGasSetup {
+  function test_callWithExactGasSuccess(bytes memory payload, bytes4 funcSelector) public {
+    vm.pauseGasMetering();
+
+    bytes memory data = abi.encodeWithSelector(funcSelector, payload);
+    vm.assume(
+      funcSelector != GenericReceiver.setRevert.selector &&
+        funcSelector != GenericReceiver.setErr.selector &&
+        funcSelector != 0x5100fc21 // s_toRevert(), which is public and therefore has a function selector
+    );
+
+    vm.expectCall(address(s_receiver), data);
+    vm.resumeGasMetering();
+
+    bool success = s_caller.callWithExactGas(
+      data,
+      address(s_receiver),
+      DEFAULT_GAS_LIMIT,
+      DEFAULT_GAS_FOR_CALL_EXACT_CHECK
+    );
+
+    assertTrue(success);
+  }
+
+  function test_CallWithExactGasSafeReturnDataExactGas() public {
+    // The calculated overhead for otherwise unaccounted for gas usage
+    uint256 overheadForCallWithExactGas = 364;
+
+    bytes memory payload = abi.encodeWithSelector(
+      s_caller.callWithExactGas.selector,
+      "",
+      address(s_receiver),
+      DEFAULT_GAS_LIMIT,
+      DEFAULT_GAS_FOR_CALL_EXACT_CHECK
+    );
+
+    // Since only 63/64th of the gas gets passed, we compensate
+    uint256 allowedGas = (DEFAULT_GAS_LIMIT + (DEFAULT_GAS_LIMIT / 64));
+
+    allowedGas += EXTCODESIZE_GAS_COST + DEFAULT_GAS_FOR_CALL_EXACT_CHECK + overheadForCallWithExactGas;
+
+    // Due to EIP-150 we expect to lose 1/64, so we compensate for this
+    allowedGas = (allowedGas * 64) / 63;
+
+    (bool success, bytes memory retData) = address(s_caller).call{gas: allowedGas}(payload);
+
+    assertTrue(success);
+    assertEq(abi.encode(true), retData);
+  }
+
+  function test_CallWithExactGasReceiverErrorSuccess() public {
+    bytes memory data = abi.encode("0x52656E73");
+
+    bytes memory errorData = new bytes(20);
+    for (uint256 i = 0; i < errorData.length; ++i) {
+      errorData[i] = 0x01;
+    }
+    s_receiver.setErr(errorData);
+    s_receiver.setRevert(true);
+
+    vm.expectCall(address(s_receiver), data);
+
+    bool success = s_caller.callWithExactGas(
+      data,
+      address(s_receiver),
+      DEFAULT_GAS_LIMIT * 10,
+      DEFAULT_GAS_FOR_CALL_EXACT_CHECK
+    );
+
+    assertFalse(success);
+  }
+
+  function test_NoContractReverts() public {
+    address addressWithoutContract = address(1337);
+
+    vm.expectRevert(CallWithExactGas.NoContract.selector);
+
+    s_caller.callWithExactGas(
+      "", // empty payload as it will revert well before needing it
+      addressWithoutContract,
+      DEFAULT_GAS_LIMIT,
+      DEFAULT_GAS_FOR_CALL_EXACT_CHECK
+    );
+  }
+
+  function test_NoGasForCallExactCheckReverts() public {
+    bytes memory payload = abi.encodeWithSelector(
+      s_caller.callWithExactGas.selector,
+      "", // empty payload as it will revert well before needing it
+      address(s_receiver),
+      DEFAULT_GAS_LIMIT,
+      DEFAULT_GAS_FOR_CALL_EXACT_CHECK
+    );
+
+    (bool success, bytes memory retData) = address(s_caller).call{gas: DEFAULT_GAS_FOR_CALL_EXACT_CHECK - 1}(payload);
+    assertFalse(success);
+    assertEq(retData.length, CallWithExactGas.NoGasForCallExactCheck.selector.length);
+    assertEq(abi.encodeWithSelector(CallWithExactGas.NoGasForCallExactCheck.selector), retData);
+  }
+
+  function test_NotEnoughGasForCallReverts() public {
+    bytes memory payload = abi.encodeWithSelector(
+      s_caller.callWithExactGas.selector,
+      "", // empty payload as it will revert well before needing it
+      address(s_receiver),
+      DEFAULT_GAS_LIMIT,
+      DEFAULT_GAS_FOR_CALL_EXACT_CHECK
+    );
+
+    // Supply enough gas for the final call, the DEFAULT_GAS_FOR_CALL_EXACT_CHECK,
+    // the extcodesize and account for EIP-150. This doesn't account for any other gas
+    // usage, and will therefore fail because the checks and memory stored/loads
+    // also cost gas.
+    uint256 allowedGas = (DEFAULT_GAS_LIMIT + (DEFAULT_GAS_LIMIT / 64)) + DEFAULT_GAS_FOR_CALL_EXACT_CHECK;
+    // extcodesize gas cost
+    allowedGas += EXTCODESIZE_GAS_COST;
+    // EIP-150
+    allowedGas = (allowedGas * 64) / 63;
+
+    // Expect this call to fail due to not having enough gas for the final call
+    (bool success, bytes memory retData) = address(s_caller).call{gas: allowedGas}(payload);
+
+    assertFalse(success);
+    assertEq(retData.length, CallWithExactGas.NotEnoughGasForCall.selector.length);
+    assertEq(abi.encodeWithSelector(CallWithExactGas.NotEnoughGasForCall.selector), retData);
+  }
+}
+
+contract CallWithExactGas__callWithExactGasSafeReturnData is CallWithExactGasSetup {
+  function testFuzz_CallWithExactGasSafeReturnDataSuccess(bytes memory payload, bytes4 funcSelector) public {
+    vm.pauseGasMetering();
+    bytes memory data = abi.encodeWithSelector(funcSelector, payload);
+    vm.assume(
+      funcSelector != GenericReceiver.setRevert.selector &&
+        funcSelector != GenericReceiver.setErr.selector &&
+        funcSelector != 0x5100fc21 // s_toRevert(), which is public and therefore has a function selector
+    );
+    uint16 maxRetBytes = 0;
+
+    vm.expectCall(address(s_receiver), data);
+    vm.resumeGasMetering();
+
+    (bool success, bytes memory retData, uint256 gasUsed) = s_caller.callWithExactGasSafeReturnData(
+      data,
+      address(s_receiver),
+      DEFAULT_GAS_LIMIT,
+      DEFAULT_GAS_FOR_CALL_EXACT_CHECK,
+      maxRetBytes
+    );
+
+    assertTrue(success);
+    assertEq(retData.length, 0);
+    assertGt(gasUsed, 500);
+  }
+
+  function test_CallWithExactGasSafeReturnDataExactGas() public {
+    // The gas cost for `extcodesize`
+    uint256 extcodesizeGas = EXTCODESIZE_GAS_COST;
+    // The calculated overhead for retData initialization
+    uint256 overheadForRetDataInit = 114;
+    // The calculated overhead for otherwise unaccounted for gas usage
+    uint256 overheadForCallWithExactGas = 486;
+
+    bytes memory payload = abi.encodeWithSelector(
+      s_caller.callWithExactGasSafeReturnData.selector,
+      "",
+      address(s_receiver),
+      DEFAULT_GAS_LIMIT,
+      DEFAULT_GAS_FOR_CALL_EXACT_CHECK,
+      0
+    );
+
+    // Since only 63/64th of the gas gets passed, we compensate
+    uint256 allowedGas = (DEFAULT_GAS_LIMIT + (DEFAULT_GAS_LIMIT / 64));
+
+    allowedGas +=
+      extcodesizeGas +
+      DEFAULT_GAS_FOR_CALL_EXACT_CHECK +
+      overheadForRetDataInit +
+      overheadForCallWithExactGas;
+
+    // Due to EIP-150 we expect to lose 1/64, so we compensate for this
+    allowedGas = (allowedGas * 64) / 63;
+
+    vm.expectCall(address(s_receiver), "");
+    (bool success, bytes memory retData) = address(s_caller).call{gas: allowedGas}(payload);
+
+    assertTrue(success);
+    (bool innerSuccess, bytes memory innerRetData, uint256 gasUsed) = abi.decode(retData, (bool, bytes, uint256));
+
+    assertTrue(innerSuccess);
+    assertEq(innerRetData.length, 0);
+    assertGt(gasUsed, 500);
+  }
+
+  function testFuzz_CallWithExactGasReceiverErrorSuccess(uint16 testRetBytes) public {
+    uint16 maxReturnBytes = 500;
+    // Bound with upper limit, otherwise the test runs out of gas.
+    testRetBytes = uint16(bound(testRetBytes, 0, maxReturnBytes * 10));
+
+    bytes memory data = abi.encode("0x52656E73");
+
+    bytes memory errorData = new bytes(testRetBytes);
+    for (uint256 i = 0; i < errorData.length; ++i) {
+      errorData[i] = 0x01;
+    }
+    s_receiver.setErr(errorData);
+    s_receiver.setRevert(true);
+
+    vm.expectCall(address(s_receiver), data);
+
+    (bool success, bytes memory retData, uint256 gasUsed) = s_caller.callWithExactGasSafeReturnData(
+      data,
+      address(s_receiver),
+      DEFAULT_GAS_LIMIT * 10,
+      DEFAULT_GAS_FOR_CALL_EXACT_CHECK,
+      maxReturnBytes
+    );
+
+    assertFalse(success);
+
+    bytes memory expectedReturnData = errorData;
+
+    // If expected return data is longer than MAX_RET_BYTES, truncate it to MAX_RET_BYTES
+    if (expectedReturnData.length > maxReturnBytes) {
+      expectedReturnData = new bytes(maxReturnBytes);
+      for (uint256 i = 0; i < maxReturnBytes; ++i) {
+        expectedReturnData[i] = errorData[i];
+      }
+    }
+    assertEq(expectedReturnData, retData);
+    assertGt(gasUsed, 500);
+  }
+
+  function test_NoContractReverts() public {
+    address addressWithoutContract = address(1337);
+
+    vm.expectRevert(CallWithExactGas.NoContract.selector);
+
+    s_caller.callWithExactGasSafeReturnData(
+      "", // empty payload as it will revert well before needing it
+      addressWithoutContract,
+      DEFAULT_GAS_LIMIT,
+      DEFAULT_GAS_FOR_CALL_EXACT_CHECK,
+      0
+    );
+  }
+
+  function test_NoGasForCallExactCheckReverts() public {
+    bytes memory payload = abi.encodeWithSelector(
+      s_caller.callWithExactGasSafeReturnData.selector,
+      "", // empty payload as it will revert well before needing it
+      address(s_receiver),
+      DEFAULT_GAS_LIMIT,
+      DEFAULT_GAS_FOR_CALL_EXACT_CHECK,
+      0
+    );
+
+    (bool success, bytes memory retData) = address(s_caller).call{gas: DEFAULT_GAS_FOR_CALL_EXACT_CHECK - 1}(payload);
+    assertFalse(success);
+    assertEq(retData.length, CallWithExactGas.NoGasForCallExactCheck.selector.length);
+    assertEq(abi.encodeWithSelector(CallWithExactGas.NoGasForCallExactCheck.selector), retData);
+  }
+
+  function test_NotEnoughGasForCallReverts() public {
+    bytes memory payload = abi.encodeWithSelector(
+      s_caller.callWithExactGasSafeReturnData.selector,
+      "", // empty payload as it will revert well before needing it
+      address(s_receiver),
+      DEFAULT_GAS_LIMIT,
+      DEFAULT_GAS_FOR_CALL_EXACT_CHECK,
+      0
+    );
+
+    // Supply enough gas for the final call, the DEFAULT_GAS_FOR_CALL_EXACT_CHECK,
+    // the extcodesize and account for EIP-150. This doesn't account for any other gas
+    // usage, and will therefore fail because the checks and memory stored/loads
+    // also cost gas.
+    uint256 allowedGas = (DEFAULT_GAS_LIMIT + (DEFAULT_GAS_LIMIT / 64)) + DEFAULT_GAS_FOR_CALL_EXACT_CHECK;
+    // extcodesize gas cost
+    allowedGas += EXTCODESIZE_GAS_COST;
+    // EIP-150
+    allowedGas = (allowedGas * 64) / 63;
+
+    // Expect this call to fail due to not having enough gas for the final call
+    (bool success, bytes memory retData) = address(s_caller).call{gas: allowedGas}(payload);
+
+    assertFalse(success);
+    assertEq(retData.length, CallWithExactGas.NotEnoughGasForCall.selector.length);
+    assertEq(abi.encodeWithSelector(CallWithExactGas.NotEnoughGasForCall.selector), retData);
+  }
+}
+
+contract CallWithExactGas__callWithExactGasEvenIfTargetIsNoContract is CallWithExactGasSetup {
+  function test_CallWithExactGasEvenIfTargetIsNoContractSuccess(bytes memory payload, bytes4 funcSelector) public {
+    vm.pauseGasMetering();
+    bytes memory data = abi.encodeWithSelector(funcSelector, payload);
+    vm.assume(
+      funcSelector != GenericReceiver.setRevert.selector &&
+        funcSelector != GenericReceiver.setErr.selector &&
+        funcSelector != 0x5100fc21 // s_toRevert(), which is public and therefore has a function selector
+    );
+    vm.expectCall(address(s_receiver), data);
+    vm.resumeGasMetering();
+
+    (bool success, bool sufficientGas) = s_caller.callWithExactGasEvenIfTargetIsNoContract(
+      data,
+      address(s_receiver),
+      DEFAULT_GAS_LIMIT,
+      DEFAULT_GAS_FOR_CALL_EXACT_CHECK
+    );
+
+    assertTrue(success);
+    assertTrue(sufficientGas);
+  }
+
+  function test_CallWithExactGasEvenIfTargetIsNoContractExactGasSuccess() public {
+    // The calculated overhead for otherwise unaccounted for gas usage
+    uint256 overheadForCallWithExactGas = 446;
+
+    bytes memory data = abi.encode("0x52656E73");
+
+    bytes memory payload = abi.encodeWithSelector(
+      s_caller.callWithExactGasEvenIfTargetIsNoContract.selector,
+      data,
+      address(s_receiver),
+      DEFAULT_GAS_LIMIT,
+      DEFAULT_GAS_FOR_CALL_EXACT_CHECK
+    );
+
+    // Since only 63/64th of the gas gets passed, we compensate
+    uint256 allowedGas = (DEFAULT_GAS_LIMIT + (DEFAULT_GAS_LIMIT / 64));
+
+    allowedGas += DEFAULT_GAS_FOR_CALL_EXACT_CHECK + overheadForCallWithExactGas;
+
+    // Due to EIP-150 we expect to lose 1/64, so we compensate for this
+    allowedGas = (allowedGas * 64) / 63;
+
+    vm.expectCall(address(s_receiver), data);
+    (bool outerCallSuccess, bytes memory SuccessAndSufficientGas) = address(s_caller).call{gas: allowedGas}(payload);
+
+    // The call succeeds
+    assertTrue(outerCallSuccess);
+
+    (bool success, bool sufficientGas) = abi.decode(SuccessAndSufficientGas, (bool, bool));
+    assertTrue(success);
+    assertTrue(sufficientGas);
+  }
+
+  function test_CallWithExactGasEvenIfTargetIsNoContractReceiverErrorSuccess() public {
+    bytes memory data = abi.encode("0x52656E73");
+
+    bytes memory errorData = new bytes(20);
+    for (uint256 i = 0; i < errorData.length; ++i) {
+      errorData[i] = 0x01;
+    }
+    s_receiver.setErr(errorData);
+    s_receiver.setRevert(true);
+
+    vm.expectCall(address(s_receiver), data);
+
+    (bool success, bool sufficientGas) = s_caller.callWithExactGasEvenIfTargetIsNoContract(
+      data,
+      address(s_receiver),
+      DEFAULT_GAS_LIMIT * 10,
+      DEFAULT_GAS_FOR_CALL_EXACT_CHECK
+    );
+
+    // We don't care if it reverts, we only care if we have enough gas
+    assertFalse(success);
+    assertTrue(sufficientGas);
+  }
+
+  function test_NoContractSuccess() public {
+    bytes memory data = abi.encode("0x52656E73");
+    address addressWithoutContract = address(1337);
+
+    (bool success, bool sufficientGas) = s_caller.callWithExactGasEvenIfTargetIsNoContract(
+      data,
+      addressWithoutContract,
+      DEFAULT_GAS_LIMIT,
+      DEFAULT_GAS_FOR_CALL_EXACT_CHECK
+    );
+
+    assertTrue(success);
+    assertTrue(sufficientGas);
+  }
+
+  function test_NoGasForCallExactCheckReturnFalseSuccess() public {
+    bytes memory payload = abi.encodeWithSelector(
+      s_caller.callWithExactGasEvenIfTargetIsNoContract.selector,
+      "", // empty payload as it will revert well before needing it
+      address(s_receiver),
+      DEFAULT_GAS_LIMIT,
+      DEFAULT_GAS_FOR_CALL_EXACT_CHECK
+    );
+
+    (bool outerCallSuccess, bytes memory SuccessAndSufficientGas) = address(s_caller).call{
+      gas: DEFAULT_GAS_FOR_CALL_EXACT_CHECK - 1
+    }(payload);
+
+    // The call succeeds
+    assertTrue(outerCallSuccess);
+
+    (bool success, bool sufficientGas) = abi.decode(SuccessAndSufficientGas, (bool, bool));
+    assertFalse(success);
+    assertFalse(sufficientGas);
+  }
+
+  function test_NotEnoughGasForCallReturnsFalseSuccess() public {
+    bytes memory payload = abi.encodeWithSelector(
+      s_caller.callWithExactGasEvenIfTargetIsNoContract.selector,
+      "", // empty payload as it will revert well before needing it
+      address(s_receiver),
+      DEFAULT_GAS_LIMIT,
+      DEFAULT_GAS_FOR_CALL_EXACT_CHECK
+    );
+
+    // Supply enough gas for the final call, the DEFAULT_GAS_FOR_CALL_EXACT_CHECK,
+    // and account for EIP-150. This doesn't account for any other gas usage, and
+    // will therefore fail because the checks and memory stored/loads also cost gas.
+    uint256 allowedGas = (DEFAULT_GAS_LIMIT + (DEFAULT_GAS_LIMIT / 64)) + DEFAULT_GAS_FOR_CALL_EXACT_CHECK;
+    // EIP-150
+    allowedGas = (allowedGas * 64) / 63;
+
+    // Expect this call to fail due to not having enough gas for the final call
+    (bool outerCallSuccess, bytes memory SuccessAndSufficientGas) = address(s_caller).call{gas: allowedGas}(payload);
+
+    // The call succeeds
+    assertTrue(outerCallSuccess);
+
+    (bool success, bool sufficientGas) = abi.decode(SuccessAndSufficientGas, (bool, bool));
+    assertFalse(success);
+    assertFalse(sufficientGas);
+  }
+}
diff --git a/contracts/src/v0.8/shared/test/call/CallWithExactGasHelper.sol b/contracts/src/v0.8/shared/test/call/CallWithExactGasHelper.sol
new file mode 100644
index 00000000000..932315639b9
--- /dev/null
+++ b/contracts/src/v0.8/shared/test/call/CallWithExactGasHelper.sol
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.19;
+
+import {CallWithExactGas} from "../../call/CallWithExactGas.sol";
+
+contract CallWithExactGasHelper {
+  function callWithExactGas(
+    bytes memory payload,
+    address target,
+    uint256 gasLimit,
+    uint16 gasForCallExactCheck
+  ) public returns (bool success) {
+    return CallWithExactGas._callWithExactGas(payload, target, gasLimit, gasForCallExactCheck);
+  }
+
+  function callWithExactGasSafeReturnData(
+    bytes memory payload,
+    address target,
+    uint256 gasLimit,
+    uint16 gasForCallExactCheck,
+    uint16 maxReturnBytes
+  ) public returns (bool success, bytes memory retData, uint256 gasUsed) {
+    return
+      CallWithExactGas._callWithExactGasSafeReturnData(payload, target, gasLimit, gasForCallExactCheck, maxReturnBytes);
+  }
+
+  function callWithExactGasEvenIfTargetIsNoContract(
+    bytes memory payload,
+    address target,
+    uint256 gasLimit,
+    uint16 gasForCallExactCheck
+  ) public returns (bool success, bool sufficientGas) {
+    return CallWithExactGas._callWithExactGasEvenIfTargetIsNoContract(payload, target, gasLimit, gasForCallExactCheck);
+  }
+}
diff --git a/contracts/src/v0.8/shared/test/testhelpers/GenericReceiver.sol b/contracts/src/v0.8/shared/test/testhelpers/GenericReceiver.sol
new file mode 100644
index 00000000000..2c058012dfd
--- /dev/null
+++ b/contracts/src/v0.8/shared/test/testhelpers/GenericReceiver.sol
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+contract GenericReceiver {
+  bool public s_toRevert;
+  bytes private s_err;
+
+  constructor(bool toRevert) {
+    s_toRevert = toRevert;
+  }
+
+  function setRevert(bool toRevert) external {
+    s_toRevert = toRevert;
+  }
+
+  function setErr(bytes memory err) external {
+    s_err = err;
+  }
+
+  // solhint-disable-next-line payable-fallback
+  fallback() external {
+    if (s_toRevert) {
+      bytes memory reason = s_err;
+      assembly {
+        revert(add(32, reason), mload(reason))
+      }
+    }
+  }
+}

From 128dba44f02c9b97e51c8a0aeb40c3bc1caca3aa Mon Sep 17 00:00:00 2001
From: Mateusz Sekara <mateusz.sekara@smartcontract.com>
Date: Wed, 29 Nov 2023 15:10:39 +0100
Subject: [PATCH 029/130] CCIP-1336 LogPoller - Bunch of minor improvements
 (#11348)

* Tracking number of logs inserted by LP

* Adding read query to LP

* Index for fourth word in data

* Regenerating mocks

* Filter by address in SelectIndexedLogsByTxHash

* Fix

* Post review fixes

* Post merge fixes
---
 core/chains/evm/logpoller/disabled.go         |   6 +-
 core/chains/evm/logpoller/log_poller.go       |  20 ++-
 core/chains/evm/logpoller/mocks/log_poller.go |  51 +++++--
 core/chains/evm/logpoller/observability.go    |  91 +++++++++---
 .../evm/logpoller/observability_test.go       |  72 ++++++++--
 core/chains/evm/logpoller/orm.go              |  35 ++++-
 core/chains/evm/logpoller/orm_test.go         | 132 +++++++++++++++++-
 core/chains/evm/logpoller/query.go            |  12 ++
 .../0211_log_poller_word_indexes.sql          |   6 +
 9 files changed, 373 insertions(+), 52 deletions(-)
 create mode 100644 core/store/migrate/migrations/0211_log_poller_word_indexes.sql

diff --git a/core/chains/evm/logpoller/disabled.go b/core/chains/evm/logpoller/disabled.go
index b54d4e6fc84..05d591042f4 100644
--- a/core/chains/evm/logpoller/disabled.go
+++ b/core/chains/evm/logpoller/disabled.go
@@ -71,7 +71,7 @@ func (disabled) IndexedLogsByBlockRange(start, end int64, eventSig common.Hash,
 	return nil, ErrDisabled
 }
 
-func (d disabled) IndexedLogsByTxHash(eventSig common.Hash, txHash common.Hash, qopts ...pg.QOpt) ([]Log, error) {
+func (d disabled) IndexedLogsByTxHash(eventSig common.Hash, address common.Address, txHash common.Hash, qopts ...pg.QOpt) ([]Log, error) {
 	return nil, ErrDisabled
 }
 
@@ -106,3 +106,7 @@ func (d disabled) IndexedLogsCreatedAfter(eventSig common.Hash, address common.A
 func (d disabled) LatestBlockByEventSigsAddrsWithConfs(fromBlock int64, eventSigs []common.Hash, addresses []common.Address, confs Confirmations, qopts ...pg.QOpt) (int64, error) {
 	return 0, ErrDisabled
 }
+
+func (d disabled) LogsDataWordBetween(eventSig common.Hash, address common.Address, wordIndexMin, wordIndexMax int, wordValue common.Hash, confs Confirmations, qopts ...pg.QOpt) ([]Log, error) {
+	return nil, ErrDisabled
+}
diff --git a/core/chains/evm/logpoller/log_poller.go b/core/chains/evm/logpoller/log_poller.go
index 7c4ea66cec7..de1999da260 100644
--- a/core/chains/evm/logpoller/log_poller.go
+++ b/core/chains/evm/logpoller/log_poller.go
@@ -53,12 +53,13 @@ type LogPoller interface {
 	IndexedLogs(eventSig common.Hash, address common.Address, topicIndex int, topicValues []common.Hash, confs Confirmations, qopts ...pg.QOpt) ([]Log, error)
 	IndexedLogsByBlockRange(start, end int64, eventSig common.Hash, address common.Address, topicIndex int, topicValues []common.Hash, qopts ...pg.QOpt) ([]Log, error)
 	IndexedLogsCreatedAfter(eventSig common.Hash, address common.Address, topicIndex int, topicValues []common.Hash, after time.Time, confs Confirmations, qopts ...pg.QOpt) ([]Log, error)
-	IndexedLogsByTxHash(eventSig common.Hash, txHash common.Hash, qopts ...pg.QOpt) ([]Log, error)
+	IndexedLogsByTxHash(eventSig common.Hash, address common.Address, txHash common.Hash, qopts ...pg.QOpt) ([]Log, error)
 	IndexedLogsTopicGreaterThan(eventSig common.Hash, address common.Address, topicIndex int, topicValueMin common.Hash, confs Confirmations, qopts ...pg.QOpt) ([]Log, error)
 	IndexedLogsTopicRange(eventSig common.Hash, address common.Address, topicIndex int, topicValueMin common.Hash, topicValueMax common.Hash, confs Confirmations, qopts ...pg.QOpt) ([]Log, error)
 	IndexedLogsWithSigsExcluding(address common.Address, eventSigA, eventSigB common.Hash, topicIndex int, fromBlock, toBlock int64, confs Confirmations, qopts ...pg.QOpt) ([]Log, error)
 	LogsDataWordRange(eventSig common.Hash, address common.Address, wordIndex int, wordValueMin, wordValueMax common.Hash, confs Confirmations, qopts ...pg.QOpt) ([]Log, error)
 	LogsDataWordGreaterThan(eventSig common.Hash, address common.Address, wordIndex int, wordValueMin common.Hash, confs Confirmations, qopts ...pg.QOpt) ([]Log, error)
+	LogsDataWordBetween(eventSig common.Hash, address common.Address, wordIndexMin, wordIndexMax int, wordValue common.Hash, confs Confirmations, qopts ...pg.QOpt) ([]Log, error)
 }
 
 type Confirmations int
@@ -969,8 +970,8 @@ func (lp *logPoller) IndexedLogsCreatedAfter(eventSig common.Hash, address commo
 	return lp.orm.SelectIndexedLogsCreatedAfter(address, eventSig, topicIndex, topicValues, after, confs, qopts...)
 }
 
-func (lp *logPoller) IndexedLogsByTxHash(eventSig common.Hash, txHash common.Hash, qopts ...pg.QOpt) ([]Log, error) {
-	return lp.orm.SelectIndexedLogsByTxHash(eventSig, txHash, qopts...)
+func (lp *logPoller) IndexedLogsByTxHash(eventSig common.Hash, address common.Address, txHash common.Hash, qopts ...pg.QOpt) ([]Log, error) {
+	return lp.orm.SelectIndexedLogsByTxHash(address, eventSig, txHash, qopts...)
 }
 
 // LogsDataWordGreaterThan note index is 0 based.
@@ -1021,6 +1022,19 @@ func (lp *logPoller) LatestBlockByEventSigsAddrsWithConfs(fromBlock int64, event
 	return lp.orm.SelectLatestBlockByEventSigsAddrsWithConfs(fromBlock, eventSigs, addresses, confs, qopts...)
 }
 
+// LogsDataWordBetween retrieves a slice of Log records that match specific criteria.
+// Besides generic filters like eventSig, address and confs, it also verifies data content against wordValue
+// data[wordIndexMin] <= wordValue <= data[wordIndexMax].
+//
+// Passing the same value for wordIndexMin and wordIndexMax will check the equality of the wordValue at that index.
+// Leading to returning logs matching: data[wordIndexMin] == wordValue.
+//
+// This function is particularly useful for filtering logs by data word values and their positions within the event data.
+// It returns an empty slice if no logs match the provided criteria.
+func (lp *logPoller) LogsDataWordBetween(eventSig common.Hash, address common.Address, wordIndexMin, wordIndexMax int, wordValue common.Hash, confs Confirmations, qopts ...pg.QOpt) ([]Log, error) {
+	return lp.orm.SelectLogsDataWordBetween(address, eventSig, wordIndexMin, wordIndexMax, wordValue, confs, qopts...)
+}
+
 // GetBlocksRange tries to get the specified block numbers from the log pollers
 // blocks table. It falls back to the RPC for any unfulfilled requested blocks.
 func (lp *logPoller) GetBlocksRange(ctx context.Context, numbers []uint64, qopts ...pg.QOpt) ([]LogPollerBlock, error) {
diff --git a/core/chains/evm/logpoller/mocks/log_poller.go b/core/chains/evm/logpoller/mocks/log_poller.go
index 01be5f7ba55..fe4ccc965cc 100644
--- a/core/chains/evm/logpoller/mocks/log_poller.go
+++ b/core/chains/evm/logpoller/mocks/log_poller.go
@@ -164,32 +164,32 @@ func (_m *LogPoller) IndexedLogsByBlockRange(start int64, end int64, eventSig co
 	return r0, r1
 }
 
-// IndexedLogsByTxHash provides a mock function with given fields: eventSig, txHash, qopts
-func (_m *LogPoller) IndexedLogsByTxHash(eventSig common.Hash, txHash common.Hash, qopts ...pg.QOpt) ([]logpoller.Log, error) {
+// IndexedLogsByTxHash provides a mock function with given fields: eventSig, address, txHash, qopts
+func (_m *LogPoller) IndexedLogsByTxHash(eventSig common.Hash, address common.Address, txHash common.Hash, qopts ...pg.QOpt) ([]logpoller.Log, error) {
 	_va := make([]interface{}, len(qopts))
 	for _i := range qopts {
 		_va[_i] = qopts[_i]
 	}
 	var _ca []interface{}
-	_ca = append(_ca, eventSig, txHash)
+	_ca = append(_ca, eventSig, address, txHash)
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
 	var r0 []logpoller.Log
 	var r1 error
-	if rf, ok := ret.Get(0).(func(common.Hash, common.Hash, ...pg.QOpt) ([]logpoller.Log, error)); ok {
-		return rf(eventSig, txHash, qopts...)
+	if rf, ok := ret.Get(0).(func(common.Hash, common.Address, common.Hash, ...pg.QOpt) ([]logpoller.Log, error)); ok {
+		return rf(eventSig, address, txHash, qopts...)
 	}
-	if rf, ok := ret.Get(0).(func(common.Hash, common.Hash, ...pg.QOpt) []logpoller.Log); ok {
-		r0 = rf(eventSig, txHash, qopts...)
+	if rf, ok := ret.Get(0).(func(common.Hash, common.Address, common.Hash, ...pg.QOpt) []logpoller.Log); ok {
+		r0 = rf(eventSig, address, txHash, qopts...)
 	} else {
 		if ret.Get(0) != nil {
 			r0 = ret.Get(0).([]logpoller.Log)
 		}
 	}
 
-	if rf, ok := ret.Get(1).(func(common.Hash, common.Hash, ...pg.QOpt) error); ok {
-		r1 = rf(eventSig, txHash, qopts...)
+	if rf, ok := ret.Get(1).(func(common.Hash, common.Address, common.Hash, ...pg.QOpt) error); ok {
+		r1 = rf(eventSig, address, txHash, qopts...)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -522,6 +522,39 @@ func (_m *LogPoller) LogsCreatedAfter(eventSig common.Hash, address common.Addre
 	return r0, r1
 }
 
+// LogsDataWordBetween provides a mock function with given fields: eventSig, address, wordIndexMin, wordIndexMax, wordValue, confs, qopts
+func (_m *LogPoller) LogsDataWordBetween(eventSig common.Hash, address common.Address, wordIndexMin int, wordIndexMax int, wordValue common.Hash, confs logpoller.Confirmations, qopts ...pg.QOpt) ([]logpoller.Log, error) {
+	_va := make([]interface{}, len(qopts))
+	for _i := range qopts {
+		_va[_i] = qopts[_i]
+	}
+	var _ca []interface{}
+	_ca = append(_ca, eventSig, address, wordIndexMin, wordIndexMax, wordValue, confs)
+	_ca = append(_ca, _va...)
+	ret := _m.Called(_ca...)
+
+	var r0 []logpoller.Log
+	var r1 error
+	if rf, ok := ret.Get(0).(func(common.Hash, common.Address, int, int, common.Hash, logpoller.Confirmations, ...pg.QOpt) ([]logpoller.Log, error)); ok {
+		return rf(eventSig, address, wordIndexMin, wordIndexMax, wordValue, confs, qopts...)
+	}
+	if rf, ok := ret.Get(0).(func(common.Hash, common.Address, int, int, common.Hash, logpoller.Confirmations, ...pg.QOpt) []logpoller.Log); ok {
+		r0 = rf(eventSig, address, wordIndexMin, wordIndexMax, wordValue, confs, qopts...)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]logpoller.Log)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(common.Hash, common.Address, int, int, common.Hash, logpoller.Confirmations, ...pg.QOpt) error); ok {
+		r1 = rf(eventSig, address, wordIndexMin, wordIndexMax, wordValue, confs, qopts...)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // LogsDataWordGreaterThan provides a mock function with given fields: eventSig, address, wordIndex, wordValueMin, confs, qopts
 func (_m *LogPoller) LogsDataWordGreaterThan(eventSig common.Hash, address common.Address, wordIndex int, wordValueMin common.Hash, confs logpoller.Confirmations, qopts ...pg.QOpt) ([]logpoller.Log, error) {
 	_va := make([]interface{}, len(qopts))
diff --git a/core/chains/evm/logpoller/observability.go b/core/chains/evm/logpoller/observability.go
index 9826d503b9f..a7a0d3c03d5 100644
--- a/core/chains/evm/logpoller/observability.go
+++ b/core/chains/evm/logpoller/observability.go
@@ -14,6 +14,14 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 )
 
+type queryType string
+
+const (
+	create queryType = "create"
+	read   queryType = "read"
+	del    queryType = "delete"
+)
+
 var (
 	sqlLatencyBuckets = []float64{
 		float64(1 * time.Millisecond),
@@ -41,47 +49,63 @@ var (
 		Name:    "log_poller_query_duration",
 		Help:    "Measures duration of Log Poller's queries fetching logs",
 		Buckets: sqlLatencyBuckets,
-	}, []string{"evmChainID", "query"})
+	}, []string{"evmChainID", "query", "type"})
 	lpQueryDataSets = promauto.NewGaugeVec(prometheus.GaugeOpts{
 		Name: "log_poller_query_dataset_size",
 		Help: "Measures size of the datasets returned by Log Poller's queries",
-	}, []string{"evmChainID", "query"})
+	}, []string{"evmChainID", "query", "type"})
+	lpLogsInserted = promauto.NewCounterVec(prometheus.CounterOpts{
+		Name: "log_poller_logs_inserted",
+		Help: "Counter to track number of logs inserted by Log Poller",
+	}, []string{"evmChainID"})
+	lpBlockInserted = promauto.NewCounterVec(prometheus.CounterOpts{
+		Name: "log_poller_blocks_inserted",
+		Help: "Counter to track number of blocks inserted by Log Poller",
+	}, []string{"evmChainID"})
 )
 
 // ObservedORM is a decorator layer for ORM used by LogPoller, responsible for pushing Prometheus metrics reporting duration and size of result set for the queries.
 // It doesn't change internal logic, because all calls are delegated to the origin ORM
 type ObservedORM struct {
 	ORM
-	queryDuration *prometheus.HistogramVec
-	datasetSize   *prometheus.GaugeVec
-	chainId       string
+	queryDuration  *prometheus.HistogramVec
+	datasetSize    *prometheus.GaugeVec
+	logsInserted   *prometheus.CounterVec
+	blocksInserted *prometheus.CounterVec
+	chainId        string
 }
 
 // NewObservedORM creates an observed version of log poller's ORM created by NewORM
 // Please see ObservedLogPoller for more details on how latencies are measured
 func NewObservedORM(chainID *big.Int, db *sqlx.DB, lggr logger.Logger, cfg pg.QConfig) *ObservedORM {
 	return &ObservedORM{
-		ORM:           NewORM(chainID, db, lggr, cfg),
-		queryDuration: lpQueryDuration,
-		datasetSize:   lpQueryDataSets,
-		chainId:       chainID.String(),
+		ORM:            NewORM(chainID, db, lggr, cfg),
+		queryDuration:  lpQueryDuration,
+		datasetSize:    lpQueryDataSets,
+		logsInserted:   lpLogsInserted,
+		blocksInserted: lpBlockInserted,
+		chainId:        chainID.String(),
 	}
 }
 
 func (o *ObservedORM) InsertLogs(logs []Log, qopts ...pg.QOpt) error {
-	return withObservedExec(o, "InsertLogs", func() error {
+	err := withObservedExec(o, "InsertLogs", create, func() error {
 		return o.ORM.InsertLogs(logs, qopts...)
 	})
+	trackInsertedLogsAndBlock(o, logs, nil, err)
+	return err
 }
 
 func (o *ObservedORM) InsertLogsWithBlock(logs []Log, block LogPollerBlock, qopts ...pg.QOpt) error {
-	return withObservedExec(o, "InsertLogsWithBlock", func() error {
+	err := withObservedExec(o, "InsertLogsWithBlock", create, func() error {
 		return o.ORM.InsertLogsWithBlock(logs, block, qopts...)
 	})
+	trackInsertedLogsAndBlock(o, logs, &block, err)
+	return err
 }
 
 func (o *ObservedORM) InsertFilter(filter Filter, qopts ...pg.QOpt) error {
-	return withObservedExec(o, "InsertFilter", func() error {
+	return withObservedExec(o, "InsertFilter", create, func() error {
 		return o.ORM.InsertFilter(filter, qopts...)
 	})
 }
@@ -93,25 +117,25 @@ func (o *ObservedORM) LoadFilters(qopts ...pg.QOpt) (map[string]Filter, error) {
 }
 
 func (o *ObservedORM) DeleteFilter(name string, qopts ...pg.QOpt) error {
-	return withObservedExec(o, "DeleteFilter", func() error {
+	return withObservedExec(o, "DeleteFilter", del, func() error {
 		return o.ORM.DeleteFilter(name, qopts...)
 	})
 }
 
 func (o *ObservedORM) DeleteBlocksBefore(end int64, qopts ...pg.QOpt) error {
-	return withObservedExec(o, "DeleteBlocksBefore", func() error {
+	return withObservedExec(o, "DeleteBlocksBefore", del, func() error {
 		return o.ORM.DeleteBlocksBefore(end, qopts...)
 	})
 }
 
 func (o *ObservedORM) DeleteLogsAndBlocksAfter(start int64, qopts ...pg.QOpt) error {
-	return withObservedExec(o, "DeleteLogsAndBlocksAfter", func() error {
+	return withObservedExec(o, "DeleteLogsAndBlocksAfter", del, func() error {
 		return o.ORM.DeleteLogsAndBlocksAfter(start, qopts...)
 	})
 }
 
 func (o *ObservedORM) DeleteExpiredLogs(qopts ...pg.QOpt) error {
-	return withObservedExec(o, "DeleteExpiredLogs", func() error {
+	return withObservedExec(o, "DeleteExpiredLogs", del, func() error {
 		return o.ORM.DeleteExpiredLogs(qopts...)
 	})
 }
@@ -176,9 +200,9 @@ func (o *ObservedORM) SelectLogs(start, end int64, address common.Address, event
 	})
 }
 
-func (o *ObservedORM) IndexedLogsByTxHash(eventSig common.Hash, txHash common.Hash, qopts ...pg.QOpt) ([]Log, error) {
-	return withObservedQueryAndResults(o, "IndexedLogsByTxHash", func() ([]Log, error) {
-		return o.ORM.SelectIndexedLogsByTxHash(eventSig, txHash, qopts...)
+func (o *ObservedORM) SelectIndexedLogsByTxHash(address common.Address, eventSig common.Hash, txHash common.Hash, qopts ...pg.QOpt) ([]Log, error) {
+	return withObservedQueryAndResults(o, "SelectIndexedLogsByTxHash", func() ([]Log, error) {
+		return o.ORM.SelectIndexedLogsByTxHash(address, eventSig, txHash, qopts...)
 	})
 }
 
@@ -212,6 +236,12 @@ func (o *ObservedORM) SelectLogsDataWordGreaterThan(address common.Address, even
 	})
 }
 
+func (o *ObservedORM) SelectLogsDataWordBetween(address common.Address, eventSig common.Hash, wordIndexMin int, wordIndexMax int, wordValue common.Hash, confs Confirmations, qopts ...pg.QOpt) ([]Log, error) {
+	return withObservedQueryAndResults(o, "SelectLogsDataWordBetween", func() ([]Log, error) {
+		return o.ORM.SelectLogsDataWordBetween(address, eventSig, wordIndexMin, wordIndexMax, wordValue, confs, qopts...)
+	})
+}
+
 func (o *ObservedORM) SelectIndexedLogsTopicGreaterThan(address common.Address, eventSig common.Hash, topicIndex int, topicValueMin common.Hash, confs Confirmations, qopts ...pg.QOpt) ([]Log, error) {
 	return withObservedQueryAndResults(o, "SelectIndexedLogsTopicGreaterThan", func() ([]Log, error) {
 		return o.ORM.SelectIndexedLogsTopicGreaterThan(address, eventSig, topicIndex, topicValueMin, confs, qopts...)
@@ -228,7 +258,7 @@ func withObservedQueryAndResults[T any](o *ObservedORM, queryName string, query
 	results, err := withObservedQuery(o, queryName, query)
 	if err == nil {
 		o.datasetSize.
-			WithLabelValues(o.chainId, queryName).
+			WithLabelValues(o.chainId, queryName, string(read)).
 			Set(float64(len(results)))
 	}
 	return results, err
@@ -238,18 +268,33 @@ func withObservedQuery[T any](o *ObservedORM, queryName string, query func() (T,
 	queryStarted := time.Now()
 	defer func() {
 		o.queryDuration.
-			WithLabelValues(o.chainId, queryName).
+			WithLabelValues(o.chainId, queryName, string(read)).
 			Observe(float64(time.Since(queryStarted)))
 	}()
 	return query()
 }
 
-func withObservedExec(o *ObservedORM, query string, exec func() error) error {
+func withObservedExec(o *ObservedORM, query string, queryType queryType, exec func() error) error {
 	queryStarted := time.Now()
 	defer func() {
 		o.queryDuration.
-			WithLabelValues(o.chainId, query).
+			WithLabelValues(o.chainId, query, string(queryType)).
 			Observe(float64(time.Since(queryStarted)))
 	}()
 	return exec()
 }
+
+func trackInsertedLogsAndBlock(o *ObservedORM, logs []Log, block *LogPollerBlock, err error) {
+	if err != nil {
+		return
+	}
+	o.logsInserted.
+		WithLabelValues(o.chainId).
+		Add(float64(len(logs)))
+
+	if block != nil {
+		o.blocksInserted.
+			WithLabelValues(o.chainId).
+			Inc()
+	}
+}
diff --git a/core/chains/evm/logpoller/observability_test.go b/core/chains/evm/logpoller/observability_test.go
index 83bd60a5564..76575f46ca4 100644
--- a/core/chains/evm/logpoller/observability_test.go
+++ b/core/chains/evm/logpoller/observability_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/prometheus/client_golang/prometheus"
 	io_prometheus_client "github.com/prometheus/client_model/go"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zapcore"
 
@@ -18,6 +19,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
+	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func TestMultipleMetricsArePublished(t *testing.T) {
@@ -54,7 +56,7 @@ func TestShouldPublishDurationInCaseOfError(t *testing.T) {
 	require.Error(t, err)
 
 	require.Equal(t, 1, testutil.CollectAndCount(orm.queryDuration))
-	require.Equal(t, 1, counterFromHistogramByLabels(t, orm.queryDuration, "200", "SelectLatestLogByEventSigWithConfs"))
+	require.Equal(t, 1, counterFromHistogramByLabels(t, orm.queryDuration, "200", "SelectLatestLogByEventSigWithConfs", "read"))
 }
 
 func TestMetricsAreProperlyPopulatedWithLabels(t *testing.T) {
@@ -68,14 +70,14 @@ func TestMetricsAreProperlyPopulatedWithLabels(t *testing.T) {
 		require.NoError(t, err)
 	}
 
-	require.Equal(t, expectedCount, counterFromHistogramByLabels(t, orm.queryDuration, "420", "query"))
-	require.Equal(t, expectedSize, counterFromGaugeByLabels(orm.datasetSize, "420", "query"))
+	require.Equal(t, expectedCount, counterFromHistogramByLabels(t, orm.queryDuration, "420", "query", "read"))
+	require.Equal(t, expectedSize, counterFromGaugeByLabels(orm.datasetSize, "420", "query", "read"))
 
-	require.Equal(t, 0, counterFromHistogramByLabels(t, orm.queryDuration, "420", "other_query"))
-	require.Equal(t, 0, counterFromHistogramByLabels(t, orm.queryDuration, "5", "query"))
+	require.Equal(t, 0, counterFromHistogramByLabels(t, orm.queryDuration, "420", "other_query", "read"))
+	require.Equal(t, 0, counterFromHistogramByLabels(t, orm.queryDuration, "5", "query", "read"))
 
-	require.Equal(t, 0, counterFromGaugeByLabels(orm.datasetSize, "420", "other_query"))
-	require.Equal(t, 0, counterFromGaugeByLabels(orm.datasetSize, "5", "query"))
+	require.Equal(t, 0, counterFromGaugeByLabels(orm.datasetSize, "420", "other_query", "read"))
+	require.Equal(t, 0, counterFromGaugeByLabels(orm.datasetSize, "5", "query", "read"))
 }
 
 func TestNotPublishingDatasetSizeInCaseOfError(t *testing.T) {
@@ -84,16 +86,60 @@ func TestNotPublishingDatasetSizeInCaseOfError(t *testing.T) {
 	_, err := withObservedQueryAndResults(orm, "errorQuery", func() ([]string, error) { return nil, fmt.Errorf("error") })
 	require.Error(t, err)
 
-	require.Equal(t, 1, counterFromHistogramByLabels(t, orm.queryDuration, "420", "errorQuery"))
-	require.Equal(t, 0, counterFromGaugeByLabels(orm.datasetSize, "420", "errorQuery"))
+	require.Equal(t, 1, counterFromHistogramByLabels(t, orm.queryDuration, "420", "errorQuery", "read"))
+	require.Equal(t, 0, counterFromGaugeByLabels(orm.datasetSize, "420", "errorQuery", "read"))
 }
 
 func TestMetricsAreProperlyPopulatedForWrites(t *testing.T) {
 	orm := createObservedORM(t, 420)
-	require.NoError(t, withObservedExec(orm, "execQuery", func() error { return nil }))
-	require.Error(t, withObservedExec(orm, "execQuery", func() error { return fmt.Errorf("error") }))
+	require.NoError(t, withObservedExec(orm, "execQuery", create, func() error { return nil }))
+	require.Error(t, withObservedExec(orm, "execQuery", create, func() error { return fmt.Errorf("error") }))
 
-	require.Equal(t, 2, counterFromHistogramByLabels(t, orm.queryDuration, "420", "execQuery"))
+	require.Equal(t, 2, counterFromHistogramByLabels(t, orm.queryDuration, "420", "execQuery", "create"))
+}
+
+func TestCountersAreProperlyPopulatedForWrites(t *testing.T) {
+	orm := createObservedORM(t, 420)
+	logs := generateRandomLogs(420, 20)
+
+	// First insert 10 logs
+	require.NoError(t, orm.InsertLogs(logs[:10]))
+	assert.Equal(t, float64(10), testutil.ToFloat64(orm.logsInserted.WithLabelValues("420")))
+
+	// Insert 5 more logs with block
+	require.NoError(t, orm.InsertLogsWithBlock(logs[10:15], NewLogPollerBlock(utils.RandomBytes32(), 10, time.Now(), 5)))
+	assert.Equal(t, float64(15), testutil.ToFloat64(orm.logsInserted.WithLabelValues("420")))
+	assert.Equal(t, float64(1), testutil.ToFloat64(orm.blocksInserted.WithLabelValues("420")))
+
+	// Insert 5 more logs with block
+	require.NoError(t, orm.InsertLogsWithBlock(logs[15:], NewLogPollerBlock(utils.RandomBytes32(), 15, time.Now(), 5)))
+	assert.Equal(t, float64(20), testutil.ToFloat64(orm.logsInserted.WithLabelValues("420")))
+	assert.Equal(t, float64(2), testutil.ToFloat64(orm.blocksInserted.WithLabelValues("420")))
+
+	// Don't update counters in case of an error
+	require.Error(t, orm.InsertLogsWithBlock(logs, NewLogPollerBlock(utils.RandomBytes32(), 0, time.Now(), 0)))
+	assert.Equal(t, float64(20), testutil.ToFloat64(orm.logsInserted.WithLabelValues("420")))
+	assert.Equal(t, float64(2), testutil.ToFloat64(orm.blocksInserted.WithLabelValues("420")))
+}
+
+func generateRandomLogs(chainId, count int) []Log {
+	logs := make([]Log, count)
+	for i := range logs {
+		logs[i] = Log{
+			EvmChainId:     utils.NewBigI(int64(chainId)),
+			LogIndex:       int64(i + 1),
+			BlockHash:      utils.RandomBytes32(),
+			BlockNumber:    int64(i + 1),
+			BlockTimestamp: time.Now(),
+			Topics:         [][]byte{},
+			EventSig:       utils.RandomBytes32(),
+			Address:        utils.RandomAddress(),
+			TxHash:         utils.RandomBytes32(),
+			Data:           []byte{},
+			CreatedAt:      time.Now(),
+		}
+	}
+	return logs
 }
 
 func createObservedORM(t *testing.T, chainId int64) *ObservedORM {
@@ -107,6 +153,8 @@ func createObservedORM(t *testing.T, chainId int64) *ObservedORM {
 func resetMetrics(lp ObservedORM) {
 	lp.queryDuration.Reset()
 	lp.datasetSize.Reset()
+	lp.logsInserted.Reset()
+	lp.blocksInserted.Reset()
 }
 
 func counterFromGaugeByLabels(gaugeVec *prometheus.GaugeVec, labels ...string) int {
diff --git a/core/chains/evm/logpoller/orm.go b/core/chains/evm/logpoller/orm.go
index c6134ed4b69..c24d423b253 100644
--- a/core/chains/evm/logpoller/orm.go
+++ b/core/chains/evm/logpoller/orm.go
@@ -48,9 +48,10 @@ type ORM interface {
 	SelectIndexedLogsTopicGreaterThan(address common.Address, eventSig common.Hash, topicIndex int, topicValueMin common.Hash, confs Confirmations, qopts ...pg.QOpt) ([]Log, error)
 	SelectIndexedLogsTopicRange(address common.Address, eventSig common.Hash, topicIndex int, topicValueMin, topicValueMax common.Hash, confs Confirmations, qopts ...pg.QOpt) ([]Log, error)
 	SelectIndexedLogsWithSigsExcluding(sigA, sigB common.Hash, topicIndex int, address common.Address, startBlock, endBlock int64, confs Confirmations, qopts ...pg.QOpt) ([]Log, error)
-	SelectIndexedLogsByTxHash(eventSig common.Hash, txHash common.Hash, qopts ...pg.QOpt) ([]Log, error)
+	SelectIndexedLogsByTxHash(address common.Address, eventSig common.Hash, txHash common.Hash, qopts ...pg.QOpt) ([]Log, error)
 	SelectLogsDataWordRange(address common.Address, eventSig common.Hash, wordIndex int, wordValueMin, wordValueMax common.Hash, confs Confirmations, qopts ...pg.QOpt) ([]Log, error)
 	SelectLogsDataWordGreaterThan(address common.Address, eventSig common.Hash, wordIndex int, wordValueMin common.Hash, confs Confirmations, qopts ...pg.QOpt) ([]Log, error)
+	SelectLogsDataWordBetween(address common.Address, eventSig common.Hash, wordIndexMin int, wordIndexMax int, wordValue common.Hash, confs Confirmations, qopts ...pg.QOpt) ([]Log, error)
 }
 
 type DbORM struct {
@@ -535,6 +536,32 @@ func (o *DbORM) SelectLogsDataWordGreaterThan(address common.Address, eventSig c
 	return logs, nil
 }
 
+func (o *DbORM) SelectLogsDataWordBetween(address common.Address, eventSig common.Hash, wordIndexMin int, wordIndexMax int, wordValue common.Hash, confs Confirmations, qopts ...pg.QOpt) ([]Log, error) {
+	args, err := newQueryArgsForEvent(o.chainID, address, eventSig).
+		withWordIndexMin(wordIndexMin).
+		withWordIndexMax(wordIndexMax).
+		withWordValue(wordValue).
+		withConfs(confs).
+		toArgs()
+	if err != nil {
+		return nil, err
+	}
+	query := fmt.Sprintf(`
+		SELECT * FROM evm.logs 
+			WHERE evm_chain_id = :evm_chain_id
+			AND address = :address
+			AND event_sig = :event_sig
+			AND substring(data from 32*:word_index_min+1 for 32) <= :word_value
+			AND substring(data from 32*:word_index_max+1 for 32) >= :word_value
+			AND block_number <= %s
+			ORDER BY (block_number, log_index)`, nestedBlockNumberQuery(confs))
+	var logs []Log
+	if err = o.q.WithOpts(qopts...).SelectNamed(&logs, query, args); err != nil {
+		return nil, err
+	}
+	return logs, nil
+}
+
 func (o *DbORM) SelectIndexedLogsTopicGreaterThan(address common.Address, eventSig common.Hash, topicIndex int, topicValueMin common.Hash, confs Confirmations, qopts ...pg.QOpt) ([]Log, error) {
 	args, err := newQueryArgsForEvent(o.chainID, address, eventSig).
 		withTopicIndex(topicIndex).
@@ -664,9 +691,10 @@ func (o *DbORM) SelectIndexedLogsCreatedAfter(address common.Address, eventSig c
 	return logs, nil
 }
 
-func (o *DbORM) SelectIndexedLogsByTxHash(eventSig common.Hash, txHash common.Hash, qopts ...pg.QOpt) ([]Log, error) {
+func (o *DbORM) SelectIndexedLogsByTxHash(address common.Address, eventSig common.Hash, txHash common.Hash, qopts ...pg.QOpt) ([]Log, error) {
 	args, err := newQueryArgs(o.chainID).
 		withTxHash(txHash).
+		withAddress(address).
 		withEventSig(eventSig).
 		toArgs()
 	if err != nil {
@@ -676,8 +704,9 @@ func (o *DbORM) SelectIndexedLogsByTxHash(eventSig common.Hash, txHash common.Ha
 	err = o.q.WithOpts(qopts...).SelectNamed(&logs, `
 		SELECT * FROM evm.logs 
 			WHERE evm_chain_id = :evm_chain_id
+			AND address = :address
+			AND event_sig = :event_sig			  
 			AND tx_hash = :tx_hash
-			AND event_sig = :event_sig
 			ORDER BY (block_number, log_index)`, args)
 	if err != nil {
 		return nil, err
diff --git a/core/chains/evm/logpoller/orm_test.go b/core/chains/evm/logpoller/orm_test.go
index e55ebeccecf..2a6ebb2c04e 100644
--- a/core/chains/evm/logpoller/orm_test.go
+++ b/core/chains/evm/logpoller/orm_test.go
@@ -15,6 +15,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest/heavyweight"
@@ -49,6 +50,21 @@ func GenLogWithTimestamp(chainID *big.Int, logIndex int64, blockNum int64, block
 	}
 }
 
+func GenLogWithData(chainID *big.Int, address common.Address, eventSig common.Hash, logIndex int64, blockNum int64, data []byte) logpoller.Log {
+	return logpoller.Log{
+		EvmChainId:     utils.NewBig(chainID),
+		LogIndex:       logIndex,
+		BlockHash:      utils.RandomBytes32(),
+		BlockNumber:    blockNum,
+		EventSig:       eventSig,
+		Topics:         [][]byte{},
+		Address:        address,
+		TxHash:         utils.RandomBytes32(),
+		Data:           data,
+		BlockTimestamp: time.Now(),
+	}
+}
+
 func TestLogPoller_Batching(t *testing.T) {
 	t.Parallel()
 	th := SetupTH(t, false, 2, 3, 2, 1000)
@@ -568,7 +584,7 @@ func TestORM_SelectIndexedLogsByTxHash(t *testing.T) {
 	}
 	require.NoError(t, o1.InsertLogs(logs))
 
-	retrievedLogs, err := o1.SelectIndexedLogsByTxHash(eventSig, txHash)
+	retrievedLogs, err := o1.SelectIndexedLogsByTxHash(addr, eventSig, txHash)
 	require.NoError(t, err)
 
 	require.Equal(t, 2, len(retrievedLogs))
@@ -1434,3 +1450,117 @@ func TestInsertLogsInTx(t *testing.T) {
 		})
 	}
 }
+
+func TestSelectLogsDataWordBetween(t *testing.T) {
+	address := utils.RandomAddress()
+	eventSig := utils.RandomBytes32()
+	th := SetupTH(t, false, 2, 3, 2, 1000)
+
+	firstLogData := make([]byte, 0, 64)
+	firstLogData = append(firstLogData, logpoller.EvmWord(1).Bytes()...)
+	firstLogData = append(firstLogData, logpoller.EvmWord(10).Bytes()...)
+
+	secondLogData := make([]byte, 0, 64)
+	secondLogData = append(secondLogData, logpoller.EvmWord(5).Bytes()...)
+	secondLogData = append(secondLogData, logpoller.EvmWord(20).Bytes()...)
+
+	err := th.ORM.InsertLogsWithBlock(
+		[]logpoller.Log{
+			GenLogWithData(th.ChainID, address, eventSig, 1, 1, firstLogData),
+			GenLogWithData(th.ChainID, address, eventSig, 2, 2, secondLogData),
+		},
+		logpoller.NewLogPollerBlock(utils.RandomBytes32(), 10, time.Now(), 1),
+	)
+	require.NoError(t, err)
+
+	tests := []struct {
+		name         string
+		wordValue    uint64
+		expectedLogs []int64
+	}{
+		{
+			name:         "returns only first log",
+			wordValue:    2,
+			expectedLogs: []int64{1},
+		},
+		{
+			name:         "returns only second log",
+			wordValue:    11,
+			expectedLogs: []int64{2},
+		},
+		{
+			name:         "returns both logs if word value is between",
+			wordValue:    5,
+			expectedLogs: []int64{1, 2},
+		},
+		{
+			name:         "returns no logs if word value is outside of the range",
+			wordValue:    21,
+			expectedLogs: []int64{},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			logs, err1 := th.ORM.SelectLogsDataWordBetween(address, eventSig, 0, 1, logpoller.EvmWord(tt.wordValue), logpoller.Unconfirmed)
+			assert.NoError(t, err1)
+			assert.Len(t, logs, len(tt.expectedLogs))
+
+			for index := range logs {
+				assert.Equal(t, tt.expectedLogs[index], logs[index].BlockNumber)
+			}
+		})
+	}
+}
+
+func Benchmark_LogsDataWordBetween(b *testing.B) {
+	chainId := big.NewInt(137)
+	_, db := heavyweight.FullTestDBV2(b, nil)
+	o := logpoller.NewORM(chainId, db, logger.Test(b), pgtest.NewQConfig(false))
+
+	numberOfReports := 100_000
+	numberOfMessagesPerReport := 256
+
+	commitStoreAddress := utils.RandomAddress()
+	commitReportAccepted := utils.RandomBytes32()
+
+	var dbLogs []logpoller.Log
+	for i := 0; i < numberOfReports; i++ {
+		data := make([]byte, 64)
+		// MinSeqNr
+		data = append(data, logpoller.EvmWord(uint64(numberOfMessagesPerReport*i+1)).Bytes()...)
+		// MaxSeqNr
+		data = append(data, logpoller.EvmWord(uint64(numberOfMessagesPerReport*(i+1))).Bytes()...)
+
+		dbLogs = append(dbLogs, logpoller.Log{
+			EvmChainId:     utils.NewBig(chainId),
+			LogIndex:       int64(i + 1),
+			BlockHash:      utils.RandomBytes32(),
+			BlockNumber:    int64(i + 1),
+			BlockTimestamp: time.Now(),
+			EventSig:       commitReportAccepted,
+			Topics:         [][]byte{},
+			Address:        commitStoreAddress,
+			TxHash:         utils.RandomAddress().Hash(),
+			Data:           data,
+			CreatedAt:      time.Now(),
+		})
+	}
+	require.NoError(b, o.InsertBlock(utils.RandomAddress().Hash(), int64(numberOfReports*numberOfMessagesPerReport), time.Now(), int64(numberOfReports*numberOfMessagesPerReport)))
+	require.NoError(b, o.InsertLogs(dbLogs))
+
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		logs, err := o.SelectLogsDataWordBetween(
+			commitStoreAddress,
+			commitReportAccepted,
+			2,
+			3,
+			logpoller.EvmWord(uint64(numberOfReports*numberOfMessagesPerReport/2)), // Pick the middle report
+			logpoller.Unconfirmed,
+		)
+		assert.NoError(b, err)
+		assert.Len(b, logs, 1)
+	}
+}
diff --git a/core/chains/evm/logpoller/query.go b/core/chains/evm/logpoller/query.go
index 7443a860a85..b7fbfade680 100644
--- a/core/chains/evm/logpoller/query.go
+++ b/core/chains/evm/logpoller/query.go
@@ -82,6 +82,18 @@ func (q *queryArgs) withWordValueMax(wordValueMax common.Hash) *queryArgs {
 	return q.withCustomHashArg("word_value_max", wordValueMax)
 }
 
+func (q *queryArgs) withWordIndexMin(wordIndex int) *queryArgs {
+	return q.withCustomArg("word_index_min", wordIndex)
+}
+
+func (q *queryArgs) withWordIndexMax(wordIndex int) *queryArgs {
+	return q.withCustomArg("word_index_max", wordIndex)
+}
+
+func (q *queryArgs) withWordValue(wordValue common.Hash) *queryArgs {
+	return q.withCustomHashArg("word_value", wordValue)
+}
+
 func (q *queryArgs) withConfs(confs Confirmations) *queryArgs {
 	return q.withCustomArg("confs", confs)
 }
diff --git a/core/store/migrate/migrations/0211_log_poller_word_indexes.sql b/core/store/migrate/migrations/0211_log_poller_word_indexes.sql
new file mode 100644
index 00000000000..3d2e8bf8a4e
--- /dev/null
+++ b/core/store/migrate/migrations/0211_log_poller_word_indexes.sql
@@ -0,0 +1,6 @@
+-- +goose Up
+CREATE INDEX evm_logs_idx_data_word_four ON evm.logs (substring(data from 97 for 32));
+
+
+-- +goose Down
+DROP INDEX IF EXISTS evm.evm_logs_idx_data_word_four;

From fbd844cd0ee9414179af22f82a64602dd9aed600 Mon Sep 17 00:00:00 2001
From: Tate <tate.exon@smartcontract.com>
Date: Wed, 29 Nov 2023 08:06:02 -0700
Subject: [PATCH 030/130] Only enforce ctf version on merge_group push to
 develop (#11389)

* Only enforce ctf version on merge_group push to develop

* add debug echo to see what was missed

* Updated with refernences to merge_group payload instead of pull_request payload

* use output and test that we can indeed do this in a fail situation so we can switch it back and know it will work for a true since we already validated that we do get true in the correct place

* The test worked, flip back to enforcing only for merge groups to develop
---
 .github/workflows/integration-tests.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 5a505ce01ca..dd696f7b2df 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -28,7 +28,23 @@ jobs:
     steps:
       - name: Checkout the repo
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - name: Check Merge Group Condition
+        id: condition-check
+        run: |
+          echo "Checking event condition..."
+          SHOULD_ENFORCE="false"
+          if [[ "$GITHUB_EVENT_NAME" == "merge_group" ]]; then
+              echo "We are in a merge_group event, now check if we are on the develop branch"
+              target_branch=$(cat $GITHUB_EVENT_PATH | jq -r .merge_group.base_ref)
+              if [[ "$target_branch" == "refs/heads/develop" ]]; then
+                  echo "We are on the develop branch, we should enforce ctf version"
+                  SHOULD_ENFORCE="true"
+              fi
+          fi
+          echo "should we enforce ctf version = $SHOULD_ENFORCE"
+          echo "should-enforce=$SHOULD_ENFORCE" >> $GITHUB_OUTPUT
       - name: Enforce CTF Version
+        if: steps.condition-check.outputs.should-enforce == 'true'
         uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/mod-version@e865e376b8c2d594028c8d645dd6c47169b72974 # v2.2.16
         with:
           go-project-path: ./integration-tests

From 9b6d6c87564b00efb2dd3b80e72978c7f7c03eca Mon Sep 17 00:00:00 2001
From: Jordan Krage <jmank88@gmail.com>
Date: Wed, 29 Nov 2023 10:38:08 -0600
Subject: [PATCH 031/130] core/services/chainlink: skip P2P Peer Wrapper when
 unused (#11411)

---
 core/services/chainlink/application.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/services/chainlink/application.go b/core/services/chainlink/application.go
index 1ecf95d3a5e..3d06789e7bc 100644
--- a/core/services/chainlink/application.go
+++ b/core/services/chainlink/application.go
@@ -360,7 +360,9 @@ func NewApplication(opts ApplicationOpts) (Application, error) {
 	}
 
 	var peerWrapper *ocrcommon.SingletonPeerWrapper
-	if cfg.P2P().Enabled() {
+	if !cfg.OCR().Enabled() && !cfg.OCR2().Enabled() {
+		globalLogger.Debug("P2P stack not needed")
+	} else if cfg.P2P().Enabled() {
 		if err := ocrcommon.ValidatePeerWrapperConfig(cfg.P2P()); err != nil {
 			return nil, err
 		}

From 4300d40aa89f99817cdc759d16c5eced8224c0a1 Mon Sep 17 00:00:00 2001
From: ilija42 <57732589+ilija42@users.noreply.github.com>
Date: Wed, 29 Nov 2023 19:49:11 +0100
Subject: [PATCH 032/130] Update CleanupChainTables shell cmd to specify schema
 (#11409)

* Update CleanupChainTables shell cmd to specify schema

* Update testdb naming checks to match

* Add test that checks if cleanup chain table shell cmd works

* Fix shell cmd test db checks to match CI

* Adjust CleanupChainTables test to handle heavyweight db testdb naming

* Change CleanupChainTables to account for duplicate table names
---
 core/cmd/shell_local.go      | 27 ++++++++++++++++++++-------
 core/cmd/shell_local_test.go | 20 ++++++++++++++++++++
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/core/cmd/shell_local.go b/core/cmd/shell_local.go
index ada70736f49..dc0d44f3189 100644
--- a/core/cmd/shell_local.go
+++ b/core/cmd/shell_local.go
@@ -996,23 +996,36 @@ func (s *Shell) CleanupChainTables(c *cli.Context) error {
 	if err != nil {
 		return s.errorOut(errors.Wrap(err, "error connecting to the database"))
 	}
-
 	defer db.Close()
 
-	tablesToDeleteFromQuery := `SELECT table_name FROM information_schema.columns WHERE "column_name"=$1;`
+	// some tables with evm_chain_id (mostly job specs) are in public schema
+	tablesToDeleteFromQuery := `SELECT table_name, table_schema FROM information_schema.columns WHERE "column_name"=$1;`
 	// Delete rows from each table based on the chain_id.
 	if strings.EqualFold("EVM", c.String("type")) {
-		var tables []string
-		if err = db.Select(&tables, tablesToDeleteFromQuery, "evm_chain_id"); err != nil {
+		rows, err := db.Query(tablesToDeleteFromQuery, "evm_chain_id")
+		if err != nil {
 			return err
+		} else if rows.Err() != nil {
+			return rows.Err()
 		}
-		for _, tableName := range tables {
+
+		var tablesToDeleteFrom []string
+		for rows.Next() {
+			var name string
+			var schema string
+			if err = rows.Scan(&name, &schema); err != nil {
+				return err
+			}
+			tablesToDeleteFrom = append(tablesToDeleteFrom, schema+"."+name)
+		}
+
+		for _, tableName := range tablesToDeleteFrom {
 			query := fmt.Sprintf(`DELETE FROM %s WHERE "evm_chain_id"=$1;`, tableName)
 			_, err = db.Exec(query, c.String("id"))
 			if err != nil {
-				fmt.Printf("Error deleting rows from %s: %v\n", tableName, err)
+				fmt.Printf("Error deleting rows containing evm_chain_id from %s: %v\n", tableName, err)
 			} else {
-				fmt.Printf("Rows with chain_id %s deleted from %s.\n", c.String("id"), tableName)
+				fmt.Printf("Rows with evm_chain_id %s deleted from %s.\n", c.String("id"), tableName)
 			}
 		}
 	} else {
diff --git a/core/cmd/shell_local_test.go b/core/cmd/shell_local_test.go
index 1e030fa9e9e..fac2d7f040b 100644
--- a/core/cmd/shell_local_test.go
+++ b/core/cmd/shell_local_test.go
@@ -492,3 +492,23 @@ func TestShell_RebroadcastTransactions_AddressCheck(t *testing.T) {
 		})
 	}
 }
+
+func TestShell_CleanupChainTables(t *testing.T) {
+	// Just check if it doesn't error, command itself shouldn't be changed unless major schema changes were made.
+	// It would be really hard to write a test that accounts for schema changes, so this should be enough to alarm us that something broke.
+	config, _ := heavyweight.FullTestDBV2(t, func(c *chainlink.Config, s *chainlink.Secrets) { c.Database.Dialect = dialects.Postgres })
+	client := cmd.Shell{
+		Config: config,
+		Logger: logger.TestLogger(t),
+	}
+
+	set := flag.NewFlagSet("test", 0)
+	flagSetApplyFromAction(client.CleanupChainTables, set, "")
+	require.NoError(t, set.Set("id", testutils.FixtureChainID.String()))
+	require.NoError(t, set.Set("type", "EVM"))
+	// heavyweight creates test db named chainlink_test_uid, while usual naming is chainlink_test
+	// CleanupChainTables handles test db name with chainlink_test, but because of heavyweight test db naming we have to set danger flag
+	require.NoError(t, set.Set("danger", "true"))
+	c := cli.NewContext(nil, set, nil)
+	require.NoError(t, client.CleanupChainTables(c))
+}

From bd039dc851972b0a100b730a61a76a2837860186 Mon Sep 17 00:00:00 2001
From: Jordan Krage <jmank88@gmail.com>
Date: Wed, 29 Nov 2023 13:40:17 -0600
Subject: [PATCH 033/130] embed Solana & Feeds LOOPPs; adjust CI (#11401)

---
 .github/workflows/integration-tests.yml       | 39 +++----------------
 core/chainlink.Dockerfile                     | 20 ++++++++++
 core/scripts/go.mod                           |  2 +-
 core/scripts/go.sum                           |  4 +-
 go.mod                                        |  2 +-
 go.sum                                        |  4 +-
 integration-tests/docker/test_env/test_env.go |  7 ++--
 .../docker/test_env/test_env_builder.go       | 10 ++++-
 integration-tests/go.mod                      |  2 +-
 integration-tests/go.sum                      |  4 +-
 10 files changed, 45 insertions(+), 49 deletions(-)

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index dd696f7b2df..9e2cce02122 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -781,7 +781,7 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           repository: smartcontractkit/chainlink-solana
-          ref: 23816fcf7d380a30c87b6d87e4fb0ca94419b259 # swtich back to this after the next solana release${{ needs.get_solana_sha.outputs.sha }}
+          ref: ${{ needs.get_solana_sha.outputs.sha }}
       - name: Build Test Image
         if: needs.changes.outputs.src == 'true' && needs.solana-test-image-exists.outputs.exists == 'false'
         uses: ./.github/actions/build-test-image
@@ -794,7 +794,7 @@ jobs:
       - run: echo "this exists so we don't have to run anything else if the build is skipped"
         if: needs.changes.outputs.src == 'false' || needs.solana-test-image-exists.outputs.exists == 'true'
 
-  solana-smoke-tests-matrix:
+  solana-smoke-tests:
     if: ${{ !contains(join(github.event.pull_request.labels.*.name, ' '), 'skip-smoke-tests') }}
     environment: integration
     permissions:
@@ -802,14 +802,7 @@ jobs:
       pull-requests: write
       id-token: write
       contents: read
-    strategy:
-      matrix:
-        image:
-          - name: (legacy)
-            tag-suffix: ""
-          - name: (plugins)
-            tag-suffix: -plugins
-    name: Solana Smoke Tests ${{ matrix.image.name }}
+    name: Solana Smoke Tests
     runs-on: ubuntu20.04-16cores-64GB
     needs:
       [
@@ -832,7 +825,7 @@ jobs:
         with:
           basic-auth: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_CLOUD_HOST }}
-          this-job-name: Solana Smoke Tests ${{ matrix.image.name }}
+          this-job-name: Solana Smoke Tests
           test-results-file: '{"testType":"go","filePath":"/tmp/gotest.log"}'
         continue-on-error: true
       - name: Checkout the repo
@@ -875,7 +868,7 @@ jobs:
         with:
           test_command_to_run: export ENV_JOB_IMAGE=${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink-solana-tests:${{ needs.get_solana_sha.outputs.sha }} && make test_smoke
           cl_repo: ${{ env.CHAINLINK_IMAGE }}
-          cl_image_tag: ${{ github.sha }}${{ matrix.image.tag-suffix }}
+          cl_image_tag: ${{ github.sha }}
           artifacts_location: /home/runner/work/chainlink-solana/chainlink-solana/integration-tests/logs
           publish_check_name: Solana Smoke Test Results
           go_mod_path: ./integration-tests/go.mod
@@ -894,25 +887,3 @@ jobs:
           path: /tmp/gotest.log
           retention-days: 7
         continue-on-error: true
-
-  ### Used to check the required checks box when the matrix completes
-  solana-smoke-tests:
-    if: always()
-    runs-on: ubuntu-latest
-    name: Solana Smoke Tests
-    needs: [solana-smoke-tests-matrix]
-    steps:
-      - name: Check smoke test matrix status
-        if: needs.solana-smoke-tests-matrix.result != 'success'
-        run: exit 1
-      - name: Collect Metrics
-        if: always()
-        id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@d1618b772a97fd87e6505de97b872ee0b1f1729a # v2.0.2
-        with:
-          basic-auth: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }}
-          hostname: ${{ secrets.GRAFANA_CLOUD_HOST }}
-          this-job-name: Solana Smoke Tests
-          matrix-aggregator-status: ${{ needs.solana-smoke-tests-matrix.result }}
-        continue-on-error: true
-  ### End Solana Section
diff --git a/core/chainlink.Dockerfile b/core/chainlink.Dockerfile
index be1fdb9053b..22e65c0aa7a 100644
--- a/core/chainlink.Dockerfile
+++ b/core/chainlink.Dockerfile
@@ -17,6 +17,22 @@ COPY . .
 # Build the golang binary
 RUN make install-chainlink
 
+# Link LOOP Plugin source dirs with simple names
+RUN go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-feeds | xargs -I % ln -s % /chainlink-feeds
+RUN go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-solana | xargs -I % ln -s % /chainlink-solana
+
+# Build image: Plugins
+FROM golang:1.21-bullseye as buildplugins
+RUN go version
+
+WORKDIR /chainlink-feeds
+COPY --from=buildgo /chainlink-feeds .
+RUN go install ./cmd/chainlink-feeds
+
+WORKDIR /chainlink-solana
+COPY --from=buildgo /chainlink-solana .
+RUN go install ./pkg/solana/cmd/chainlink-solana
+
 # Final image: ubuntu with chainlink binary
 FROM ubuntu:20.04
 
@@ -32,6 +48,10 @@ RUN curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
 
 COPY --from=buildgo /go/bin/chainlink /usr/local/bin/
 
+# Install (but don't enable) LOOP Plugins
+COPY --from=buildplugins /go/bin/chainlink-feeds /usr/local/bin/
+COPY --from=buildplugins /go/bin/chainlink-solana /usr/local/bin/
+
 # Dependency of CosmWasm/wasmd
 COPY --from=buildgo /go/pkg/mod/github.com/\!cosm\!wasm/wasmvm@v*/internal/api/libwasmvm.*.so /usr/lib/
 RUN chmod 755 /usr/lib/libwasmvm.*.so
diff --git a/core/scripts/go.mod b/core/scripts/go.mod
index 7fa6055b161..1eb186931f8 100644
--- a/core/scripts/go.mod
+++ b/core/scripts/go.mod
@@ -307,7 +307,7 @@ require (
 	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f9248 // indirect
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 // indirect
 	github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d // indirect
-	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231117191230-aa6640f2edd1 // indirect
+	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3 // indirect
 	github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664 // indirect
 	github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 // indirect
 	github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1 // indirect
diff --git a/core/scripts/go.sum b/core/scripts/go.sum
index 7706fa15f19..2a77f2066db 100644
--- a/core/scripts/go.sum
+++ b/core/scripts/go.sum
@@ -1510,8 +1510,8 @@ github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a454
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542/go.mod h1:EpvRoycRD+kniYlz+pCpRT5e+fmPm0mSD/vmND+0oMg=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d h1:w4MsbOtNk6nD/mcXLstHWk9hB6g7QLtcAfhPjhwvOaQ=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d/go.mod h1:YPAfLNowdBwiKiYOwgwtbJHi8AJWbcxkbOY0ItAvkfc=
-github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231117191230-aa6640f2edd1 h1:D7yb4kgNGVAiD5lFYqm/LW8d5jU66TXyYvSskDiW9yg=
-github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231117191230-aa6640f2edd1/go.mod h1:UfW7/PZKon+iDEHtrHOfvMnS5GfYOW/SdMZ6P97rPEk=
+github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3 h1:DudPr8ZNMEVgDwHBvnrpvK96JrGcGCG+LLBnlqaPGnE=
+github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3/go.mod h1:UfW7/PZKon+iDEHtrHOfvMnS5GfYOW/SdMZ6P97rPEk=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664 h1:yxaHuDTtj2xxtsR8b+LJw8xDvyr6v/F6GP3InsP4wPI=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664/go.mod h1:3Fa+HQTZ3R3fPC0hUqugvoo+NEeo8Y4J2WOnQfi7O34=
 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 h1:FFdvEzlYwcuVHkdZ8YnZR/XomeMGbz5E2F2HZI3I3w8=
diff --git a/go.mod b/go.mod
index 0133011813e..c105c1c6000 100644
--- a/go.mod
+++ b/go.mod
@@ -69,7 +69,7 @@ require (
 	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f9248
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542
 	github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d
-	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231117191230-aa6640f2edd1
+	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3
 	github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664
 	github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
 	github.com/smartcontractkit/libocr v0.0.0-20231107151413-13e0202ae8d7
diff --git a/go.sum b/go.sum
index 504f2ba8073..18d78d4815e 100644
--- a/go.sum
+++ b/go.sum
@@ -1513,8 +1513,8 @@ github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a454
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542/go.mod h1:EpvRoycRD+kniYlz+pCpRT5e+fmPm0mSD/vmND+0oMg=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d h1:w4MsbOtNk6nD/mcXLstHWk9hB6g7QLtcAfhPjhwvOaQ=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d/go.mod h1:YPAfLNowdBwiKiYOwgwtbJHi8AJWbcxkbOY0ItAvkfc=
-github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231117191230-aa6640f2edd1 h1:D7yb4kgNGVAiD5lFYqm/LW8d5jU66TXyYvSskDiW9yg=
-github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231117191230-aa6640f2edd1/go.mod h1:UfW7/PZKon+iDEHtrHOfvMnS5GfYOW/SdMZ6P97rPEk=
+github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3 h1:DudPr8ZNMEVgDwHBvnrpvK96JrGcGCG+LLBnlqaPGnE=
+github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3/go.mod h1:UfW7/PZKon+iDEHtrHOfvMnS5GfYOW/SdMZ6P97rPEk=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664 h1:yxaHuDTtj2xxtsR8b+LJw8xDvyr6v/F6GP3InsP4wPI=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664/go.mod h1:3Fa+HQTZ3R3fPC0hUqugvoo+NEeo8Y4J2WOnQfi7O34=
 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 h1:FFdvEzlYwcuVHkdZ8YnZR/XomeMGbz5E2F2HZI3I3w8=
diff --git a/integration-tests/docker/test_env/test_env.go b/integration-tests/docker/test_env/test_env.go
index 6278ec13987..4b0cefddd55 100644
--- a/integration-tests/docker/test_env/test_env.go
+++ b/integration-tests/docker/test_env/test_env.go
@@ -151,15 +151,14 @@ func (te *CLClusterTestEnv) StartMockAdapter() error {
 	return te.MockAdapter.StartContainer()
 }
 
-func (te *CLClusterTestEnv) StartClCluster(nodeConfig *chainlink.Config, count int, secretsConfig string) error {
+func (te *CLClusterTestEnv) StartClCluster(nodeConfig *chainlink.Config, count int, secretsConfig string, opts ...ClNodeOption) error {
 	if te.Cfg != nil && te.Cfg.ClCluster != nil {
 		te.ClCluster = te.Cfg.ClCluster
 	} else {
+		opts = append(opts, WithSecrets(secretsConfig))
 		te.ClCluster = &ClCluster{}
 		for i := 0; i < count; i++ {
-			ocrNode := NewClNode([]string{te.Network.Name}, os.Getenv("CHAINLINK_IMAGE"), os.Getenv("CHAINLINK_VERSION"), nodeConfig,
-				WithSecrets(secretsConfig),
-			)
+			ocrNode := NewClNode([]string{te.Network.Name}, os.Getenv("CHAINLINK_IMAGE"), os.Getenv("CHAINLINK_VERSION"), nodeConfig, opts...)
 			te.ClCluster.Nodes = append(te.ClCluster.Nodes, ocrNode)
 		}
 	}
diff --git a/integration-tests/docker/test_env/test_env_builder.go b/integration-tests/docker/test_env/test_env_builder.go
index 32f84991eef..685ea5338ae 100644
--- a/integration-tests/docker/test_env/test_env_builder.go
+++ b/integration-tests/docker/test_env/test_env_builder.go
@@ -40,6 +40,7 @@ type CLTestEnvBuilder struct {
 	secretsConfig          string
 	nonDevGethNetworks     []blockchain.EVMNetwork
 	clNodesCount           int
+	clNodesOpts            []func(*ClNode)
 	customNodeCsaKeys      []string
 	defaultNodeCsaKeys     []string
 	l                      zerolog.Logger
@@ -110,6 +111,11 @@ func (b *CLTestEnvBuilder) WithCLNodes(clNodesCount int) *CLTestEnvBuilder {
 	return b
 }
 
+func (b *CLTestEnvBuilder) WithCLNodeOptions(opt ...ClNodeOption) *CLTestEnvBuilder {
+	b.clNodesOpts = append(b.clNodesOpts, opt...)
+	return b
+}
+
 func (b *CLTestEnvBuilder) WithForwarders() *CLTestEnvBuilder {
 	b.hasForwarders = true
 	return b
@@ -267,7 +273,7 @@ func (b *CLTestEnvBuilder) Build() (*CLClusterTestEnv, error) {
 			return nil, fmt.Errorf("cannot create nodes with custom config without nonDevNetworks")
 		}
 
-		err = b.te.StartClCluster(b.clNodeConfig, b.clNodesCount, b.secretsConfig)
+		err = b.te.StartClCluster(b.clNodeConfig, b.clNodesCount, b.secretsConfig, b.clNodesOpts...)
 		if err != nil {
 			return nil, err
 		}
@@ -351,7 +357,7 @@ func (b *CLTestEnvBuilder) Build() (*CLClusterTestEnv, error) {
 			}
 		}
 
-		err := b.te.StartClCluster(cfg, b.clNodesCount, b.secretsConfig)
+		err := b.te.StartClCluster(cfg, b.clNodesCount, b.secretsConfig, b.clNodesOpts...)
 		if err != nil {
 			return nil, err
 		}
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index 63bf5e9e55f..5f250af6fa8 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -391,7 +391,7 @@ require (
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 // indirect
 	github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d // indirect
-	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231117191230-aa6640f2edd1 // indirect
+	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3 // indirect
 	github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664 // indirect
 	github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 // indirect
 	github.com/smartcontractkit/wsrpc v0.7.2 // indirect
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index a1a272c0b8b..855d97d5e40 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -2382,8 +2382,8 @@ github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a454
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542/go.mod h1:EpvRoycRD+kniYlz+pCpRT5e+fmPm0mSD/vmND+0oMg=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d h1:w4MsbOtNk6nD/mcXLstHWk9hB6g7QLtcAfhPjhwvOaQ=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d/go.mod h1:YPAfLNowdBwiKiYOwgwtbJHi8AJWbcxkbOY0ItAvkfc=
-github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231117191230-aa6640f2edd1 h1:D7yb4kgNGVAiD5lFYqm/LW8d5jU66TXyYvSskDiW9yg=
-github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231117191230-aa6640f2edd1/go.mod h1:UfW7/PZKon+iDEHtrHOfvMnS5GfYOW/SdMZ6P97rPEk=
+github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3 h1:DudPr8ZNMEVgDwHBvnrpvK96JrGcGCG+LLBnlqaPGnE=
+github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3/go.mod h1:UfW7/PZKon+iDEHtrHOfvMnS5GfYOW/SdMZ6P97rPEk=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664 h1:yxaHuDTtj2xxtsR8b+LJw8xDvyr6v/F6GP3InsP4wPI=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664/go.mod h1:3Fa+HQTZ3R3fPC0hUqugvoo+NEeo8Y4J2WOnQfi7O34=
 github.com/smartcontractkit/chainlink-testing-framework v1.19.5 h1:Iq1L7wCA8IkBBtP3p6W2ttu8v9cJp95spusnozW1UrA=

From cd0849471fc9e5861e14cc75ab2a7bf19bb6c779 Mon Sep 17 00:00:00 2001
From: Dimitris Grigoriou <dimitris.grigoriou@smartcontract.com>
Date: Wed, 29 Nov 2023 22:13:42 +0200
Subject: [PATCH 034/130] Change difficulty from Big to BigInt (#11388)

* Change difficulty from Big to BigInt

* Fix headtracker mock head

* Remove EsnureClosed

* Fix mock heads

* Fix Tracker close on txm
---
 common/client/mock_head_test.go               | 11 ++--
 common/client/mock_node_test.go               | 14 ++---
 common/client/multi_node.go                   |  6 +-
 common/client/multi_node_test.go              | 28 +++++-----
 common/client/node.go                         |  8 +--
 common/client/node_fsm.go                     |  7 +--
 common/client/node_lifecycle.go               | 17 +++---
 common/client/node_lifecycle_test.go          | 55 ++++++++++---------
 .../client/node_selector_total_difficulty.go  |  4 +-
 .../node_selector_total_difficulty_test.go    | 34 ++++++------
 common/client/types.go                        |  3 +-
 common/fee/models.go                          |  2 +-
 common/headtracker/types/mocks/head.go        | 14 ++---
 common/txmgr/broadcaster.go                   |  2 +-
 common/txmgr/txmgr.go                         | 17 +++---
 common/types/head.go                          |  5 +-
 common/types/mocks/head.go                    | 11 ++--
 core/chains/evm/assets/wei.go                 |  2 +-
 core/chains/evm/client/erroring_node.go       |  3 +-
 core/chains/evm/client/helpers_test.go        |  3 +-
 core/chains/evm/client/node.go                |  7 +--
 core/chains/evm/client/node_fsm.go            |  7 +--
 core/chains/evm/client/node_lifecycle.go      | 17 +++---
 core/chains/evm/client/node_lifecycle_test.go | 25 ++++-----
 .../client/node_selector_total_difficulty.go  |  6 +-
 .../node_selector_total_difficulty_test.go    | 34 ++++++------
 core/chains/evm/client/pool.go                |  4 +-
 .../evm/client/simulated_backend_client.go    |  2 +-
 core/chains/evm/gas/models.go                 |  2 +-
 core/chains/evm/mocks/node.go                 | 12 ++--
 core/chains/evm/txmgr/transmitchecker.go      |  3 +-
 core/chains/evm/types/models.go               | 10 ++--
 core/utils/big.go                             |  2 +-
 core/utils/utils.go                           | 11 ----
 34 files changed, 188 insertions(+), 200 deletions(-)

diff --git a/common/client/mock_head_test.go b/common/client/mock_head_test.go
index b9cf0a5866f..1b69eedf438 100644
--- a/common/client/mock_head_test.go
+++ b/common/client/mock_head_test.go
@@ -3,7 +3,8 @@
 package client
 
 import (
-	utils "github.com/smartcontractkit/chainlink/v2/core/utils"
+	big "math/big"
+
 	mock "github.com/stretchr/testify/mock"
 )
 
@@ -13,15 +14,15 @@ type mockHead struct {
 }
 
 // BlockDifficulty provides a mock function with given fields:
-func (_m *mockHead) BlockDifficulty() *utils.Big {
+func (_m *mockHead) BlockDifficulty() *big.Int {
 	ret := _m.Called()
 
-	var r0 *utils.Big
-	if rf, ok := ret.Get(0).(func() *utils.Big); ok {
+	var r0 *big.Int
+	if rf, ok := ret.Get(0).(func() *big.Int); ok {
 		r0 = rf()
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*utils.Big)
+			r0 = ret.Get(0).(*big.Int)
 		}
 	}
 
diff --git a/common/client/mock_node_test.go b/common/client/mock_node_test.go
index bd704cd2c6f..ea0e7d1a120 100644
--- a/common/client/mock_node_test.go
+++ b/common/client/mock_node_test.go
@@ -4,11 +4,11 @@ package client
 
 import (
 	context "context"
+	big "math/big"
 
-	types "github.com/smartcontractkit/chainlink/v2/common/types"
 	mock "github.com/stretchr/testify/mock"
 
-	utils "github.com/smartcontractkit/chainlink/v2/core/utils"
+	types "github.com/smartcontractkit/chainlink/v2/common/types"
 )
 
 // mockNode is an autogenerated mock type for the Node type
@@ -115,13 +115,13 @@ func (_m *mockNode[CHAIN_ID, HEAD, RPC]) State() nodeState {
 }
 
 // StateAndLatest provides a mock function with given fields:
-func (_m *mockNode[CHAIN_ID, HEAD, RPC]) StateAndLatest() (nodeState, int64, *utils.Big) {
+func (_m *mockNode[CHAIN_ID, HEAD, RPC]) StateAndLatest() (nodeState, int64, *big.Int) {
 	ret := _m.Called()
 
 	var r0 nodeState
 	var r1 int64
-	var r2 *utils.Big
-	if rf, ok := ret.Get(0).(func() (nodeState, int64, *utils.Big)); ok {
+	var r2 *big.Int
+	if rf, ok := ret.Get(0).(func() (nodeState, int64, *big.Int)); ok {
 		return rf()
 	}
 	if rf, ok := ret.Get(0).(func() nodeState); ok {
@@ -136,11 +136,11 @@ func (_m *mockNode[CHAIN_ID, HEAD, RPC]) StateAndLatest() (nodeState, int64, *ut
 		r1 = ret.Get(1).(int64)
 	}
 
-	if rf, ok := ret.Get(2).(func() *utils.Big); ok {
+	if rf, ok := ret.Get(2).(func() *big.Int); ok {
 		r2 = rf()
 	} else {
 		if ret.Get(2) != nil {
-			r2 = ret.Get(2).(*utils.Big)
+			r2 = ret.Get(2).(*big.Int)
 		}
 	}
 
diff --git a/common/client/multi_node.go b/common/client/multi_node.go
index 3f72d04124f..db5380e91f5 100644
--- a/common/client/multi_node.go
+++ b/common/client/multi_node.go
@@ -14,11 +14,11 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/assets"
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils"
 
 	"github.com/smartcontractkit/chainlink/v2/common/config"
 	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 var (
@@ -261,8 +261,8 @@ func (c *multiNode[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OP
 
 // nLiveNodes returns the number of currently alive nodes, as well as the highest block number and greatest total difficulty.
 // totalDifficulty will be 0 if all nodes return nil.
-func (c *multiNode[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD, RPC_CLIENT]) nLiveNodes() (nLiveNodes int, blockNumber int64, totalDifficulty *utils.Big) {
-	totalDifficulty = utils.NewBigI(0)
+func (c *multiNode[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD, RPC_CLIENT]) nLiveNodes() (nLiveNodes int, blockNumber int64, totalDifficulty *big.Int) {
+	totalDifficulty = big.NewInt(0)
 	for _, n := range c.nodes {
 		if s, num, td := n.StateAndLatest(); s == nodeStateAlive {
 			nLiveNodes++
diff --git a/common/client/multi_node_test.go b/common/client/multi_node_test.go
index 45ffb745370..229f1320a14 100644
--- a/common/client/multi_node_test.go
+++ b/common/client/multi_node_test.go
@@ -2,6 +2,7 @@ package client
 
 import (
 	"fmt"
+	big "math/big"
 	"math/rand"
 	"testing"
 	"time"
@@ -17,14 +18,13 @@ import (
 
 	"github.com/smartcontractkit/chainlink/v2/common/config"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
-type multiNodeRPCClient RPC[types.ID, *utils.Big, Hashable, Hashable, any, Hashable, any, any,
+type multiNodeRPCClient RPC[types.ID, *big.Int, Hashable, Hashable, any, Hashable, any, any,
 	types.Receipt[Hashable, Hashable], Hashable, types.Head[Hashable]]
 
 type testMultiNode struct {
-	*multiNode[types.ID, *utils.Big, Hashable, Hashable, any, Hashable, any, any,
+	*multiNode[types.ID, *big.Int, Hashable, Hashable, any, Hashable, any, any,
 		types.Receipt[Hashable, Hashable], Hashable, types.Head[Hashable], multiNodeRPCClient]
 }
 
@@ -46,19 +46,19 @@ func newTestMultiNode(t *testing.T, opts multiNodeOpts) testMultiNode {
 		opts.logger = logger.Test(t)
 	}
 
-	result := NewMultiNode[types.ID, *utils.Big, Hashable, Hashable, any, Hashable, any, any,
+	result := NewMultiNode[types.ID, *big.Int, Hashable, Hashable, any, Hashable, any, any,
 		types.Receipt[Hashable, Hashable], Hashable, types.Head[Hashable], multiNodeRPCClient](opts.logger,
 		opts.selectionMode, opts.leaseDuration, opts.noNewHeadsThreshold, opts.nodes, opts.sendonlys,
 		opts.chainID, opts.chainType, opts.chainFamily, opts.sendOnlyErrorParser)
 	return testMultiNode{
-		result.(*multiNode[types.ID, *utils.Big, Hashable, Hashable, any, Hashable, any, any,
+		result.(*multiNode[types.ID, *big.Int, Hashable, Hashable, any, Hashable, any, any,
 			types.Receipt[Hashable, Hashable], Hashable, types.Head[Hashable], multiNodeRPCClient]),
 	}
 }
 
-func newMultiNodeRPCClient(t *testing.T) *mockRPC[types.ID, *utils.Big, Hashable, Hashable, any, Hashable, any, any,
+func newMultiNodeRPCClient(t *testing.T) *mockRPC[types.ID, *big.Int, Hashable, Hashable, any, Hashable, any, any,
 	types.Receipt[Hashable, Hashable], Hashable, types.Head[Hashable]] {
-	return newMockRPC[types.ID, *utils.Big, Hashable, Hashable, any, Hashable, any, any,
+	return newMockRPC[types.ID, *big.Int, Hashable, Hashable, any, Hashable, any, any,
 		types.Receipt[Hashable, Hashable], Hashable, types.Head[Hashable]](t)
 }
 
@@ -424,40 +424,40 @@ func TestMultiNode_nLiveNodes(t *testing.T) {
 	t.Parallel()
 	type nodeParams struct {
 		BlockNumber     int64
-		TotalDifficulty *utils.Big
+		TotalDifficulty *big.Int
 		State           nodeState
 	}
 	testCases := []struct {
 		Name                    string
 		ExpectedNLiveNodes      int
 		ExpectedBlockNumber     int64
-		ExpectedTotalDifficulty *utils.Big
+		ExpectedTotalDifficulty *big.Int
 		NodeParams              []nodeParams
 	}{
 		{
 			Name:                    "no nodes",
-			ExpectedTotalDifficulty: utils.NewBigI(0),
+			ExpectedTotalDifficulty: big.NewInt(0),
 		},
 		{
 			Name:                    "Best node is not healthy",
-			ExpectedTotalDifficulty: utils.NewBigI(10),
+			ExpectedTotalDifficulty: big.NewInt(10),
 			ExpectedBlockNumber:     20,
 			ExpectedNLiveNodes:      3,
 			NodeParams: []nodeParams{
 				{
 					State:           nodeStateOutOfSync,
 					BlockNumber:     1000,
-					TotalDifficulty: utils.NewBigI(2000),
+					TotalDifficulty: big.NewInt(2000),
 				},
 				{
 					State:           nodeStateAlive,
 					BlockNumber:     20,
-					TotalDifficulty: utils.NewBigI(9),
+					TotalDifficulty: big.NewInt(9),
 				},
 				{
 					State:           nodeStateAlive,
 					BlockNumber:     19,
-					TotalDifficulty: utils.NewBigI(10),
+					TotalDifficulty: big.NewInt(10),
 				},
 				{
 					State:           nodeStateAlive,
diff --git a/common/client/node.go b/common/client/node.go
index b2d3a33a5b8..4fad18b42cf 100644
--- a/common/client/node.go
+++ b/common/client/node.go
@@ -3,6 +3,7 @@ package client
 import (
 	"context"
 	"fmt"
+	"math/big"
 	"net/url"
 	"sync"
 	"time"
@@ -15,7 +16,6 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 const QueryTimeout = 10 * time.Second
@@ -53,7 +53,7 @@ type Node[
 	// State returns nodeState
 	State() nodeState
 	// StateAndLatest returns nodeState with the latest received block number & total difficulty.
-	StateAndLatest() (nodeState, int64, *utils.Big)
+	StateAndLatest() (nodeState, int64, *big.Int)
 	// Name is a unique identifier for this node.
 	Name() string
 	String() string
@@ -90,7 +90,7 @@ type node[
 	state   nodeState
 	// Each node is tracking the last received head number and total difficulty
 	stateLatestBlockNumber     int64
-	stateLatestTotalDifficulty *utils.Big
+	stateLatestTotalDifficulty *big.Int
 
 	// nodeCtx is the node lifetime's context
 	nodeCtx context.Context
@@ -103,7 +103,7 @@ type node[
 	//  1. see how many live nodes there are in total, so we can prevent the last alive node in a pool from being
 	//  moved to out-of-sync state. It is better to have one out-of-sync node than no nodes at all.
 	//  2. compare against the highest head (by number or difficulty) to ensure we don't fall behind too far.
-	nLiveNodes func() (count int, blockNumber int64, totalDifficulty *utils.Big)
+	nLiveNodes func() (count int, blockNumber int64, totalDifficulty *big.Int)
 }
 
 func NewNode[
diff --git a/common/client/node_fsm.go b/common/client/node_fsm.go
index d4fc19140e9..74a5814f773 100644
--- a/common/client/node_fsm.go
+++ b/common/client/node_fsm.go
@@ -2,11 +2,10 @@ package client
 
 import (
 	"fmt"
+	"math/big"
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
-
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 var (
@@ -110,7 +109,7 @@ func (n *node[CHAIN_ID, HEAD, RPC]) State() nodeState {
 	return n.state
 }
 
-func (n *node[CHAIN_ID, HEAD, RPC]) StateAndLatest() (nodeState, int64, *utils.Big) {
+func (n *node[CHAIN_ID, HEAD, RPC]) StateAndLatest() (nodeState, int64, *big.Int) {
 	n.stateMu.RLock()
 	defer n.stateMu.RUnlock()
 	return n.state, n.stateLatestBlockNumber, n.stateLatestTotalDifficulty
@@ -182,7 +181,7 @@ func (n *node[CHAIN_ID, HEAD, RPC]) transitionToInSync(fn func()) {
 
 // declareOutOfSync puts a node into OutOfSync state, disconnecting all current
 // clients and making it unavailable for use until back in-sync.
-func (n *node[CHAIN_ID, HEAD, RPC]) declareOutOfSync(isOutOfSync func(num int64, td *utils.Big) bool) {
+func (n *node[CHAIN_ID, HEAD, RPC]) declareOutOfSync(isOutOfSync func(num int64, td *big.Int) bool) {
 	n.transitionToOutOfSync(func() {
 		n.lfcLog.Errorw("RPC Node is out of sync", "nodeState", n.state)
 		n.wg.Add(1)
diff --git a/common/client/node_lifecycle.go b/common/client/node_lifecycle.go
index 9b47412766b..59a59691c83 100644
--- a/common/client/node_lifecycle.go
+++ b/common/client/node_lifecycle.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"math"
+	"math/big"
 	"time"
 
 	"github.com/pkg/errors"
@@ -11,6 +12,8 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	bigmath "github.com/smartcontractkit/chainlink-common/pkg/utils/big_math"
+
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -49,7 +52,7 @@ func zombieNodeCheckInterval(noNewHeadsThreshold time.Duration) time.Duration {
 	return utils.WithJitter(interval)
 }
 
-func (n *node[CHAIN_ID, HEAD, RPC]) setLatestReceived(blockNumber int64, totalDifficulty *utils.Big) {
+func (n *node[CHAIN_ID, HEAD, RPC]) setLatestReceived(blockNumber int64, totalDifficulty *big.Int) {
 	n.stateMu.Lock()
 	defer n.stateMu.Unlock()
 	n.stateLatestBlockNumber = blockNumber
@@ -216,13 +219,13 @@ func (n *node[CHAIN_ID, HEAD, RPC]) aliveLoop() {
 					continue
 				}
 			}
-			n.declareOutOfSync(func(num int64, td *utils.Big) bool { return num < highestReceivedBlockNumber })
+			n.declareOutOfSync(func(num int64, td *big.Int) bool { return num < highestReceivedBlockNumber })
 			return
 		}
 	}
 }
 
-func (n *node[CHAIN_ID, HEAD, RPC]) isOutOfSync(num int64, td *utils.Big) (outOfSync bool) {
+func (n *node[CHAIN_ID, HEAD, RPC]) isOutOfSync(num int64, td *big.Int) (outOfSync bool) {
 	outOfSync, _ = n.syncStatus(num, td)
 	return
 }
@@ -230,7 +233,7 @@ func (n *node[CHAIN_ID, HEAD, RPC]) isOutOfSync(num int64, td *utils.Big) (outOf
 // syncStatus returns outOfSync true if num or td is more than SyncThresold behind the best node.
 // Always returns outOfSync false for SyncThreshold 0.
 // liveNodes is only included when outOfSync is true.
-func (n *node[CHAIN_ID, HEAD, RPC]) syncStatus(num int64, td *utils.Big) (outOfSync bool, liveNodes int) {
+func (n *node[CHAIN_ID, HEAD, RPC]) syncStatus(num int64, td *big.Int) (outOfSync bool, liveNodes int) {
 	if n.nLiveNodes == nil {
 		return // skip for tests
 	}
@@ -245,8 +248,8 @@ func (n *node[CHAIN_ID, HEAD, RPC]) syncStatus(num int64, td *utils.Big) (outOfS
 	case NodeSelectionModeHighestHead, NodeSelectionModeRoundRobin, NodeSelectionModePriorityLevel:
 		return num < highest-int64(threshold), ln
 	case NodeSelectionModeTotalDifficulty:
-		bigThreshold := utils.NewBigI(int64(threshold))
-		return td.Cmp(greatest.Sub(bigThreshold)) < 0, ln
+		bigThreshold := big.NewInt(int64(threshold))
+		return td.Cmp(bigmath.Sub(greatest, bigThreshold)) < 0, ln
 	default:
 		panic("unrecognized NodeSelectionMode: " + mode)
 	}
@@ -258,7 +261,7 @@ const (
 )
 
 // outOfSyncLoop takes an OutOfSync node and waits until isOutOfSync returns false to go back to live status
-func (n *node[CHAIN_ID, HEAD, RPC]) outOfSyncLoop(isOutOfSync func(num int64, td *utils.Big) bool) {
+func (n *node[CHAIN_ID, HEAD, RPC]) outOfSyncLoop(isOutOfSync func(num int64, td *big.Int) bool) {
 	defer n.wg.Done()
 
 	{
diff --git a/common/client/node_lifecycle_test.go b/common/client/node_lifecycle_test.go
index 51b44ac516d..224b79d8378 100644
--- a/common/client/node_lifecycle_test.go
+++ b/common/client/node_lifecycle_test.go
@@ -2,6 +2,7 @@ package client
 
 import (
 	"fmt"
+	big "math/big"
 	"sync/atomic"
 	"testing"
 
@@ -12,11 +13,11 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	bigmath "github.com/smartcontractkit/chainlink-common/pkg/utils/big_math"
 	"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
 
 	"github.com/smartcontractkit/chainlink/v2/common/types"
 	"github.com/smartcontractkit/chainlink/v2/common/types/mocks"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
@@ -188,8 +189,8 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 			lggr: lggr,
 		})
 		defer func() { assert.NoError(t, node.close()) }()
-		node.nLiveNodes = func() (count int, blockNumber int64, totalDifficulty *utils.Big) {
-			return 1, 20, utils.NewBigI(10)
+		node.nLiveNodes = func() (count int, blockNumber int64, totalDifficulty *big.Int) {
+			return 1, 20, big.NewInt(10)
 		}
 		pollError := errors.New("failed to get ClientVersion")
 		rpc.On("ClientVersion", mock.Anything).Return("", pollError)
@@ -213,8 +214,8 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 		})
 		defer func() { assert.NoError(t, node.close()) }()
 		node.stateLatestBlockNumber = 20
-		node.nLiveNodes = func() (count int, blockNumber int64, totalDifficulty *utils.Big) {
-			return 10, syncThreshold + node.stateLatestBlockNumber + 1, utils.NewBigI(10)
+		node.nLiveNodes = func() (count int, blockNumber int64, totalDifficulty *big.Int) {
+			return 10, syncThreshold + node.stateLatestBlockNumber + 1, big.NewInt(10)
 		}
 		rpc.On("ClientVersion", mock.Anything).Return("", nil)
 		// tries to redial in outOfSync
@@ -244,8 +245,8 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 		})
 		defer func() { assert.NoError(t, node.close()) }()
 		node.stateLatestBlockNumber = 20
-		node.nLiveNodes = func() (count int, blockNumber int64, totalDifficulty *utils.Big) {
-			return 1, syncThreshold + node.stateLatestBlockNumber + 1, utils.NewBigI(10)
+		node.nLiveNodes = func() (count int, blockNumber int64, totalDifficulty *big.Int) {
+			return 1, syncThreshold + node.stateLatestBlockNumber + 1, big.NewInt(10)
 		}
 		rpc.On("ClientVersion", mock.Anything).Return("", nil)
 		node.declareAlive()
@@ -266,8 +267,8 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 		})
 		defer func() { assert.NoError(t, node.close()) }()
 		node.stateLatestBlockNumber = 20
-		node.nLiveNodes = func() (count int, blockNumber int64, totalDifficulty *utils.Big) {
-			return 1, node.stateLatestBlockNumber + 100, utils.NewBigI(10)
+		node.nLiveNodes = func() (count int, blockNumber int64, totalDifficulty *big.Int) {
+			return 1, node.stateLatestBlockNumber + 100, big.NewInt(10)
 		}
 		rpc.On("ClientVersion", mock.Anything).Return("", nil)
 		node.declareAlive()
@@ -310,8 +311,8 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 			rpc:                 rpc,
 		})
 		defer func() { assert.NoError(t, node.close()) }()
-		node.nLiveNodes = func() (count int, blockNumber int64, totalDifficulty *utils.Big) {
-			return 1, 20, utils.NewBigI(10)
+		node.nLiveNodes = func() (count int, blockNumber int64, totalDifficulty *big.Int) {
+			return 1, 20, big.NewInt(10)
 		}
 		node.declareAlive()
 		tests.AssertLogEventually(t, observedLogs, fmt.Sprintf("RPC endpoint detected out of sync; %s %s", msgCannotDisable, msgDegradedState))
@@ -353,7 +354,7 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 		sub.On("Err").Return((<-chan error)(nil))
 		sub.On("Unsubscribe").Once()
 		expectedBlockNumber := rand.Int64()
-		expectedDiff := utils.NewBigI(rand.Int64())
+		expectedDiff := big.NewInt(rand.Int64())
 		rpc.On("Subscribe", mock.Anything, mock.Anything, rpcSubscriptionMethodNewHeads).Run(func(args mock.Arguments) {
 			ch := args.Get(1).(chan<- Head)
 			go writeHeads(t, ch, head{BlockNumber: expectedBlockNumber, BlockDifficulty: expectedDiff})
@@ -367,14 +368,14 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 		node.declareAlive()
 		tests.AssertEventually(t, func() bool {
 			state, block, diff := node.StateAndLatest()
-			return state == nodeStateAlive && block == expectedBlockNumber == diff.Equal(expectedDiff)
+			return state == nodeStateAlive && block == expectedBlockNumber == bigmath.Equal(diff, expectedDiff)
 		})
 	})
 }
 
 type head struct {
 	BlockNumber     int64
-	BlockDifficulty *utils.Big
+	BlockDifficulty *big.Int
 }
 
 func writeHeads(t *testing.T, ch chan<- Head, heads ...head) {
@@ -411,7 +412,7 @@ func TestUnit_NodeLifecycle_outOfSyncLoop(t *testing.T) {
 		return node
 	}
 
-	stubIsOutOfSync := func(num int64, td *utils.Big) bool {
+	stubIsOutOfSync := func(num int64, td *big.Int) bool {
 		return false
 	}
 
@@ -448,7 +449,7 @@ func TestUnit_NodeLifecycle_outOfSyncLoop(t *testing.T) {
 		}).Return(outOfSyncSubscription, nil).Once()
 		rpc.On("Dial", mock.Anything).Return(errors.New("failed to redial")).Maybe()
 
-		node.declareOutOfSync(func(num int64, td *utils.Big) bool {
+		node.declareOutOfSync(func(num int64, td *big.Int) bool {
 			return true
 		})
 		tests.AssertLogCountEventually(t, observedLogs, msgReceivedBlock, len(heads))
@@ -614,7 +615,7 @@ func TestUnit_NodeLifecycle_outOfSyncLoop(t *testing.T) {
 
 		setupRPCForAliveLoop(t, rpc)
 
-		node.declareOutOfSync(func(num int64, td *utils.Big) bool {
+		node.declareOutOfSync(func(num int64, td *big.Int) bool {
 			return num < highestBlock
 		})
 		tests.AssertLogEventually(t, observedLogs, msgReceivedBlock)
@@ -635,8 +636,8 @@ func TestUnit_NodeLifecycle_outOfSyncLoop(t *testing.T) {
 			lggr:                lggr,
 		})
 		defer func() { assert.NoError(t, node.close()) }()
-		node.nLiveNodes = func() (count int, blockNumber int64, totalDifficulty *utils.Big) {
-			return 0, 100, utils.NewBigI(200)
+		node.nLiveNodes = func() (count int, blockNumber int64, totalDifficulty *big.Int) {
+			return 0, 100, big.NewInt(200)
 		}
 
 		rpc.On("Dial", mock.Anything).Return(nil).Once()
@@ -943,7 +944,7 @@ func TestUnit_NodeLifecycle_syncStatus(t *testing.T) {
 	})
 	t.Run("skip if syncThreshold is not configured", func(t *testing.T) {
 		node := newTestNode(t, testNodeOpts{})
-		node.nLiveNodes = func() (count int, blockNumber int64, totalDifficulty *utils.Big) {
+		node.nLiveNodes = func() (count int, blockNumber int64, totalDifficulty *big.Int) {
 			return
 		}
 		outOfSync, liveNodes := node.syncStatus(0, nil)
@@ -954,7 +955,7 @@ func TestUnit_NodeLifecycle_syncStatus(t *testing.T) {
 		node := newTestNode(t, testNodeOpts{
 			config: testNodeConfig{syncThreshold: 1},
 		})
-		node.nLiveNodes = func() (count int, blockNumber int64, totalDifficulty *utils.Big) {
+		node.nLiveNodes = func() (count int, blockNumber int64, totalDifficulty *big.Int) {
 			return
 		}
 		assert.Panics(t, func() {
@@ -1000,13 +1001,13 @@ func TestUnit_NodeLifecycle_syncStatus(t *testing.T) {
 					selectionMode: selectionMode,
 				},
 			})
-			node.nLiveNodes = func() (int, int64, *utils.Big) {
-				return nodesNum, highestBlock, utils.NewBigI(totalDifficulty)
+			node.nLiveNodes = func() (int, int64, *big.Int) {
+				return nodesNum, highestBlock, big.NewInt(totalDifficulty)
 			}
 			for _, td := range []int64{totalDifficulty - syncThreshold - 1, totalDifficulty - syncThreshold, totalDifficulty, totalDifficulty + 1} {
 				for _, testCase := range testCases {
 					t.Run(fmt.Sprintf("%s: selectionMode: %s: total difficulty: %d", testCase.name, selectionMode, td), func(t *testing.T) {
-						outOfSync, liveNodes := node.syncStatus(testCase.blockNumber, utils.NewBigI(td))
+						outOfSync, liveNodes := node.syncStatus(testCase.blockNumber, big.NewInt(td))
 						assert.Equal(t, nodesNum, liveNodes)
 						assert.Equal(t, testCase.outOfSync, outOfSync)
 					})
@@ -1053,13 +1054,13 @@ func TestUnit_NodeLifecycle_syncStatus(t *testing.T) {
 				selectionMode: NodeSelectionModeTotalDifficulty,
 			},
 		})
-		node.nLiveNodes = func() (int, int64, *utils.Big) {
-			return nodesNum, highestBlock, utils.NewBigI(totalDifficulty)
+		node.nLiveNodes = func() (int, int64, *big.Int) {
+			return nodesNum, highestBlock, big.NewInt(totalDifficulty)
 		}
 		for _, hb := range []int64{highestBlock - syncThreshold - 1, highestBlock - syncThreshold, highestBlock, highestBlock + 1} {
 			for _, testCase := range testCases {
 				t.Run(fmt.Sprintf("%s: selectionMode: %s: highest block: %d", testCase.name, NodeSelectionModeTotalDifficulty, hb), func(t *testing.T) {
-					outOfSync, liveNodes := node.syncStatus(hb, utils.NewBigI(testCase.totalDifficulty))
+					outOfSync, liveNodes := node.syncStatus(hb, big.NewInt(testCase.totalDifficulty))
 					assert.Equal(t, nodesNum, liveNodes)
 					assert.Equal(t, testCase.outOfSync, outOfSync)
 				})
diff --git a/common/client/node_selector_total_difficulty.go b/common/client/node_selector_total_difficulty.go
index 9b29642d033..35491503bcc 100644
--- a/common/client/node_selector_total_difficulty.go
+++ b/common/client/node_selector_total_difficulty.go
@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
+	"math/big"
 
 	"github.com/smartcontractkit/chainlink/v2/common/types"
 )
@@ -22,7 +22,7 @@ func NewTotalDifficultyNodeSelector[
 
 func (s totalDifficultyNodeSelector[CHAIN_ID, HEAD, RPC]) Select() Node[CHAIN_ID, HEAD, RPC] {
 	// NodeNoNewHeadsThreshold may not be enabled, in this case all nodes have td == nil
-	var highestTD *utils.Big
+	var highestTD *big.Int
 	var nodes []Node[CHAIN_ID, HEAD, RPC]
 	var aliveNodes []Node[CHAIN_ID, HEAD, RPC]
 
diff --git a/common/client/node_selector_total_difficulty_test.go b/common/client/node_selector_total_difficulty_test.go
index 4eecb859db9..5c43cdd8472 100644
--- a/common/client/node_selector_total_difficulty_test.go
+++ b/common/client/node_selector_total_difficulty_test.go
@@ -1,10 +1,10 @@
 package client
 
 import (
+	big "math/big"
 	"testing"
 
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -27,10 +27,10 @@ func TestTotalDifficultyNodeSelector(t *testing.T) {
 			node.On("StateAndLatest").Return(nodeStateOutOfSync, int64(-1), nil)
 		} else if i == 1 {
 			// second node is alive
-			node.On("StateAndLatest").Return(nodeStateAlive, int64(1), utils.NewBigI(7))
+			node.On("StateAndLatest").Return(nodeStateAlive, int64(1), big.NewInt(7))
 		} else {
 			// third node is alive and best
-			node.On("StateAndLatest").Return(nodeStateAlive, int64(2), utils.NewBigI(8))
+			node.On("StateAndLatest").Return(nodeStateAlive, int64(2), big.NewInt(8))
 		}
 		node.On("Order").Maybe().Return(int32(1))
 		nodes = append(nodes, node)
@@ -42,7 +42,7 @@ func TestTotalDifficultyNodeSelector(t *testing.T) {
 	t.Run("stick to the same node", func(t *testing.T) {
 		node := newMockNode[types.ID, Head, nodeClient](t)
 		// fourth node is alive (same as 3rd)
-		node.On("StateAndLatest").Return(nodeStateAlive, int64(2), utils.NewBigI(8))
+		node.On("StateAndLatest").Return(nodeStateAlive, int64(2), big.NewInt(8))
 		node.On("Order").Maybe().Return(int32(1))
 		nodes = append(nodes, node)
 
@@ -53,7 +53,7 @@ func TestTotalDifficultyNodeSelector(t *testing.T) {
 	t.Run("another best node", func(t *testing.T) {
 		node := newMockNode[types.ID, Head, nodeClient](t)
 		// fifth node is alive (better than 3rd and 4th)
-		node.On("StateAndLatest").Return(nodeStateAlive, int64(3), utils.NewBigI(11))
+		node.On("StateAndLatest").Return(nodeStateAlive, int64(3), big.NewInt(11))
 		node.On("Order").Maybe().Return(int32(1))
 		nodes = append(nodes, node)
 
@@ -88,7 +88,7 @@ func TestTotalDifficultyNodeSelector_None(t *testing.T) {
 			node.On("StateAndLatest").Return(nodeStateOutOfSync, int64(-1), nil)
 		} else {
 			// others are unreachable
-			node.On("StateAndLatest").Return(nodeStateUnreachable, int64(1), utils.NewBigI(7))
+			node.On("StateAndLatest").Return(nodeStateUnreachable, int64(1), big.NewInt(7))
 		}
 		nodes = append(nodes, node)
 	}
@@ -106,7 +106,7 @@ func TestTotalDifficultyNodeSelectorWithOrder(t *testing.T) {
 	t.Run("same td and order", func(t *testing.T) {
 		for i := 0; i < 3; i++ {
 			node := newMockNode[types.ID, Head, nodeClient](t)
-			node.On("StateAndLatest").Return(nodeStateAlive, int64(1), utils.NewBigI(10))
+			node.On("StateAndLatest").Return(nodeStateAlive, int64(1), big.NewInt(10))
 			node.On("Order").Return(int32(2))
 			nodes = append(nodes, node)
 		}
@@ -117,15 +117,15 @@ func TestTotalDifficultyNodeSelectorWithOrder(t *testing.T) {
 
 	t.Run("same td but different order", func(t *testing.T) {
 		node1 := newMockNode[types.ID, Head, nodeClient](t)
-		node1.On("StateAndLatest").Return(nodeStateAlive, int64(3), utils.NewBigI(10))
+		node1.On("StateAndLatest").Return(nodeStateAlive, int64(3), big.NewInt(10))
 		node1.On("Order").Return(int32(3))
 
 		node2 := newMockNode[types.ID, Head, nodeClient](t)
-		node2.On("StateAndLatest").Return(nodeStateAlive, int64(3), utils.NewBigI(10))
+		node2.On("StateAndLatest").Return(nodeStateAlive, int64(3), big.NewInt(10))
 		node2.On("Order").Return(int32(1))
 
 		node3 := newMockNode[types.ID, Head, nodeClient](t)
-		node3.On("StateAndLatest").Return(nodeStateAlive, int64(3), utils.NewBigI(10))
+		node3.On("StateAndLatest").Return(nodeStateAlive, int64(3), big.NewInt(10))
 		node3.On("Order").Return(int32(2))
 
 		nodes := []Node[types.ID, Head, nodeClient]{node1, node2, node3}
@@ -136,15 +136,15 @@ func TestTotalDifficultyNodeSelectorWithOrder(t *testing.T) {
 
 	t.Run("different td but same order", func(t *testing.T) {
 		node1 := newMockNode[types.ID, Head, nodeClient](t)
-		node1.On("StateAndLatest").Return(nodeStateAlive, int64(1), utils.NewBigI(10))
+		node1.On("StateAndLatest").Return(nodeStateAlive, int64(1), big.NewInt(10))
 		node1.On("Order").Maybe().Return(int32(3))
 
 		node2 := newMockNode[types.ID, Head, nodeClient](t)
-		node2.On("StateAndLatest").Return(nodeStateAlive, int64(1), utils.NewBigI(11))
+		node2.On("StateAndLatest").Return(nodeStateAlive, int64(1), big.NewInt(11))
 		node2.On("Order").Maybe().Return(int32(3))
 
 		node3 := newMockNode[types.ID, Head, nodeClient](t)
-		node3.On("StateAndLatest").Return(nodeStateAlive, int64(1), utils.NewBigI(12))
+		node3.On("StateAndLatest").Return(nodeStateAlive, int64(1), big.NewInt(12))
 		node3.On("Order").Return(int32(3))
 
 		nodes := []Node[types.ID, Head, nodeClient]{node1, node2, node3}
@@ -155,19 +155,19 @@ func TestTotalDifficultyNodeSelectorWithOrder(t *testing.T) {
 
 	t.Run("different head and different order", func(t *testing.T) {
 		node1 := newMockNode[types.ID, Head, nodeClient](t)
-		node1.On("StateAndLatest").Return(nodeStateAlive, int64(1), utils.NewBigI(100))
+		node1.On("StateAndLatest").Return(nodeStateAlive, int64(1), big.NewInt(100))
 		node1.On("Order").Maybe().Return(int32(4))
 
 		node2 := newMockNode[types.ID, Head, nodeClient](t)
-		node2.On("StateAndLatest").Return(nodeStateAlive, int64(1), utils.NewBigI(110))
+		node2.On("StateAndLatest").Return(nodeStateAlive, int64(1), big.NewInt(110))
 		node2.On("Order").Maybe().Return(int32(5))
 
 		node3 := newMockNode[types.ID, Head, nodeClient](t)
-		node3.On("StateAndLatest").Return(nodeStateAlive, int64(1), utils.NewBigI(110))
+		node3.On("StateAndLatest").Return(nodeStateAlive, int64(1), big.NewInt(110))
 		node3.On("Order").Maybe().Return(int32(1))
 
 		node4 := newMockNode[types.ID, Head, nodeClient](t)
-		node4.On("StateAndLatest").Return(nodeStateAlive, int64(1), utils.NewBigI(105))
+		node4.On("StateAndLatest").Return(nodeStateAlive, int64(1), big.NewInt(105))
 		node4.On("Order").Maybe().Return(int32(2))
 
 		nodes := []Node[types.ID, Head, nodeClient]{node1, node2, node3, node4}
diff --git a/common/client/types.go b/common/client/types.go
index 6d3a22cee77..32d4da98b50 100644
--- a/common/client/types.go
+++ b/common/client/types.go
@@ -7,7 +7,6 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/assets"
 	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 // RPC includes all the necessary methods for a multi-node client to interact directly with any RPC endpoint.
@@ -51,7 +50,7 @@ type RPC[
 //go:generate mockery --quiet --name Head --structname mockHead --filename "mock_head_test.go" --inpackage --case=underscore
 type Head interface {
 	BlockNumber() int64
-	BlockDifficulty() *utils.Big
+	BlockDifficulty() *big.Int
 }
 
 // NodeClient includes all the necessary RPC methods required by a node.
diff --git a/common/fee/models.go b/common/fee/models.go
index 1fcb55c5309..b843cc3f055 100644
--- a/common/fee/models.go
+++ b/common/fee/models.go
@@ -6,8 +6,8 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	bigmath "github.com/smartcontractkit/chainlink-common/pkg/utils/big_math"
 	"github.com/smartcontractkit/chainlink/v2/common/chains/label"
-	bigmath "github.com/smartcontractkit/chainlink/v2/core/utils/big_math"
 )
 
 var (
diff --git a/common/headtracker/types/mocks/head.go b/common/headtracker/types/mocks/head.go
index 1de1f78de8c..79c483c9978 100644
--- a/common/headtracker/types/mocks/head.go
+++ b/common/headtracker/types/mocks/head.go
@@ -3,13 +3,13 @@
 package mocks
 
 import (
-	time "time"
+	big "math/big"
 
 	mock "github.com/stretchr/testify/mock"
 
-	types "github.com/smartcontractkit/chainlink/v2/common/types"
+	time "time"
 
-	utils "github.com/smartcontractkit/chainlink/v2/core/utils"
+	types "github.com/smartcontractkit/chainlink/v2/common/types"
 )
 
 // Head is an autogenerated mock type for the Head type
@@ -18,15 +18,15 @@ type Head[BLOCK_HASH types.Hashable, CHAIN_ID types.ID] struct {
 }
 
 // BlockDifficulty provides a mock function with given fields:
-func (_m *Head[BLOCK_HASH, CHAIN_ID]) BlockDifficulty() *utils.Big {
+func (_m *Head[BLOCK_HASH, CHAIN_ID]) BlockDifficulty() *big.Int {
 	ret := _m.Called()
 
-	var r0 *utils.Big
-	if rf, ok := ret.Get(0).(func() *utils.Big); ok {
+	var r0 *big.Int
+	if rf, ok := ret.Get(0).(func() *big.Int); ok {
 		r0 = rf()
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*utils.Big)
+			r0 = ret.Get(0).(*big.Int)
 		}
 	}
 
diff --git a/common/txmgr/broadcaster.go b/common/txmgr/broadcaster.go
index cff5746a9e0..ab620c51be3 100644
--- a/common/txmgr/broadcaster.go
+++ b/common/txmgr/broadcaster.go
@@ -247,7 +247,7 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) clos
 	eb.initSync.Lock()
 	defer eb.initSync.Unlock()
 	if !eb.isStarted {
-		return errors.Wrap(utils.ErrAlreadyStopped, "Broadcaster is not started")
+		return errors.Wrap(services.ErrAlreadyStopped, "Broadcaster is not started")
 	}
 	close(eb.chStop)
 	eb.wg.Wait()
diff --git a/common/txmgr/txmgr.go b/common/txmgr/txmgr.go
index 3aac88e2f4b..0a50bb66385 100644
--- a/common/txmgr/txmgr.go
+++ b/common/txmgr/txmgr.go
@@ -401,15 +401,18 @@ func (b *Txm[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) runLoop()
 			// be in an Unstarted state here, if execReset exited early.
 			//
 			// In this case, we don't care about stopping them since they are
-			// already "stopped", hence the usage of utils.EnsureClosed.
-			if err := utils.EnsureClosed(b.broadcaster); err != nil {
-				b.logger.Panicw(fmt.Sprintf("Failed to Close Broadcaster: %v", err), "err", err)
+			// already "stopped".
+			err := b.broadcaster.Close()
+			if err != nil && (!errors.Is(err, services.ErrAlreadyStopped) || !errors.Is(err, services.ErrCannotStopUnstarted)) {
+				b.logger.Errorw(fmt.Sprintf("Failed to Close Broadcaster: %v", err), "err", err)
 			}
-			if err := utils.EnsureClosed(b.confirmer); err != nil {
-				b.logger.Panicw(fmt.Sprintf("Failed to Close Confirmer: %v", err), "err", err)
+			err = b.confirmer.Close()
+			if err != nil && (!errors.Is(err, services.ErrAlreadyStopped) || !errors.Is(err, services.ErrCannotStopUnstarted)) {
+				b.logger.Errorw(fmt.Sprintf("Failed to Close Confirmer: %v", err), "err", err)
 			}
-			if err := utils.EnsureClosed(b.tracker); err != nil {
-				b.logger.Panicw(fmt.Sprintf("Failed to Close Tracker: %v", err), "err", err)
+			err = b.tracker.Close()
+			if err != nil && (!errors.Is(err, services.ErrAlreadyStopped) || !errors.Is(err, services.ErrCannotStopUnstarted)) {
+				b.logger.Errorw(fmt.Sprintf("Failed to Close Tracker: %v", err), "err", err)
 			}
 			return
 		case <-keysChanged:
diff --git a/common/types/head.go b/common/types/head.go
index 000bad2390e..c363fd5d0f2 100644
--- a/common/types/head.go
+++ b/common/types/head.go
@@ -1,9 +1,8 @@
 package types
 
 import (
+	"math/big"
 	"time"
-
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 // Head provides access to a chain's head, as needed by the TxManager.
@@ -36,5 +35,5 @@ type Head[BLOCK_HASH Hashable] interface {
 
 	// Returns the total difficulty of the block. For chains who do not have a concept of block
 	// difficulty, return 0.
-	BlockDifficulty() *utils.Big
+	BlockDifficulty() *big.Int
 }
diff --git a/common/types/mocks/head.go b/common/types/mocks/head.go
index 82fd910a08b..99d2a265b44 100644
--- a/common/types/mocks/head.go
+++ b/common/types/mocks/head.go
@@ -3,13 +3,12 @@
 package mocks
 
 import (
+	big "math/big"
 	time "time"
 
 	mock "github.com/stretchr/testify/mock"
 
 	types "github.com/smartcontractkit/chainlink/v2/common/types"
-
-	utils "github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 // Head is an autogenerated mock type for the Head type
@@ -18,15 +17,15 @@ type Head[BLOCK_HASH types.Hashable] struct {
 }
 
 // BlockDifficulty provides a mock function with given fields:
-func (_m *Head[BLOCK_HASH]) BlockDifficulty() *utils.Big {
+func (_m *Head[BLOCK_HASH]) BlockDifficulty() *big.Int {
 	ret := _m.Called()
 
-	var r0 *utils.Big
-	if rf, ok := ret.Get(0).(func() *utils.Big); ok {
+	var r0 *big.Int
+	if rf, ok := ret.Get(0).(func() *big.Int); ok {
 		r0 = rf()
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*utils.Big)
+			r0 = ret.Get(0).(*big.Int)
 		}
 	}
 
diff --git a/core/chains/evm/assets/wei.go b/core/chains/evm/assets/wei.go
index 7d1240d384c..be0143b3a86 100644
--- a/core/chains/evm/assets/wei.go
+++ b/core/chains/evm/assets/wei.go
@@ -10,8 +10,8 @@ import (
 	"github.com/shopspring/decimal"
 	"golang.org/x/exp/constraints"
 
+	bigmath "github.com/smartcontractkit/chainlink-common/pkg/utils/big_math"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
-	bigmath "github.com/smartcontractkit/chainlink/v2/core/utils/big_math"
 )
 
 const (
diff --git a/core/chains/evm/client/erroring_node.go b/core/chains/evm/client/erroring_node.go
index 21c4d269ea4..c33891728a7 100644
--- a/core/chains/evm/client/erroring_node.go
+++ b/core/chains/evm/client/erroring_node.go
@@ -5,7 +5,6 @@ import (
 	"math/big"
 
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
@@ -132,7 +131,7 @@ func (e *erroringNode) State() NodeState {
 	return NodeStateUnreachable
 }
 
-func (e *erroringNode) StateAndLatest() (NodeState, int64, *utils.Big) {
+func (e *erroringNode) StateAndLatest() (NodeState, int64, *big.Int) {
 	return NodeStateUnreachable, -1, nil
 }
 
diff --git a/core/chains/evm/client/helpers_test.go b/core/chains/evm/client/helpers_test.go
index dce825f4f71..27b335534da 100644
--- a/core/chains/evm/client/helpers_test.go
+++ b/core/chains/evm/client/helpers_test.go
@@ -14,7 +14,6 @@ import (
 	commonconfig "github.com/smartcontractkit/chainlink/v2/common/config"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 type TestNodePoolConfig struct {
@@ -45,7 +44,7 @@ func NewClientWithTestNode(t *testing.T, nodePoolCfg config.NodePool, noNewHeads
 
 	lggr := logger.Test(t)
 	n := NewNode(nodePoolCfg, noNewHeadsThreshold, lggr, *parsed, rpcHTTPURL, "eth-primary-0", id, chainID, 1)
-	n.(*node).setLatestReceived(0, utils.NewBigI(0))
+	n.(*node).setLatestReceived(0, big.NewInt(0))
 	primaries := []Node{n}
 
 	var sendonlys []SendOnlyNode
diff --git a/core/chains/evm/client/node.go b/core/chains/evm/client/node.go
index e2da78b502a..a2c8b807ba2 100644
--- a/core/chains/evm/client/node.go
+++ b/core/chains/evm/client/node.go
@@ -24,7 +24,6 @@ import (
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 var (
@@ -93,7 +92,7 @@ type Node interface {
 	// State returns NodeState
 	State() NodeState
 	// StateAndLatest returns NodeState with the latest received block number & total difficulty.
-	StateAndLatest() (state NodeState, blockNum int64, totalDifficulty *utils.Big)
+	StateAndLatest() (state NodeState, blockNum int64, totalDifficulty *big.Int)
 	// Name is a unique identifier for this node.
 	Name() string
 	ChainID() *big.Int
@@ -153,7 +152,7 @@ type node struct {
 	state   NodeState
 	// Each node is tracking the last received head number and total difficulty
 	stateLatestBlockNumber     int64
-	stateLatestTotalDifficulty *utils.Big
+	stateLatestTotalDifficulty *big.Int
 
 	// Need to track subscriptions because closing the RPC does not (always?)
 	// close the underlying subscription
@@ -177,7 +176,7 @@ type node struct {
 	//  1. see how many live nodes there are in total, so we can prevent the last alive node in a pool from being
 	//  moved to out-of-sync state. It is better to have one out-of-sync node than no nodes at all.
 	//  2. compare against the highest head (by number or difficulty) to ensure we don't fall behind too far.
-	nLiveNodes func() (count int, blockNumber int64, totalDifficulty *utils.Big)
+	nLiveNodes func() (count int, blockNumber int64, totalDifficulty *big.Int)
 }
 
 // NewNode returns a new *node as Node
diff --git a/core/chains/evm/client/node_fsm.go b/core/chains/evm/client/node_fsm.go
index 10694eb7fc4..c92af3b4120 100644
--- a/core/chains/evm/client/node_fsm.go
+++ b/core/chains/evm/client/node_fsm.go
@@ -2,11 +2,10 @@ package client
 
 import (
 	"fmt"
+	"math/big"
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
-
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 var (
@@ -112,7 +111,7 @@ func (n *node) State() NodeState {
 	return n.state
 }
 
-func (n *node) StateAndLatest() (NodeState, int64, *utils.Big) {
+func (n *node) StateAndLatest() (NodeState, int64, *big.Int) {
 	n.stateMu.RLock()
 	defer n.stateMu.RUnlock()
 	return n.state, n.stateLatestBlockNumber, n.stateLatestTotalDifficulty
@@ -184,7 +183,7 @@ func (n *node) transitionToInSync(fn func()) {
 
 // declareOutOfSync puts a node into OutOfSync state, disconnecting all current
 // clients and making it unavailable for use until back in-sync.
-func (n *node) declareOutOfSync(isOutOfSync func(num int64, td *utils.Big) bool) {
+func (n *node) declareOutOfSync(isOutOfSync func(num int64, td *big.Int) bool) {
 	n.transitionToOutOfSync(func() {
 		n.lfcLog.Errorw("RPC Node is out of sync", "nodeState", n.state)
 		n.wg.Add(1)
diff --git a/core/chains/evm/client/node_lifecycle.go b/core/chains/evm/client/node_lifecycle.go
index 11d03d97dd5..f838325a646 100644
--- a/core/chains/evm/client/node_lifecycle.go
+++ b/core/chains/evm/client/node_lifecycle.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"math"
+	"math/big"
 	"time"
 
 	"github.com/pkg/errors"
@@ -11,6 +12,8 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	bigmath "github.com/smartcontractkit/chainlink-common/pkg/utils/big_math"
+
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
@@ -50,7 +53,7 @@ func zombieNodeCheckInterval(noNewHeadsThreshold time.Duration) time.Duration {
 	return utils.WithJitter(interval)
 }
 
-func (n *node) setLatestReceived(blockNumber int64, totalDifficulty *utils.Big) {
+func (n *node) setLatestReceived(blockNumber int64, totalDifficulty *big.Int) {
 	n.stateMu.Lock()
 	defer n.stateMu.Unlock()
 	n.stateLatestBlockNumber = blockNumber
@@ -215,13 +218,13 @@ func (n *node) aliveLoop() {
 					continue
 				}
 			}
-			n.declareOutOfSync(func(num int64, td *utils.Big) bool { return num < highestReceivedBlockNumber })
+			n.declareOutOfSync(func(num int64, td *big.Int) bool { return num < highestReceivedBlockNumber })
 			return
 		}
 	}
 }
 
-func (n *node) isOutOfSync(num int64, td *utils.Big) (outOfSync bool) {
+func (n *node) isOutOfSync(num int64, td *big.Int) (outOfSync bool) {
 	outOfSync, _ = n.syncStatus(num, td)
 	return
 }
@@ -229,7 +232,7 @@ func (n *node) isOutOfSync(num int64, td *utils.Big) (outOfSync bool) {
 // syncStatus returns outOfSync true if num or td is more than SyncThresold behind the best node.
 // Always returns outOfSync false for SyncThreshold 0.
 // liveNodes is only included when outOfSync is true.
-func (n *node) syncStatus(num int64, td *utils.Big) (outOfSync bool, liveNodes int) {
+func (n *node) syncStatus(num int64, td *big.Int) (outOfSync bool, liveNodes int) {
 	if n.nLiveNodes == nil {
 		return // skip for tests
 	}
@@ -244,8 +247,8 @@ func (n *node) syncStatus(num int64, td *utils.Big) (outOfSync bool, liveNodes i
 	case NodeSelectionMode_HighestHead, NodeSelectionMode_RoundRobin, NodeSelectionMode_PriorityLevel:
 		return num < highest-int64(threshold), ln
 	case NodeSelectionMode_TotalDifficulty:
-		bigThreshold := utils.NewBigI(int64(threshold))
-		return td.Cmp(greatest.Sub(bigThreshold)) < 0, ln
+		bigThreshold := big.NewInt(int64(threshold))
+		return td.Cmp(bigmath.Sub(greatest, bigThreshold)) < 0, ln
 	default:
 		panic("unrecognized NodeSelectionMode: " + mode)
 	}
@@ -257,7 +260,7 @@ const (
 )
 
 // outOfSyncLoop takes an OutOfSync node and waits until isOutOfSync returns false to go back to live status
-func (n *node) outOfSyncLoop(isOutOfSync func(num int64, td *utils.Big) bool) {
+func (n *node) outOfSyncLoop(isOutOfSync func(num int64, td *big.Int) bool) {
 	defer n.wg.Done()
 
 	{
diff --git a/core/chains/evm/client/node_lifecycle_test.go b/core/chains/evm/client/node_lifecycle_test.go
index 42f813cc2b5..f097c2bc078 100644
--- a/core/chains/evm/client/node_lifecycle_test.go
+++ b/core/chains/evm/client/node_lifecycle_test.go
@@ -16,7 +16,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func standardHandler(method string, _ gjson.Result) (resp testutils.JSONRPCResponse) {
@@ -161,7 +160,7 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 			}
 			return
 		})
-		n.nLiveNodes = func() (int, int64, *utils.Big) { return 1, 0, nil }
+		n.nLiveNodes = func() (int, int64, *big.Int) { return 1, 0, nil }
 		dial(t, n)
 		defer func() { assert.NoError(t, n.Close()) }()
 
@@ -308,7 +307,7 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 
 		iN := NewNode(pollDisabledCfg, testutils.TestInterval, lggr, *s.WSURL(), nil, "test node", 42, testutils.FixtureChainID, 1)
 		n := iN.(*node)
-		n.nLiveNodes = func() (int, int64, *utils.Big) { return 1, 0, nil }
+		n.nLiveNodes = func() (int, int64, *big.Int) { return 1, 0, nil }
 		dial(t, n)
 		defer func() { assert.NoError(t, n.Close()) }()
 
@@ -353,7 +352,7 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 
 		iN := NewNode(cfg, 0*time.Second, logger.Test(t), *s.WSURL(), nil, "test node", 42, testutils.FixtureChainID, 1)
 		n := iN.(*node)
-		n.nLiveNodes = func() (count int, blockNumber int64, totalDifficulty *utils.Big) {
+		n.nLiveNodes = func() (count int, blockNumber int64, totalDifficulty *big.Int) {
 			return 2, highestHead.Load(), nil
 		}
 
@@ -415,7 +414,7 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 
 		iN := NewNode(cfg, 0*time.Second, logger.Test(t), *s.WSURL(), nil, "test node", 42, testutils.FixtureChainID, 1)
 		n := iN.(*node)
-		n.nLiveNodes = func() (count int, blockNumber int64, totalDifficulty *utils.Big) {
+		n.nLiveNodes = func() (count int, blockNumber int64, totalDifficulty *big.Int) {
 			return 2, highestHead.Load(), nil
 		}
 
@@ -474,7 +473,7 @@ func TestUnit_NodeLifecycle_aliveLoop(t *testing.T) {
 
 		iN := NewNode(cfg, 0*time.Second, lggr, *s.WSURL(), nil, "test node", 42, testutils.FixtureChainID, 1)
 		n := iN.(*node)
-		n.nLiveNodes = func() (count int, blockNumber int64, totalDifficulty *utils.Big) {
+		n.nLiveNodes = func() (count int, blockNumber int64, totalDifficulty *big.Int) {
 			return 1, highestHead.Load(), nil
 		}
 
@@ -521,7 +520,7 @@ func TestUnit_NodeLifecycle_outOfSyncLoop(t *testing.T) {
 		n.wg.Add(1)
 		go func() {
 			defer close(ch)
-			n.outOfSyncLoop(func(num int64, td *utils.Big) bool { return false })
+			n.outOfSyncLoop(func(num int64, td *big.Int) bool { return false })
 		}()
 		assert.NoError(t, n.Close())
 		testutils.WaitWithTimeout(t, ch, "expected outOfSyncLoop to exit")
@@ -536,7 +535,7 @@ func TestUnit_NodeLifecycle_outOfSyncLoop(t *testing.T) {
 
 		n.wg.Add(1)
 
-		n.outOfSyncLoop(func(num int64, td *utils.Big) bool { return num == 0 })
+		n.outOfSyncLoop(func(num int64, td *big.Int) bool { return num == 0 })
 		assert.Equal(t, NodeStateUnreachable, n.State())
 	})
 
@@ -565,7 +564,7 @@ func TestUnit_NodeLifecycle_outOfSyncLoop(t *testing.T) {
 		defer func() { assert.NoError(t, n.Close()) }()
 
 		n.wg.Add(1)
-		go n.outOfSyncLoop(func(num int64, td *utils.Big) bool { return num == 0 })
+		go n.outOfSyncLoop(func(num int64, td *big.Int) bool { return num == 0 })
 
 		testutils.WaitWithTimeout(t, chSubbed, "timed out waiting for initial subscription")
 
@@ -612,7 +611,7 @@ func TestUnit_NodeLifecycle_outOfSyncLoop(t *testing.T) {
 		defer func() { assert.NoError(t, n.Close()) }()
 
 		n.wg.Add(1)
-		go n.outOfSyncLoop(func(num int64, td *utils.Big) bool { return num < 43 })
+		go n.outOfSyncLoop(func(num int64, td *big.Int) bool { return num < 43 })
 
 		testutils.WaitWithTimeout(t, chSubbed, "timed out waiting for initial subscription")
 
@@ -661,7 +660,7 @@ func TestUnit_NodeLifecycle_outOfSyncLoop(t *testing.T) {
 
 		iN := NewNode(cfg, time.Second*0, lggr, *s.WSURL(), nil, "test node", 0, testutils.FixtureChainID, 1)
 		n := iN.(*node)
-		n.nLiveNodes = func() (count int, blockNumber int64, totalDifficulty *utils.Big) {
+		n.nLiveNodes = func() (count int, blockNumber int64, totalDifficulty *big.Int) {
 			return 2, stall + int64(cfg.SyncThreshold()), nil
 		}
 
@@ -717,14 +716,14 @@ func TestUnit_NodeLifecycle_outOfSyncLoop(t *testing.T) {
 
 		iN := NewNode(cfg, testutils.TestInterval, logger.Test(t), *s.WSURL(), nil, "test node", 42, testutils.FixtureChainID, 1)
 		n := iN.(*node)
-		n.nLiveNodes = func() (int, int64, *utils.Big) { return 0, 0, nil }
+		n.nLiveNodes = func() (int, int64, *big.Int) { return 0, 0, nil }
 
 		dial(t, n)
 		n.setState(NodeStateOutOfSync)
 		defer func() { assert.NoError(t, n.Close()) }()
 
 		n.wg.Add(1)
-		go n.outOfSyncLoop(func(num int64, td *utils.Big) bool { return num == 0 })
+		go n.outOfSyncLoop(func(num int64, td *big.Int) bool { return num == 0 })
 
 		testutils.WaitWithTimeout(t, chSubbed, "timed out waiting for initial subscription")
 
diff --git a/core/chains/evm/client/node_selector_total_difficulty.go b/core/chains/evm/client/node_selector_total_difficulty.go
index 99a1c89dd4f..27d888947d9 100644
--- a/core/chains/evm/client/node_selector_total_difficulty.go
+++ b/core/chains/evm/client/node_selector_total_difficulty.go
@@ -1,8 +1,6 @@
 package client
 
-import (
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
-)
+import "math/big"
 
 type totalDifficultyNodeSelector []Node
 
@@ -13,7 +11,7 @@ func NewTotalDifficultyNodeSelector(nodes []Node) NodeSelector {
 
 func (s totalDifficultyNodeSelector) Select() Node {
 	// NodeNoNewHeadsThreshold may not be enabled, in this case all nodes have td == nil
-	var highestTD *utils.Big
+	var highestTD *big.Int
 	var nodes []Node
 	var aliveNodes []Node
 
diff --git a/core/chains/evm/client/node_selector_total_difficulty_test.go b/core/chains/evm/client/node_selector_total_difficulty_test.go
index d42a7461dee..486a421477e 100644
--- a/core/chains/evm/client/node_selector_total_difficulty_test.go
+++ b/core/chains/evm/client/node_selector_total_difficulty_test.go
@@ -1,11 +1,11 @@
 package client_test
 
 import (
+	"math/big"
 	"testing"
 
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmmocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/mocks"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -27,10 +27,10 @@ func TestTotalDifficultyNodeSelector(t *testing.T) {
 			node.On("StateAndLatest").Return(evmclient.NodeStateOutOfSync, int64(-1), nil)
 		} else if i == 1 {
 			// second node is alive
-			node.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(1), utils.NewBigI(7))
+			node.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(1), big.NewInt(7))
 		} else {
 			// third node is alive and best
-			node.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(2), utils.NewBigI(8))
+			node.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(2), big.NewInt(8))
 		}
 		node.On("Order").Maybe().Return(int32(1))
 		nodes = append(nodes, node)
@@ -42,7 +42,7 @@ func TestTotalDifficultyNodeSelector(t *testing.T) {
 	t.Run("stick to the same node", func(t *testing.T) {
 		node := evmmocks.NewNode(t)
 		// fourth node is alive (same as 3rd)
-		node.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(2), utils.NewBigI(8))
+		node.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(2), big.NewInt(8))
 		node.On("Order").Maybe().Return(int32(1))
 		nodes = append(nodes, node)
 
@@ -53,7 +53,7 @@ func TestTotalDifficultyNodeSelector(t *testing.T) {
 	t.Run("another best node", func(t *testing.T) {
 		node := evmmocks.NewNode(t)
 		// fifth node is alive (better than 3rd and 4th)
-		node.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(3), utils.NewBigI(11))
+		node.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(3), big.NewInt(11))
 		node.On("Order").Maybe().Return(int32(1))
 		nodes = append(nodes, node)
 
@@ -87,7 +87,7 @@ func TestTotalDifficultyNodeSelector_None(t *testing.T) {
 			node.On("StateAndLatest").Return(evmclient.NodeStateOutOfSync, int64(-1), nil)
 		} else {
 			// others are unreachable
-			node.On("StateAndLatest").Return(evmclient.NodeStateUnreachable, int64(1), utils.NewBigI(7))
+			node.On("StateAndLatest").Return(evmclient.NodeStateUnreachable, int64(1), big.NewInt(7))
 		}
 		nodes = append(nodes, node)
 	}
@@ -104,7 +104,7 @@ func TestTotalDifficultyNodeSelectorWithOrder(t *testing.T) {
 	t.Run("same td and order", func(t *testing.T) {
 		for i := 0; i < 3; i++ {
 			node := evmmocks.NewNode(t)
-			node.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(1), utils.NewBigI(10))
+			node.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(1), big.NewInt(10))
 			node.On("Order").Return(int32(2))
 			nodes = append(nodes, node)
 		}
@@ -115,15 +115,15 @@ func TestTotalDifficultyNodeSelectorWithOrder(t *testing.T) {
 
 	t.Run("same td but different order", func(t *testing.T) {
 		node1 := evmmocks.NewNode(t)
-		node1.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(3), utils.NewBigI(10))
+		node1.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(3), big.NewInt(10))
 		node1.On("Order").Return(int32(3))
 
 		node2 := evmmocks.NewNode(t)
-		node2.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(3), utils.NewBigI(10))
+		node2.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(3), big.NewInt(10))
 		node2.On("Order").Return(int32(1))
 
 		node3 := evmmocks.NewNode(t)
-		node3.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(3), utils.NewBigI(10))
+		node3.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(3), big.NewInt(10))
 		node3.On("Order").Return(int32(2))
 
 		nodes := []evmclient.Node{node1, node2, node3}
@@ -134,15 +134,15 @@ func TestTotalDifficultyNodeSelectorWithOrder(t *testing.T) {
 
 	t.Run("different td but same order", func(t *testing.T) {
 		node1 := evmmocks.NewNode(t)
-		node1.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(1), utils.NewBigI(10))
+		node1.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(1), big.NewInt(10))
 		node1.On("Order").Maybe().Return(int32(3))
 
 		node2 := evmmocks.NewNode(t)
-		node2.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(1), utils.NewBigI(11))
+		node2.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(1), big.NewInt(11))
 		node2.On("Order").Maybe().Return(int32(3))
 
 		node3 := evmmocks.NewNode(t)
-		node3.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(1), utils.NewBigI(12))
+		node3.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(1), big.NewInt(12))
 		node3.On("Order").Return(int32(3))
 
 		nodes := []evmclient.Node{node1, node2, node3}
@@ -153,19 +153,19 @@ func TestTotalDifficultyNodeSelectorWithOrder(t *testing.T) {
 
 	t.Run("different head and different order", func(t *testing.T) {
 		node1 := evmmocks.NewNode(t)
-		node1.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(1), utils.NewBigI(100))
+		node1.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(1), big.NewInt(100))
 		node1.On("Order").Maybe().Return(int32(4))
 
 		node2 := evmmocks.NewNode(t)
-		node2.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(1), utils.NewBigI(110))
+		node2.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(1), big.NewInt(110))
 		node2.On("Order").Maybe().Return(int32(5))
 
 		node3 := evmmocks.NewNode(t)
-		node3.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(1), utils.NewBigI(110))
+		node3.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(1), big.NewInt(110))
 		node3.On("Order").Maybe().Return(int32(1))
 
 		node4 := evmmocks.NewNode(t)
-		node4.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(1), utils.NewBigI(105))
+		node4.On("StateAndLatest").Return(evmclient.NodeStateAlive, int64(1), big.NewInt(105))
 		node4.On("Order").Maybe().Return(int32(2))
 
 		nodes := []evmclient.Node{node1, node2, node3, node4}
diff --git a/core/chains/evm/client/pool.go b/core/chains/evm/client/pool.go
index 9217f633dc3..6c36cc3e987 100644
--- a/core/chains/evm/client/pool.go
+++ b/core/chains/evm/client/pool.go
@@ -178,8 +178,8 @@ func (p *Pool) Dial(ctx context.Context) error {
 
 // nLiveNodes returns the number of currently alive nodes, as well as the highest block number and greatest total difficulty.
 // totalDifficulty will be 0 if all nodes return nil.
-func (p *Pool) nLiveNodes() (nLiveNodes int, blockNumber int64, totalDifficulty *utils.Big) {
-	totalDifficulty = utils.NewBigI(0)
+func (p *Pool) nLiveNodes() (nLiveNodes int, blockNumber int64, totalDifficulty *big.Int) {
+	totalDifficulty = big.NewInt(0)
 	for _, n := range p.nodes {
 		if s, num, td := n.StateAndLatest(); s == NodeStateAlive {
 			nLiveNodes++
diff --git a/core/chains/evm/client/simulated_backend_client.go b/core/chains/evm/client/simulated_backend_client.go
index 10b2aae502a..293bf64badc 100644
--- a/core/chains/evm/client/simulated_backend_client.go
+++ b/core/chains/evm/client/simulated_backend_client.go
@@ -302,7 +302,7 @@ func (c *SimulatedBackendClient) SubscribeNewHead(
 			case h := <-ch:
 				var head *evmtypes.Head
 				if h != nil {
-					head = &evmtypes.Head{Difficulty: (*utils.Big)(h.Difficulty), Timestamp: time.Unix(int64(h.Time), 0), Number: h.Number.Int64(), Hash: h.Hash(), ParentHash: h.ParentHash, Parent: lastHead, EVMChainID: utils.NewBig(c.chainId)}
+					head = &evmtypes.Head{Difficulty: h.Difficulty, Timestamp: time.Unix(int64(h.Time), 0), Number: h.Number.Int64(), Hash: h.Hash(), ParentHash: h.ParentHash, Parent: lastHead, EVMChainID: utils.NewBig(c.chainId)}
 					lastHead = head
 				}
 				select {
diff --git a/core/chains/evm/gas/models.go b/core/chains/evm/gas/models.go
index 4f9a5419702..c7476d58ba4 100644
--- a/core/chains/evm/gas/models.go
+++ b/core/chains/evm/gas/models.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	bigmath "github.com/smartcontractkit/chainlink-common/pkg/utils/big_math"
 
 	"github.com/smartcontractkit/chainlink/v2/common/config"
 	commonfee "github.com/smartcontractkit/chainlink/v2/common/fee"
@@ -22,7 +23,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas/rollups"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/label"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	bigmath "github.com/smartcontractkit/chainlink/v2/core/utils/big_math"
 )
 
 // EvmFeeEstimator provides a unified interface that wraps EvmEstimator and can determine if legacy or dynamic fee estimation should be used
diff --git a/core/chains/evm/mocks/node.go b/core/chains/evm/mocks/node.go
index 85db2e0ca0f..69020d411f4 100644
--- a/core/chains/evm/mocks/node.go
+++ b/core/chains/evm/mocks/node.go
@@ -19,8 +19,6 @@ import (
 	rpc "github.com/ethereum/go-ethereum/rpc"
 
 	types "github.com/ethereum/go-ethereum/core/types"
-
-	utils "github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 // Node is an autogenerated mock type for the Node type
@@ -519,13 +517,13 @@ func (_m *Node) State() client.NodeState {
 }
 
 // StateAndLatest provides a mock function with given fields:
-func (_m *Node) StateAndLatest() (client.NodeState, int64, *utils.Big) {
+func (_m *Node) StateAndLatest() (client.NodeState, int64, *big.Int) {
 	ret := _m.Called()
 
 	var r0 client.NodeState
 	var r1 int64
-	var r2 *utils.Big
-	if rf, ok := ret.Get(0).(func() (client.NodeState, int64, *utils.Big)); ok {
+	var r2 *big.Int
+	if rf, ok := ret.Get(0).(func() (client.NodeState, int64, *big.Int)); ok {
 		return rf()
 	}
 	if rf, ok := ret.Get(0).(func() client.NodeState); ok {
@@ -540,11 +538,11 @@ func (_m *Node) StateAndLatest() (client.NodeState, int64, *utils.Big) {
 		r1 = ret.Get(1).(int64)
 	}
 
-	if rf, ok := ret.Get(2).(func() *utils.Big); ok {
+	if rf, ok := ret.Get(2).(func() *big.Int); ok {
 		r2 = rf()
 	} else {
 		if ret.Get(2) != nil {
-			r2 = ret.Get(2).(*utils.Big)
+			r2 = ret.Get(2).(*big.Int)
 		}
 	}
 
diff --git a/core/chains/evm/txmgr/transmitchecker.go b/core/chains/evm/txmgr/transmitchecker.go
index f210934adb1..76dfcb9d51c 100644
--- a/core/chains/evm/txmgr/transmitchecker.go
+++ b/core/chains/evm/txmgr/transmitchecker.go
@@ -12,6 +12,8 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	bigmath "github.com/smartcontractkit/chainlink-common/pkg/utils/big_math"
+
 	"github.com/smartcontractkit/chainlink/v2/common/txmgr"
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
@@ -22,7 +24,6 @@ import (
 	v2 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/vrf_coordinator_v2"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/vrf_coordinator_v2plus_interface"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
-	bigmath "github.com/smartcontractkit/chainlink/v2/core/utils/big_math"
 )
 
 type (
diff --git a/core/chains/evm/types/models.go b/core/chains/evm/types/models.go
index 83b90b4d539..314180a7e98 100644
--- a/core/chains/evm/types/models.go
+++ b/core/chains/evm/types/models.go
@@ -39,8 +39,8 @@ type Head struct {
 	ReceiptsRoot     common.Hash
 	TransactionsRoot common.Hash
 	StateRoot        common.Hash
-	Difficulty       *utils.Big
-	TotalDifficulty  *utils.Big
+	Difficulty       *big.Int
+	TotalDifficulty  *big.Int
 }
 
 var _ commontypes.Head[common.Hash] = &Head{}
@@ -80,7 +80,7 @@ func (h *Head) GetTimestamp() time.Time {
 	return h.Timestamp
 }
 
-func (h *Head) BlockDifficulty() *utils.Big {
+func (h *Head) BlockDifficulty() *big.Int {
 	return h.Difficulty
 }
 
@@ -283,8 +283,8 @@ func (h *Head) UnmarshalJSON(bs []byte) error {
 	h.ReceiptsRoot = jsonHead.ReceiptsRoot
 	h.TransactionsRoot = jsonHead.TransactionsRoot
 	h.StateRoot = jsonHead.StateRoot
-	h.Difficulty = utils.NewBig(jsonHead.Difficulty.ToInt())
-	h.TotalDifficulty = utils.NewBig(jsonHead.TotalDifficulty.ToInt())
+	h.Difficulty = jsonHead.Difficulty.ToInt()
+	h.TotalDifficulty = jsonHead.TotalDifficulty.ToInt()
 	return nil
 }
 
diff --git a/core/utils/big.go b/core/utils/big.go
index 22cd8e64e55..69fab223de7 100644
--- a/core/utils/big.go
+++ b/core/utils/big.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/ethereum/go-ethereum/common/hexutil"
 
+	bigmath "github.com/smartcontractkit/chainlink-common/pkg/utils/big_math"
 	"github.com/smartcontractkit/chainlink-common/pkg/utils/bytes"
-	bigmath "github.com/smartcontractkit/chainlink/v2/core/utils/big_math"
 )
 
 const base10 = 10
diff --git a/core/utils/utils.go b/core/utils/utils.go
index 69597fb9e4a..0df280775b5 100644
--- a/core/utils/utils.go
+++ b/core/utils/utils.go
@@ -9,7 +9,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io"
 	"math"
 	"math/big"
 	mrand "math/rand"
@@ -771,16 +770,6 @@ var (
 // Deprecated: use services.StateMachine
 type StartStopOnce = services.StateMachine
 
-// EnsureClosed closes the io.Closer, returning nil if it was already
-// closed or not started yet
-func EnsureClosed(c io.Closer) error {
-	err := c.Close()
-	if errors.Is(err, ErrAlreadyStopped) || errors.Is(err, ErrCannotStopUnstarted) {
-		return nil
-	}
-	return err
-}
-
 // WithJitter adds +/- 10% to a duration
 func WithJitter(d time.Duration) time.Duration {
 	// #nosec

From b7cb603352bb88b880e15875cccfcc1f2f54f101 Mon Sep 17 00:00:00 2001
From: Jordan Krage <jmank88@gmail.com>
Date: Wed, 29 Nov 2023 14:18:50 -0600
Subject: [PATCH 035/130] core/chains/evm/txmgr: nil check errs before wrapping
 (#11412)

---
 core/chains/evm/txmgr/evm_tx_store.go | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/core/chains/evm/txmgr/evm_tx_store.go b/core/chains/evm/txmgr/evm_tx_store.go
index 51c9f98e884..e36ca611e16 100644
--- a/core/chains/evm/txmgr/evm_tx_store.go
+++ b/core/chains/evm/txmgr/evm_tx_store.go
@@ -567,7 +567,10 @@ func (o *evmTxStore) GetFatalTransactions(ctx context.Context) (txes []*Tx, err
 		txes = make([]*Tx, len(dbEtxs))
 		dbEthTxsToEvmEthTxPtrs(dbEtxs, txes)
 		err = o.LoadTxesAttempts(txes, pg.WithParentCtx(ctx), pg.WithQueryer(tx))
-		return fmt.Errorf("failed to load evm.tx_attempts: %w", err)
+		if err != nil {
+			return fmt.Errorf("failed to load evm.tx_attempts: %w", err)
+		}
+		return nil
 	}, pg.OptReadOnlyTx())
 
 	return txes, nil
@@ -1277,7 +1280,10 @@ func (o *evmTxStore) GetNonFatalTransactions(ctx context.Context, chainID *big.I
 		txes = make([]*Tx, len(dbEtxs))
 		dbEthTxsToEvmEthTxPtrs(dbEtxs, txes)
 		err = o.LoadTxesAttempts(txes, pg.WithParentCtx(ctx), pg.WithQueryer(tx))
-		return fmt.Errorf("failed to load evm.txes: %w", err)
+		if err != nil {
+			return fmt.Errorf("failed to load evm.txes: %w", err)
+		}
+		return nil
 	}, pg.OptReadOnlyTx())
 
 	return txes, nil
@@ -1302,7 +1308,10 @@ func (o *evmTxStore) GetTxByID(ctx context.Context, id int64) (txe *Tx, err erro
 		}
 		txe = txes[0]
 		err = o.LoadTxesAttempts(txes, pg.WithParentCtx(ctx), pg.WithQueryer(tx))
-		return fmt.Errorf("failed to load evm.tx_attempts: %w", err)
+		if err != nil {
+			return fmt.Errorf("failed to load evm.tx_attempts: %w", err)
+		}
+		return nil
 	}, pg.OptReadOnlyTx())
 
 	return txe, nil

From 5c4e368b341e878e339f4d25e0fccd93cf0e9035 Mon Sep 17 00:00:00 2001
From: Jordan Krage <jmank88@gmail.com>
Date: Wed, 29 Nov 2023 14:31:39 -0600
Subject: [PATCH 036/130] .github/workflows: notify slack for ci-core develop
 failues (#11408)

---
 .github/workflows/ci-core.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-core.yml b/.github/workflows/ci-core.yml
index e69fc64cc7b..fd8dfed88ab 100644
--- a/.github/workflows/ci-core.yml
+++ b/.github/workflows/ci-core.yml
@@ -29,7 +29,7 @@ jobs:
           gc-basic-auth: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }}
           gc-host: ${{ secrets.GRAFANA_CLOUD_HOST }}
       - name: Notify Slack
-        if: ${{ failure() && github.event.schedule != '' }}
+        if: ${{ failure() && (github.event_name == 'merge_group' || github.event.branch == 'develop')}}
         uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 # v1.24.0
         env:
           SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
@@ -107,7 +107,7 @@ jobs:
             ./coverage.txt
             ./postgres_logs.txt
       - name: Notify Slack
-        if: ${{ failure() && matrix.cmd == 'go_core_race_tests' && github.event.schedule != '' }}
+        if: ${{ failure() && matrix.cmd == 'go_core_race_tests' && (github.event_name == 'merge_group' || github.event.branch == 'develop') }}
         uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 # v1.24.0
         env:
           SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}

From 4f5a3f89092cac91cef1682e075b723693465fe8 Mon Sep 17 00:00:00 2001
From: Dimitris Grigoriou <dimitris.grigoriou@smartcontract.com>
Date: Wed, 29 Nov 2023 23:54:32 +0200
Subject: [PATCH 037/130] Add PendingSequenceAt to fix txm test case (#11416)

* Add PendingSequenceAt nonce

* Fix return values
---
 core/chains/evm/txmgr/txmgr_test.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/chains/evm/txmgr/txmgr_test.go b/core/chains/evm/txmgr/txmgr_test.go
index f82bc991d52..524c85b108b 100644
--- a/core/chains/evm/txmgr/txmgr_test.go
+++ b/core/chains/evm/txmgr/txmgr_test.go
@@ -519,8 +519,8 @@ func TestTxm_Reset(t *testing.T) {
 	cfg := evmtest.NewChainScopedConfig(t, gcfg)
 	kst := cltest.NewKeyStore(t, db, cfg.Database())
 
-	_, addr := cltest.RandomKey{Nonce: 5}.MustInsert(t, kst.Eth())
-	_, addr2 := cltest.RandomKey{Nonce: 3}.MustInsert(t, kst.Eth())
+	_, addr := cltest.RandomKey{}.MustInsert(t, kst.Eth())
+	_, addr2 := cltest.RandomKey{}.MustInsert(t, kst.Eth())
 	txStore := cltest.NewTestTxStore(t, db, cfg.Database())
 	// 4 confirmed tx from addr1
 	for i := int64(0); i < 4; i++ {
@@ -534,6 +534,8 @@ func TestTxm_Reset(t *testing.T) {
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
 	ethClient.On("HeadByNumber", mock.Anything, (*big.Int)(nil)).Return(nil, nil)
 	ethClient.On("BatchCallContextAll", mock.Anything, mock.Anything).Return(nil).Maybe()
+	ethClient.On("PendingSequenceAt", mock.Anything, addr).Return(128, nil).Maybe()
+	ethClient.On("PendingSequenceAt", mock.Anything, addr2).Return(44, nil).Maybe()
 
 	estimator := gas.NewEstimator(logger.Test(t), ethClient, cfg.EVM(), cfg.EVM().GasEstimator())
 	txm, err := makeTestEvmTxm(t, db, ethClient, estimator, cfg.EVM(), cfg.EVM().GasEstimator(), cfg.EVM().Transactions(), cfg.Database(), cfg.Database().Listener(), kst.Eth())

From d6465f09ff93f9d93bab561ee33261828d4e083b Mon Sep 17 00:00:00 2001
From: Jordan Krage <jmank88@gmail.com>
Date: Wed, 29 Nov 2023 20:06:46 -0600
Subject: [PATCH 038/130] core/chains/evm/txmgr: fix TestTxm_Reset mocks
 (#11420)

---
 core/chains/evm/txmgr/broadcaster_test.go | 1 +
 core/chains/evm/txmgr/txmgr_test.go       | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/chains/evm/txmgr/broadcaster_test.go b/core/chains/evm/txmgr/broadcaster_test.go
index 93b1093e795..26e78344b93 100644
--- a/core/chains/evm/txmgr/broadcaster_test.go
+++ b/core/chains/evm/txmgr/broadcaster_test.go
@@ -161,6 +161,7 @@ func TestEthBroadcaster_LoadNextSequenceMapFailure_StartupSuccess(t *testing.T)
 	// Instance starts without error even if loading next sequence map fails
 	err := eb.Start(testutils.Context(t))
 	require.NoError(t, err)
+	t.Cleanup(func() { assert.NoError(t, eb.Close()) })
 }
 
 func TestEthBroadcaster_ProcessUnstartedEthTxs_Success(t *testing.T) {
diff --git a/core/chains/evm/txmgr/txmgr_test.go b/core/chains/evm/txmgr/txmgr_test.go
index 524c85b108b..745623ed77e 100644
--- a/core/chains/evm/txmgr/txmgr_test.go
+++ b/core/chains/evm/txmgr/txmgr_test.go
@@ -534,8 +534,8 @@ func TestTxm_Reset(t *testing.T) {
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
 	ethClient.On("HeadByNumber", mock.Anything, (*big.Int)(nil)).Return(nil, nil)
 	ethClient.On("BatchCallContextAll", mock.Anything, mock.Anything).Return(nil).Maybe()
-	ethClient.On("PendingSequenceAt", mock.Anything, addr).Return(128, nil).Maybe()
-	ethClient.On("PendingSequenceAt", mock.Anything, addr2).Return(44, nil).Maybe()
+	ethClient.On("PendingNonceAt", mock.Anything, addr).Return(uint64(128), nil).Maybe()
+	ethClient.On("PendingNonceAt", mock.Anything, addr2).Return(uint64(44), nil).Maybe()
 
 	estimator := gas.NewEstimator(logger.Test(t), ethClient, cfg.EVM(), cfg.EVM().GasEstimator())
 	txm, err := makeTestEvmTxm(t, db, ethClient, estimator, cfg.EVM(), cfg.EVM().GasEstimator(), cfg.EVM().Transactions(), cfg.Database(), cfg.Database().Listener(), kst.Eth())

From 7f1a336440dfed0989e0cb136ffe72c7c11a1b7b Mon Sep 17 00:00:00 2001
From: Andrei Smirnov <andrei.smirnov@smartcontract.com>
Date: Thu, 30 Nov 2023 10:43:12 +0300
Subject: [PATCH 039/130] Gateway client script: added readme and json pretty
 print (#11361)

* Gateway client script: added readme and json pretty print

* Reading S4 payload from the file
---
 core/scripts/gateway/client/README.md       | 20 ++++++++++++++++++
 core/scripts/gateway/client/send_request.go | 23 +++++++++++++++++----
 2 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 core/scripts/gateway/client/README.md

diff --git a/core/scripts/gateway/client/README.md b/core/scripts/gateway/client/README.md
new file mode 100644
index 00000000000..8c257753e6a
--- /dev/null
+++ b/core/scripts/gateway/client/README.md
@@ -0,0 +1,20 @@
+# A gateway client script
+
+This script is used to connect to a gateway server and send commands to it.
+
+## Usage
+
+All requests have to be signed on behalf of a user, you need to provide your private key in .env file, e.g.
+
+```
+PRIVATE_KEY=1a2b3c...
+```
+
+The script will automatically sign the message using the provided private key.
+Run the script without arguments to get the list of available commands.
+
+## Example
+
+```
+go run . -gateway_url https://01.functions-gateway.chain.link -don_id fun-avalanche-mainnet-2 -method secrets_list -message_id 123
+```
diff --git a/core/scripts/gateway/client/send_request.go b/core/scripts/gateway/client/send_request.go
index 94ff6fb17da..8ab4e8bce79 100644
--- a/core/scripts/gateway/client/send_request.go
+++ b/core/scripts/gateway/client/send_request.go
@@ -28,7 +28,7 @@ func main() {
 	s4SetSlotId := flag.Uint("s4_set_slot_id", 0, "S4 set slot ID")
 	s4SetVersion := flag.Uint64("s4_set_version", 0, "S4 set version")
 	s4SetExpirationPeriod := flag.Int64("s4_set_expiration_period", 60*60*1000, "S4 how long until the entry expires from now (in milliseconds)")
-	s4SetPayload := flag.String("s4_set_payload", "", "S4 set payload")
+	s4SetPayloadFile := flag.String("s4_set_payload_file", "", "S4 payload file to set secret")
 	repeat := flag.Bool("repeat", false, "Repeat sending the request every 10 seconds")
 	flag.Parse()
 
@@ -50,6 +50,16 @@ func main() {
 	}
 	address := crypto.PubkeyToAddress(key.PublicKey)
 
+	var s4SetPayload []byte
+	if *methodName == functions.MethodSecretsSet {
+		var err error
+		s4SetPayload, err = os.ReadFile(*s4SetPayloadFile)
+		if err != nil {
+			fmt.Println("error reading S4 payload file", err)
+			return
+		}
+	}
+
 	// build payload (if relevant)
 	var payloadJSON []byte
 	if *methodName == functions.MethodSecretsSet {
@@ -57,7 +67,7 @@ func main() {
 			Address:    address.Bytes(),
 			SlotID:     *s4SetSlotId,
 			Version:    *s4SetVersion,
-			Payload:    []byte(*s4SetPayload),
+			Payload:    s4SetPayload,
 			Expiration: time.Now().UnixMilli() + *s4SetExpirationPeriod,
 		}
 		signature, err := envelope.Sign(key)
@@ -70,7 +80,7 @@ func main() {
 			SlotID:     envelope.SlotID,
 			Version:    envelope.Version,
 			Expiration: envelope.Expiration,
-			Payload:    []byte(*s4SetPayload),
+			Payload:    s4SetPayload,
 			Signature:  signature,
 		}
 
@@ -131,7 +141,12 @@ func main() {
 			return
 		}
 
-		fmt.Println(string(body))
+		var prettyJSON bytes.Buffer
+		if err := json.Indent(&prettyJSON, body, "", "  "); err != nil {
+			fmt.Println(string(body))
+		} else {
+			fmt.Println(prettyJSON.String())
+		}
 	}
 
 	sendRequest()

From 01f8398706b98bd4ab72314539dafd608443da1c Mon Sep 17 00:00:00 2001
From: Cedric <cedric.cordenier@smartcontract.com>
Date: Thu, 30 Nov 2023 09:07:58 +0000
Subject: [PATCH 040/130] [BCF-2779] Better formatting of the generic plugin
 config (#11406)

---
 core/services/ocr2/delegate.go               | 41 +++++++++++-------
 core/services/ocr2/validate/validate.go      | 37 +++++++++++++---
 core/services/ocr2/validate/validate_test.go | 44 +++++++++++++++++++-
 plugins/medianpoc/plugin.go                  | 14 +++++--
 plugins/medianpoc/plugin_test.go             |  2 +-
 5 files changed, 109 insertions(+), 29 deletions(-)

diff --git a/core/services/ocr2/delegate.go b/core/services/ocr2/delegate.go
index eebc95903ed..af56c1e7a99 100644
--- a/core/services/ocr2/delegate.go
+++ b/core/services/ocr2/delegate.go
@@ -525,29 +525,33 @@ func (d *Delegate) newServicesGenericPlugin(
 ) (srvs []job.ServiceCtx, err error) {
 	spec := jb.OCR2OracleSpec
 
+	// NOTE: we don't need to validate this config, since that happens as part of creating the job.
+	// See: validate/validate.go's `validateSpec`.
 	p := validate.OCR2GenericPluginConfig{}
 	err = json.Unmarshal(spec.PluginConfig.Bytes(), &p)
 	if err != nil {
 		return nil, err
 	}
-	cconf := p.CoreConfig
 
-	command := cconf.Command
+	command := p.Command
 	if command == "" {
-		command = defaultPathFromPluginName(cconf.PluginName)
+		command = defaultPathFromPluginName(p.PluginName)
 	}
 
-	// NOTE: we don't need to validate this config, since that happens as part of creating the job.
-	// See: validate/validate.go's `validateSpec`.
+	// Add the default pipeline to the pluginConfig
+	p.Pipelines = append(
+		p.Pipelines,
+		validate.PipelineSpec{Name: "__DEFAULT_PIPELINE__", Spec: jb.Pipeline.Source},
+	)
 
 	rid, err := spec.RelayID()
 	if err != nil {
-		return nil, ErrJobSpecNoRelayer{PluginName: cconf.PluginName, Err: err}
+		return nil, ErrJobSpecNoRelayer{PluginName: p.PluginName, Err: err}
 	}
 
 	relayer, err := d.RelayGetter.Get(rid)
 	if err != nil {
-		return nil, ErrRelayNotEnabled{Err: err, Relay: spec.Relay, PluginName: p.CoreConfig.PluginName}
+		return nil, ErrRelayNotEnabled{Err: err, Relay: spec.Relay, PluginName: p.PluginName}
 	}
 
 	provider, err := relayer.NewPluginProvider(ctx, types.RelayArgs{
@@ -556,7 +560,7 @@ func (d *Delegate) newServicesGenericPlugin(
 		ContractID:    spec.ContractID,
 		New:           d.isNewlyCreatedJob,
 		RelayConfig:   spec.RelayConfig.Bytes(),
-		ProviderType:  cconf.ProviderType,
+		ProviderType:  p.ProviderType,
 	}, types.PluginArgs{
 		TransmitterID: spec.TransmitterID.String,
 		PluginConfig:  spec.PluginConfig.Bytes(),
@@ -570,7 +574,7 @@ func (d *Delegate) newServicesGenericPlugin(
 		rid.Network,
 		rid.ChainID,
 		spec.ContractID,
-		synchronization.TelemetryType(cconf.TelemetryType),
+		synchronization.TelemetryType(p.TelemetryType),
 	)
 	oracleArgs := libocr2.OCR2OracleArgs{
 		BinaryNetworkEndpointFactory: d.peerWrapper.Peer2,
@@ -586,8 +590,8 @@ func (d *Delegate) newServicesGenericPlugin(
 		OffchainConfigDigester:       provider.OffchainConfigDigester(),
 	}
 
-	pluginLggr := lggr.Named(cconf.PluginName).Named(spec.ContractID).Named(spec.GetID())
-	cmdFn, grpcOpts, err := d.cfg.RegisterLOOP(fmt.Sprintf("%s-%s-%s", cconf.PluginName, spec.ContractID, spec.GetID()), command)
+	pluginLggr := lggr.Named(p.PluginName).Named(spec.ContractID).Named(spec.GetID())
+	cmdFn, grpcOpts, err := d.cfg.RegisterLOOP(fmt.Sprintf("%s-%s-%s", p.PluginName, spec.ContractID, spec.GetID()), command)
 	if err != nil {
 		return nil, fmt.Errorf("failed to register loop: %w", err)
 	}
@@ -604,7 +608,7 @@ func (d *Delegate) newServicesGenericPlugin(
 		//TODO: remove this workaround when the EVM relayer is running inside of an LOOPP
 		d.lggr.Info("provider is not a LOOPP provider, switching to provider server")
 
-		ps, err2 := relay.NewProviderServer(provider, types.OCR2PluginType(cconf.ProviderType), d.lggr)
+		ps, err2 := relay.NewProviderServer(provider, types.OCR2PluginType(p.ProviderType), d.lggr)
 		if err2 != nil {
 			return nil, fmt.Errorf("cannot start EVM provider server: %s", err)
 		}
@@ -615,12 +619,17 @@ func (d *Delegate) newServicesGenericPlugin(
 		srvs = append(srvs, ps)
 	}
 
+	pc, err := json.Marshal(p.Config)
+	if err != nil {
+		return nil, fmt.Errorf("cannot dump plugin config to string before sending to plugin: %s", err)
+	}
+
 	pluginConfig := types.ReportingPluginServiceConfig{
-		PluginName:    cconf.PluginName,
+		PluginName:    p.PluginName,
 		Command:       command,
-		ProviderType:  cconf.ProviderType,
-		TelemetryType: cconf.TelemetryType,
-		PluginConfig:  p.PluginConfig,
+		ProviderType:  p.ProviderType,
+		TelemetryType: p.TelemetryType,
+		PluginConfig:  string(pc),
 	}
 
 	pr := generic.NewPipelineRunnerAdapter(pluginLggr, jb, d.pipelineRunner)
diff --git a/core/services/ocr2/validate/validate.go b/core/services/ocr2/validate/validate.go
index c97d23dca09..bb9bb03a8ac 100644
--- a/core/services/ocr2/validate/validate.go
+++ b/core/services/ocr2/validate/validate.go
@@ -125,16 +125,42 @@ func validateSpec(tree *toml.Tree, spec job.Job) error {
 	return nil
 }
 
-type coreConfig struct {
+type PipelineSpec struct {
+	Name string `json:"name"`
+	Spec string `json:"spec"`
+}
+
+type Config struct {
+	Pipelines    []PipelineSpec `json:"pipelines"`
+	PluginConfig map[string]any `json:"pluginConfig"`
+}
+
+type innerConfig struct {
 	Command       string `json:"command"`
 	ProviderType  string `json:"providerType"`
 	PluginName    string `json:"pluginName"`
 	TelemetryType string `json:"telemetryType"`
+	Config
 }
 
 type OCR2GenericPluginConfig struct {
-	CoreConfig   coreConfig `json:"coreConfig"`
-	PluginConfig string
+	innerConfig
+}
+
+func (o *OCR2GenericPluginConfig) UnmarshalJSON(data []byte) error {
+	err := json.Unmarshal(data, &o.innerConfig)
+	if err != nil {
+		return nil
+	}
+
+	m := map[string]any{}
+	err = json.Unmarshal(data, &m)
+	if err != nil {
+		return err
+	}
+
+	o.PluginConfig = m
+	return nil
 }
 
 func validateOCR2GenericPluginSpec(jsonConfig job.JSONConfig) error {
@@ -144,12 +170,11 @@ func validateOCR2GenericPluginSpec(jsonConfig job.JSONConfig) error {
 		return err
 	}
 
-	cc := p.CoreConfig
-	if cc.PluginName == "" {
+	if p.PluginName == "" {
 		return errors.New("generic config invalid: must provide plugin name")
 	}
 
-	if cc.TelemetryType == "" {
+	if p.TelemetryType == "" {
 		return errors.New("generic config invalid: must provide telemetry type")
 	}
 
diff --git a/core/services/ocr2/validate/validate_test.go b/core/services/ocr2/validate/validate_test.go
index 5b40224a4bf..b03f08f6b08 100644
--- a/core/services/ocr2/validate/validate_test.go
+++ b/core/services/ocr2/validate/validate_test.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/manyminds/api2go/jsonapi"
+	"github.com/pelletier/go-toml"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -627,7 +628,7 @@ transmitterID = "0x74103Cf8b436465870b26aa9Fa2F62AD62b22E35"
 [relayConfig]
 chainID = 4
 
-[pluginConfig.coreConfig]
+[pluginConfig]
 pluginName = "median"
 `,
 			assertion: func(t *testing.T, os job.Job, err error) {
@@ -655,7 +656,7 @@ transmitterID = "0x74103Cf8b436465870b26aa9Fa2F62AD62b22E35"
 [relayConfig]
 chainID = 4
 
-[pluginConfig.coreConfig]
+[pluginConfig]
 pluginName = "median"
 telemetryType = "median"
 `,
@@ -678,3 +679,42 @@ telemetryType = "median"
 		})
 	}
 }
+
+type envelope struct {
+	PluginConfig *validate.OCR2GenericPluginConfig
+}
+
+func TestOCR2GenericPluginConfig_Unmarshal(t *testing.T) {
+	payload := `
+[pluginConfig]
+pluginName = "median"
+telemetryType = "median"
+foo = "bar"
+
+[[pluginConfig.pipelines]]
+name = "default"
+spec = "a spec"
+`
+	tree, err := toml.Load(payload)
+	require.NoError(t, err)
+
+	// Load the toml how we load it in the plugin, i.e. convert to
+	// map[string]any first, then treat as JSON
+	o := map[string]any{}
+	err = tree.Unmarshal(&o)
+	require.NoError(t, err)
+
+	b, err := json.Marshal(o)
+	require.NoError(t, err)
+
+	e := &envelope{}
+	err = json.Unmarshal(b, e)
+	require.NoError(t, err)
+
+	pc := e.PluginConfig
+	assert.Equal(t, "bar", pc.PluginConfig["foo"])
+	assert.Len(t, pc.Pipelines, 1)
+	assert.Equal(t, validate.PipelineSpec{Name: "default", Spec: "a spec"}, pc.Pipelines[0])
+	assert.Equal(t, "median", pc.PluginName)
+	assert.Equal(t, "median", pc.TelemetryType)
+}
diff --git a/plugins/medianpoc/plugin.go b/plugins/medianpoc/plugin.go
index af4ec41ab8f..fdf409b588f 100644
--- a/plugins/medianpoc/plugin.go
+++ b/plugins/medianpoc/plugin.go
@@ -30,8 +30,13 @@ type Plugin struct {
 	reportingplugins.MedianProviderServer
 }
 
+type pipelineSpec struct {
+	Name string `json:"name"`
+	Spec string `json:"spec"`
+}
+
 type jsonConfig struct {
-	Pipelines map[string]string `json:"pipelines"`
+	Pipelines []pipelineSpec `json:"pipelines"`
 }
 
 func (j jsonConfig) defaultPipeline() (string, error) {
@@ -39,9 +44,10 @@ func (j jsonConfig) defaultPipeline() (string, error) {
 }
 
 func (j jsonConfig) getPipeline(key string) (string, error) {
-	v, ok := j.Pipelines[key]
-	if ok {
-		return v, nil
+	for _, v := range j.Pipelines {
+		if v.Name == key {
+			return v.Spec, nil
+		}
 	}
 	return "", fmt.Errorf("no pipeline found for %s", key)
 }
diff --git a/plugins/medianpoc/plugin_test.go b/plugins/medianpoc/plugin_test.go
index bc6af7ae5d3..0d6c0360e43 100644
--- a/plugins/medianpoc/plugin_test.go
+++ b/plugins/medianpoc/plugin_test.go
@@ -80,7 +80,7 @@ func TestNewPlugin(t *testing.T) {
 	juelsPerFeeCoinSpec := "jpfc-spec"
 	config := types.ReportingPluginServiceConfig{
 		PluginConfig: fmt.Sprintf(
-			`{"pipelines": {"__DEFAULT_PIPELINE__": "%s", "juelsPerFeeCoinPipeline": "%s"}}`,
+			`{"pipelines": [{"name": "__DEFAULT_PIPELINE__", "spec": "%s"},{"name": "juelsPerFeeCoinPipeline", "spec": "%s"}]}`,
 			defaultSpec,
 			juelsPerFeeCoinSpec,
 		),

From f034241c3c7f018cae71c9122328bc9e2b06e4ad Mon Sep 17 00:00:00 2001
From: Sri Kidambi <1702865+kidambisrinivas@users.noreply.github.com>
Date: Thu, 30 Nov 2023 12:50:01 +0000
Subject: [PATCH 041/130] Add VRFOwner contract support to VRF V2 Super Script
 (#11414)

* Deploy VRFOwner contract and transfer ownership of coordinator

* Minor changes

* Execute vrfOwner.SetAuthorizedSenders for all sending keys

---------

Co-authored-by: Ilja Pavlovs <ilja.pavlovs@gmail.com>
---
 core/scripts/common/arbitrum.go               |  7 ++-
 .../vrfv2/testnet/v2scripts/super_scripts.go  | 55 +++++++++++++++++--
 core/scripts/vrfv2/testnet/v2scripts/util.go  |  1 -
 3 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/core/scripts/common/arbitrum.go b/core/scripts/common/arbitrum.go
index a3a2a24fcd8..251f9b7609c 100644
--- a/core/scripts/common/arbitrum.go
+++ b/core/scripts/common/arbitrum.go
@@ -1,12 +1,13 @@
 package common
 
 const (
-	ArbitrumGoerliChainID int64 = 421613
-	ArbitrumOneChainID    int64 = 42161
+	ArbitrumGoerliChainID  int64 = 421613
+	ArbitrumOneChainID     int64 = 42161
+	ArbitrumSepoliaChainID int64 = 421614
 )
 
 // IsArbitrumChainID returns true if and only if the given chain ID corresponds
 // to an Arbitrum chain (testnet or mainnet).
 func IsArbitrumChainID(chainID int64) bool {
-	return chainID == ArbitrumGoerliChainID || chainID == ArbitrumOneChainID
+	return chainID == ArbitrumGoerliChainID || chainID == ArbitrumOneChainID || chainID == ArbitrumSepoliaChainID
 }
diff --git a/core/scripts/vrfv2/testnet/v2scripts/super_scripts.go b/core/scripts/vrfv2/testnet/v2scripts/super_scripts.go
index b623ae63084..4a1c1fcec41 100644
--- a/core/scripts/vrfv2/testnet/v2scripts/super_scripts.go
+++ b/core/scripts/vrfv2/testnet/v2scripts/super_scripts.go
@@ -19,9 +19,11 @@ import (
 	"github.com/smartcontractkit/chainlink/core/scripts/common/vrf/model"
 	"github.com/smartcontractkit/chainlink/core/scripts/common/vrf/util"
 
+	evmtypes "github.com/ethereum/go-ethereum/core/types"
 	helpers "github.com/smartcontractkit/chainlink/core/scripts/common"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/link_token_interface"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/vrf_coordinator_v2"
+	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/vrf_owner"
 	"github.com/smartcontractkit/chainlink/v2/core/services/signatures/secp256k1"
 )
 
@@ -50,6 +52,8 @@ func DeployUniverseViaCLI(e helpers.Environment) {
 
 	batchFulfillmentEnabled := deployCmd.Bool("batch-fulfillment-enabled", constants.BatchFulfillmentEnabled, "whether send randomness fulfillments in batches inside one tx from CL node")
 
+	deployVRFOwner := deployCmd.Bool("deploy-vrf-owner", false, "whether to deploy VRF owner contracts")
+
 	// optional flags
 	fallbackWeiPerUnitLinkString := deployCmd.String("fallback-wei-per-unit-link", constants.FallbackWeiPerUnitLink.String(), "fallback wei/link ratio")
 	registerVRFKeyUncompressedPubKey := deployCmd.String("uncompressed-pub-key", "", "uncompressed public key")
@@ -98,10 +102,7 @@ func DeployUniverseViaCLI(e helpers.Environment) {
 
 	nodesMap := make(map[string]model.Node)
 
-	fundingAmount, ok := new(big.Int).SetString(*nodeSendingKeyFundingAmount, 10)
-	if !ok {
-		panic(fmt.Sprintf("failed to parse node sending key funding amount '%s'", *nodeSendingKeyFundingAmount))
-	}
+	fundingAmount := decimal.RequireFromString(*nodeSendingKeyFundingAmount).BigInt()
 	nodesMap[model.VRFPrimaryNodeName] = model.Node{
 		SendingKeys:             util.MapToSendingKeyArr(vrfPrimaryNodeSendingKeys),
 		SendingKeyFundingAmount: fundingAmount,
@@ -143,6 +144,7 @@ func DeployUniverseViaCLI(e helpers.Environment) {
 		coordinatorConfig,
 		*batchFulfillmentEnabled,
 		nodesMap,
+		*deployVRFOwner,
 	)
 
 	vrfPrimaryNode := nodesMap[model.VRFPrimaryNodeName]
@@ -160,6 +162,7 @@ func VRFV2DeployUniverse(
 	coordinatorConfig CoordinatorConfigV2,
 	batchFulfillmentEnabled bool,
 	nodesMap map[string]model.Node,
+	deployVRFOwner bool,
 ) model.JobSpecs {
 	var compressedPkHex string
 	var keyHash common.Hash
@@ -216,6 +219,15 @@ func VRFV2DeployUniverse(
 	coordinator, err := vrf_coordinator_v2.NewVRFCoordinatorV2(contractAddresses.CoordinatorAddress, e.Ec)
 	helpers.PanicErr(err)
 
+	var vrfOwnerAddress common.Address
+	if deployVRFOwner {
+		var tx *evmtypes.Transaction
+		fmt.Printf("\nDeploying VRF Owner for coordinator %v\n", contractAddresses.CoordinatorAddress)
+		vrfOwnerAddress, tx, _, err = vrf_owner.DeployVRFOwner(e.Owner, e.Ec, contractAddresses.CoordinatorAddress)
+		helpers.PanicErr(err)
+		helpers.ConfirmContractDeployed(context.Background(), e.Ec, tx, e.ChainID)
+	}
+
 	if contractAddresses.BatchCoordinatorAddress.String() == "0x0000000000000000000000000000000000000000" {
 		fmt.Println("\nDeploying Batch Coordinator...")
 		contractAddresses.BatchCoordinatorAddress = DeployBatchCoordinatorV2(e, contractAddresses.CoordinatorAddress)
@@ -273,6 +285,28 @@ func VRFV2DeployUniverse(
 	helpers.PanicErr(err)
 	fmt.Printf("Subscription %+v\n", s)
 
+	if deployVRFOwner {
+		// VRF Owner
+		vrfOwner, err := vrf_owner.NewVRFOwner(vrfOwnerAddress, e.Ec)
+		helpers.PanicErr(err)
+		var authorizedSendersSlice []common.Address
+		for _, s := range nodesMap[model.VRFPrimaryNodeName].SendingKeys {
+			authorizedSendersSlice = append(authorizedSendersSlice, common.HexToAddress(s.Address))
+		}
+		fmt.Printf("\nSetting authorised senders for VRF Owner: %v, Authorised senders %v\n", vrfOwnerAddress.String(), authorizedSendersSlice)
+		tx, err := vrfOwner.SetAuthorizedSenders(e.Owner, authorizedSendersSlice)
+		helpers.PanicErr(err)
+		helpers.ConfirmTXMined(context.Background(), e.Ec, tx, e.ChainID, "vrf owner set authorized senders")
+		fmt.Printf("\nTransfering ownership of coordinator: %v, VRF Owner %v\n", contractAddresses.CoordinatorAddress, vrfOwnerAddress.String())
+		tx, err = coordinator.TransferOwnership(e.Owner, vrfOwnerAddress)
+		helpers.PanicErr(err)
+		helpers.ConfirmTXMined(context.Background(), e.Ec, tx, e.ChainID, "transfer ownership to", vrfOwnerAddress.String())
+		fmt.Printf("\nAccepting ownership of coordinator: %v, VRF Owner %v\n", contractAddresses.CoordinatorAddress, vrfOwnerAddress.String())
+		tx, err = vrfOwner.AcceptVRFOwnership(e.Owner)
+		helpers.PanicErr(err)
+		helpers.ConfirmTXMined(context.Background(), e.Ec, tx, e.ChainID, "vrf owner accepting vrf ownership")
+	}
+
 	formattedVrfPrimaryJobSpec := fmt.Sprintf(
 		jobs.VRFV2JobFormatted,
 		contractAddresses.CoordinatorAddress,      //coordinatorAddress
@@ -293,6 +327,12 @@ func VRFV2DeployUniverse(
 		contractAddresses.CoordinatorAddress,
 		contractAddresses.CoordinatorAddress,
 	)
+	if deployVRFOwner {
+		formattedVrfPrimaryJobSpec = strings.Replace(formattedVrfPrimaryJobSpec,
+			"minIncomingConfirmations",
+			fmt.Sprintf("vrfOwnerAddress = \"%s\"\nminIncomingConfirmations", vrfOwnerAddress.Hex()),
+			1)
+	}
 
 	formattedVrfBackupJobSpec := fmt.Sprintf(
 		jobs.VRFV2JobFormatted,
@@ -314,6 +354,12 @@ func VRFV2DeployUniverse(
 		contractAddresses.CoordinatorAddress,
 		contractAddresses.CoordinatorAddress,
 	)
+	if deployVRFOwner {
+		formattedVrfBackupJobSpec = strings.Replace(formattedVrfBackupJobSpec,
+			"minIncomingConfirmations",
+			fmt.Sprintf("vrfOwnerAddress = \"%s\"\nminIncomingConfirmations", vrfOwnerAddress.Hex()),
+			1)
+	}
 
 	formattedBHSJobSpec := fmt.Sprintf(
 		jobs.BHSJobFormatted,
@@ -353,6 +399,7 @@ func VRFV2DeployUniverse(
 		"\nVRF Coordinator Address:", contractAddresses.CoordinatorAddress,
 		"\nBatch VRF Coordinator Address:", contractAddresses.BatchCoordinatorAddress,
 		"\nVRF Consumer Address:", consumerAddress,
+		"\nVRF Owner Address:", vrfOwnerAddress,
 		"\nVRF Subscription Id:", subID,
 		"\nVRF Subscription Balance:", *subscriptionBalanceJuels,
 		"\nPossible VRF Request command: ",
diff --git a/core/scripts/vrfv2/testnet/v2scripts/util.go b/core/scripts/vrfv2/testnet/v2scripts/util.go
index 0e348e9c01c..94e381378bb 100644
--- a/core/scripts/vrfv2/testnet/v2scripts/util.go
+++ b/core/scripts/vrfv2/testnet/v2scripts/util.go
@@ -89,7 +89,6 @@ func EoaFundSubscription(e helpers.Environment, coordinator vrf_coordinator_v2.V
 	fmt.Println("Initial account balance:", bal, e.Owner.From.String(), "Funding amount:", amount.String())
 	b, err := utils.ABIEncode(`[{"type":"uint64"}]`, subID)
 	helpers.PanicErr(err)
-	e.Owner.GasLimit = 500000
 	tx, err := linkToken.TransferAndCall(e.Owner, coordinator.Address(), amount, b)
 	helpers.PanicErr(err)
 	helpers.ConfirmTXMined(context.Background(), e.Ec, tx, e.ChainID, fmt.Sprintf("sub ID: %d", subID))

From f2f2e35238661ec4720553d5edeea5ef69a85ecb Mon Sep 17 00:00:00 2001
From: Sergey Kudasov <f4hrenh9it@gmail.com>
Date: Thu, 30 Nov 2023 15:52:20 +0300
Subject: [PATCH 042/130] RE-2081 All core metrics dashboard for CRIB (#11396)

* complete core metrics

* all core metrics

* go mod tidy

* revert go mod

* extend wasp dashboard for load tests

* run OCRv1 on devspace (#11417)

* run OCRv1 on devspace

* fix go.mod

* fix goimports

* remove external charts

* dynamic nodes connection in config

* try the same replaces from integration-tests

* fix go.sum
---
 charts/chainlink-cluster/README.md            |   19 +-
 charts/chainlink-cluster/connect.toml         |   12 +
 .../dashboard/cmd/dashboard_deploy.go         |   13 +-
 .../chainlink-cluster/dashboard/dashboard.go  |  672 +++++-
 charts/chainlink-cluster/devspace.yaml        |    8 +-
 charts/chainlink-cluster/go.mod               |  177 +-
 charts/chainlink-cluster/go.sum               | 2116 ++++++++++++++++-
 .../templates/chainlink-cm.yaml               |   12 +-
 .../templates/chainlink-service.yaml          |    2 +-
 .../templates/mockserver-service.yaml         |   14 +
 .../templates/mockserver.yaml                 |    3 +-
 charts/chainlink-cluster/values-raw-helm.yaml |   19 +-
 integration-tests/go.mod                      |    2 +-
 integration-tests/k8s/connect.go              |  103 +
 integration-tests/load/ocr/README.md          |   28 +
 integration-tests/load/ocr/config.go          |   72 +
 integration-tests/load/ocr/config.toml        |   20 +
 integration-tests/load/ocr/gun.go             |   55 +
 integration-tests/load/ocr/helper.go          |   68 +
 integration-tests/load/ocr/ocr_test.go        |   71 +
 integration-tests/load/ocr/vu.go              |  128 +
 21 files changed, 3555 insertions(+), 59 deletions(-)
 create mode 100644 charts/chainlink-cluster/connect.toml
 create mode 100644 charts/chainlink-cluster/templates/mockserver-service.yaml
 create mode 100644 integration-tests/k8s/connect.go
 create mode 100644 integration-tests/load/ocr/README.md
 create mode 100644 integration-tests/load/ocr/config.go
 create mode 100644 integration-tests/load/ocr/config.toml
 create mode 100644 integration-tests/load/ocr/gun.go
 create mode 100644 integration-tests/load/ocr/helper.go
 create mode 100644 integration-tests/load/ocr/ocr_test.go
 create mode 100644 integration-tests/load/ocr/vu.go

diff --git a/charts/chainlink-cluster/README.md b/charts/chainlink-cluster/README.md
index 46c337dc724..e3cec129a91 100644
--- a/charts/chainlink-cluster/README.md
+++ b/charts/chainlink-cluster/README.md
@@ -55,10 +55,8 @@ Destroy the cluster
 devspace purge
 ```
 
-If you need to run some system level tests inside k8s use `runner` profile:
-```
-devspace dev -p runner
-```
+## Running load tests
+Check this [doc](../../integration-tests/load/ocr/README.md)
 
 If you used `devspace dev ...` always use `devspace reset pods` to switch the pods back
 
@@ -66,8 +64,6 @@ If you used `devspace dev ...` always use `devspace reset pods` to switch the po
 If you need to debug CL node that is already deployed change `dev.app.container` and `dev.app.labelSelector` in [devspace.yaml](devspace.yaml) if they are not default and run:
 ```
 devspace dev -p node
-or
-devspace dev -p runner
 ```
 
 ## Automatic file sync
@@ -85,7 +81,7 @@ helm install -f values-raw-helm.yaml cl-cluster .
 ```
 Forward all apps (in another terminal)
 ```
-sudo kubefwd svc
+sudo kubefwd svc -n cl-cluster
 ```
 Then you can connect and run your tests
 
@@ -126,14 +122,9 @@ export GRAFANA_URL=...
 export GRAFANA_TOKEN=...
 export LOKI_DATA_SOURCE_NAME=Loki
 export PROMETHEUS_DATA_SOURCE_NAME=Thanos
-export DASHBOARD_FOLDER=CLClusterEphemeralDevspace
+export DASHBOARD_FOLDER=CRIB
 export DASHBOARD_NAME=ChainlinkCluster
 
 cd dashboard/cmd && go run dashboard_deploy.go
 ```
-Open Grafana folder `CLClusterEphemeralDevspace` and find dashboard `ChainlinkCluster`
-
-If you'd like to add more metrics or verify that all of them are added you can have the full list using IDE search or `ripgrep`:
-```
-rg -U ".*promauto.*\n.*Name: \"(.*)\"" ../.. > metrics.txt
-```
\ No newline at end of file
+Open Grafana folder `CRIB` and find dashboard `ChainlinkCluster`
\ No newline at end of file
diff --git a/charts/chainlink-cluster/connect.toml b/charts/chainlink-cluster/connect.toml
new file mode 100644
index 00000000000..f0a74d4c144
--- /dev/null
+++ b/charts/chainlink-cluster/connect.toml
@@ -0,0 +1,12 @@
+namespace = "cl-cluster"
+network_name = "geth"
+network_chain_id = 1337
+network_private_key = "ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
+network_ws_url = "ws://geth:8546"
+network_http_url = "http://geth:8544"
+cl_nodes_num = 6
+cl_node_url_template = "http://app-node-%d:6688"
+cl_node_internal_dns_record_template = "app-node-%d"
+cl_node_user = "notreal@fakeemail.ch"
+cl_node_password = "fj293fbBnlQ!f9vNs"
+mockserver_url = "http://app-mockserver:1080"
\ No newline at end of file
diff --git a/charts/chainlink-cluster/dashboard/cmd/dashboard_deploy.go b/charts/chainlink-cluster/dashboard/cmd/dashboard_deploy.go
index 170ffa02883..93619fe6148 100644
--- a/charts/chainlink-cluster/dashboard/cmd/dashboard_deploy.go
+++ b/charts/chainlink-cluster/dashboard/cmd/dashboard_deploy.go
@@ -1,14 +1,13 @@
 package main
 
 import (
-	"context"
 	"os"
 
 	"github.com/smartcontractkit/chainlink/v2/dashboard/dashboard"
+	"github.com/smartcontractkit/wasp"
 )
 
 func main() {
-	ctx := context.Background()
 	name := os.Getenv("DASHBOARD_NAME")
 	if name == "" {
 		panic("DASHBOARD_NAME must be provided")
@@ -17,6 +16,7 @@ func main() {
 	if ldsn == "" {
 		panic("DATA_SOURCE_NAME must be provided")
 	}
+	os.Setenv("DATA_SOURCE_NAME", ldsn)
 	pdsn := os.Getenv("PROMETHEUS_DATA_SOURCE_NAME")
 	if ldsn == "" {
 		panic("DATA_SOURCE_NAME must be provided")
@@ -34,11 +34,16 @@ func main() {
 		panic("GRAFANA_TOKEN must be provided")
 	}
 	// if you'll use this dashboard base in other projects, you can add your own opts here to extend it
-	db, err := dashboard.NewCLClusterDashboard(name, ldsn, pdsn, dbf, grafanaURL, grafanaToken, nil)
+	db, err := dashboard.NewCLClusterDashboard(6, name, ldsn, pdsn, dbf, grafanaURL, grafanaToken, nil)
 	if err != nil {
 		panic(err)
 	}
-	if err := db.Deploy(ctx); err != nil {
+	// here we are extending load testing dashboard with core metrics, for example
+	wdb, err := wasp.NewDashboard(nil, db.Opts())
+	if err != nil {
+		panic(err)
+	}
+	if _, err := wdb.Deploy(); err != nil {
 		panic(err)
 	}
 }
diff --git a/charts/chainlink-cluster/dashboard/dashboard.go b/charts/chainlink-cluster/dashboard/dashboard.go
index 293cded2b0c..b29140c0405 100644
--- a/charts/chainlink-cluster/dashboard/dashboard.go
+++ b/charts/chainlink-cluster/dashboard/dashboard.go
@@ -13,11 +13,178 @@ import (
 	"github.com/K-Phoen/grabana/target/prometheus"
 	"github.com/K-Phoen/grabana/timeseries"
 	"github.com/K-Phoen/grabana/timeseries/axis"
-	"github.com/K-Phoen/grabana/variable/interval"
 	"github.com/K-Phoen/grabana/variable/query"
 	"github.com/pkg/errors"
 )
 
+/*
+Use ripgrep to get the full list
+rg -oU ".*promauto.*\n.*Name: \"(.*)\"" -r '$1' > metrics.txt
+
+duplicates?
+
+common/client/node.go:pool_rpc_node_verifies
+common/client/node.go:pool_rpc_node_verifies_failed
+common/client/node.go:pool_rpc_node_verifies_success
+common/client/node_fsm.go:pool_rpc_node_num_transitions_to_alive
+common/client/node_fsm.go:pool_rpc_node_num_transitions_to_in_sync
+common/client/node_fsm.go:pool_rpc_node_num_transitions_to_out_of_sync
+common/client/node_fsm.go:pool_rpc_node_num_transitions_to_unreachable
+common/client/node_fsm.go:pool_rpc_node_num_transitions_to_invalid_chain_id
+common/client/node_fsm.go:pool_rpc_node_num_transitions_to_unusable
+common/client/node_lifecycle.go:pool_rpc_node_highest_seen_block
+common/client/node_lifecycle.go:pool_rpc_node_num_seen_blocks
+common/client/node_lifecycle.go:pool_rpc_node_polls_total
+common/client/node_lifecycle.go:pool_rpc_node_polls_failed
+common/client/node_lifecycle.go:pool_rpc_node_polls_success
+
+covered
+
+core/logger/prometheus.go:log_warn_count
+core/logger/prometheus.go:log_error_count
+core/logger/prometheus.go:log_critical_count
+core/logger/prometheus.go:log_panic_count
+core/logger/prometheus.go:log_fatal_count
+common/client/multi_node.go:multi_node_states
+common/txmgr/broadcaster.go:tx_manager_time_until_tx_broadcast
+common/txmgr/confirmer.go:tx_manager_num_gas_bumps
+common/txmgr/confirmer.go:tx_manager_gas_bump_exceeds_limit
+common/txmgr/confirmer.go:tx_manager_num_confirmed_transactions
+common/txmgr/confirmer.go:tx_manager_num_successful_transactions
+common/txmgr/confirmer.go:tx_manager_num_tx_reverted
+common/txmgr/confirmer.go:tx_manager_fwd_tx_count
+common/txmgr/confirmer.go:tx_manager_tx_attempt_count
+common/txmgr/confirmer.go:tx_manager_time_until_tx_confirmed
+common/txmgr/confirmer.go:tx_manager_blocks_until_tx_confirmed
+common/headtracker/head_tracker.go:head_tracker_current_head
+common/headtracker/head_tracker.go:head_tracker_very_old_head
+common/headtracker/head_listener.go:head_tracker_heads_received
+common/headtracker/head_listener.go:head_tracker_connection_errors
+core/chains/evm/client/node_fsm.go:evm_pool_rpc_node_num_transitions_to_alive
+core/chains/evm/client/node_fsm.go:evm_pool_rpc_node_num_transitions_to_in_sync
+core/chains/evm/client/node_fsm.go:evm_pool_rpc_node_num_transitions_to_out_of_sync
+core/chains/evm/client/node_fsm.go:evm_pool_rpc_node_num_transitions_to_unreachable
+core/chains/evm/client/node_fsm.go:evm_pool_rpc_node_num_transitions_to_invalid_chain_id
+core/chains/evm/client/node_fsm.go:evm_pool_rpc_node_num_transitions_to_unusable
+core/services/promreporter/prom_reporter.go:unconfirmed_transactions
+core/services/promreporter/prom_reporter.go:max_unconfirmed_tx_age
+core/services/promreporter/prom_reporter.go:max_unconfirmed_blocks
+core/services/promreporter/prom_reporter.go:pipeline_runs_queued
+core/services/promreporter/prom_reporter.go:pipeline_task_runs_queued
+core/services/pipeline/task.bridge.go:bridge_latency_seconds
+core/services/pipeline/task.bridge.go:bridge_errors_total
+core/services/pipeline/task.bridge.go:bridge_cache_hits_total
+core/services/pipeline/task.bridge.go:bridge_cache_errors_total
+core/services/pipeline/task.http.go:pipeline_task_http_fetch_time
+core/services/pipeline/task.http.go:pipeline_task_http_response_body_size
+core/services/pipeline/task.eth_call.go:pipeline_task_eth_call_execution_time
+core/services/pipeline/runner.go:pipeline_task_execution_time
+core/services/pipeline/runner.go:pipeline_run_errors
+core/services/pipeline/runner.go:pipeline_run_total_time_to_completion
+core/services/pipeline/runner.go:pipeline_tasks_total_finished
+core/chains/evm/client/node.go:evm_pool_rpc_node_dials_total
+core/chains/evm/client/node.go:evm_pool_rpc_node_dials_failed
+core/chains/evm/client/node.go:evm_pool_rpc_node_dials_success
+core/chains/evm/client/node.go:evm_pool_rpc_node_verifies
+core/chains/evm/client/node.go:evm_pool_rpc_node_verifies_failed
+core/chains/evm/client/node.go:evm_pool_rpc_node_verifies_success
+core/chains/evm/client/node.go:evm_pool_rpc_node_calls_total
+core/chains/evm/client/node.go:evm_pool_rpc_node_calls_failed
+core/chains/evm/client/node.go:evm_pool_rpc_node_calls_success
+core/chains/evm/client/node.go:evm_pool_rpc_node_rpc_call_time
+core/chains/evm/client/pool.go:evm_pool_rpc_node_states
+core/utils/mailbox_prom.go:mailbox_load_percent
+core/services/pg/stats.go:db_conns_max
+core/services/pg/stats.go:db_conns_open
+core/services/pg/stats.go:db_conns_used
+core/services/pg/stats.go:db_wait_count
+core/services/pg/stats.go:db_wait_time_seconds
+core/chains/evm/client/node_lifecycle.go:evm_pool_rpc_node_highest_seen_block
+core/chains/evm/client/node_lifecycle.go:evm_pool_rpc_node_num_seen_blocks
+core/chains/evm/client/node_lifecycle.go:evm_pool_rpc_node_polls_total
+core/chains/evm/client/node_lifecycle.go:evm_pool_rpc_node_polls_failed
+core/chains/evm/client/node_lifecycle.go:evm_pool_rpc_node_polls_success
+core/services/relay/evm/config_poller.go:ocr2_failed_rpc_contract_calls
+core/services/feeds/service.go:feeds_job_proposal_requests
+core/services/feeds/service.go:feeds_job_proposal_count
+core/services/ocrcommon/prom.go:bridge_json_parse_values
+core/services/ocrcommon/prom.go:ocr_median_values
+core/chains/evm/logpoller/observability.go:log_poller_query_dataset_size
+
+not-covered and product specific (definitions/usage should be moved to plugins)
+
+mercury
+
+core/services/relay/evm/mercury/types/types.go:mercury_price_feed_missing
+core/services/relay/evm/mercury/types/types.go:mercury_price_feed_errors
+core/services/relay/evm/mercury/queue.go:mercury_transmit_queue_load
+core/services/relay/evm/mercury/v1/data_source.go:mercury_insufficient_blocks_count
+core/services/relay/evm/mercury/v1/data_source.go:mercury_zero_blocks_count
+core/services/relay/evm/mercury/wsrpc/client.go:mercury_transmit_timeout_count
+core/services/relay/evm/mercury/wsrpc/client.go:mercury_dial_count
+core/services/relay/evm/mercury/wsrpc/client.go:mercury_dial_success_count
+core/services/relay/evm/mercury/wsrpc/client.go:mercury_dial_error_count
+core/services/relay/evm/mercury/wsrpc/client.go:mercury_connection_reset_count
+core/services/relay/evm/mercury/transmitter.go:mercury_transmit_success_count
+core/services/relay/evm/mercury/transmitter.go:mercury_transmit_duplicate_count
+core/services/relay/evm/mercury/transmitter.go:mercury_transmit_connection_error_count
+core/services/relay/evm/mercury/transmitter.go:mercury_transmit_queue_delete_error_count
+core/services/relay/evm/mercury/transmitter.go:mercury_transmit_queue_insert_error_count
+core/services/relay/evm/mercury/transmitter.go:mercury_transmit_queue_push_error_count
+core/services/relay/evm/mercury/transmitter.go:mercury_transmit_server_error_count
+
+functions
+
+core/services/gateway/connectionmanager.go:gateway_heartbeats_sent
+core/services/gateway/gateway.go:gateway_request
+core/services/gateway/handlers/functions/handler.functions.go:gateway_functions_handler_error
+core/services/gateway/handlers/functions/handler.functions.go:gateway_functions_secrets_set_success
+core/services/gateway/handlers/functions/handler.functions.go:gateway_functions_secrets_set_failure
+core/services/gateway/handlers/functions/handler.functions.go:gateway_functions_secrets_list_success
+core/services/gateway/handlers/functions/handler.functions.go:gateway_functions_secrets_list_failure
+core/services/functions/external_adapter_client.go:functions_external_adapter_client_latency
+core/services/functions/external_adapter_client.go:functions_external_adapter_client_errors_total
+core/services/functions/listener.go:functions_request_received
+core/services/functions/listener.go:functions_request_internal_error
+core/services/functions/listener.go:functions_request_computation_error
+core/services/functions/listener.go:functions_request_computation_success
+core/services/functions/listener.go:functions_request_timeout
+core/services/functions/listener.go:functions_request_confirmed
+core/services/functions/listener.go:functions_request_computation_result_size
+core/services/functions/listener.go:functions_request_computation_error_size
+core/services/functions/listener.go:functions_request_computation_duration
+core/services/functions/listener.go:functions_request_pruned
+core/services/ocr2/plugins/functions/reporting.go:functions_reporting_plugin_restarts
+core/services/ocr2/plugins/functions/reporting.go:functions_reporting_plugin_query
+core/services/ocr2/plugins/functions/reporting.go:functions_reporting_plugin_observation
+core/services/ocr2/plugins/functions/reporting.go:functions_reporting_plugin_report
+core/services/ocr2/plugins/functions/reporting.go:functions_reporting_plugin_report_num_observations
+core/services/ocr2/plugins/functions/reporting.go:functions_reporting_plugin_accept
+core/services/ocr2/plugins/functions/reporting.go:functions_reporting_plugin_transmit
+core/services/ocr2/plugins/s4/prometheus.go:s4_reporting_plugin_query
+core/services/ocr2/plugins/s4/prometheus.go:s4_reporting_plugin_observation
+core/services/ocr2/plugins/s4/prometheus.go:s4_reporting_plugin_report
+core/services/ocr2/plugins/s4/prometheus.go:s4_reporting_plugin_accept
+core/services/ocr2/plugins/s4/prometheus.go:s4_reporting_plugin_query_byte_size
+core/services/ocr2/plugins/s4/prometheus.go:s4_reporting_plugin_query_rows_count
+core/services/ocr2/plugins/s4/prometheus.go:s4_reporting_plugin_observation_rows_count
+core/services/ocr2/plugins/s4/prometheus.go:s4_reporting_plugin_report_rows_count
+core/services/ocr2/plugins/s4/prometheus.go:s4_reporting_plugin_wrong_sig_count
+core/services/ocr2/plugins/s4/prometheus.go:s4_reporting_plugin_expired_rows
+
+vrf
+
+core/services/vrf/vrfcommon/metrics.go:vrf_request_queue_size
+core/services/vrf/vrfcommon/metrics.go:vrf_processed_request_count
+core/services/vrf/vrfcommon/metrics.go:vrf_dropped_request_count
+core/services/vrf/vrfcommon/metrics.go:vrf_duplicate_requests
+core/services/vrf/vrfcommon/metrics.go:vrf_request_time_between_sims
+core/services/vrf/vrfcommon/metrics.go:vrf_request_time_until_initial_sim
+
+keeper
+core/services/keeper/upkeep_executer.go:keeper_check_upkeep_execution_time
+*/
+
 const (
 	ErrFailedToCreateDashboard = "failed to create dashboard"
 	ErrFailedToCreateFolder    = "failed to create folder"
@@ -25,6 +192,7 @@ const (
 
 // CLClusterDashboard is a dashboard for a Chainlink cluster
 type CLClusterDashboard struct {
+	Nodes                    int
 	Name                     string
 	LokiDataSourceName       string
 	PrometheusDataSourceName string
@@ -37,8 +205,9 @@ type CLClusterDashboard struct {
 }
 
 // NewCLClusterDashboard returns a new dashboard for a Chainlink cluster, can be used as a base for more complex plugin based dashboards
-func NewCLClusterDashboard(name, ldsn, pdsn, dbf, grafanaURL, grafanaToken string, opts []dashboard.Option) (*CLClusterDashboard, error) {
+func NewCLClusterDashboard(nodes int, name, ldsn, pdsn, dbf, grafanaURL, grafanaToken string, opts []dashboard.Option) (*CLClusterDashboard, error) {
 	db := &CLClusterDashboard{
+		Nodes:                    nodes,
 		Name:                     name,
 		Folder:                   dbf,
 		LokiDataSourceName:       ldsn,
@@ -58,19 +227,32 @@ func (m *CLClusterDashboard) Opts() []dashboard.Option {
 }
 
 // logsRowOption returns a row option for a node's logs with name and instance selector
-func (m *CLClusterDashboard) logsRowOption(name, instanceSelector string) row.Option {
+func (m *CLClusterDashboard) logsRowOption(name, q string) row.Option {
 	return row.WithLogs(
 		name,
 		logs.DataSource(m.LokiDataSourceName),
 		logs.Span(12),
 		logs.Height("300px"),
 		logs.Transparent(),
-		logs.WithLokiTarget(fmt.Sprintf(`
-			{namespace="${namespace}", app="app", instance="%s", container="node"}
-		`, instanceSelector)),
+		logs.WithLokiTarget(q),
 	)
 }
 
+func (m *CLClusterDashboard) logsRowOptionsForNodes(nodes int) []row.Option {
+	opts := make([]row.Option, 0)
+	for i := 1; i <= nodes; i++ {
+		opts = append(opts, row.WithLogs(
+			fmt.Sprintf("Node %d", i),
+			logs.DataSource(m.LokiDataSourceName),
+			logs.Span(12),
+			logs.Height("300px"),
+			logs.Transparent(),
+			logs.WithLokiTarget(fmt.Sprintf(`{namespace="${namespace}", app="app", instance="node-%d", container="node"}`, i)),
+		))
+	}
+	return opts
+}
+
 // timeseriesRowOption returns a row option for a timeseries with name, axis unit, query and legend template
 func (m *CLClusterDashboard) timeseriesRowOption(name, axisUnit, query, legendTemplate string) row.Option {
 	var tsq timeseries.Option
@@ -129,12 +311,9 @@ func (m *CLClusterDashboard) generate() error {
 			query.Request(fmt.Sprintf("label_values(%s)", "namespace")),
 			query.Sort(query.NumericalAsc),
 		),
-		dashboard.VariableAsInterval(
-			"interval",
-			interval.Values([]string{"30s", "1m", "5m", "10m", "30m", "1h", "6h", "12h"}),
-		),
 		dashboard.Row(
 			"Cluster health",
+			row.Collapse(),
 			m.statRowOption(
 				"App Version",
 				`version{namespace="${namespace}"}`,
@@ -160,6 +339,21 @@ func (m *CLClusterDashboard) generate() error {
 					prometheus.Legend("{{pod}} - {{service_id}}"),
 				),
 			),
+			row.WithTimeSeries(
+				"ETH Balance",
+				timeseries.Span(12),
+				timeseries.Height("200px"),
+				timeseries.DataSource(m.PrometheusDataSourceName),
+				timeseries.WithPrometheusTarget(
+					`eth_balance{namespace="${namespace}"}`,
+					prometheus.Legend("{{pod}} - {{account}}"),
+				),
+			),
+		),
+		// logs
+		dashboard.Row(
+			"Logs",
+			row.Collapse(),
 			row.WithTimeSeries(
 				"Log Counters",
 				timeseries.Span(12),
@@ -177,30 +371,244 @@ func (m *CLClusterDashboard) generate() error {
 					`log_critical_count{namespace="${namespace}"}`,
 					prometheus.Legend("{{pod}} - critical"),
 				),
+				timeseries.WithPrometheusTarget(
+					`log_warn_count{namespace="${namespace}"}`,
+					prometheus.Legend("{{pod}} - warn"),
+				),
 				timeseries.WithPrometheusTarget(
 					`log_error_count{namespace="${namespace}"}`,
 					prometheus.Legend("{{pod}} - error"),
 				),
 			),
-			row.WithTimeSeries(
-				"ETH Balance",
-				timeseries.Span(12),
-				timeseries.Height("200px"),
-				timeseries.DataSource(m.PrometheusDataSourceName),
-				timeseries.WithPrometheusTarget(
-					`eth_balance{namespace="${namespace}"}`,
-					prometheus.Legend("{{pod}} - {{account}}"),
-				),
+			m.logsRowOption("All errors", `
+			{namespace="${namespace}", app="app", container="node"} 
+			| json 
+			| level="error" 
+			|  line_format "{{ .instance }} {{ .level }} {{ .ts }} {{ .logger }} {{ .caller }} {{ .msg }} {{ .version }} {{ .nodeTier }} {{ .nodeName }} {{ .node }} {{ .evmChainID }} {{ .nodeOrder }} {{ .mode }} {{ .nodeState }} {{ .sentryEventID }} {{ .stacktrace }}"`),
+			m.logsRowOption("Node 1", `{namespace="${namespace}", app="app", instance="node-1", container="node"}`),
+			m.logsRowOption("Node 2", `{namespace="${namespace}", app="app", instance="node-2", container="node"}`),
+			m.logsRowOption("Node 3", `{namespace="${namespace}", app="app", instance="node-3", container="node"}`),
+			m.logsRowOption("Node 4", `{namespace="${namespace}", app="app", instance="node-4", container="node"}`),
+			m.logsRowOption("Node 5", `{namespace="${namespace}", app="app", instance="node-5", container="node"}`),
+			m.logsRowOption("Node 6", `{namespace="${namespace}", app="app", instance="node-6", container="node"}`),
+		),
+		// HeadTracker
+		dashboard.Row("Head tracker",
+			row.Collapse(),
+			m.timeseriesRowOption(
+				"Head tracker current head",
+				"Block",
+				`head_tracker_current_head{namespace="${namespace}"}`,
+				"{{ pod }}",
+			),
+			m.timeseriesRowOption(
+				"Head tracker very old head",
+				"Block",
+				`head_tracker_very_old_head{namespace="${namespace}"}`,
+				"{{ pod }}",
+			),
+			m.timeseriesRowOption(
+				"Head tracker heads received",
+				"Block",
+				`head_tracker_heads_received{namespace="${namespace}"}`,
+				"{{ pod }}",
+			),
+			m.timeseriesRowOption(
+				"Head tracker connection errors",
+				"Errors",
+				`head_tracker_connection_errors{namespace="${namespace}"}`,
+				"{{ pod }}",
 			),
 		),
-		// logs
-		dashboard.Row(
-			"Logs",
+		dashboard.Row("LogPoller",
+			row.Collapse(),
+			m.timeseriesRowOption(
+				"LogPoller Query Dataset Size",
+				"",
+				`log_poller_query_dataset_size{namespace="${namespace}"}`,
+				"{{ pod }}",
+			),
+		),
+		dashboard.Row("OCRCommon",
+			row.Collapse(),
+			m.timeseriesRowOption(
+				"Bridge JSON Parse Values",
+				"",
+				`bridge_json_parse_values{namespace="${namespace}"}`,
+				"{{ pod }} JobID: {{ job_id }}",
+			),
+			m.timeseriesRowOption(
+				"OCR Median Values",
+				"",
+				`ocr_median_values{namespace="${namespace}"}`,
+				"{{pod}} JobID: {{ job_id }}",
+			),
+		),
+		dashboard.Row("Relay Config Poller",
+			row.Collapse(),
+			m.timeseriesRowOption(
+				"Relay Config Poller RPC Contract Calls",
+				"",
+				`ocr2_failed_rpc_contract_calls{namespace="${namespace}"}`,
+				"{{ pod }}",
+			),
+		),
+		dashboard.Row("Feeds Jobs",
+			row.Collapse(),
+			m.timeseriesRowOption(
+				"Feeds Job Proposal Requests",
+				"",
+				`feeds_job_proposal_requests{namespace="${namespace}"}`,
+				"{{ pod }}",
+			),
+			m.timeseriesRowOption(
+				"Feeds Job Proposal Count",
+				"",
+				`feeds_job_proposal_count{namespace="${namespace}"}`,
+				"{{ pod }}",
+			),
+		),
+		dashboard.Row("Mailbox",
+			row.Collapse(),
+			m.timeseriesRowOption(
+				"Mailbox Load Percent",
+				"",
+				`mailbox_load_percent{namespace="${namespace}"}`,
+				"{{ pod }} {{ name }}",
+			),
+		),
+		dashboard.Row("Multi Node States",
+			row.Collapse(),
+			m.timeseriesRowOption(
+				"Multi Node States",
+				"",
+				`multi_node_states{namespace="${namespace}"}`,
+				"{{ pod }}",
+			),
+		),
+		dashboard.Row("Block History Estimator",
+			row.Collapse(),
+			m.timeseriesRowOption(
+				"Gas Updater All Gas Price Percentiles",
+				"",
+				`gas_updater_all_gas_price_percentiles{namespace="${namespace}"}`,
+				"{{ pod }}",
+			),
+			m.timeseriesRowOption(
+				"Gas Updater All Tip Cap Percentiles",
+				"",
+				`gas_updater_all_tip_cap_percentiles{namespace="${namespace}"}`,
+				"{{ pod }}",
+			),
+			m.timeseriesRowOption(
+				"Gas Updater Set Gas Price",
+				"",
+				`gas_updater_set_gas_price{namespace="${namespace}"}`,
+				"{{ pod }}",
+			),
+			m.timeseriesRowOption(
+				"Gas Updater Set Tip Cap",
+				"",
+				`gas_updater_set_tip_cap{namespace="${namespace}"}`,
+				"{{ pod }}",
+			),
+			m.timeseriesRowOption(
+				"Gas Updater Current Base Fee",
+				"",
+				`gas_updater_current_base_fee{namespace="${namespace}"}`,
+				"{{ pod }}",
+			),
+			m.timeseriesRowOption(
+				"Block History Estimator Connectivity Failure Count",
+				"",
+				`block_history_estimator_connectivity_failure_count{namespace="${namespace}"}`,
+				"{{ pod }}",
+			),
+		),
+		// PromReporter
+		dashboard.Row("Prom Reporter",
 			row.Collapse(),
-			m.logsRowOption("Node 1", "node-1"),
-			m.logsRowOption("Node 2", "node-2"),
-			m.logsRowOption("Node 3", "node-3"),
-			m.logsRowOption("Node 4", "node-4"),
+			m.timeseriesRowOption(
+				"Unconfirmed Transactions",
+				"Tx",
+				`unconfirmed_transactions{namespace="${namespace}"}`,
+				"{{ pod }}",
+			),
+			m.timeseriesRowOption(
+				"Unconfirmed TX Age",
+				"Sec",
+				`max_unconfirmed_tx_age{namespace="${namespace}"}`,
+				"{{ pod }}",
+			),
+			m.timeseriesRowOption(
+				"Unconfirmed TX Blocks",
+				"Blocks",
+				`max_unconfirmed_blocks{namespace="${namespace}"}`,
+				"{{ pod }}",
+			),
+		),
+		dashboard.Row("TX Manager",
+			row.Collapse(),
+			m.timeseriesRowOption(
+				"TX Manager Time Until TX Broadcast",
+				"",
+				`tx_manager_time_until_tx_broadcast{namespace="${namespace}"}`,
+				"{{ pod }}",
+			),
+			m.timeseriesRowOption(
+				"TX Manager Num Gas Bumps",
+				"",
+				`tx_manager_num_gas_bumps{namespace="${namespace}"}`,
+				"{{ pod }}",
+			),
+			m.timeseriesRowOption(
+				"TX Manager Num Gas Bumps Exceeds Limit",
+				"",
+				`tx_manager_gas_bump_exceeds_limit{namespace="${namespace}"}`,
+				"{{ pod }}",
+			),
+			m.timeseriesRowOption(
+				"TX Manager Num Confirmed Transactions",
+				"",
+				`tx_manager_num_confirmed_transactions{namespace="${namespace}"}`,
+				"{{ pod }}",
+			),
+			m.timeseriesRowOption(
+				"TX Manager Num Successful Transactions",
+				"",
+				`tx_manager_num_successful_transactions{namespace="${namespace}"}`,
+				"{{ pod }}",
+			),
+			m.timeseriesRowOption(
+				"TX Manager Num Reverted Transactions",
+				"",
+				`tx_manager_num_tx_reverted{namespace="${namespace}"}`,
+				"{{ pod }}",
+			),
+			m.timeseriesRowOption(
+				"TX Manager Num Fwd Transactions",
+				"",
+				`tx_manager_fwd_tx_count{namespace="${namespace}"}`,
+				"{{ pod }}",
+			),
+			m.timeseriesRowOption(
+				"TX Manager Num Transactions Attempts",
+				"",
+				`tx_manager_tx_attempt_count{namespace="${namespace}"}`,
+				"{{ pod }}",
+			),
+			m.timeseriesRowOption(
+				"TX Manager Time Until TX Confirmed",
+				"",
+				`tx_manager_time_until_tx_confirmed{namespace="${namespace}"}`,
+				"{{ pod }}",
+			),
+			m.timeseriesRowOption(
+				"TX Manager Block Until TX Confirmed",
+				"",
+				`tx_manager_blocks_until_tx_confirmed{namespace="${namespace}"}`,
+				"{{ pod }}",
+			),
 		),
 		// DON report metrics
 		dashboard.Row("DON Report metrics",
@@ -236,6 +644,40 @@ func (m *CLClusterDashboard) generate() error {
 				"",
 			),
 		),
+		dashboard.Row(
+			"EVM Pool Lifecycle",
+			row.Collapse(),
+			m.timeseriesRowOption(
+				"EVM Pool Highest Seen Block",
+				"Block",
+				`evm_pool_rpc_node_highest_seen_block{namespace="${namespace}"}`,
+				"{{pod}}",
+			),
+			m.timeseriesRowOption(
+				"EVM Pool Num Seen Blocks",
+				"Block",
+				`evm_pool_rpc_node_num_seen_blocks{namespace="${namespace}"}`,
+				"{{pod}}",
+			),
+			m.timeseriesRowOption(
+				"EVM Pool Node Polls Total",
+				"Block",
+				`evm_pool_rpc_node_polls_total{namespace="${namespace}"}`,
+				"{{pod}}",
+			),
+			m.timeseriesRowOption(
+				"EVM Pool Node Polls Failed",
+				"Block",
+				`evm_pool_rpc_node_polls_failed{namespace="${namespace}"}`,
+				"{{pod}}",
+			),
+			m.timeseriesRowOption(
+				"EVM Pool Node Polls Success",
+				"Block",
+				`evm_pool_rpc_node_polls_success{namespace="${namespace}"}`,
+				"{{pod}}",
+			),
+		),
 		dashboard.Row(
 			"DB Connection Metrics (App)",
 			row.Collapse(),
@@ -263,6 +705,12 @@ func (m *CLClusterDashboard) generate() error {
 				`db_conns_wait{namespace="${namespace}"}`,
 				"{{pod}}",
 			),
+			m.timeseriesRowOption(
+				"DB Wait Count",
+				"",
+				`db_wait_count{namespace="${namespace}"}`,
+				"{{pod}}",
+			),
 			m.timeseriesRowOption(
 				"DB Wait time",
 				"Sec",
@@ -291,6 +739,12 @@ func (m *CLClusterDashboard) generate() error {
 				`evm_pool_rpc_node_dials_success{namespace="${namespace}"}`,
 				"{{pod}}",
 			),
+			m.timeseriesRowOption(
+				"EVM Pool RPC Node Dials Failed",
+				"",
+				`evm_pool_rpc_node_dials_failed{namespace="${namespace}"}`,
+				"{{pod}}",
+			),
 			m.timeseriesRowOption(
 				"EVM Pool RPC Node Dials Total",
 				"",
@@ -298,9 +752,9 @@ func (m *CLClusterDashboard) generate() error {
 				"{{pod}}",
 			),
 			m.timeseriesRowOption(
-				"EVM Pool RPC Highest Seen Block",
+				"EVM Pool RPC Node Dials Failed",
 				"",
-				`evm_pool_rpc_node_highest_seen_block{namespace="${namespace}"}`,
+				`evm_pool_rpc_node_dials_failed{namespace="${namespace}"}`,
 				"{{pod}}",
 			),
 			m.timeseriesRowOption(
@@ -309,6 +763,36 @@ func (m *CLClusterDashboard) generate() error {
 				`evm_pool_rpc_node_num_transitions_to_alive{namespace="${namespace}"}`,
 				"{{pod}}",
 			),
+			m.timeseriesRowOption(
+				"EVM Pool RPC Total Transitions to In Sync",
+				"",
+				`evm_pool_rpc_node_num_transitions_to_in_sync{namespace="${namespace}"}`,
+				"{{pod}}",
+			),
+			m.timeseriesRowOption(
+				"EVM Pool RPC Total Transitions to Out of Sync",
+				"",
+				`evm_pool_rpc_node_num_transitions_to_out_of_sync{namespace="${namespace}"}`,
+				"{{pod}}",
+			),
+			m.timeseriesRowOption(
+				"EVM Pool RPC Total Transitions to Unreachable",
+				"",
+				`evm_pool_rpc_node_num_transitions_to_unreachable{namespace="${namespace}"}`,
+				"{{pod}}",
+			),
+			m.timeseriesRowOption(
+				"EVM Pool RPC Total Transitions to invalid Chain ID",
+				"",
+				`evm_pool_rpc_node_num_transitions_to_invalid_chain_id{namespace="${namespace}"}`,
+				"{{pod}}",
+			),
+			m.timeseriesRowOption(
+				"EVM Pool RPC Total Transitions to unusable",
+				"",
+				`evm_pool_rpc_node_num_transitions_to_unusable{namespace="${namespace}"}`,
+				"{{pod}}",
+			),
 			m.timeseriesRowOption(
 				"EVM Pool RPC Node Polls Success",
 				"",
@@ -339,6 +823,12 @@ func (m *CLClusterDashboard) generate() error {
 				`evm_pool_rpc_node_verifies_success{namespace="${namespace}"}`,
 				"{{pod}} - {{evmChainID}}",
 			),
+			m.timeseriesRowOption(
+				"EVM Pool RPC Node Verifies Failed",
+				"",
+				`evm_pool_rpc_node_verifies_failed{namespace="${namespace}"}`,
+				"{{pod}} - {{evmChainID}}",
+			),
 		),
 		dashboard.Row(
 			"EVM Pool RPC Node Latencies (App)",
@@ -351,7 +841,89 @@ func (m *CLClusterDashboard) generate() error {
 			),
 		),
 		dashboard.Row(
-			"Pipeline Tasks Metrics (App)",
+			"Pipeline Metrics (Runner)",
+			row.Collapse(),
+			m.timeseriesRowOption(
+				"Pipeline Task Execution Time",
+				"Sec",
+				`pipeline_task_execution_time{namespace="${namespace}"} / 1e6`,
+				"{{ pod }} JobID: {{ job_id }}",
+			),
+			m.timeseriesRowOption(
+				"Pipeline Run Errors",
+				"",
+				`pipeline_run_errors{namespace="${namespace}"}`,
+				"{{ pod }} JobID: {{ job_id }}",
+			),
+			m.timeseriesRowOption(
+				"Pipeline Run Total Time to Completion",
+				"Sec",
+				`pipeline_run_total_time_to_completion{namespace="${namespace}"} / 1e6`,
+				"{{ pod }} JobID: {{ job_id }}",
+			),
+			m.timeseriesRowOption(
+				"Pipeline Tasks Total Finished",
+				"",
+				`pipeline_tasks_total_finished{namespace="${namespace}"}`,
+				"{{ pod }} JobID: {{ job_id }}",
+			),
+		),
+		dashboard.Row(
+			"Pipeline Metrics (ETHCall)",
+			row.Collapse(),
+			m.timeseriesRowOption(
+				"Pipeline Task ETH Call Execution Time",
+				"Sec",
+				`pipeline_task_eth_call_execution_time{namespace="${namespace}"}`,
+				"{{pod}}",
+			),
+		),
+		dashboard.Row(
+			"Pipeline Metrics (HTTP)",
+			row.Collapse(),
+			m.timeseriesRowOption(
+				"Pipeline Task HTTP Fetch Time",
+				"Sec",
+				`pipeline_task_http_fetch_time{namespace="${namespace}"} / 1e6`,
+				"{{pod}}",
+			),
+			m.timeseriesRowOption(
+				"Pipeline Task HTTP Response Body Size",
+				"Bytes",
+				`pipeline_task_http_response_body_size{namespace="${namespace}"}`,
+				"{{pod}}",
+			),
+		),
+		dashboard.Row(
+			"Pipeline Metrics (Bridge)",
+			row.Collapse(),
+			m.timeseriesRowOption(
+				"Pipeline Bridge Latency",
+				"Sec",
+				`bridge_latency_seconds{namespace="${namespace}"}`,
+				"{{pod}}",
+			),
+			m.timeseriesRowOption(
+				"Pipeline Bridge Errors Total",
+				"",
+				`bridge_errors_total{namespace="${namespace}"}`,
+				"{{pod}}",
+			),
+			m.timeseriesRowOption(
+				"Pipeline Bridge Cache Hits Total",
+				"",
+				`bridge_cache_hits_total{namespace="${namespace}"}`,
+				"{{pod}}",
+			),
+			m.timeseriesRowOption(
+				"Pipeline Bridge Cache Errors Total",
+				"",
+				`bridge_cache_errors_total{namespace="${namespace}"}`,
+				"{{pod}}",
+			),
+		),
+		dashboard.Row(
+			"Pipeline Metrics",
 			row.Collapse(),
 			m.timeseriesRowOption(
 				"Pipeline Runs Queued",
@@ -367,6 +939,48 @@ func (m *CLClusterDashboard) generate() error {
 			),
 		),
 	}
+	logOptsFinal := make([]row.Option, 0)
+	logOptsFinal = append(
+		logOptsFinal,
+		row.Collapse(),
+		row.WithTimeSeries(
+			"Log Counters",
+			timeseries.Span(12),
+			timeseries.Height("200px"),
+			timeseries.DataSource(m.PrometheusDataSourceName),
+			timeseries.WithPrometheusTarget(
+				`log_panic_count{namespace="${namespace}"}`,
+				prometheus.Legend("{{pod}} - panic"),
+			),
+			timeseries.WithPrometheusTarget(
+				`log_fatal_count{namespace="${namespace}"}`,
+				prometheus.Legend("{{pod}} - fatal"),
+			),
+			timeseries.WithPrometheusTarget(
+				`log_critical_count{namespace="${namespace}"}`,
+				prometheus.Legend("{{pod}} - critical"),
+			),
+			timeseries.WithPrometheusTarget(
+				`log_warn_count{namespace="${namespace}"}`,
+				prometheus.Legend("{{pod}} - warn"),
+			),
+			timeseries.WithPrometheusTarget(
+				`log_error_count{namespace="${namespace}"}`,
+				prometheus.Legend("{{pod}} - error"),
+			),
+		),
+		m.logsRowOption("All errors", `
+			{namespace="${namespace}", app="app", container="node"} 
+			| json 
+			| level="error" 
+			|  line_format "{{ .instance }} {{ .level }} {{ .ts }} {{ .logger }} {{ .caller }} {{ .msg }} {{ .version }} {{ .nodeTier }} {{ .nodeName }} {{ .node }} {{ .evmChainID }} {{ .nodeOrder }} {{ .mode }} {{ .nodeState }} {{ .sentryEventID }} {{ .stacktrace }}"`),
+	)
+	logOptsFinal = append(logOptsFinal, m.logsRowOptionsForNodes(m.Nodes)...)
+	logRowOpts := dashboard.Row(
+		"Logs",
+		logOptsFinal...,
+	)
+	opts = append(opts, logRowOpts)
 	opts = append(opts, m.extendedOpts...)
 	builder, err := dashboard.New(
 		"Chainlink Cluster Dashboard",
diff --git a/charts/chainlink-cluster/devspace.yaml b/charts/chainlink-cluster/devspace.yaml
index 688660d918e..4f7cf8641a3 100644
--- a/charts/chainlink-cluster/devspace.yaml
+++ b/charts/chainlink-cluster/devspace.yaml
@@ -55,7 +55,7 @@ deployments:
           stateful: false
         chainlink:
           web_port: 6688
-          p2p_port: 8090
+          p2p_port: 6690
           nodes:
             - name: node-1
               image: ${DEVSPACE_IMAGE}
@@ -69,6 +69,12 @@ deployments:
             - name: node-4
               image: ${DEVSPACE_IMAGE}
               version: latest
+            - name: node-5
+              image: ${DEVSPACE_IMAGE}
+              version: latest
+            - name: node-6
+              image: ${DEVSPACE_IMAGE}
+              version: latest
         prometheusMonitor: "true"
         podAnnotations: { }
         nodeSelector: { }
diff --git a/charts/chainlink-cluster/go.mod b/charts/chainlink-cluster/go.mod
index 990ebbf713e..951fb1d2e3c 100644
--- a/charts/chainlink-cluster/go.mod
+++ b/charts/chainlink-cluster/go.mod
@@ -5,11 +5,186 @@ go 1.21
 require (
 	github.com/K-Phoen/grabana v0.21.19
 	github.com/pkg/errors v0.9.1
+	github.com/smartcontractkit/wasp v0.3.6
 )
 
 require (
 	github.com/K-Phoen/sdk v0.12.3 // indirect
+	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
+	github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 // indirect
+	github.com/armon/go-metrics v0.4.1 // indirect
+	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
+	github.com/aws/aws-sdk-go v1.44.217 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee // indirect
+	github.com/c9s/goprocinfo v0.0.0-20210130143923-c95fcf8c64a8 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/coreos/go-semver v0.3.0 // indirect
+	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/dennwc/varint v1.0.0 // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/edsrzf/mmap-go v1.1.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.10.1 // indirect
+	github.com/fatih/color v1.14.1 // indirect
+	github.com/felixge/httpsnoop v1.0.3 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/gin-gonic/gin v1.8.1 // indirect
+	github.com/go-kit/log v0.2.1 // indirect
+	github.com/go-logfmt/logfmt v0.6.0 // indirect
+	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-openapi/analysis v0.21.4 // indirect
+	github.com/go-openapi/errors v0.20.3 // indirect
+	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonreference v0.20.2 // indirect
+	github.com/go-openapi/loads v0.21.2 // indirect
+	github.com/go-openapi/spec v0.20.8 // indirect
+	github.com/go-openapi/strfmt v0.21.3 // indirect
+	github.com/go-openapi/swag v0.22.3 // indirect
+	github.com/go-openapi/validate v0.22.1 // indirect
+	github.com/go-playground/locales v0.14.0 // indirect
+	github.com/go-playground/universal-translator v0.18.0 // indirect
+	github.com/go-playground/validator/v10 v10.11.1 // indirect
+	github.com/go-resty/resty/v2 v2.7.0 // indirect
+	github.com/goccy/go-json v0.9.11 // indirect
+	github.com/gogo/googleapis v1.4.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/gogo/status v1.1.1 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/btree v1.1.2 // indirect
+	github.com/google/gnostic v0.6.9 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/gosimple/slug v1.13.1 // indirect
 	github.com/gosimple/unidecode v1.0.1 // indirect
-	github.com/prometheus/common v0.39.0 // indirect
+	github.com/grafana/dskit v0.0.0-20230201083518-528d8a7d52f2 // indirect
+	github.com/grafana/loki v1.6.2-0.20231017135925-990ac685e6a6 // indirect
+	github.com/grafana/loki/pkg/push v0.0.0-20230127102416-571f88bc5765 // indirect
+	github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
+	github.com/hashicorp/consul/api v1.20.0 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
+	github.com/hashicorp/go-hclog v1.4.0 // indirect
+	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
+	github.com/hashicorp/go-msgpack v0.5.5 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
+	github.com/hashicorp/go-sockaddr v1.0.2 // indirect
+	github.com/hashicorp/golang-lru v0.6.0 // indirect
+	github.com/hashicorp/memberlist v0.5.0 // indirect
+	github.com/hashicorp/serf v0.10.1 // indirect
+	github.com/imdario/mergo v0.3.13 // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/jpillora/backoff v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/julienschmidt/httprouter v1.3.0 // indirect
+	github.com/klauspost/compress v1.16.3 // indirect
+	github.com/leodido/go-urn v1.2.1 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/miekg/dns v1.1.51 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
+	github.com/oklog/ulid v1.3.1 // indirect
+	github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e // indirect
+	github.com/opentracing-contrib/go-stdlib v1.0.0 // indirect
+	github.com/opentracing/opentracing-go v1.2.0 // indirect
+	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/prometheus/alertmanager v0.25.0 // indirect
+	github.com/prometheus/client_golang v1.15.1 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/prometheus/common v0.42.0 // indirect
+	github.com/prometheus/common/sigv4 v0.1.0 // indirect
+	github.com/prometheus/exporter-toolkit v0.9.1 // indirect
+	github.com/prometheus/procfs v0.9.0 // indirect
+	github.com/prometheus/prometheus v0.43.1-0.20230327151049-211ae4f1f0a2 // indirect
+	github.com/rs/zerolog v1.29.0 // indirect
+	github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
+	github.com/sercand/kuberesolver/v4 v4.0.0 // indirect
+	github.com/sirupsen/logrus v1.9.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/stretchr/objx v0.5.0 // indirect
+	github.com/stretchr/testify v1.8.3 // indirect
+	github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
+	github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
+	github.com/ugorji/go/codec v1.2.7 // indirect
+	github.com/weaveworks/common v0.0.0-20230411130259-f7d83a041205 // indirect
+	github.com/weaveworks/promrus v1.2.0 // indirect
+	go.etcd.io/etcd/api/v3 v3.5.7 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
+	go.etcd.io/etcd/client/v3 v3.5.7 // indirect
+	go.mongodb.org/mongo-driver v1.11.2 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0 // indirect
+	go.opentelemetry.io/otel v1.14.0 // indirect
+	go.opentelemetry.io/otel/metric v0.37.0 // indirect
+	go.opentelemetry.io/otel/trace v1.14.0 // indirect
+	go.uber.org/atomic v1.10.0 // indirect
+	go.uber.org/goleak v1.2.1 // indirect
+	go.uber.org/multierr v1.9.0 // indirect
+	go.uber.org/ratelimit v0.2.0 // indirect
+	go.uber.org/zap v1.21.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
+	golang.org/x/exp v0.0.0-20230307190834-24139beb5833 // indirect
+	golang.org/x/mod v0.9.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/oauth2 v0.7.0 // indirect
+	golang.org/x/sync v0.1.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/term v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
+	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/tools v0.7.0 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
+	google.golang.org/grpc v1.57.2 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/api v0.26.2 // indirect
+	k8s.io/apimachinery v0.26.2 // indirect
+	k8s.io/client-go v0.26.2 // indirect
+	k8s.io/klog/v2 v2.90.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d // indirect
+	k8s.io/utils v0.0.0-20230308161112-d77c459e9343 // indirect
+	nhooyr.io/websocket v1.8.7 // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/yaml v1.3.0 // indirect
+)
+
+replace (
+	// Fixes go mod tidy issue for ambiguous imports from go-ethereum
+	// See https://github.com/ugorji/go/issues/279
+	github.com/btcsuite/btcd => github.com/btcsuite/btcd v0.22.1
+
+	github.com/go-kit/log => github.com/go-kit/log v0.2.1
+
+	// replicating the replace directive on cosmos SDK
+	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
+
+	// until merged upstream: https://github.com/hashicorp/go-plugin/pull/257
+	github.com/hashicorp/go-plugin => github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306
+
+	// until merged upstream: https://github.com/mwitkow/grpc-proxy/pull/69
+	github.com/mwitkow/grpc-proxy => github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f
+
+	github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.43.1-0.20230327151049-211ae4f1f0a2
+	github.com/sercand/kuberesolver/v4 => github.com/sercand/kuberesolver/v5 v5.1.1
 )
diff --git a/charts/chainlink-cluster/go.sum b/charts/chainlink-cluster/go.sum
index 093a42d6081..4a7704cac49 100644
--- a/charts/chainlink-cluster/go.sum
+++ b/charts/chainlink-cluster/go.sum
@@ -1,20 +1,2126 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
+cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
+cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
+cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
+cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
+cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
+cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
+cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
+cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
+cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
+cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
+cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
+cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
+cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
+cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
+cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
+cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY=
+cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg=
+cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8=
+cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0=
+cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY=
+cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM=
+cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY=
+cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ=
+cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI=
+cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4=
+cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc=
+cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA=
+cloud.google.com/go v0.100.1/go.mod h1:fs4QogzfH5n2pBXBP9vRiU+eCny7lD2vmFZy79Iuw1U=
+cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A=
+cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc=
+cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU=
+cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
+cloud.google.com/go v0.107.0/go.mod h1:wpc2eNrD7hXUTy8EKS10jkxpZBjASrORK7goS+3YX2I=
+cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY=
+cloud.google.com/go/accessapproval v1.4.0/go.mod h1:zybIuC3KpDOvotz59lFe5qxRZx6C75OtwbisN56xYB4=
+cloud.google.com/go/accessapproval v1.5.0/go.mod h1:HFy3tuiGvMdcd/u+Cu5b9NkO1pEICJ46IR82PoUdplw=
+cloud.google.com/go/accessapproval v1.6.0/go.mod h1:R0EiYnwV5fsRFiKZkPHr6mwyk2wxUJ30nL4j2pcFY2E=
+cloud.google.com/go/accesscontextmanager v1.3.0/go.mod h1:TgCBehyr5gNMz7ZaH9xubp+CE8dkrszb4oK9CWyvD4o=
+cloud.google.com/go/accesscontextmanager v1.4.0/go.mod h1:/Kjh7BBu/Gh83sv+K60vN9QE5NJcd80sU33vIe2IFPE=
+cloud.google.com/go/accesscontextmanager v1.6.0/go.mod h1:8XCvZWfYw3K/ji0iVnp+6pu7huxoQTLmxAbVjbloTtM=
+cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw=
+cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY=
+cloud.google.com/go/aiplatform v1.27.0/go.mod h1:Bvxqtl40l0WImSb04d0hXFU7gDOiq9jQmorivIiWcKg=
+cloud.google.com/go/aiplatform v1.35.0/go.mod h1:7MFT/vCaOyZT/4IIFfxH4ErVg/4ku6lKv3w0+tFTgXQ=
+cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI=
+cloud.google.com/go/analytics v0.12.0/go.mod h1:gkfj9h6XRf9+TS4bmuhPEShsh3hH8PAZzm/41OOhQd4=
+cloud.google.com/go/analytics v0.18.0/go.mod h1:ZkeHGQlcIPkw0R/GW+boWHhCOR43xz9RN/jn7WcqfIE=
+cloud.google.com/go/apigateway v1.3.0/go.mod h1:89Z8Bhpmxu6AmUxuVRg/ECRGReEdiP3vQtk4Z1J9rJk=
+cloud.google.com/go/apigateway v1.4.0/go.mod h1:pHVY9MKGaH9PQ3pJ4YLzoj6U5FUDeDFBllIz7WmzJoc=
+cloud.google.com/go/apigateway v1.5.0/go.mod h1:GpnZR3Q4rR7LVu5951qfXPJCHquZt02jf7xQx7kpqN8=
+cloud.google.com/go/apigeeconnect v1.3.0/go.mod h1:G/AwXFAKo0gIXkPTVfZDd2qA1TxBXJ3MgMRBQkIi9jc=
+cloud.google.com/go/apigeeconnect v1.4.0/go.mod h1:kV4NwOKqjvt2JYR0AoIWo2QGfoRtn/pkS3QlHp0Ni04=
+cloud.google.com/go/apigeeconnect v1.5.0/go.mod h1:KFaCqvBRU6idyhSNyn3vlHXc8VMDJdRmwDF6JyFRqZ8=
+cloud.google.com/go/apigeeregistry v0.4.0/go.mod h1:EUG4PGcsZvxOXAdyEghIdXwAEi/4MEaoqLMLDMIwKXY=
+cloud.google.com/go/apigeeregistry v0.5.0/go.mod h1:YR5+s0BVNZfVOUkMa5pAR2xGd0A473vA5M7j247o1wM=
+cloud.google.com/go/apikeys v0.4.0/go.mod h1:XATS/yqZbaBK0HOssf+ALHp8jAlNHUgyfprvNcBIszU=
+cloud.google.com/go/apikeys v0.5.0/go.mod h1:5aQfwY4D+ewMMWScd3hm2en3hCj+BROlyrt3ytS7KLI=
+cloud.google.com/go/appengine v1.4.0/go.mod h1:CS2NhuBuDXM9f+qscZ6V86m1MIIqPj3WC/UoEuR1Sno=
+cloud.google.com/go/appengine v1.5.0/go.mod h1:TfasSozdkFI0zeoxW3PTBLiNqRmzraodCWatWI9Dmak=
+cloud.google.com/go/appengine v1.6.0/go.mod h1:hg6i0J/BD2cKmDJbaFSYHFyZkgBEfQrDg/X0V5fJn84=
+cloud.google.com/go/area120 v0.5.0/go.mod h1:DE/n4mp+iqVyvxHN41Vf1CR602GiHQjFPusMFW6bGR4=
+cloud.google.com/go/area120 v0.6.0/go.mod h1:39yFJqWVgm0UZqWTOdqkLhjoC7uFfgXRC8g/ZegeAh0=
+cloud.google.com/go/area120 v0.7.1/go.mod h1:j84i4E1RboTWjKtZVWXPqvK5VHQFJRF2c1Nm69pWm9k=
+cloud.google.com/go/artifactregistry v1.6.0/go.mod h1:IYt0oBPSAGYj/kprzsBjZ/4LnG/zOcHyFHjWPCi6SAQ=
+cloud.google.com/go/artifactregistry v1.7.0/go.mod h1:mqTOFOnGZx8EtSqK/ZWcsm/4U8B77rbcLP6ruDU2Ixk=
+cloud.google.com/go/artifactregistry v1.8.0/go.mod h1:w3GQXkJX8hiKN0v+at4b0qotwijQbYUqF2GWkZzAhC0=
+cloud.google.com/go/artifactregistry v1.9.0/go.mod h1:2K2RqvA2CYvAeARHRkLDhMDJ3OXy26h3XW+3/Jh2uYc=
+cloud.google.com/go/artifactregistry v1.11.2/go.mod h1:nLZns771ZGAwVLzTX/7Al6R9ehma4WUEhZGWV6CeQNQ=
+cloud.google.com/go/asset v1.5.0/go.mod h1:5mfs8UvcM5wHhqtSv8J1CtxxaQq3AdBxxQi2jGW/K4o=
+cloud.google.com/go/asset v1.7.0/go.mod h1:YbENsRK4+xTiL+Ofoj5Ckf+O17kJtgp3Y3nn4uzZz5s=
+cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjbytpUaW0=
+cloud.google.com/go/asset v1.9.0/go.mod h1:83MOE6jEJBMqFKadM9NLRcs80Gdw76qGuHn8m3h8oHQ=
+cloud.google.com/go/asset v1.10.0/go.mod h1:pLz7uokL80qKhzKr4xXGvBQXnzHn5evJAEAtZiIb0wY=
+cloud.google.com/go/asset v1.11.1/go.mod h1:fSwLhbRvC9p9CXQHJ3BgFeQNM4c9x10lqlrdEUYXlJo=
+cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY=
+cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw=
+cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI=
+cloud.google.com/go/assuredworkloads v1.8.0/go.mod h1:AsX2cqyNCOvEQC8RMPnoc0yEarXQk6WEKkxYfL6kGIo=
+cloud.google.com/go/assuredworkloads v1.9.0/go.mod h1:kFuI1P78bplYtT77Tb1hi0FMxM0vVpRC7VVoJC3ZoT0=
+cloud.google.com/go/assuredworkloads v1.10.0/go.mod h1:kwdUQuXcedVdsIaKgKTp9t0UJkE5+PAVNhdQm4ZVq2E=
+cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0=
+cloud.google.com/go/automl v1.6.0/go.mod h1:ugf8a6Fx+zP0D59WLhqgTDsQI9w07o64uf/Is3Nh5p8=
+cloud.google.com/go/automl v1.7.0/go.mod h1:RL9MYCCsJEOmt0Wf3z9uzG0a7adTT1fe+aObgSpkCt8=
+cloud.google.com/go/automl v1.8.0/go.mod h1:xWx7G/aPEe/NP+qzYXktoBSDfjO+vnKMGgsApGJJquM=
+cloud.google.com/go/automl v1.12.0/go.mod h1:tWDcHDp86aMIuHmyvjuKeeHEGq76lD7ZqfGLN6B0NuU=
+cloud.google.com/go/baremetalsolution v0.3.0/go.mod h1:XOrocE+pvK1xFfleEnShBlNAXf+j5blPPxrhjKgnIFc=
+cloud.google.com/go/baremetalsolution v0.4.0/go.mod h1:BymplhAadOO/eBa7KewQ0Ppg4A4Wplbn+PsFKRLo0uI=
+cloud.google.com/go/baremetalsolution v0.5.0/go.mod h1:dXGxEkmR9BMwxhzBhV0AioD0ULBmuLZI8CdwalUxuss=
+cloud.google.com/go/batch v0.3.0/go.mod h1:TR18ZoAekj1GuirsUsR1ZTKN3FC/4UDnScjT8NXImFE=
+cloud.google.com/go/batch v0.4.0/go.mod h1:WZkHnP43R/QCGQsZ+0JyG4i79ranE2u8xvjq/9+STPE=
+cloud.google.com/go/batch v0.7.0/go.mod h1:vLZN95s6teRUqRQ4s3RLDsH8PvboqBK+rn1oevL159g=
+cloud.google.com/go/beyondcorp v0.2.0/go.mod h1:TB7Bd+EEtcw9PCPQhCJtJGjk/7TC6ckmnSFS+xwTfm4=
+cloud.google.com/go/beyondcorp v0.3.0/go.mod h1:E5U5lcrcXMsCuoDNyGrpyTm/hn7ne941Jz2vmksAxW8=
+cloud.google.com/go/beyondcorp v0.4.0/go.mod h1:3ApA0mbhHx6YImmuubf5pyW8srKnCEPON32/5hj+RmM=
+cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
+cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
+cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
+cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
+cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
+cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
+cloud.google.com/go/bigquery v1.42.0/go.mod h1:8dRTJxhtG+vwBKzE5OseQn/hiydoQN3EedCaOdYmxRA=
+cloud.google.com/go/bigquery v1.43.0/go.mod h1:ZMQcXHsl+xmU1z36G2jNGZmKp9zNY5BUua5wDgmNCfw=
+cloud.google.com/go/bigquery v1.44.0/go.mod h1:0Y33VqXTEsbamHJvJHdFmtqHvMIY28aK1+dFsvaChGc=
+cloud.google.com/go/bigquery v1.48.0/go.mod h1:QAwSz+ipNgfL5jxiaK7weyOhzdoAy1zFm0Nf1fysJac=
+cloud.google.com/go/billing v1.4.0/go.mod h1:g9IdKBEFlItS8bTtlrZdVLWSSdSyFUZKXNS02zKMOZY=
+cloud.google.com/go/billing v1.5.0/go.mod h1:mztb1tBc3QekhjSgmpf/CV4LzWXLzCArwpLmP2Gm88s=
+cloud.google.com/go/billing v1.6.0/go.mod h1:WoXzguj+BeHXPbKfNWkqVtDdzORazmCjraY+vrxcyvI=
+cloud.google.com/go/billing v1.7.0/go.mod h1:q457N3Hbj9lYwwRbnlD7vUpyjq6u5U1RAOArInEiD5Y=
+cloud.google.com/go/billing v1.12.0/go.mod h1:yKrZio/eu+okO/2McZEbch17O5CB5NpZhhXG6Z766ss=
+cloud.google.com/go/binaryauthorization v1.1.0/go.mod h1:xwnoWu3Y84jbuHa0zd526MJYmtnVXn0syOjaJgy4+dM=
+cloud.google.com/go/binaryauthorization v1.2.0/go.mod h1:86WKkJHtRcv5ViNABtYMhhNWRrD1Vpi//uKEy7aYEfI=
+cloud.google.com/go/binaryauthorization v1.3.0/go.mod h1:lRZbKgjDIIQvzYQS1p99A7/U1JqvqeZg0wiI5tp6tg0=
+cloud.google.com/go/binaryauthorization v1.4.0/go.mod h1:tsSPQrBd77VLplV70GUhBf/Zm3FsKmgSqgm4UmiDItk=
+cloud.google.com/go/binaryauthorization v1.5.0/go.mod h1:OSe4OU1nN/VswXKRBmciKpo9LulY41gch5c68htf3/Q=
+cloud.google.com/go/certificatemanager v1.3.0/go.mod h1:n6twGDvcUBFu9uBgt4eYvvf3sQ6My8jADcOVwHmzadg=
+cloud.google.com/go/certificatemanager v1.4.0/go.mod h1:vowpercVFyqs8ABSmrdV+GiFf2H/ch3KyudYQEMM590=
+cloud.google.com/go/certificatemanager v1.6.0/go.mod h1:3Hh64rCKjRAX8dXgRAyOcY5vQ/fE1sh8o+Mdd6KPgY8=
+cloud.google.com/go/channel v1.8.0/go.mod h1:W5SwCXDJsq/rg3tn3oG0LOxpAo6IMxNa09ngphpSlnk=
+cloud.google.com/go/channel v1.9.0/go.mod h1:jcu05W0my9Vx4mt3/rEHpfxc9eKi9XwsdDL8yBMbKUk=
+cloud.google.com/go/channel v1.11.0/go.mod h1:IdtI0uWGqhEeatSB62VOoJ8FSUhJ9/+iGkJVqp74CGE=
+cloud.google.com/go/cloudbuild v1.3.0/go.mod h1:WequR4ULxlqvMsjDEEEFnOG5ZSRSgWOywXYDb1vPE6U=
+cloud.google.com/go/cloudbuild v1.4.0/go.mod h1:5Qwa40LHiOXmz3386FrjrYM93rM/hdRr7b53sySrTqA=
+cloud.google.com/go/cloudbuild v1.7.0/go.mod h1:zb5tWh2XI6lR9zQmsm1VRA+7OCuve5d8S+zJUul8KTg=
+cloud.google.com/go/clouddms v1.3.0/go.mod h1:oK6XsCDdW4Ib3jCCBugx+gVjevp2TMXFtgxvPSee3OM=
+cloud.google.com/go/clouddms v1.4.0/go.mod h1:Eh7sUGCC+aKry14O1NRljhjyrr0NFC0G2cjwX0cByRk=
+cloud.google.com/go/clouddms v1.5.0/go.mod h1:QSxQnhikCLUw13iAbffF2CZxAER3xDGNHjsTAkQJcQA=
+cloud.google.com/go/cloudtasks v1.5.0/go.mod h1:fD92REy1x5woxkKEkLdvavGnPJGEn8Uic9nWuLzqCpY=
+cloud.google.com/go/cloudtasks v1.6.0/go.mod h1:C6Io+sxuke9/KNRkbQpihnW93SWDU3uXt92nu85HkYI=
+cloud.google.com/go/cloudtasks v1.7.0/go.mod h1:ImsfdYWwlWNJbdgPIIGJWC+gemEGTBK/SunNQQNCAb4=
+cloud.google.com/go/cloudtasks v1.8.0/go.mod h1:gQXUIwCSOI4yPVK7DgTVFiiP0ZW/eQkydWzwVMdHxrI=
+cloud.google.com/go/cloudtasks v1.9.0/go.mod h1:w+EyLsVkLWHcOaqNEyvcKAsWp9p29dL6uL9Nst1cI7Y=
+cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow=
+cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM=
+cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M=
+cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s=
+cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU=
+cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U=
+cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/compute v1.12.0/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU=
+cloud.google.com/go/compute v1.12.1/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU=
+cloud.google.com/go/compute v1.13.0/go.mod h1:5aPTS0cUNMIc1CE546K+Th6weJUNQErARyZtRXDJ8GE=
+cloud.google.com/go/compute v1.14.0/go.mod h1:YfLtxrj9sU4Yxv+sXzZkyPjEyPBZfXHUvjxega5vAdo=
+cloud.google.com/go/compute v1.15.1/go.mod h1:bjjoF/NtFUrkD/urWfdHaKuOPDR5nWIs63rR+SXhcpA=
+cloud.google.com/go/compute v1.18.0/go.mod h1:1X7yHxec2Ga+Ss6jPyjxRxpu2uu7PLgsOVXvgU0yacs=
+cloud.google.com/go/compute/metadata v0.1.0/go.mod h1:Z1VN+bulIf6bt4P/C37K4DyZYZEXYonfTBHHFPO/4UU=
+cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
+cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM=
+cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
+cloud.google.com/go/contactcenterinsights v1.3.0/go.mod h1:Eu2oemoePuEFc/xKFPjbTuPSj0fYJcPls9TFlPNnHHY=
+cloud.google.com/go/contactcenterinsights v1.4.0/go.mod h1:L2YzkGbPsv+vMQMCADxJoT9YiTTnSEd6fEvCeHTYVck=
+cloud.google.com/go/contactcenterinsights v1.6.0/go.mod h1:IIDlT6CLcDoyv79kDv8iWxMSTZhLxSCofVV5W6YFM/w=
+cloud.google.com/go/container v1.6.0/go.mod h1:Xazp7GjJSeUYo688S+6J5V+n/t+G5sKBTFkKNudGRxg=
+cloud.google.com/go/container v1.7.0/go.mod h1:Dp5AHtmothHGX3DwwIHPgq45Y8KmNsgN3amoYfxVkLo=
+cloud.google.com/go/container v1.13.1/go.mod h1:6wgbMPeQRw9rSnKBCAJXnds3Pzj03C4JHamr8asWKy4=
+cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I=
+cloud.google.com/go/containeranalysis v0.6.0/go.mod h1:HEJoiEIu+lEXM+k7+qLCci0h33lX3ZqoYFdmPcoO7s4=
+cloud.google.com/go/containeranalysis v0.7.0/go.mod h1:9aUL+/vZ55P2CXfuZjS4UjQ9AgXoSw8Ts6lemfmxBxI=
+cloud.google.com/go/datacatalog v1.3.0/go.mod h1:g9svFY6tuR+j+hrTw3J2dNcmI0dzmSiyOzm8kpLq0a0=
+cloud.google.com/go/datacatalog v1.5.0/go.mod h1:M7GPLNQeLfWqeIm3iuiruhPzkt65+Bx8dAKvScX8jvs=
+cloud.google.com/go/datacatalog v1.6.0/go.mod h1:+aEyF8JKg+uXcIdAmmaMUmZ3q1b/lKLtXCmXdnc0lbc=
+cloud.google.com/go/datacatalog v1.7.0/go.mod h1:9mEl4AuDYWw81UGc41HonIHH7/sn52H0/tc8f8ZbZIE=
+cloud.google.com/go/datacatalog v1.8.0/go.mod h1:KYuoVOv9BM8EYz/4eMFxrr4DUKhGIOXxZoKYF5wdISM=
+cloud.google.com/go/datacatalog v1.8.1/go.mod h1:RJ58z4rMp3gvETA465Vg+ag8BGgBdnRPEMMSTr5Uv+M=
+cloud.google.com/go/datacatalog v1.12.0/go.mod h1:CWae8rFkfp6LzLumKOnmVh4+Zle4A3NXLzVJ1d1mRm0=
+cloud.google.com/go/dataflow v0.6.0/go.mod h1:9QwV89cGoxjjSR9/r7eFDqqjtvbKxAK2BaYU6PVk9UM=
+cloud.google.com/go/dataflow v0.7.0/go.mod h1:PX526vb4ijFMesO1o202EaUmouZKBpjHsTlCtB4parQ=
+cloud.google.com/go/dataflow v0.8.0/go.mod h1:Rcf5YgTKPtQyYz8bLYhFoIV/vP39eL7fWNcSOyFfLJE=
+cloud.google.com/go/dataform v0.3.0/go.mod h1:cj8uNliRlHpa6L3yVhDOBrUXH+BPAO1+KFMQQNSThKo=
+cloud.google.com/go/dataform v0.4.0/go.mod h1:fwV6Y4Ty2yIFL89huYlEkwUPtS7YZinZbzzj5S9FzCE=
+cloud.google.com/go/dataform v0.5.0/go.mod h1:GFUYRe8IBa2hcomWplodVmUx/iTL0FrsauObOM3Ipr0=
+cloud.google.com/go/dataform v0.6.0/go.mod h1:QPflImQy33e29VuapFdf19oPbE4aYTJxr31OAPV+ulA=
+cloud.google.com/go/datafusion v1.4.0/go.mod h1:1Zb6VN+W6ALo85cXnM1IKiPw+yQMKMhB9TsTSRDo/38=
+cloud.google.com/go/datafusion v1.5.0/go.mod h1:Kz+l1FGHB0J+4XF2fud96WMmRiq/wj8N9u007vyXZ2w=
+cloud.google.com/go/datafusion v1.6.0/go.mod h1:WBsMF8F1RhSXvVM8rCV3AeyWVxcC2xY6vith3iw3S+8=
+cloud.google.com/go/datalabeling v0.5.0/go.mod h1:TGcJ0G2NzcsXSE/97yWjIZO0bXj0KbVlINXMG9ud42I=
+cloud.google.com/go/datalabeling v0.6.0/go.mod h1:WqdISuk/+WIGeMkpw/1q7bK/tFEZxsrFJOJdY2bXvTQ=
+cloud.google.com/go/datalabeling v0.7.0/go.mod h1:WPQb1y08RJbmpM3ww0CSUAGweL0SxByuW2E+FU+wXcM=
+cloud.google.com/go/dataplex v1.3.0/go.mod h1:hQuRtDg+fCiFgC8j0zV222HvzFQdRd+SVX8gdmFcZzA=
+cloud.google.com/go/dataplex v1.4.0/go.mod h1:X51GfLXEMVJ6UN47ESVqvlsRplbLhcsAt0kZCCKsU0A=
+cloud.google.com/go/dataplex v1.5.2/go.mod h1:cVMgQHsmfRoI5KFYq4JtIBEUbYwc3c7tXmIDhRmNNVQ=
+cloud.google.com/go/dataproc v1.7.0/go.mod h1:CKAlMjII9H90RXaMpSxQ8EU6dQx6iAYNPcYPOkSbi8s=
+cloud.google.com/go/dataproc v1.8.0/go.mod h1:5OW+zNAH0pMpw14JVrPONsxMQYMBqJuzORhIBfBn9uI=
+cloud.google.com/go/dataproc v1.12.0/go.mod h1:zrF3aX0uV3ikkMz6z4uBbIKyhRITnxvr4i3IjKsKrw4=
+cloud.google.com/go/dataqna v0.5.0/go.mod h1:90Hyk596ft3zUQ8NkFfvICSIfHFh1Bc7C4cK3vbhkeo=
+cloud.google.com/go/dataqna v0.6.0/go.mod h1:1lqNpM7rqNLVgWBJyk5NF6Uen2PHym0jtVJonplVsDA=
+cloud.google.com/go/dataqna v0.7.0/go.mod h1:Lx9OcIIeqCrw1a6KdO3/5KMP1wAmTc0slZWwP12Qq3c=
+cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
+cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
+cloud.google.com/go/datastore v1.10.0/go.mod h1:PC5UzAmDEkAmkfaknstTYbNpgE49HAgW2J1gcgUfmdM=
+cloud.google.com/go/datastream v1.2.0/go.mod h1:i/uTP8/fZwgATHS/XFu0TcNUhuA0twZxxQ3EyCUQMwo=
+cloud.google.com/go/datastream v1.3.0/go.mod h1:cqlOX8xlyYF/uxhiKn6Hbv6WjwPPuI9W2M9SAXwaLLQ=
+cloud.google.com/go/datastream v1.4.0/go.mod h1:h9dpzScPhDTs5noEMQVWP8Wx8AFBRyS0s8KWPx/9r0g=
+cloud.google.com/go/datastream v1.5.0/go.mod h1:6TZMMNPwjUqZHBKPQ1wwXpb0d5VDVPl2/XoS5yi88q4=
+cloud.google.com/go/datastream v1.6.0/go.mod h1:6LQSuswqLa7S4rPAOZFVjHIG3wJIjZcZrw8JDEDJuIs=
+cloud.google.com/go/deploy v1.4.0/go.mod h1:5Xghikd4VrmMLNaF6FiRFDlHb59VM59YoDQnOUdsH/c=
+cloud.google.com/go/deploy v1.5.0/go.mod h1:ffgdD0B89tToyW/U/D2eL0jN2+IEV/3EMuXHA0l4r+s=
+cloud.google.com/go/deploy v1.6.0/go.mod h1:f9PTHehG/DjCom3QH0cntOVRm93uGBDt2vKzAPwpXQI=
+cloud.google.com/go/dialogflow v1.15.0/go.mod h1:HbHDWs33WOGJgn6rfzBW1Kv807BE3O1+xGbn59zZWI4=
+cloud.google.com/go/dialogflow v1.16.1/go.mod h1:po6LlzGfK+smoSmTBnbkIZY2w8ffjz/RcGSS+sh1el0=
+cloud.google.com/go/dialogflow v1.17.0/go.mod h1:YNP09C/kXA1aZdBgC/VtXX74G/TKn7XVCcVumTflA+8=
+cloud.google.com/go/dialogflow v1.18.0/go.mod h1:trO7Zu5YdyEuR+BhSNOqJezyFQ3aUzz0njv7sMx/iek=
+cloud.google.com/go/dialogflow v1.19.0/go.mod h1:JVmlG1TwykZDtxtTXujec4tQ+D8SBFMoosgy+6Gn0s0=
+cloud.google.com/go/dialogflow v1.29.0/go.mod h1:b+2bzMe+k1s9V+F2jbJwpHPzrnIyHihAdRFMtn2WXuM=
+cloud.google.com/go/dialogflow v1.31.0/go.mod h1:cuoUccuL1Z+HADhyIA7dci3N5zUssgpBJmCzI6fNRB4=
+cloud.google.com/go/dlp v1.6.0/go.mod h1:9eyB2xIhpU0sVwUixfBubDoRwP+GjeUoxxeueZmqvmM=
+cloud.google.com/go/dlp v1.7.0/go.mod h1:68ak9vCiMBjbasxeVD17hVPxDEck+ExiHavX8kiHG+Q=
+cloud.google.com/go/dlp v1.9.0/go.mod h1:qdgmqgTyReTz5/YNSSuueR8pl7hO0o9bQ39ZhtgkWp4=
+cloud.google.com/go/documentai v1.7.0/go.mod h1:lJvftZB5NRiFSX4moiye1SMxHx0Bc3x1+p9e/RfXYiU=
+cloud.google.com/go/documentai v1.8.0/go.mod h1:xGHNEB7CtsnySCNrCFdCyyMz44RhFEEX2Q7UD0c5IhU=
+cloud.google.com/go/documentai v1.9.0/go.mod h1:FS5485S8R00U10GhgBC0aNGrJxBP8ZVpEeJ7PQDZd6k=
+cloud.google.com/go/documentai v1.10.0/go.mod h1:vod47hKQIPeCfN2QS/jULIvQTugbmdc0ZvxxfQY1bg4=
+cloud.google.com/go/documentai v1.16.0/go.mod h1:o0o0DLTEZ+YnJZ+J4wNfTxmDVyrkzFvttBXXtYRMHkM=
+cloud.google.com/go/domains v0.6.0/go.mod h1:T9Rz3GasrpYk6mEGHh4rymIhjlnIuB4ofT1wTxDeT4Y=
+cloud.google.com/go/domains v0.7.0/go.mod h1:PtZeqS1xjnXuRPKE/88Iru/LdfoRyEHYA9nFQf4UKpg=
+cloud.google.com/go/domains v0.8.0/go.mod h1:M9i3MMDzGFXsydri9/vW+EWz9sWb4I6WyHqdlAk0idE=
+cloud.google.com/go/edgecontainer v0.1.0/go.mod h1:WgkZ9tp10bFxqO8BLPqv2LlfmQF1X8lZqwW4r1BTajk=
+cloud.google.com/go/edgecontainer v0.2.0/go.mod h1:RTmLijy+lGpQ7BXuTDa4C4ssxyXT34NIuHIgKuP4s5w=
+cloud.google.com/go/edgecontainer v0.3.0/go.mod h1:FLDpP4nykgwwIfcLt6zInhprzw0lEi2P1fjO6Ie0qbc=
+cloud.google.com/go/errorreporting v0.3.0/go.mod h1:xsP2yaAp+OAW4OIm60An2bbLpqIhKXdWR/tawvl7QzU=
+cloud.google.com/go/essentialcontacts v1.3.0/go.mod h1:r+OnHa5jfj90qIfZDO/VztSFqbQan7HV75p8sA+mdGI=
+cloud.google.com/go/essentialcontacts v1.4.0/go.mod h1:8tRldvHYsmnBCHdFpvU+GL75oWiBKl80BiqlFh9tp+8=
+cloud.google.com/go/essentialcontacts v1.5.0/go.mod h1:ay29Z4zODTuwliK7SnX8E86aUF2CTzdNtvv42niCX0M=
+cloud.google.com/go/eventarc v1.7.0/go.mod h1:6ctpF3zTnaQCxUjHUdcfgcA1A2T309+omHZth7gDfmc=
+cloud.google.com/go/eventarc v1.8.0/go.mod h1:imbzxkyAU4ubfsaKYdQg04WS1NvncblHEup4kvF+4gw=
+cloud.google.com/go/eventarc v1.10.0/go.mod h1:u3R35tmZ9HvswGRBnF48IlYgYeBcPUCjkr4BTdem2Kw=
+cloud.google.com/go/filestore v1.3.0/go.mod h1:+qbvHGvXU1HaKX2nD0WEPo92TP/8AQuCVEBXNY9z0+w=
+cloud.google.com/go/filestore v1.4.0/go.mod h1:PaG5oDfo9r224f8OYXURtAsY+Fbyq/bLYoINEK8XQAI=
+cloud.google.com/go/filestore v1.5.0/go.mod h1:FqBXDWBp4YLHqRnVGveOkHDf8svj9r5+mUDLupOWEDs=
+cloud.google.com/go/firestore v1.9.0/go.mod h1:HMkjKHNTtRyZNiMzu7YAsLr9K3X2udY2AMwDaMEQiiE=
+cloud.google.com/go/functions v1.6.0/go.mod h1:3H1UA3qiIPRWD7PeZKLvHZ9SaQhR26XIJcC0A5GbvAk=
+cloud.google.com/go/functions v1.7.0/go.mod h1:+d+QBcWM+RsrgZfV9xo6KfA1GlzJfxcfZcRPEhDDfzg=
+cloud.google.com/go/functions v1.8.0/go.mod h1:RTZ4/HsQjIqIYP9a9YPbU+QFoQsAlYgrwOXJWHn1POY=
+cloud.google.com/go/functions v1.9.0/go.mod h1:Y+Dz8yGguzO3PpIjhLTbnqV1CWmgQ5UwtlpzoyquQ08=
+cloud.google.com/go/functions v1.10.0/go.mod h1:0D3hEOe3DbEvCXtYOZHQZmD+SzYsi1YbI7dGvHfldXw=
+cloud.google.com/go/gaming v1.5.0/go.mod h1:ol7rGcxP/qHTRQE/RO4bxkXq+Fix0j6D4LFPzYTIrDM=
+cloud.google.com/go/gaming v1.6.0/go.mod h1:YMU1GEvA39Qt3zWGyAVA9bpYz/yAhTvaQ1t2sK4KPUA=
+cloud.google.com/go/gaming v1.7.0/go.mod h1:LrB8U7MHdGgFG851iHAfqUdLcKBdQ55hzXy9xBJz0+w=
+cloud.google.com/go/gaming v1.8.0/go.mod h1:xAqjS8b7jAVW0KFYeRUxngo9My3f33kFmua++Pi+ggM=
+cloud.google.com/go/gaming v1.9.0/go.mod h1:Fc7kEmCObylSWLO334NcO+O9QMDyz+TKC4v1D7X+Bc0=
+cloud.google.com/go/gkebackup v0.2.0/go.mod h1:XKvv/4LfG829/B8B7xRkk8zRrOEbKtEam6yNfuQNH60=
+cloud.google.com/go/gkebackup v0.3.0/go.mod h1:n/E671i1aOQvUxT541aTkCwExO/bTer2HDlj4TsBRAo=
+cloud.google.com/go/gkebackup v0.4.0/go.mod h1:byAyBGUwYGEEww7xsbnUTBHIYcOPy/PgUWUtOeRm9Vg=
+cloud.google.com/go/gkeconnect v0.5.0/go.mod h1:c5lsNAg5EwAy7fkqX/+goqFsU1Da/jQFqArp+wGNr/o=
+cloud.google.com/go/gkeconnect v0.6.0/go.mod h1:Mln67KyU/sHJEBY8kFZ0xTeyPtzbq9StAVvEULYK16A=
+cloud.google.com/go/gkeconnect v0.7.0/go.mod h1:SNfmVqPkaEi3bF/B3CNZOAYPYdg7sU+obZ+QTky2Myw=
+cloud.google.com/go/gkehub v0.9.0/go.mod h1:WYHN6WG8w9bXU0hqNxt8rm5uxnk8IH+lPY9J2TV7BK0=
+cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y977wO+hBH0=
+cloud.google.com/go/gkehub v0.11.0/go.mod h1:JOWHlmN+GHyIbuWQPl47/C2RFhnFKH38jH9Ascu3n0E=
+cloud.google.com/go/gkemulticloud v0.3.0/go.mod h1:7orzy7O0S+5kq95e4Hpn7RysVA7dPs8W/GgfUtsPbrA=
+cloud.google.com/go/gkemulticloud v0.4.0/go.mod h1:E9gxVBnseLWCk24ch+P9+B2CoDFJZTyIgLKSalC7tuI=
+cloud.google.com/go/gkemulticloud v0.5.0/go.mod h1:W0JDkiyi3Tqh0TJr//y19wyb1yf8llHVto2Htf2Ja3Y=
+cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc=
+cloud.google.com/go/gsuiteaddons v1.3.0/go.mod h1:EUNK/J1lZEZO8yPtykKxLXI6JSVN2rg9bN8SXOa0bgM=
+cloud.google.com/go/gsuiteaddons v1.4.0/go.mod h1:rZK5I8hht7u7HxFQcFei0+AtfS9uSushomRlg+3ua1o=
+cloud.google.com/go/gsuiteaddons v1.5.0/go.mod h1:TFCClYLd64Eaa12sFVmUyG62tk4mdIsI7pAnSXRkcFo=
+cloud.google.com/go/iam v0.1.0/go.mod h1:vcUNEa0pEm0qRVpmWepWaFMIAI8/hjB9mO8rNCJtF6c=
+cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY=
+cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc=
+cloud.google.com/go/iam v0.6.0/go.mod h1:+1AH33ueBne5MzYccyMHtEKqLE4/kJOibtffMHDMFMc=
+cloud.google.com/go/iam v0.7.0/go.mod h1:H5Br8wRaDGNc8XP3keLc4unfUUZeyH3Sfl9XpQEYOeg=
+cloud.google.com/go/iam v0.8.0/go.mod h1:lga0/y3iH6CX7sYqypWJ33hf7kkfXJag67naqGESjkE=
+cloud.google.com/go/iam v0.11.0/go.mod h1:9PiLDanza5D+oWFZiH1uG+RnRCfEGKoyl6yo4cgWZGY=
+cloud.google.com/go/iam v0.12.0/go.mod h1:knyHGviacl11zrtZUoDuYpDgLjvr28sLQaG0YB2GYAY=
+cloud.google.com/go/iap v1.4.0/go.mod h1:RGFwRJdihTINIe4wZ2iCP0zF/qu18ZwyKxrhMhygBEc=
+cloud.google.com/go/iap v1.5.0/go.mod h1:UH/CGgKd4KyohZL5Pt0jSKE4m3FR51qg6FKQ/z/Ix9A=
+cloud.google.com/go/iap v1.6.0/go.mod h1:NSuvI9C/j7UdjGjIde7t7HBz+QTwBcapPE07+sSRcLk=
+cloud.google.com/go/ids v1.1.0/go.mod h1:WIuwCaYVOzHIj2OhN9HAwvW+DBdmUAdcWlFxRl+KubM=
+cloud.google.com/go/ids v1.2.0/go.mod h1:5WXvp4n25S0rA/mQWAg1YEEBBq6/s+7ml1RDCW1IrcY=
+cloud.google.com/go/ids v1.3.0/go.mod h1:JBdTYwANikFKaDP6LtW5JAi4gubs57SVNQjemdt6xV4=
+cloud.google.com/go/iot v1.3.0/go.mod h1:r7RGh2B61+B8oz0AGE+J72AhA0G7tdXItODWsaA2oLs=
+cloud.google.com/go/iot v1.4.0/go.mod h1:dIDxPOn0UvNDUMD8Ger7FIaTuvMkj+aGk94RPP0iV+g=
+cloud.google.com/go/iot v1.5.0/go.mod h1:mpz5259PDl3XJthEmh9+ap0affn/MqNSP4My77Qql9o=
+cloud.google.com/go/kms v1.4.0/go.mod h1:fajBHndQ+6ubNw6Ss2sSd+SWvjL26RNo/dr7uxsnnOA=
+cloud.google.com/go/kms v1.5.0/go.mod h1:QJS2YY0eJGBg3mnDfuaCyLauWwBJiHRboYxJ++1xJNg=
+cloud.google.com/go/kms v1.6.0/go.mod h1:Jjy850yySiasBUDi6KFUwUv2n1+o7QZFyuUJg6OgjA0=
+cloud.google.com/go/kms v1.9.0/go.mod h1:qb1tPTgfF9RQP8e1wq4cLFErVuTJv7UsSC915J8dh3w=
+cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic=
+cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI=
+cloud.google.com/go/language v1.7.0/go.mod h1:DJ6dYN/W+SQOjF8e1hLQXMF21AkH2w9wiPzPCJa2MIE=
+cloud.google.com/go/language v1.8.0/go.mod h1:qYPVHf7SPoNNiCL2Dr0FfEFNil1qi3pQEyygwpgVKB8=
+cloud.google.com/go/language v1.9.0/go.mod h1:Ns15WooPM5Ad/5no/0n81yUetis74g3zrbeJBE+ptUY=
+cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8=
+cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08=
+cloud.google.com/go/lifesciences v0.8.0/go.mod h1:lFxiEOMqII6XggGbOnKiyZ7IBwoIqA84ClvoezaA/bo=
+cloud.google.com/go/logging v1.6.1/go.mod h1:5ZO0mHHbvm8gEmeEUHrmDlTDSu5imF6MUP9OfilNXBw=
+cloud.google.com/go/logging v1.7.0/go.mod h1:3xjP2CjkM3ZkO73aj4ASA5wRPGGCRrPIAeNqVNkzY8M=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
+cloud.google.com/go/longrunning v0.3.0/go.mod h1:qth9Y41RRSUE69rDcOn6DdK3HfQfsUI0YSmW3iIlLJc=
+cloud.google.com/go/longrunning v0.4.1/go.mod h1:4iWDqhBZ70CvZ6BfETbvam3T8FMvLK+eFj0E6AaRQTo=
+cloud.google.com/go/managedidentities v1.3.0/go.mod h1:UzlW3cBOiPrzucO5qWkNkh0w33KFtBJU281hacNvsdE=
+cloud.google.com/go/managedidentities v1.4.0/go.mod h1:NWSBYbEMgqmbZsLIyKvxrYbtqOsxY1ZrGM+9RgDqInM=
+cloud.google.com/go/managedidentities v1.5.0/go.mod h1:+dWcZ0JlUmpuxpIDfyP5pP5y0bLdRwOS4Lp7gMni/LA=
+cloud.google.com/go/maps v0.1.0/go.mod h1:BQM97WGyfw9FWEmQMpZ5T6cpovXXSd1cGmFma94eubI=
+cloud.google.com/go/maps v0.6.0/go.mod h1:o6DAMMfb+aINHz/p/jbcY+mYeXBoZoxTfdSQ8VAJaCw=
+cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4=
+cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w=
+cloud.google.com/go/mediatranslation v0.7.0/go.mod h1:LCnB/gZr90ONOIQLgSXagp8XUW1ODs2UmUMvcgMfI2I=
+cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE=
+cloud.google.com/go/memcache v1.5.0/go.mod h1:dk3fCK7dVo0cUU2c36jKb4VqKPS22BTkf81Xq617aWM=
+cloud.google.com/go/memcache v1.6.0/go.mod h1:XS5xB0eQZdHtTuTF9Hf8eJkKtR3pVRCcvJwtm68T3rA=
+cloud.google.com/go/memcache v1.7.0/go.mod h1:ywMKfjWhNtkQTxrWxCkCFkoPjLHPW6A7WOTVI8xy3LY=
+cloud.google.com/go/memcache v1.9.0/go.mod h1:8oEyzXCu+zo9RzlEaEjHl4KkgjlNDaXbCQeQWlzNFJM=
+cloud.google.com/go/metastore v1.5.0/go.mod h1:2ZNrDcQwghfdtCwJ33nM0+GrBGlVuh8rakL3vdPY3XY=
+cloud.google.com/go/metastore v1.6.0/go.mod h1:6cyQTls8CWXzk45G55x57DVQ9gWg7RiH65+YgPsNh9s=
+cloud.google.com/go/metastore v1.7.0/go.mod h1:s45D0B4IlsINu87/AsWiEVYbLaIMeUSoxlKKDqBGFS8=
+cloud.google.com/go/metastore v1.8.0/go.mod h1:zHiMc4ZUpBiM7twCIFQmJ9JMEkDSyZS9U12uf7wHqSI=
+cloud.google.com/go/metastore v1.10.0/go.mod h1:fPEnH3g4JJAk+gMRnrAnoqyv2lpUCqJPWOodSaf45Eo=
+cloud.google.com/go/monitoring v1.7.0/go.mod h1:HpYse6kkGo//7p6sT0wsIC6IBDET0RhIsnmlA53dvEk=
+cloud.google.com/go/monitoring v1.8.0/go.mod h1:E7PtoMJ1kQXWxPjB6mv2fhC5/15jInuulFdYYtlcvT4=
+cloud.google.com/go/monitoring v1.12.0/go.mod h1:yx8Jj2fZNEkL/GYZyTLS4ZtZEZN8WtDEiEqG4kLK50w=
+cloud.google.com/go/networkconnectivity v1.4.0/go.mod h1:nOl7YL8odKyAOtzNX73/M5/mGZgqqMeryi6UPZTk/rA=
+cloud.google.com/go/networkconnectivity v1.5.0/go.mod h1:3GzqJx7uhtlM3kln0+x5wyFvuVH1pIBJjhCpjzSt75o=
+cloud.google.com/go/networkconnectivity v1.6.0/go.mod h1:OJOoEXW+0LAxHh89nXd64uGG+FbQoeH8DtxCHVOMlaM=
+cloud.google.com/go/networkconnectivity v1.7.0/go.mod h1:RMuSbkdbPwNMQjB5HBWD5MpTBnNm39iAVpC3TmsExt8=
+cloud.google.com/go/networkconnectivity v1.10.0/go.mod h1:UP4O4sWXJG13AqrTdQCD9TnLGEbtNRqjuaaA7bNjF5E=
+cloud.google.com/go/networkmanagement v1.4.0/go.mod h1:Q9mdLLRn60AsOrPc8rs8iNV6OHXaGcDdsIQe1ohekq8=
+cloud.google.com/go/networkmanagement v1.5.0/go.mod h1:ZnOeZ/evzUdUsnvRt792H0uYEnHQEMaz+REhhzJRcf4=
+cloud.google.com/go/networkmanagement v1.6.0/go.mod h1:5pKPqyXjB/sgtvB5xqOemumoQNB7y95Q7S+4rjSOPYY=
+cloud.google.com/go/networksecurity v0.5.0/go.mod h1:xS6fOCoqpVC5zx15Z/MqkfDwH4+m/61A3ODiDV1xmiQ=
+cloud.google.com/go/networksecurity v0.6.0/go.mod h1:Q5fjhTr9WMI5mbpRYEbiexTzROf7ZbDzvzCrNl14nyU=
+cloud.google.com/go/networksecurity v0.7.0/go.mod h1:mAnzoxx/8TBSyXEeESMy9OOYwo1v+gZ5eMRnsT5bC8k=
+cloud.google.com/go/notebooks v1.2.0/go.mod h1:9+wtppMfVPUeJ8fIWPOq1UnATHISkGXGqTkxeieQ6UY=
+cloud.google.com/go/notebooks v1.3.0/go.mod h1:bFR5lj07DtCPC7YAAJ//vHskFBxA5JzYlH68kXVdk34=
+cloud.google.com/go/notebooks v1.4.0/go.mod h1:4QPMngcwmgb6uw7Po99B2xv5ufVoIQ7nOGDyL4P8AgA=
+cloud.google.com/go/notebooks v1.5.0/go.mod h1:q8mwhnP9aR8Hpfnrc5iN5IBhrXUy8S2vuYs+kBJ/gu0=
+cloud.google.com/go/notebooks v1.7.0/go.mod h1:PVlaDGfJgj1fl1S3dUwhFMXFgfYGhYQt2164xOMONmE=
+cloud.google.com/go/optimization v1.1.0/go.mod h1:5po+wfvX5AQlPznyVEZjGJTMr4+CAkJf2XSTQOOl9l4=
+cloud.google.com/go/optimization v1.2.0/go.mod h1:Lr7SOHdRDENsh+WXVmQhQTrzdu9ybg0NecjHidBq6xs=
+cloud.google.com/go/optimization v1.3.1/go.mod h1:IvUSefKiwd1a5p0RgHDbWCIbDFgKuEdB+fPPuP0IDLI=
+cloud.google.com/go/orchestration v1.3.0/go.mod h1:Sj5tq/JpWiB//X/q3Ngwdl5K7B7Y0KZ7bfv0wL6fqVA=
+cloud.google.com/go/orchestration v1.4.0/go.mod h1:6W5NLFWs2TlniBphAViZEVhrXRSMgUGDfW7vrWKvsBk=
+cloud.google.com/go/orchestration v1.6.0/go.mod h1:M62Bevp7pkxStDfFfTuCOaXgaaqRAga1yKyoMtEoWPQ=
+cloud.google.com/go/orgpolicy v1.4.0/go.mod h1:xrSLIV4RePWmP9P3tBl8S93lTmlAxjm06NSm2UTmKvE=
+cloud.google.com/go/orgpolicy v1.5.0/go.mod h1:hZEc5q3wzwXJaKrsx5+Ewg0u1LxJ51nNFlext7Tanwc=
+cloud.google.com/go/orgpolicy v1.10.0/go.mod h1:w1fo8b7rRqlXlIJbVhOMPrwVljyuW5mqssvBtU18ONc=
+cloud.google.com/go/osconfig v1.7.0/go.mod h1:oVHeCeZELfJP7XLxcBGTMBvRO+1nQ5tFG9VQTmYS2Fs=
+cloud.google.com/go/osconfig v1.8.0/go.mod h1:EQqZLu5w5XA7eKizepumcvWx+m8mJUhEwiPqWiZeEdg=
+cloud.google.com/go/osconfig v1.9.0/go.mod h1:Yx+IeIZJ3bdWmzbQU4fxNl8xsZ4amB+dygAwFPlvnNo=
+cloud.google.com/go/osconfig v1.10.0/go.mod h1:uMhCzqC5I8zfD9zDEAfvgVhDS8oIjySWh+l4WK6GnWw=
+cloud.google.com/go/osconfig v1.11.0/go.mod h1:aDICxrur2ogRd9zY5ytBLV89KEgT2MKB2L/n6x1ooPw=
+cloud.google.com/go/oslogin v1.4.0/go.mod h1:YdgMXWRaElXz/lDk1Na6Fh5orF7gvmJ0FGLIs9LId4E=
+cloud.google.com/go/oslogin v1.5.0/go.mod h1:D260Qj11W2qx/HVF29zBg+0fd6YCSjSqLUkY/qEenQU=
+cloud.google.com/go/oslogin v1.6.0/go.mod h1:zOJ1O3+dTU8WPlGEkFSh7qeHPPSoxrcMbbK1Nm2iX70=
+cloud.google.com/go/oslogin v1.7.0/go.mod h1:e04SN0xO1UNJ1M5GP0vzVBFicIe4O53FOfcixIqTyXo=
+cloud.google.com/go/oslogin v1.9.0/go.mod h1:HNavntnH8nzrn8JCTT5fj18FuJLFJc4NaZJtBnQtKFs=
+cloud.google.com/go/phishingprotection v0.5.0/go.mod h1:Y3HZknsK9bc9dMi+oE8Bim0lczMU6hrX0UpADuMefr0=
+cloud.google.com/go/phishingprotection v0.6.0/go.mod h1:9Y3LBLgy0kDTcYET8ZH3bq/7qni15yVUoAxiFxnlSUA=
+cloud.google.com/go/phishingprotection v0.7.0/go.mod h1:8qJI4QKHoda/sb/7/YmMQ2omRLSLYSu9bU0EKCNI+Lk=
+cloud.google.com/go/policytroubleshooter v1.3.0/go.mod h1:qy0+VwANja+kKrjlQuOzmlvscn4RNsAc0e15GGqfMxg=
+cloud.google.com/go/policytroubleshooter v1.4.0/go.mod h1:DZT4BcRw3QoO8ota9xw/LKtPa8lKeCByYeKTIf/vxdE=
+cloud.google.com/go/policytroubleshooter v1.5.0/go.mod h1:Rz1WfV+1oIpPdN2VvvuboLVRsB1Hclg3CKQ53j9l8vw=
+cloud.google.com/go/privatecatalog v0.5.0/go.mod h1:XgosMUvvPyxDjAVNDYxJ7wBW8//hLDDYmnsNcMGq1K0=
+cloud.google.com/go/privatecatalog v0.6.0/go.mod h1:i/fbkZR0hLN29eEWiiwue8Pb+GforiEIBnV9yrRUOKI=
+cloud.google.com/go/privatecatalog v0.7.0/go.mod h1:2s5ssIFO69F5csTXcwBP7NPFTZvps26xGzvQ2PQaBYg=
+cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
+cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
+cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
+cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
+cloud.google.com/go/pubsub v1.26.0/go.mod h1:QgBH3U/jdJy/ftjPhTkyXNj543Tin1pRYcdcPRnFIRI=
+cloud.google.com/go/pubsub v1.27.1/go.mod h1:hQN39ymbV9geqBnfQq6Xf63yNhUAhv9CZhzp5O6qsW0=
+cloud.google.com/go/pubsub v1.28.0/go.mod h1:vuXFpwaVoIPQMGXqRyUQigu/AX1S3IWugR9xznmcXX8=
+cloud.google.com/go/pubsublite v1.5.0/go.mod h1:xapqNQ1CuLfGi23Yda/9l4bBCKz/wC3KIJ5gKcxveZg=
+cloud.google.com/go/pubsublite v1.6.0/go.mod h1:1eFCS0U11xlOuMFV/0iBqw3zP12kddMeCbj/F3FSj9k=
+cloud.google.com/go/recaptchaenterprise v1.3.1/go.mod h1:OdD+q+y4XGeAlxRaMn1Y7/GveP6zmq76byL6tjPE7d4=
+cloud.google.com/go/recaptchaenterprise/v2 v2.1.0/go.mod h1:w9yVqajwroDNTfGuhmOjPDN//rZGySaf6PtFVcSCa7o=
+cloud.google.com/go/recaptchaenterprise/v2 v2.2.0/go.mod h1:/Zu5jisWGeERrd5HnlS3EUGb/D335f9k51B/FVil0jk=
+cloud.google.com/go/recaptchaenterprise/v2 v2.3.0/go.mod h1:O9LwGCjrhGHBQET5CA7dd5NwwNQUErSgEDit1DLNTdo=
+cloud.google.com/go/recaptchaenterprise/v2 v2.4.0/go.mod h1:Am3LHfOuBstrLrNCBrlI5sbwx9LBg3te2N6hGvHn2mE=
+cloud.google.com/go/recaptchaenterprise/v2 v2.5.0/go.mod h1:O8LzcHXN3rz0j+LBC91jrwI3R+1ZSZEWrfL7XHgNo9U=
+cloud.google.com/go/recaptchaenterprise/v2 v2.6.0/go.mod h1:RPauz9jeLtB3JVzg6nCbe12qNoaa8pXc4d/YukAmcnA=
+cloud.google.com/go/recommendationengine v0.5.0/go.mod h1:E5756pJcVFeVgaQv3WNpImkFP8a+RptV6dDLGPILjvg=
+cloud.google.com/go/recommendationengine v0.6.0/go.mod h1:08mq2umu9oIqc7tDy8sx+MNJdLG0fUi3vaSVbztHgJ4=
+cloud.google.com/go/recommendationengine v0.7.0/go.mod h1:1reUcE3GIu6MeBz/h5xZJqNLuuVjNg1lmWMPyjatzac=
+cloud.google.com/go/recommender v1.5.0/go.mod h1:jdoeiBIVrJe9gQjwd759ecLJbxCDED4A6p+mqoqDvTg=
+cloud.google.com/go/recommender v1.6.0/go.mod h1:+yETpm25mcoiECKh9DEScGzIRyDKpZ0cEhWGo+8bo+c=
+cloud.google.com/go/recommender v1.7.0/go.mod h1:XLHs/W+T8olwlGOgfQenXBTbIseGclClff6lhFVe9Bs=
+cloud.google.com/go/recommender v1.8.0/go.mod h1:PkjXrTT05BFKwxaUxQmtIlrtj0kph108r02ZZQ5FE70=
+cloud.google.com/go/recommender v1.9.0/go.mod h1:PnSsnZY7q+VL1uax2JWkt/UegHssxjUVVCrX52CuEmQ=
+cloud.google.com/go/redis v1.7.0/go.mod h1:V3x5Jq1jzUcg+UNsRvdmsfuFnit1cfe3Z/PGyq/lm4Y=
+cloud.google.com/go/redis v1.8.0/go.mod h1:Fm2szCDavWzBk2cDKxrkmWBqoCiL1+Ctwq7EyqBCA/A=
+cloud.google.com/go/redis v1.9.0/go.mod h1:HMYQuajvb2D0LvMgZmLDZW8V5aOC/WxstZHiy4g8OiA=
+cloud.google.com/go/redis v1.10.0/go.mod h1:ThJf3mMBQtW18JzGgh41/Wld6vnDDc/F/F35UolRZPM=
+cloud.google.com/go/redis v1.11.0/go.mod h1:/X6eicana+BWcUda5PpwZC48o37SiFVTFSs0fWAJ7uQ=
+cloud.google.com/go/resourcemanager v1.3.0/go.mod h1:bAtrTjZQFJkiWTPDb1WBjzvc6/kifjj4QBYuKCCoqKA=
+cloud.google.com/go/resourcemanager v1.4.0/go.mod h1:MwxuzkumyTX7/a3n37gmsT3py7LIXwrShilPh3P1tR0=
+cloud.google.com/go/resourcemanager v1.5.0/go.mod h1:eQoXNAiAvCf5PXxWxXjhKQoTMaUSNrEfg+6qdf/wots=
+cloud.google.com/go/resourcesettings v1.3.0/go.mod h1:lzew8VfESA5DQ8gdlHwMrqZs1S9V87v3oCnKCWoOuQU=
+cloud.google.com/go/resourcesettings v1.4.0/go.mod h1:ldiH9IJpcrlC3VSuCGvjR5of/ezRrOxFtpJoJo5SmXg=
+cloud.google.com/go/resourcesettings v1.5.0/go.mod h1:+xJF7QSG6undsQDfsCJyqWXyBwUoJLhetkRMDRnIoXA=
+cloud.google.com/go/retail v1.8.0/go.mod h1:QblKS8waDmNUhghY2TI9O3JLlFk8jybHeV4BF19FrE4=
+cloud.google.com/go/retail v1.9.0/go.mod h1:g6jb6mKuCS1QKnH/dpu7isX253absFl6iE92nHwlBUY=
+cloud.google.com/go/retail v1.10.0/go.mod h1:2gDk9HsL4HMS4oZwz6daui2/jmKvqShXKQuB2RZ+cCc=
+cloud.google.com/go/retail v1.11.0/go.mod h1:MBLk1NaWPmh6iVFSz9MeKG/Psyd7TAgm6y/9L2B4x9Y=
+cloud.google.com/go/retail v1.12.0/go.mod h1:UMkelN/0Z8XvKymXFbD4EhFJlYKRx1FGhQkVPU5kF14=
+cloud.google.com/go/run v0.2.0/go.mod h1:CNtKsTA1sDcnqqIFR3Pb5Tq0usWxJJvsWOCPldRU3Do=
+cloud.google.com/go/run v0.3.0/go.mod h1:TuyY1+taHxTjrD0ZFk2iAR+xyOXEA0ztb7U3UNA0zBo=
+cloud.google.com/go/run v0.8.0/go.mod h1:VniEnuBwqjigv0A7ONfQUaEItaiCRVujlMqerPPiktM=
+cloud.google.com/go/scheduler v1.4.0/go.mod h1:drcJBmxF3aqZJRhmkHQ9b3uSSpQoltBPGPxGAWROx6s=
+cloud.google.com/go/scheduler v1.5.0/go.mod h1:ri073ym49NW3AfT6DZi21vLZrG07GXr5p3H1KxN5QlI=
+cloud.google.com/go/scheduler v1.6.0/go.mod h1:SgeKVM7MIwPn3BqtcBntpLyrIJftQISRrYB5ZtT+KOk=
+cloud.google.com/go/scheduler v1.7.0/go.mod h1:jyCiBqWW956uBjjPMMuX09n3x37mtyPJegEWKxRsn44=
+cloud.google.com/go/scheduler v1.8.0/go.mod h1:TCET+Y5Gp1YgHT8py4nlg2Sew8nUHMqcpousDgXJVQc=
+cloud.google.com/go/secretmanager v1.6.0/go.mod h1:awVa/OXF6IiyaU1wQ34inzQNc4ISIDIrId8qE5QGgKA=
+cloud.google.com/go/secretmanager v1.8.0/go.mod h1:hnVgi/bN5MYHd3Gt0SPuTPPp5ENina1/LxM+2W9U9J4=
+cloud.google.com/go/secretmanager v1.9.0/go.mod h1:b71qH2l1yHmWQHt9LC80akm86mX8AL6X1MA01dW8ht4=
+cloud.google.com/go/secretmanager v1.10.0/go.mod h1:MfnrdvKMPNra9aZtQFvBcvRU54hbPD8/HayQdlUgJpU=
+cloud.google.com/go/security v1.5.0/go.mod h1:lgxGdyOKKjHL4YG3/YwIL2zLqMFCKs0UbQwgyZmfJl4=
+cloud.google.com/go/security v1.7.0/go.mod h1:mZklORHl6Bg7CNnnjLH//0UlAlaXqiG7Lb9PsPXLfD0=
+cloud.google.com/go/security v1.8.0/go.mod h1:hAQOwgmaHhztFhiQ41CjDODdWP0+AE1B3sX4OFlq+GU=
+cloud.google.com/go/security v1.9.0/go.mod h1:6Ta1bO8LXI89nZnmnsZGp9lVoVWXqsVbIq/t9dzI+2Q=
+cloud.google.com/go/security v1.10.0/go.mod h1:QtOMZByJVlibUT2h9afNDWRZ1G96gVywH8T5GUSb9IA=
+cloud.google.com/go/security v1.12.0/go.mod h1:rV6EhrpbNHrrxqlvW0BWAIawFWq3X90SduMJdFwtLB8=
+cloud.google.com/go/securitycenter v1.13.0/go.mod h1:cv5qNAqjY84FCN6Y9z28WlkKXyWsgLO832YiWwkCWcU=
+cloud.google.com/go/securitycenter v1.14.0/go.mod h1:gZLAhtyKv85n52XYWt6RmeBdydyxfPeTrpToDPw4Auc=
+cloud.google.com/go/securitycenter v1.15.0/go.mod h1:PeKJ0t8MoFmmXLXWm41JidyzI3PJjd8sXWaVqg43WWk=
+cloud.google.com/go/securitycenter v1.16.0/go.mod h1:Q9GMaLQFUD+5ZTabrbujNWLtSLZIZF7SAR0wWECrjdk=
+cloud.google.com/go/securitycenter v1.18.1/go.mod h1:0/25gAzCM/9OL9vVx4ChPeM/+DlfGQJDwBy/UC8AKK0=
+cloud.google.com/go/servicecontrol v1.4.0/go.mod h1:o0hUSJ1TXJAmi/7fLJAedOovnujSEvjKCAFNXPQ1RaU=
+cloud.google.com/go/servicecontrol v1.5.0/go.mod h1:qM0CnXHhyqKVuiZnGKrIurvVImCs8gmqWsDoqe9sU1s=
+cloud.google.com/go/servicecontrol v1.11.0/go.mod h1:kFmTzYzTUIuZs0ycVqRHNaNhgR+UMUpw9n02l/pY+mc=
+cloud.google.com/go/servicedirectory v1.4.0/go.mod h1:gH1MUaZCgtP7qQiI+F+A+OpeKF/HQWgtAddhTbhL2bs=
+cloud.google.com/go/servicedirectory v1.5.0/go.mod h1:QMKFL0NUySbpZJ1UZs3oFAmdvVxhhxB6eJ/Vlp73dfg=
+cloud.google.com/go/servicedirectory v1.6.0/go.mod h1:pUlbnWsLH9c13yGkxCmfumWEPjsRs1RlmJ4pqiNjVL4=
+cloud.google.com/go/servicedirectory v1.7.0/go.mod h1:5p/U5oyvgYGYejufvxhgwjL8UVXjkuw7q5XcG10wx1U=
+cloud.google.com/go/servicedirectory v1.8.0/go.mod h1:srXodfhY1GFIPvltunswqXpVxFPpZjf8nkKQT7XcXaY=
+cloud.google.com/go/servicemanagement v1.4.0/go.mod h1:d8t8MDbezI7Z2R1O/wu8oTggo3BI2GKYbdG4y/SJTco=
+cloud.google.com/go/servicemanagement v1.5.0/go.mod h1:XGaCRe57kfqu4+lRxaFEAuqmjzF0r+gWHjWqKqBvKFo=
+cloud.google.com/go/servicemanagement v1.6.0/go.mod h1:aWns7EeeCOtGEX4OvZUWCCJONRZeFKiptqKf1D0l/Jc=
+cloud.google.com/go/serviceusage v1.3.0/go.mod h1:Hya1cozXM4SeSKTAgGXgj97GlqUvF5JaoXacR1JTP/E=
+cloud.google.com/go/serviceusage v1.4.0/go.mod h1:SB4yxXSaYVuUBYUml6qklyONXNLt83U0Rb+CXyhjEeU=
+cloud.google.com/go/serviceusage v1.5.0/go.mod h1:w8U1JvqUqwJNPEOTQjrMHkw3IaIFLoLsPLvsE3xueec=
+cloud.google.com/go/shell v1.3.0/go.mod h1:VZ9HmRjZBsjLGXusm7K5Q5lzzByZmJHf1d0IWHEN5X4=
+cloud.google.com/go/shell v1.4.0/go.mod h1:HDxPzZf3GkDdhExzD/gs8Grqk+dmYcEjGShZgYa9URw=
+cloud.google.com/go/shell v1.6.0/go.mod h1:oHO8QACS90luWgxP3N9iZVuEiSF84zNyLytb+qE2f9A=
+cloud.google.com/go/spanner v1.41.0/go.mod h1:MLYDBJR/dY4Wt7ZaMIQ7rXOTLjYrmxLE/5ve9vFfWos=
+cloud.google.com/go/spanner v1.44.0/go.mod h1:G8XIgYdOK+Fbcpbs7p2fiprDw4CaZX63whnSMLVBxjk=
+cloud.google.com/go/speech v1.6.0/go.mod h1:79tcr4FHCimOp56lwC01xnt/WPJZc4v3gzyT7FoBkCM=
+cloud.google.com/go/speech v1.7.0/go.mod h1:KptqL+BAQIhMsj1kOP2la5DSEEerPDuOP/2mmkhHhZQ=
+cloud.google.com/go/speech v1.8.0/go.mod h1:9bYIl1/tjsAnMgKGHKmBZzXKEkGgtU+MpdDPTE9f7y0=
+cloud.google.com/go/speech v1.9.0/go.mod h1:xQ0jTcmnRFFM2RfX/U+rk6FQNUF6DQlydUSyoooSpco=
+cloud.google.com/go/speech v1.14.1/go.mod h1:gEosVRPJ9waG7zqqnsHpYTOoAS4KouMRLDFMekpJ0J0=
+cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
+cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
+cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
+cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
+cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
+cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
+cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y=
+cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc=
+cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s=
+cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y=
+cloud.google.com/go/storagetransfer v1.5.0/go.mod h1:dxNzUopWy7RQevYFHewchb29POFv3/AaBgnhqzqiK0w=
+cloud.google.com/go/storagetransfer v1.6.0/go.mod h1:y77xm4CQV/ZhFZH75PLEXY0ROiS7Gh6pSKrM8dJyg6I=
+cloud.google.com/go/storagetransfer v1.7.0/go.mod h1:8Giuj1QNb1kfLAiWM1bN6dHzfdlDAVC9rv9abHot2W4=
+cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw=
+cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g=
+cloud.google.com/go/talent v1.3.0/go.mod h1:CmcxwJ/PKfRgd1pBjQgU6W3YBwiewmUzQYH5HHmSCmM=
+cloud.google.com/go/talent v1.4.0/go.mod h1:ezFtAgVuRf8jRsvyE6EwmbTK5LKciD4KVnHuDEFmOOA=
+cloud.google.com/go/talent v1.5.0/go.mod h1:G+ODMj9bsasAEJkQSzO2uHQWXHHXUomArjWQQYkqK6c=
+cloud.google.com/go/texttospeech v1.4.0/go.mod h1:FX8HQHA6sEpJ7rCMSfXuzBcysDAuWusNNNvN9FELDd8=
+cloud.google.com/go/texttospeech v1.5.0/go.mod h1:oKPLhR4n4ZdQqWKURdwxMy0uiTS1xU161C8W57Wkea4=
+cloud.google.com/go/texttospeech v1.6.0/go.mod h1:YmwmFT8pj1aBblQOI3TfKmwibnsfvhIBzPXcW4EBovc=
+cloud.google.com/go/tpu v1.3.0/go.mod h1:aJIManG0o20tfDQlRIej44FcwGGl/cD0oiRyMKG19IQ=
+cloud.google.com/go/tpu v1.4.0/go.mod h1:mjZaX8p0VBgllCzF6wcU2ovUXN9TONFLd7iz227X2Xg=
+cloud.google.com/go/tpu v1.5.0/go.mod h1:8zVo1rYDFuW2l4yZVY0R0fb/v44xLh3llq7RuV61fPM=
+cloud.google.com/go/trace v1.3.0/go.mod h1:FFUE83d9Ca57C+K8rDl/Ih8LwOzWIV1krKgxg6N0G28=
+cloud.google.com/go/trace v1.4.0/go.mod h1:UG0v8UBqzusp+z63o7FK74SdFE+AXpCLdFb1rshXG+Y=
+cloud.google.com/go/trace v1.8.0/go.mod h1:zH7vcsbAhklH8hWFig58HvxcxyQbaIqMarMg9hn5ECA=
+cloud.google.com/go/translate v1.3.0/go.mod h1:gzMUwRjvOqj5i69y/LYLd8RrNQk+hOmIXTi9+nb3Djs=
+cloud.google.com/go/translate v1.4.0/go.mod h1:06Dn/ppvLD6WvA5Rhdp029IX2Mi3Mn7fpMRLPvXT5Wg=
+cloud.google.com/go/translate v1.6.0/go.mod h1:lMGRudH1pu7I3n3PETiOB2507gf3HnfLV8qlkHZEyos=
+cloud.google.com/go/video v1.8.0/go.mod h1:sTzKFc0bUSByE8Yoh8X0mn8bMymItVGPfTuUBUyRgxk=
+cloud.google.com/go/video v1.9.0/go.mod h1:0RhNKFRF5v92f8dQt0yhaHrEuH95m068JYOvLZYnJSw=
+cloud.google.com/go/video v1.13.0/go.mod h1:ulzkYlYgCp15N2AokzKjy7MQ9ejuynOJdf1tR5lGthk=
+cloud.google.com/go/videointelligence v1.6.0/go.mod h1:w0DIDlVRKtwPCn/C4iwZIJdvC69yInhW0cfi+p546uU=
+cloud.google.com/go/videointelligence v1.7.0/go.mod h1:k8pI/1wAhjznARtVT9U1llUaFNPh7muw8QyOUpavru4=
+cloud.google.com/go/videointelligence v1.8.0/go.mod h1:dIcCn4gVDdS7yte/w+koiXn5dWVplOZkE+xwG9FgK+M=
+cloud.google.com/go/videointelligence v1.9.0/go.mod h1:29lVRMPDYHikk3v8EdPSaL8Ku+eMzDljjuvRs105XoU=
+cloud.google.com/go/videointelligence v1.10.0/go.mod h1:LHZngX1liVtUhZvi2uNS0VQuOzNi2TkY1OakiuoUOjU=
+cloud.google.com/go/vision v1.2.0/go.mod h1:SmNwgObm5DpFBme2xpyOyasvBc1aPdjvMk2bBk0tKD0=
+cloud.google.com/go/vision/v2 v2.2.0/go.mod h1:uCdV4PpN1S0jyCyq8sIM42v2Y6zOLkZs+4R9LrGYwFo=
+cloud.google.com/go/vision/v2 v2.3.0/go.mod h1:UO61abBx9QRMFkNBbf1D8B1LXdS2cGiiCRx0vSpZoUo=
+cloud.google.com/go/vision/v2 v2.4.0/go.mod h1:VtI579ll9RpVTrdKdkMzckdnwMyX2JILb+MhPqRbPsY=
+cloud.google.com/go/vision/v2 v2.5.0/go.mod h1:MmaezXOOE+IWa+cS7OhRRLK2cNv1ZL98zhqFFZaaH2E=
+cloud.google.com/go/vision/v2 v2.6.0/go.mod h1:158Hes0MvOS9Z/bDMSFpjwsUrZ5fPrdwuyyvKSGAGMY=
+cloud.google.com/go/vmmigration v1.2.0/go.mod h1:IRf0o7myyWFSmVR1ItrBSFLFD/rJkfDCUTO4vLlJvsE=
+cloud.google.com/go/vmmigration v1.3.0/go.mod h1:oGJ6ZgGPQOFdjHuocGcLqX4lc98YQ7Ygq8YQwHh9A7g=
+cloud.google.com/go/vmmigration v1.5.0/go.mod h1:E4YQ8q7/4W9gobHjQg4JJSgXXSgY21nA5r8swQV+Xxc=
+cloud.google.com/go/vmwareengine v0.1.0/go.mod h1:RsdNEf/8UDvKllXhMz5J40XxDrNJNN4sagiox+OI208=
+cloud.google.com/go/vmwareengine v0.2.2/go.mod h1:sKdctNJxb3KLZkE/6Oui94iw/xs9PRNC2wnNLXsHvH8=
+cloud.google.com/go/vpcaccess v1.4.0/go.mod h1:aQHVbTWDYUR1EbTApSVvMq1EnT57ppDmQzZ3imqIk4w=
+cloud.google.com/go/vpcaccess v1.5.0/go.mod h1:drmg4HLk9NkZpGfCmZ3Tz0Bwnm2+DKqViEpeEpOq0m8=
+cloud.google.com/go/vpcaccess v1.6.0/go.mod h1:wX2ILaNhe7TlVa4vC5xce1bCnqE3AeH27RV31lnmZes=
+cloud.google.com/go/webrisk v1.4.0/go.mod h1:Hn8X6Zr+ziE2aNd8SliSDWpEnSS1u4R9+xXZmFiHmGE=
+cloud.google.com/go/webrisk v1.5.0/go.mod h1:iPG6fr52Tv7sGk0H6qUFzmL3HHZev1htXuWDEEsqMTg=
+cloud.google.com/go/webrisk v1.6.0/go.mod h1:65sW9V9rOosnc9ZY7A7jsy1zoHS5W9IAXv6dGqhMQMc=
+cloud.google.com/go/webrisk v1.7.0/go.mod h1:mVMHgEYH0r337nmt1JyLthzMr6YxwN1aAIEc2fTcq7A=
+cloud.google.com/go/webrisk v1.8.0/go.mod h1:oJPDuamzHXgUc+b8SiHRcVInZQuybnvEW72PqTc7sSg=
+cloud.google.com/go/websecurityscanner v1.3.0/go.mod h1:uImdKm2wyeXQevQJXeh8Uun/Ym1VqworNDlBXQevGMo=
+cloud.google.com/go/websecurityscanner v1.4.0/go.mod h1:ebit/Fp0a+FWu5j4JOmJEV8S8CzdTkAS77oDsiSqYWQ=
+cloud.google.com/go/websecurityscanner v1.5.0/go.mod h1:Y6xdCPy81yi0SQnDY1xdNTNpfY1oAgXUlcfN3B3eSng=
+cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1Vwf+KmJENM0=
+cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M=
+cloud.google.com/go/workflows v1.8.0/go.mod h1:ysGhmEajwZxGn1OhGOGKsTXc5PyxOc0vfKf5Af+to4M=
+cloud.google.com/go/workflows v1.9.0/go.mod h1:ZGkj1aFIOd9c8Gerkjjq7OW7I5+l6cSvT3ujaO/WwSA=
+cloud.google.com/go/workflows v1.10.0/go.mod h1:fZ8LmRmZQWacon9UCX1r/g/DfAXx5VcPALq2CxzdePw=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
+gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
+git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc=
+github.com/Azure/azure-sdk-for-go v65.0.0+incompatible h1:HzKLt3kIwMm4KeJYTdx9EbjRYTySD/t8i1Ee/W5EGXw=
+github.com/Azure/azure-sdk-for-go v65.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
+github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
+github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
+github.com/Azure/go-autorest/autorest v0.11.28 h1:ndAExarwr5Y+GaHE6VCaY1kyS/HwwGGyuimVhWsHOEM=
+github.com/Azure/go-autorest/autorest v0.11.28/go.mod h1:MrkzG3Y3AH668QyF9KRk5neJnGgmhQ6krbhR8Q5eMvA=
+github.com/Azure/go-autorest/autorest/adal v0.9.22 h1:/GblQdIudfEM3AWWZ0mrYJQSd7JS4S/Mbzh6F0ov0Xc=
+github.com/Azure/go-autorest/autorest/adal v0.9.22/go.mod h1:XuAbAEUv2Tta//+voMI038TrJBqjKam0me7qR+L8Cmk=
+github.com/Azure/go-autorest/autorest/date v0.3.0 h1:7gUk1U5M/CQbp9WoqinNzJar+8KY+LPI6wiWrP/myHw=
+github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74=
+github.com/Azure/go-autorest/autorest/to v0.4.0 h1:oXVqrxakqqV1UZdSazDOPOLvOIz+XA683u8EctwboHk=
+github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE=
+github.com/Azure/go-autorest/autorest/validation v0.3.1 h1:AgyqjAd94fwNAoTjl/WQXg4VvFeRFpO+UhNyRXqF1ac=
+github.com/Azure/go-autorest/autorest/validation v0.3.1/go.mod h1:yhLgjC0Wda5DYXl6JAsWyUe4KVNffhoDhG0zVzUMo3E=
+github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+ZtXWSmf4Tg=
+github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
+github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo=
+github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
+github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM=
+github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo=
+github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk=
 github.com/K-Phoen/grabana v0.21.19 h1:tJjRO8nN9JrFjLoQGtOB9P5ILoqENZZGAtt3nK+Ry2Y=
 github.com/K-Phoen/grabana v0.21.19/go.mod h1:B7gxVxacQUgHWmgqduf4WPZoKYHO1mvZnRVCoyQiwdw=
 github.com/K-Phoen/sdk v0.12.3 h1:ScutEQASc9VEKJCm3OjIMD82BIS9B2XtNg3gEf6Gs+M=
 github.com/K-Phoen/sdk v0.12.3/go.mod h1:qmM0wO23CtoDux528MXPpYvS4XkRWkWX6rvX9Za8EVU=
+github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg=
+github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE=
+github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
+github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
+github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9/go.mod h1:JynElWSGnm/4RlzPXRlREEwqTHAN3T56Bv2ITsFT3gY=
+github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19/go.mod h1:T13YZdzov6OU0A1+RfKZiZN9ca6VeKdBdyDV+BY97Tk=
+github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
+github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b/go.mod h1:1KcenG0jGWcpt8ov532z81sp/kMMUG485J2InIOyADM=
+github.com/alecthomas/kingpin/v2 v2.3.1/go.mod h1:oYL5vtsvEHZGHxU7DMp32Dvx+qL+ptGn6lWaot2vCNE=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
+github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc=
+github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
+github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 h1:MzBOUgng9orim59UnfUTLRjMpd09C5uEVQ6RPGeCaVI=
+github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129/go.mod h1:rFgpPQZYZ8vdbc+48xibu8ALc3yeyd64IhHS+PU6Yyg=
+github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
+github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0Ih0vcRo/gZ1M0=
+github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
+github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
+github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
+github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA=
+github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
+github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
+github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
+github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
+github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
+github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
+github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
+github.com/aws/aws-sdk-go v1.44.217 h1:FcWC56MRl+k756aH3qeMQTylSdeJ58WN0iFz3fkyRz0=
+github.com/aws/aws-sdk-go v1.44.217/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
+github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
+github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
+github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
+github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
+github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
+github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee h1:BnPxIde0gjtTnc9Er7cxvBk8DHLWhEux0SxayC8dP6I=
+github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M=
+github.com/c9s/goprocinfo v0.0.0-20210130143923-c95fcf8c64a8 h1:SjZ2GvvOononHOpK84APFuMvxqsk3tEIaKH/z4Rpu3g=
+github.com/c9s/goprocinfo v0.0.0-20210130143923-c95fcf8c64a8/go.mod h1:uEyr4WpAH4hio6LFriaPkL938XnrvLpNPmQHBdrmbIE=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw=
+github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
+github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
+github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
+github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
+github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k=
+github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
+github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
+github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/coreos/go-systemd/v22 v22.4.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
+github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dennwc/varint v1.0.0 h1:kGNFFSSw8ToIy3obO/kKr8U9GZYUAxQEVuix4zfDWzE=
+github.com/dennwc/varint v1.0.0/go.mod h1:hnItb35rvZvJrbTALZtY/iQfDs48JKRG1RPpgziApxA=
+github.com/digitalocean/godo v1.97.0 h1:p9w1yCcWMZcxFSLPToNGXA96WfUVLXqoHti6GzVomL4=
+github.com/digitalocean/godo v1.97.0/go.mod h1:NRpFznZFvhHjBoqZAaOD3khVzsJ3EibzKqFL4R60dmA=
+github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
+github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
+github.com/docker/docker v23.0.1+incompatible h1:vjgvJZxprTTE1A37nm+CLNAdwu6xZekyoiVlUZEINcY=
+github.com/docker/docker v23.0.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
+github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
+github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
+github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
+github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
+github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
+github.com/edsrzf/mmap-go v1.1.0 h1:6EUwBLQ/Mcr1EYLE4Tn1VdW1A4ckqCQWZBw8Hr0kjpQ=
+github.com/edsrzf/mmap-go v1.1.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q=
+github.com/emicklei/go-restful/v3 v3.10.1 h1:rc42Y5YTp7Am7CS630D7JmhRjq4UlEUuEKfrDac4bSQ=
+github.com/emicklei/go-restful/v3 v3.10.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
+github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
+github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
+github.com/envoyproxy/go-control-plane v0.10.3/go.mod h1:fJJn/j26vwOu972OllsvAgJJM//w9BV6Fxbg2LuVd34=
+github.com/envoyproxy/go-control-plane v0.11.0/go.mod h1:VnHyVMpzcLvCFt9yUz1UnCwHLhwx1WguiVDV7pTG/tI=
+github.com/envoyproxy/go-control-plane v0.11.1-0.20230524094728-9239064ad72f h1:7T++XKzy4xg7PKy+bM+Sa9/oe1OC88yz2hXQUISoXfA=
+github.com/envoyproxy/go-control-plane v0.11.1-0.20230524094728-9239064ad72f/go.mod h1:sfYdkwUW4BA3PbKjySwjJy+O4Pu0h62rlqCMHNk+K+Q=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo=
+github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w=
+github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
+github.com/envoyproxy/protoc-gen-validate v0.10.1 h1:c0g45+xCJhdgFGw7a5QAfdS4byAbud7miNWJ1WwEVf8=
+github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
+github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
+github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
+github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
+github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
+github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
+github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0=
+github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
+github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
+github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
+github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
+github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
+github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
+github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8=
+github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk=
+github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g=
+github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks=
+github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY=
+github.com/go-fonts/liberation v0.2.0/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY=
+github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmnUIzUY=
+github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
+github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
+github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod h1:CO1AlKB2CSIqUrmQPqA0gdRIlnLEY0gK5JGjh37zN5U=
+github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81/go.mod h1:SX0U8uGpxhq9o2S/CELCSUxEWWAuoCUcVCQWv7G2OCk=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
+github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=
+github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
+github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
+github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
+github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
+github.com/go-openapi/analysis v0.21.2/go.mod h1:HZwRk4RRisyG8vx2Oe6aqeSQcoxRp47Xkp3+K6q+LdY=
+github.com/go-openapi/analysis v0.21.4 h1:ZDFLvSNxpDaomuCueM0BlSXxpANBlFYiBvr+GXrvIHc=
+github.com/go-openapi/analysis v0.21.4/go.mod h1:4zQ35W4neeZTqh3ol0rv/O8JBbka9QyAgQRPp9y3pfo=
+github.com/go-openapi/errors v0.19.8/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
+github.com/go-openapi/errors v0.19.9/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
+github.com/go-openapi/errors v0.20.2/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
+github.com/go-openapi/errors v0.20.3 h1:rz6kiC84sqNQoqrtulzaL/VERgkoCyB6WdEkc2ujzUc=
+github.com/go-openapi/errors v0.20.3/go.mod h1:Z3FlZ4I8jEGxjUK+bugx3on2mIAk4txuAOhlsB1FSgk=
+github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
+github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
+github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns=
+github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo=
+github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
+github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
+github.com/go-openapi/loads v0.21.1/go.mod h1:/DtAMXXneXFjbQMGEtbamCZb+4x7eGwkvZCvBmwUG+g=
+github.com/go-openapi/loads v0.21.2 h1:r2a/xFIYeZ4Qd2TnGpWDIQNcP80dIaZgf704za8enro=
+github.com/go-openapi/loads v0.21.2/go.mod h1:Jq58Os6SSGz0rzh62ptiu8Z31I+OTHqmULx5e/gJbNw=
+github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I=
+github.com/go-openapi/spec v0.20.6/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
+github.com/go-openapi/spec v0.20.8 h1:ubHmXNY3FCIOinT8RNrrPfGc9t7I1qhPtdOGoG2AxRU=
+github.com/go-openapi/spec v0.20.8/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
+github.com/go-openapi/strfmt v0.21.0/go.mod h1:ZRQ409bWMj+SOgXofQAGTIo2Ebu72Gs+WaRADcS5iNg=
+github.com/go-openapi/strfmt v0.21.1/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k=
+github.com/go-openapi/strfmt v0.21.3 h1:xwhj5X6CjXEZZHMWy1zKJxvW9AfHC9pkyUjLvHtKG7o=
+github.com/go-openapi/strfmt v0.21.3/go.mod h1:k+RzNO0Da+k3FrrynSNN8F7n/peCmQQqbbXjtDfvmGg=
+github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
+github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
+github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=
+github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
+github.com/go-openapi/validate v0.22.1 h1:G+c2ub6q47kfX1sOBLwIQwzBVt8qmOAARyo/9Fqs9NU=
+github.com/go-openapi/validate v0.22.1/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg=
+github.com/go-pdf/fpdf v0.5.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M=
+github.com/go-pdf/fpdf v0.6.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M=
+github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
+github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
+github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
+github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU=
+github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
+github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
+github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho=
+github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
+github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
+github.com/go-playground/validator/v10 v10.11.1 h1:prmOlTVv+YjZjmRmNSF3VmspqJIxJWXmqUsHwfTRRkQ=
+github.com/go-playground/validator/v10 v10.11.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU=
+github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPrFY=
+github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/go-zookeeper/zk v1.0.3 h1:7M2kwOsc//9VeeFiPtf+uSJlVpU66x9Ba5+8XK7/TDg=
+github.com/go-zookeeper/zk v1.0.3/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
+github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0=
+github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY=
+github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg=
+github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
+github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
+github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs=
+github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
+github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
+github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk=
+github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28=
+github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo=
+github.com/gobuffalo/genny v0.1.1/go.mod h1:5TExbEyY48pfunL4QSXxlDOmdsD44RRq4mVZ0Ex28Xk=
+github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw=
+github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360=
+github.com/gobuffalo/gogen v0.1.0/go.mod h1:8NTelM5qd8RZ15VjQTFkAW6qOMx5wBbW4dSCS3BY8gg=
+github.com/gobuffalo/gogen v0.1.1/go.mod h1:y8iBtmHmGc4qa3urIyo1shvOD8JftTtfcKi+71xfDNE=
+github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8=
+github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
+github.com/gobuffalo/mapi v1.0.2/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
+github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
+github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
+github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ=
+github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0=
+github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
+github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
+github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
+github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8=
+github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
+github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo=
+github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
+github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk=
+github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
+github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
+github.com/gogo/googleapis v1.4.0 h1:zgVt4UpGxcqVOw97aRGxT4svlcmdK35fynLNctY32zI=
+github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c=
+github.com/gogo/status v1.0.3/go.mod h1:SavQ51ycCLnc7dGyJxp8YAmudx8xqiVrRf+6IXRsugc=
+github.com/gogo/status v1.1.1 h1:DuHXlSFHNKqTQ+/ACf5Vs6r4X/dH2EgIzR9Vr+H65kg=
+github.com/gogo/status v1.1.1/go.mod h1:jpG3dM5QPcqu19Hg8lkUhBFBa3TcLs1DG7+2Jqci7oU=
+github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
+github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
+github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ=
+github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
+github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
+github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
+github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
+github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
+github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
+github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
+github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0=
+github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
+github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
+github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
+github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
+github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
+github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8=
+github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8=
+github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg=
+github.com/googleapis/enterprise-certificate-proxy v0.2.1/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
+github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
+github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
+github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
+github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM=
+github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM=
+github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM=
+github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c=
+github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo=
+github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY=
+github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=
+github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=
+github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
+github.com/gophercloud/gophercloud v1.2.0 h1:1oXyj4g54KBg/kFtCdMM6jtxSzeIyg8wv4z1HoGPp1E=
+github.com/gophercloud/gophercloud v1.2.0/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM=
+github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
+github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
+github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
+github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gosimple/slug v1.13.1 h1:bQ+kpX9Qa6tHRaK+fZR0A0M2Kd7Pa5eHPPsb1JpHD+Q=
 github.com/gosimple/slug v1.13.1/go.mod h1:UiRaFH+GEilHstLUmcBgWcI42viBN7mAb818JrYOeFQ=
 github.com/gosimple/unidecode v1.0.1 h1:hZzFTMMqSswvf0LBJZCZgThIZrpDHFXux9KeGmn6T/o=
 github.com/gosimple/unidecode v1.0.1/go.mod h1:CP0Cr1Y1kogOtx0bJblKzsVWrqYaqfNOnHzpgWw4Awc=
+github.com/grafana/dskit v0.0.0-20230201083518-528d8a7d52f2 h1:IOks+FXJ6iO/pfbaVEf4efNw+YzYBYNCkCabyrbkFTM=
+github.com/grafana/dskit v0.0.0-20230201083518-528d8a7d52f2/go.mod h1:zj+5BNZAVmQafV583uLTAOzRr963KPdEm4d6NPmtbwg=
+github.com/grafana/loki v1.6.2-0.20231017135925-990ac685e6a6 h1:V5PspEXlSlNh22sMyGkgfSOVVLTsSmhbmsp1VPt8Fdc=
+github.com/grafana/loki v1.6.2-0.20231017135925-990ac685e6a6/go.mod h1:+aWr7OBDuZMT+p0rKmLfW5saO2m3YOGBnt++IlgLhVk=
+github.com/grafana/loki/pkg/push v0.0.0-20230127102416-571f88bc5765 h1:VXitROTlmZtLzvokNe8ZbUKpmwldM4Hy1zdNRO32jKU=
+github.com/grafana/loki/pkg/push v0.0.0-20230127102416-571f88bc5765/go.mod h1:DhJMrd2QInI/1CNtTN43BZuTmkccdizW1jZ+F6aHkhY=
+github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd h1:PpuIBO5P3e9hpqBD0O/HjhShYuM6XE0i/lbE6J94kww=
+github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd/go.mod h1:M5qHK+eWfAv8VR/265dIuEpL3fNfeC21tXXp9itM24A=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w=
+github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw=
+github.com/hashicorp/consul/api v1.20.0 h1:9IHTjNVSZ7MIwjlW3N3a7iGiykCMDpxZu8jsxFJh0yc=
+github.com/hashicorp/consul/api v1.20.0/go.mod h1:nR64eD44KQ59Of/ECwt2vUmIK2DKsDzAwTmwmLl8Wpo=
+github.com/hashicorp/consul/sdk v0.13.1 h1:EygWVWWMczTzXGpO93awkHFzfUka6hLYJ0qhETd+6lY=
+github.com/hashicorp/consul/sdk v0.13.1/go.mod h1:SW/mM4LbKfqmMvcFu8v+eiQQ7oitXEFeiBe9StxERb0=
+github.com/hashicorp/cronexpr v1.1.1 h1:NJZDd87hGXjoZBdvyCF9mX4DCq5Wy7+A/w+A7q0wn6c=
+github.com/hashicorp/cronexpr v1.1.1/go.mod h1:P4wA0KBl9C5q2hABiMO7cp6jcIg96CDh1Efb3g1PWA4=
+github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
+github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
+github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
+github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
+github.com/hashicorp/go-hclog v1.4.0 h1:ctuWFGrhFha8BnnzxqeRGidlEcQkDyL5u8J8t5eA11I=
+github.com/hashicorp/go-hclog v1.4.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
+github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
+github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
+github.com/hashicorp/go-msgpack v0.5.5 h1:i9R9JSrqIz0QVLz3sz+i3YJdT7TTSLcfLLzJi9aZTuI=
+github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
+github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
+github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
+github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
+github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
+github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
+github.com/hashicorp/go-retryablehttp v0.7.2 h1:AcYqCvkpalPnPF2pn0KamgwamS42TqUDDYFRKq/RAd0=
+github.com/hashicorp/go-retryablehttp v0.7.2/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8=
+github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
+github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
+github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
+github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc=
+github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
+github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
+github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
+github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI=
+github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.6.0 h1:uL2shRDx7RTrOrTCUZEGP/wJUFiUI8QT6E7z5o8jga4=
+github.com/hashicorp/golang-lru v0.6.0/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
+github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
+github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc=
+github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR/prTM=
+github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0=
+github.com/hashicorp/nomad/api v0.0.0-20230308192510-48e7d70fcd4b h1:EkuSTU8c/63q4LMayj8ilgg/4I5PXDFVcnqKfs9qcwI=
+github.com/hashicorp/nomad/api v0.0.0-20230308192510-48e7d70fcd4b/go.mod h1:bKUb1ytds5KwUioHdvdq9jmrDqCThv95si0Ub7iNeBg=
+github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY=
+github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4=
+github.com/hetznercloud/hcloud-go v1.41.0 h1:KJGFRRc68QiVu4PrEP5BmCQVveCP2CM26UGQUKGpIUs=
+github.com/hetznercloud/hcloud-go v1.41.0/go.mod h1:NaHg47L6C77mngZhwBG652dTAztYrsZ2/iITJKhQkHA=
+github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
+github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
+github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/ionos-cloud/sdk-go/v6 v6.1.4 h1:BJHhFA8Q1SZC7VOXqKKr2BV2ysQ2/4hlk1e4hZte7GY=
+github.com/ionos-cloud/sdk-go/v6 v6.1.4/go.mod h1:Ox3W0iiEz0GHnfY9e5LmAxwklsxguuNFEUSu0gVRTME=
+github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
+github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
+github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
+github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
+github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
+github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
+github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
+github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
+github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
+github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
+github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
+github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
+github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
+github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
+github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE=
+github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
+github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
+github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
+github.com/klauspost/compress v1.16.3 h1:XuJt9zzcnaz6a16/OU53ZjWp/v7/42WcR5t2a0PcNQY=
+github.com/klauspost/compress v1.16.3/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
+github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
+github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b h1:udzkj9S/zlT5X367kqJis0QP7YMxobob6zhzq6Yre00=
+github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b/go.mod h1:pcaDhQK0/NJZEvtCO0qQPPropqV0sJOJ6YW7X+9kRwM=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
+github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
+github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
+github.com/linode/linodego v1.14.1 h1:uGxQyy0BidoEpLGdvfi4cPgEW+0YUFsEGrLEhcTfjNc=
+github.com/linode/linodego v1.14.1/go.mod h1:NJlzvlNtdMRRkXb0oN6UWzUkj6t+IBsyveHgZ5Ppjyk=
+github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
+github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
+github.com/lyft/protoc-gen-star/v2 v2.0.1/go.mod h1:RcCdONR2ScXaYnQC5tUzxzlpA3WVYF7/opLeUgcQs/o=
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
+github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
+github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
+github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
+github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
+github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
+github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
+github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
+github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
+github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
+github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
+github.com/miekg/dns v1.1.51 h1:0+Xg7vObnhrz/4ZCZcZh7zPXlmU0aveS2HDBd0m0qSo=
+github.com/miekg/dns v1.1.51/go.mod h1:2Z9d3CP1LQWihRZUf29mQ19yDThaI4DAYzte2CaQW5c=
+github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY=
+github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE=
+github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
+github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
+github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
+github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
+github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
+github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
+github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
+github.com/onsi/ginkgo/v2 v2.4.0 h1:+Ig9nvqgS5OBSACXNk15PLdp0U9XPYROt9CFzVdFGIs=
+github.com/onsi/ginkgo/v2 v2.4.0/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkAt4OrFo=
+github.com/onsi/gomega v1.24.0 h1:+0glovB9Jd6z3VR+ScSwQqXVTIfJcGA9UBM8yzQxhqg=
+github.com/onsi/gomega v1.24.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2vQAg=
+github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
+github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
+github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM=
+github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
+github.com/opentracing-contrib/go-grpc v0.0.0-20180928155321-4b5a12d3ff02/go.mod h1:JNdpVEzCpXBgIiv4ds+TzhN1hrtxq6ClLrTlT9OQRSc=
+github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e h1:4cPxUYdgaGzZIT5/j0IfqOrrXmq6bG8AwvwisMXpdrg=
+github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e/go.mod h1:DYR5Eij8rJl8h7gblRrOZ8g0kW1umSpKqYIBTgeDtLo=
+github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9/go.mod h1:PLldrQSroqzH70Xl+1DQcGnefIbqsKR7UDaiux3zV+w=
+github.com/opentracing-contrib/go-stdlib v1.0.0 h1:TBS7YuVotp8myLon4Pv7BtCBzOTo1DeZCld0Z63mW2w=
+github.com/opentracing-contrib/go-stdlib v1.0.0/go.mod h1:qtI1ogk+2JhVPIXVc6q+NHziSmy2W5GbdQZFUHADCBU=
+github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
+github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
+github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
+github.com/ovh/go-ovh v1.3.0 h1:mvZaddk4E4kLcXhzb+cxBsMPYp2pHqiQpWYkInsuZPQ=
+github.com/ovh/go-ovh v1.3.0/go.mod h1:AxitLZ5HBRPyUd+Zl60Ajaag+rNTdVXWIkzfrVuTXWA=
+github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
+github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0=
+github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y=
+github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
+github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU=
+github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek=
+github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2dXMnm1mY=
+github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
+github.com/phpdave11/gofpdi v1.0.13/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
+github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
+github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/common v0.39.0 h1:oOyhkDq05hPZKItWVBkJ6g6AtGxi+fy7F4JvUV8uhsI=
-github.com/prometheus/common v0.39.0/go.mod h1:6XBZ7lYdLCbkAVhwRsWTZn+IN5AB9F/NXd5w0BbEX0Y=
-github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
-github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
+github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
+github.com/prometheus/alertmanager v0.25.0 h1:vbXKUR6PYRiZPRIKfmXaG+dmCKG52RtPL4Btl8hQGvg=
+github.com/prometheus/alertmanager v0.25.0/go.mod h1:MEZ3rFVHqKZsw7IcNS/m4AWZeXThmJhumpiWR4eHU/w=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
+github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
+github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
+github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
+github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ=
+github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y=
+github.com/prometheus/client_golang v1.15.1 h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI=
+github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4=
+github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
+github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
+github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
+github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
+github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
+github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA=
+github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM=
+github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc=
+github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4=
+github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI=
+github.com/prometheus/exporter-toolkit v0.8.2/go.mod h1:00shzmJL7KxcsabLWcONwpyNEuWhREOnFqZW7vadFS0=
+github.com/prometheus/exporter-toolkit v0.9.1 h1:cNkC01riqiOS+kh3zdnNwRsbe/Blh0WwK3ij5rPJ9Sw=
+github.com/prometheus/exporter-toolkit v0.9.1/go.mod h1:iFlTmFISCix0vyuyBmm0UqOUCTao9+RsAsKJP3YM9ec=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
+github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
+github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
+github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
+github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
+github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI=
+github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY=
+github.com/prometheus/prometheus v0.43.1-0.20230327151049-211ae4f1f0a2 h1:i5hmbBzR+VeL5pPl1ZncsJ1bpg3SO66bwkE1msJBsMA=
+github.com/prometheus/prometheus v0.43.1-0.20230327151049-211ae4f1f0a2/go.mod h1:Mm42Acga98xgA+u5yTaC3ki3i0rJEJWFpbdHN7q2trk=
+github.com/pyroscope-io/client v0.6.0 h1:rcUFgcnfmuyVYDYT+4d0zfqc8YedOyruHSsUb9ImaBw=
+github.com/pyroscope-io/client v0.6.0/go.mod h1:4h21iOU4pUOq0prKyDlvYRL+SCKsBc5wKiEtV+rJGqU=
+github.com/pyroscope-io/godeltaprof v0.1.2 h1:MdlEmYELd5w+lvIzmZvXGNMVzW2Qc9jDMuJaPOR75g4=
+github.com/pyroscope-io/godeltaprof v0.1.2/go.mod h1:psMITXp90+8pFenXkKIpNhrfmI9saQnPbba27VIaiQE=
+github.com/regen-network/protobuf v1.3.3-alpha.regen.1 h1:OHEc+q5iIAXpqiqFKeLpu5NwTIkVXUs48vFMwzqpqY4=
+github.com/regen-network/protobuf v1.3.3-alpha.regen.1/go.mod h1:2DjTFR1HhMQhiWC5sZ4OhQ3+NtdbZ6oBDKQwq5Ou+FI=
+github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
+github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
+github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
+github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/rs/zerolog v1.29.0 h1:Zes4hju04hjbvkVkOhdl2HpZa+0PmVwigmo8XoORE5w=
+github.com/rs/zerolog v1.29.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0=
+github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w=
+github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245/go.mod h1:pQAZKsJ8yyVxGRWYNEm9oFB8ieLgKFnamEyDmSA0BRk=
+github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
+github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.14 h1:yFl3jyaSVLNYXlnNYM5z2pagEk1dYQhfr1p20T1NyKY=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.14/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
+github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
+github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
+github.com/sercand/kuberesolver/v5 v5.1.1 h1:CYH+d67G0sGBj7q5wLK61yzqJJ8gLLC8aeprPTHb6yY=
+github.com/sercand/kuberesolver/v5 v5.1.1/go.mod h1:Fs1KbKhVRnB2aDWN12NjKCB+RgYMWZJ294T3BtmVCpQ=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
+github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
+github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/smartcontractkit/wasp v0.3.6 h1:1TLWfrTzqZwNvyyoKzPZ8FLQat2lNz640eM+mMh2YxM=
+github.com/smartcontractkit/wasp v0.3.6/go.mod h1:L/cyUGfpaWxy/2twOVJLRt2mySJEIqGrFj9nyvRLpSo=
+github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
+github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
+github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
+github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
+github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
+github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
+github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
+github.com/uber/jaeger-client-go v2.28.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
+github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o=
+github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
+github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
+github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg=
+github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
+github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
+github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
+github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
+github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0=
+github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
+github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs=
+github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI=
+github.com/weaveworks/common v0.0.0-20230411130259-f7d83a041205 h1:gjb7t9LCnRu14LHubyLIgrE+EYlAaREiPn/VknV7R3s=
+github.com/weaveworks/common v0.0.0-20230411130259-f7d83a041205/go.mod h1:O9wmSPNVSuqxzUZPFlHnPQ8xnyvx0qBnKGFfGbj95uY=
+github.com/weaveworks/promrus v1.2.0 h1:jOLf6pe6/vss4qGHjXmGz4oDJQA+AOCqEL3FvvZGz7M=
+github.com/weaveworks/promrus v1.2.0/go.mod h1:SaE82+OJ91yqjrE1rsvBWVzNZKcHYFtMUyS1+Ogs/KA=
+github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
+github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs=
+github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g=
+github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
+github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
+github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
+github.com/xhit/go-str2duration v1.2.0/go.mod h1:3cPSlfZlUHVlneIVfePFWcJZsuwf+P1v2SRTV4cUmp4=
+github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
+github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
+github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
+go.etcd.io/etcd/api/v3 v3.5.7 h1:sbcmosSVesNrWOJ58ZQFitHMdncusIifYcrBfwrlJSY=
+go.etcd.io/etcd/api/v3 v3.5.7/go.mod h1:9qew1gCdDDLu+VwmeG+iFpL+QlpHTo7iubavdVDgCAA=
+go.etcd.io/etcd/client/pkg/v3 v3.5.7 h1:y3kf5Gbp4e4q7egZdn5T7W9TSHUvkClN6u+Rq9mEOmg=
+go.etcd.io/etcd/client/pkg/v3 v3.5.7/go.mod h1:o0Abi1MK86iad3YrWhgUsbGx1pmTS+hrORWc2CamuhY=
+go.etcd.io/etcd/client/v3 v3.5.7 h1:u/OhpiuCgYY8awOHlhIhmGIGpxfBU/GZBUP3m/3/Iz4=
+go.etcd.io/etcd/client/v3 v3.5.7/go.mod h1:sOWmj9DZUMyAngS7QQwCyAXXAL6WhgTOPLNS/NabQgw=
+go.mongodb.org/mongo-driver v1.7.3/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R79oO62zWg=
+go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng=
+go.mongodb.org/mongo-driver v1.10.0/go.mod h1:wsihk0Kdgv8Kqu1Anit4sfK+22vSFbUrAVEYRhCXrA8=
+go.mongodb.org/mongo-driver v1.11.2 h1:+1v2rDQUWNcGW7/7E0Jvdz51V38XXxJfhzbV17aNHCw=
+go.mongodb.org/mongo-driver v1.11.2/go.mod h1:s7p5vEtfbeR1gYi6pnj3c3/urpbLv2T5Sfd6Rp2HBB8=
+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
+go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
+go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
+go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
+go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0 h1:lE9EJyw3/JhrjWH/hEy9FptnalDQgj7vpbgC2KCCCxE=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0/go.mod h1:pcQ3MM3SWvrA71U4GDqv9UFDJ3HQsW7y5ZO3tDTlUdI=
+go.opentelemetry.io/otel v1.14.0 h1:/79Huy8wbf5DnIPhemGB+zEPVwnN6fuQybr/SRXa6hM=
+go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU=
+go.opentelemetry.io/otel/metric v0.37.0 h1:pHDQuLQOZwYD+Km0eb657A25NaRzy0a+eLyKfDXedEs=
+go.opentelemetry.io/otel/metric v0.37.0/go.mod h1:DmdaHfGt54iV6UKxsV9slj2bBRJcKC1B1uvDLIioc1s=
+go.opentelemetry.io/otel/trace v1.14.0 h1:wp2Mmvj41tDsyAJXiWDWpfNsOiIyd38fy85pyKcFq/M=
+go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8=
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
+go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
+go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
+go.uber.org/atomic v1.5.1/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
+go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
+go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
+go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
+go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
+go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
+go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
+go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI=
+go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ=
+go.uber.org/ratelimit v0.2.0 h1:UQE2Bgi7p2B85uP5dC2bbRtig0C+OeNRnNEafLjsLPA=
+go.uber.org/ratelimit v0.2.0/go.mod h1:YYBV4e4naJvhpitQrWJu1vCpgB7CboMe0qhltKt6mUg=
+go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8=
+go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20221012134737-56aed061732a/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
+golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
+golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
+golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3/go.mod h1:NOZ3BPKG0ec/BKJQgnvsSFpcKLM5xXVWnvZS97DWHgE=
+golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
+golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
+golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
+golang.org/x/exp v0.0.0-20230307190834-24139beb5833 h1:SChBja7BCQewoTAU7IgvucQKMIXrEpFxNMs0spT3/5s=
+golang.org/x/exp v0.0.0-20230307190834-24139beb5833/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
+golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/image v0.0.0-20200119044424-58c23975cae1/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/image v0.0.0-20210216034530-4410531fe030/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/image v0.0.0-20210607152325-775e3b0c77b9/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
+golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
+golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
+golang.org/x/image v0.0.0-20220302094943-723b81ca9867/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
+golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
+golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
+golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190921015927-1a5e07d1ff72/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
+golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM=
+golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
+golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
+golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
+golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
+golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
+golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
+golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE=
+golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE=
+golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec=
+golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I=
+golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw=
+golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g=
+golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210304124612-50617c2ba197/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
+golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
+golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
+golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
+golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
+golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
+golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190927191325-030b2cf1153e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
+golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
+golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
+golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
+golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
+golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
+golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
+gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
+gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0=
+gonum.org/v1/gonum v0.9.3/go.mod h1:TZumC3NeyVQskjXqmyWt4S3bINhy7B4eYwW69EbyX+0=
+gonum.org/v1/gonum v0.11.0/go.mod h1:fSG4YDCxxUZQJ7rKsQrj0gMOg00Il0Z96/qMA4bVQhA=
+gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
+gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc=
+gonum.org/v1/plot v0.9.0/go.mod h1:3Pcqqmp6RHvJI72kgb8fThyUnav364FOsdDo2aGW5lY=
+gonum.org/v1/plot v0.10.1/go.mod h1:VZW5OlhkL1mysU9vaqNHnsy86inf6Ot+jB3r+BczCEo=
+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
+google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
+google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
+google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
+google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
+google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
+google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
+google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU=
+google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94=
+google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo=
+google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4=
+google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw=
+google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU=
+google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k=
+google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
+google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
+google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI=
+google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I=
+google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo=
+google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g=
+google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA=
+google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8=
+google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs=
+google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA=
+google.golang.org/api v0.77.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA=
+google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw=
+google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg=
+google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o=
+google.golang.org/api v0.85.0/go.mod h1:AqZf8Ep9uZ2pyTvgL+x0D3Zt0eoT9b5E8fmzfu6FO2g=
+google.golang.org/api v0.90.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw=
+google.golang.org/api v0.93.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw=
+google.golang.org/api v0.95.0/go.mod h1:eADj+UBuxkh5zlrSntJghuNeg8HwQ1w5lTKkuqaETEI=
+google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s=
+google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s=
+google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s=
+google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
+google.golang.org/api v0.102.0/go.mod h1:3VFl6/fzoA+qNuS1N1/VfXY4LjoXN/wzeIp7TweWwGo=
+google.golang.org/api v0.103.0/go.mod h1:hGtW6nK1AC+d9si/UBhw8Xli+QMOf6xyNAyJw4qU9w0=
+google.golang.org/api v0.106.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY=
+google.golang.org/api v0.107.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY=
+google.golang.org/api v0.108.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY=
+google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
+google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
+google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
+google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
+google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200324203455-a04cca1dde73/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
+google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210329143202-679c6ae281ee/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
+google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
+google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A=
+google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
+google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
+google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
+google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
+google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
+google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
+google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
+google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
+google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w=
+google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
+google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
+google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
+google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
+google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E=
+google.golang.org/genproto v0.0.0-20220329172620-7be39ac1afc7/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
+google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
+google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
+google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
+google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
+google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
+google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
+google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
+google.golang.org/genproto v0.0.0-20220518221133-4f43b3371335/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
+google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
+google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
+google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
+google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
+google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
+google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
+google.golang.org/genproto v0.0.0-20220722212130-b98a9ff5e252/go.mod h1:GkXuJDJ6aQ7lnJcRF+SJVgFdQhypqgl3LB1C9vabdRE=
+google.golang.org/genproto v0.0.0-20220801145646-83ce21fca29f/go.mod h1:iHe1svFLAZg9VWz891+QbRMwUv9O/1Ww+/mngYeThbc=
+google.golang.org/genproto v0.0.0-20220815135757-37a418bb8959/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
+google.golang.org/genproto v0.0.0-20220817144833-d7fd3f11b9b1/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
+google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
+google.golang.org/genproto v0.0.0-20220829144015-23454907ede3/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
+google.golang.org/genproto v0.0.0-20220829175752-36a9c930ecbf/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
+google.golang.org/genproto v0.0.0-20220913154956-18f8339a66a5/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
+google.golang.org/genproto v0.0.0-20220914142337-ca0e39ece12f/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
+google.golang.org/genproto v0.0.0-20220915135415-7fd63a7952de/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
+google.golang.org/genproto v0.0.0-20220916172020-2692e8806bfa/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
+google.golang.org/genproto v0.0.0-20220919141832-68c03719ef51/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
+google.golang.org/genproto v0.0.0-20220920201722-2b89144ce006/go.mod h1:ht8XFiar2npT/g4vkk7O0WYS1sHOHbdujxbEp7CJWbw=
+google.golang.org/genproto v0.0.0-20220926165614-551eb538f295/go.mod h1:woMGP53BroOrRY3xTxlbr8Y3eB/nzAvvFM83q7kG2OI=
+google.golang.org/genproto v0.0.0-20220926220553-6981cbe3cfce/go.mod h1:woMGP53BroOrRY3xTxlbr8Y3eB/nzAvvFM83q7kG2OI=
+google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM=
+google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM=
+google.golang.org/genproto v0.0.0-20221024153911-1573dae28c9c/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s=
+google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
+google.golang.org/genproto v0.0.0-20221109142239-94d6d90a7d66/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
+google.golang.org/genproto v0.0.0-20221114212237-e4508ebdbee1/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
+google.golang.org/genproto v0.0.0-20221117204609-8f9c96812029/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
+google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
+google.golang.org/genproto v0.0.0-20221201164419-0e50fba7f41c/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
+google.golang.org/genproto v0.0.0-20221201204527-e3fa12d562f3/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
+google.golang.org/genproto v0.0.0-20221202195650-67e5cbc046fd/go.mod h1:cTsE614GARnxrLsqKREzmNYJACSWWpAWdNMwnD7c2BE=
+google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
+google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
+google.golang.org/genproto v0.0.0-20230112194545-e10362b5ecf9/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
+google.golang.org/genproto v0.0.0-20230113154510-dbe35b8444a5/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
+google.golang.org/genproto v0.0.0-20230123190316-2c411cf9d197/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
+google.golang.org/genproto v0.0.0-20230124163310-31e0e69b6fc2/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
+google.golang.org/genproto v0.0.0-20230125152338-dcaf20b6aeaa/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
+google.golang.org/genproto v0.0.0-20230127162408-596548ed4efa/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
+google.golang.org/genproto v0.0.0-20230209215440-0dfe4f8abfcc/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
+google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44/go.mod h1:8B0gmkoRebU8ukX6HP+4wrVQUY1+6PkQ44BSyIlflHA=
+google.golang.org/genproto v0.0.0-20230222225845-10f96fb3dbec/go.mod h1:3Dl5ZL0q0isWJt+FVcfpQyirqemEuLAK/iFvg1UP1Hw=
+google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s=
+google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 h1:9NWlQfY2ePejTmfwUH1OWwmznFa+0kKcHGPDvcPza9M=
+google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54/go.mod h1:zqTuNwFlFRsw5zIts5VnzLQxSRqh+CGOTVMlYbY0Eyk=
+google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 h1:m8v1xLLLzMe1m5P+gCTF8nJB9epwZQUBERm20Oy1poQ=
+google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 h1:0nDDozoAU19Qb2HwhXadU8OcsiO/09cnTqhUtq2MEOM=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA=
+google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
+google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
+google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
+google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
+google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
+google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
+google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
+google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
+google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
+google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
+google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
+google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
+google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
+google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
+google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
+google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww=
+google.golang.org/grpc v1.52.0/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY=
+google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw=
+google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8=
+google.golang.org/grpc v1.57.2 h1:uw37EN34aMFFXB2QPW7Tq6tdTbind1GpRxw5aOX3a5k=
+google.golang.org/grpc v1.57.2/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo=
+google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
+gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
+gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las=
+k8s.io/api v0.26.2 h1:dM3cinp3PGB6asOySalOZxEG4CZ0IAdJsrYZXE/ovGQ=
+k8s.io/api v0.26.2/go.mod h1:1kjMQsFE+QHPfskEcVNgL3+Hp88B80uj0QtSOlj8itU=
+k8s.io/apimachinery v0.26.2 h1:da1u3D5wfR5u2RpLhE/ZtZS2P7QvDgLZTi9wrNZl/tQ=
+k8s.io/apimachinery v0.26.2/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I=
+k8s.io/client-go v0.26.2 h1:s1WkVujHX3kTp4Zn4yGNFK+dlDXy1bAAkIl+cFAiuYI=
+k8s.io/client-go v0.26.2/go.mod h1:u5EjOuSyBa09yqqyY7m3abZeovO/7D/WehVVlZ2qcqU=
+k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
+k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
+k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d h1:VcFq5n7wCJB2FQMCIHfC+f+jNcGgNMar1uKd6rVlifU=
+k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
+k8s.io/utils v0.0.0-20230308161112-d77c459e9343 h1:m7tbIjXGcGIAtpmQr7/NAi7RsWoW3E7Zcm4jI1HicTc=
+k8s.io/utils v0.0.0-20230308161112-d77c459e9343/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
+lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
+modernc.org/cc/v3 v3.36.0/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI=
+modernc.org/cc/v3 v3.36.2/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI=
+modernc.org/cc/v3 v3.36.3/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI=
+modernc.org/ccgo/v3 v3.0.0-20220428102840-41399a37e894/go.mod h1:eI31LL8EwEBKPpNpA4bU1/i+sKOwOrQy8D87zWUcRZc=
+modernc.org/ccgo/v3 v3.0.0-20220430103911-bc99d88307be/go.mod h1:bwdAnOoaIt8Ax9YdWGjxWsdkPcZyRPHqrOvJxaKAKGw=
+modernc.org/ccgo/v3 v3.16.4/go.mod h1:tGtX0gE9Jn7hdZFeU88slbTh1UtCYKusWOoCJuvkWsQ=
+modernc.org/ccgo/v3 v3.16.6/go.mod h1:tGtX0gE9Jn7hdZFeU88slbTh1UtCYKusWOoCJuvkWsQ=
+modernc.org/ccgo/v3 v3.16.8/go.mod h1:zNjwkizS+fIFDrDjIAgBSCLkWbJuHF+ar3QRn+Z9aws=
+modernc.org/ccgo/v3 v3.16.9/go.mod h1:zNMzC9A9xeNUepy6KuZBbugn3c0Mc9TeiJO4lgvkJDo=
+modernc.org/ccorpus v1.11.6/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ=
+modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM=
+modernc.org/libc v0.0.0-20220428101251-2d5f3daf273b/go.mod h1:p7Mg4+koNjc8jkqwcoFBJx7tXkpj00G77X7A72jXPXA=
+modernc.org/libc v1.16.0/go.mod h1:N4LD6DBE9cf+Dzf9buBlzVJndKr/iJHG97vGLHYnb5A=
+modernc.org/libc v1.16.1/go.mod h1:JjJE0eu4yeK7tab2n4S1w8tlWd9MxXLRzheaRnAKymU=
+modernc.org/libc v1.16.17/go.mod h1:hYIV5VZczAmGZAnG15Vdngn5HSF5cSkbvfz2B7GRuVU=
+modernc.org/libc v1.16.19/go.mod h1:p7Mg4+koNjc8jkqwcoFBJx7tXkpj00G77X7A72jXPXA=
+modernc.org/libc v1.17.0/go.mod h1:XsgLldpP4aWlPlsjqKRdHPqCxCjISdHfM/yeWC5GyW0=
+modernc.org/libc v1.17.1/go.mod h1:FZ23b+8LjxZs7XtFMbSzL/EhPxNbfZbErxEHc7cbD9s=
+modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
+modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
+modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
+modernc.org/memory v1.1.1/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw=
+modernc.org/memory v1.2.0/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw=
+modernc.org/memory v1.2.1/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
+modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
+modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
+modernc.org/sqlite v1.18.1/go.mod h1:6ho+Gow7oX5V+OiOQ6Tr4xeqbx13UZ6t+Fw9IRUG4d4=
+modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw=
+modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw=
+modernc.org/tcl v1.13.1/go.mod h1:XOLfOwzhkljL4itZkK6T72ckMgvj0BDsnKNdZVUOecw=
+modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
+modernc.org/z v1.5.1/go.mod h1:eWFB510QWW5Th9YGZT81s+LwvaAs3Q2yr4sP0rmLkv8=
+nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g=
+nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
+rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
+rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
+rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
+rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
+sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
+sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
+sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
+sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
+sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
+sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
diff --git a/charts/chainlink-cluster/templates/chainlink-cm.yaml b/charts/chainlink-cluster/templates/chainlink-cm.yaml
index 736a3322048..b33e29df4b5 100644
--- a/charts/chainlink-cluster/templates/chainlink-cm.yaml
+++ b/charts/chainlink-cluster/templates/chainlink-cm.yaml
@@ -26,15 +26,25 @@ data:
     AllowOrigins = '*'
     SecureCookies = false
     SessionTimeout = '999h0m0s'
+    [Feature]
+    FeedsManager = true
+    LogPoller = true
+    UICSAKeys = true
     [OCR]
     Enabled = true
+    DefaultTransactionQueueDepth = 0
     [P2P]
     [P2P.V2]
     Enabled = true
-    ListenAddresses = ["0.0.0.0:6690"]
+    ListenAddresses = ['0.0.0.0:6690']
+    AnnounceAddresses = ['0.0.0.0:6690']
+    DeltaDial = '500ms'
+    DeltaReconcile = '5s'
     [[EVM]]
     ChainID = '1337'
     MinContractPayment = '0'
+    AutoCreateKey = true
+    FinalityDepth = 1
     [[EVM.Nodes]]
     Name = 'node-0'
     WSURL = 'ws://geth:8546'
diff --git a/charts/chainlink-cluster/templates/chainlink-service.yaml b/charts/chainlink-cluster/templates/chainlink-service.yaml
index 24c96c909ea..7a3b70efb4f 100644
--- a/charts/chainlink-cluster/templates/chainlink-service.yaml
+++ b/charts/chainlink-cluster/templates/chainlink-service.yaml
@@ -12,7 +12,7 @@ spec:
       port: {{ $.Values.chainlink.p2p_port }}
       targetPort: {{ $.Values.chainlink.p2p_port }}
   selector:
-    app: {{ $.Release.Name }}
+    instance: {{ $cfg.name }}
   type: ClusterIP
 ---
 {{- end }}
\ No newline at end of file
diff --git a/charts/chainlink-cluster/templates/mockserver-service.yaml b/charts/chainlink-cluster/templates/mockserver-service.yaml
new file mode 100644
index 00000000000..f8ab78a84b5
--- /dev/null
+++ b/charts/chainlink-cluster/templates/mockserver-service.yaml
@@ -0,0 +1,14 @@
+{{ if (hasKey .Values "mockserver") }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Release.Name }}-mockserver
+spec:
+  selector:
+    app: {{ .Release.Name }}-mockserver
+  ports:
+    - name: serviceport
+      port: {{ default "1080" $.Values.mockserver.port}}
+      targetPort: serviceport
+  type: ClusterIP
+{{ end }}
\ No newline at end of file
diff --git a/charts/chainlink-cluster/templates/mockserver.yaml b/charts/chainlink-cluster/templates/mockserver.yaml
index 96f9582435f..14c05d0acd5 100755
--- a/charts/chainlink-cluster/templates/mockserver.yaml
+++ b/charts/chainlink-cluster/templates/mockserver.yaml
@@ -1,3 +1,4 @@
+{{ if (hasKey .Values "mockserver") }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -5,7 +6,6 @@ metadata:
   labels:
     app: {{ .Release.Name }}-mockserver
 spec:
-  replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
       app: {{ .Release.Name }}-mockserver
@@ -57,4 +57,5 @@ spec:
       tolerations:
   {{ toYaml . | indent 8 }}
   {{- end }}
+{{- end }}
 ---
\ No newline at end of file
diff --git a/charts/chainlink-cluster/values-raw-helm.yaml b/charts/chainlink-cluster/values-raw-helm.yaml
index 006515f0a33..726a5347119 100644
--- a/charts/chainlink-cluster/values-raw-helm.yaml
+++ b/charts/chainlink-cluster/values-raw-helm.yaml
@@ -11,7 +11,7 @@
 #   version: stable
 chainlink:
   web_port: 6688
-  p2p_port: 8090
+  p2p_port: 6690
   nodes:
     - name: node-1
       image: "public.ecr.aws/chainlink/chainlink:latest"
@@ -45,9 +45,13 @@ chainlink:
 #        HTTPURL = 'http://geth:8544'
 #        [WebServer.TLS]
 #        HTTPSPort = 0
+# or use overridesToml to override some part of configuration
+#      overridesToml: |
     - name: node-2
     - name: node-3
     - name: node-4
+    - name: node-5
+    - name: node-6
   resources:
     requests:
       cpu: 350m
@@ -106,6 +110,19 @@ runner:
     limits:
       cpu: 1
       memory: 512Mi
+  affinity: { }
+  tolerations: [ ]
+  nodeSelector: { }
+  ingress:
+    enabled: false
+    className: ""
+    hosts: [ ]
+    tls: [ ]
+    annotations: { }
+  service:
+    type: NodePort
+    port: 8080
+
 
 # monitoring.coreos.com/v1 PodMonitor for each node
 prometheusMonitor: false
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index 5f250af6fa8..e801e25de5f 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -36,6 +36,7 @@ require (
 	github.com/testcontainers/testcontainers-go v0.23.0
 	github.com/umbracle/ethgo v0.1.3
 	go.dedis.ch/kyber/v3 v3.1.0
+	go.uber.org/ratelimit v0.2.0
 	go.uber.org/zap v1.26.0
 	golang.org/x/sync v0.5.0
 	gopkg.in/guregu/null.v4 v4.0.0
@@ -452,7 +453,6 @@ require (
 	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/goleak v1.3.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	go.uber.org/ratelimit v0.2.0 // indirect
 	golang.org/x/arch v0.4.0 // indirect
 	golang.org/x/crypto v0.15.0 // indirect
 	golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect
diff --git a/integration-tests/k8s/connect.go b/integration-tests/k8s/connect.go
new file mode 100644
index 00000000000..34eafc42e24
--- /dev/null
+++ b/integration-tests/k8s/connect.go
@@ -0,0 +1,103 @@
+package k8s
+
+import (
+	"fmt"
+	"os"
+	"time"
+
+	"github.com/pelletier/go-toml/v2"
+	"github.com/rs/zerolog"
+	"github.com/rs/zerolog/log"
+
+	"github.com/smartcontractkit/chainlink-testing-framework/blockchain"
+	client2 "github.com/smartcontractkit/chainlink-testing-framework/client"
+	"github.com/smartcontractkit/chainlink/integration-tests/client"
+	"github.com/smartcontractkit/chainlink/integration-tests/contracts"
+)
+
+const (
+	DefaultConfigFilePath        = "../../../charts/chainlink-cluster/connect.toml"
+	ErrReadConnectionConfig      = "failed to read TOML environment connection config"
+	ErrUnmarshalConnectionConfig = "failed to unmarshal TOML environment connection config"
+)
+
+type ConnectionVars struct {
+	Namespace                       string `toml:"namespace"`
+	NetworkName                     string `toml:"network_name"`
+	NetworkChainID                  int64  `toml:"network_chain_id"`
+	NetworkPrivateKey               string `toml:"network_private_key"`
+	NetworkWSURL                    string `toml:"network_ws_url"`
+	NetworkHTTPURL                  string `toml:"network_http_url"`
+	CLNodesNum                      int    `toml:"cl_nodes_num"`
+	CLNodeURLTemplate               string `toml:"cl_node_url_template"`
+	CLNodeInternalDNSRecordTemplate string `toml:"cl_node_internal_dns_record_template"`
+	CLNodeUser                      string `toml:"cl_node_user"`
+	CLNodePassword                  string `toml:"cl_node_password"`
+	MockServerURL                   string `toml:"mockserver_url"`
+}
+
+// ConnectRemote connects to a local environment, see charts/chainlink-cluster
+func ConnectRemote(l zerolog.Logger) (blockchain.EVMClient, *client2.MockserverClient, contracts.ContractDeployer, *client.ChainlinkK8sClient, []*client.ChainlinkK8sClient, error) {
+	cfg, err := ReadConfig()
+	if err != nil {
+		return nil, nil, nil, nil, nil, err
+	}
+	net := &blockchain.EVMNetwork{
+		Name:                 cfg.NetworkName,
+		Simulated:            true,
+		SupportsEIP1559:      true,
+		ClientImplementation: blockchain.EthereumClientImplementation,
+		ChainID:              1337,
+		PrivateKeys: []string{
+			cfg.NetworkPrivateKey,
+		},
+		URLs:                      []string{cfg.NetworkWSURL},
+		HTTPURLs:                  []string{cfg.NetworkHTTPURL},
+		ChainlinkTransactionLimit: 500000,
+		Timeout:                   blockchain.JSONStrDuration{Duration: 2 * time.Minute},
+		MinimumConfirmations:      1,
+		GasEstimationBuffer:       10000,
+	}
+	cc, err := blockchain.NewEVMClientFromNetwork(*net, l)
+	if err != nil {
+		return nil, nil, nil, nil, nil, err
+	}
+	cd, err := contracts.NewContractDeployer(cc, l)
+	if err != nil {
+		return nil, nil, nil, nil, nil, err
+	}
+	clClients := make([]*client.ChainlinkK8sClient, 0)
+	for i := 1; i <= cfg.CLNodesNum; i++ {
+		c, err := client.NewChainlinkK8sClient(&client.ChainlinkConfig{
+			URL:        fmt.Sprintf(cfg.CLNodeURLTemplate, i),
+			Email:      cfg.CLNodeUser,
+			InternalIP: fmt.Sprintf(cfg.CLNodeInternalDNSRecordTemplate, i),
+			Password:   cfg.CLNodePassword,
+		}, fmt.Sprintf(cfg.CLNodeInternalDNSRecordTemplate, i), cfg.Namespace)
+		if err != nil {
+			return nil, nil, nil, nil, nil, err
+		}
+		clClients = append(clClients, c)
+	}
+	msClient := client2.NewMockserverClient(&client2.MockserverConfig{
+		LocalURL:   cfg.MockServerURL,
+		ClusterURL: cfg.MockServerURL,
+	})
+	return cc, msClient, cd, clClients[0], clClients[1:], nil
+}
+
+func ReadConfig() (*ConnectionVars, error) {
+	var cfg *ConnectionVars
+	var d []byte
+	var err error
+	d, err = os.ReadFile(DefaultConfigFilePath)
+	if err != nil {
+		return nil, fmt.Errorf("%s, err: %w", ErrReadConnectionConfig, err)
+	}
+	err = toml.Unmarshal(d, &cfg)
+	if err != nil {
+		return nil, fmt.Errorf("%s, err: %w", ErrUnmarshalConnectionConfig, err)
+	}
+	log.Info().Interface("Config", cfg).Msg("Connecting to environment from config")
+	return cfg, nil
+}
diff --git a/integration-tests/load/ocr/README.md b/integration-tests/load/ocr/README.md
new file mode 100644
index 00000000000..20446992dc2
--- /dev/null
+++ b/integration-tests/load/ocr/README.md
@@ -0,0 +1,28 @@
+### OCR Load tests
+
+## Setup
+These tests can connect to any cluster create with [chainlink-cluster](../../../charts/chainlink-cluster/README.md)
+
+Create your cluster
+```
+kubectl create ns my-cluster
+devspace use namespace my-cluster
+devspace deploy
+sudo kubefwd svc -n my-cluster
+```
+
+Change environment connection configuration [here](connection.toml)
+
+If you haven't changed anything in [devspace.yaml](../../../charts/chainlink-cluster/devspace.yaml) then default connection configuration will work
+
+## Usage
+
+```
+export LOKI_TOKEN=...
+export LOKI_URL=...
+
+go test -v -run TestOCRLoad
+go test -v -run TestOCRVolume
+```
+
+Check test configuration [here](config.toml)
\ No newline at end of file
diff --git a/integration-tests/load/ocr/config.go b/integration-tests/load/ocr/config.go
new file mode 100644
index 00000000000..2991df3774a
--- /dev/null
+++ b/integration-tests/load/ocr/config.go
@@ -0,0 +1,72 @@
+package ocr
+
+import (
+	"encoding/base64"
+	"fmt"
+	"os"
+
+	"github.com/pelletier/go-toml/v2"
+	"github.com/rs/zerolog/log"
+
+	"github.com/smartcontractkit/chainlink/v2/core/store/models"
+)
+
+const (
+	DefaultConfigFilename  = "config.toml"
+	ErrReadPerfConfig      = "failed to read TOML config for performance tests"
+	ErrUnmarshalPerfConfig = "failed to unmarshal TOML config for performance tests"
+)
+
+type PerformanceConfig struct {
+	Load   *Load   `toml:"Load"`
+	Volume *Volume `toml:"Volume"`
+	Common *Common `toml:"Common"`
+}
+
+type Common struct {
+	ETHFunds int `toml:"eth_funds"`
+}
+
+type Load struct {
+	TestDuration          *models.Duration `toml:"test_duration"`
+	Rate                  int64            `toml:"rate"`
+	RateLimitUnitDuration *models.Duration `toml:"rate_limit_unit_duration"`
+	VerificationInterval  *models.Duration `toml:"verification_interval"`
+	VerificationTimeout   *models.Duration `toml:"verification_timeout"`
+	EAChangeInterval      *models.Duration `toml:"ea_change_interval"`
+}
+
+type Volume struct {
+	TestDuration          *models.Duration `toml:"test_duration"`
+	Rate                  int64            `toml:"rate"`
+	VURequestsPerUnit     int              `toml:"vu_requests_per_unit"`
+	RateLimitUnitDuration *models.Duration `toml:"rate_limit_unit_duration"`
+	VerificationInterval  *models.Duration `toml:"verification_interval"`
+	VerificationTimeout   *models.Duration `toml:"verification_timeout"`
+	EAChangeInterval      *models.Duration `toml:"ea_change_interval"`
+}
+
+func ReadConfig() (*PerformanceConfig, error) {
+	var cfg *PerformanceConfig
+	rawConfig := os.Getenv("CONFIG")
+	var d []byte
+	var err error
+	if rawConfig == "" {
+		d, err = os.ReadFile(DefaultConfigFilename)
+		if err != nil {
+			return nil, fmt.Errorf("%s, err: %w", ErrReadPerfConfig, err)
+		}
+	} else {
+		d, err = base64.StdEncoding.DecodeString(rawConfig)
+		if err != nil {
+			return nil, fmt.Errorf("%s, err: %w", ErrReadPerfConfig, err)
+		}
+	}
+	err = toml.Unmarshal(d, &cfg)
+	if err != nil {
+		return nil, fmt.Errorf("%s, err: %w", ErrUnmarshalPerfConfig, err)
+	}
+
+	log.Debug().Interface("Config", cfg).Msg("Parsed config")
+	return cfg, nil
+}
diff --git a/integration-tests/load/ocr/config.toml b/integration-tests/load/ocr/config.toml
new file mode 100644
index 00000000000..df8364b3ee4
--- /dev/null
+++ b/integration-tests/load/ocr/config.toml
@@ -0,0 +1,20 @@
+[Load]
+test_duration = "3m"
+rate_limit_unit_duration = "1m"
+rate = 3
+verification_interval = "5s"
+verification_timeout = "3m"
+ea_change_interval = "5s"
+
+[Volume]
+test_duration = "3m"
+rate_limit_unit_duration = "1m"
+vu_requests_per_unit = 10
+rate = 1
+verification_interval = "5s"
+verification_timeout = "3m"
+
+ea_change_interval = "5s"
+
+[Common]
+eth_funds = 3
\ No newline at end of file
diff --git a/integration-tests/load/ocr/gun.go b/integration-tests/load/ocr/gun.go
new file mode 100644
index 00000000000..a2eb1ff2200
--- /dev/null
+++ b/integration-tests/load/ocr/gun.go
@@ -0,0 +1,55 @@
+package ocr
+
+import (
+	"context"
+	"sync/atomic"
+	"time"
+
+	"github.com/rs/zerolog"
+
+	"github.com/smartcontractkit/chainlink-testing-framework/blockchain"
+	"github.com/smartcontractkit/chainlink/integration-tests/contracts"
+
+	"github.com/smartcontractkit/wasp"
+)
+
+// Gun is a gun for the OCR load test
+// it triggers new rounds for provided feed(aggregator) contract
+type Gun struct {
+	roundNum     atomic.Int64
+	ocrInstances []contracts.OffchainAggregator
+	cc           blockchain.EVMClient
+	l            zerolog.Logger
+}
+
+func NewGun(l zerolog.Logger, cc blockchain.EVMClient, ocrInstances []contracts.OffchainAggregator) *Gun {
+	return &Gun{
+		l:            l,
+		cc:           cc,
+		ocrInstances: ocrInstances,
+	}
+}
+
+func (m *Gun) Call(_ *wasp.Generator) *wasp.CallResult {
+	m.roundNum.Add(1)
+	requestedRound := m.roundNum.Load()
+	m.l.Info().
+		Int64("RoundNum", requestedRound).
+		Str("FeedID", m.ocrInstances[0].Address()).
+		Msg("starting new round")
+	err := m.ocrInstances[0].RequestNewRound()
+	if err != nil {
+		return &wasp.CallResult{Error: err.Error(), Failed: true}
+	}
+	for {
+		time.Sleep(5 * time.Second)
+		lr, err := m.ocrInstances[0].GetLatestRound(context.Background())
+		if err != nil {
+			return &wasp.CallResult{Error: err.Error(), Failed: true}
+		}
+		m.l.Info().Interface("LatestRound", lr).Msg("latest round")
+		if lr.RoundId.Int64() >= requestedRound {
+			return &wasp.CallResult{}
+		}
+	}
+}
diff --git a/integration-tests/load/ocr/helper.go b/integration-tests/load/ocr/helper.go
new file mode 100644
index 00000000000..c35dc384d17
--- /dev/null
+++ b/integration-tests/load/ocr/helper.go
@@ -0,0 +1,68 @@
+package ocr
+
+import (
+	"math/big"
+	"math/rand"
+	"time"
+
+	"github.com/rs/zerolog"
+
+	"github.com/smartcontractkit/chainlink-testing-framework/blockchain"
+
+	client2 "github.com/smartcontractkit/chainlink-testing-framework/client"
+	"github.com/smartcontractkit/chainlink/integration-tests/actions"
+	"github.com/smartcontractkit/chainlink/integration-tests/client"
+	"github.com/smartcontractkit/chainlink/integration-tests/contracts"
+)
+
+func SetupCluster(
+	cc blockchain.EVMClient,
+	cd contracts.ContractDeployer,
+	workerNodes []*client.ChainlinkK8sClient,
+) (contracts.LinkToken, error) {
+	err := actions.FundChainlinkNodes(workerNodes, cc, big.NewFloat(3))
+	if err != nil {
+		return nil, err
+	}
+	lt, err := cd.DeployLinkTokenContract()
+	if err != nil {
+		return nil, err
+	}
+	return lt, nil
+}
+
+func SetupFeed(
+	cc blockchain.EVMClient,
+	msClient *client2.MockserverClient,
+	cd contracts.ContractDeployer,
+	bootstrapNode *client.ChainlinkK8sClient,
+	workerNodes []*client.ChainlinkK8sClient,
+	lt contracts.LinkToken,
+) ([]contracts.OffchainAggregator, error) {
+	ocrInstances, err := actions.DeployOCRContracts(1, lt, cd, workerNodes, cc)
+	if err != nil {
+		return nil, err
+	}
+	err = actions.CreateOCRJobs(ocrInstances, bootstrapNode, workerNodes, 5, msClient, cc.GetChainID().String())
+	if err != nil {
+		return nil, err
+	}
+	return ocrInstances, nil
+}
+
+func SimulateEAActivity(
+	l zerolog.Logger,
+	eaChangeInterval time.Duration,
+	ocrInstances []contracts.OffchainAggregator,
+	workerNodes []*client.ChainlinkK8sClient,
+	msClient *client2.MockserverClient,
+) {
+	go func() {
+		for {
+			time.Sleep(eaChangeInterval)
+			if err := actions.SetAllAdapterResponsesToTheSameValue(rand.Intn(1000), ocrInstances, workerNodes, msClient); err != nil {
+				l.Error().Err(err).Msg("failed to update mockserver responses")
+			}
+		}
+	}()
+}
diff --git a/integration-tests/load/ocr/ocr_test.go b/integration-tests/load/ocr/ocr_test.go
new file mode 100644
index 00000000000..6bf1487125d
--- /dev/null
+++ b/integration-tests/load/ocr/ocr_test.go
@@ -0,0 +1,71 @@
+package ocr
+
+import (
+	"testing"
+
+	"github.com/smartcontractkit/chainlink/integration-tests/k8s"
+
+	"github.com/smartcontractkit/wasp"
+	"github.com/stretchr/testify/require"
+
+	"github.com/smartcontractkit/chainlink-testing-framework/logging"
+)
+
+var (
+	CommonTestLabels = map[string]string{
+		"branch": "ocr_healthcheck_local",
+		"commit": "ocr_healthcheck_local",
+	}
+)
+
+func TestOCRPerformance(t *testing.T) {
+	l := logging.GetTestLogger(t)
+	cc, msClient, cd, bootstrapNode, workerNodes, err := k8s.ConnectRemote(l)
+	require.NoError(t, err)
+	lt, err := SetupCluster(cc, cd, workerNodes)
+	require.NoError(t, err)
+	ocrInstances, err := SetupFeed(cc, msClient, cd, bootstrapNode, workerNodes, lt)
+	require.NoError(t, err)
+	cfg, err := ReadConfig()
+	require.NoError(t, err)
+	SimulateEAActivity(l, cfg.Load.EAChangeInterval.Duration(), ocrInstances, workerNodes, msClient)
+
+	p := wasp.NewProfile()
+	p.Add(wasp.NewGenerator(&wasp.Config{
+		T:                     t,
+		GenName:               "ocr",
+		LoadType:              wasp.RPS,
+		CallTimeout:           cfg.Load.VerificationTimeout.Duration(),
+		RateLimitUnitDuration: cfg.Load.RateLimitUnitDuration.Duration(),
+		Schedule:              wasp.Plain(cfg.Load.Rate, cfg.Load.TestDuration.Duration()),
+		Gun:                   NewGun(l, cc, ocrInstances),
+		Labels:                CommonTestLabels,
+		LokiConfig:            wasp.NewEnvLokiConfig(),
+	}))
+	_, err = p.Run(true)
+	require.NoError(t, err)
+}
+
+func TestOCRCapacity(t *testing.T) {
+	l := logging.GetTestLogger(t)
+	cc, msClient, cd, bootstrapNode, workerNodes, err := k8s.ConnectRemote(l)
+	require.NoError(t, err)
+	lt, err := SetupCluster(cc, cd, workerNodes)
+	require.NoError(t, err)
+	cfg, err := ReadConfig()
+	require.NoError(t, err)
+
+	p := wasp.NewProfile()
+	p.Add(wasp.NewGenerator(&wasp.Config{
+		T:           t,
+		GenName:     "ocr",
+		LoadType:    wasp.VU,
+		CallTimeout: cfg.Volume.VerificationTimeout.Duration(),
+		Schedule:    wasp.Plain(cfg.Volume.Rate, cfg.Volume.TestDuration.Duration()),
+		VU:          NewVU(l, cfg.Volume.VURequestsPerUnit, cfg.Volume.RateLimitUnitDuration.Duration(), cc, lt, cd, bootstrapNode, workerNodes, msClient),
+		Labels:      CommonTestLabels,
+		LokiConfig:  wasp.NewEnvLokiConfig(),
+	}))
+	_, err = p.Run(true)
+	require.NoError(t, err)
+}
diff --git a/integration-tests/load/ocr/vu.go b/integration-tests/load/ocr/vu.go
new file mode 100644
index 00000000000..a905ec011df
--- /dev/null
+++ b/integration-tests/load/ocr/vu.go
@@ -0,0 +1,128 @@
+package ocr
+
+import (
+	"context"
+	"sync/atomic"
+	"time"
+
+	"github.com/rs/zerolog"
+
+	"github.com/smartcontractkit/chainlink-testing-framework/blockchain"
+
+	"github.com/smartcontractkit/wasp"
+	"go.uber.org/ratelimit"
+
+	client2 "github.com/smartcontractkit/chainlink-testing-framework/client"
+	"github.com/smartcontractkit/chainlink/integration-tests/actions"
+	"github.com/smartcontractkit/chainlink/integration-tests/client"
+	"github.com/smartcontractkit/chainlink/integration-tests/contracts"
+)
+
+// VU is a virtual user for the OCR load test
+// it creates a feed and triggers new rounds
+type VU struct {
+	rl            ratelimit.Limiter
+	rate          int
+	rateUnit      time.Duration
+	roundNum      atomic.Int64
+	cc            blockchain.EVMClient
+	lt            contracts.LinkToken
+	cd            contracts.ContractDeployer
+	bootstrapNode *client.ChainlinkK8sClient
+	workerNodes   []*client.ChainlinkK8sClient
+	msClient      *client2.MockserverClient
+	l             zerolog.Logger
+	ocrInstances  []contracts.OffchainAggregator
+	stop          chan struct{}
+}
+
+func NewVU(
+	l zerolog.Logger,
+	rate int,
+	rateUnit time.Duration,
+	cc blockchain.EVMClient,
+	lt contracts.LinkToken,
+	cd contracts.ContractDeployer,
+	bootstrapNode *client.ChainlinkK8sClient,
+	workerNodes []*client.ChainlinkK8sClient,
+	msClient *client2.MockserverClient,
+) *VU {
+	return &VU{
+		rl:            ratelimit.New(rate, ratelimit.Per(rateUnit)),
+		rate:          rate,
+		rateUnit:      rateUnit,
+		l:             l,
+		cc:            cc,
+		lt:            lt,
+		cd:            cd,
+		msClient:      msClient,
+		bootstrapNode: bootstrapNode,
+		workerNodes:   workerNodes,
+	}
+}
+
+func (m *VU) Clone(_ *wasp.Generator) wasp.VirtualUser {
+	return &VU{
+		stop:          make(chan struct{}, 1),
+		rl:            ratelimit.New(m.rate, ratelimit.Per(m.rateUnit)),
+		rate:          m.rate,
+		rateUnit:      m.rateUnit,
+		l:             m.l,
+		cc:            m.cc,
+		lt:            m.lt,
+		cd:            m.cd,
+		msClient:      m.msClient,
+		bootstrapNode: m.bootstrapNode,
+		workerNodes:   m.workerNodes,
+	}
+}
+
+func (m *VU) Setup(_ *wasp.Generator) error {
+	ocrInstances, err := actions.DeployOCRContracts(1, m.lt, m.cd, m.workerNodes, m.cc)
+	if err != nil {
+		return err
+	}
+	err = actions.CreateOCRJobs(ocrInstances, m.bootstrapNode, m.workerNodes, 5, m.msClient, m.cc.GetChainID().String())
+	if err != nil {
+		return err
+	}
+	m.ocrInstances = ocrInstances
+	return nil
+}
+
+func (m *VU) Teardown(_ *wasp.Generator) error {
+	return nil
+}
+
+func (m *VU) Call(l *wasp.Generator) {
+	m.rl.Take()
+	m.roundNum.Add(1)
+	requestedRound := m.roundNum.Load()
+	m.l.Info().
+		Int64("RoundNum", requestedRound).
+		Str("FeedID", m.ocrInstances[0].Address()).
+		Msg("starting new round")
+	err := m.ocrInstances[0].RequestNewRound()
+	if err != nil {
+		l.ResponsesChan <- &wasp.CallResult{Error: err.Error(), Failed: true}
+	}
+	for {
+		time.Sleep(5 * time.Second)
+		lr, err := m.ocrInstances[0].GetLatestRound(context.Background())
+		if err != nil {
+			l.ResponsesChan <- &wasp.CallResult{Error: err.Error(), Failed: true}
+		}
+		m.l.Info().Interface("LatestRound", lr).Msg("latest round")
+		if lr.RoundId.Int64() >= requestedRound {
+			l.ResponsesChan <- &wasp.CallResult{}
+		}
+	}
+}
+
+func (m *VU) Stop(_ *wasp.Generator) {
+	m.stop <- struct{}{}
+}
+
+func (m *VU) StopChan() chan struct{} {
+	return m.stop
+}

From 47132bf0a880410e08a4c9c26dc485a4a6d72ce5 Mon Sep 17 00:00:00 2001
From: Adam Hamrick <adam.hamrick@smartcontract.com>
Date: Thu, 30 Nov 2023 09:17:06 -0500
Subject: [PATCH 043/130] Update Test Go and CTF Version (#11413)

---
 integration-tests/go.mod | 4 ++--
 integration-tests/go.sum | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index e801e25de5f..e83859f2f46 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -1,6 +1,6 @@
 module github.com/smartcontractkit/chainlink/integration-tests
 
-go 1.21.3
+go 1.21.4
 
 // Make sure we're working with the latest chainlink libs
 replace github.com/smartcontractkit/chainlink/v2 => ../
@@ -25,7 +25,7 @@ require (
 	github.com/slack-go/slack v0.12.2
 	github.com/smartcontractkit/chainlink-automation v1.0.1
 	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f9248
-	github.com/smartcontractkit/chainlink-testing-framework v1.19.5
+	github.com/smartcontractkit/chainlink-testing-framework v1.19.7
 	github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
 	github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000
 	github.com/smartcontractkit/libocr v0.0.0-20231107151413-13e0202ae8d7
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index 855d97d5e40..9a647daaffb 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -2386,8 +2386,8 @@ github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b
 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3/go.mod h1:UfW7/PZKon+iDEHtrHOfvMnS5GfYOW/SdMZ6P97rPEk=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664 h1:yxaHuDTtj2xxtsR8b+LJw8xDvyr6v/F6GP3InsP4wPI=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664/go.mod h1:3Fa+HQTZ3R3fPC0hUqugvoo+NEeo8Y4J2WOnQfi7O34=
-github.com/smartcontractkit/chainlink-testing-framework v1.19.5 h1:Iq1L7wCA8IkBBtP3p6W2ttu8v9cJp95spusnozW1UrA=
-github.com/smartcontractkit/chainlink-testing-framework v1.19.5/go.mod h1:+FVgkz6phTc+piVT57AcQfr3I8xvZgZ1lOpRPOu/dLQ=
+github.com/smartcontractkit/chainlink-testing-framework v1.19.7 h1:8oEduPXC5kBwnNwE5qdK+h/NZ2qOlxK0hgtedS+/St0=
+github.com/smartcontractkit/chainlink-testing-framework v1.19.7/go.mod h1:+FVgkz6phTc+piVT57AcQfr3I8xvZgZ1lOpRPOu/dLQ=
 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 h1:FFdvEzlYwcuVHkdZ8YnZR/XomeMGbz5E2F2HZI3I3w8=
 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868/go.mod h1:Kn1Hape05UzFZ7bOUnm3GVsHzP0TNrVmpfXYNHdqGGs=
 github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306 h1:ko88+ZznniNJZbZPWAvHQU8SwKAdHngdDZ+pvVgB5ss=

From a2ef90e998dd55f0e84a52252bd125ebf68a041e Mon Sep 17 00:00:00 2001
From: Jordan Krage <jmank88@gmail.com>
Date: Thu, 30 Nov 2023 09:42:02 -0600
Subject: [PATCH 044/130] core/chains/evm/config/toml/defaults: fix sepolia
 link address (#11426)

---
 core/chains/evm/client/client.go                           | 5 ++++-
 core/chains/evm/client/rpc_client.go                       | 4 +++-
 core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml | 2 +-
 docs/CHANGELOG.md                                          | 4 ++++
 docs/CONFIG.md                                             | 2 +-
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/core/chains/evm/client/client.go b/core/chains/evm/client/client.go
index cccda9914fc..688cc3c9bea 100644
--- a/core/chains/evm/client/client.go
+++ b/core/chains/evm/client/client.go
@@ -2,6 +2,7 @@ package client
 
 import (
 	"context"
+	"fmt"
 	"math/big"
 	"strings"
 	"time"
@@ -166,7 +167,9 @@ func (client *client) TokenBalance(ctx context.Context, address common.Address,
 	if err != nil {
 		return numLinkBigInt, err
 	}
-	numLinkBigInt.SetString(result, 0)
+	if _, ok := numLinkBigInt.SetString(result, 0); !ok {
+		return nil, fmt.Errorf("failed to parse int: %s", result)
+	}
 	return numLinkBigInt, nil
 }
 
diff --git a/core/chains/evm/client/rpc_client.go b/core/chains/evm/client/rpc_client.go
index fc9c348a572..01851c4ae90 100644
--- a/core/chains/evm/client/rpc_client.go
+++ b/core/chains/evm/client/rpc_client.go
@@ -866,7 +866,9 @@ func (r *rpcClient) TokenBalance(ctx context.Context, address common.Address, co
 	if err != nil {
 		return numLinkBigInt, err
 	}
-	numLinkBigInt.SetString(result, 0)
+	if _, ok := numLinkBigInt.SetString(result, 0); !ok {
+		return nil, fmt.Errorf("failed to parse int: %s", result)
+	}
 	return numLinkBigInt, nil
 }
 
diff --git a/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml b/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml
index 7b979c2fd8b..27dda602962 100644
--- a/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml
@@ -1,5 +1,5 @@
 ChainID = '11155111'
-LinkContractAddress = '0xb227f007804c16546Bd054dfED2E7A1fD5437678'
+LinkContractAddress = '0x779877A7B0D9E8603169DdbD7836e478b4624789'
 MinContractPayment = '0.1 link'
 
 [GasEstimator]
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index e282d047892..dc2f774cd31 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -67,6 +67,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     - `mercury_insufficient_blocks_count`
     - `mercury_zero_blocks_count`
 
+### Fixed
+
+- Corrected Ethereum Sepolia `LinkContractAddress` to `0x779877A7B0D9E8603169DdbD7836e478b4624789`
+
 ...
 
 <!-- unreleasedstop -->
diff --git a/docs/CONFIG.md b/docs/CONFIG.md
index 38aac7085e8..3568abe7a0e 100644
--- a/docs/CONFIG.md
+++ b/docs/CONFIG.md
@@ -5271,7 +5271,7 @@ BlockBackfillDepth = 10
 BlockBackfillSkip = false
 FinalityDepth = 50
 FinalityTagEnabled = false
-LinkContractAddress = '0xb227f007804c16546Bd054dfED2E7A1fD5437678'
+LinkContractAddress = '0x779877A7B0D9E8603169DdbD7836e478b4624789'
 LogBackfillBatchSize = 1000
 LogPollInterval = '15s'
 LogKeepBlocksDepth = 100000

From 73334d1708d0fc79d2e7e087898ee09b3e887e33 Mon Sep 17 00:00:00 2001
From: george-dorin <120329946+george-dorin@users.noreply.github.com>
Date: Thu, 30 Nov 2023 19:16:19 +0200
Subject: [PATCH 045/130] Fix telemetry manager health report (#11397)

* Fix incorrect health report

* Add network and chainID to logger and service names

* Update helpers_test

* Update services name

* Remove unused

* Add changelog

* Implement feedback
---
 core/services/synchronization/helpers_test.go       |  4 ++--
 .../telemetry_ingress_batch_client.go               |  4 ++--
 .../synchronization/telemetry_ingress_client.go     |  4 ++--
 core/services/telemetry/manager.go                  | 13 +++++--------
 core/services/telemetry/manager_test.go             |  8 +++-----
 docs/CHANGELOG.md                                   |  3 +++
 6 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/core/services/synchronization/helpers_test.go b/core/services/synchronization/helpers_test.go
index 14aaf5a7a02..7bb2dde7633 100644
--- a/core/services/synchronization/helpers_test.go
+++ b/core/services/synchronization/helpers_test.go
@@ -12,14 +12,14 @@ import (
 
 // NewTestTelemetryIngressClient calls NewTelemetryIngressClient and injects telemClient.
 func NewTestTelemetryIngressClient(t *testing.T, url *url.URL, serverPubKeyHex string, ks keystore.CSA, logging bool, telemClient telemPb.TelemClient) TelemetryService {
-	tc := NewTelemetryIngressClient(url, serverPubKeyHex, ks, logging, logger.TestLogger(t), 100)
+	tc := NewTelemetryIngressClient(url, serverPubKeyHex, ks, logging, logger.TestLogger(t), 100, "test", "test")
 	tc.(*telemetryIngressClient).telemClient = telemClient
 	return tc
 }
 
 // NewTestTelemetryIngressBatchClient calls NewTelemetryIngressBatchClient and injects telemClient.
 func NewTestTelemetryIngressBatchClient(t *testing.T, url *url.URL, serverPubKeyHex string, ks keystore.CSA, logging bool, telemClient telemPb.TelemClient, sendInterval time.Duration, uniconn bool) TelemetryService {
-	tc := NewTelemetryIngressBatchClient(url, serverPubKeyHex, ks, logging, logger.TestLogger(t), 100, 50, sendInterval, time.Second, uniconn)
+	tc := NewTelemetryIngressBatchClient(url, serverPubKeyHex, ks, logging, logger.TestLogger(t), 100, 50, sendInterval, time.Second, uniconn, "test", "test")
 	tc.(*telemetryIngressBatchClient).close = func() error { return nil }
 	tc.(*telemetryIngressBatchClient).telemClient = telemClient
 	return tc
diff --git a/core/services/synchronization/telemetry_ingress_batch_client.go b/core/services/synchronization/telemetry_ingress_batch_client.go
index c551ac85b3e..5f286f1617b 100644
--- a/core/services/synchronization/telemetry_ingress_batch_client.go
+++ b/core/services/synchronization/telemetry_ingress_batch_client.go
@@ -66,7 +66,7 @@ type telemetryIngressBatchClient struct {
 
 // NewTelemetryIngressBatchClient returns a client backed by wsrpc that
 // can send telemetry to the telemetry ingress server
-func NewTelemetryIngressBatchClient(url *url.URL, serverPubKeyHex string, ks keystore.CSA, logging bool, lggr logger.Logger, telemBufferSize uint, telemMaxBatchSize uint, telemSendInterval time.Duration, telemSendTimeout time.Duration, useUniconn bool) TelemetryService {
+func NewTelemetryIngressBatchClient(url *url.URL, serverPubKeyHex string, ks keystore.CSA, logging bool, lggr logger.Logger, telemBufferSize uint, telemMaxBatchSize uint, telemSendInterval time.Duration, telemSendTimeout time.Duration, useUniconn bool, network string, chainID string) TelemetryService {
 	return &telemetryIngressBatchClient{
 		telemBufferSize:   telemBufferSize,
 		telemMaxBatchSize: telemMaxBatchSize,
@@ -77,7 +77,7 @@ func NewTelemetryIngressBatchClient(url *url.URL, serverPubKeyHex string, ks key
 		serverPubKeyHex:   serverPubKeyHex,
 		globalLogger:      lggr,
 		logging:           logging,
-		lggr:              lggr.Named("TelemetryIngressBatchClient"),
+		lggr:              lggr.Named("TelemetryIngressBatchClient").Named(network).Named(chainID),
 		chDone:            make(chan struct{}),
 		workers:           make(map[string]*telemetryIngressBatchWorker),
 		useUniConn:        useUniconn,
diff --git a/core/services/synchronization/telemetry_ingress_client.go b/core/services/synchronization/telemetry_ingress_client.go
index b566199fdc0..bcad01622ea 100644
--- a/core/services/synchronization/telemetry_ingress_client.go
+++ b/core/services/synchronization/telemetry_ingress_client.go
@@ -52,13 +52,13 @@ type telemetryIngressClient struct {
 
 // NewTelemetryIngressClient returns a client backed by wsrpc that
 // can send telemetry to the telemetry ingress server
-func NewTelemetryIngressClient(url *url.URL, serverPubKeyHex string, ks keystore.CSA, logging bool, lggr logger.Logger, telemBufferSize uint) TelemetryService {
+func NewTelemetryIngressClient(url *url.URL, serverPubKeyHex string, ks keystore.CSA, logging bool, lggr logger.Logger, telemBufferSize uint, network string, chainID string) TelemetryService {
 	return &telemetryIngressClient{
 		url:             url,
 		ks:              ks,
 		serverPubKeyHex: serverPubKeyHex,
 		logging:         logging,
-		lggr:            lggr.Named("TelemetryIngressClient"),
+		lggr:            lggr.Named("TelemetryIngressClient").Named(network).Named(chainID),
 		chTelemetry:     make(chan TelemPayload, telemBufferSize),
 		chDone:          make(services.StopChan),
 	}
diff --git a/core/services/telemetry/manager.go b/core/services/telemetry/manager.go
index d760d13b2b0..c457aca5bf8 100644
--- a/core/services/telemetry/manager.go
+++ b/core/services/telemetry/manager.go
@@ -2,7 +2,6 @@ package telemetry
 
 import (
 	"context"
-	"fmt"
 	"net/url"
 	"strings"
 	"time"
@@ -68,7 +67,6 @@ func (l *legacyEndpointConfig) URL() *url.URL {
 }
 
 type telemetryEndpoint struct {
-	services.StateMachine
 	ChainID string
 	Network string
 	URL     *url.URL
@@ -140,11 +138,10 @@ func (m *Manager) Name() string {
 }
 
 func (m *Manager) HealthReport() map[string]error {
-	hr := make(map[string]error)
-	hr[m.lggr.Name()] = m.Healthy()
+	hr := map[string]error{m.Name(): m.Healthy()}
+
 	for _, e := range m.endpoints {
-		name := fmt.Sprintf("%s.%s.%s", m.lggr.Name(), e.Network, e.ChainID)
-		hr[name] = e.Healthy()
+		services.CopyHealth(hr, e.client.HealthReport())
 	}
 	return hr
 }
@@ -190,9 +187,9 @@ func (m *Manager) addEndpoint(e config.TelemetryIngressEndpoint) error {
 
 	var tClient synchronization.TelemetryService
 	if m.useBatchSend {
-		tClient = synchronization.NewTelemetryIngressBatchClient(e.URL(), e.ServerPubKey(), m.ks, m.logging, m.lggr, m.bufferSize, m.maxBatchSize, m.sendInterval, m.sendTimeout, m.uniConn)
+		tClient = synchronization.NewTelemetryIngressBatchClient(e.URL(), e.ServerPubKey(), m.ks, m.logging, m.lggr, m.bufferSize, m.maxBatchSize, m.sendInterval, m.sendTimeout, m.uniConn, e.Network(), e.ChainID())
 	} else {
-		tClient = synchronization.NewTelemetryIngressClient(e.URL(), e.ServerPubKey(), m.ks, m.logging, m.lggr, m.bufferSize)
+		tClient = synchronization.NewTelemetryIngressClient(e.URL(), e.ServerPubKey(), m.ks, m.logging, m.lggr, m.bufferSize, e.Network(), e.ChainID())
 	}
 
 	te := telemetryEndpoint{
diff --git a/core/services/telemetry/manager_test.go b/core/services/telemetry/manager_test.go
index f09e4d3482f..8564be8466f 100644
--- a/core/services/telemetry/manager_test.go
+++ b/core/services/telemetry/manager_test.go
@@ -14,7 +14,6 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zapcore"
 
-	"github.com/smartcontractkit/chainlink-common/pkg/services"
 	"github.com/smartcontractkit/chainlink/v2/core/config"
 	"github.com/smartcontractkit/chainlink/v2/core/config/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
@@ -246,10 +245,9 @@ func TestCorrectEndpointRouting(t *testing.T) {
 		})
 
 		tm.endpoints[i] = &telemetryEndpoint{
-			StateMachine: services.StateMachine{},
-			ChainID:      e.chainID,
-			Network:      e.network,
-			client:       clientMock,
+			ChainID: e.chainID,
+			Network: e.network,
+			client:  clientMock,
 		}
 
 	}
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index dc2f774cd31..929fec5a3e6 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [dev]
 
+### Fixed
+- Fixed a bug that caused the Telemetry Manager to report incorrect health
+
 ### Added
 
 - Added a tracker component to the txmgr for tracking and gracefully handling abandoned transactions. Abandoned transactions occur when a fromAddress is removed from the keystore by a node operator. The tracker gives abandoned transactions a chance to be finalized on chain, or marks them as fatal_error if they are not finalized within a specified time to live (default 6hrs).

From cc260b044ff43836e8f34ce86e7949c75e4d8e46 Mon Sep 17 00:00:00 2001
From: Sam <samsondav@protonmail.com>
Date: Thu, 30 Nov 2023 12:22:14 -0500
Subject: [PATCH 046/130] Increase blocks number for mercury v1 to 10 (#11410)

* Increase blocks number for mercury v1 to 10

* Fix test
---
 core/scripts/go.mod                           |  2 +-
 core/scripts/go.sum                           |  4 +-
 .../relay/evm/mercury/v1/data_source_test.go  | 42 ++++++-------------
 go.mod                                        |  2 +-
 go.sum                                        |  4 +-
 integration-tests/go.mod                      |  2 +-
 integration-tests/go.sum                      |  4 +-
 7 files changed, 21 insertions(+), 39 deletions(-)

diff --git a/core/scripts/go.mod b/core/scripts/go.mod
index 1eb186931f8..c1ed59097cc 100644
--- a/core/scripts/go.mod
+++ b/core/scripts/go.mod
@@ -304,7 +304,7 @@ require (
 	github.com/shirou/gopsutil/v3 v3.23.10 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f9248 // indirect
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231129142348-7087174fecde // indirect
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 // indirect
 	github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d // indirect
 	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3 // indirect
diff --git a/core/scripts/go.sum b/core/scripts/go.sum
index 2a77f2066db..de86a457218 100644
--- a/core/scripts/go.sum
+++ b/core/scripts/go.sum
@@ -1504,8 +1504,8 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
 github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
 github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f9248 h1:HJCPvJ+ZjU9TSX4YD5rxBJqGAvqhDfzoJgI3WmfeWeI=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f9248/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231129142348-7087174fecde h1:yulX+cnJbiS/iACjOdJfFtD5bD9M6TnXy7Og/PBafew=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231129142348-7087174fecde/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 h1:oewYJtdRkJKUHCNDCj5C2LQe6Oq6qy975g931nfG0cc=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542/go.mod h1:EpvRoycRD+kniYlz+pCpRT5e+fmPm0mSD/vmND+0oMg=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d h1:w4MsbOtNk6nD/mcXLstHWk9hB6g7QLtcAfhPjhwvOaQ=
diff --git a/core/services/relay/evm/mercury/v1/data_source_test.go b/core/services/relay/evm/mercury/v1/data_source_test.go
index 6eb9f430c60..45a99f29196 100644
--- a/core/services/relay/evm/mercury/v1/data_source_test.go
+++ b/core/services/relay/evm/mercury/v1/data_source_test.go
@@ -356,49 +356,31 @@ func TestMercury_Observe(t *testing.T) {
 			ht2.AssertExpectations(t)
 		})
 		t.Run("when chain is long enough", func(t *testing.T) {
-			h1 := &evmtypes.Head{
-				Number: 1,
-			}
-			h2 := &evmtypes.Head{
-				Number: 2,
-				Parent: h1,
-			}
-			h3 := &evmtypes.Head{
-				Number: 3,
-				Parent: h2,
-			}
-			h4 := &evmtypes.Head{
-				Number: 4,
-				Parent: h3,
-			}
-			h5 := &evmtypes.Head{
-				Number: 5,
-				Parent: h4,
-			}
-			h6 := &evmtypes.Head{
-				Number: 6,
-				Parent: h5,
+			heads := make([]*evmtypes.Head, nBlocksObservation+5)
+			for i := range heads {
+				heads[i] = &evmtypes.Head{Number: int64(i)}
+				if i > 0 {
+					heads[i].Parent = heads[i-1]
+				}
 			}
 
 			ht2 := commonmocks.NewHeadTracker[*evmtypes.Head, common.Hash](t)
-			ht2.On("LatestChain").Return(h6)
+			ht2.On("LatestChain").Return(heads[len(heads)-1])
 			ds.chainReader = evm.NewChainReader(ht2)
 
 			obs, err := ds.Observe(ctx, repts, true)
 			assert.NoError(t, err)
 
-			assert.Len(t, obs.LatestBlocks, 5)
-			assert.Equal(t, 6, int(obs.LatestBlocks[0].Num))
-			assert.Equal(t, 5, int(obs.LatestBlocks[1].Num))
-			assert.Equal(t, 4, int(obs.LatestBlocks[2].Num))
-			assert.Equal(t, 3, int(obs.LatestBlocks[3].Num))
-			assert.Equal(t, 2, int(obs.LatestBlocks[4].Num))
+			assert.Len(t, obs.LatestBlocks, nBlocksObservation)
+			highestBlockNum := heads[len(heads)-1].Number
+			for i := range obs.LatestBlocks {
+				assert.Equal(t, int(highestBlockNum)-i, int(obs.LatestBlocks[i].Num))
+			}
 
 			ht2.AssertExpectations(t)
 		})
 
 		t.Run("when chain reader returns an error", func(t *testing.T) {
-
 			ds.chainReader = &mockChainReader{
 				err: io.EOF,
 				obs: nil,
diff --git a/go.mod b/go.mod
index c105c1c6000..688f5810529 100644
--- a/go.mod
+++ b/go.mod
@@ -66,7 +66,7 @@ require (
 	github.com/shopspring/decimal v1.3.1
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704
 	github.com/smartcontractkit/chainlink-automation v1.0.1
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f9248
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231129142348-7087174fecde
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542
 	github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d
 	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3
diff --git a/go.sum b/go.sum
index 18d78d4815e..d522aabb08a 100644
--- a/go.sum
+++ b/go.sum
@@ -1507,8 +1507,8 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
 github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
 github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f9248 h1:HJCPvJ+ZjU9TSX4YD5rxBJqGAvqhDfzoJgI3WmfeWeI=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f9248/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231129142348-7087174fecde h1:yulX+cnJbiS/iACjOdJfFtD5bD9M6TnXy7Og/PBafew=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231129142348-7087174fecde/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 h1:oewYJtdRkJKUHCNDCj5C2LQe6Oq6qy975g931nfG0cc=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542/go.mod h1:EpvRoycRD+kniYlz+pCpRT5e+fmPm0mSD/vmND+0oMg=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d h1:w4MsbOtNk6nD/mcXLstHWk9hB6g7QLtcAfhPjhwvOaQ=
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index e83859f2f46..b03819e2066 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/segmentio/ksuid v1.0.4
 	github.com/slack-go/slack v0.12.2
 	github.com/smartcontractkit/chainlink-automation v1.0.1
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f9248
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231129142348-7087174fecde
 	github.com/smartcontractkit/chainlink-testing-framework v1.19.7
 	github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
 	github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index 9a647daaffb..74fe9e4dc4d 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -2376,8 +2376,8 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
 github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
 github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f9248 h1:HJCPvJ+ZjU9TSX4YD5rxBJqGAvqhDfzoJgI3WmfeWeI=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231127213516-5b67a57f9248/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231129142348-7087174fecde h1:yulX+cnJbiS/iACjOdJfFtD5bD9M6TnXy7Og/PBafew=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231129142348-7087174fecde/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 h1:oewYJtdRkJKUHCNDCj5C2LQe6Oq6qy975g931nfG0cc=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542/go.mod h1:EpvRoycRD+kniYlz+pCpRT5e+fmPm0mSD/vmND+0oMg=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d h1:w4MsbOtNk6nD/mcXLstHWk9hB6g7QLtcAfhPjhwvOaQ=

From 2a216cbcc4bb441e6d9b063798bbb906e1f3ae9f Mon Sep 17 00:00:00 2001
From: Dylan Tinianov <dylantinianov@gmail.com>
Date: Thu, 30 Nov 2023 15:20:49 -0500
Subject: [PATCH 047/130] [BCI-2151] Refactor prom reporter db API (#11394)

* Refactor prom reporter db API

* Add test case

* lint

* Use Txm from LegacyChainContainer

* Use legacyevm

* lint

* Use TXM chainID

* lint

---------

Co-authored-by: Prashant Yadav <34992934+prashantkumar1982@users.noreply.github.com>
---
 common/txmgr/mocks/tx_manager.go              | 74 ++++++++++++++++++
 common/txmgr/txmgr.go                         | 29 ++++++-
 common/txmgr/types/mocks/tx_store.go          | 74 ++++++++++++++++++
 common/txmgr/types/tx_store.go                |  4 +
 core/chains/evm/txmgr/evm_tx_store.go         | 47 ++++++++++++
 core/chains/evm/txmgr/evm_tx_store_test.go    | 76 +++++++++++++++++++
 core/chains/evm/txmgr/mocks/evm_tx_store.go   | 74 ++++++++++++++++++
 core/internal/cltest/mocks.go                 | 14 ++++
 core/services/chainlink/application.go        | 10 +--
 core/services/promreporter/prom_reporter.go   | 63 ++++++++++-----
 .../promreporter/prom_reporter_test.go        | 41 ++++++++--
 docs/CHANGELOG.md                             |  1 +
 12 files changed, 476 insertions(+), 31 deletions(-)

diff --git a/common/txmgr/mocks/tx_manager.go b/common/txmgr/mocks/tx_manager.go
index 89abf1dea51..27077218f6e 100644
--- a/common/txmgr/mocks/tx_manager.go
+++ b/common/txmgr/mocks/tx_manager.go
@@ -9,6 +9,8 @@ import (
 	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
 	mock "github.com/stretchr/testify/mock"
 
+	null "gopkg.in/guregu/null.v4"
+
 	txmgr "github.com/smartcontractkit/chainlink/v2/common/txmgr"
 
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
@@ -35,6 +37,30 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Close(
 	return r0
 }
 
+// CountTransactionsByState provides a mock function with given fields: ctx, state
+func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) CountTransactionsByState(ctx context.Context, state txmgrtypes.TxState) (uint32, error) {
+	ret := _m.Called(ctx, state)
+
+	var r0 uint32
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, txmgrtypes.TxState) (uint32, error)); ok {
+		return rf(ctx, state)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, txmgrtypes.TxState) uint32); ok {
+		r0 = rf(ctx, state)
+	} else {
+		r0 = ret.Get(0).(uint32)
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, txmgrtypes.TxState) error); ok {
+		r1 = rf(ctx, state)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // CreateTransaction provides a mock function with given fields: ctx, txRequest
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) CreateTransaction(ctx context.Context, txRequest txmgrtypes.TxRequest[ADDR, TX_HASH]) (txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, txRequest)
@@ -59,6 +85,54 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Create
 	return r0, r1
 }
 
+// FindEarliestUnconfirmedBroadcastTime provides a mock function with given fields: ctx
+func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindEarliestUnconfirmedBroadcastTime(ctx context.Context) (null.Time, error) {
+	ret := _m.Called(ctx)
+
+	var r0 null.Time
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context) (null.Time, error)); ok {
+		return rf(ctx)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context) null.Time); ok {
+		r0 = rf(ctx)
+	} else {
+		r0 = ret.Get(0).(null.Time)
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context) error); ok {
+		r1 = rf(ctx)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FindEarliestUnconfirmedTxAttemptBlock provides a mock function with given fields: ctx
+func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindEarliestUnconfirmedTxAttemptBlock(ctx context.Context) (null.Int, error) {
+	ret := _m.Called(ctx)
+
+	var r0 null.Int
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context) (null.Int, error)); ok {
+		return rf(ctx)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context) null.Int); ok {
+		r0 = rf(ctx)
+	} else {
+		r0 = ret.Get(0).(null.Int)
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context) error); ok {
+		r1 = rf(ctx)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // FindTxesByMetaFieldAndStates provides a mock function with given fields: ctx, metaField, metaValue, states, chainID
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindTxesByMetaFieldAndStates(ctx context.Context, metaField string, metaValue string, states []txmgrtypes.TxState, chainID *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, metaField, metaValue, states, chainID)
diff --git a/common/txmgr/txmgr.go b/common/txmgr/txmgr.go
index 0a50bb66385..3fbdb852f8b 100644
--- a/common/txmgr/txmgr.go
+++ b/common/txmgr/txmgr.go
@@ -10,10 +10,10 @@ import (
 	"time"
 
 	"github.com/google/uuid"
+	nullv4 "gopkg.in/guregu/null.v4"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
-
 	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
@@ -55,6 +55,9 @@ type TxManager[
 	FindTxesWithMetaFieldByReceiptBlockNum(ctx context.Context, metaField string, blockNum int64, chainID *big.Int) (txes []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], err error)
 	// Find transactions loaded with transaction attempts and receipts by transaction IDs and states
 	FindTxesWithAttemptsAndReceiptsByIdsAndState(ctx context.Context, ids []big.Int, states []txmgrtypes.TxState, chainID *big.Int) (txes []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], err error)
+	FindEarliestUnconfirmedBroadcastTime(ctx context.Context) (nullv4.Time, error)
+	FindEarliestUnconfirmedTxAttemptBlock(ctx context.Context) (nullv4.Int, error)
+	CountTransactionsByState(ctx context.Context, state txmgrtypes.TxState) (count uint32, err error)
 }
 
 type reset struct {
@@ -576,6 +579,18 @@ func (b *Txm[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxesWi
 	return
 }
 
+func (b *Txm[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindEarliestUnconfirmedBroadcastTime(ctx context.Context) (nullv4.Time, error) {
+	return b.txStore.FindEarliestUnconfirmedBroadcastTime(ctx, b.chainID)
+}
+
+func (b *Txm[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindEarliestUnconfirmedTxAttemptBlock(ctx context.Context) (nullv4.Int, error) {
+	return b.txStore.FindEarliestUnconfirmedTxAttemptBlock(ctx, b.chainID)
+}
+
+func (b *Txm[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) CountTransactionsByState(ctx context.Context, state txmgrtypes.TxState) (count uint32, err error) {
+	return b.txStore.CountTransactionsByState(ctx, state, b.chainID)
+}
+
 type NullTxManager[
 	CHAIN_ID types.ID,
 	HEAD types.Head[BLOCK_HASH],
@@ -642,3 +657,15 @@ func (n *NullTxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Fin
 func (n *NullTxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindTxesWithAttemptsAndReceiptsByIdsAndState(ctx context.Context, ids []big.Int, states []txmgrtypes.TxState, chainID *big.Int) (txes []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], err error) {
 	return txes, errors.New(n.ErrMsg)
 }
+
+func (n *NullTxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindEarliestUnconfirmedBroadcastTime(ctx context.Context) (nullv4.Time, error) {
+	return nullv4.Time{}, errors.New(n.ErrMsg)
+}
+
+func (n *NullTxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindEarliestUnconfirmedTxAttemptBlock(ctx context.Context) (nullv4.Int, error) {
+	return nullv4.Int{}, errors.New(n.ErrMsg)
+}
+
+func (n *NullTxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) CountTransactionsByState(ctx context.Context, state txmgrtypes.TxState) (count uint32, err error) {
+	return count, errors.New(n.ErrMsg)
+}
diff --git a/common/txmgr/types/mocks/tx_store.go b/common/txmgr/types/mocks/tx_store.go
index 0a7738fd68a..df1528a4c24 100644
--- a/common/txmgr/types/mocks/tx_store.go
+++ b/common/txmgr/types/mocks/tx_store.go
@@ -9,6 +9,8 @@ import (
 	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
 	mock "github.com/stretchr/testify/mock"
 
+	null "gopkg.in/guregu/null.v4"
+
 	time "time"
 
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
@@ -56,6 +58,30 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) Close() {
 	_m.Called()
 }
 
+// CountTransactionsByState provides a mock function with given fields: ctx, state, chainID
+func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) CountTransactionsByState(ctx context.Context, state txmgrtypes.TxState, chainID CHAIN_ID) (uint32, error) {
+	ret := _m.Called(ctx, state, chainID)
+
+	var r0 uint32
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, txmgrtypes.TxState, CHAIN_ID) (uint32, error)); ok {
+		return rf(ctx, state, chainID)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, txmgrtypes.TxState, CHAIN_ID) uint32); ok {
+		r0 = rf(ctx, state, chainID)
+	} else {
+		r0 = ret.Get(0).(uint32)
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, txmgrtypes.TxState, CHAIN_ID) error); ok {
+		r1 = rf(ctx, state, chainID)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // CountUnconfirmedTransactions provides a mock function with given fields: ctx, fromAddress, chainID
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) CountUnconfirmedTransactions(ctx context.Context, fromAddress ADDR, chainID CHAIN_ID) (uint32, error) {
 	ret := _m.Called(ctx, fromAddress, chainID)
@@ -142,6 +168,54 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) DeleteInPro
 	return r0
 }
 
+// FindEarliestUnconfirmedBroadcastTime provides a mock function with given fields: ctx, chainID
+func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindEarliestUnconfirmedBroadcastTime(ctx context.Context, chainID CHAIN_ID) (null.Time, error) {
+	ret := _m.Called(ctx, chainID)
+
+	var r0 null.Time
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, CHAIN_ID) (null.Time, error)); ok {
+		return rf(ctx, chainID)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, CHAIN_ID) null.Time); ok {
+		r0 = rf(ctx, chainID)
+	} else {
+		r0 = ret.Get(0).(null.Time)
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, CHAIN_ID) error); ok {
+		r1 = rf(ctx, chainID)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FindEarliestUnconfirmedTxAttemptBlock provides a mock function with given fields: ctx, chainID
+func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindEarliestUnconfirmedTxAttemptBlock(ctx context.Context, chainID CHAIN_ID) (null.Int, error) {
+	ret := _m.Called(ctx, chainID)
+
+	var r0 null.Int
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, CHAIN_ID) (null.Int, error)); ok {
+		return rf(ctx, chainID)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, CHAIN_ID) null.Int); ok {
+		r0 = rf(ctx, chainID)
+	} else {
+		r0 = ret.Get(0).(null.Int)
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, CHAIN_ID) error); ok {
+		r1 = rf(ctx, chainID)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // FindLatestSequence provides a mock function with given fields: ctx, fromAddress, chainId
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindLatestSequence(ctx context.Context, fromAddress ADDR, chainId CHAIN_ID) (SEQ, error) {
 	ret := _m.Called(ctx, fromAddress, chainId)
diff --git a/common/txmgr/types/tx_store.go b/common/txmgr/types/tx_store.go
index 251135795fd..57ecf28d589 100644
--- a/common/txmgr/types/tx_store.go
+++ b/common/txmgr/types/tx_store.go
@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/google/uuid"
+	"gopkg.in/guregu/null.v4"
 
 	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
@@ -64,6 +65,7 @@ type TransactionStore[
 	FEE feetypes.Fee,
 ] interface {
 	CountUnconfirmedTransactions(ctx context.Context, fromAddress ADDR, chainID CHAIN_ID) (count uint32, err error)
+	CountTransactionsByState(ctx context.Context, state TxState, chainID CHAIN_ID) (count uint32, err error)
 	CountUnstartedTransactions(ctx context.Context, fromAddress ADDR, chainID CHAIN_ID) (count uint32, err error)
 	CreateTransaction(ctx context.Context, txRequest TxRequest[ADDR, TX_HASH], chainID CHAIN_ID) (tx Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], err error)
 	DeleteInProgressAttempt(ctx context.Context, attempt TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error
@@ -79,6 +81,8 @@ type TransactionStore[
 	FindTxWithSequence(ctx context.Context, fromAddress ADDR, seq SEQ) (etx *Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], err error)
 	FindNextUnstartedTransactionFromAddress(ctx context.Context, etx *Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], fromAddress ADDR, chainID CHAIN_ID) error
 	FindTransactionsConfirmedInBlockRange(ctx context.Context, highBlockNumber, lowBlockNumber int64, chainID CHAIN_ID) (etxs []*Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], err error)
+	FindEarliestUnconfirmedBroadcastTime(ctx context.Context, chainID CHAIN_ID) (null.Time, error)
+	FindEarliestUnconfirmedTxAttemptBlock(ctx context.Context, chainID CHAIN_ID) (null.Int, error)
 	GetTxInProgress(ctx context.Context, fromAddress ADDR) (etx *Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], err error)
 	GetInProgressTxAttempts(ctx context.Context, address ADDR, chainID CHAIN_ID) (attempts []TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], err error)
 	GetNonFatalTransactions(ctx context.Context, chainID CHAIN_ID) (txs []*Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], err error)
diff --git a/core/chains/evm/txmgr/evm_tx_store.go b/core/chains/evm/txmgr/evm_tx_store.go
index e36ca611e16..730809e8dda 100644
--- a/core/chains/evm/txmgr/evm_tx_store.go
+++ b/core/chains/evm/txmgr/evm_tx_store.go
@@ -1131,6 +1131,39 @@ ORDER BY nonce ASC
 	return etxs, pkgerrors.Wrap(err, "FindTransactionsConfirmedInBlockRange failed")
 }
 
+func (o *evmTxStore) FindEarliestUnconfirmedBroadcastTime(ctx context.Context, chainID *big.Int) (broadcastAt nullv4.Time, err error) {
+	var cancel context.CancelFunc
+	ctx, cancel = o.mergeContexts(ctx)
+	defer cancel()
+	qq := o.q.WithOpts(pg.WithParentCtx(ctx))
+	err = qq.Transaction(func(tx pg.Queryer) error {
+		if err = qq.QueryRowContext(ctx, `SELECT min(initial_broadcast_at) FROM evm.txes WHERE state = 'unconfirmed' AND evm_chain_id = $1`, chainID.String()).Scan(&broadcastAt); err != nil {
+			return fmt.Errorf("failed to query for unconfirmed eth_tx count: %w", err)
+		}
+		return nil
+	}, pg.OptReadOnlyTx())
+	return broadcastAt, err
+}
+
+func (o *evmTxStore) FindEarliestUnconfirmedTxAttemptBlock(ctx context.Context, chainID *big.Int) (earliestUnconfirmedTxBlock nullv4.Int, err error) {
+	var cancel context.CancelFunc
+	ctx, cancel = o.mergeContexts(ctx)
+	defer cancel()
+	qq := o.q.WithOpts(pg.WithParentCtx(ctx))
+	err = qq.Transaction(func(tx pg.Queryer) error {
+		err = qq.QueryRowContext(ctx, `
+SELECT MIN(broadcast_before_block_num) FROM evm.tx_attempts
+JOIN evm.txes ON evm.txes.id = evm.tx_attempts.eth_tx_id
+WHERE evm.txes.state = 'unconfirmed'
+AND evm_chain_id = $1`, chainID.String()).Scan(&earliestUnconfirmedTxBlock)
+		if err != nil {
+			return fmt.Errorf("failed to query for earliest unconfirmed tx block: %w", err)
+		}
+		return nil
+	}, pg.OptReadOnlyTx())
+	return earliestUnconfirmedTxBlock, err
+}
+
 func (o *evmTxStore) IsTxFinalized(ctx context.Context, blockHeight int64, txID int64, chainID *big.Int) (finalized bool, err error) {
 	var cancel context.CancelFunc
 	ctx, cancel = o.mergeContexts(ctx)
@@ -1733,6 +1766,20 @@ func (o *evmTxStore) CountUnconfirmedTransactions(ctx context.Context, fromAddre
 	return o.countTransactionsWithState(ctx, fromAddress, txmgr.TxUnconfirmed, chainID)
 }
 
+// CountTransactionsByState returns the number of transactions with any fromAddress in the given state
+func (o *evmTxStore) CountTransactionsByState(ctx context.Context, state txmgrtypes.TxState, chainID *big.Int) (count uint32, err error) {
+	var cancel context.CancelFunc
+	ctx, cancel = o.mergeContexts(ctx)
+	defer cancel()
+	qq := o.q.WithOpts(pg.WithParentCtx(ctx))
+	err = qq.Get(&count, `SELECT count(*) FROM evm.txes WHERE state = $1 AND evm_chain_id = $2`,
+		state, chainID.String())
+	if err != nil {
+		return 0, fmt.Errorf("failed to CountTransactionsByState: %w", err)
+	}
+	return count, nil
+}
+
 // CountUnstartedTransactions returns the number of unconfirmed transactions
 func (o *evmTxStore) CountUnstartedTransactions(ctx context.Context, fromAddress common.Address, chainID *big.Int) (count uint32, err error) {
 	return o.countTransactionsWithState(ctx, fromAddress, txmgr.TxUnstarted, chainID)
diff --git a/core/chains/evm/txmgr/evm_tx_store_test.go b/core/chains/evm/txmgr/evm_tx_store_test.go
index e68641735ee..0b4287b6f6c 100644
--- a/core/chains/evm/txmgr/evm_tx_store_test.go
+++ b/core/chains/evm/txmgr/evm_tx_store_test.go
@@ -847,6 +847,61 @@ func TestORM_FindTransactionsConfirmedInBlockRange(t *testing.T) {
 	})
 }
 
+func TestORM_FindEarliestUnconfirmedBroadcastTime(t *testing.T) {
+	t.Parallel()
+
+	db := pgtest.NewSqlxDB(t)
+	cfg := newTestChainScopedConfig(t)
+	txStore := cltest.NewTestTxStore(t, db, cfg.Database())
+	ethKeyStore := cltest.NewKeyStore(t, db, cfg.Database()).Eth()
+	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
+	_, fromAddress := cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
+
+	t.Run("no unconfirmed eth txes", func(t *testing.T) {
+		broadcastAt, err := txStore.FindEarliestUnconfirmedBroadcastTime(testutils.Context(t), ethClient.ConfiguredChainID())
+		require.NoError(t, err)
+		require.False(t, broadcastAt.Valid)
+	})
+
+	t.Run("verify broadcast time", func(t *testing.T) {
+		tx := cltest.MustInsertUnconfirmedEthTx(t, txStore, 123, fromAddress)
+		broadcastAt, err := txStore.FindEarliestUnconfirmedBroadcastTime(testutils.Context(t), ethClient.ConfiguredChainID())
+		require.NoError(t, err)
+		require.True(t, broadcastAt.Ptr().Equal(*tx.BroadcastAt))
+	})
+}
+
+func TestORM_FindEarliestUnconfirmedTxAttemptBlock(t *testing.T) {
+	t.Parallel()
+
+	db := pgtest.NewSqlxDB(t)
+	cfg := newTestChainScopedConfig(t)
+	txStore := cltest.NewTestTxStore(t, db, cfg.Database())
+	ethKeyStore := cltest.NewKeyStore(t, db, cfg.Database()).Eth()
+	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
+	_, fromAddress := cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
+	_, fromAddress2 := cltest.MustInsertRandomKeyReturningState(t, ethKeyStore)
+
+	t.Run("no earliest unconfirmed tx block", func(t *testing.T) {
+		earliestBlock, err := txStore.FindEarliestUnconfirmedTxAttemptBlock(testutils.Context(t), ethClient.ConfiguredChainID())
+		require.NoError(t, err)
+		require.False(t, earliestBlock.Valid)
+	})
+
+	t.Run("verify earliest unconfirmed tx block", func(t *testing.T) {
+		var blockNum int64 = 2
+		tx := mustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(t, txStore, 123, blockNum, time.Now(), fromAddress)
+		_ = mustInsertConfirmedMissingReceiptEthTxWithLegacyAttempt(t, txStore, 123, blockNum, time.Now().Add(time.Minute), fromAddress2)
+		err := txStore.UpdateTxsUnconfirmed(testutils.Context(t), []int64{tx.ID})
+		require.NoError(t, err)
+
+		earliestBlock, err := txStore.FindEarliestUnconfirmedTxAttemptBlock(testutils.Context(t), ethClient.ConfiguredChainID())
+		require.NoError(t, err)
+		require.True(t, earliestBlock.Valid)
+		require.Equal(t, blockNum, earliestBlock.Int64)
+	})
+}
+
 func TestORM_SaveInsufficientEthAttempt(t *testing.T) {
 	t.Parallel()
 
@@ -1511,6 +1566,27 @@ func TestORM_CountUnconfirmedTransactions(t *testing.T) {
 	assert.Equal(t, int(count), 3)
 }
 
+func TestORM_CountTransactionsByState(t *testing.T) {
+	t.Parallel()
+
+	db := pgtest.NewSqlxDB(t)
+	cfg := configtest.NewGeneralConfig(t, nil)
+	txStore := cltest.NewTestTxStore(t, db, cfg.Database())
+	ethKeyStore := cltest.NewKeyStore(t, db, cfg.Database()).Eth()
+
+	_, fromAddress1 := cltest.MustInsertRandomKey(t, ethKeyStore)
+	_, fromAddress2 := cltest.MustInsertRandomKey(t, ethKeyStore)
+	_, fromAddress3 := cltest.MustInsertRandomKey(t, ethKeyStore)
+
+	cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, txStore, 0, fromAddress1)
+	cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, txStore, 1, fromAddress2)
+	cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, txStore, 2, fromAddress3)
+
+	count, err := txStore.CountTransactionsByState(testutils.Context(t), txmgrcommon.TxUnconfirmed, &cltest.FixtureChainID)
+	require.NoError(t, err)
+	assert.Equal(t, int(count), 3)
+}
+
 func TestORM_CountUnstartedTransactions(t *testing.T) {
 	t.Parallel()
 
diff --git a/core/chains/evm/txmgr/mocks/evm_tx_store.go b/core/chains/evm/txmgr/mocks/evm_tx_store.go
index 00efc1add98..bf3088b2aa1 100644
--- a/core/chains/evm/txmgr/mocks/evm_tx_store.go
+++ b/core/chains/evm/txmgr/mocks/evm_tx_store.go
@@ -14,6 +14,8 @@ import (
 
 	mock "github.com/stretchr/testify/mock"
 
+	null "gopkg.in/guregu/null.v4"
+
 	time "time"
 
 	types "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
@@ -59,6 +61,30 @@ func (_m *EvmTxStore) Close() {
 	_m.Called()
 }
 
+// CountTransactionsByState provides a mock function with given fields: ctx, state, chainID
+func (_m *EvmTxStore) CountTransactionsByState(ctx context.Context, state types.TxState, chainID *big.Int) (uint32, error) {
+	ret := _m.Called(ctx, state, chainID)
+
+	var r0 uint32
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, types.TxState, *big.Int) (uint32, error)); ok {
+		return rf(ctx, state, chainID)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, types.TxState, *big.Int) uint32); ok {
+		r0 = rf(ctx, state, chainID)
+	} else {
+		r0 = ret.Get(0).(uint32)
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, types.TxState, *big.Int) error); ok {
+		r1 = rf(ctx, state, chainID)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // CountUnconfirmedTransactions provides a mock function with given fields: ctx, fromAddress, chainID
 func (_m *EvmTxStore) CountUnconfirmedTransactions(ctx context.Context, fromAddress common.Address, chainID *big.Int) (uint32, error) {
 	ret := _m.Called(ctx, fromAddress, chainID)
@@ -145,6 +171,54 @@ func (_m *EvmTxStore) DeleteInProgressAttempt(ctx context.Context, attempt types
 	return r0
 }
 
+// FindEarliestUnconfirmedBroadcastTime provides a mock function with given fields: ctx, chainID
+func (_m *EvmTxStore) FindEarliestUnconfirmedBroadcastTime(ctx context.Context, chainID *big.Int) (null.Time, error) {
+	ret := _m.Called(ctx, chainID)
+
+	var r0 null.Time
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) (null.Time, error)); ok {
+		return rf(ctx, chainID)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) null.Time); ok {
+		r0 = rf(ctx, chainID)
+	} else {
+		r0 = ret.Get(0).(null.Time)
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *big.Int) error); ok {
+		r1 = rf(ctx, chainID)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// FindEarliestUnconfirmedTxAttemptBlock provides a mock function with given fields: ctx, chainID
+func (_m *EvmTxStore) FindEarliestUnconfirmedTxAttemptBlock(ctx context.Context, chainID *big.Int) (null.Int, error) {
+	ret := _m.Called(ctx, chainID)
+
+	var r0 null.Int
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) (null.Int, error)); ok {
+		return rf(ctx, chainID)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) null.Int); ok {
+		r0 = rf(ctx, chainID)
+	} else {
+		r0 = ret.Get(0).(null.Int)
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *big.Int) error); ok {
+		r1 = rf(ctx, chainID)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // FindLatestSequence provides a mock function with given fields: ctx, fromAddress, chainId
 func (_m *EvmTxStore) FindLatestSequence(ctx context.Context, fromAddress common.Address, chainId *big.Int) (evmtypes.Nonce, error) {
 	ret := _m.Called(ctx, fromAddress, chainId)
diff --git a/core/internal/cltest/mocks.go b/core/internal/cltest/mocks.go
index d49e94557e3..073b3ba246c 100644
--- a/core/internal/cltest/mocks.go
+++ b/core/internal/cltest/mocks.go
@@ -11,6 +11,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
+
 	"github.com/jmoiron/sqlx"
 
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
@@ -409,6 +411,18 @@ func NewLegacyChainsWithMockChain(t testing.TB, ethClient evmclient.Client, cfg
 
 }
 
+func NewLegacyChainsWithMockChainAndTxManager(t testing.TB, ethClient evmclient.Client, cfg legacyevm.AppConfig, txm txmgr.TxManager) legacyevm.LegacyChainContainer {
+	ch := new(evmmocks.Chain)
+	ch.On("Client").Return(ethClient)
+	ch.On("Logger").Return(logger.TestLogger(t))
+	scopedCfg := evmtest.NewChainScopedConfig(t, cfg)
+	ch.On("ID").Return(scopedCfg.EVM().ChainID())
+	ch.On("Config").Return(scopedCfg)
+	ch.On("TxManager").Return(txm)
+
+	return NewLegacyChainsWithChain(ch, cfg)
+}
+
 func NewLegacyChainsWithChain(ch legacyevm.Chain, cfg legacyevm.AppConfig) legacyevm.LegacyChainContainer {
 	m := map[string]legacyevm.Chain{ch.ID().String(): ch}
 	return legacyevm.NewLegacyChains(m, cfg.EVMConfigs())
diff --git a/core/services/chainlink/application.go b/core/services/chainlink/application.go
index 3d06789e7bc..1c9cd106ba9 100644
--- a/core/services/chainlink/application.go
+++ b/core/services/chainlink/application.go
@@ -238,11 +238,6 @@ func NewApplication(opts ApplicationOpts) (Application, error) {
 		globalLogger.Info("DatabaseBackup: periodic database backups are disabled. To enable automatic backups, set Database.Backup.Mode=lite or Database.Backup.Mode=full")
 	}
 
-	srvcs = append(srvcs, eventBroadcaster, mailMon)
-	srvcs = append(srvcs, relayerChainInterops.Services()...)
-	promReporter := promreporter.NewPromReporter(db.DB, globalLogger)
-	srvcs = append(srvcs, promReporter)
-
 	// pool must be started before all relayers and stopped after them
 	srvcs = append(srvcs, opts.MercuryPool)
 
@@ -254,6 +249,11 @@ func NewApplication(opts ApplicationOpts) (Application, error) {
 		return nil, fmt.Errorf("no evm chains found")
 	}
 
+	srvcs = append(srvcs, eventBroadcaster, mailMon)
+	srvcs = append(srvcs, relayerChainInterops.Services()...)
+	promReporter := promreporter.NewPromReporter(db.DB, legacyEVMChains, globalLogger)
+	srvcs = append(srvcs, promReporter)
+
 	// Initialize Local Users ORM and Authentication Provider specified in config
 	// BasicAdminUsersORM is initialized and required regardless of separate Authentication Provider
 	localAdminUsersORM := localauth.NewORM(db, cfg.WebServer().SessionTimeout().Duration(), globalLogger, cfg.Database(), auditLogger)
diff --git a/core/services/promreporter/prom_reporter.go b/core/services/promreporter/prom_reporter.go
index d115b1022c1..3e1444a6da1 100644
--- a/core/services/promreporter/prom_reporter.go
+++ b/core/services/promreporter/prom_reporter.go
@@ -3,18 +3,22 @@ package promreporter
 import (
 	"context"
 	"database/sql"
+	"fmt"
 	"math/big"
 	"sync"
 	"time"
 
+	txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
+
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"go.uber.org/multierr"
-	"gopkg.in/guregu/null.v4"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
@@ -24,6 +28,7 @@ type (
 	promReporter struct {
 		services.StateMachine
 		db           *sql.DB
+		chains       legacyevm.LegacyChainContainer
 		lggr         logger.Logger
 		backend      PrometheusBackend
 		newHeads     *utils.Mailbox[*evmtypes.Head]
@@ -86,7 +91,7 @@ func (defaultBackend) SetPipelineTaskRunsQueued(n int) {
 	promPipelineRunsQueued.Set(float64(n))
 }
 
-func NewPromReporter(db *sql.DB, lggr logger.Logger, opts ...interface{}) *promReporter {
+func NewPromReporter(db *sql.DB, chainContainer legacyevm.LegacyChainContainer, lggr logger.Logger, opts ...interface{}) *promReporter {
 	var backend PrometheusBackend = defaultBackend{}
 	period := 15 * time.Second
 	for _, opt := range opts {
@@ -101,6 +106,7 @@ func NewPromReporter(db *sql.DB, lggr logger.Logger, opts ...interface{}) *promR
 	chStop := make(chan struct{})
 	return &promReporter{
 		db:           db,
+		chains:       chainContainer,
 		lggr:         lggr.Named("PromReporter"),
 		backend:      backend,
 		newHeads:     utils.NewSingleMailbox[*evmtypes.Head](),
@@ -161,6 +167,14 @@ func (pr *promReporter) eventLoop() {
 	}
 }
 
+func (pr *promReporter) getTxm(evmChainID *big.Int) (txmgr.TxManager, error) {
+	chain, err := pr.chains.Get(evmChainID.String())
+	if err != nil {
+		return nil, fmt.Errorf("failed to get chain: %w", err)
+	}
+	return chain.TxManager(), nil
+}
+
 func (pr *promReporter) reportHeadMetrics(ctx context.Context, head *evmtypes.Head) {
 	evmChainID := head.EVMChainID.ToInt()
 	err := multierr.Combine(
@@ -175,40 +189,49 @@ func (pr *promReporter) reportHeadMetrics(ctx context.Context, head *evmtypes.He
 }
 
 func (pr *promReporter) reportPendingEthTxes(ctx context.Context, evmChainID *big.Int) (err error) {
-	var unconfirmed int64
-	if err := pr.db.QueryRowContext(ctx, `SELECT count(*) FROM evm.txes WHERE state = 'unconfirmed' AND evm_chain_id = $1`, evmChainID.String()).Scan(&unconfirmed); err != nil {
-		return errors.Wrap(err, "failed to query for unconfirmed eth_tx count")
+	txm, err := pr.getTxm(evmChainID)
+	if err != nil {
+		return fmt.Errorf("failed to get txm: %w", err)
+	}
+
+	unconfirmed, err := txm.CountTransactionsByState(ctx, txmgrcommon.TxUnconfirmed)
+	if err != nil {
+		return fmt.Errorf("failed to query for unconfirmed eth_tx count: %w", err)
 	}
-	pr.backend.SetUnconfirmedTransactions(evmChainID, unconfirmed)
+	pr.backend.SetUnconfirmedTransactions(evmChainID, int64(unconfirmed))
 	return nil
 }
 
 func (pr *promReporter) reportMaxUnconfirmedAge(ctx context.Context, evmChainID *big.Int) (err error) {
-	var broadcastAt null.Time
-	now := time.Now()
-	if err := pr.db.QueryRowContext(ctx, `SELECT min(initial_broadcast_at) FROM evm.txes WHERE state = 'unconfirmed' AND evm_chain_id = $1`, evmChainID.String()).Scan(&broadcastAt); err != nil {
-		return errors.Wrap(err, "failed to query for unconfirmed eth_tx count")
+	txm, err := pr.getTxm(evmChainID)
+	if err != nil {
+		return fmt.Errorf("failed to get txm: %w", err)
 	}
+
+	broadcastAt, err := txm.FindEarliestUnconfirmedBroadcastTime(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to query for min broadcast time: %w", err)
+	}
+
 	var seconds float64
 	if broadcastAt.Valid {
-		nanos := now.Sub(broadcastAt.ValueOrZero())
-		seconds = float64(nanos) / 1000000000
+		seconds = time.Since(broadcastAt.ValueOrZero()).Seconds()
 	}
 	pr.backend.SetMaxUnconfirmedAge(evmChainID, seconds)
 	return nil
 }
 
 func (pr *promReporter) reportMaxUnconfirmedBlocks(ctx context.Context, head *evmtypes.Head) (err error) {
-	var earliestUnconfirmedTxBlock null.Int
-	err = pr.db.QueryRowContext(ctx, `
-SELECT MIN(broadcast_before_block_num) FROM evm.tx_attempts
-JOIN evm.txes ON evm.txes.id = evm.tx_attempts.eth_tx_id
-WHERE evm.txes.state = 'unconfirmed'
-AND evm_chain_id = $1
-AND evm.txes.state = 'unconfirmed'`, head.EVMChainID.String()).Scan(&earliestUnconfirmedTxBlock)
+	txm, err := pr.getTxm(head.EVMChainID.ToInt())
 	if err != nil {
-		return errors.Wrap(err, "failed to query for min broadcast_before_block_num")
+		return fmt.Errorf("failed to get txm: %w", err)
 	}
+
+	earliestUnconfirmedTxBlock, err := txm.FindEarliestUnconfirmedTxAttemptBlock(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to query for earliest unconfirmed tx block: %w", err)
+	}
+
 	var blocksUnconfirmed int64
 	if !earliestUnconfirmedTxBlock.IsZero() {
 		blocksUnconfirmed = head.Number - earliestUnconfirmedTxBlock.ValueOrZero()
diff --git a/core/services/promreporter/prom_reporter_test.go b/core/services/promreporter/prom_reporter_test.go
index 1f15d94418d..54e3a5d3fab 100644
--- a/core/services/promreporter/prom_reporter_test.go
+++ b/core/services/promreporter/prom_reporter_test.go
@@ -6,15 +6,21 @@ import (
 	"testing"
 	"time"
 
+	"github.com/jmoiron/sqlx"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
+	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/promreporter"
@@ -25,12 +31,38 @@ func newHead() evmtypes.Head {
 	return evmtypes.Head{Number: 42, EVMChainID: utils.NewBigI(0)}
 }
 
+func newLegacyChainContainer(t *testing.T, db *sqlx.DB) legacyevm.LegacyChainContainer {
+	config, dbConfig, evmConfig := txmgr.MakeTestConfigs(t)
+	keyStore := cltest.NewKeyStore(t, db, dbConfig).Eth()
+	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
+	estimator := gas.NewEstimator(logger.TestLogger(t), ethClient, config, evmConfig.GasEstimator())
+	lggr := logger.TestLogger(t)
+	lp := logpoller.NewLogPoller(logpoller.NewORM(testutils.FixtureChainID, db, lggr, pgtest.NewQConfig(true)), ethClient, lggr, 100*time.Millisecond, false, 2, 3, 2, 1000)
+
+	txm, err := txmgr.NewTxm(
+		db,
+		evmConfig,
+		evmConfig.GasEstimator(),
+		evmConfig.Transactions(),
+		dbConfig,
+		dbConfig.Listener(),
+		ethClient,
+		lggr,
+		lp,
+		keyStore,
+		estimator)
+	require.NoError(t, err)
+
+	cfg := configtest.NewGeneralConfig(t, nil)
+	return cltest.NewLegacyChainsWithMockChainAndTxManager(t, ethClient, cfg, txm)
+}
+
 func Test_PromReporter_OnNewLongestChain(t *testing.T) {
 	t.Run("with nothing in the database", func(t *testing.T) {
-		d := pgtest.NewSqlDB(t)
+		db := pgtest.NewSqlxDB(t)
 
 		backend := mocks.NewPrometheusBackend(t)
-		reporter := promreporter.NewPromReporter(d, logger.TestLogger(t), backend, 10*time.Millisecond)
+		reporter := promreporter.NewPromReporter(db.DB, newLegacyChainContainer(t, db), logger.TestLogger(t), backend, 10*time.Millisecond)
 
 		var subscribeCalls atomic.Int32
 
@@ -74,7 +106,7 @@ func Test_PromReporter_OnNewLongestChain(t *testing.T) {
 				subscribeCalls.Add(1)
 			}).
 			Return()
-		reporter := promreporter.NewPromReporter(db.DB, logger.TestLogger(t), backend, 10*time.Millisecond)
+		reporter := promreporter.NewPromReporter(db.DB, newLegacyChainContainer(t, db), logger.TestLogger(t), backend, 10*time.Millisecond)
 		require.NoError(t, reporter.Start(testutils.Context(t)))
 		defer func() { assert.NoError(t, reporter.Close()) }()
 
@@ -91,11 +123,10 @@ func Test_PromReporter_OnNewLongestChain(t *testing.T) {
 
 	t.Run("with unfinished pipeline task runs", func(t *testing.T) {
 		db := pgtest.NewSqlxDB(t)
-
 		pgtest.MustExec(t, db, `SET CONSTRAINTS pipeline_task_runs_pipeline_run_id_fkey DEFERRED`)
 
 		backend := mocks.NewPrometheusBackend(t)
-		reporter := promreporter.NewPromReporter(db.DB, logger.TestLogger(t), backend, 10*time.Millisecond)
+		reporter := promreporter.NewPromReporter(db.DB, newLegacyChainContainer(t, db), logger.TestLogger(t), backend, 10*time.Millisecond)
 
 		cltest.MustInsertUnfinishedPipelineTaskRun(t, db, 1)
 		cltest.MustInsertUnfinishedPipelineTaskRun(t, db, 1)
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 929fec5a3e6..6af224157a7 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -56,6 +56,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- `PromReporter` no longer directly reads txm related status from the db, and instead uses the txStore API.
 - `L2Suggested` mode is now called `SuggestedPrice`
 - Console logs will now escape (non-whitespace) control characters
 

From fa2834db90bc259650943255b26717534b6c919a Mon Sep 17 00:00:00 2001
From: Justin Kaseman <justinkaseman@live.com>
Date: Thu, 30 Nov 2023 15:54:23 -0500
Subject: [PATCH 048/130] FUN-1130: Move Functions Coordinator v1.1 to
 production folder (#11431)

---
 .../functions/v1_1_0/FunctionsBilling.sol     | 391 ++++++++++++++++++
 .../functions/v1_1_0/FunctionsCoordinator.sol | 184 +++++++++
 .../v1_1_0/libraries/ChainSpecificUtil.sol    |  78 ++++
 .../functions/v1_1_0/ocr/OCR2Abstract.sol     | 103 +++++
 .../v0.8/functions/v1_1_0/ocr/OCR2Base.sol    | 351 ++++++++++++++++
 5 files changed, 1107 insertions(+)
 create mode 100644 contracts/src/v0.8/functions/v1_1_0/FunctionsBilling.sol
 create mode 100644 contracts/src/v0.8/functions/v1_1_0/FunctionsCoordinator.sol
 create mode 100644 contracts/src/v0.8/functions/v1_1_0/libraries/ChainSpecificUtil.sol
 create mode 100644 contracts/src/v0.8/functions/v1_1_0/ocr/OCR2Abstract.sol
 create mode 100644 contracts/src/v0.8/functions/v1_1_0/ocr/OCR2Base.sol

diff --git a/contracts/src/v0.8/functions/v1_1_0/FunctionsBilling.sol b/contracts/src/v0.8/functions/v1_1_0/FunctionsBilling.sol
new file mode 100644
index 00000000000..ff345003741
--- /dev/null
+++ b/contracts/src/v0.8/functions/v1_1_0/FunctionsBilling.sol
@@ -0,0 +1,391 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.19;
+
+import {IFunctionsSubscriptions} from "../v1_0_0/interfaces/IFunctionsSubscriptions.sol";
+import {AggregatorV3Interface} from "../../shared/interfaces/AggregatorV3Interface.sol";
+import {IFunctionsBilling} from "../v1_0_0/interfaces/IFunctionsBilling.sol";
+
+import {Routable} from "../v1_0_0/Routable.sol";
+import {FunctionsResponse} from "../v1_0_0/libraries/FunctionsResponse.sol";
+
+import {SafeCast} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/math/SafeCast.sol";
+
+import {ChainSpecificUtil} from "./libraries/ChainSpecificUtil.sol";
+
+/// @title Functions Billing contract
+/// @notice Contract that calculates payment from users to the nodes of the Decentralized Oracle Network (DON).
+abstract contract FunctionsBilling is Routable, IFunctionsBilling {
+  using FunctionsResponse for FunctionsResponse.RequestMeta;
+  using FunctionsResponse for FunctionsResponse.Commitment;
+  using FunctionsResponse for FunctionsResponse.FulfillResult;
+
+  uint256 private constant REASONABLE_GAS_PRICE_CEILING = 1_000_000_000_000_000; // 1 million gwei
+
+  event RequestBilled(
+    bytes32 indexed requestId,
+    uint96 juelsPerGas,
+    uint256 l1FeeShareWei,
+    uint96 callbackCostJuels,
+    uint96 totalCostJuels
+  );
+
+  // ================================================================
+  // |                  Request Commitment state                    |
+  // ================================================================
+
+  mapping(bytes32 requestId => bytes32 commitmentHash) private s_requestCommitments;
+
+  event CommitmentDeleted(bytes32 requestId);
+
+  // ================================================================
+  // |                     Configuration state                      |
+  // ================================================================
+
+  struct Config {
+    uint32 fulfillmentGasPriceOverEstimationBP; // ══╗ Percentage of gas price overestimation to account for changes in gas price between request and response. Held as basis points (one hundredth of 1 percentage point)
+    uint32 feedStalenessSeconds; //                  ║ How long before we consider the feed price to be stale and fallback to fallbackNativePerUnitLink.
+    uint32 gasOverheadBeforeCallback; //             ║ Represents the average gas execution cost before the fulfillment callback. This amount is always billed for every request.
+    uint32 gasOverheadAfterCallback; //              ║ Represents the average gas execution cost after the fulfillment callback. This amount is always billed for every request.
+    uint72 donFee; //                                ║ Additional flat fee (in Juels of LINK) that will be split between Node Operators. Max value is 2^80 - 1 == 1.2m LINK.
+    uint40 minimumEstimateGasPriceWei; //            ║ The lowest amount of wei that will be used as the tx.gasprice when estimating the cost to fulfill the request
+    uint16 maxSupportedRequestDataVersion; // ═══════╝ The highest support request data version supported by the node. All lower versions should also be supported.
+    uint224 fallbackNativePerUnitLink; // ═══════════╗ Fallback NATIVE CURRENCY / LINK conversion rate if the data feed is stale
+    uint32 requestTimeoutSeconds; // ════════════════╝ How many seconds it takes before we consider a request to be timed out
+  }
+
+  Config private s_config;
+
+  event ConfigUpdated(Config config);
+
+  error UnsupportedRequestDataVersion();
+  error InsufficientBalance();
+  error InvalidSubscription();
+  error UnauthorizedSender();
+  error MustBeSubOwner(address owner);
+  error InvalidLinkWeiPrice(int256 linkWei);
+  error PaymentTooLarge();
+  error NoTransmittersSet();
+  error InvalidCalldata();
+
+  // ================================================================
+  // |                        Balance state                         |
+  // ================================================================
+
+  mapping(address transmitter => uint96 balanceJuelsLink) private s_withdrawableTokens;
+  // Pool together collected DON fees
+  // Disperse them on withdrawal or change in OCR configuration
+  uint96 internal s_feePool;
+
+  AggregatorV3Interface private s_linkToNativeFeed;
+
+  // ================================================================
+  // |                       Initialization                         |
+  // ================================================================
+  constructor(address router, Config memory config, address linkToNativeFeed) Routable(router) {
+    s_linkToNativeFeed = AggregatorV3Interface(linkToNativeFeed);
+
+    updateConfig(config);
+  }
+
+  // ================================================================
+  // |                        Configuration                         |
+  // ================================================================
+
+  /// @notice Gets the Chainlink Coordinator's billing configuration
+  /// @return config
+  function getConfig() external view returns (Config memory) {
+    return s_config;
+  }
+
+  /// @notice Sets the Chainlink Coordinator's billing configuration
+  /// @param config - See the contents of the Config struct in IFunctionsBilling.Config for more information
+  function updateConfig(Config memory config) public {
+    _onlyOwner();
+
+    s_config = config;
+    emit ConfigUpdated(config);
+  }
+
+  // ================================================================
+  // |                       Fee Calculation                        |
+  // ================================================================
+
+  /// @inheritdoc IFunctionsBilling
+  function getDONFee(bytes memory /* requestData */) public view override returns (uint72) {
+    return s_config.donFee;
+  }
+
+  /// @inheritdoc IFunctionsBilling
+  function getAdminFee() public view override returns (uint72) {
+    return _getRouter().getAdminFee();
+  }
+
+  /// @inheritdoc IFunctionsBilling
+  function getWeiPerUnitLink() public view returns (uint256) {
+    Config memory config = s_config;
+    (, int256 weiPerUnitLink, , uint256 timestamp, ) = s_linkToNativeFeed.latestRoundData();
+    // solhint-disable-next-line not-rely-on-time
+    if (config.feedStalenessSeconds < block.timestamp - timestamp && config.feedStalenessSeconds > 0) {
+      return config.fallbackNativePerUnitLink;
+    }
+    if (weiPerUnitLink <= 0) {
+      revert InvalidLinkWeiPrice(weiPerUnitLink);
+    }
+    return uint256(weiPerUnitLink);
+  }
+
+  function _getJuelsFromWei(uint256 amountWei) private view returns (uint96) {
+    // (1e18 juels/link) * wei / (wei/link) = juels
+    // There are only 1e9*1e18 = 1e27 juels in existence, should not exceed uint96 (2^96 ~ 7e28)
+    return SafeCast.toUint96((1e18 * amountWei) / getWeiPerUnitLink());
+  }
+
+  // ================================================================
+  // |                       Cost Estimation                        |
+  // ================================================================
+
+  /// @inheritdoc IFunctionsBilling
+  function estimateCost(
+    uint64 subscriptionId,
+    bytes calldata data,
+    uint32 callbackGasLimit,
+    uint256 gasPriceWei
+  ) external view override returns (uint96) {
+    _getRouter().isValidCallbackGasLimit(subscriptionId, callbackGasLimit);
+    // Reasonable ceilings to prevent integer overflows
+    if (gasPriceWei > REASONABLE_GAS_PRICE_CEILING) {
+      revert InvalidCalldata();
+    }
+    uint72 adminFee = getAdminFee();
+    uint72 donFee = getDONFee(data);
+    return _calculateCostEstimate(callbackGasLimit, gasPriceWei, donFee, adminFee);
+  }
+
+  /// @notice Estimate the cost in Juels of LINK
+  // that will be charged to a subscription to fulfill a Functions request
+  // Gas Price can be overestimated to account for flucuations between request and response time
+  function _calculateCostEstimate(
+    uint32 callbackGasLimit,
+    uint256 gasPriceWei,
+    uint72 donFee,
+    uint72 adminFee
+  ) internal view returns (uint96) {
+    // If gas price is less than the minimum fulfillment gas price, override to using the minimum
+    if (gasPriceWei < s_config.minimumEstimateGasPriceWei) {
+      gasPriceWei = s_config.minimumEstimateGasPriceWei;
+    }
+
+    uint256 gasPriceWithOverestimation = gasPriceWei +
+      ((gasPriceWei * s_config.fulfillmentGasPriceOverEstimationBP) / 10_000);
+    /// @NOTE: Basis Points are 1/100th of 1%, divide by 10_000 to bring back to original units
+
+    uint256 executionGas = s_config.gasOverheadBeforeCallback + s_config.gasOverheadAfterCallback + callbackGasLimit;
+    uint256 l1FeeWei = ChainSpecificUtil._getCurrentTxL1GasFees(msg.data);
+    uint96 estimatedGasReimbursementJuels = _getJuelsFromWei((gasPriceWithOverestimation * executionGas) + l1FeeWei);
+
+    uint96 feesJuels = uint96(donFee) + uint96(adminFee);
+
+    return estimatedGasReimbursementJuels + feesJuels;
+  }
+
+  // ================================================================
+  // |                           Billing                            |
+  // ================================================================
+
+  /// @notice Initiate the billing process for an Functions request
+  /// @dev Only callable by the Functions Router
+  /// @param request - Chainlink Functions request data, see FunctionsResponse.RequestMeta for the structure
+  /// @return commitment - The parameters of the request that must be held consistent at response time
+  function _startBilling(
+    FunctionsResponse.RequestMeta memory request
+  ) internal returns (FunctionsResponse.Commitment memory commitment) {
+    Config memory config = s_config;
+
+    // Nodes should support all past versions of the structure
+    if (request.dataVersion > config.maxSupportedRequestDataVersion) {
+      revert UnsupportedRequestDataVersion();
+    }
+
+    uint72 donFee = getDONFee(request.data);
+    uint96 estimatedTotalCostJuels = _calculateCostEstimate(
+      request.callbackGasLimit,
+      tx.gasprice,
+      donFee,
+      request.adminFee
+    );
+
+    // Check that subscription can afford the estimated cost
+    if ((request.availableBalance) < estimatedTotalCostJuels) {
+      revert InsufficientBalance();
+    }
+
+    uint32 timeoutTimestamp = uint32(block.timestamp + config.requestTimeoutSeconds);
+    bytes32 requestId = keccak256(
+      abi.encode(
+        address(this),
+        request.requestingContract,
+        request.subscriptionId,
+        request.initiatedRequests + 1,
+        keccak256(request.data),
+        request.dataVersion,
+        request.callbackGasLimit,
+        estimatedTotalCostJuels,
+        timeoutTimestamp,
+        // solhint-disable-next-line avoid-tx-origin
+        tx.origin
+      )
+    );
+
+    commitment = FunctionsResponse.Commitment({
+      adminFee: request.adminFee,
+      coordinator: address(this),
+      client: request.requestingContract,
+      subscriptionId: request.subscriptionId,
+      callbackGasLimit: request.callbackGasLimit,
+      estimatedTotalCostJuels: estimatedTotalCostJuels,
+      timeoutTimestamp: timeoutTimestamp,
+      requestId: requestId,
+      donFee: donFee,
+      gasOverheadBeforeCallback: config.gasOverheadBeforeCallback,
+      gasOverheadAfterCallback: config.gasOverheadAfterCallback
+    });
+
+    s_requestCommitments[requestId] = keccak256(abi.encode(commitment));
+
+    return commitment;
+  }
+
+  /// @notice Finalize billing process for an Functions request by sending a callback to the Client contract and then charging the subscription
+  /// @param requestId identifier for the request that was generated by the Registry in the beginBilling commitment
+  /// @param response response data from DON consensus
+  /// @param err error from DON consensus
+  /// @param reportBatchSize the number of fulfillments in the transmitter's report
+  /// @return result fulfillment result
+  /// @dev Only callable by a node that has been approved on the Coordinator
+  /// @dev simulated offchain to determine if sufficient balance is present to fulfill the request
+  function _fulfillAndBill(
+    bytes32 requestId,
+    bytes memory response,
+    bytes memory err,
+    bytes memory onchainMetadata,
+    bytes memory /* offchainMetadata TODO: use in getDonFee() for dynamic billing */,
+    uint8 reportBatchSize
+  ) internal returns (FunctionsResponse.FulfillResult) {
+    FunctionsResponse.Commitment memory commitment = abi.decode(onchainMetadata, (FunctionsResponse.Commitment));
+
+    uint256 gasOverheadWei = (commitment.gasOverheadBeforeCallback + commitment.gasOverheadAfterCallback) * tx.gasprice;
+    uint256 l1FeeShareWei = ChainSpecificUtil._getCurrentTxL1GasFees(msg.data) / reportBatchSize;
+    // Gas overhead without callback
+    uint96 gasOverheadJuels = _getJuelsFromWei(gasOverheadWei + l1FeeShareWei);
+    uint96 juelsPerGas = _getJuelsFromWei(tx.gasprice);
+
+    // The Functions Router will perform the callback to the client contract
+    (FunctionsResponse.FulfillResult resultCode, uint96 callbackCostJuels) = _getRouter().fulfill(
+      response,
+      err,
+      juelsPerGas,
+      gasOverheadJuels + commitment.donFee, // cost without callback or admin fee, those will be added by the Router
+      msg.sender,
+      commitment
+    );
+
+    // The router will only pay the DON on successfully processing the fulfillment
+    // In these two fulfillment results the user has been charged
+    // Otherwise, the Coordinator should hold on to the request commitment
+    if (
+      resultCode == FunctionsResponse.FulfillResult.FULFILLED ||
+      resultCode == FunctionsResponse.FulfillResult.USER_CALLBACK_ERROR
+    ) {
+      delete s_requestCommitments[requestId];
+      // Reimburse the transmitter for the fulfillment gas cost
+      s_withdrawableTokens[msg.sender] = gasOverheadJuels + callbackCostJuels;
+      // Put donFee into the pool of fees, to be split later
+      // Saves on storage writes that would otherwise be charged to the user
+      s_feePool += commitment.donFee;
+      emit RequestBilled({
+        requestId: requestId,
+        juelsPerGas: juelsPerGas,
+        l1FeeShareWei: l1FeeShareWei,
+        callbackCostJuels: callbackCostJuels,
+        totalCostJuels: gasOverheadJuels + callbackCostJuels + commitment.donFee + commitment.adminFee
+      });
+    }
+
+    return resultCode;
+  }
+
+  // ================================================================
+  // |                       Request Timeout                        |
+  // ================================================================
+
+  /// @inheritdoc IFunctionsBilling
+  /// @dev Only callable by the Router
+  /// @dev Used by FunctionsRouter.sol during timeout of a request
+  function deleteCommitment(bytes32 requestId) external override onlyRouter {
+    // Delete commitment
+    delete s_requestCommitments[requestId];
+    emit CommitmentDeleted(requestId);
+  }
+
+  // ================================================================
+  // |                    Fund withdrawal                           |
+  // ================================================================
+
+  /// @inheritdoc IFunctionsBilling
+  function oracleWithdraw(address recipient, uint96 amount) external {
+    _disperseFeePool();
+
+    if (amount == 0) {
+      amount = s_withdrawableTokens[msg.sender];
+    } else if (s_withdrawableTokens[msg.sender] < amount) {
+      revert InsufficientBalance();
+    }
+    s_withdrawableTokens[msg.sender] -= amount;
+    IFunctionsSubscriptions(address(_getRouter())).oracleWithdraw(recipient, amount);
+  }
+
+  /// @inheritdoc IFunctionsBilling
+  /// @dev Only callable by the Coordinator owner
+  function oracleWithdrawAll() external {
+    _onlyOwner();
+    _disperseFeePool();
+
+    address[] memory transmitters = _getTransmitters();
+
+    // Bounded by "maxNumOracles" on OCR2Abstract.sol
+    for (uint256 i = 0; i < transmitters.length; ++i) {
+      uint96 balance = s_withdrawableTokens[transmitters[i]];
+      if (balance > 0) {
+        s_withdrawableTokens[transmitters[i]] = 0;
+        IFunctionsSubscriptions(address(_getRouter())).oracleWithdraw(transmitters[i], balance);
+      }
+    }
+  }
+
+  // Overriden in FunctionsCoordinator, which has visibility into transmitters
+  function _getTransmitters() internal view virtual returns (address[] memory);
+
+  // DON fees are collected into a pool s_feePool
+  // When OCR configuration changes, or any oracle withdraws, this must be dispersed
+  function _disperseFeePool() internal {
+    if (s_feePool == 0) {
+      return;
+    }
+    // All transmitters are assumed to also be observers
+    // Pay out the DON fee to all transmitters
+    address[] memory transmitters = _getTransmitters();
+    uint256 numberOfTransmitters = transmitters.length;
+    if (numberOfTransmitters == 0) {
+      revert NoTransmittersSet();
+    }
+    uint96 feePoolShare = s_feePool / uint96(numberOfTransmitters);
+    // Bounded by "maxNumOracles" on OCR2Abstract.sol
+    for (uint256 i = 0; i < numberOfTransmitters; ++i) {
+      s_withdrawableTokens[transmitters[i]] += feePoolShare;
+    }
+    s_feePool -= feePoolShare * uint96(numberOfTransmitters);
+  }
+
+  // Overriden in FunctionsCoordinator.sol
+  function _onlyOwner() internal view virtual;
+}
diff --git a/contracts/src/v0.8/functions/v1_1_0/FunctionsCoordinator.sol b/contracts/src/v0.8/functions/v1_1_0/FunctionsCoordinator.sol
new file mode 100644
index 00000000000..0a5da643a57
--- /dev/null
+++ b/contracts/src/v0.8/functions/v1_1_0/FunctionsCoordinator.sol
@@ -0,0 +1,184 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.19;
+
+import {IFunctionsCoordinator} from "../v1_0_0/interfaces/IFunctionsCoordinator.sol";
+import {ITypeAndVersion} from "../../shared/interfaces/ITypeAndVersion.sol";
+
+import {FunctionsBilling} from "./FunctionsBilling.sol";
+import {OCR2Base} from "./ocr/OCR2Base.sol";
+import {FunctionsResponse} from "../v1_0_0/libraries/FunctionsResponse.sol";
+
+/// @title Functions Coordinator contract
+/// @notice Contract that nodes of a Decentralized Oracle Network (DON) interact with
+contract FunctionsCoordinator is OCR2Base, IFunctionsCoordinator, FunctionsBilling {
+  using FunctionsResponse for FunctionsResponse.RequestMeta;
+  using FunctionsResponse for FunctionsResponse.Commitment;
+  using FunctionsResponse for FunctionsResponse.FulfillResult;
+
+  /// @inheritdoc ITypeAndVersion
+  // solhint-disable-next-line chainlink-solidity/all-caps-constant-storage-variables
+  string public constant override typeAndVersion = "Functions Coordinator v1.1.0";
+
+  event OracleRequest(
+    bytes32 indexed requestId,
+    address indexed requestingContract,
+    address requestInitiator,
+    uint64 subscriptionId,
+    address subscriptionOwner,
+    bytes data,
+    uint16 dataVersion,
+    bytes32 flags,
+    uint64 callbackGasLimit,
+    FunctionsResponse.Commitment commitment
+  );
+  event OracleResponse(bytes32 indexed requestId, address transmitter);
+
+  error InconsistentReportData();
+  error EmptyPublicKey();
+  error UnauthorizedPublicKeyChange();
+
+  bytes private s_donPublicKey;
+  bytes private s_thresholdPublicKey;
+
+  constructor(
+    address router,
+    Config memory config,
+    address linkToNativeFeed
+  ) OCR2Base() FunctionsBilling(router, config, linkToNativeFeed) {}
+
+  /// @inheritdoc IFunctionsCoordinator
+  function getThresholdPublicKey() external view override returns (bytes memory) {
+    if (s_thresholdPublicKey.length == 0) {
+      revert EmptyPublicKey();
+    }
+    return s_thresholdPublicKey;
+  }
+
+  /// @inheritdoc IFunctionsCoordinator
+  function setThresholdPublicKey(bytes calldata thresholdPublicKey) external override onlyOwner {
+    if (thresholdPublicKey.length == 0) {
+      revert EmptyPublicKey();
+    }
+    s_thresholdPublicKey = thresholdPublicKey;
+  }
+
+  /// @inheritdoc IFunctionsCoordinator
+  function getDONPublicKey() external view override returns (bytes memory) {
+    if (s_donPublicKey.length == 0) {
+      revert EmptyPublicKey();
+    }
+    return s_donPublicKey;
+  }
+
+  /// @inheritdoc IFunctionsCoordinator
+  function setDONPublicKey(bytes calldata donPublicKey) external override onlyOwner {
+    if (donPublicKey.length == 0) {
+      revert EmptyPublicKey();
+    }
+    s_donPublicKey = donPublicKey;
+  }
+
+  /// @dev check if node is in current transmitter list
+  function _isTransmitter(address node) internal view returns (bool) {
+    address[] memory nodes = s_transmitters;
+    // Bounded by "maxNumOracles" on OCR2Abstract.sol
+    for (uint256 i = 0; i < nodes.length; ++i) {
+      if (nodes[i] == node) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /// @inheritdoc IFunctionsCoordinator
+  function startRequest(
+    FunctionsResponse.RequestMeta calldata request
+  ) external override onlyRouter returns (FunctionsResponse.Commitment memory commitment) {
+    commitment = _startBilling(request);
+
+    emit OracleRequest(
+      commitment.requestId,
+      request.requestingContract,
+      // solhint-disable-next-line avoid-tx-origin
+      tx.origin,
+      request.subscriptionId,
+      request.subscriptionOwner,
+      request.data,
+      request.dataVersion,
+      request.flags,
+      request.callbackGasLimit,
+      commitment
+    );
+
+    return commitment;
+  }
+
+  /// @dev DON fees are pooled together. If the OCR configuration is going to change, these need to be distributed.
+  function _beforeSetConfig(uint8 /* _f */, bytes memory /* _onchainConfig */) internal override {
+    if (_getTransmitters().length > 0) {
+      _disperseFeePool();
+    }
+  }
+
+  /// @dev Used by FunctionsBilling.sol
+  function _getTransmitters() internal view override returns (address[] memory) {
+    return s_transmitters;
+  }
+
+  /// @dev Report hook called within OCR2Base.sol
+  function _report(
+    uint256 /*initialGas*/,
+    address /*transmitter*/,
+    uint8 /*signerCount*/,
+    address[MAX_NUM_ORACLES] memory /*signers*/,
+    bytes calldata report
+  ) internal override {
+    (
+      bytes32[] memory requestIds,
+      bytes[] memory results,
+      bytes[] memory errors,
+      bytes[] memory onchainMetadata,
+      bytes[] memory offchainMetadata
+    ) = abi.decode(report, (bytes32[], bytes[], bytes[], bytes[], bytes[]));
+    uint256 numberOfFulfillments = uint8(requestIds.length);
+
+    if (
+      numberOfFulfillments == 0 ||
+      numberOfFulfillments != results.length ||
+      numberOfFulfillments != errors.length ||
+      numberOfFulfillments != onchainMetadata.length ||
+      numberOfFulfillments != offchainMetadata.length
+    ) {
+      revert ReportInvalid("Fields must be equal length");
+    }
+
+    // Bounded by "MaxRequestBatchSize" on the Job's ReportingPluginConfig
+    for (uint256 i = 0; i < numberOfFulfillments; ++i) {
+      FunctionsResponse.FulfillResult result = FunctionsResponse.FulfillResult(
+        _fulfillAndBill(
+          requestIds[i],
+          results[i],
+          errors[i],
+          onchainMetadata[i],
+          offchainMetadata[i],
+          uint8(numberOfFulfillments) // will not exceed "MaxRequestBatchSize" on the Job's ReportingPluginConfig
+        )
+      );
+
+      // Emit on successfully processing the fulfillment
+      // In these two fulfillment results the user has been charged
+      // Otherwise, the DON will re-try
+      if (
+        result == FunctionsResponse.FulfillResult.FULFILLED ||
+        result == FunctionsResponse.FulfillResult.USER_CALLBACK_ERROR
+      ) {
+        emit OracleResponse(requestIds[i], msg.sender);
+      }
+    }
+  }
+
+  /// @dev Used in FunctionsBilling.sol
+  function _onlyOwner() internal view override {
+    _validateOwnership();
+  }
+}
diff --git a/contracts/src/v0.8/functions/v1_1_0/libraries/ChainSpecificUtil.sol b/contracts/src/v0.8/functions/v1_1_0/libraries/ChainSpecificUtil.sol
new file mode 100644
index 00000000000..68d346e676d
--- /dev/null
+++ b/contracts/src/v0.8/functions/v1_1_0/libraries/ChainSpecificUtil.sol
@@ -0,0 +1,78 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.19;
+
+import {ArbGasInfo} from "../../../vendor/@arbitrum/nitro-contracts/src/precompiles/ArbGasInfo.sol";
+import {GasPriceOracle} from "../../../vendor/@eth-optimism/contracts-bedrock/v0.16.2/src/L2/GasPriceOracle.sol";
+
+/// @dev A library that abstracts out opcodes that behave differently across chains.
+/// @dev The methods below return values that are pertinent to the given chain.
+library ChainSpecificUtil {
+  // ------------ Start Arbitrum Constants ------------
+
+  /// @dev ARBGAS_ADDR is the address of the ArbGasInfo precompile on Arbitrum.
+  /// @dev reference: https://github.com/OffchainLabs/nitro/blob/v2.0.14/contracts/src/precompiles/ArbGasInfo.sol#L10
+  address private constant ARBGAS_ADDR = address(0x000000000000000000000000000000000000006C);
+  ArbGasInfo private constant ARBGAS = ArbGasInfo(ARBGAS_ADDR);
+
+  uint256 private constant ARB_MAINNET_CHAIN_ID = 42161;
+  uint256 private constant ARB_GOERLI_TESTNET_CHAIN_ID = 421613;
+  uint256 private constant ARB_SEPOLIA_TESTNET_CHAIN_ID = 421614;
+
+  // ------------ End Arbitrum Constants ------------
+
+  // ------------ Start Optimism Constants ------------
+  /// @dev L1_FEE_DATA_PADDING includes 35 bytes for L1 data padding for Optimism
+  bytes internal constant L1_FEE_DATA_PADDING =
+    "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff";
+  /// @dev OVM_GASPRICEORACLE_ADDR is the address of the GasPriceOracle precompile on Optimism.
+  /// @dev reference: https://community.optimism.io/docs/developers/build/transaction-fees/#estimating-the-l1-data-fee
+  address private constant OVM_GASPRICEORACLE_ADDR = address(0x420000000000000000000000000000000000000F);
+  GasPriceOracle private constant OVM_GASPRICEORACLE = GasPriceOracle(OVM_GASPRICEORACLE_ADDR);
+
+  uint256 private constant OP_MAINNET_CHAIN_ID = 10;
+  uint256 private constant OP_GOERLI_CHAIN_ID = 420;
+  uint256 private constant OP_SEPOLIA_CHAIN_ID = 11155420;
+
+  /// @dev Base is a OP stack based rollup and follows the same L1 pricing logic as Optimism.
+  uint256 private constant BASE_MAINNET_CHAIN_ID = 8453;
+  uint256 private constant BASE_GOERLI_CHAIN_ID = 84531;
+  uint256 private constant BASE_SEPOLIA_CHAIN_ID = 84532;
+
+  // ------------ End Optimism Constants ------------
+
+  /// @notice Returns the L1 fees in wei that will be paid for the current transaction, given any calldata
+  /// @notice for the current transaction.
+  /// @notice When on a known Arbitrum chain, it uses ArbGas.getCurrentTxL1GasFees to get the fees.
+  /// @notice On Arbitrum, the provided calldata is not used to calculate the fees.
+  /// @notice On Optimism, the provided calldata is passed to the GasPriceOracle predeploy
+  /// @notice and getL1Fee is called to get the fees.
+  function _getCurrentTxL1GasFees(bytes memory txCallData) internal view returns (uint256 l1FeeWei) {
+    uint256 chainid = block.chainid;
+    if (_isArbitrumChainId(chainid)) {
+      return ARBGAS.getCurrentTxL1GasFees();
+    } else if (_isOptimismChainId(chainid)) {
+      return OVM_GASPRICEORACLE.getL1Fee(bytes.concat(txCallData, L1_FEE_DATA_PADDING));
+    }
+    return 0;
+  }
+
+  /// @notice Return true if and only if the provided chain ID is an Arbitrum chain ID.
+  function _isArbitrumChainId(uint256 chainId) internal pure returns (bool) {
+    return
+      chainId == ARB_MAINNET_CHAIN_ID ||
+      chainId == ARB_GOERLI_TESTNET_CHAIN_ID ||
+      chainId == ARB_SEPOLIA_TESTNET_CHAIN_ID;
+  }
+
+  /// @notice Return true if and only if the provided chain ID is an Optimism (or Base) chain ID.
+  /// @notice Note that optimism chain id's are also OP stack chain id's.
+  function _isOptimismChainId(uint256 chainId) internal pure returns (bool) {
+    return
+      chainId == OP_MAINNET_CHAIN_ID ||
+      chainId == OP_GOERLI_CHAIN_ID ||
+      chainId == OP_SEPOLIA_CHAIN_ID ||
+      chainId == BASE_MAINNET_CHAIN_ID ||
+      chainId == BASE_GOERLI_CHAIN_ID ||
+      chainId == BASE_SEPOLIA_CHAIN_ID;
+  }
+}
diff --git a/contracts/src/v0.8/functions/v1_1_0/ocr/OCR2Abstract.sol b/contracts/src/v0.8/functions/v1_1_0/ocr/OCR2Abstract.sol
new file mode 100644
index 00000000000..4182227d645
--- /dev/null
+++ b/contracts/src/v0.8/functions/v1_1_0/ocr/OCR2Abstract.sol
@@ -0,0 +1,103 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.19;
+
+import {ITypeAndVersion} from "../../../shared/interfaces/ITypeAndVersion.sol";
+
+abstract contract OCR2Abstract is ITypeAndVersion {
+  // Maximum number of oracles the offchain reporting protocol is designed for
+  uint256 internal constant MAX_NUM_ORACLES = 31;
+
+  /**
+   * @notice triggers a new run of the offchain reporting protocol
+   * @param previousConfigBlockNumber block in which the previous config was set, to simplify historic analysis
+   * @param configDigest configDigest of this configuration
+   * @param configCount ordinal number of this config setting among all config settings over the life of this contract
+   * @param signers ith element is address ith oracle uses to sign a report
+   * @param transmitters ith element is address ith oracle uses to transmit a report via the transmit method
+   * @param f maximum number of faulty/dishonest oracles the protocol can tolerate while still working correctly
+   * @param onchainConfig serialized configuration used by the contract (and possibly oracles)
+   * @param offchainConfigVersion version of the serialization format used for "offchainConfig" parameter
+   * @param offchainConfig serialized configuration used by the oracles exclusively and only passed through the contract
+   */
+  event ConfigSet(
+    uint32 previousConfigBlockNumber,
+    bytes32 configDigest,
+    uint64 configCount,
+    address[] signers,
+    address[] transmitters,
+    uint8 f,
+    bytes onchainConfig,
+    uint64 offchainConfigVersion,
+    bytes offchainConfig
+  );
+
+  /**
+   * @notice sets offchain reporting protocol configuration incl. participating oracles
+   * @param signers addresses with which oracles sign the reports
+   * @param transmitters addresses oracles use to transmit the reports
+   * @param f number of faulty oracles the system can tolerate
+   * @param onchainConfig serialized configuration used by the contract (and possibly oracles)
+   * @param offchainConfigVersion version number for offchainEncoding schema
+   * @param offchainConfig serialized configuration used by the oracles exclusively and only passed through the contract
+   */
+  function setConfig(
+    address[] memory signers,
+    address[] memory transmitters,
+    uint8 f,
+    bytes memory onchainConfig,
+    uint64 offchainConfigVersion,
+    bytes memory offchainConfig
+  ) external virtual;
+
+  /**
+   * @notice information about current offchain reporting protocol configuration
+   * @return configCount ordinal number of current config, out of all configs applied to this contract so far
+   * @return blockNumber block at which this config was set
+   * @return configDigest domain-separation tag for current config (see _configDigestFromConfigData)
+   */
+  function latestConfigDetails()
+    external
+    view
+    virtual
+    returns (uint32 configCount, uint32 blockNumber, bytes32 configDigest);
+
+  /**
+    * @notice optionally emited to indicate the latest configDigest and epoch for
+     which a report was successfully transmited. Alternatively, the contract may
+     use latestConfigDigestAndEpoch with scanLogs set to false.
+  */
+  event Transmitted(bytes32 configDigest, uint32 epoch);
+
+  /**
+     * @notice optionally returns the latest configDigest and epoch for which a
+     report was successfully transmitted. Alternatively, the contract may return
+     scanLogs set to true and use Transmitted events to provide this information
+     to offchain watchers.
+   * @return scanLogs indicates whether to rely on the configDigest and epoch
+     returned or whether to scan logs for the Transmitted event instead.
+   * @return configDigest
+   * @return epoch
+   */
+  function latestConfigDigestAndEpoch()
+    external
+    view
+    virtual
+    returns (bool scanLogs, bytes32 configDigest, uint32 epoch);
+
+  /**
+   * @notice transmit is called to post a new report to the contract
+   * @param report serialized report, which the signatures are signing.
+   * @param rs ith element is the R components of the ith signature on report. Must have at most maxNumOracles entries
+   * @param ss ith element is the S components of the ith signature on report. Must have at most maxNumOracles entries
+   * @param rawVs ith element is the the V component of the ith signature
+   */
+  function transmit(
+    // NOTE: If these parameters are changed, expectedMsgDataLength and/or
+    // TRANSMIT_MSGDATA_CONSTANT_LENGTH_COMPONENT need to be changed accordingly
+    bytes32[3] calldata reportContext,
+    bytes calldata report,
+    bytes32[] calldata rs,
+    bytes32[] calldata ss,
+    bytes32 rawVs // signatures
+  ) external virtual;
+}
diff --git a/contracts/src/v0.8/functions/v1_1_0/ocr/OCR2Base.sol b/contracts/src/v0.8/functions/v1_1_0/ocr/OCR2Base.sol
new file mode 100644
index 00000000000..ea1d45ffd46
--- /dev/null
+++ b/contracts/src/v0.8/functions/v1_1_0/ocr/OCR2Base.sol
@@ -0,0 +1,351 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import {ConfirmedOwner} from "../../../shared/access/ConfirmedOwner.sol";
+import {OCR2Abstract} from "./OCR2Abstract.sol";
+
+/**
+ * @notice Onchain verification of reports from the offchain reporting protocol
+ * @dev For details on its operation, see the offchain reporting protocol design
+ * doc, which refers to this contract as simply the "contract".
+ */
+abstract contract OCR2Base is ConfirmedOwner, OCR2Abstract {
+  error ReportInvalid(string message);
+  error InvalidConfig(string message);
+
+  constructor() ConfirmedOwner(msg.sender) {}
+
+  // incremented each time a new config is posted. This count is incorporated
+  // into the config digest, to prevent replay attacks.
+  uint32 internal s_configCount;
+  uint32 internal s_latestConfigBlockNumber; // makes it easier for offchain systems
+  // to extract config from logs.
+
+  // Storing these fields used on the hot path in a ConfigInfo variable reduces the
+  // retrieval of all of them to a single SLOAD. If any further fields are
+  // added, make sure that storage of the struct still takes at most 32 bytes.
+  struct ConfigInfo {
+    bytes32 latestConfigDigest;
+    uint8 f; // TODO: could be optimized by squeezing into one slot
+    uint8 n;
+  }
+  ConfigInfo internal s_configInfo;
+
+  // Used for s_oracles[a].role, where a is an address, to track the purpose
+  // of the address, or to indicate that the address is unset.
+  enum Role {
+    // No oracle role has been set for address a
+    Unset,
+    // Signing address for the s_oracles[a].index'th oracle. I.e., report
+    // signatures from this oracle should ecrecover back to address a.
+    Signer,
+    // Transmission address for the s_oracles[a].index'th oracle. I.e., if a
+    // report is received by OCR2Aggregator.transmit in which msg.sender is
+    // a, it is attributed to the s_oracles[a].index'th oracle.
+    Transmitter
+  }
+
+  struct Oracle {
+    uint8 index; // Index of oracle in s_signers/s_transmitters
+    Role role; // Role of the address which mapped to this struct
+  }
+
+  mapping(address signerOrTransmitter => Oracle) internal s_oracles;
+
+  // s_signers contains the signing address of each oracle
+  address[] internal s_signers;
+
+  // s_transmitters contains the transmission address of each oracle,
+  // i.e. the address the oracle actually sends transactions to the contract from
+  address[] internal s_transmitters;
+
+  /*
+   * Config logic
+   */
+
+  // Reverts transaction if config args are invalid
+  modifier checkConfigValid(
+    uint256 numSigners,
+    uint256 numTransmitters,
+    uint256 f
+  ) {
+    if (numSigners > MAX_NUM_ORACLES) revert InvalidConfig("too many signers");
+    if (f == 0) revert InvalidConfig("f must be positive");
+    if (numSigners != numTransmitters) revert InvalidConfig("oracle addresses out of registration");
+    if (numSigners <= 3 * f) revert InvalidConfig("faulty-oracle f too high");
+    _;
+  }
+
+  struct SetConfigArgs {
+    address[] signers;
+    address[] transmitters;
+    uint8 f;
+    bytes onchainConfig;
+    uint64 offchainConfigVersion;
+    bytes offchainConfig;
+  }
+
+  /// @inheritdoc OCR2Abstract
+  function latestConfigDigestAndEpoch()
+    external
+    view
+    virtual
+    override
+    returns (bool scanLogs, bytes32 configDigest, uint32 epoch)
+  {
+    return (true, bytes32(0), uint32(0));
+  }
+
+  /**
+   * @notice sets offchain reporting protocol configuration incl. participating oracles
+   * @param _signers addresses with which oracles sign the reports
+   * @param _transmitters addresses oracles use to transmit the reports
+   * @param _f number of faulty oracles the system can tolerate
+   * @param _onchainConfig encoded on-chain contract configuration
+   * @param _offchainConfigVersion version number for offchainEncoding schema
+   * @param _offchainConfig encoded off-chain oracle configuration
+   */
+  function setConfig(
+    address[] memory _signers,
+    address[] memory _transmitters,
+    uint8 _f,
+    bytes memory _onchainConfig,
+    uint64 _offchainConfigVersion,
+    bytes memory _offchainConfig
+  ) external override checkConfigValid(_signers.length, _transmitters.length, _f) onlyOwner {
+    SetConfigArgs memory args = SetConfigArgs({
+      signers: _signers,
+      transmitters: _transmitters,
+      f: _f,
+      onchainConfig: _onchainConfig,
+      offchainConfigVersion: _offchainConfigVersion,
+      offchainConfig: _offchainConfig
+    });
+
+    _beforeSetConfig(args.f, args.onchainConfig);
+
+    while (s_signers.length != 0) {
+      // remove any old signer/transmitter addresses
+      uint256 lastIdx = s_signers.length - 1;
+      address signer = s_signers[lastIdx];
+      address transmitter = s_transmitters[lastIdx];
+      delete s_oracles[signer];
+      delete s_oracles[transmitter];
+      s_signers.pop();
+      s_transmitters.pop();
+    }
+
+    // Bounded by MAX_NUM_ORACLES in OCR2Abstract.sol
+    for (uint256 i = 0; i < args.signers.length; i++) {
+      if (args.signers[i] == address(0)) revert InvalidConfig("signer must not be empty");
+      if (args.transmitters[i] == address(0)) revert InvalidConfig("transmitter must not be empty");
+      // add new signer/transmitter addresses
+      if (s_oracles[args.signers[i]].role != Role.Unset) revert InvalidConfig("repeated signer address");
+      s_oracles[args.signers[i]] = Oracle(uint8(i), Role.Signer);
+      if (s_oracles[args.transmitters[i]].role != Role.Unset) revert InvalidConfig("repeated transmitter address");
+      s_oracles[args.transmitters[i]] = Oracle(uint8(i), Role.Transmitter);
+      s_signers.push(args.signers[i]);
+      s_transmitters.push(args.transmitters[i]);
+    }
+    s_configInfo.f = args.f;
+    uint32 previousConfigBlockNumber = s_latestConfigBlockNumber;
+    s_latestConfigBlockNumber = uint32(block.number);
+    s_configCount += 1;
+    {
+      s_configInfo.latestConfigDigest = _configDigestFromConfigData(
+        block.chainid,
+        address(this),
+        s_configCount,
+        args.signers,
+        args.transmitters,
+        args.f,
+        args.onchainConfig,
+        args.offchainConfigVersion,
+        args.offchainConfig
+      );
+    }
+    s_configInfo.n = uint8(args.signers.length);
+
+    emit ConfigSet(
+      previousConfigBlockNumber,
+      s_configInfo.latestConfigDigest,
+      s_configCount,
+      args.signers,
+      args.transmitters,
+      args.f,
+      args.onchainConfig,
+      args.offchainConfigVersion,
+      args.offchainConfig
+    );
+  }
+
+  function _configDigestFromConfigData(
+    uint256 _chainId,
+    address _contractAddress,
+    uint64 _configCount,
+    address[] memory _signers,
+    address[] memory _transmitters,
+    uint8 _f,
+    bytes memory _onchainConfig,
+    uint64 _encodedConfigVersion,
+    bytes memory _encodedConfig
+  ) internal pure returns (bytes32) {
+    uint256 h = uint256(
+      keccak256(
+        abi.encode(
+          _chainId,
+          _contractAddress,
+          _configCount,
+          _signers,
+          _transmitters,
+          _f,
+          _onchainConfig,
+          _encodedConfigVersion,
+          _encodedConfig
+        )
+      )
+    );
+    uint256 prefixMask = type(uint256).max << (256 - 16); // 0xFFFF00..00
+    uint256 prefix = 0x0001 << (256 - 16); // 0x000100..00
+    return bytes32((prefix & prefixMask) | (h & ~prefixMask));
+  }
+
+  /**
+   * @notice information about current offchain reporting protocol configuration
+   * @return configCount ordinal number of current config, out of all configs applied to this contract so far
+   * @return blockNumber block at which this config was set
+   * @return configDigest domain-separation tag for current config (see __configDigestFromConfigData)
+   */
+  function latestConfigDetails()
+    external
+    view
+    override
+    returns (uint32 configCount, uint32 blockNumber, bytes32 configDigest)
+  {
+    return (s_configCount, s_latestConfigBlockNumber, s_configInfo.latestConfigDigest);
+  }
+
+  /**
+   * @return list of addresses permitted to transmit reports to this contract
+   * @dev The list will match the order used to specify the transmitter during setConfig
+   */
+  function transmitters() external view returns (address[] memory) {
+    return s_transmitters;
+  }
+
+  function _beforeSetConfig(uint8 _f, bytes memory _onchainConfig) internal virtual;
+
+  /**
+   * @dev hook called after the report has been fully validated
+   * for the extending contract to handle additional logic, such as oracle payment
+   * @param initialGas the amount of gas before validation
+   * @param transmitter the address of the account that submitted the report
+   * @param signers the addresses of all signing accounts
+   * @param report serialized report
+   */
+  function _report(
+    uint256 initialGas,
+    address transmitter,
+    uint8 signerCount,
+    address[MAX_NUM_ORACLES] memory signers,
+    bytes calldata report
+  ) internal virtual;
+
+  // The constant-length components of the msg.data sent to transmit.
+  // See the "If we wanted to call sam" example on for example reasoning
+  // https://solidity.readthedocs.io/en/v0.7.2/abi-spec.html
+  uint16 private constant TRANSMIT_MSGDATA_CONSTANT_LENGTH_COMPONENT =
+    4 + // function selector
+      32 *
+      3 + // 3 words containing reportContext
+      32 + // word containing start location of abiencoded report value
+      32 + // word containing location start of abiencoded rs value
+      32 + // word containing start location of abiencoded ss value
+      32 + // rawVs value
+      32 + // word containing length of report
+      32 + // word containing length rs
+      32 + // word containing length of ss
+      0; // placeholder
+
+  function _requireExpectedMsgDataLength(
+    bytes calldata report,
+    bytes32[] calldata rs,
+    bytes32[] calldata ss
+  ) private pure {
+    // calldata will never be big enough to make this overflow
+    uint256 expected = uint256(TRANSMIT_MSGDATA_CONSTANT_LENGTH_COMPONENT) +
+      report.length + // one byte pure entry in _report
+      rs.length *
+      32 + // 32 bytes per entry in _rs
+      ss.length *
+      32 + // 32 bytes per entry in _ss
+      0; // placeholder
+    if (msg.data.length != expected) revert ReportInvalid("calldata length mismatch");
+  }
+
+  /**
+   * @notice transmit is called to post a new report to the contract
+   * @param report serialized report, which the signatures are signing.
+   * @param rs ith element is the R components of the ith signature on report. Must have at most maxNumOracles entries
+   * @param ss ith element is the S components of the ith signature on report. Must have at most maxNumOracles entries
+   * @param rawVs ith element is the the V component of the ith signature
+   */
+  function transmit(
+    // NOTE: If these parameters are changed, expectedMsgDataLength and/or
+    // TRANSMIT_MSGDATA_CONSTANT_LENGTH_COMPONENT need to be changed accordingly
+    bytes32[3] calldata reportContext,
+    bytes calldata report,
+    bytes32[] calldata rs,
+    bytes32[] calldata ss,
+    bytes32 rawVs // signatures
+  ) external override {
+    uint256 initialGas = gasleft(); // This line must come first
+
+    {
+      // reportContext consists of:
+      // reportContext[0]: ConfigDigest
+      // reportContext[1]: 27 byte padding, 4-byte epoch and 1-byte round
+      // reportContext[2]: ExtraHash
+      bytes32 configDigest = reportContext[0];
+      uint32 epochAndRound = uint32(uint256(reportContext[1]));
+
+      emit Transmitted(configDigest, uint32(epochAndRound >> 8));
+
+      // The following check is disabled to allow both current and proposed routes to submit reports using the same OCR config digest
+      // Chainlink Functions uses globally unique request IDs. Metadata about the request is stored and checked in the Coordinator and Router
+      // require(configInfo.latestConfigDigest == configDigest, "configDigest mismatch");
+
+      _requireExpectedMsgDataLength(report, rs, ss);
+
+      uint256 expectedNumSignatures = (s_configInfo.n + s_configInfo.f) / 2 + 1;
+
+      if (rs.length != expectedNumSignatures) revert ReportInvalid("wrong number of signatures");
+      if (rs.length != ss.length) revert ReportInvalid("report rs and ss must be of equal length");
+
+      Oracle memory transmitter = s_oracles[msg.sender];
+      if (transmitter.role != Role.Transmitter && msg.sender != s_transmitters[transmitter.index])
+        revert ReportInvalid("unauthorized transmitter");
+    }
+
+    address[MAX_NUM_ORACLES] memory signed;
+    uint8 signerCount = 0;
+
+    {
+      // Verify signatures attached to report
+      bytes32 h = keccak256(abi.encodePacked(keccak256(report), reportContext));
+
+      Oracle memory o;
+      // Bounded by MAX_NUM_ORACLES in OCR2Abstract.sol
+      for (uint256 i = 0; i < rs.length; ++i) {
+        address signer = ecrecover(h, uint8(rawVs[i]) + 27, rs[i], ss[i]);
+        o = s_oracles[signer];
+        if (o.role != Role.Signer) revert ReportInvalid("address not authorized to sign");
+        if (signed[o.index] != address(0)) revert ReportInvalid("non-unique signature");
+        signed[o.index] = signer;
+        signerCount += 1;
+      }
+    }
+
+    _report(initialGas, msg.sender, signerCount, signed, report);
+  }
+}

From 963efe070700241001e10a4dc55970985bd8598b Mon Sep 17 00:00:00 2001
From: Tate <tate.exon@smartcontract.com>
Date: Thu, 30 Nov 2023 14:10:48 -0700
Subject: [PATCH 049/130] Bump chainlink-testing-framework to get postgres ecr
 changes (#11435)

---
 integration-tests/docker/test_env/cl_node.go  | 9 ++++++---
 integration-tests/docker/test_env/test_env.go | 5 ++++-
 integration-tests/go.mod                      | 2 +-
 integration-tests/go.sum                      | 4 ++--
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/integration-tests/docker/test_env/cl_node.go b/integration-tests/docker/test_env/cl_node.go
index c781ddfc1b8..7dc077ad34b 100644
--- a/integration-tests/docker/test_env/cl_node.go
+++ b/integration-tests/docker/test_env/cl_node.go
@@ -82,10 +82,13 @@ func WithLogWatch(lw *logwatch.LogWatch) ClNodeOption {
 	}
 }
 
-func NewClNode(networks []string, imageName, imageVersion string, nodeConfig *chainlink.Config, opts ...ClNodeOption) *ClNode {
+func NewClNode(networks []string, imageName, imageVersion string, nodeConfig *chainlink.Config, opts ...ClNodeOption) (*ClNode, error) {
 	nodeDefaultCName := fmt.Sprintf("%s-%s", "cl-node", uuid.NewString()[0:8])
 	pgDefaultCName := fmt.Sprintf("pg-%s", nodeDefaultCName)
-	pgDb := test_env.NewPostgresDb(networks, test_env.WithPostgresDbContainerName(pgDefaultCName))
+	pgDb, err := test_env.NewPostgresDb(networks, test_env.WithPostgresDbContainerName(pgDefaultCName))
+	if err != nil {
+		return nil, err
+	}
 	n := &ClNode{
 		EnvComponent: test_env.EnvComponent{
 			ContainerName:    nodeDefaultCName,
@@ -102,7 +105,7 @@ func NewClNode(networks []string, imageName, imageVersion string, nodeConfig *ch
 	for _, opt := range opts {
 		opt(n)
 	}
-	return n
+	return n, nil
 }
 
 func (n *ClNode) SetTestLogger(t *testing.T) {
diff --git a/integration-tests/docker/test_env/test_env.go b/integration-tests/docker/test_env/test_env.go
index 4b0cefddd55..030a3ae9622 100644
--- a/integration-tests/docker/test_env/test_env.go
+++ b/integration-tests/docker/test_env/test_env.go
@@ -158,7 +158,10 @@ func (te *CLClusterTestEnv) StartClCluster(nodeConfig *chainlink.Config, count i
 		opts = append(opts, WithSecrets(secretsConfig))
 		te.ClCluster = &ClCluster{}
 		for i := 0; i < count; i++ {
-			ocrNode := NewClNode([]string{te.Network.Name}, os.Getenv("CHAINLINK_IMAGE"), os.Getenv("CHAINLINK_VERSION"), nodeConfig, opts...)
+			ocrNode, err := NewClNode([]string{te.Network.Name}, os.Getenv("CHAINLINK_IMAGE"), os.Getenv("CHAINLINK_VERSION"), nodeConfig, opts...)
+			if err != nil {
+				return err
+			}
 			te.ClCluster.Nodes = append(te.ClCluster.Nodes, ocrNode)
 		}
 	}
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index b03819e2066..68b46d8a26a 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -25,7 +25,7 @@ require (
 	github.com/slack-go/slack v0.12.2
 	github.com/smartcontractkit/chainlink-automation v1.0.1
 	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231129142348-7087174fecde
-	github.com/smartcontractkit/chainlink-testing-framework v1.19.7
+	github.com/smartcontractkit/chainlink-testing-framework v1.20.0
 	github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
 	github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000
 	github.com/smartcontractkit/libocr v0.0.0-20231107151413-13e0202ae8d7
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index 74fe9e4dc4d..46c132d6ff1 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -2386,8 +2386,8 @@ github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b
 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3/go.mod h1:UfW7/PZKon+iDEHtrHOfvMnS5GfYOW/SdMZ6P97rPEk=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664 h1:yxaHuDTtj2xxtsR8b+LJw8xDvyr6v/F6GP3InsP4wPI=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664/go.mod h1:3Fa+HQTZ3R3fPC0hUqugvoo+NEeo8Y4J2WOnQfi7O34=
-github.com/smartcontractkit/chainlink-testing-framework v1.19.7 h1:8oEduPXC5kBwnNwE5qdK+h/NZ2qOlxK0hgtedS+/St0=
-github.com/smartcontractkit/chainlink-testing-framework v1.19.7/go.mod h1:+FVgkz6phTc+piVT57AcQfr3I8xvZgZ1lOpRPOu/dLQ=
+github.com/smartcontractkit/chainlink-testing-framework v1.20.0 h1:gQPQRKJuMh6QTAIMkqZ7v5WkjEmbcoMIX/V6WPVrvuI=
+github.com/smartcontractkit/chainlink-testing-framework v1.20.0/go.mod h1:+FVgkz6phTc+piVT57AcQfr3I8xvZgZ1lOpRPOu/dLQ=
 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 h1:FFdvEzlYwcuVHkdZ8YnZR/XomeMGbz5E2F2HZI3I3w8=
 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868/go.mod h1:Kn1Hape05UzFZ7bOUnm3GVsHzP0TNrVmpfXYNHdqGGs=
 github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306 h1:ko88+ZznniNJZbZPWAvHQU8SwKAdHngdDZ+pvVgB5ss=

From 64b1b0ecd06224402b5e380ef0776b2a87e01f11 Mon Sep 17 00:00:00 2001
From: ilija42 <57732589+ilija42@users.noreply.github.com>
Date: Thu, 30 Nov 2023 22:30:40 +0100
Subject: [PATCH 050/130] Improve randomize testdb sequences (#11433)

---
 core/cmd/shell_local.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/cmd/shell_local.go b/core/cmd/shell_local.go
index dc0d44f3189..a1f7fdb857c 100644
--- a/core/cmd/shell_local.go
+++ b/core/cmd/shell_local.go
@@ -22,6 +22,7 @@ import (
 	gethCommon "github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/fatih/color"
+	"github.com/lib/pq"
 
 	"github.com/kylelemons/godebug/diff"
 	"github.com/pkg/errors"
@@ -834,7 +835,9 @@ func (m *failedToRandomizeTestDBSequencesError) Error() string {
 // randomizeTestDBSequences randomizes sequenced table columns sequence
 // This is necessary as to avoid false positives in some test cases.
 func randomizeTestDBSequences(db *sqlx.DB) error {
-	seqRows, err := db.Query(`SELECT sequence_schema, sequence_name FROM information_schema.sequences WHERE sequence_schema = $1`, "public")
+	// not ideal to hard code this, but also not safe to do it programmatically :(
+	schemas := pq.Array([]string{"public", "evm"})
+	seqRows, err := db.Query(`SELECT sequence_schema, sequence_name, minimum_value FROM information_schema.sequences WHERE sequence_schema IN ($1)`, schemas)
 	if err != nil {
 		return fmt.Errorf("%s: error fetching sequences: %s", failedToRandomizeTestDBSequencesError{}, err)
 	}
@@ -842,7 +845,8 @@ func randomizeTestDBSequences(db *sqlx.DB) error {
 	defer seqRows.Close()
 	for seqRows.Next() {
 		var sequenceSchema, sequenceName string
-		if err = seqRows.Scan(&sequenceSchema, &sequenceName); err != nil {
+		var minimumSequenceValue int64
+		if err = seqRows.Scan(&sequenceSchema, &sequenceName, &minimumSequenceValue); err != nil {
 			return fmt.Errorf("%s: failed scanning sequence rows: %s", failedToRandomizeTestDBSequencesError{}, err)
 		}
 
@@ -855,6 +859,7 @@ func randomizeTestDBSequences(db *sqlx.DB) error {
 		if err != nil {
 			return fmt.Errorf("%s: failed to generate random number", failedToRandomizeTestDBSequencesError{})
 		}
+		randNum.Add(randNum, big.NewInt(minimumSequenceValue))
 
 		if _, err = db.Exec(fmt.Sprintf("ALTER SEQUENCE %s.%s RESTART WITH %d", sequenceSchema, sequenceName, randNum)); err != nil {
 			return fmt.Errorf("%s: failed to alter and restart %s sequence: %w", failedToRandomizeTestDBSequencesError{}, sequenceName, err)

From 2804d8e35573c716d726068b54948703327622ba Mon Sep 17 00:00:00 2001
From: ferglor <19188060+ferglor@users.noreply.github.com>
Date: Thu, 30 Nov 2023 22:33:57 +0000
Subject: [PATCH 051/130] Refactor evm registry packages (#11374)

---
 core/scripts/chaincli/handler/debug.go        |  6 ++---
 core/scripts/chaincli/handler/keeper.go       |  2 +-
 core/scripts/chaincli/handler/report.go       |  2 +-
 core/services/ocr2/delegate.go                |  4 ++--
 .../plugins/ocr2keeper/custom_telemetry.go    |  2 +-
 .../{evm20 => evmregistry/v20}/abi.go         |  0
 .../{evm20 => evmregistry/v20}/abi_test.go    |  0
 .../{evm20 => evmregistry/v20}/encoder.go     |  0
 .../v20}/encoder_test.go                      |  0
 .../{evm20 => evmregistry/v20}/head.go        |  0
 .../v20}/log_provider.go                      |  1 +
 .../v20}/mocks/registry.go                    |  0
 .../{evm20 => evmregistry/v20}/registry.go    |  1 +
 .../v20}/registry_test.go                     |  0
 .../{evm21 => evmregistry/v21}/active_list.go |  2 +-
 .../v21}/active_list_test.go                  |  2 +-
 .../v21}/autotelemetry21/custom_telemetry.go  |  2 +-
 .../autotelemetry21/custom_telemetry_test.go  |  2 +-
 .../v21}/block_subscriber.go                  |  0
 .../v21}/block_subscriber_test.go             |  0
 .../{evm21 => evmregistry/v21}/core/abi.go    |  0
 .../v21}/core/interfaces.go                   |  0
 .../v21}/core/mocks/upkeep_state_reader.go    |  0
 .../v21}/core/payload.go                      |  0
 .../v21}/core/payload_test.go                 |  0
 .../v21}/core/testutil.go                     |  0
 .../v21}/core/trigger.go                      |  0
 .../v21}/core/trigger_test.go                 |  0
 .../{evm21 => evmregistry/v21}/core/type.go   |  0
 .../v21}/core/type_test.go                    |  0
 .../{evm21 => evmregistry/v21}/core/utils.go  |  0
 .../v21}/core/utils_test.go                   |  0
 .../v21}/encoding/encoder.go                  |  2 +-
 .../v21}/encoding/encoder_test.go             |  2 +-
 .../v21}/encoding/interface.go                |  3 +--
 .../v21}/encoding/packer.go                   |  5 ++--
 .../v21}/encoding/packer_test.go              |  5 ++--
 .../{evm21 => evmregistry/v21}/keyring.go     |  0
 .../v21}/keyring_test.go                      |  0
 .../v21}/logprovider/block_time.go            |  0
 .../v21}/logprovider/block_time_test.go       |  0
 .../v21}/logprovider/buffer.go                |  0
 .../v21}/logprovider/buffer_test.go           |  2 +-
 .../v21}/logprovider/factory.go               |  2 +-
 .../v21}/logprovider/filter.go                |  0
 .../v21}/logprovider/filter_store.go          |  0
 .../v21}/logprovider/filter_store_test.go     |  0
 .../v21}/logprovider/filter_test.go           |  0
 .../v21}/logprovider/integration_test.go      | 10 ++++----
 .../v21}/logprovider/log_packer.go            |  2 +-
 .../v21}/logprovider/provider.go              |  3 ++-
 .../v21}/logprovider/provider_life_cycle.go   |  0
 .../logprovider/provider_life_cycle_test.go   |  2 +-
 .../v21}/logprovider/provider_test.go         |  0
 .../v21}/logprovider/recoverer.go             |  3 ++-
 .../v21}/logprovider/recoverer_test.go        |  4 ++--
 .../v21}/mercury/mercury.go                   |  0
 .../v21}/mercury/mercury_test.go              |  0
 .../v21}/mercury/streams/streams.go           |  8 +++----
 .../v21}/mercury/streams/streams_test.go      |  8 +++----
 .../v21}/mercury/upkeep_failure_reasons.go    |  0
 .../v21}/mercury/upkeep_states.go             |  0
 .../v21}/mercury/v02/request.go               |  2 +-
 .../v21}/mercury/v02/v02_request_test.go      |  3 +--
 .../v21}/mercury/v03/request.go               |  2 +-
 .../v21}/mercury/v03/v03_request_test.go      |  5 ++--
 .../v21}/mocks/http_client.go                 |  0
 .../v21}/mocks/registry.go                    |  0
 .../v21}/payload_builder.go                   |  4 ++--
 .../v21}/payload_builder_test.go              |  4 ++--
 .../{evm21 => evmregistry/v21}/registry.go    |  8 +++----
 .../v21}/registry_check_pipeline.go           |  4 ++--
 .../v21}/registry_check_pipeline_test.go      |  6 ++---
 .../v21}/registry_test.go                     |  6 ++---
 .../{evm21 => evmregistry/v21}/services.go    |  8 +++----
 .../v21}/testdata/btc-usd.json                |  0
 .../v21}/testdata/eth-usd.json                |  0
 .../v21}/transmit/cache.go                    |  0
 .../v21}/transmit/cache_test.go               |  0
 .../v21}/transmit/encoding.go                 |  0
 .../v21}/transmit/encoding_test.go            |  2 +-
 .../v21}/transmit/event_provider.go           |  3 ++-
 .../v21}/transmit/event_provider_test.go      |  2 +-
 .../v21}/upkeep_provider.go                   |  2 +-
 .../v21}/upkeep_provider_test.go              |  2 +-
 .../v21}/upkeepstate/orm.go                   |  0
 .../v21}/upkeepstate/orm_test.go              |  0
 .../v21}/upkeepstate/scanner.go               |  2 +-
 .../v21}/upkeepstate/scanner_test.go          |  0
 .../v21}/upkeepstate/store.go                 |  3 ++-
 .../v21}/upkeepstate/store_test.go            |  0
 .../plugins/ocr2keeper/integration_21_test.go |  2 +-
 core/services/ocr2/plugins/ocr2keeper/util.go | 24 +++++++++----------
 integration-tests/smoke/automation_test.go    |  2 +-
 94 files changed, 92 insertions(+), 91 deletions(-)
 rename core/services/ocr2/plugins/ocr2keeper/{evm20 => evmregistry/v20}/abi.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm20 => evmregistry/v20}/abi_test.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm20 => evmregistry/v20}/encoder.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm20 => evmregistry/v20}/encoder_test.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm20 => evmregistry/v20}/head.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm20 => evmregistry/v20}/log_provider.go (99%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm20 => evmregistry/v20}/mocks/registry.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm20 => evmregistry/v20}/registry.go (99%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm20 => evmregistry/v20}/registry_test.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/active_list.go (98%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/active_list_test.go (98%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/autotelemetry21/custom_telemetry.go (99%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/autotelemetry21/custom_telemetry_test.go (97%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/block_subscriber.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/block_subscriber_test.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/core/abi.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/core/interfaces.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/core/mocks/upkeep_state_reader.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/core/payload.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/core/payload_test.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/core/testutil.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/core/trigger.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/core/trigger_test.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/core/type.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/core/type_test.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/core/utils.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/core/utils_test.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/encoding/encoder.go (98%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/encoding/encoder_test.go (98%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/encoding/interface.go (98%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/encoding/packer.go (99%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/encoding/packer_test.go (99%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/keyring.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/keyring_test.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/logprovider/block_time.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/logprovider/block_time_test.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/logprovider/buffer.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/logprovider/buffer_test.go (99%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/logprovider/factory.go (98%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/logprovider/filter.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/logprovider/filter_store.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/logprovider/filter_store_test.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/logprovider/filter_test.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/logprovider/integration_test.go (97%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/logprovider/log_packer.go (96%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/logprovider/provider.go (99%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/logprovider/provider_life_cycle.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/logprovider/provider_life_cycle_test.go (99%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/logprovider/provider_test.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/logprovider/recoverer.go (99%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/logprovider/recoverer_test.go (99%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/mercury/mercury.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/mercury/mercury_test.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/mercury/streams/streams.go (98%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/mercury/streams/streams_test.go (99%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/mercury/upkeep_failure_reasons.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/mercury/upkeep_states.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/mercury/v02/request.go (99%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/mercury/v02/v02_request_test.go (99%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/mercury/v03/request.go (99%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/mercury/v03/v03_request_test.go (99%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/mocks/http_client.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/mocks/registry.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/payload_builder.go (95%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/payload_builder_test.go (98%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/registry.go (99%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/registry_check_pipeline.go (99%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/registry_check_pipeline_test.go (99%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/registry_test.go (99%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/services.go (96%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/testdata/btc-usd.json (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/testdata/eth-usd.json (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/transmit/cache.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/transmit/cache_test.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/transmit/encoding.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/transmit/encoding_test.go (98%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/transmit/event_provider.go (99%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/transmit/event_provider_test.go (99%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/upkeep_provider.go (97%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/upkeep_provider_test.go (98%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/upkeepstate/orm.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/upkeepstate/orm_test.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/upkeepstate/scanner.go (98%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/upkeepstate/scanner_test.go (100%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/upkeepstate/store.go (99%)
 rename core/services/ocr2/plugins/ocr2keeper/{evm21 => evmregistry/v21}/upkeepstate/store_test.go (100%)

diff --git a/core/scripts/chaincli/handler/debug.go b/core/scripts/chaincli/handler/debug.go
index 4938907669f..fec8c6cd414 100644
--- a/core/scripts/chaincli/handler/debug.go
+++ b/core/scripts/chaincli/handler/debug.go
@@ -26,9 +26,9 @@ import (
 	"github.com/smartcontractkit/chainlink/core/scripts/common"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_utils_2_1"
 	iregistry21 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/i_keeper_registry_master_wrapper_2_1"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/encoding"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/streams"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 	bigmath "github.com/smartcontractkit/chainlink/v2/core/utils/big_math"
 )
diff --git a/core/scripts/chaincli/handler/keeper.go b/core/scripts/chaincli/handler/keeper.go
index 453ef43a566..439532430ab 100644
--- a/core/scripts/chaincli/handler/keeper.go
+++ b/core/scripts/chaincli/handler/keeper.go
@@ -14,7 +14,7 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/umbracle/ethgo/abi"
 
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/streams"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams"
 
 	"github.com/smartcontractkit/chainlink/core/scripts/chaincli/config"
 	helpers "github.com/smartcontractkit/chainlink/core/scripts/common"
diff --git a/core/scripts/chaincli/handler/report.go b/core/scripts/chaincli/handler/report.go
index 8381bbc1374..622963f1ac0 100644
--- a/core/scripts/chaincli/handler/report.go
+++ b/core/scripts/chaincli/handler/report.go
@@ -22,7 +22,7 @@ import (
 	ocr2keepers20 "github.com/smartcontractkit/chainlink-automation/pkg/v2"
 
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/keeper_registry_wrapper2_0"
-	evm "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm20"
+	evm "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20"
 )
 
 type OCR2ReportDataElem struct {
diff --git a/core/services/ocr2/delegate.go b/core/services/ocr2/delegate.go
index af56c1e7a99..02341821375 100644
--- a/core/services/ocr2/delegate.go
+++ b/core/services/ocr2/delegate.go
@@ -50,8 +50,8 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/median"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/mercury"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/autotelemetry21"
-	ocr2keeper21core "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/autotelemetry21"
+	ocr2keeper21core "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
 	ocr2vrfconfig "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2vrf/config"
 	ocr2coordinator "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2vrf/coordinator"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2vrf/juelsfeecoin"
diff --git a/core/services/ocr2/plugins/ocr2keeper/custom_telemetry.go b/core/services/ocr2/plugins/ocr2keeper/custom_telemetry.go
index fd43747f52a..d250df4afe1 100644
--- a/core/services/ocr2/plugins/ocr2keeper/custom_telemetry.go
+++ b/core/services/ocr2/plugins/ocr2keeper/custom_telemetry.go
@@ -15,7 +15,7 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	evm21 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21"
+	evm21 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21"
 	"github.com/smartcontractkit/chainlink/v2/core/services/synchronization/telem"
 	"github.com/smartcontractkit/chainlink/v2/core/static"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm20/abi.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/abi.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm20/abi.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/abi.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm20/abi_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/abi_test.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm20/abi_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/abi_test.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm20/encoder.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/encoder.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm20/encoder.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/encoder.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm20/encoder_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/encoder_test.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm20/encoder_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/encoder_test.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm20/head.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/head.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm20/head.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/head.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm20/log_provider.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/log_provider.go
similarity index 99%
rename from core/services/ocr2/plugins/ocr2keeper/evm20/log_provider.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/log_provider.go
index 7ab641d2bf7..45884d2f726 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm20/log_provider.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/log_provider.go
@@ -16,6 +16,7 @@ import (
 	"github.com/smartcontractkit/chainlink-automation/pkg/v2/encoding"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	registry "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/keeper_registry_wrapper2_0"
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm20/mocks/registry.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/mocks/registry.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm20/mocks/registry.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/mocks/registry.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm20/registry.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/registry.go
similarity index 99%
rename from core/services/ocr2/plugins/ocr2keeper/evm20/registry.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/registry.go
index 682ebb6e2a3..a6a2f40f855 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm20/registry.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/registry.go
@@ -20,6 +20,7 @@ import (
 	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v2"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm20/registry_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/registry_test.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm20/registry_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/registry_test.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/active_list.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/active_list.go
similarity index 98%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/active_list.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/active_list.go
index 9f825556331..7ea476ee773 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/active_list.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/active_list.go
@@ -6,7 +6,7 @@ import (
 
 	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"
 
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
 )
 
 // ActiveUpkeepList is a list to manage active upkeep IDs
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/active_list_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/active_list_test.go
similarity index 98%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/active_list_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/active_list_test.go
index 06b9979eefc..378589d1779 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/active_list_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/active_list_test.go
@@ -9,7 +9,7 @@ import (
 
 	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"
 
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
 )
 
 func TestActiveUpkeepList(t *testing.T) {
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/autotelemetry21/custom_telemetry.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/autotelemetry21/custom_telemetry.go
similarity index 99%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/autotelemetry21/custom_telemetry.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/autotelemetry21/custom_telemetry.go
index 0ed4c84dbb5..e7e9728c3a0 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/autotelemetry21/custom_telemetry.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/autotelemetry21/custom_telemetry.go
@@ -15,7 +15,7 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	evm21 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21"
+	evm21 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21"
 	"github.com/smartcontractkit/chainlink/v2/core/services/synchronization/telem"
 	"github.com/smartcontractkit/chainlink/v2/core/static"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/autotelemetry21/custom_telemetry_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/autotelemetry21/custom_telemetry_test.go
similarity index 97%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/autotelemetry21/custom_telemetry_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/autotelemetry21/custom_telemetry_test.go
index 4318d9aac60..5fce8718cba 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/autotelemetry21/custom_telemetry_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/autotelemetry21/custom_telemetry_test.go
@@ -10,7 +10,7 @@ import (
 	headtracker "github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker/types"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	evm "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21"
+	evm "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21"
 )
 
 // const historySize = 4
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/block_subscriber.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/block_subscriber.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/block_subscriber.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/block_subscriber.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/block_subscriber_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/block_subscriber_test.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/block_subscriber_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/block_subscriber_test.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/core/abi.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/abi.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/core/abi.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/abi.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/core/interfaces.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/interfaces.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/core/interfaces.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/interfaces.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/core/mocks/upkeep_state_reader.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/mocks/upkeep_state_reader.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/core/mocks/upkeep_state_reader.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/mocks/upkeep_state_reader.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/core/payload.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/payload.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/core/payload.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/payload.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/core/payload_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/payload_test.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/core/payload_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/payload_test.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/core/testutil.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/testutil.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/core/testutil.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/testutil.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/core/trigger.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/trigger.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/core/trigger.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/trigger.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/core/trigger_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/trigger_test.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/core/trigger_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/trigger_test.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/core/type.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/type.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/core/type.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/type.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/core/type_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/type_test.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/core/type_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/type_test.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/core/utils.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/utils.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/core/utils.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/utils.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/core/utils_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/utils_test.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/core/utils_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/utils_test.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/encoding/encoder.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/encoder.go
similarity index 98%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/encoding/encoder.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/encoder.go
index fadf55633d0..89fcbb4a0ef 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/encoding/encoder.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/encoder.go
@@ -7,7 +7,7 @@ import (
 	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"
 
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_utils_2_1"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
 )
 
 var (
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/encoding/encoder_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/encoder_test.go
similarity index 98%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/encoding/encoder_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/encoder_test.go
index 63ff2650be2..1376e2a9bb3 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/encoding/encoder_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/encoder_test.go
@@ -9,7 +9,7 @@ import (
 
 	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"
 
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
 )
 
 func TestReportEncoder_EncodeExtract(t *testing.T) {
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/encoding/interface.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/interface.go
similarity index 98%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/encoding/interface.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/interface.go
index cf98115d76f..83ace2492f5 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/encoding/interface.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/interface.go
@@ -5,10 +5,9 @@ import (
 
 	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"
 
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury"
-
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_utils_2_1"
 	iregistry21 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/i_keeper_registry_master_wrapper_2_1"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury"
 )
 
 const (
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/encoding/packer.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/packer.go
similarity index 99%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/encoding/packer.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/packer.go
index 0157d1baf8e..57013a6277a 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/encoding/packer.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/packer.go
@@ -9,10 +9,9 @@ import (
 
 	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"
 
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury"
-
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_utils_2_1"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury"
 )
 
 // triggerWrapper is a wrapper for the different trigger types (log and condition triggers).
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/encoding/packer_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/packer_test.go
similarity index 99%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/encoding/packer_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/packer_test.go
index b52b777dbe5..42fcd40d618 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/encoding/packer_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/packer_test.go
@@ -14,11 +14,10 @@ import (
 
 	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"
 
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury"
-
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_utils_2_1"
 	automation21Utils "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_utils_2_1"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury"
 )
 
 func TestPacker_PackReport(t *testing.T) {
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/keyring.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/keyring.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/keyring.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/keyring.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/keyring_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/keyring_test.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/keyring_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/keyring_test.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/block_time.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/block_time.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/block_time.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/block_time.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/block_time_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/block_time_test.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/block_time_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/block_time_test.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/buffer.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/buffer.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/buffer.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/buffer.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/buffer_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/buffer_test.go
similarity index 99%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/buffer_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/buffer_test.go
index a973ea6e19c..046c93a428a 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/buffer_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/buffer_test.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
 )
 
 func TestLogEventBuffer_GetBlocksInRange(t *testing.T) {
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/factory.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/factory.go
similarity index 98%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/factory.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/factory.go
index 38342550c58..2b48fec2b37 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/factory.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/factory.go
@@ -8,7 +8,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
 )
 
 // New creates a new log event provider and recoverer.
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/filter.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/filter.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/filter.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/filter.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/filter_store.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/filter_store.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/filter_store.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/filter_store.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/filter_store_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/filter_store_test.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/filter_store_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/filter_store_test.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/filter_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/filter_test.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/filter_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/filter_test.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/integration_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/integration_test.go
similarity index 97%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/integration_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/integration_test.go
index dd90b5e00bf..caad1adc9ad 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/integration_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/integration_test.go
@@ -31,8 +31,8 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
-	kevmcore "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider"
+	evmregistry21 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 )
 
@@ -150,7 +150,7 @@ func TestIntegration_LogEventProvider_UpdateConfig(t *testing.T) {
 	require.Equal(t, 1, len(addrs))
 
 	t.Run("update filter config", func(t *testing.T) {
-		upkeepID := kevmcore.GenUpkeepID(ocr2keepers.LogTrigger, "111")
+		upkeepID := evmregistry21.GenUpkeepID(ocr2keepers.LogTrigger, "111")
 		id := upkeepID.BigInt()
 		cfg := newPlainLogTriggerConfig(addrs[0])
 		b, err := ethClient.BlockByHash(ctx, backend.Commit())
@@ -182,7 +182,7 @@ func TestIntegration_LogEventProvider_UpdateConfig(t *testing.T) {
 	})
 
 	t.Run("register same log filter", func(t *testing.T) {
-		upkeepID := kevmcore.GenUpkeepID(ocr2keepers.LogTrigger, "222")
+		upkeepID := evmregistry21.GenUpkeepID(ocr2keepers.LogTrigger, "222")
 		id := upkeepID.BigInt()
 		cfg := newPlainLogTriggerConfig(addrs[0])
 		b, err := ethClient.BlockByHash(ctx, backend.Commit())
@@ -663,7 +663,7 @@ func setupDependencies(t *testing.T, db *sqlx.DB, backend *backends.SimulatedBac
 	return lp, ethClient
 }
 
-func setup(lggr logger.Logger, poller logpoller.LogPoller, c client.Client, stateStore kevmcore.UpkeepStateReader, filterStore logprovider.UpkeepFilterStore, opts *logprovider.LogTriggersOptions) (logprovider.LogEventProvider, logprovider.LogRecoverer) {
+func setup(lggr logger.Logger, poller logpoller.LogPoller, c client.Client, stateStore evmregistry21.UpkeepStateReader, filterStore logprovider.UpkeepFilterStore, opts *logprovider.LogTriggersOptions) (logprovider.LogEventProvider, logprovider.LogRecoverer) {
 	packer := logprovider.NewLogEventsPacker()
 	if opts == nil {
 		o := logprovider.NewOptions(200)
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/log_packer.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/log_packer.go
similarity index 96%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/log_packer.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/log_packer.go
index 655d7dacfe6..5902af73f03 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/log_packer.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/log_packer.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_utils_2_1"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
 )
 
 type LogDataPacker interface {
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/provider.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/provider.go
similarity index 99%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/provider.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/provider.go
index a3887cbe787..2dabcc82671 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/provider.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/provider.go
@@ -19,10 +19,11 @@ import (
 	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_utils_2_1"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/provider_life_cycle.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/provider_life_cycle.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/provider_life_cycle.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/provider_life_cycle.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/provider_life_cycle_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/provider_life_cycle_test.go
similarity index 99%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/provider_life_cycle_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/provider_life_cycle_test.go
index c58bd859510..278c727a06a 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/provider_life_cycle_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/provider_life_cycle_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
 )
 
 func TestLogEventProvider_LifeCycle(t *testing.T) {
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/provider_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/provider_test.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/provider_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/provider_test.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/recoverer.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/recoverer.go
similarity index 99%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/recoverer.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/recoverer.go
index 98eb0b291bc..c7f6884426f 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/recoverer.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/recoverer.go
@@ -20,10 +20,11 @@ import (
 	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/recoverer_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/recoverer_test.go
similarity index 99%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/recoverer_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/recoverer_test.go
index 10e58bf26b3..89b19b4a819 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/recoverer_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/recoverer_test.go
@@ -23,8 +23,8 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core/mocks"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/mercury.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/mercury.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/mercury/mercury.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/mercury.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/mercury_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/mercury_test.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/mercury/mercury_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/mercury_test.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/streams/streams.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams.go
similarity index 98%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/mercury/streams/streams.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams.go
index f98d4ed2df4..aec23431921 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/streams/streams.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams.go
@@ -21,10 +21,10 @@ import (
 
 	iregistry21 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/i_keeper_registry_master_wrapper_2_1"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury"
-	v02 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/v02"
-	v03 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/v03"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury"
+	v02 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/v02"
+	v03 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/v03"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/streams/streams_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams_test.go
similarity index 99%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/mercury/streams/streams_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams_test.go
index baa277e0357..abcc37dca18 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/streams/streams_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams_test.go
@@ -26,10 +26,10 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/models"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/encoding"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury"
-	v02 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/v02"
-	v03 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/v03"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury"
+	v02 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/v02"
+	v03 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/v03"
 )
 
 type MockMercuryConfigProvider struct {
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/upkeep_failure_reasons.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/upkeep_failure_reasons.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/mercury/upkeep_failure_reasons.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/upkeep_failure_reasons.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/upkeep_states.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/upkeep_states.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/mercury/upkeep_states.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/upkeep_states.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/v02/request.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/v02/request.go
similarity index 99%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/mercury/v02/request.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/v02/request.go
index 4ce7893a0b6..8135617b6fd 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/v02/request.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/v02/request.go
@@ -17,7 +17,7 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/v02/v02_request_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/v02/v02_request_test.go
similarity index 99%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/mercury/v02/v02_request_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/v02/v02_request_test.go
index 2aecc0df771..ac945859d89 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/v02/v02_request_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/v02/v02_request_test.go
@@ -18,11 +18,10 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/models"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 
 	"github.com/stretchr/testify/assert"
-
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury"
 )
 
 const (
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/v03/request.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/v03/request.go
similarity index 99%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/mercury/v03/request.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/v03/request.go
index 1c607889741..7002e2f30ac 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/v03/request.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/v03/request.go
@@ -17,7 +17,7 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/v03/v03_request_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/v03/v03_request_test.go
similarity index 99%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/mercury/v03/v03_request_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/v03/v03_request_test.go
index 049448f8f76..16ccdac5d1f 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/v03/v03_request_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/v03/v03_request_test.go
@@ -16,12 +16,11 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/models"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mocks"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 
 	"github.com/stretchr/testify/assert"
-
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury"
 )
 
 const (
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/mocks/http_client.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mocks/http_client.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/mocks/http_client.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mocks/http_client.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/mocks/registry.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mocks/registry.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/mocks/registry.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mocks/registry.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/payload_builder.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/payload_builder.go
similarity index 95%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/payload_builder.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/payload_builder.go
index e138f440e49..37c458ae6eb 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/payload_builder.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/payload_builder.go
@@ -6,8 +6,8 @@ import (
 	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"
 
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider"
 )
 
 type payloadBuilder struct {
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/payload_builder_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/payload_builder_test.go
similarity index 98%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/payload_builder_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/payload_builder_test.go
index d7c2312d193..7e55267f6d3 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/payload_builder_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/payload_builder_test.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider"
 )
 
 func TestNewPayloadBuilder(t *testing.T) {
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/registry.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/registry.go
similarity index 99%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/registry.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/registry.go
index e6db3e66e69..bb05b8029fe 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/registry.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/registry.go
@@ -28,10 +28,10 @@ import (
 	iregistry21 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/i_keeper_registry_master_wrapper_2_1"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/models"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/encoding"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/streams"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/registry_check_pipeline.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/registry_check_pipeline.go
similarity index 99%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/registry_check_pipeline.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/registry_check_pipeline.go
index b0db3f7dd13..f5a931aae45 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/registry_check_pipeline.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/registry_check_pipeline.go
@@ -12,8 +12,8 @@ import (
 
 	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"
 
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/encoding"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding"
 )
 
 const (
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/registry_check_pipeline_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/registry_check_pipeline_test.go
similarity index 99%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/registry_check_pipeline_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/registry_check_pipeline_test.go
index 4eaf334f7c6..a14aaec0c5e 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/registry_check_pipeline_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/registry_check_pipeline_test.go
@@ -26,9 +26,9 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/models"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/encoding"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mocks"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 )
 
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/registry_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/registry_test.go
similarity index 99%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/registry_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/registry_test.go
index fdc6675da85..f3e4402092c 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/registry_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/registry_test.go
@@ -23,9 +23,9 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_utils_2_1"
 	iregistry21 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/i_keeper_registry_master_wrapper_2_1"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/encoding"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/services.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/services.go
similarity index 96%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/services.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/services.go
index 35d2f82942b..71ccee872ff 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/services.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/services.go
@@ -16,10 +16,10 @@ import (
 	iregistry21 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/i_keeper_registry_master_wrapper_2_1"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/models"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/encoding"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/transmit"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/upkeepstate"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/transmit"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 )
 
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/testdata/btc-usd.json b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/testdata/btc-usd.json
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/testdata/btc-usd.json
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/testdata/btc-usd.json
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/testdata/eth-usd.json b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/testdata/eth-usd.json
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/testdata/eth-usd.json
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/testdata/eth-usd.json
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/transmit/cache.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/transmit/cache.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/transmit/cache.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/transmit/cache.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/transmit/cache_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/transmit/cache_test.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/transmit/cache_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/transmit/cache_test.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/transmit/encoding.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/transmit/encoding.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/transmit/encoding.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/transmit/encoding.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/transmit/encoding_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/transmit/encoding_test.go
similarity index 98%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/transmit/encoding_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/transmit/encoding_test.go
index 7415b3701f8..da32376aab6 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/transmit/encoding_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/transmit/encoding_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	iregistry21 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/i_keeper_registry_master_wrapper_2_1"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
 )
 
 func TestTransmitEventLog(t *testing.T) {
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/transmit/event_provider.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/transmit/event_provider.go
similarity index 99%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/transmit/event_provider.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/transmit/event_provider.go
index 95f5ec0bf11..f66711c2b71 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/transmit/event_provider.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/transmit/event_provider.go
@@ -11,11 +11,12 @@ import (
 	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	iregistry21 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/i_keeper_registry_master_wrapper_2_1"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 )
 
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/transmit/event_provider_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/transmit/event_provider_test.go
similarity index 99%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/transmit/event_provider_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/transmit/event_provider_test.go
index 8d56fec22a5..950ec810402 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/transmit/event_provider_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/transmit/event_provider_test.go
@@ -19,7 +19,7 @@ import (
 	iregistry21 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/i_keeper_registry_master_wrapper_2_1"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
 )
 
 func TestTransmitEventProvider_Sanity(t *testing.T) {
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/upkeep_provider.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeep_provider.go
similarity index 97%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/upkeep_provider.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeep_provider.go
index 5b6d4ac7032..b30215e4fbf 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/upkeep_provider.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeep_provider.go
@@ -7,7 +7,7 @@ import (
 	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
 )
 
 var _ ocr2keepers.ConditionalUpkeepProvider = &upkeepProvider{}
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/upkeep_provider_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeep_provider_test.go
similarity index 98%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/upkeep_provider_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeep_provider_test.go
index 69bfabb259f..81ea3913188 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/upkeep_provider_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeep_provider_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
 )
 
 func TestUpkeepProvider_GetActiveUpkeeps(t *testing.T) {
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/upkeepstate/orm.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/orm.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/upkeepstate/orm.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/orm.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/upkeepstate/orm_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/orm_test.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/upkeepstate/orm_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/orm_test.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/upkeepstate/scanner.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/scanner.go
similarity index 98%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/upkeepstate/scanner.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/scanner.go
index d70611313af..30a50977d17 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/upkeepstate/scanner.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/scanner.go
@@ -11,7 +11,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	iregistry21 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/i_keeper_registry_master_wrapper_2_1"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 )
 
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/upkeepstate/scanner_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/scanner_test.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/upkeepstate/scanner_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/scanner_test.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/upkeepstate/store.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/store.go
similarity index 99%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/upkeepstate/store.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/store.go
index 505959b8f39..4a4de5ea1ad 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evm21/upkeepstate/store.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/store.go
@@ -11,8 +11,9 @@ import (
 	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/upkeepstate/store_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/store_test.go
similarity index 100%
rename from core/services/ocr2/plugins/ocr2keeper/evm21/upkeepstate/store_test.go
rename to core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/store_test.go
diff --git a/core/services/ocr2/plugins/ocr2keeper/integration_21_test.go b/core/services/ocr2/plugins/ocr2keeper/integration_21_test.go
index 01418b9f761..7ccd785a668 100644
--- a/core/services/ocr2/plugins/ocr2keeper/integration_21_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/integration_21_test.go
@@ -54,7 +54,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/streams"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
 )
diff --git a/core/services/ocr2/plugins/ocr2keeper/util.go b/core/services/ocr2/plugins/ocr2keeper/util.go
index 0c81b16f0fa..02a0d033bc1 100644
--- a/core/services/ocr2/plugins/ocr2keeper/util.go
+++ b/core/services/ocr2/plugins/ocr2keeper/util.go
@@ -20,9 +20,9 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/models"
-	kevm20 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm20"
-	kevm21 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21"
-	kevm21transmit "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/transmit"
+	evmregistry20 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20"
+	evmregistry21 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21"
+	evmregistry21transmit "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/transmit"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
 	evmrelay "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
@@ -73,11 +73,11 @@ func EVMDependencies20(
 	lggr logger.Logger,
 	chain legacyevm.Chain,
 	pr pipeline.Runner,
-) (evmrelay.OCR2KeeperProvider, *kevm20.EvmRegistry, Encoder20, *kevm20.LogProvider, error) {
+) (evmrelay.OCR2KeeperProvider, *evmregistry20.EvmRegistry, Encoder20, *evmregistry20.LogProvider, error) {
 	var err error
 
 	var keeperProvider evmrelay.OCR2KeeperProvider
-	var registry *kevm20.EvmRegistry
+	var registry *evmregistry20.EvmRegistry
 
 	// the provider will be returned as a dependency
 	if keeperProvider, err = EVMProvider(db, chain, lggr, spec, pr); err != nil {
@@ -85,17 +85,17 @@ func EVMDependencies20(
 	}
 
 	rAddr := ethkey.MustEIP55Address(spec.OCR2OracleSpec.ContractID).Address()
-	if registry, err = kevm20.NewEVMRegistryService(rAddr, chain, lggr); err != nil {
+	if registry, err = evmregistry20.NewEVMRegistryService(rAddr, chain, lggr); err != nil {
 		return nil, nil, nil, nil, err
 	}
 
-	encoder := kevm20.EVMAutomationEncoder20{}
+	encoder := evmregistry20.EVMAutomationEncoder20{}
 
 	// lookback blocks is hard coded and should provide ample time for logs
 	// to be detected in most cases
 	var lookbackBlocks int64 = 250
 	// TODO: accept a version of the registry contract and use the correct interfaces
-	logProvider, err := kevm20.NewLogProvider(lggr, chain.LogPoller(), rAddr, chain.Client(), lookbackBlocks)
+	logProvider, err := evmregistry20.NewLogProvider(lggr, chain.LogPoller(), rAddr, chain.Client(), lookbackBlocks)
 
 	return keeperProvider, registry, encoder, logProvider, err
 }
@@ -105,7 +105,7 @@ func FilterNamesFromSpec20(spec *job.OCR2OracleSpec) (names []string, err error)
 	if err != nil {
 		return nil, err
 	}
-	return []string{kevm20.LogProviderFilterName(addr.Address()), kevm20.UpkeepFilterName(addr.Address())}, err
+	return []string{evmregistry20.LogProviderFilterName(addr.Address()), evmregistry20.UpkeepFilterName(addr.Address())}, err
 }
 
 func EVMDependencies21(
@@ -117,7 +117,7 @@ func EVMDependencies21(
 	mc *models.MercuryCredentials,
 	keyring ocrtypes.OnchainKeyring,
 	dbCfg pg.QConfig,
-) (evmrelay.OCR2KeeperProvider, kevm21.AutomationServices, error) {
+) (evmrelay.OCR2KeeperProvider, evmregistry21.AutomationServices, error) {
 	var err error
 	var keeperProvider evmrelay.OCR2KeeperProvider
 
@@ -128,7 +128,7 @@ func EVMDependencies21(
 	}
 
 	rAddr := ethkey.MustEIP55Address(oSpec.ContractID).Address()
-	services, err := kevm21.New(rAddr, chain, mc, keyring, lggr, db, dbCfg)
+	services, err := evmregistry21.New(rAddr, chain, mc, keyring, lggr, db, dbCfg)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -141,5 +141,5 @@ func FilterNamesFromSpec21(spec *job.OCR2OracleSpec) (names []string, err error)
 	if err != nil {
 		return nil, err
 	}
-	return []string{kevm21transmit.EventProviderFilterName(addr.Address()), kevm21.RegistryUpkeepFilterName(addr.Address())}, err
+	return []string{evmregistry21transmit.EventProviderFilterName(addr.Address()), evmregistry21.RegistryUpkeepFilterName(addr.Address())}, err
 }
diff --git a/integration-tests/smoke/automation_test.go b/integration-tests/smoke/automation_test.go
index cdc8748676f..81b484f4e73 100644
--- a/integration-tests/smoke/automation_test.go
+++ b/integration-tests/smoke/automation_test.go
@@ -23,7 +23,7 @@ import (
 
 	cltypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_utils_2_1"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evm21/mercury/streams"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
 
 	"github.com/smartcontractkit/chainlink/integration-tests/actions"

From 8ae5190c246d98f8b83c24e8be0e4b65abe42562 Mon Sep 17 00:00:00 2001
From: Jordan Krage <jmank88@gmail.com>
Date: Thu, 30 Nov 2023 17:03:09 -0600
Subject: [PATCH 052/130] core/services/chainlink: pass static ver & sha to
 HealtChecker (#11432)

---
 core/scripts/go.mod                    | 2 +-
 core/scripts/go.sum                    | 4 ++--
 core/services/chainlink/application.go | 3 ++-
 go.mod                                 | 2 +-
 go.sum                                 | 4 ++--
 integration-tests/go.mod               | 2 +-
 integration-tests/go.sum               | 4 ++--
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/core/scripts/go.mod b/core/scripts/go.mod
index c1ed59097cc..197716c2b28 100644
--- a/core/scripts/go.mod
+++ b/core/scripts/go.mod
@@ -304,7 +304,7 @@ require (
 	github.com/shirou/gopsutil/v3 v3.23.10 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231129142348-7087174fecde // indirect
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231130184744-32b4198d2589 // indirect
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 // indirect
 	github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d // indirect
 	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3 // indirect
diff --git a/core/scripts/go.sum b/core/scripts/go.sum
index de86a457218..c6f922432b4 100644
--- a/core/scripts/go.sum
+++ b/core/scripts/go.sum
@@ -1504,8 +1504,8 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
 github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
 github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231129142348-7087174fecde h1:yulX+cnJbiS/iACjOdJfFtD5bD9M6TnXy7Og/PBafew=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231129142348-7087174fecde/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231130184744-32b4198d2589 h1:68YZ874EBGEGwT3lcg6Y+3GZXzyNDeDDiqLHvNMBKYc=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231130184744-32b4198d2589/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 h1:oewYJtdRkJKUHCNDCj5C2LQe6Oq6qy975g931nfG0cc=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542/go.mod h1:EpvRoycRD+kniYlz+pCpRT5e+fmPm0mSD/vmND+0oMg=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d h1:w4MsbOtNk6nD/mcXLstHWk9hB6g7QLtcAfhPjhwvOaQ=
diff --git a/core/services/chainlink/application.go b/core/services/chainlink/application.go
index 1c9cd106ba9..5c204d693e9 100644
--- a/core/services/chainlink/application.go
+++ b/core/services/chainlink/application.go
@@ -20,6 +20,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/loop"
 	commonservices "github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink/v2/core/static"
 
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
 	"github.com/smartcontractkit/chainlink/v2/core/build"
@@ -424,7 +425,7 @@ func NewApplication(opts ApplicationOpts) (Application, error) {
 		globalLogger.Debug("Off-chain reporting v2 disabled")
 	}
 
-	healthChecker := commonservices.NewChecker()
+	healthChecker := commonservices.NewChecker(static.Version, static.Sha)
 
 	var lbs []utils.DependentAwaiter
 	for _, c := range legacyEVMChains.Slice() {
diff --git a/go.mod b/go.mod
index 688f5810529..41255bc4f02 100644
--- a/go.mod
+++ b/go.mod
@@ -66,7 +66,7 @@ require (
 	github.com/shopspring/decimal v1.3.1
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704
 	github.com/smartcontractkit/chainlink-automation v1.0.1
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231129142348-7087174fecde
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231130184744-32b4198d2589
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542
 	github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d
 	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3
diff --git a/go.sum b/go.sum
index d522aabb08a..cc3e1303774 100644
--- a/go.sum
+++ b/go.sum
@@ -1507,8 +1507,8 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
 github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
 github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231129142348-7087174fecde h1:yulX+cnJbiS/iACjOdJfFtD5bD9M6TnXy7Og/PBafew=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231129142348-7087174fecde/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231130184744-32b4198d2589 h1:68YZ874EBGEGwT3lcg6Y+3GZXzyNDeDDiqLHvNMBKYc=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231130184744-32b4198d2589/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 h1:oewYJtdRkJKUHCNDCj5C2LQe6Oq6qy975g931nfG0cc=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542/go.mod h1:EpvRoycRD+kniYlz+pCpRT5e+fmPm0mSD/vmND+0oMg=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d h1:w4MsbOtNk6nD/mcXLstHWk9hB6g7QLtcAfhPjhwvOaQ=
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index 68b46d8a26a..220dc86b455 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/segmentio/ksuid v1.0.4
 	github.com/slack-go/slack v0.12.2
 	github.com/smartcontractkit/chainlink-automation v1.0.1
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231129142348-7087174fecde
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231130184744-32b4198d2589
 	github.com/smartcontractkit/chainlink-testing-framework v1.20.0
 	github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
 	github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index 46c132d6ff1..134168a8667 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -2376,8 +2376,8 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
 github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
 github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231129142348-7087174fecde h1:yulX+cnJbiS/iACjOdJfFtD5bD9M6TnXy7Og/PBafew=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231129142348-7087174fecde/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231130184744-32b4198d2589 h1:68YZ874EBGEGwT3lcg6Y+3GZXzyNDeDDiqLHvNMBKYc=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231130184744-32b4198d2589/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 h1:oewYJtdRkJKUHCNDCj5C2LQe6Oq6qy975g931nfG0cc=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542/go.mod h1:EpvRoycRD+kniYlz+pCpRT5e+fmPm0mSD/vmND+0oMg=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d h1:w4MsbOtNk6nD/mcXLstHWk9hB6g7QLtcAfhPjhwvOaQ=

From cdd570032b73ec1930a66ee23e93bf1b8018851c Mon Sep 17 00:00:00 2001
From: Cedric <cedric.cordenier@smartcontract.com>
Date: Fri, 1 Dec 2023 10:11:40 +0000
Subject: [PATCH 053/130] [chore] Refactor ResultsRunSaver to not expose
 runResults (#11398)

---
 core/services/ocr/delegate.go                 | 17 ++--
 core/services/ocr2/delegate.go                | 85 ++++---------------
 core/services/ocr2/plugins/median/services.go | 32 ++++---
 core/services/ocr2/plugins/mercury/plugin.go  | 11 +--
 core/services/ocrcommon/data_source.go        | 24 +++---
 core/services/ocrcommon/data_source_test.go   | 22 +++--
 core/services/ocrcommon/run_saver.go          | 20 +++--
 core/services/ocrcommon/run_saver_test.go     |  6 +-
 .../relay/evm/mercury/v1/data_source.go       | 13 ++-
 .../relay/evm/mercury/v1/data_source_test.go  | 23 ++---
 .../relay/evm/mercury/v2/data_source.go       | 13 ++-
 .../relay/evm/mercury/v2/data_source_test.go  | 11 +++
 .../relay/evm/mercury/v3/data_source.go       | 13 ++-
 .../relay/evm/mercury/v3/data_source_test.go  | 11 +++
 14 files changed, 143 insertions(+), 158 deletions(-)

diff --git a/core/services/ocr/delegate.go b/core/services/ocr/delegate.go
index ac78002d450..f473c93b1f0 100644
--- a/core/services/ocr/delegate.go
+++ b/core/services/ocr/delegate.go
@@ -274,7 +274,12 @@ func (d *Delegate) ServicesForSpec(jb job.Job) (services []job.ServiceCtx, err e
 			effectiveTransmitterAddress,
 		)
 
-		runResults := make(chan *pipeline.Run, chain.Config().JobPipeline().ResultWriteQueueDepth())
+		saver := ocrcommon.NewResultRunSaver(
+			d.pipelineRunner,
+			lggr,
+			cfg.JobPipeline().MaxSuccessfulRuns(),
+			cfg.JobPipeline().ResultWriteQueueDepth(),
+		)
 
 		var configOverrider ocrtypes.ConfigOverrider
 		configOverriderService, err := d.maybeCreateConfigOverrider(lggr, chain, concreteSpec.ContractAddress)
@@ -311,7 +316,7 @@ func (d *Delegate) ServicesForSpec(jb job.Job) (services []job.ServiceCtx, err e
 				jb,
 				*jb.PipelineSpec,
 				lggr,
-				runResults,
+				saver,
 				enhancedTelemChan,
 			),
 			LocalConfig:                  lc,
@@ -334,13 +339,7 @@ func (d *Delegate) ServicesForSpec(jb job.Job) (services []job.ServiceCtx, err e
 		// RunResultSaver needs to be started first so its available
 		// to read db writes. It is stopped last after the Oracle is shut down
 		// so no further runs are enqueued and we can drain the queue.
-		services = append([]job.ServiceCtx{ocrcommon.NewResultRunSaver(
-			runResults,
-			d.pipelineRunner,
-			make(chan struct{}),
-			lggr,
-			cfg.JobPipeline().MaxSuccessfulRuns(),
-		)}, services...)
+		services = append([]job.ServiceCtx{saver}, services...)
 	}
 
 	return services, nil
diff --git a/core/services/ocr2/delegate.go b/core/services/ocr2/delegate.go
index 02341821375..16f02282afb 100644
--- a/core/services/ocr2/delegate.go
+++ b/core/services/ocr2/delegate.go
@@ -426,24 +426,22 @@ func (d *Delegate) ServicesForSpec(jb job.Job) ([]job.ServiceCtx, error) {
 
 	spec.CaptureEATelemetry = d.cfg.OCR2().CaptureEATelemetry()
 
-	runResults := make(chan *pipeline.Run, d.cfg.JobPipeline().ResultWriteQueueDepth())
-
 	ctx := lggrCtx.ContextWithValues(context.Background())
 	switch spec.PluginType {
 	case types.Mercury:
-		return d.newServicesMercury(ctx, lggr, jb, runResults, bootstrapPeers, kb, ocrDB, lc, ocrLogger)
+		return d.newServicesMercury(ctx, lggr, jb, bootstrapPeers, kb, ocrDB, lc, ocrLogger)
 
 	case types.Median:
-		return d.newServicesMedian(ctx, lggr, jb, runResults, bootstrapPeers, kb, ocrDB, lc, ocrLogger)
+		return d.newServicesMedian(ctx, lggr, jb, bootstrapPeers, kb, ocrDB, lc, ocrLogger)
 
 	case types.DKG:
 		return d.newServicesDKG(lggr, jb, bootstrapPeers, kb, ocrDB, lc, ocrLogger)
 
 	case types.OCR2VRF:
-		return d.newServicesOCR2VRF(lggr, jb, runResults, bootstrapPeers, kb, ocrDB, lc)
+		return d.newServicesOCR2VRF(lggr, jb, bootstrapPeers, kb, ocrDB, lc)
 
 	case types.OCR2Keeper:
-		return d.newServicesOCR2Keepers(lggr, jb, runResults, bootstrapPeers, kb, ocrDB, lc, ocrLogger)
+		return d.newServicesOCR2Keepers(lggr, jb, bootstrapPeers, kb, ocrDB, lc, ocrLogger)
 
 	case types.Functions:
 		const (
@@ -453,7 +451,7 @@ func (d *Delegate) ServicesForSpec(jb job.Job) ([]job.ServiceCtx, error) {
 		)
 		thresholdPluginDB := NewDB(d.db, spec.ID, thresholdPluginId, lggr, d.cfg.Database())
 		s4PluginDB := NewDB(d.db, spec.ID, s4PluginId, lggr, d.cfg.Database())
-		return d.newServicesOCR2Functions(lggr, jb, runResults, bootstrapPeers, kb, ocrDB, thresholdPluginDB, s4PluginDB, lc, ocrLogger)
+		return d.newServicesOCR2Functions(lggr, jb, bootstrapPeers, kb, ocrDB, thresholdPluginDB, s4PluginDB, lc, ocrLogger)
 
 	case types.GenericPlugin:
 		return d.newServicesGenericPlugin(ctx, lggr, jb, bootstrapPeers, kb, ocrDB, lc, ocrLogger)
@@ -652,7 +650,6 @@ func (d *Delegate) newServicesMercury(
 	ctx context.Context,
 	lggr logger.SugaredLogger,
 	jb job.Job,
-	runResults chan *pipeline.Run,
 	bootstrapPeers []commontypes.BootstrapperLocator,
 	kb ocr2key.KeyBundle,
 	ocrDB *db,
@@ -720,7 +717,7 @@ func (d *Delegate) newServicesMercury(
 
 	chEnhancedTelem := make(chan ocrcommon.EnhancedTelemetryMercuryData, 100)
 
-	mercuryServices, err2 := mercury.NewServices(jb, mercuryProvider, d.pipelineRunner, runResults, lggr, oracleArgsNoPlugin, d.cfg.JobPipeline(), chEnhancedTelem, d.mercuryORM, (mercuryutils.FeedID)(*spec.FeedID))
+	mercuryServices, err2 := mercury.NewServices(jb, mercuryProvider, d.pipelineRunner, lggr, oracleArgsNoPlugin, d.cfg.JobPipeline(), chEnhancedTelem, d.mercuryORM, (mercuryutils.FeedID)(*spec.FeedID))
 
 	if ocrcommon.ShouldCollectEnhancedTelemetryMercury(jb) {
 		enhancedTelemService := ocrcommon.NewEnhancedTelemetryService(&jb, chEnhancedTelem, make(chan struct{}), d.monitoringEndpointGen.GenMonitoringEndpoint(rid.Network, rid.ChainID, spec.FeedID.String(), synchronization.EnhancedEAMercury), lggr.Named("EnhancedTelemetryMercury"))
@@ -736,7 +733,6 @@ func (d *Delegate) newServicesMedian(
 	ctx context.Context,
 	lggr logger.SugaredLogger,
 	jb job.Job,
-	runResults chan *pipeline.Run,
 	bootstrapPeers []commontypes.BootstrapperLocator,
 	kb ocr2key.KeyBundle,
 	ocrDB *db,
@@ -762,14 +758,18 @@ func (d *Delegate) newServicesMedian(
 	}
 	errorLog := &errorLog{jobID: jb.ID, recordError: d.jobORM.RecordError}
 	enhancedTelemChan := make(chan ocrcommon.EnhancedTelemetryData, 100)
-	mConfig := median.NewMedianConfig(d.cfg.JobPipeline().MaxSuccessfulRuns(), d.cfg)
+	mConfig := median.NewMedianConfig(
+		d.cfg.JobPipeline().MaxSuccessfulRuns(),
+		d.cfg.JobPipeline().ResultWriteQueueDepth(),
+		d.cfg,
+	)
 
 	relayer, err := d.RelayGetter.Get(rid)
 	if err != nil {
 		return nil, ErrRelayNotEnabled{Err: err, PluginName: "median", Relay: spec.Relay}
 	}
 
-	medianServices, err2 := median.NewMedianServices(ctx, jb, d.isNewlyCreatedJob, relayer, d.pipelineRunner, runResults, lggr, oracleArgsNoPlugin, mConfig, enhancedTelemChan, errorLog)
+	medianServices, err2 := median.NewMedianServices(ctx, jb, d.isNewlyCreatedJob, relayer, d.pipelineRunner, lggr, oracleArgsNoPlugin, mConfig, enhancedTelemChan, errorLog)
 
 	if ocrcommon.ShouldCollectEnhancedTelemetry(&jb) {
 		enhancedTelemService := ocrcommon.NewEnhancedTelemetryService(&jb, enhancedTelemChan, make(chan struct{}), d.monitoringEndpointGen.GenMonitoringEndpoint(rid.Network, rid.ChainID, spec.ContractID, synchronization.EnhancedEA), lggr.Named("EnhancedTelemetry"))
@@ -852,7 +852,6 @@ func (d *Delegate) newServicesDKG(
 func (d *Delegate) newServicesOCR2VRF(
 	lggr logger.SugaredLogger,
 	jb job.Job,
-	runResults chan *pipeline.Run,
 	bootstrapPeers []commontypes.BootstrapperLocator,
 	kb ocr2key.KeyBundle,
 	ocrDB *db,
@@ -1019,28 +1018,16 @@ func (d *Delegate) newServicesOCR2VRF(
 		return nil, errors.Wrap(err2, "new ocr2vrf")
 	}
 
-	// RunResultSaver needs to be started first, so it's available
-	// to read odb writes. It is stopped last after the OraclePlugin is shut down
-	// so no further runs are enqueued, and we can drain the queue.
-	runResultSaver := ocrcommon.NewResultRunSaver(
-		runResults,
-		d.pipelineRunner,
-		make(chan struct{}),
-		lggr,
-		d.cfg.JobPipeline().MaxSuccessfulRuns(),
-	)
-
 	// NOTE: we return from here with the services because the OCR2VRF oracles are defined
 	// and exported from the ocr2vrf library. It takes care of running the DKG and OCR2VRF
 	// oracles under the hood together.
 	oracleCtx := job.NewServiceAdapter(oracles)
-	return []job.ServiceCtx{runResultSaver, vrfProvider, dkgProvider, oracleCtx}, nil
+	return []job.ServiceCtx{vrfProvider, dkgProvider, oracleCtx}, nil
 }
 
 func (d *Delegate) newServicesOCR2Keepers(
 	lggr logger.SugaredLogger,
 	jb job.Job,
-	runResults chan *pipeline.Run,
 	bootstrapPeers []commontypes.BootstrapperLocator,
 	kb ocr2key.KeyBundle,
 	ocrDB *db,
@@ -1059,18 +1046,17 @@ func (d *Delegate) newServicesOCR2Keepers(
 
 	switch cfg.ContractVersion {
 	case "v2.1":
-		return d.newServicesOCR2Keepers21(lggr, jb, runResults, bootstrapPeers, kb, ocrDB, lc, ocrLogger, cfg, spec)
+		return d.newServicesOCR2Keepers21(lggr, jb, bootstrapPeers, kb, ocrDB, lc, ocrLogger, cfg, spec)
 	case "v2.0":
-		return d.newServicesOCR2Keepers20(lggr, jb, runResults, bootstrapPeers, kb, ocrDB, lc, ocrLogger, cfg, spec)
+		return d.newServicesOCR2Keepers20(lggr, jb, bootstrapPeers, kb, ocrDB, lc, ocrLogger, cfg, spec)
 	default:
-		return d.newServicesOCR2Keepers20(lggr, jb, runResults, bootstrapPeers, kb, ocrDB, lc, ocrLogger, cfg, spec)
+		return d.newServicesOCR2Keepers20(lggr, jb, bootstrapPeers, kb, ocrDB, lc, ocrLogger, cfg, spec)
 	}
 }
 
 func (d *Delegate) newServicesOCR2Keepers21(
 	lggr logger.SugaredLogger,
 	jb job.Job,
-	runResults chan *pipeline.Run,
 	bootstrapPeers []commontypes.BootstrapperLocator,
 	kb ocr2key.KeyBundle,
 	ocrDB *db,
@@ -1162,19 +1148,7 @@ func (d *Delegate) newServicesOCR2Keepers21(
 		return nil, errors.Wrap(err, "could not create new keepers ocr2 delegate")
 	}
 
-	// RunResultSaver needs to be started first, so it's available
-	// to read odb writes. It is stopped last after the OraclePlugin is shut down
-	// so no further runs are enqueued, and we can drain the queue.
-	runResultSaver := ocrcommon.NewResultRunSaver(
-		runResults,
-		d.pipelineRunner,
-		make(chan struct{}),
-		lggr,
-		d.cfg.JobPipeline().MaxSuccessfulRuns(),
-	)
-
 	automationServices := []job.ServiceCtx{
-		runResultSaver,
 		keeperProvider,
 		services.Registry(),
 		services.BlockSubscriber(),
@@ -1206,7 +1180,6 @@ func (d *Delegate) newServicesOCR2Keepers21(
 func (d *Delegate) newServicesOCR2Keepers20(
 	lggr logger.SugaredLogger,
 	jb job.Job,
-	runResults chan *pipeline.Run,
 	bootstrapPeers []commontypes.BootstrapperLocator,
 	kb ocr2key.KeyBundle,
 	ocrDB *db,
@@ -1316,20 +1289,8 @@ func (d *Delegate) newServicesOCR2Keepers20(
 		return nil, errors.Wrap(err, "could not create new keepers ocr2 delegate")
 	}
 
-	// RunResultSaver needs to be started first, so it's available
-	// to read odb writes. It is stopped last after the OraclePlugin is shut down
-	// so no further runs are enqueued, and we can drain the queue.
-	runResultSaver := ocrcommon.NewResultRunSaver(
-		runResults,
-		d.pipelineRunner,
-		make(chan struct{}),
-		lggr,
-		d.cfg.JobPipeline().MaxSuccessfulRuns(),
-	)
-
 	return []job.ServiceCtx{
 		job.NewServiceAdapter(runr),
-		runResultSaver,
 		keeperProvider,
 		rgstry,
 		logProvider,
@@ -1340,7 +1301,6 @@ func (d *Delegate) newServicesOCR2Keepers20(
 func (d *Delegate) newServicesOCR2Functions(
 	lggr logger.SugaredLogger,
 	jb job.Job,
-	runResults chan *pipeline.Run,
 	bootstrapPeers []commontypes.BootstrapperLocator,
 	kb ocr2key.KeyBundle,
 	functionsOcrDB *db,
@@ -1480,18 +1440,7 @@ func (d *Delegate) newServicesOCR2Functions(
 		return nil, errors.Wrap(err, "error calling NewFunctionsServices")
 	}
 
-	// RunResultSaver needs to be started first, so it's available
-	// to read odb writes. It is stopped last after the OraclePlugin is shut down
-	// so no further runs are enqueued, and we can drain the queue.
-	runResultSaver := ocrcommon.NewResultRunSaver(
-		runResults,
-		d.pipelineRunner,
-		make(chan struct{}),
-		lggr,
-		d.cfg.JobPipeline().MaxSuccessfulRuns(),
-	)
-
-	return append([]job.ServiceCtx{runResultSaver, functionsProvider, thresholdProvider, s4Provider}, functionsServices...), nil
+	return append([]job.ServiceCtx{functionsProvider, thresholdProvider, s4Provider}, functionsServices...), nil
 }
 
 // errorLog implements [loop.ErrorLog]
diff --git a/core/services/ocr2/plugins/median/services.go b/core/services/ocr2/plugins/median/services.go
index 896bbacb419..2d1ef720545 100644
--- a/core/services/ocr2/plugins/median/services.go
+++ b/core/services/ocr2/plugins/median/services.go
@@ -25,19 +25,22 @@ import (
 
 type MedianConfig interface {
 	JobPipelineMaxSuccessfulRuns() uint64
+	JobPipelineResultWriteQueueDepth() uint64
 	plugins.RegistrarConfig
 }
 
 // concrete implementation of MedianConfig
 type medianConfig struct {
-	jobPipelineMaxSuccessfulRuns uint64
+	jobPipelineMaxSuccessfulRuns     uint64
+	jobPipelineResultWriteQueueDepth uint64
 	plugins.RegistrarConfig
 }
 
-func NewMedianConfig(jobPipelineMaxSuccessfulRuns uint64, pluginProcessCfg plugins.RegistrarConfig) MedianConfig {
+func NewMedianConfig(jobPipelineMaxSuccessfulRuns uint64, jobPipelineResultWriteQueueDepth uint64, pluginProcessCfg plugins.RegistrarConfig) MedianConfig {
 	return &medianConfig{
-		jobPipelineMaxSuccessfulRuns: jobPipelineMaxSuccessfulRuns,
-		RegistrarConfig:              pluginProcessCfg,
+		jobPipelineMaxSuccessfulRuns:     jobPipelineMaxSuccessfulRuns,
+		jobPipelineResultWriteQueueDepth: jobPipelineResultWriteQueueDepth,
+		RegistrarConfig:                  pluginProcessCfg,
 	}
 }
 
@@ -45,12 +48,15 @@ func (m *medianConfig) JobPipelineMaxSuccessfulRuns() uint64 {
 	return m.jobPipelineMaxSuccessfulRuns
 }
 
+func (m *medianConfig) JobPipelineResultWriteQueueDepth() uint64 {
+	return m.jobPipelineResultWriteQueueDepth
+}
+
 func NewMedianServices(ctx context.Context,
 	jb job.Job,
 	isNewlyCreatedJob bool,
 	relayer loop.Relayer,
 	pipelineRunner pipeline.Runner,
-	runResults chan *pipeline.Run,
 	lggr logger.Logger,
 	argsNoPlugin libocr.OCR2OracleArgs,
 	cfg MedianConfig,
@@ -69,6 +75,13 @@ func NewMedianServices(ctx context.Context,
 	}
 	spec := jb.OCR2OracleSpec
 
+	runSaver := ocrcommon.NewResultRunSaver(
+		pipelineRunner,
+		lggr,
+		cfg.JobPipelineMaxSuccessfulRuns(),
+		cfg.JobPipelineResultWriteQueueDepth(),
+	)
+
 	provider, err := relayer.NewPluginProvider(ctx, types.RelayArgs{
 		ExternalJobID: jb.ExternalJobID,
 		JobID:         jb.ID,
@@ -104,7 +117,7 @@ func NewMedianServices(ctx context.Context,
 		jb,
 		*jb.PipelineSpec,
 		lggr,
-		runResults,
+		runSaver,
 		chEnhancedTelem,
 	), ocrcommon.NewInMemoryDataSource(pipelineRunner, jb, pipeline.Spec{
 		ID:           jb.ID,
@@ -140,13 +153,6 @@ func NewMedianServices(ctx context.Context,
 		abort()
 		return
 	}
-	runSaver := ocrcommon.NewResultRunSaver(
-		runResults,
-		pipelineRunner,
-		make(chan struct{}),
-		lggr,
-		cfg.JobPipelineMaxSuccessfulRuns(),
-	)
 	srvs = append(srvs, runSaver, job.NewServiceAdapter(oracle))
 	if !jb.OCR2OracleSpec.CaptureEATelemetry {
 		lggr.Infof("Enhanced EA telemetry is disabled for job %s", jb.Name.ValueOrZero())
diff --git a/core/services/ocr2/plugins/mercury/plugin.go b/core/services/ocr2/plugins/mercury/plugin.go
index bd68ccd8b72..d443008334c 100644
--- a/core/services/ocr2/plugins/mercury/plugin.go
+++ b/core/services/ocr2/plugins/mercury/plugin.go
@@ -26,13 +26,13 @@ import (
 
 type Config interface {
 	MaxSuccessfulRuns() uint64
+	ResultWriteQueueDepth() uint64
 }
 
 func NewServices(
 	jb job.Job,
 	ocr2Provider commontypes.MercuryProvider,
 	pipelineRunner pipeline.Runner,
-	runResults chan *pipeline.Run,
 	lggr logger.Logger,
 	argsNoPlugin libocr2.MercuryOracleArgs,
 	cfg Config,
@@ -55,6 +55,8 @@ func NewServices(
 	}
 	lggr = lggr.Named("MercuryPlugin").With("jobID", jb.ID, "jobName", jb.Name.ValueOrZero())
 
+	saver := ocrcommon.NewResultRunSaver(pipelineRunner, lggr, cfg.MaxSuccessfulRuns(), cfg.ResultWriteQueueDepth())
+
 	switch feedID.Version() {
 	case 1:
 		ds := mercuryv1.NewDataSource(
@@ -63,7 +65,7 @@ func NewServices(
 			jb,
 			*jb.PipelineSpec,
 			lggr,
-			runResults,
+			saver,
 			chEnhancedTelem,
 			ocr2Provider.ChainReader(),
 			ocr2Provider.MercuryServerFetcher(),
@@ -84,7 +86,7 @@ func NewServices(
 			*jb.PipelineSpec,
 			feedID,
 			lggr,
-			runResults,
+			saver,
 			chEnhancedTelem,
 			ocr2Provider.MercuryServerFetcher(),
 			*pluginConfig.LinkFeedID,
@@ -104,7 +106,7 @@ func NewServices(
 			*jb.PipelineSpec,
 			feedID,
 			lggr,
-			runResults,
+			saver,
 			chEnhancedTelem,
 			ocr2Provider.MercuryServerFetcher(),
 			*pluginConfig.LinkFeedID,
@@ -124,6 +126,5 @@ func NewServices(
 	if err != nil {
 		return nil, errors.WithStack(err)
 	}
-	saver := ocrcommon.NewResultRunSaver(runResults, pipelineRunner, make(chan struct{}), lggr, cfg.MaxSuccessfulRuns())
 	return []job.ServiceCtx{ocr2Provider, saver, job.NewServiceAdapter(oracle)}, nil
 }
diff --git a/core/services/ocrcommon/data_source.go b/core/services/ocrcommon/data_source.go
index 0363a7124b6..706376fbfd1 100644
--- a/core/services/ocrcommon/data_source.go
+++ b/core/services/ocrcommon/data_source.go
@@ -33,9 +33,13 @@ type inMemoryDataSource struct {
 	chEnhancedTelemetry chan<- EnhancedTelemetryData
 }
 
+type Saver interface {
+	Save(run *pipeline.Run)
+}
+
 type dataSourceBase struct {
 	inMemoryDataSource
-	runResults chan<- *pipeline.Run
+	saver Saver
 }
 
 // dataSource implements dataSourceBase with the proper Observe return type for ocr1
@@ -55,7 +59,7 @@ type ObservationTimestamp struct {
 	ConfigDigest string
 }
 
-func NewDataSourceV1(pr pipeline.Runner, jb job.Job, spec pipeline.Spec, lggr logger.Logger, runResults chan<- *pipeline.Run, chEnhancedTelemetry chan EnhancedTelemetryData) ocr1types.DataSource {
+func NewDataSourceV1(pr pipeline.Runner, jb job.Job, spec pipeline.Spec, lggr logger.Logger, s Saver, chEnhancedTelemetry chan EnhancedTelemetryData) ocr1types.DataSource {
 	return &dataSource{
 		dataSourceBase: dataSourceBase{
 			inMemoryDataSource: inMemoryDataSource{
@@ -65,12 +69,12 @@ func NewDataSourceV1(pr pipeline.Runner, jb job.Job, spec pipeline.Spec, lggr lo
 				lggr:                lggr,
 				chEnhancedTelemetry: chEnhancedTelemetry,
 			},
-			runResults: runResults,
+			saver: s,
 		},
 	}
 }
 
-func NewDataSourceV2(pr pipeline.Runner, jb job.Job, spec pipeline.Spec, lggr logger.Logger, runResults chan<- *pipeline.Run, enhancedTelemChan chan EnhancedTelemetryData) median.DataSource {
+func NewDataSourceV2(pr pipeline.Runner, jb job.Job, spec pipeline.Spec, lggr logger.Logger, s Saver, enhancedTelemChan chan EnhancedTelemetryData) median.DataSource {
 	return &dataSourceV2{
 		dataSourceBase: dataSourceBase{
 			inMemoryDataSource: inMemoryDataSource{
@@ -80,7 +84,7 @@ func NewDataSourceV2(pr pipeline.Runner, jb job.Job, spec pipeline.Spec, lggr lo
 				lggr:                lggr,
 				chEnhancedTelemetry: enhancedTelemChan,
 			},
-			runResults: runResults,
+			saver: s,
 		},
 	}
 }
@@ -189,19 +193,13 @@ func (ds *dataSourceBase) observe(ctx context.Context, timestamp ObservationTime
 		return nil, err
 	}
 
-	// Do the database write in a non-blocking fashion
+	// Save() does the database write in a non-blocking fashion
 	// so we can return the observation results immediately.
 	// This is helpful in the case of a blocking API call, where
 	// we reach the passed in context deadline and we want to
 	// immediately return any result we have and do not want to have
 	// a db write block that.
-	select {
-	case ds.runResults <- run:
-	default:
-		// If we're unable to enqueue a write, still return the value we have but warn.
-		ds.lggr.Warnf("unable to enqueue run save for job ID %d, buffer full", ds.inMemoryDataSource.spec.JobID)
-		return ds.inMemoryDataSource.parse(finalResult)
-	}
+	ds.saver.Save(run)
 
 	return ds.inMemoryDataSource.parse(finalResult)
 }
diff --git a/core/services/ocrcommon/data_source_test.go b/core/services/ocrcommon/data_source_test.go
index 51a004f1f05..3ffc6b31e8c 100644
--- a/core/services/ocrcommon/data_source_test.go
+++ b/core/services/ocrcommon/data_source_test.go
@@ -93,8 +93,17 @@ func Test_InMemoryDataSourceWithProm(t *testing.T) {
 
 }
 
+type mockSaver struct {
+	r *pipeline.Run
+}
+
+func (ms *mockSaver) Save(r *pipeline.Run) {
+	ms.r = r
+}
+
 func Test_NewDataSourceV2(t *testing.T) {
 	runner := pipelinemocks.NewRunner(t)
+	ms := &mockSaver{}
 	runner.On("ExecuteRun", mock.Anything, mock.AnythingOfType("pipeline.Spec"), mock.Anything, mock.Anything).
 		Return(&pipeline.Run{}, pipeline.TaskRunResults{
 			{
@@ -106,16 +115,16 @@ func Test_NewDataSourceV2(t *testing.T) {
 			},
 		}, nil)
 
-	resChan := make(chan *pipeline.Run, 100)
-	ds := ocrcommon.NewDataSourceV2(runner, job.Job{}, pipeline.Spec{}, logger.TestLogger(t), resChan, nil)
+	ds := ocrcommon.NewDataSourceV2(runner, job.Job{}, pipeline.Spec{}, logger.TestLogger(t), ms, nil)
 	val, err := ds.Observe(testutils.Context(t), types.ReportTimestamp{})
 	require.NoError(t, err)
-	assert.Equal(t, mockValue, val.String())    // returns expected value after pipeline run
-	assert.Equal(t, &pipeline.Run{}, <-resChan) // expected data properly passed to channel
+	assert.Equal(t, mockValue, val.String()) // returns expected value after pipeline run
+	assert.Equal(t, &pipeline.Run{}, ms.r)   // expected data properly passed to channel
 }
 
 func Test_NewDataSourceV1(t *testing.T) {
 	runner := pipelinemocks.NewRunner(t)
+	ms := &mockSaver{}
 	runner.On("ExecuteRun", mock.Anything, mock.AnythingOfType("pipeline.Spec"), mock.Anything, mock.Anything).
 		Return(&pipeline.Run{}, pipeline.TaskRunResults{
 			{
@@ -127,10 +136,9 @@ func Test_NewDataSourceV1(t *testing.T) {
 			},
 		}, nil)
 
-	resChan := make(chan *pipeline.Run, 100)
-	ds := ocrcommon.NewDataSourceV1(runner, job.Job{}, pipeline.Spec{}, logger.TestLogger(t), resChan, nil)
+	ds := ocrcommon.NewDataSourceV1(runner, job.Job{}, pipeline.Spec{}, logger.TestLogger(t), ms, nil)
 	val, err := ds.Observe(testutils.Context(t), ocrtypes.ReportTimestamp{})
 	require.NoError(t, err)
 	assert.Equal(t, mockValue, new(big.Int).Set(val).String()) // returns expected value after pipeline run
-	assert.Equal(t, &pipeline.Run{}, <-resChan)                // expected data properly passed to channel
+	assert.Equal(t, &pipeline.Run{}, ms.r)                     // expected data properly passed to channel
 }
diff --git a/core/services/ocrcommon/run_saver.go b/core/services/ocrcommon/run_saver.go
index 184226605fe..b1a0fc7b141 100644
--- a/core/services/ocrcommon/run_saver.go
+++ b/core/services/ocrcommon/run_saver.go
@@ -12,7 +12,7 @@ type RunResultSaver struct {
 	services.StateMachine
 
 	maxSuccessfulRuns uint64
-	runResults        <-chan *pipeline.Run
+	runResults        chan *pipeline.Run
 	pipelineRunner    pipeline.Runner
 	done              chan struct{}
 	logger            logger.Logger
@@ -24,18 +24,28 @@ func (r *RunResultSaver) HealthReport() map[string]error {
 
 func (r *RunResultSaver) Name() string { return r.logger.Name() }
 
-func NewResultRunSaver(runResults <-chan *pipeline.Run, pipelineRunner pipeline.Runner, done chan struct{},
-	logger logger.Logger, maxSuccessfulRuns uint64,
+func NewResultRunSaver(pipelineRunner pipeline.Runner,
+	logger logger.Logger, maxSuccessfulRuns uint64, resultsWriteDepth uint64,
 ) *RunResultSaver {
 	return &RunResultSaver{
 		maxSuccessfulRuns: maxSuccessfulRuns,
-		runResults:        runResults,
+		runResults:        make(chan *pipeline.Run, resultsWriteDepth),
 		pipelineRunner:    pipelineRunner,
-		done:              done,
+		done:              make(chan struct{}),
 		logger:            logger.Named("RunResultSaver"),
 	}
 }
 
+// Save sends the run on the internal `runResults` channel for saving.
+// IMPORTANT: if the `runResults` pipeline is full, the run will be dropped.
+func (r *RunResultSaver) Save(run *pipeline.Run) {
+	select {
+	case r.runResults <- run:
+	default:
+		r.logger.Warnw("RunSaver: the write queue was full, dropping run")
+	}
+}
+
 // Start starts RunResultSaver.
 func (r *RunResultSaver) Start(context.Context) error {
 	return r.StartOnce("RunResultSaver", func() error {
diff --git a/core/services/ocrcommon/run_saver_test.go b/core/services/ocrcommon/run_saver_test.go
index 7d20a7a202e..73697d181bc 100644
--- a/core/services/ocrcommon/run_saver_test.go
+++ b/core/services/ocrcommon/run_saver_test.go
@@ -14,13 +14,11 @@ import (
 
 func TestRunSaver(t *testing.T) {
 	pipelineRunner := mocks.NewRunner(t)
-	rr := make(chan *pipeline.Run, 100)
 	rs := NewResultRunSaver(
-		rr,
 		pipelineRunner,
-		make(chan struct{}),
 		logger.TestLogger(t),
 		1000,
+		100,
 	)
 	require.NoError(t, rs.Start(testutils.Context(t)))
 	for i := 0; i < 100; i++ {
@@ -31,7 +29,7 @@ func TestRunSaver(t *testing.T) {
 				args.Get(0).(*pipeline.Run).ID = int64(d)
 			}).
 			Once()
-		rr <- &pipeline.Run{ID: int64(i)}
+		rs.Save(&pipeline.Run{ID: int64(i)})
 	}
 	require.NoError(t, rs.Close())
 }
diff --git a/core/services/relay/evm/mercury/v1/data_source.go b/core/services/relay/evm/mercury/v1/data_source.go
index 79eb32af441..bc94166e566 100644
--- a/core/services/relay/evm/mercury/v1/data_source.go
+++ b/core/services/relay/evm/mercury/v1/data_source.go
@@ -58,7 +58,7 @@ type datasource struct {
 	jb             job.Job
 	spec           pipeline.Spec
 	lggr           logger.Logger
-	runResults     chan<- *pipeline.Run
+	saver          ocrcommon.Saver
 	orm            types.DataSourceORM
 	codec          reportcodec.ReportCodec
 	feedID         [32]byte
@@ -76,8 +76,8 @@ type datasource struct {
 
 var _ relaymercuryv1.DataSource = &datasource{}
 
-func NewDataSource(orm types.DataSourceORM, pr pipeline.Runner, jb job.Job, spec pipeline.Spec, lggr logger.Logger, rr chan *pipeline.Run, enhancedTelemChan chan ocrcommon.EnhancedTelemetryMercuryData, chainReader relaymercury.ChainReader, fetcher Fetcher, initialBlockNumber *int64, feedID mercuryutils.FeedID) *datasource {
-	return &datasource{pr, jb, spec, lggr, rr, orm, reportcodec.ReportCodec{}, feedID, sync.RWMutex{}, enhancedTelemChan, chainReader, fetcher, initialBlockNumber, insufficientBlocksCount.WithLabelValues(feedID.String()), zeroBlocksCount.WithLabelValues(feedID.String())}
+func NewDataSource(orm types.DataSourceORM, pr pipeline.Runner, jb job.Job, spec pipeline.Spec, lggr logger.Logger, s ocrcommon.Saver, enhancedTelemChan chan ocrcommon.EnhancedTelemetryMercuryData, chainReader relaymercury.ChainReader, fetcher Fetcher, initialBlockNumber *int64, feedID mercuryutils.FeedID) *datasource {
+	return &datasource{pr, jb, spec, lggr, s, orm, reportcodec.ReportCodec{}, feedID, sync.RWMutex{}, enhancedTelemChan, chainReader, fetcher, initialBlockNumber, insufficientBlocksCount.WithLabelValues(feedID.String()), zeroBlocksCount.WithLabelValues(feedID.String())}
 }
 
 type ErrEmptyLatestReport struct {
@@ -156,11 +156,8 @@ func (ds *datasource) Observe(ctx context.Context, repts ocrtypes.ReportTimestam
 			pipelineExecutionErr = fmt.Errorf("Observe failed while executing run: %w", pipelineExecutionErr)
 			return
 		}
-		select {
-		case ds.runResults <- run:
-		default:
-			ds.lggr.Warnf("unable to enqueue run save for job ID %d, buffer full", ds.spec.JobID)
-		}
+
+		ds.saver.Save(run)
 
 		// NOTE: trrs comes back as _all_ tasks, but we only want the terminal ones
 		// They are guaranteed to be sorted by index asc so should be in the correct order
diff --git a/core/services/relay/evm/mercury/v1/data_source_test.go b/core/services/relay/evm/mercury/v1/data_source_test.go
index 45a99f29196..d8d7d39dbb8 100644
--- a/core/services/relay/evm/mercury/v1/data_source_test.go
+++ b/core/services/relay/evm/mercury/v1/data_source_test.go
@@ -52,6 +52,14 @@ func (m *mockFetcher) LatestTimestamp(context.Context) (int64, error) {
 	return 0, nil
 }
 
+type mockSaver struct {
+	r *pipeline.Run
+}
+
+func (ms *mockSaver) Save(r *pipeline.Run) {
+	ms.r = r
+}
+
 type mockORM struct {
 	report []byte
 	err    error
@@ -80,6 +88,9 @@ func TestMercury_Observe(t *testing.T) {
 	fetcher := &mockFetcher{}
 	ds.fetcher = fetcher
 
+	saver := &mockSaver{}
+	ds.saver = saver
+
 	trrs := []pipeline.TaskRunResult{
 		{
 			// benchmark price
@@ -293,24 +304,16 @@ func TestMercury_Observe(t *testing.T) {
 			_, err := ds.Observe(ctx, repts, false)
 			assert.EqualError(t, err, "Observe failed while parsing run results: failed to parse Bid: can't convert foo to decimal")
 		})
-		t.Run("sends run to runResults channel", func(t *testing.T) {
+		t.Run("saves run", func(t *testing.T) {
 			for i := range trrs {
 				trrs[i].Result.Value = "123"
 				trrs[i].Result.Error = nil
 			}
-			ch := make(chan *pipeline.Run, 1)
-
-			ds.runResults = ch
 
 			_, err := ds.Observe(ctx, repts, false)
 			assert.NoError(t, err)
 
-			select {
-			case run := <-ch:
-				assert.Equal(t, int64(42), run.ID)
-			default:
-				t.Fatal("expected run on channel")
-			}
+			assert.Equal(t, int64(42), saver.r.ID)
 		})
 	})
 
diff --git a/core/services/relay/evm/mercury/v2/data_source.go b/core/services/relay/evm/mercury/v2/data_source.go
index f7b78925130..ec6cf5ad106 100644
--- a/core/services/relay/evm/mercury/v2/data_source.go
+++ b/core/services/relay/evm/mercury/v2/data_source.go
@@ -39,7 +39,7 @@ type datasource struct {
 	spec           pipeline.Spec
 	feedID         mercuryutils.FeedID
 	lggr           logger.Logger
-	runResults     chan<- *pipeline.Run
+	saver          ocrcommon.Saver
 	orm            types.DataSourceORM
 	codec          reportcodec.ReportCodec
 
@@ -54,8 +54,8 @@ type datasource struct {
 
 var _ relaymercuryv2.DataSource = &datasource{}
 
-func NewDataSource(orm types.DataSourceORM, pr pipeline.Runner, jb job.Job, spec pipeline.Spec, feedID mercuryutils.FeedID, lggr logger.Logger, rr chan *pipeline.Run, enhancedTelemChan chan ocrcommon.EnhancedTelemetryMercuryData, fetcher LatestReportFetcher, linkFeedID, nativeFeedID mercuryutils.FeedID) *datasource {
-	return &datasource{pr, jb, spec, feedID, lggr, rr, orm, reportcodec.ReportCodec{}, fetcher, linkFeedID, nativeFeedID, sync.RWMutex{}, enhancedTelemChan}
+func NewDataSource(orm types.DataSourceORM, pr pipeline.Runner, jb job.Job, spec pipeline.Spec, feedID mercuryutils.FeedID, lggr logger.Logger, s ocrcommon.Saver, enhancedTelemChan chan ocrcommon.EnhancedTelemetryMercuryData, fetcher LatestReportFetcher, linkFeedID, nativeFeedID mercuryutils.FeedID) *datasource {
+	return &datasource{pr, jb, spec, feedID, lggr, s, orm, reportcodec.ReportCodec{}, fetcher, linkFeedID, nativeFeedID, sync.RWMutex{}, enhancedTelemChan}
 }
 
 func (ds *datasource) Observe(ctx context.Context, repts ocrtypes.ReportTimestamp, fetchMaxFinalizedTimestamp bool) (obs relaymercuryv2.Observation, pipelineExecutionErr error) {
@@ -91,11 +91,8 @@ func (ds *datasource) Observe(ctx context.Context, repts ocrtypes.ReportTimestam
 			pipelineExecutionErr = fmt.Errorf("Observe failed while executing run: %w", pipelineExecutionErr)
 			return
 		}
-		select {
-		case ds.runResults <- run:
-		default:
-			ds.lggr.Warnf("unable to enqueue run save for job ID %d, buffer full", ds.spec.JobID)
-		}
+
+		ds.saver.Save(run)
 
 		var parsed parseOutput
 		parsed, pipelineExecutionErr = ds.parse(trrs)
diff --git a/core/services/relay/evm/mercury/v2/data_source_test.go b/core/services/relay/evm/mercury/v2/data_source_test.go
index 02492031939..d1030327e10 100644
--- a/core/services/relay/evm/mercury/v2/data_source_test.go
+++ b/core/services/relay/evm/mercury/v2/data_source_test.go
@@ -63,6 +63,14 @@ func (m *mockORM) LatestReport(ctx context.Context, feedID [32]byte, qopts ...pg
 	return m.report, m.err
 }
 
+type mockSaver struct {
+	r *pipeline.Run
+}
+
+func (ms *mockSaver) Save(r *pipeline.Run) {
+	ms.r = r
+}
+
 func Test_Datasource(t *testing.T) {
 	orm := &mockORM{}
 	ds := &datasource{orm: orm, lggr: logger.TestLogger(t)}
@@ -72,6 +80,9 @@ func Test_Datasource(t *testing.T) {
 	fetcher := &mockFetcher{}
 	ds.fetcher = fetcher
 
+	saver := &mockSaver{}
+	ds.saver = saver
+
 	goodTrrs := []pipeline.TaskRunResult{
 		{
 			// bp
diff --git a/core/services/relay/evm/mercury/v3/data_source.go b/core/services/relay/evm/mercury/v3/data_source.go
index 34dbd13be99..d5e1e5716dd 100644
--- a/core/services/relay/evm/mercury/v3/data_source.go
+++ b/core/services/relay/evm/mercury/v3/data_source.go
@@ -40,7 +40,7 @@ type datasource struct {
 	spec           pipeline.Spec
 	feedID         mercuryutils.FeedID
 	lggr           logger.Logger
-	runResults     chan<- *pipeline.Run
+	saver          ocrcommon.Saver
 	orm            types.DataSourceORM
 	codec          reportcodec.ReportCodec
 
@@ -55,8 +55,8 @@ type datasource struct {
 
 var _ relaymercuryv3.DataSource = &datasource{}
 
-func NewDataSource(orm types.DataSourceORM, pr pipeline.Runner, jb job.Job, spec pipeline.Spec, feedID mercuryutils.FeedID, lggr logger.Logger, rr chan *pipeline.Run, enhancedTelemChan chan ocrcommon.EnhancedTelemetryMercuryData, fetcher LatestReportFetcher, linkFeedID, nativeFeedID mercuryutils.FeedID) *datasource {
-	return &datasource{pr, jb, spec, feedID, lggr, rr, orm, reportcodec.ReportCodec{}, fetcher, linkFeedID, nativeFeedID, sync.RWMutex{}, enhancedTelemChan}
+func NewDataSource(orm types.DataSourceORM, pr pipeline.Runner, jb job.Job, spec pipeline.Spec, feedID mercuryutils.FeedID, lggr logger.Logger, s ocrcommon.Saver, enhancedTelemChan chan ocrcommon.EnhancedTelemetryMercuryData, fetcher LatestReportFetcher, linkFeedID, nativeFeedID mercuryutils.FeedID) *datasource {
+	return &datasource{pr, jb, spec, feedID, lggr, s, orm, reportcodec.ReportCodec{}, fetcher, linkFeedID, nativeFeedID, sync.RWMutex{}, enhancedTelemChan}
 }
 
 func (ds *datasource) Observe(ctx context.Context, repts ocrtypes.ReportTimestamp, fetchMaxFinalizedTimestamp bool) (obs relaymercuryv3.Observation, pipelineExecutionErr error) {
@@ -92,11 +92,8 @@ func (ds *datasource) Observe(ctx context.Context, repts ocrtypes.ReportTimestam
 			pipelineExecutionErr = fmt.Errorf("Observe failed while executing run: %w", pipelineExecutionErr)
 			return
 		}
-		select {
-		case ds.runResults <- run:
-		default:
-			ds.lggr.Warnf("unable to enqueue run save for job ID %d, buffer full", ds.spec.JobID)
-		}
+
+		ds.saver.Save(run)
 
 		var parsed parseOutput
 		parsed, pipelineExecutionErr = ds.parse(trrs)
diff --git a/core/services/relay/evm/mercury/v3/data_source_test.go b/core/services/relay/evm/mercury/v3/data_source_test.go
index c4b5b4c6100..e03e321d093 100644
--- a/core/services/relay/evm/mercury/v3/data_source_test.go
+++ b/core/services/relay/evm/mercury/v3/data_source_test.go
@@ -63,6 +63,14 @@ func (m *mockORM) LatestReport(ctx context.Context, feedID [32]byte, qopts ...pg
 	return m.report, m.err
 }
 
+type mockSaver struct {
+	r *pipeline.Run
+}
+
+func (ms *mockSaver) Save(r *pipeline.Run) {
+	ms.r = r
+}
+
 func Test_Datasource(t *testing.T) {
 	orm := &mockORM{}
 	ds := &datasource{orm: orm, lggr: logger.TestLogger(t)}
@@ -72,6 +80,9 @@ func Test_Datasource(t *testing.T) {
 	fetcher := &mockFetcher{}
 	ds.fetcher = fetcher
 
+	saver := &mockSaver{}
+	ds.saver = saver
+
 	goodTrrs := []pipeline.TaskRunResult{
 		{
 			// bp

From f136035be3d916f3933d7ae053f1207b6b1dd229 Mon Sep 17 00:00:00 2001
From: Anirudh Warrier <12178754+anirudhwarrier@users.noreply.github.com>
Date: Fri, 1 Dec 2023 14:36:38 +0400
Subject: [PATCH 054/130] [AUTO-7451]  Move load test and smoke test to use new
 actions (#11364)

* move load test to use new common action

* move smoke test to use common action

* fix smoke tests

* decrease batch size in load test report prep

* add info logs in TestAutomationKeeperNodesDown

* remove duplicate registry config in smoke test

* use AutomationTest struct in setupAutomationTestDocker

* add and use SetupMercuryMock
---
 .../actions/automationv2/actions.go           |  23 ++
 .../automationv2_1/automationv2_1_test.go     | 233 ++++-------
 integration-tests/smoke/automation_test.go    | 381 +++++++++++-------
 3 files changed, 346 insertions(+), 291 deletions(-)

diff --git a/integration-tests/actions/automationv2/actions.go b/integration-tests/actions/automationv2/actions.go
index f97c17bb94f..febdd892150 100644
--- a/integration-tests/actions/automationv2/actions.go
+++ b/integration-tests/actions/automationv2/actions.go
@@ -11,6 +11,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/smartcontractkit/chainlink/integration-tests/docker/test_env"
+
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/lib/pq"
@@ -36,6 +38,8 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/chaintype"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
+
+	ctfTestEnv "github.com/smartcontractkit/chainlink-testing-framework/docker/test_env"
 )
 
 type NodeDetails struct {
@@ -70,6 +74,8 @@ type AutomationTest struct {
 	ChainlinkNodesk8s []*client.ChainlinkK8sClient
 	ChainlinkNodes    []*client.ChainlinkClient
 
+	DockerEnv *test_env.CLClusterTestEnv
+
 	NodeDetails              []NodeDetails
 	DefaultP2Pv2Bootstrapper string
 	MercuryCredentialName    string
@@ -135,6 +141,10 @@ func (a *AutomationTest) SetUpkeepPrivilegeManager(address string) {
 	a.UpkeepPrivilegeManager = common.HexToAddress(address)
 }
 
+func (a *AutomationTest) SetDockerEnv(env *test_env.CLClusterTestEnv) {
+	a.DockerEnv = env
+}
+
 func (a *AutomationTest) DeployLINK() error {
 	linkToken, err := a.Deployer.DeployLinkTokenContract()
 	if err != nil {
@@ -646,6 +656,19 @@ func (a *AutomationTest) AddJobsAndSetConfig(t *testing.T) {
 	l.Info().Str("Registry Address", a.Registry.Address()).Msg("Successfully setConfig on registry")
 }
 
+func (a *AutomationTest) SetupMercuryMock(t *testing.T, imposters []ctfTestEnv.KillgraveImposter) {
+	if a.IsOnk8s {
+		t.Error("mercury mock is not supported on k8s")
+	}
+	if a.DockerEnv == nil {
+		t.Error("docker env is not set")
+	}
+	err := a.DockerEnv.MockAdapter.AddImposter(imposters)
+	if err != nil {
+		require.NoError(t, err, "Error adding mock imposter")
+	}
+}
+
 func (a *AutomationTest) SetupAutomationDeployment(t *testing.T) {
 	l := logging.GetTestLogger(t)
 	err := a.CollectNodeDetails()
diff --git a/integration-tests/load/automationv2_1/automationv2_1_test.go b/integration-tests/load/automationv2_1/automationv2_1_test.go
index 1f39d5e4b0e..5fde9befba5 100644
--- a/integration-tests/load/automationv2_1/automationv2_1_test.go
+++ b/integration-tests/load/automationv2_1/automationv2_1_test.go
@@ -2,8 +2,8 @@ package automationv2_1
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
+	"math"
 	"math/big"
 	"os"
 	"strconv"
@@ -31,12 +31,12 @@ import (
 	"github.com/smartcontractkit/chainlink-testing-framework/logging"
 	"github.com/smartcontractkit/chainlink-testing-framework/networks"
 
-	registrar21 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_registrar_wrapper2_1"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_utils_2_1"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/log_emitter"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/simple_log_upkeep_counter_wrapper"
 
 	"github.com/smartcontractkit/chainlink/integration-tests/actions"
+	"github.com/smartcontractkit/chainlink/integration-tests/actions/automationv2"
 	"github.com/smartcontractkit/chainlink/integration-tests/client"
 	"github.com/smartcontractkit/chainlink/integration-tests/contracts"
 	contractseth "github.com/smartcontractkit/chainlink/integration-tests/contracts/ethereum"
@@ -284,31 +284,14 @@ func TestLogTrigger(t *testing.T) {
 
 	chainClient.ParallelTransactions(true)
 
-	linkToken, err := contractDeployer.DeployLinkTokenContract()
-	require.NoError(t, err, "Error deploying link token contract")
-
-	err = chainClient.WaitForEvents()
-	require.NoError(t, err, "Failed waiting for contracts to deploy")
-
-	registry, registrar := actions.DeployAutoOCRRegistryAndRegistrar(
-		t, contractseth.RegistryVersion_2_1, *registrySettings, linkToken, contractDeployer, chainClient,
-	)
-
-	err = actions.FundChainlinkNodesAddress(chainlinkNodes[1:], chainClient, big.NewFloat(100), 0)
-	require.NoError(t, err, "Error funding chainlink nodes")
-
-	actions.CreateOCRKeeperJobs(
-		t,
-		chainlinkNodes,
-		registry.Address(),
-		chainClient.GetChainID().Int64(),
-		0,
-		contractseth.RegistryVersion_2_1,
-	)
-
-	S, oracleIdentities, err := actions.GetOracleIdentities(chainlinkNodes)
-	require.NoError(t, err, "Error getting oracle identities")
-	offC, err := json.Marshal(ocr2keepers30config.OffchainConfig{
+	a := automationv2.NewAutomationTestK8s(chainClient, contractDeployer, chainlinkNodes)
+	a.RegistrySettings = *registrySettings
+	a.RegistrarSettings = contracts.KeeperRegistrarSettings{
+		AutoApproveConfigType: uint8(2),
+		AutoApproveMaxAllowed: math.MaxUint16,
+		MinLinkJuels:          big.NewInt(0),
+	}
+	a.PluginConfig = ocr2keepers30config.OffchainConfig{
 		TargetProbability:    "0.999",
 		TargetInRounds:       1,
 		PerformLockoutWindow: 80_000, // Copied from arbitrum mainnet prod value
@@ -316,64 +299,33 @@ func TestLogTrigger(t *testing.T) {
 		GasOverheadPerUpkeep: 300_000,
 		MinConfirmations:     0,
 		MaxUpkeepBatchSize:   10,
-	})
-	require.NoError(t, err, "Error marshalling offchain config")
-
-	signerOnchainPublicKeys, transmitterAccounts, f, _, offchainConfigVersion, offchainConfig, err := ocr3.ContractSetConfigArgsForTests(
-		10*time.Second,        // deltaProgress time.Duration,
-		15*time.Second,        // deltaResend time.Duration,
-		500*time.Millisecond,  // deltaInitial time.Duration,
-		1000*time.Millisecond, // deltaRound time.Duration,
-		200*time.Millisecond,  // deltaGrace time.Duration,
-		300*time.Millisecond,  // deltaCertifiedCommitRequest time.Duration
-		15*time.Second,        // deltaStage time.Duration,
-		24,                    // rMax uint64,
-		S,                     // s []int,
-		oracleIdentities,      // oracles []OracleIdentityExtra,
-		offC,                  // reportingPluginConfig []byte,
-		20*time.Millisecond,   // maxDurationQuery time.Duration,
-		20*time.Millisecond,   // maxDurationObservation time.Duration, // good to here
-		1200*time.Millisecond, // maxDurationShouldAcceptAttestedReport time.Duration,
-		20*time.Millisecond,   // maxDurationShouldTransmitAcceptedReport time.Duration,
-		1,                     // f int,
-		nil,                   // onchainConfig []byte,
-	)
-	require.NoError(t, err, "Error setting OCR config vars")
-
-	var signers []common.Address
-	for _, signer := range signerOnchainPublicKeys {
-		require.Equal(t, 20, len(signer), "OnChainPublicKey '%v' has wrong length for address", signer)
-		signers = append(signers, common.BytesToAddress(signer))
 	}
-
-	var transmitters []common.Address
-	for _, transmitter := range transmitterAccounts {
-		require.True(t, common.IsHexAddress(string(transmitter)), "TransmitAccount '%s' is not a valid Ethereum address", string(transmitter))
-		transmitters = append(transmitters, common.HexToAddress(string(transmitter)))
+	a.PublicConfig = ocr3.PublicConfig{
+		DeltaProgress:                           10 * time.Second,
+		DeltaResend:                             15 * time.Second,
+		DeltaInitial:                            500 * time.Millisecond,
+		DeltaRound:                              1000 * time.Millisecond,
+		DeltaGrace:                              200 * time.Millisecond,
+		DeltaCertifiedCommitRequest:             300 * time.Millisecond,
+		DeltaStage:                              15 * time.Second,
+		RMax:                                    24,
+		MaxDurationQuery:                        20 * time.Millisecond,
+		MaxDurationObservation:                  20 * time.Millisecond,
+		MaxDurationShouldAcceptAttestedReport:   1200 * time.Millisecond,
+		MaxDurationShouldTransmitAcceptedReport: 20 * time.Millisecond,
+		F:                                       1,
 	}
 
-	onchainConfig, err := registrySettings.EncodeOnChainConfig(registrar.Address(), common.HexToAddress(chainClient.GetDefaultWallet().Address()))
-	require.NoError(t, err, "Error encoding onchain config")
-	l.Info().Msg("Done building OCR config")
-	ocrConfig := contracts.OCRv2Config{
-		Signers:               signers,
-		Transmitters:          transmitters,
-		F:                     f,
-		OnchainConfig:         onchainConfig,
-		OffchainConfigVersion: offchainConfigVersion,
-		OffchainConfig:        offchainConfig,
-	}
+	a.SetupAutomationDeployment(t)
 
-	err = registry.SetConfig(*registrySettings, ocrConfig)
-	require.NoError(t, err, "Error setting registry config")
+	err = actions.FundChainlinkNodesAddress(chainlinkNodes[1:], chainClient, big.NewFloat(100), 0)
+	require.NoError(t, err, "Error funding chainlink nodes")
 
 	consumerContracts := make([]contracts.KeeperConsumer, 0)
 	triggerContracts := make([]contracts.LogEmitter, 0)
 
 	utilsABI, err := automation_utils_2_1.AutomationUtilsMetaData.GetAbi()
 	require.NoError(t, err, "Error getting automation utils abi")
-	registrarABI, err := registrar21.AutomationRegistrarMetaData.GetAbi()
-	require.NoError(t, err, "Error getting automation registrar abi")
 	emitterABI, err := log_emitter.LogEmitterMetaData.GetAbi()
 	require.NoError(t, err, "Error getting log emitter abi")
 	consumerABI, err := simple_log_upkeep_counter_wrapper.SimpleLogUpkeepCounterMetaData.GetAbi()
@@ -382,8 +334,8 @@ func TestLogTrigger(t *testing.T) {
 	var bytes0 = [32]byte{
 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	}
-	registrationTxHashes := make([]common.Hash, 0)
-	upkeepIds := make([]*big.Int, 0)
+
+	upkeepConfigs := make([]automationv2.UpkeepConfig, 0)
 
 	for i := 0; i < numberOfUpkeeps; i++ {
 		consumerContract, err := contractDeployer.DeployAutomationSimpleLogTriggerConsumer()
@@ -427,49 +379,32 @@ func TestLogTrigger(t *testing.T) {
 		require.NoError(t, err, "Error encoding log trigger config")
 		l.Debug().Bytes("Encoded Log Trigger Config", encodedLogTriggerConfig).Msg("Encoded Log Trigger Config")
 
-		registrationRequest, err := registrarABI.Pack(
-			"register",
-			fmt.Sprintf("LogTriggerUpkeep-%d", i),
-			[]byte("test@mail.com"),
-			common.HexToAddress(consumerContract.Address()),
-			automationDefaultUpkeepGasLimit,
-			common.HexToAddress(chainClient.GetDefaultWallet().Address()),
-			uint8(1),
-			[]byte("0"),
-			encodedLogTriggerConfig,
-			[]byte("0"),
-			automationDefaultLinkFunds,
-			common.HexToAddress(chainClient.GetDefaultWallet().Address()),
-		)
-		require.NoError(t, err, "Error encoding upkeep registration request")
-		tx, err := linkToken.TransferAndCall(registrar.Address(), automationDefaultLinkFunds, registrationRequest)
-		require.NoError(t, err, "Error sending upkeep registration request")
-		registrationTxHashes = append(registrationTxHashes, tx.Hash())
+		upkeepConfig := automationv2.UpkeepConfig{
+			UpkeepName:     fmt.Sprintf("LogTriggerUpkeep-%d", i),
+			EncryptedEmail: []byte("test@mail.com"),
+			UpkeepContract: common.HexToAddress(consumerContract.Address()),
+			GasLimit:       automationDefaultUpkeepGasLimit,
+			AdminAddress:   common.HexToAddress(chainClient.GetDefaultWallet().Address()),
+			TriggerType:    uint8(1),
+			CheckData:      []byte("0"),
+			TriggerConfig:  encodedLogTriggerConfig,
+			OffchainConfig: []byte("0"),
+			FundingAmount:  automationDefaultLinkFunds,
+		}
+		upkeepConfigs = append(upkeepConfigs, upkeepConfig)
 	}
 
+	registrationTxHashes, err := a.RegisterUpkeeps(upkeepConfigs)
+	require.NoError(t, err, "Error registering upkeeps")
+
 	err = chainClient.WaitForEvents()
-	require.NoError(t, err, "Failed waiting for upkeeps to be registered")
-
-	for _, txHash := range registrationTxHashes {
-		receipt, err := chainClient.GetTxReceipt(txHash)
-		require.NoError(t, err, "Registration tx should be completed")
-		var upkeepId *big.Int
-		for _, rawLog := range receipt.Logs {
-			parsedUpkeepId, err := registry.ParseUpkeepIdFromRegisteredLog(rawLog)
-			if err == nil {
-				upkeepId = parsedUpkeepId
-				break
-			}
-		}
-		require.NotNil(t, upkeepId, "Upkeep ID should be found after registration")
-		l.Debug().
-			Str("TxHash", txHash.String()).
-			Str("Upkeep ID", upkeepId.String()).
-			Msg("Found upkeepId in tx hash")
-		upkeepIds = append(upkeepIds, upkeepId)
-	}
-	l.Info().Msg("Successfully registered all Automation Consumer Contracts")
-	l.Info().Interface("Upkeep IDs", upkeepIds).Msg("Upkeep IDs")
+	require.NoError(t, err, "Failed waiting for upkeeps to register")
+
+	upkeepIds, err := a.ConfirmUpkeepsRegistered(registrationTxHashes)
+	require.NoError(t, err, "Error confirming upkeeps registered")
+
+	l.Info().Msg("Successfully registered all Automation Upkeeps")
+	l.Info().Interface("Upkeep IDs", upkeepIds).Msg("Upkeeps Registered")
 	l.Info().Str("STARTUP_WAIT_TIME", StartupWaitTime.String()).Msg("Waiting for plugin to start")
 	time.Sleep(StartupWaitTime)
 
@@ -523,7 +458,7 @@ func TestLogTrigger(t *testing.T) {
 
 	upkeepDelays := make([][]int64, 0)
 	var numberOfEventsEmitted int
-	var batchSize = 500
+	var batchSize uint64 = 500
 
 	for _, gen := range p.Generators {
 		numberOfEventsEmitted += len(gen.GetData().OKData.Data)
@@ -531,38 +466,47 @@ func TestLogTrigger(t *testing.T) {
 	numberOfEventsEmitted = numberOfEventsEmitted * numberOfEvents
 	l.Info().Int("Number of Events Emitted", numberOfEventsEmitted).Msg("Number of Events Emitted")
 
-	if endBlock-startBlock < uint64(batchSize) {
-		batchSize = int(endBlock - startBlock)
+	if endBlock-startBlock < batchSize {
+		batchSize = endBlock - startBlock
 	}
 
-	for cIter, consumerContract := range consumerContracts {
+	for _, consumerContract := range consumerContracts {
 		var (
 			logs    []types.Log
 			address = common.HexToAddress(consumerContract.Address())
 			timeout = 5 * time.Second
 		)
-		for fromBlock := startBlock; fromBlock < endBlock; fromBlock += uint64(batchSize) + 1 {
-			var (
-				filterQuery = geth.FilterQuery{
-					Addresses: []common.Address{address},
-					FromBlock: big.NewInt(0).SetUint64(fromBlock),
-					ToBlock:   big.NewInt(0).SetUint64(fromBlock + uint64(batchSize)),
-					Topics:    [][]common.Hash{{consumerABI.Events["PerformingUpkeep"].ID}},
+		for fromBlock := startBlock; fromBlock < endBlock; fromBlock += batchSize + 1 {
+			filterQuery := geth.FilterQuery{
+				Addresses: []common.Address{address},
+				FromBlock: big.NewInt(0).SetUint64(fromBlock),
+				ToBlock:   big.NewInt(0).SetUint64(fromBlock + batchSize),
+				Topics:    [][]common.Hash{{consumerABI.Events["PerformingUpkeep"].ID}},
+			}
+			err = fmt.Errorf("initial error") // to ensure our for loop runs at least once
+			for err != nil {
+				var (
+					logsInBatch []types.Log
+				)
+				ctx2, cancel := context.WithTimeout(ctx, timeout)
+				logsInBatch, err = chainClient.FilterLogs(ctx2, filterQuery)
+				cancel()
+				if err != nil {
+					l.Error().Err(err).
+						Interface("FilterQuery", filterQuery).
+						Str("Contract Address", consumerContract.Address()).
+						Str("Timeout", timeout.String()).
+						Msg("Error getting logs")
+					timeout = time.Duration(math.Min(float64(timeout)*2, float64(2*time.Minute)))
+					continue
 				}
-			)
-			var cancel context.CancelFunc
-			ctx, cancel = context.WithTimeout(ctx, timeout)
-			logsInBatch, err := chainClient.FilterLogs(ctx, filterQuery)
-			cancel()
-			if err != nil {
-				l.Error().Err(err).
+				l.Info().
 					Interface("FilterQuery", filterQuery).
 					Str("Contract Address", consumerContract.Address()).
 					Str("Timeout", timeout.String()).
-					Msg("Error getting logs")
+					Msg("Collected logs")
+				logs = append(logs, logsInBatch...)
 			}
-			logs = append(logs, logsInBatch...)
-			time.Sleep(time.Millisecond * 500)
 		}
 
 		if len(logs) > 0 {
@@ -582,9 +526,6 @@ func TestLogTrigger(t *testing.T) {
 			}
 			upkeepDelays = append(upkeepDelays, delay)
 		}
-		if (cIter+1)%batchSize == 0 {
-			time.Sleep(time.Millisecond * 500)
-		}
 	}
 
 	l.Info().Interface("Upkeep Delays", upkeepDelays).Msg("Upkeep Delays")
@@ -596,6 +537,8 @@ func TestLogTrigger(t *testing.T) {
 	}
 
 	avg, median, ninetyPct, ninetyNinePct, maximum := testreporters.IntListStats(allUpkeepDelays)
+	eventsMissed := numberOfEventsEmitted - len(allUpkeepDelays)
+	percentMissed := float64(eventsMissed) / float64(numberOfEventsEmitted) * 100
 	l.Info().
 		Float64("Average", avg).Int64("Median", median).
 		Int64("90th Percentile", ninetyPct).Int64("99th Percentile", ninetyNinePct).
@@ -604,13 +547,15 @@ func TestLogTrigger(t *testing.T) {
 	l.Info().
 		Int("Total Perform Count", len(allUpkeepDelays)).
 		Int("Total Events Emitted", numberOfEventsEmitted).
-		Int("Total Events Missed", numberOfEventsEmitted-len(allUpkeepDelays)).
+		Int("Total Events Missed", eventsMissed).
+		Float64("Percent Missed", percentMissed).
 		Msg("Test completed")
 
 	testReport := fmt.Sprintf("Upkeep Delays in seconds\nAverage: %f\nMedian: %d\n90th Percentile: %d\n"+
-		"99th Percentile: %d\nMax: %d\nTotal Perform Count: %d\n\nTotal Events Emitted: %d\nTotal Events Missed: %d\nTest Duration: %s\n",
+		"99th Percentile: %d\nMax: %d\nTotal Perform Count: %d\n\nTotal Events Emitted: %d\nTotal Events Missed: %d\n"+
+		"Percent Missed: %f\nTest Duration: %s\n",
 		avg, median, ninetyPct, ninetyNinePct, maximum, len(allUpkeepDelays), numberOfEventsEmitted,
-		numberOfEventsEmitted-len(allUpkeepDelays), testDuration.String())
+		eventsMissed, percentMissed, testDuration.String())
 
 	err = sendSlackNotification("Finished", l, testEnvironment.Cfg.Namespace, strconv.Itoa(numberofNodes),
 		strconv.FormatInt(startTime.UnixMilli(), 10), strconv.FormatInt(endTime.UnixMilli(), 10),
diff --git a/integration-tests/smoke/automation_test.go b/integration-tests/smoke/automation_test.go
index 81b484f4e73..f72843e77e8 100644
--- a/integration-tests/smoke/automation_test.go
+++ b/integration-tests/smoke/automation_test.go
@@ -10,12 +10,20 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
+	ctfTestEnv "github.com/smartcontractkit/chainlink-testing-framework/docker/test_env"
+
+	ocr3 "github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3confighelper"
+
+	ocr2keepers30config "github.com/smartcontractkit/chainlink-automation/pkg/v3/config"
+
+	"github.com/smartcontractkit/chainlink/integration-tests/actions/automationv2"
+
 	"github.com/kelseyhightower/envconfig"
+
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/onsi/gomega"
 	"github.com/stretchr/testify/require"
 
-	"github.com/smartcontractkit/chainlink-testing-framework/blockchain"
 	"github.com/smartcontractkit/chainlink-testing-framework/logging"
 	"github.com/smartcontractkit/chainlink-testing-framework/networks"
 	"github.com/smartcontractkit/chainlink-testing-framework/utils/ptr"
@@ -27,7 +35,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
 
 	"github.com/smartcontractkit/chainlink/integration-tests/actions"
-	"github.com/smartcontractkit/chainlink/integration-tests/client"
 	"github.com/smartcontractkit/chainlink/integration-tests/contracts"
 	"github.com/smartcontractkit/chainlink/integration-tests/contracts/ethereum"
 	"github.com/smartcontractkit/chainlink/integration-tests/docker/test_env"
@@ -37,28 +44,13 @@ import (
 var utilsABI = cltypes.MustGetABI(automation_utils_2_1.AutomationUtilsABI)
 
 const (
-	automationDefaultUpkeepGasLimit  = uint32(2500000)
-	automationDefaultLinkFunds       = int64(9e18)
-	automationDefaultUpkeepsToDeploy = 10
-	automationExpectedData           = "abcdef"
-	defaultAmountOfUpkeeps           = 2
+	automationDefaultUpkeepGasLimit = uint32(2500000)
+	automationDefaultLinkFunds      = int64(9e18)
+	automationExpectedData          = "abcdef"
+	defaultAmountOfUpkeeps          = 2
 )
 
 var (
-	defaultOCRRegistryConfig = contracts.KeeperRegistrySettings{
-		PaymentPremiumPPB:    uint32(200000000),
-		FlatFeeMicroLINK:     uint32(0),
-		BlockCountPerTurn:    big.NewInt(10),
-		CheckGasLimit:        uint32(2500000),
-		StalenessSeconds:     big.NewInt(90000),
-		GasCeilingMultiplier: uint16(1),
-		MinUpkeepSpend:       big.NewInt(0),
-		MaxPerformGas:        uint32(5000000),
-		FallbackGasPrice:     big.NewInt(2e11),
-		FallbackLinkPrice:    big.NewInt(2e18),
-		MaxCheckDataSize:     uint32(5000),
-		MaxPerformDataSize:   uint32(5000),
-	}
 	automationDefaultRegistryConfig = contracts.KeeperRegistrySettings{
 		PaymentPremiumPPB:    uint32(200000000),
 		FlatFeeMicroLINK:     uint32(0),
@@ -124,17 +116,17 @@ func SetupAutomationBasic(t *testing.T, nodeUpgrade bool) {
 			isMercuryV03 := name == "registry_2_1_with_mercury_v03"
 			isMercury := isMercuryV02 || isMercuryV03
 
-			chainClient, _, contractDeployer, linkToken, registry, registrar, testEnv := setupAutomationTestDocker(
-				t, registryVersion, defaultOCRRegistryConfig, isMercuryV02, isMercuryV03,
+			a := setupAutomationTestDocker(
+				t, registryVersion, automationDefaultRegistryConfig, isMercuryV02, isMercuryV03,
 			)
 
 			consumers, upkeepIDs := actions.DeployConsumers(
 				t,
-				registry,
-				registrar,
-				linkToken,
-				contractDeployer,
-				chainClient,
+				a.Registry,
+				a.Registrar,
+				a.LinkToken,
+				a.Deployer,
+				a.ChainClient,
 				defaultAmountOfUpkeeps,
 				big.NewInt(automationDefaultLinkFunds),
 				automationDefaultUpkeepGasLimit,
@@ -155,7 +147,7 @@ func SetupAutomationBasic(t *testing.T, nodeUpgrade bool) {
 					privilegeConfigBytes, _ := json.Marshal(streams.UpkeepPrivilegeConfig{
 						MercuryEnabled: true,
 					})
-					if err := registry.SetUpkeepPrivilegeConfig(upkeepIDs[i], privilegeConfigBytes); err != nil {
+					if err := a.Registry.SetUpkeepPrivilegeConfig(upkeepIDs[i], privilegeConfigBytes); err != nil {
 						l.Error().Msg("Error when setting upkeep privilege config")
 						return
 					}
@@ -184,7 +176,7 @@ func SetupAutomationBasic(t *testing.T, nodeUpgrade bool) {
 				expect := 5
 				// Upgrade the nodes one at a time and check that the upkeeps are still being performed
 				for i := 0; i < 5; i++ {
-					err = actions.UpgradeChainlinkNodeVersionsLocal(upgradeImage, upgradeVersion, testEnv.ClCluster.Nodes[i])
+					err = actions.UpgradeChainlinkNodeVersionsLocal(upgradeImage, upgradeVersion, a.DockerEnv.ClCluster.Nodes[i])
 					require.NoError(t, err, "Error when upgrading node %d", i)
 					time.Sleep(time.Second * 10)
 					expect = expect + 5
@@ -203,11 +195,11 @@ func SetupAutomationBasic(t *testing.T, nodeUpgrade bool) {
 
 			// Cancel all the registered upkeeps via the registry
 			for i := 0; i < len(upkeepIDs); i++ {
-				err := registry.CancelUpkeep(upkeepIDs[i])
+				err := a.Registry.CancelUpkeep(upkeepIDs[i])
 				require.NoError(t, err, "Could not cancel upkeep at index %d", i)
 			}
 
-			err = chainClient.WaitForEvents()
+			err = a.ChainClient.WaitForEvents()
 			require.NoError(t, err, "Error encountered when waiting for upkeeps to be cancelled")
 
 			var countersAfterCancellation = make([]*big.Int, len(upkeepIDs))
@@ -238,17 +230,17 @@ func TestSetUpkeepTriggerConfig(t *testing.T) {
 	t.Parallel()
 	l := logging.GetTestLogger(t)
 
-	chainClient, _, contractDeployer, linkToken, registry, registrar, _ := setupAutomationTestDocker(
-		t, ethereum.RegistryVersion_2_1, defaultOCRRegistryConfig, false, false,
+	a := setupAutomationTestDocker(
+		t, ethereum.RegistryVersion_2_1, automationDefaultRegistryConfig, false, false,
 	)
 
 	consumers, upkeepIDs := actions.DeployConsumers(
 		t,
-		registry,
-		registrar,
-		linkToken,
-		contractDeployer,
-		chainClient,
+		a.Registry,
+		a.Registrar,
+		a.LinkToken,
+		a.Deployer,
+		a.ChainClient,
 		defaultAmountOfUpkeeps,
 		big.NewInt(automationDefaultLinkFunds),
 		automationDefaultUpkeepGasLimit,
@@ -313,11 +305,11 @@ func TestSetUpkeepTriggerConfig(t *testing.T) {
 			return
 		}
 
-		err = registry.SetUpkeepTriggerConfig(upkeepIDs[i], encodedLogTriggerConfig)
+		err = a.Registry.SetUpkeepTriggerConfig(upkeepIDs[i], encodedLogTriggerConfig)
 		require.NoError(t, err, "Could not set upkeep trigger config at index %d", i)
 	}
 
-	err := chainClient.WaitForEvents()
+	err := a.ChainClient.WaitForEvents()
 	require.NoError(t, err, "Error encountered when waiting for setting trigger config for upkeeps")
 
 	var countersAfterSetNoMatch = make([]*big.Int, len(upkeepIDs))
@@ -361,11 +353,11 @@ func TestSetUpkeepTriggerConfig(t *testing.T) {
 			return
 		}
 
-		err = registry.SetUpkeepTriggerConfig(upkeepIDs[i], encodedLogTriggerConfig)
+		err = a.Registry.SetUpkeepTriggerConfig(upkeepIDs[i], encodedLogTriggerConfig)
 		require.NoError(t, err, "Could not set upkeep trigger config at index %d", i)
 	}
 
-	err = chainClient.WaitForEvents()
+	err = a.ChainClient.WaitForEvents()
 	require.NoError(t, err, "Error encountered when waiting for setting trigger config for upkeeps")
 
 	var countersAfterSetMatch = make([]*big.Int, len(upkeepIDs))
@@ -413,11 +405,23 @@ func TestAutomationAddFunds(t *testing.T) {
 		registryVersion := rv
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
-			chainClient, _, contractDeployer, linkToken, registry, registrar, _ := setupAutomationTestDocker(
-				t, registryVersion, defaultOCRRegistryConfig, false, false,
+			a := setupAutomationTestDocker(
+				t, registryVersion, automationDefaultRegistryConfig, false, false,
 			)
 
-			consumers, upkeepIDs := actions.DeployConsumers(t, registry, registrar, linkToken, contractDeployer, chainClient, defaultAmountOfUpkeeps, big.NewInt(1), automationDefaultUpkeepGasLimit, false, false)
+			consumers, upkeepIDs := actions.DeployConsumers(
+				t,
+				a.Registry,
+				a.Registrar,
+				a.LinkToken,
+				a.Deployer,
+				a.ChainClient,
+				defaultAmountOfUpkeeps,
+				big.NewInt(1),
+				automationDefaultUpkeepGasLimit,
+				false,
+				false,
+			)
 
 			gom := gomega.NewGomegaWithT(t)
 			// Since the upkeep is currently underfunded, check that it doesn't get executed
@@ -429,15 +433,15 @@ func TestAutomationAddFunds(t *testing.T) {
 			}, "2m", "1s").Should(gomega.Succeed()) // ~1m for setup, 1m assertion
 
 			// Grant permission to the registry to fund the upkeep
-			err := linkToken.Approve(registry.Address(), big.NewInt(9e18))
+			err := a.LinkToken.Approve(a.Registry.Address(), big.NewInt(9e18))
 			require.NoError(t, err, "Could not approve permissions for the registry on the link token contract")
-			err = chainClient.WaitForEvents()
+			err = a.ChainClient.WaitForEvents()
 			require.NoError(t, err, "Error waiting for events")
 
 			// Add funds to the upkeep whose ID we know from above
-			err = registry.AddUpkeepFunds(upkeepIDs[0], big.NewInt(9e18))
+			err = a.Registry.AddUpkeepFunds(upkeepIDs[0], big.NewInt(9e18))
 			require.NoError(t, err, "Unable to add upkeep")
-			err = chainClient.WaitForEvents()
+			err = a.ChainClient.WaitForEvents()
 			require.NoError(t, err, "Error waiting for events")
 
 			// Now the new upkeep should be performing because we added enough funds
@@ -464,11 +468,23 @@ func TestAutomationPauseUnPause(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			l := logging.GetTestLogger(t)
-			chainClient, _, contractDeployer, linkToken, registry, registrar, _ := setupAutomationTestDocker(
-				t, registryVersion, defaultOCRRegistryConfig, false, false,
+			a := setupAutomationTestDocker(
+				t, registryVersion, automationDefaultRegistryConfig, false, false,
 			)
 
-			consumers, upkeepIDs := actions.DeployConsumers(t, registry, registrar, linkToken, contractDeployer, chainClient, defaultAmountOfUpkeeps, big.NewInt(automationDefaultLinkFunds), automationDefaultUpkeepGasLimit, false, false)
+			consumers, upkeepIDs := actions.DeployConsumers(
+				t,
+				a.Registry,
+				a.Registrar,
+				a.LinkToken,
+				a.Deployer,
+				a.ChainClient,
+				defaultAmountOfUpkeeps,
+				big.NewInt(automationDefaultLinkFunds),
+				automationDefaultUpkeepGasLimit,
+				false,
+				false,
+			)
 
 			gom := gomega.NewGomegaWithT(t)
 			gom.Eventually(func(g gomega.Gomega) {
@@ -484,11 +500,11 @@ func TestAutomationPauseUnPause(t *testing.T) {
 
 			// pause all the registered upkeeps via the registry
 			for i := 0; i < len(upkeepIDs); i++ {
-				err := registry.PauseUpkeep(upkeepIDs[i])
+				err := a.Registry.PauseUpkeep(upkeepIDs[i])
 				require.NoError(t, err, "Could not pause upkeep at index %d", i)
 			}
 
-			err := chainClient.WaitForEvents()
+			err := a.ChainClient.WaitForEvents()
 			require.NoError(t, err, "Error waiting for upkeeps to be paused")
 
 			var countersAfterPause = make([]*big.Int, len(upkeepIDs))
@@ -513,11 +529,11 @@ func TestAutomationPauseUnPause(t *testing.T) {
 
 			// unpause all the registered upkeeps via the registry
 			for i := 0; i < len(upkeepIDs); i++ {
-				err := registry.UnpauseUpkeep(upkeepIDs[i])
+				err := a.Registry.UnpauseUpkeep(upkeepIDs[i])
 				require.NoError(t, err, "Could not unpause upkeep at index %d", i)
 			}
 
-			err = chainClient.WaitForEvents()
+			err = a.ChainClient.WaitForEvents()
 			require.NoError(t, err, "Error waiting for upkeeps to be unpaused")
 
 			gom.Eventually(func(g gomega.Gomega) {
@@ -547,11 +563,23 @@ func TestAutomationRegisterUpkeep(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			l := logging.GetTestLogger(t)
-			chainClient, _, contractDeployer, linkToken, registry, registrar, _ := setupAutomationTestDocker(
-				t, registryVersion, defaultOCRRegistryConfig, false, false,
+			a := setupAutomationTestDocker(
+				t, registryVersion, automationDefaultRegistryConfig, false, false,
 			)
 
-			consumers, upkeepIDs := actions.DeployConsumers(t, registry, registrar, linkToken, contractDeployer, chainClient, defaultAmountOfUpkeeps, big.NewInt(automationDefaultLinkFunds), automationDefaultUpkeepGasLimit, false, false)
+			consumers, upkeepIDs := actions.DeployConsumers(
+				t,
+				a.Registry,
+				a.Registrar,
+				a.LinkToken,
+				a.Deployer,
+				a.ChainClient,
+				defaultAmountOfUpkeeps,
+				big.NewInt(automationDefaultLinkFunds),
+				automationDefaultUpkeepGasLimit,
+				false,
+				false,
+			)
 
 			var initialCounters = make([]*big.Int, len(upkeepIDs))
 			gom := gomega.NewGomegaWithT(t)
@@ -571,8 +599,8 @@ func TestAutomationRegisterUpkeep(t *testing.T) {
 				}
 			}, "4m", "1s").Should(gomega.Succeed()) // ~1m for cluster setup, ~1m for performing each upkeep once, ~2m buffer
 
-			newConsumers, _ := actions.RegisterNewUpkeeps(t, contractDeployer, chainClient, linkToken,
-				registry, registrar, automationDefaultUpkeepGasLimit, 1)
+			newConsumers, _ := actions.RegisterNewUpkeeps(t, a.Deployer, a.ChainClient, a.LinkToken,
+				a.Registry, a.Registrar, automationDefaultUpkeepGasLimit, 1)
 
 			// We know that newConsumers has size 1, so we can just use the newly registered upkeep.
 			newUpkeep := newConsumers[0]
@@ -618,11 +646,23 @@ func TestAutomationPauseRegistry(t *testing.T) {
 		registryVersion := rv
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
-			chainClient, _, contractDeployer, linkToken, registry, registrar, _ := setupAutomationTestDocker(
-				t, registryVersion, defaultOCRRegistryConfig, false, false,
+			a := setupAutomationTestDocker(
+				t, registryVersion, automationDefaultRegistryConfig, false, false,
 			)
 
-			consumers, upkeepIDs := actions.DeployConsumers(t, registry, registrar, linkToken, contractDeployer, chainClient, defaultAmountOfUpkeeps, big.NewInt(automationDefaultLinkFunds), automationDefaultUpkeepGasLimit, false, false)
+			consumers, upkeepIDs := actions.DeployConsumers(
+				t,
+				a.Registry,
+				a.Registrar,
+				a.LinkToken,
+				a.Deployer,
+				a.ChainClient,
+				defaultAmountOfUpkeeps,
+				big.NewInt(automationDefaultLinkFunds),
+				automationDefaultUpkeepGasLimit,
+				false,
+				false,
+			)
 			gom := gomega.NewGomegaWithT(t)
 
 			// Observe that the upkeeps which are initially registered are performing
@@ -636,9 +676,9 @@ func TestAutomationPauseRegistry(t *testing.T) {
 			}, "4m", "1s").Should(gomega.Succeed()) // ~1m for cluster setup, ~1m for performing each upkeep once, ~2m buffer
 
 			// Pause the registry
-			err := registry.Pause()
+			err := a.Registry.Pause()
 			require.NoError(t, err, "Error pausing registry")
-			err = chainClient.WaitForEvents()
+			err = a.ChainClient.WaitForEvents()
 			require.NoError(t, err, "Error waiting for registry to pause")
 
 			// Store how many times each upkeep performed once the registry was successfully paused
@@ -676,13 +716,25 @@ func TestAutomationKeeperNodesDown(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			l := logging.GetTestLogger(t)
-			chainClient, chainlinkNodes, contractDeployer, linkToken, registry, registrar, _ := setupAutomationTestDocker(
-				t, registryVersion, defaultOCRRegistryConfig, false, false,
+			a := setupAutomationTestDocker(
+				t, registryVersion, automationDefaultRegistryConfig, false, false,
 			)
 
-			consumers, upkeepIDs := actions.DeployConsumers(t, registry, registrar, linkToken, contractDeployer, chainClient, defaultAmountOfUpkeeps, big.NewInt(automationDefaultLinkFunds), automationDefaultUpkeepGasLimit, false, false)
+			consumers, upkeepIDs := actions.DeployConsumers(
+				t,
+				a.Registry,
+				a.Registrar,
+				a.LinkToken,
+				a.Deployer,
+				a.ChainClient,
+				defaultAmountOfUpkeeps,
+				big.NewInt(automationDefaultLinkFunds),
+				automationDefaultUpkeepGasLimit,
+				false,
+				false,
+			)
 			gom := gomega.NewGomegaWithT(t)
-			nodesWithoutBootstrap := chainlinkNodes[1:]
+			nodesWithoutBootstrap := a.ChainlinkNodes[1:]
 
 			var initialCounters = make([]*big.Int, len(upkeepIDs))
 
@@ -691,6 +743,7 @@ func TestAutomationKeeperNodesDown(t *testing.T) {
 				for i := 0; i < len(upkeepIDs); i++ {
 					counter, err := consumers[i].Counter(testcontext.Get(t))
 					initialCounters[i] = counter
+					l.Info().Int64("Upkeeps Performed", counter.Int64()).Int("Upkeep Index", i).Msg("Number of upkeeps performed")
 					g.Expect(err).ShouldNot(gomega.HaveOccurred(), "Failed to retrieve consumer counter for upkeep at index %d", i)
 					g.Expect(counter.Int64()).Should(gomega.BeNumerically(">", int64(0)),
 						"Expected consumer counter to be greater than 0, but got %d", counter.Int64())
@@ -700,7 +753,7 @@ func TestAutomationKeeperNodesDown(t *testing.T) {
 			// Take down 1 node. Currently, using 4 nodes so f=1 and is the max nodes that can go down.
 			err := nodesWithoutBootstrap[0].MustDeleteJob("1")
 			require.NoError(t, err, "Error deleting job from Chainlink node")
-			err = chainClient.WaitForEvents()
+			err = a.ChainClient.WaitForEvents()
 			require.NoError(t, err, "Error waiting for blockchain events")
 
 			l.Info().Msg("Successfully managed to take down the first half of the nodes")
@@ -709,6 +762,7 @@ func TestAutomationKeeperNodesDown(t *testing.T) {
 			gom.Eventually(func(g gomega.Gomega) {
 				for i := 0; i < len(upkeepIDs); i++ {
 					currentCounter, err := consumers[i].Counter(testcontext.Get(t))
+					l.Info().Int64("Upkeeps Performed", currentCounter.Int64()).Int("Upkeep Index", i).Msg("Number of upkeeps performed")
 					g.Expect(err).ShouldNot(gomega.HaveOccurred(), "Failed to retrieve consumer counter for upkeep at index %d", i)
 					g.Expect(currentCounter.Int64()).Should(gomega.BeNumerically(">", initialCounters[i].Int64()),
 						"Expected counter to have increased from initial value of %s, but got %s",
@@ -721,7 +775,7 @@ func TestAutomationKeeperNodesDown(t *testing.T) {
 			for _, nodeToTakeDown := range restOfNodesDown {
 				err = nodeToTakeDown.MustDeleteJob("1")
 				require.NoError(t, err, "Error deleting job from Chainlink node")
-				err = chainClient.WaitForEvents()
+				err = a.ChainClient.WaitForEvents()
 				require.NoError(t, err, "Error waiting for blockchain events")
 			}
 			l.Info().Msg("Successfully managed to take down the second half of the nodes")
@@ -761,17 +815,17 @@ func TestAutomationPerformSimulation(t *testing.T) {
 		registryVersion := rv
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
-			chainClient, _, contractDeployer, linkToken, registry, registrar, _ := setupAutomationTestDocker(
-				t, registryVersion, defaultOCRRegistryConfig, false, false,
+			a := setupAutomationTestDocker(
+				t, registryVersion, automationDefaultRegistryConfig, false, false,
 			)
 
 			consumersPerformance, _ := actions.DeployPerformanceConsumers(
 				t,
-				registry,
-				registrar,
-				linkToken,
-				contractDeployer,
-				chainClient,
+				a.Registry,
+				a.Registrar,
+				a.LinkToken,
+				a.Deployer,
+				a.ChainClient,
 				defaultAmountOfUpkeeps,
 				big.NewInt(automationDefaultLinkFunds),
 				automationDefaultUpkeepGasLimit,
@@ -797,7 +851,7 @@ func TestAutomationPerformSimulation(t *testing.T) {
 			// Set performGas on consumer to be low, so that performUpkeep starts becoming successful
 			err := consumerPerformance.SetPerformGasToBurn(testcontext.Get(t), big.NewInt(100000))
 			require.NoError(t, err, "Perform gas should be set successfully on consumer")
-			err = chainClient.WaitForEvents()
+			err = a.ChainClient.WaitForEvents()
 			require.NoError(t, err, "Error waiting for set perform gas tx")
 
 			// Upkeep should now start performing
@@ -825,17 +879,17 @@ func TestAutomationCheckPerformGasLimit(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			l := logging.GetTestLogger(t)
-			chainClient, chainlinkNodes, contractDeployer, linkToken, registry, registrar, _ := setupAutomationTestDocker(
-				t, registryVersion, defaultOCRRegistryConfig, false, false,
+			a := setupAutomationTestDocker(
+				t, registryVersion, automationDefaultRegistryConfig, false, false,
 			)
 
 			consumersPerformance, upkeepIDs := actions.DeployPerformanceConsumers(
 				t,
-				registry,
-				registrar,
-				linkToken,
-				contractDeployer,
-				chainClient,
+				a.Registry,
+				a.Registrar,
+				a.LinkToken,
+				a.Deployer,
+				a.ChainClient,
 				defaultAmountOfUpkeeps,
 				big.NewInt(automationDefaultLinkFunds),
 				automationDefaultUpkeepGasLimit,
@@ -846,7 +900,7 @@ func TestAutomationCheckPerformGasLimit(t *testing.T) {
 			)
 			gom := gomega.NewGomegaWithT(t)
 
-			nodesWithoutBootstrap := chainlinkNodes[1:]
+			nodesWithoutBootstrap := a.ChainlinkNodes[1:]
 			consumerPerformance := consumersPerformance[0]
 			upkeepID := upkeepIDs[0]
 
@@ -861,9 +915,9 @@ func TestAutomationCheckPerformGasLimit(t *testing.T) {
 			}, "2m", "1s").Should(gomega.Succeed()) // ~1m for setup, 1m assertion
 
 			// Increase gas limit for the upkeep, higher than the performGasBurn
-			err := registry.SetUpkeepGasLimit(upkeepID, uint32(4500000))
+			err := a.Registry.SetUpkeepGasLimit(upkeepID, uint32(4500000))
 			require.NoError(t, err, "Error setting upkeep gas limit")
-			err = chainClient.WaitForEvents()
+			err = a.ChainClient.WaitForEvents()
 			require.NoError(t, err, "Error waiting for SetUpkeepGasLimit tx")
 
 			// Upkeep should now start performing
@@ -878,7 +932,7 @@ func TestAutomationCheckPerformGasLimit(t *testing.T) {
 			// Now increase the checkGasBurn on consumer, upkeep should stop performing
 			err = consumerPerformance.SetCheckGasToBurn(testcontext.Get(t), big.NewInt(3000000))
 			require.NoError(t, err, "Check gas burn should be set successfully on consumer")
-			err = chainClient.WaitForEvents()
+			err = a.ChainClient.WaitForEvents()
 			require.NoError(t, err, "Error waiting for SetCheckGasToBurn tx")
 
 			// Get existing performed count
@@ -906,12 +960,12 @@ func TestAutomationCheckPerformGasLimit(t *testing.T) {
 			highCheckGasLimit.CheckGasLimit = uint32(5000000)
 			highCheckGasLimit.RegistryVersion = registryVersion
 
-			ocrConfig, err := actions.BuildAutoOCR2ConfigVarsLocal(l, nodesWithoutBootstrap, highCheckGasLimit, registrar.Address(), 30*time.Second, registry.RegistryOwnerAddress())
+			ocrConfig, err := actions.BuildAutoOCR2ConfigVarsLocal(l, nodesWithoutBootstrap, highCheckGasLimit, a.Registrar.Address(), 30*time.Second, a.Registry.RegistryOwnerAddress())
 			require.NoError(t, err, "Error building OCR config")
 
-			err = registry.SetConfig(highCheckGasLimit, ocrConfig)
+			err = a.Registry.SetConfig(highCheckGasLimit, ocrConfig)
 			require.NoError(t, err, "Registry config should be set successfully!")
-			err = chainClient.WaitForEvents()
+			err = a.ChainClient.WaitForEvents()
 			require.NoError(t, err, "Error waiting for set config tx")
 
 			// Upkeep should start performing again, and it should get regularly performed
@@ -939,17 +993,17 @@ func TestUpdateCheckData(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			l := logging.GetTestLogger(t)
-			chainClient, _, contractDeployer, linkToken, registry, registrar, _ := setupAutomationTestDocker(
-				t, registryVersion, defaultOCRRegistryConfig, false, false,
+			a := setupAutomationTestDocker(
+				t, registryVersion, automationDefaultRegistryConfig, false, false,
 			)
 
 			performDataChecker, upkeepIDs := actions.DeployPerformDataCheckerConsumers(
 				t,
-				registry,
-				registrar,
-				linkToken,
-				contractDeployer,
-				chainClient,
+				a.Registry,
+				a.Registrar,
+				a.LinkToken,
+				a.Deployer,
+				a.ChainClient,
 				defaultAmountOfUpkeeps,
 				big.NewInt(automationDefaultLinkFunds),
 				automationDefaultUpkeepGasLimit,
@@ -970,16 +1024,16 @@ func TestUpdateCheckData(t *testing.T) {
 			}, "2m", "1s").Should(gomega.Succeed()) // ~1m for setup, 1m assertion
 
 			for i := 0; i < len(upkeepIDs); i++ {
-				err := registry.UpdateCheckData(upkeepIDs[i], []byte(automationExpectedData))
+				err := a.Registry.UpdateCheckData(upkeepIDs[i], []byte(automationExpectedData))
 				require.NoError(t, err, "Could not update check data for upkeep at index %d", i)
 			}
 
-			err := chainClient.WaitForEvents()
+			err := a.ChainClient.WaitForEvents()
 			require.NoError(t, err, "Error while waiting for check data update")
 
 			// retrieve new check data for all upkeeps
 			for i := 0; i < len(upkeepIDs); i++ {
-				upkeep, err := registry.GetUpkeepInfo(testcontext.Get(t), upkeepIDs[i])
+				upkeep, err := a.Registry.GetUpkeepInfo(testcontext.Get(t), upkeepIDs[i])
 				require.NoError(t, err, "Failed to get upkeep info at index %d", i)
 				require.Equal(t, []byte(automationExpectedData), upkeep.CheckData, "Upkeep data not as expected")
 			}
@@ -1009,15 +1063,7 @@ func setupAutomationTestDocker(
 	registryConfig contracts.KeeperRegistrySettings,
 	isMercuryV02 bool,
 	isMercuryV03 bool,
-) (
-	blockchain.EVMClient,
-	[]*client.ChainlinkClient,
-	contracts.ContractDeployer,
-	contracts.LinkToken,
-	contracts.KeeperRegistry,
-	contracts.KeeperRegistrar,
-	*test_env.CLClusterTestEnv,
-) {
+) automationv2.AutomationTest {
 	require.False(t, isMercuryV02 && isMercuryV03, "Cannot run test with both Mercury V02 and V03 on")
 
 	l := logging.GetTestLogger(t)
@@ -1080,16 +1126,6 @@ func setupAutomationTestDocker(
 		err = env.FundChainlinkNodes(big.NewFloat(testConfig.ChainlinkNodeFunding))
 		require.NoError(t, err, "Error funding CL nodes")
 
-		if isMercuryV02 {
-			output := `{"chainlinkBlob":"0x0001c38d71fed6c320b90e84b6f559459814d068e2a1700adc931ca9717d4fe70000000000000000000000000000000000000000000000000000000001a80b52b4bf1233f9cb71144a253a1791b202113c4ab4a92fa1b176d684b4959666ff8200000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001004254432d5553442d415242495452554d2d544553544e4554000000000000000000000000000000000000000000000000000000000000000000000000645570be000000000000000000000000000000000000000000000000000002af2b818dc5000000000000000000000000000000000000000000000000000002af2426faf3000000000000000000000000000000000000000000000000000002af32dc209700000000000000000000000000000000000000000000000000000000012130f8df0a9745bb6ad5e2df605e158ba8ad8a33ef8a0acf9851f0f01668a3a3f2b68600000000000000000000000000000000000000000000000000000000012130f60000000000000000000000000000000000000000000000000000000000000002c4a7958dce105089cf5edb68dad7dcfe8618d7784eb397f97d5a5fade78c11a58275aebda478968e545f7e3657aba9dcbe8d44605e4c6fde3e24edd5e22c94270000000000000000000000000000000000000000000000000000000000000002459c12d33986018a8959566d145225f0c4a4e61a9a3f50361ccff397899314f0018162cf10cd89897635a0bb62a822355bd199d09f4abe76e4d05261bb44733d"}`
-			err = env.MockAdapter.SetStringValuePath("/client", []string{http.MethodGet, http.MethodPost}, map[string]string{"Content-Type": "application/json"}, output)
-			require.NoError(t, err)
-		}
-		if isMercuryV03 {
-			output := `{"reports":[{"feedID":"0x4554482d5553442d415242495452554d2d544553544e45540000000000000000","validFromTimestamp":0,"observationsTimestamp":0,"fullReport":"0x00066dfcd1ed2d95b18c948dbc5bd64c687afe93e4ca7d663ddec14c20090ad80000000000000000000000000000000000000000000000000000000000081401000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000002200000000000000000000000000000000000000000000000000000000000000280000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001204554482d5553442d415242495452554d2d544553544e455400000000000000000000000000000000000000000000000000000000000000000000000064891c98000000000000000000000000000000000000000000000000000000289ad8d367000000000000000000000000000000000000000000000000000000289acf0b38000000000000000000000000000000000000000000000000000000289b3da40000000000000000000000000000000000000000000000000000000000018ae7ce74d9fa252a8983976eab600dc7590c778d04813430841bc6e765c34cd81a168d00000000000000000000000000000000000000000000000000000000018ae7cb0000000000000000000000000000000000000000000000000000000064891c98000000000000000000000000000000000000000000000000000000000000000260412b94e525ca6cedc9f544fd86f77606d52fe731a5d069dbe836a8bfc0fb8c911963b0ae7a14971f3b4621bffb802ef0605392b9a6c89c7fab1df8633a5ade00000000000000000000000000000000000000000000000000000000000000024500c2f521f83fba5efc2bf3effaaedde43d0a4adff785c1213b712a3aed0d8157642a84324db0cf9695ebd27708d4608eb0337e0dd87b0e43f0fa70c700d911"}]}`
-			err = env.MockAdapter.SetStringValuePath("/api/v1/reports/bulk", []string{http.MethodGet, http.MethodPost}, map[string]string{"Content-Type": "application/json"}, output)
-			require.NoError(t, err)
-		}
 	} else {
 		env, err = test_env.NewCLTestEnvBuilder().
 			WithTestLogger(t).
@@ -1105,31 +1141,82 @@ func setupAutomationTestDocker(
 
 	env.ParallelTransactions(true)
 	nodeClients := env.ClCluster.NodeAPIs()
-	workerNodes := nodeClients[1:]
 
-	linkToken, err := env.ContractDeployer.DeployLinkTokenContract()
-	require.NoError(t, err, "Error deploying LINK token")
+	a := automationv2.NewAutomationTestDocker(env.EVMClient, env.ContractDeployer, nodeClients)
+	a.MercuryCredentialName = "cred1"
+	a.RegistrySettings = registryConfig
+	a.RegistrarSettings = contracts.KeeperRegistrarSettings{
+		AutoApproveConfigType: uint8(2),
+		AutoApproveMaxAllowed: 1000,
+		MinLinkJuels:          big.NewInt(0),
+	}
+	a.PluginConfig = ocr2keepers30config.OffchainConfig{
+		TargetProbability:    "0.999",
+		TargetInRounds:       1,
+		PerformLockoutWindow: 3_600_000, // Intentionally set to be higher than in prod for testing purpose
+		GasLimitPerReport:    10_300_000,
+		GasOverheadPerUpkeep: 300_000,
+		MinConfirmations:     0,
+		MaxUpkeepBatchSize:   10,
+	}
+	a.PublicConfig = ocr3.PublicConfig{
+		DeltaProgress:                           10 * time.Second,
+		DeltaResend:                             15 * time.Second,
+		DeltaInitial:                            500 * time.Millisecond,
+		DeltaRound:                              1000 * time.Millisecond,
+		DeltaGrace:                              200 * time.Millisecond,
+		DeltaCertifiedCommitRequest:             300 * time.Millisecond,
+		DeltaStage:                              30 * time.Second,
+		RMax:                                    24,
+		MaxDurationQuery:                        20 * time.Millisecond,
+		MaxDurationObservation:                  20 * time.Millisecond,
+		MaxDurationShouldAcceptAttestedReport:   1200 * time.Millisecond,
+		MaxDurationShouldTransmitAcceptedReport: 20 * time.Millisecond,
+		F:                                       1,
+	}
 
-	registry, registrar := actions.DeployAutoOCRRegistryAndRegistrar(
-		t,
-		registryVersion,
-		registryConfig,
-		linkToken,
-		env.ContractDeployer,
-		env.EVMClient,
-	)
+	a.SetupAutomationDeployment(t)
+	a.SetDockerEnv(env)
 
-	// Fund the registry with LINK
-	err = linkToken.Transfer(registry.Address(), big.NewInt(0).Mul(big.NewInt(1e18), big.NewInt(int64(defaultAmountOfUpkeeps))))
-	require.NoError(t, err, "Funding keeper registry contract shouldn't fail")
+	if isMercuryV02 || isMercuryV03 {
+		var imposters []ctfTestEnv.KillgraveImposter
+		mercuryv03Mock200 := ctfTestEnv.KillgraveImposter{
+			Request: ctfTestEnv.KillgraveRequest{
+				Method:     http.MethodGet,
+				Endpoint:   "/api/v1/reports/bulk",
+				SchemaFile: nil,
+				Params:     &map[string]string{"feedIDs": "0x00028c915d6af0fd66bba2d0fc9405226bca8d6806333121a7d9832103d1563c", "timestamp": "{[\\d+]}"},
+				Headers:    nil,
+			},
+			Response: ctfTestEnv.KillgraveResponse{
+				Status:   200,
+				Body:     `{"reports":[{"feedID":"0x00028c915d6af0fd66bba2d0fc9405226bca8d6806333121a7d9832103d1563c","validFromTimestamp":0,"observationsTimestamp":0,"fullReport":"0x00066dfcd1ed2d95b18c948dbc5bd64c687afe93e4ca7d663ddec14c20090ad80000000000000000000000000000000000000000000000000000000000081401000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000002200000000000000000000000000000000000000000000000000000000000000280000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001204554482d5553442d415242495452554d2d544553544e455400000000000000000000000000000000000000000000000000000000000000000000000064891c98000000000000000000000000000000000000000000000000000000289ad8d367000000000000000000000000000000000000000000000000000000289acf0b38000000000000000000000000000000000000000000000000000000289b3da40000000000000000000000000000000000000000000000000000000000018ae7ce74d9fa252a8983976eab600dc7590c778d04813430841bc6e765c34cd81a168d00000000000000000000000000000000000000000000000000000000018ae7cb0000000000000000000000000000000000000000000000000000000064891c98000000000000000000000000000000000000000000000000000000000000000260412b94e525ca6cedc9f544fd86f77606d52fe731a5d069dbe836a8bfc0fb8c911963b0ae7a14971f3b4621bffb802ef0605392b9a6c89c7fab1df8633a5ade00000000000000000000000000000000000000000000000000000000000000024500c2f521f83fba5efc2bf3effaaedde43d0a4adff785c1213b712a3aed0d8157642a84324db0cf9695ebd27708d4608eb0337e0dd87b0e43f0fa70c700d911"}]}`,
+				BodyFile: nil,
+				Headers:  nil,
+				Delay:    nil,
+			},
+		}
 
-	err = actions.CreateOCRKeeperJobsLocal(l, nodeClients, registry.Address(), network.ChainID, 0, registryVersion)
-	require.NoError(t, err, "Error creating OCR Keeper Jobs")
-	ocrConfig, err := actions.BuildAutoOCR2ConfigVarsLocal(l, workerNodes, registryConfig, registrar.Address(), 30*time.Second, registry.RegistryOwnerAddress())
-	require.NoError(t, err, "Error building OCR config vars")
-	err = registry.SetConfig(automationDefaultRegistryConfig, ocrConfig)
-	require.NoError(t, err, "Registry config should be set successfully")
-	require.NoError(t, env.EVMClient.WaitForEvents(), "Waiting for config to be set")
+		mercuryv02Mock200 := ctfTestEnv.KillgraveImposter{
+			Request: ctfTestEnv.KillgraveRequest{
+				Method:     http.MethodGet,
+				Endpoint:   "/client",
+				SchemaFile: nil,
+				Params:     &map[string]string{"feedIdHex": "{0x00028c915d6af0fd66bba2d0fc9405226bca8d6806333121a7d9832103d1563c|0x4554482d5553442d415242495452554d2d544553544e45540000000000000000}", "blockNumber": "{[\\d+]}"},
+				Headers:    nil,
+			},
+			Response: ctfTestEnv.KillgraveResponse{
+				Status:   200,
+				Body:     `{"chainlinkBlob":"0x0001c38d71fed6c320b90e84b6f559459814d068e2a1700adc931ca9717d4fe70000000000000000000000000000000000000000000000000000000001a80b52b4bf1233f9cb71144a253a1791b202113c4ab4a92fa1b176d684b4959666ff8200000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001004254432d5553442d415242495452554d2d544553544e4554000000000000000000000000000000000000000000000000000000000000000000000000645570be000000000000000000000000000000000000000000000000000002af2b818dc5000000000000000000000000000000000000000000000000000002af2426faf3000000000000000000000000000000000000000000000000000002af32dc209700000000000000000000000000000000000000000000000000000000012130f8df0a9745bb6ad5e2df605e158ba8ad8a33ef8a0acf9851f0f01668a3a3f2b68600000000000000000000000000000000000000000000000000000000012130f60000000000000000000000000000000000000000000000000000000000000002c4a7958dce105089cf5edb68dad7dcfe8618d7784eb397f97d5a5fade78c11a58275aebda478968e545f7e3657aba9dcbe8d44605e4c6fde3e24edd5e22c94270000000000000000000000000000000000000000000000000000000000000002459c12d33986018a8959566d145225f0c4a4e61a9a3f50361ccff397899314f0018162cf10cd89897635a0bb62a822355bd199d09f4abe76e4d05261bb44733d"}`,
+				BodyFile: nil,
+				Headers:  nil,
+				Delay:    nil,
+			},
+		}
+
+		imposters = append(imposters, mercuryv03Mock200, mercuryv02Mock200)
+		a.SetupMercuryMock(t, imposters)
+	}
 
-	return env.EVMClient, nodeClients, env.ContractDeployer, linkToken, registry, registrar, env
+	return *a
 }

From 532a9d40c868a40672515a173f800647bfef305e Mon Sep 17 00:00:00 2001
From: ilija42 <57732589+ilija42@users.noreply.github.com>
Date: Fri, 1 Dec 2023 12:39:45 +0100
Subject: [PATCH 055/130] Fix keystore enable to upsert, now restores
 accidentally deleted keys (#11428)

---
 core/services/keystore/eth.go      | 11 ++++++--
 core/services/keystore/eth_test.go | 45 ++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/core/services/keystore/eth.go b/core/services/keystore/eth.go
index a2b207044c0..cea7b6762e0 100644
--- a/core/services/keystore/eth.go
+++ b/core/services/keystore/eth.go
@@ -221,13 +221,18 @@ func (ks *eth) Enable(address common.Address, chainID *big.Int, qopts ...pg.QOpt
 func (ks *eth) enable(address common.Address, chainID *big.Int, qopts ...pg.QOpt) error {
 	state := new(ethkey.State)
 	q := ks.q.WithOpts(qopts...)
-	sql := `UPDATE evm.key_states SET disabled = false, updated_at = NOW() WHERE address = $1 AND evm_chain_id = $2
-			RETURNING *;`
+	sql := `INSERT INTO evm.key_states as key_states ("address", "evm_chain_id", "disabled", "created_at", "updated_at") VALUES ($1, $2, false, NOW(), NOW())
+			ON CONFLICT ("address", "evm_chain_id") DO UPDATE SET "disabled" = false, "updated_at" = NOW() WHERE key_states."address" = $1 AND key_states."evm_chain_id" = $2
+    		RETURNING *;`
 	if err := q.Get(state, sql, address, chainID.String()); err != nil {
 		return errors.Wrap(err, "failed to enable state")
 	}
 
-	ks.keyStates.enable(address, chainID, state.UpdatedAt)
+	if state.CreatedAt.Equal(state.UpdatedAt) {
+		ks.keyStates.add(state)
+	} else {
+		ks.keyStates.enable(address, chainID, state.UpdatedAt)
+	}
 	ks.notify()
 	return nil
 }
diff --git a/core/services/keystore/eth_test.go b/core/services/keystore/eth_test.go
index 4165350300f..d9c5cf5cb89 100644
--- a/core/services/keystore/eth_test.go
+++ b/core/services/keystore/eth_test.go
@@ -541,6 +541,51 @@ func Test_EthKeyStore_SubscribeToKeyChanges(t *testing.T) {
 	assertCountAtLeast(1)
 }
 
+func Test_EthKeyStore_Enable(t *testing.T) {
+	t.Parallel()
+
+	db := pgtest.NewSqlxDB(t)
+	cfg := configtest.NewTestGeneralConfig(t)
+	keyStore := cltest.NewKeyStore(t, db, cfg.Database())
+	ks := keyStore.Eth()
+
+	t.Run("already existing disabled key gets enabled", func(t *testing.T) {
+		k, _ := cltest.MustInsertRandomKeyNoChains(t, ks)
+		require.NoError(t, ks.Add(k.Address, testutils.SimulatedChainID))
+		require.NoError(t, ks.Disable(k.Address, testutils.SimulatedChainID))
+		require.NoError(t, ks.Enable(k.Address, testutils.SimulatedChainID))
+		key, err := ks.GetState(k.Address.Hex(), testutils.SimulatedChainID)
+		require.NoError(t, err)
+		require.Equal(t, key.Disabled, false)
+	})
+
+	t.Run("creates key, deletes it unsafely and then enable creates it again", func(t *testing.T) {
+		k, _ := cltest.MustInsertRandomKeyNoChains(t, ks)
+		require.NoError(t, ks.Add(k.Address, testutils.SimulatedChainID))
+		_, err := db.Exec("DELETE FROM evm.key_states WHERE address = $1", k.Address)
+		require.NoError(t, err)
+		require.NoError(t, ks.Enable(k.Address, testutils.SimulatedChainID))
+		key, err := ks.GetState(k.Address.Hex(), testutils.SimulatedChainID)
+		require.NoError(t, err)
+		require.Equal(t, key.Disabled, false)
+	})
+
+	t.Run("creates key and enables it if it exists in the keystore, but is missing from key states db table", func(t *testing.T) {
+		k, _ := cltest.MustInsertRandomKeyNoChains(t, ks)
+		require.NoError(t, ks.Enable(k.Address, testutils.SimulatedChainID))
+		key, err := ks.GetState(k.Address.Hex(), testutils.SimulatedChainID)
+		require.NoError(t, err)
+		require.Equal(t, key.Disabled, false)
+	})
+
+	t.Run("errors if key is not present in keystore", func(t *testing.T) {
+		addrNotInKs := testutils.NewAddress()
+		require.Error(t, ks.Enable(addrNotInKs, testutils.SimulatedChainID))
+		_, err := ks.GetState(addrNotInKs.Hex(), testutils.SimulatedChainID)
+		require.Error(t, err)
+	})
+}
+
 func Test_EthKeyStore_EnsureKeys(t *testing.T) {
 	t.Parallel()
 

From 43604c18bfad89b15d7c67b8fd3a0219f2184db4 Mon Sep 17 00:00:00 2001
From: Jim W <poopoothegorilla@users.noreply.github.com>
Date: Fri, 1 Dec 2023 08:44:48 -0500
Subject: [PATCH 056/130] upgrade cosmos gogoproto (#10879)

* upgrade cosmos gogoproto pkg

* upgrade gogoproto for core scripts

* run go mod on integrations

* upgrade prometheus to 0.48

* update integrations mod

* rm replace

* newer grafana/loki; updated kuberesolver replace

---------

Co-authored-by: Jordan Krage <jmank88@gmail.com>
---
 core/scripts/go.mod      |    8 +-
 core/scripts/go.sum      |   36 +-
 go.mod                   |    8 +-
 go.sum                   |   36 +-
 integration-tests/go.mod |   62 ++-
 integration-tests/go.sum | 1098 ++++----------------------------------
 6 files changed, 185 insertions(+), 1063 deletions(-)

diff --git a/core/scripts/go.mod b/core/scripts/go.mod
index 197716c2b28..2de09adab56 100644
--- a/core/scripts/go.mod
+++ b/core/scripts/go.mod
@@ -81,7 +81,7 @@ require (
 	github.com/cosmos/cosmos-proto v1.0.0-beta.2 // indirect
 	github.com/cosmos/cosmos-sdk v0.47.4 // indirect
 	github.com/cosmos/go-bip39 v1.0.0 // indirect
-	github.com/cosmos/gogoproto v1.4.10 // indirect
+	github.com/cosmos/gogoproto v1.4.11 // indirect
 	github.com/cosmos/iavl v0.20.0 // indirect
 	github.com/cosmos/ibc-go/v7 v7.0.1 // indirect
 	github.com/cosmos/ics23/go v0.9.1-0.20221207100636-b1abd8678aab // indirect
@@ -149,7 +149,7 @@ require (
 	github.com/google/go-tpm v0.9.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/gopacket v1.1.19 // indirect
-	github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8 // indirect
+	github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 // indirect
 	github.com/gorilla/context v1.1.1 // indirect
 	github.com/gorilla/securecookie v1.1.2 // indirect
 	github.com/gorilla/sessions v1.2.2 // indirect
@@ -290,7 +290,7 @@ require (
 	github.com/prometheus/client_model v0.5.0 // indirect
 	github.com/prometheus/common v0.45.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
-	github.com/prometheus/prometheus v0.47.2 // indirect
+	github.com/prometheus/prometheus v0.48.0 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/rjeczalik/notify v0.9.3 // indirect
@@ -359,7 +359,7 @@ require (
 	go.uber.org/zap v1.26.0 // indirect
 	golang.org/x/arch v0.4.0 // indirect
 	golang.org/x/crypto v0.15.0 // indirect
-	golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect
+	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
 	golang.org/x/mod v0.14.0 // indirect
 	golang.org/x/net v0.18.0 // indirect
 	golang.org/x/sync v0.5.0 // indirect
diff --git a/core/scripts/go.sum b/core/scripts/go.sum
index c6f922432b4..9157e968763 100644
--- a/core/scripts/go.sum
+++ b/core/scripts/go.sum
@@ -158,8 +158,8 @@ github.com/avast/retry-go/v4 v4.5.1 h1:AxIx0HGi4VZ3I02jr78j5lZ3M6x1E0Ivxa6b0pUUh
 github.com/avast/retry-go/v4 v4.5.1/go.mod h1:/sipNsvNB3RRuT5iNcb6h73nw3IBmXJ/H3XrCQYSOpc=
 github.com/aws/aws-sdk-go v1.22.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go v1.44.302 h1:ST3ko6GrJKn3Xi+nAvxjG3uk/V1pW8KC52WLeIxqqNk=
-github.com/aws/aws-sdk-go v1.44.302/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/aws/aws-sdk-go v1.45.25 h1:c4fLlh5sLdK2DCRTY1z0hyuJZU4ygxX8m1FswL6/nF4=
+github.com/aws/aws-sdk-go v1.45.25/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
 github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59 h1:WWB576BN5zNSZc/M9d/10pqEx5VHNhaQ/yOVAkmj5Yo=
 github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I=
 github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
@@ -275,8 +275,8 @@ github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY
 github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
 github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE=
 github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ4GUkT+tbFI=
-github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoKuI=
-github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek=
+github.com/cosmos/gogoproto v1.4.11 h1:LZcMHrx4FjUgrqQSWeaGC1v/TeuVFqSLa43CC6aWR2g=
+github.com/cosmos/gogoproto v1.4.11/go.mod h1:/g39Mh8m17X8Q/GDEs5zYTSNaNnInBSohtaxzQnYq1Y=
 github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38=
 github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A=
 github.com/cosmos/ibc-go/v7 v7.0.1 h1:NIBNRWjlOoFvFQu1ZlgwkaSeHO5avf4C1YQiWegt8jw=
@@ -613,11 +613,11 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8 h1:n6vlPhxsA+BW/XsS5+uqi7GyzaLa5MH7qlSLBZtRdiA=
-github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8/go.mod h1:Jh3hGz2jkYak8qXPD19ryItVnUgpgeqzdkY/D0EaeuA=
+github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 h1:pUa4ghanp6q4IJHwE9RwLgmVFfReJN+KbQ8ExNEUUoQ=
+github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc=
-github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
+github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o=
+github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -625,8 +625,8 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
 github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/enterprise-certificate-proxy v0.2.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM=
-github.com/googleapis/enterprise-certificate-proxy v0.2.5/go.mod h1:RxW0N9901Cko1VOCW3SXCpWP+mlIEkk2tP7jnHy9a3w=
+github.com/googleapis/enterprise-certificate-proxy v0.3.1 h1:SBWmZhjUDRorQxrN0nwzf+AHBxnbFjViHQS4P0yVpmQ=
+github.com/googleapis/enterprise-certificate-proxy v0.3.1/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas=
@@ -1430,8 +1430,8 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
 github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
 github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
-github.com/prometheus/prometheus v0.47.2 h1:jWcnuQHz1o1Wu3MZ6nMJDuTI0kU5yJp9pkxh8XEkNvI=
-github.com/prometheus/prometheus v0.47.2/go.mod h1:J/bmOSjgH7lFxz2gZhrWEZs2i64vMS+HIuZfmYNhJ/M=
+github.com/prometheus/prometheus v0.48.0 h1:yrBloImGQ7je4h8M10ujGh4R6oxYQJQKlMuETwNskGk=
+github.com/prometheus/prometheus v0.48.0/go.mod h1:SRw624aMAxTfryAcP8rOjg4S/sHHaetx2lyJJ2nM83g=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ=
 github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc=
@@ -1812,8 +1812,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 h1:MGwJjxBy0HJshjDNfLsYO8xppfqWlA5ZT9OhtUUhTNw=
-golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -1914,8 +1914,8 @@ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210413134643-5e61552d6c78/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4=
-golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4=
+golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY=
+golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -2155,8 +2155,8 @@ google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz513
 google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
 google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
 google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
-google.golang.org/api v0.132.0 h1:8t2/+qZ26kAOGSmOiHwVycqVaDg7q3JDILrNi/Z6rvc=
-google.golang.org/api v0.132.0/go.mod h1:AeTBC6GpJnJSRJjktDcPX0QwtS8pGYZOV6MSuSCusw0=
+google.golang.org/api v0.147.0 h1:Can3FaQo9LlVqxJCodNmeZW/ib3/qKAY3rFeXiHo5gc=
+google.golang.org/api v0.147.0/go.mod h1:pQ/9j83DcmPd/5C9e2nFOdjjNkDZ1G+zkbK2uvdkJMs=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
diff --git a/go.mod b/go.mod
index 41255bc4f02..670ec435ea1 100644
--- a/go.mod
+++ b/go.mod
@@ -23,7 +23,7 @@ require (
 	github.com/gin-contrib/size v0.0.0-20230212012657-e14a14094dc4
 	github.com/gin-gonic/gin v1.9.1
 	github.com/go-webauthn/webauthn v0.9.1
-	github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8
+	github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98
 	github.com/google/uuid v1.4.0
 	github.com/gorilla/securecookie v1.1.2
 	github.com/gorilla/sessions v1.2.2
@@ -58,7 +58,7 @@ require (
 	github.com/prometheus/client_golang v1.17.0
 	github.com/prometheus/client_model v0.5.0
 	github.com/prometheus/common v0.45.0
-	github.com/prometheus/prometheus v0.47.2
+	github.com/prometheus/prometheus v0.48.0
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/rogpeppe/go-internal v1.11.0
 	github.com/scylladb/go-reflectx v1.0.1
@@ -90,7 +90,7 @@ require (
 	go.uber.org/multierr v1.11.0
 	go.uber.org/zap v1.26.0
 	golang.org/x/crypto v0.15.0
-	golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1
+	golang.org/x/exp v0.0.0-20231006140011-7918f672742d
 	golang.org/x/sync v0.5.0
 	golang.org/x/term v0.14.0
 	golang.org/x/text v0.14.0
@@ -144,7 +144,7 @@ require (
 	github.com/cosmos/btcutil v1.0.5 // indirect
 	github.com/cosmos/cosmos-proto v1.0.0-beta.2 // indirect
 	github.com/cosmos/go-bip39 v1.0.0 // indirect
-	github.com/cosmos/gogoproto v1.4.10 // indirect
+	github.com/cosmos/gogoproto v1.4.11 // indirect
 	github.com/cosmos/iavl v0.20.0 // indirect
 	github.com/cosmos/ibc-go/v7 v7.0.1 // indirect
 	github.com/cosmos/ics23/go v0.9.1-0.20221207100636-b1abd8678aab // indirect
diff --git a/go.sum b/go.sum
index cc3e1303774..74a086d6cf4 100644
--- a/go.sum
+++ b/go.sum
@@ -157,8 +157,8 @@ github.com/avast/retry-go/v4 v4.5.1 h1:AxIx0HGi4VZ3I02jr78j5lZ3M6x1E0Ivxa6b0pUUh
 github.com/avast/retry-go/v4 v4.5.1/go.mod h1:/sipNsvNB3RRuT5iNcb6h73nw3IBmXJ/H3XrCQYSOpc=
 github.com/aws/aws-sdk-go v1.22.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go v1.44.302 h1:ST3ko6GrJKn3Xi+nAvxjG3uk/V1pW8KC52WLeIxqqNk=
-github.com/aws/aws-sdk-go v1.44.302/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/aws/aws-sdk-go v1.45.25 h1:c4fLlh5sLdK2DCRTY1z0hyuJZU4ygxX8m1FswL6/nF4=
+github.com/aws/aws-sdk-go v1.45.25/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
 github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59 h1:WWB576BN5zNSZc/M9d/10pqEx5VHNhaQ/yOVAkmj5Yo=
 github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I=
 github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
@@ -274,8 +274,8 @@ github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY
 github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
 github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE=
 github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ4GUkT+tbFI=
-github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoKuI=
-github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek=
+github.com/cosmos/gogoproto v1.4.11 h1:LZcMHrx4FjUgrqQSWeaGC1v/TeuVFqSLa43CC6aWR2g=
+github.com/cosmos/gogoproto v1.4.11/go.mod h1:/g39Mh8m17X8Q/GDEs5zYTSNaNnInBSohtaxzQnYq1Y=
 github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38=
 github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A=
 github.com/cosmos/ibc-go/v7 v7.0.1 h1:NIBNRWjlOoFvFQu1ZlgwkaSeHO5avf4C1YQiWegt8jw=
@@ -612,11 +612,11 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8 h1:n6vlPhxsA+BW/XsS5+uqi7GyzaLa5MH7qlSLBZtRdiA=
-github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8/go.mod h1:Jh3hGz2jkYak8qXPD19ryItVnUgpgeqzdkY/D0EaeuA=
+github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 h1:pUa4ghanp6q4IJHwE9RwLgmVFfReJN+KbQ8ExNEUUoQ=
+github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc=
-github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
+github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o=
+github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -624,8 +624,8 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
 github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/enterprise-certificate-proxy v0.2.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM=
-github.com/googleapis/enterprise-certificate-proxy v0.2.5/go.mod h1:RxW0N9901Cko1VOCW3SXCpWP+mlIEkk2tP7jnHy9a3w=
+github.com/googleapis/enterprise-certificate-proxy v0.3.1 h1:SBWmZhjUDRorQxrN0nwzf+AHBxnbFjViHQS4P0yVpmQ=
+github.com/googleapis/enterprise-certificate-proxy v0.3.1/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas=
@@ -1435,8 +1435,8 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
 github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
 github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
-github.com/prometheus/prometheus v0.47.2 h1:jWcnuQHz1o1Wu3MZ6nMJDuTI0kU5yJp9pkxh8XEkNvI=
-github.com/prometheus/prometheus v0.47.2/go.mod h1:J/bmOSjgH7lFxz2gZhrWEZs2i64vMS+HIuZfmYNhJ/M=
+github.com/prometheus/prometheus v0.48.0 h1:yrBloImGQ7je4h8M10ujGh4R6oxYQJQKlMuETwNskGk=
+github.com/prometheus/prometheus v0.48.0/go.mod h1:SRw624aMAxTfryAcP8rOjg4S/sHHaetx2lyJJ2nM83g=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ=
 github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc=
@@ -1817,8 +1817,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 h1:MGwJjxBy0HJshjDNfLsYO8xppfqWlA5ZT9OhtUUhTNw=
-golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -1920,8 +1920,8 @@ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210413134643-5e61552d6c78/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4=
-golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4=
+golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY=
+golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -2162,8 +2162,8 @@ google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz513
 google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
 google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
 google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
-google.golang.org/api v0.132.0 h1:8t2/+qZ26kAOGSmOiHwVycqVaDg7q3JDILrNi/Z6rvc=
-google.golang.org/api v0.132.0/go.mod h1:AeTBC6GpJnJSRJjktDcPX0QwtS8pGYZOV6MSuSCusw0=
+google.golang.org/api v0.147.0 h1:Can3FaQo9LlVqxJCodNmeZW/ib3/qKAY3rFeXiHo5gc=
+google.golang.org/api v0.147.0/go.mod h1:pQ/9j83DcmPd/5C9e2nFOdjjNkDZ1G+zkbK2uvdkJMs=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index 220dc86b455..9bcd36470b8 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -59,8 +59,12 @@ require (
 	filippo.io/edwards25519 v1.0.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.1 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.8.0 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
 	github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
+	github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1 // indirect
 	github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect
 	github.com/CosmWasm/wasmd v0.40.1 // indirect
 	github.com/CosmWasm/wasmvm v1.2.4 // indirect
@@ -75,7 +79,7 @@ require (
 	github.com/armon/go-metrics v0.4.1 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/avast/retry-go/v4 v4.5.1 // indirect
-	github.com/aws/aws-sdk-go v1.44.302 // indirect
+	github.com/aws/aws-sdk-go v1.45.25 // indirect
 	github.com/aws/constructs-go/constructs/v10 v10.1.255 // indirect
 	github.com/aws/jsii-runtime-go v1.75.0 // indirect
 	github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59 // indirect
@@ -86,7 +90,7 @@ require (
 	github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect
 	github.com/bytedance/sonic v1.9.1 // indirect
-	github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee // indirect
+	github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b // indirect
 	github.com/c9s/goprocinfo v0.0.0-20210130143923-c95fcf8c64a8 // indirect
 	github.com/cdk8s-team/cdk8s-core-go/cdk8s/v2 v2.7.5 // indirect
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
@@ -112,7 +116,7 @@ require (
 	github.com/cosmos/cosmos-proto v1.0.0-beta.2 // indirect
 	github.com/cosmos/cosmos-sdk v0.47.4 // indirect
 	github.com/cosmos/go-bip39 v1.0.0 // indirect
-	github.com/cosmos/gogoproto v1.4.10 // indirect
+	github.com/cosmos/gogoproto v1.4.11 // indirect
 	github.com/cosmos/iavl v0.20.0 // indirect
 	github.com/cosmos/ibc-go/v7 v7.0.1 // indirect
 	github.com/cosmos/ics23/go v0.9.1-0.20221207100636-b1abd8678aab // indirect
@@ -129,7 +133,7 @@ require (
 	github.com/dgraph-io/ristretto v0.1.1 // indirect
 	github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
 	github.com/docker/distribution v2.8.2+incompatible // indirect
-	github.com/docker/docker v24.0.5+incompatible // indirect
+	github.com/docker/docker v24.0.7+incompatible // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
@@ -197,7 +201,7 @@ require (
 	github.com/google/go-tpm v0.9.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/gopacket v1.1.19 // indirect
-	github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8 // indirect
+	github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/gorilla/context v1.1.1 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
@@ -206,9 +210,9 @@ require (
 	github.com/gorilla/websocket v1.5.1 // indirect
 	github.com/gosimple/slug v1.13.1 // indirect
 	github.com/gosimple/unidecode v1.0.1 // indirect
-	github.com/grafana/dskit v0.0.0-20230201083518-528d8a7d52f2 // indirect
-	github.com/grafana/loki v1.6.2-0.20231017135925-990ac685e6a6 // indirect
-	github.com/grafana/loki/pkg/push v0.0.0-20230127102416-571f88bc5765 // indirect
+	github.com/grafana/dskit v0.0.0-20231120170505-765e343eda4f // indirect
+	github.com/grafana/loki v1.6.2-0.20231201111602-11ef833ed3e4 // indirect
+	github.com/grafana/loki/pkg/push v0.0.0-20231201111602-11ef833ed3e4 // indirect
 	github.com/grafana/pyroscope-go v1.0.4 // indirect
 	github.com/grafana/pyroscope-go/godeltaprof v0.1.4 // indirect
 	github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
@@ -221,7 +225,7 @@ require (
 	github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
 	github.com/gtank/merlin v0.1.1 // indirect
 	github.com/gtank/ristretto255 v0.1.2 // indirect
-	github.com/hashicorp/consul/api v1.22.0 // indirect
+	github.com/hashicorp/consul/api v1.25.1 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-hclog v1.5.0 // indirect
@@ -267,10 +271,11 @@ require (
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/julienschmidt/httprouter v1.3.0 // indirect
 	github.com/klauspost/compress v1.17.2 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
 	github.com/koron/go-ssdp v0.0.2 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
+	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/leanovate/gopter v0.2.10-0.20210127095200-9abe2343507a // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/libp2p/go-addr-util v0.0.2 // indirect
@@ -319,10 +324,10 @@ require (
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-runewidth v0.0.14 // indirect
 	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
-	github.com/miekg/dns v1.1.55 // indirect
+	github.com/miekg/dns v1.1.56 // indirect
 	github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
 	github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 // indirect
-	github.com/minio/sha256-simd v1.0.0 // indirect
+	github.com/minio/sha256-simd v1.0.1 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
@@ -366,17 +371,18 @@ require (
 	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
+	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
-	github.com/prometheus/alertmanager v0.25.1 // indirect
+	github.com/prometheus/alertmanager v0.26.0 // indirect
 	github.com/prometheus/client_golang v1.17.0 // indirect
 	github.com/prometheus/client_model v0.5.0 // indirect
 	github.com/prometheus/common v0.45.0 // indirect
 	github.com/prometheus/common/sigv4 v0.1.0 // indirect
-	github.com/prometheus/exporter-toolkit v0.10.0 // indirect
+	github.com/prometheus/exporter-toolkit v0.10.1-0.20230714054209-2f4150c63f97 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
-	github.com/prometheus/prometheus v0.47.2 // indirect
+	github.com/prometheus/prometheus v0.48.0 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/robfig/cron/v3 v3.0.1 // indirect
@@ -384,7 +390,7 @@ require (
 	github.com/russross/blackfriday v1.6.0 // indirect
 	github.com/sasha-s/go-deadlock v0.3.1 // indirect
 	github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
-	github.com/sercand/kuberesolver/v4 v4.0.0 // indirect
+	github.com/sercand/kuberesolver/v5 v5.1.1 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
 	github.com/shirou/gopsutil/v3 v3.23.10 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
@@ -396,9 +402,10 @@ require (
 	github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664 // indirect
 	github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 // indirect
 	github.com/smartcontractkit/wsrpc v0.7.2 // indirect
+	github.com/soheilhy/cmux v0.1.5 // indirect
 	github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
-	github.com/spf13/afero v1.9.3 // indirect
+	github.com/spf13/afero v1.9.5 // indirect
 	github.com/spf13/cast v1.5.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
@@ -424,8 +431,6 @@ require (
 	github.com/ugorji/go/codec v1.2.11 // indirect
 	github.com/umbracle/fastrlp v0.0.0-20220527094140-59d5dd30e722 // indirect
 	github.com/valyala/fastjson v1.4.1 // indirect
-	github.com/weaveworks/common v0.0.0-20230411130259-f7d83a041205 // indirect
-	github.com/weaveworks/promrus v1.2.0 // indirect
 	github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
 	github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
@@ -440,8 +445,10 @@ require (
 	go.etcd.io/etcd/client/v3 v3.5.7 // indirect
 	go.mongodb.org/mongo-driver v1.12.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
+	go.opentelemetry.io/collector/pdata v1.0.0-rcv0016 // indirect
+	go.opentelemetry.io/collector/semconv v0.87.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
 	go.opentelemetry.io/otel v1.21.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
@@ -455,10 +462,10 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/arch v0.4.0 // indirect
 	golang.org/x/crypto v0.15.0 // indirect
-	golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect
+	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
 	golang.org/x/mod v0.14.0 // indirect
 	golang.org/x/net v0.18.0 // indirect
-	golang.org/x/oauth2 v0.12.0 // indirect
+	golang.org/x/oauth2 v0.13.0 // indirect
 	golang.org/x/sys v0.14.0 // indirect
 	golang.org/x/term v0.14.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
@@ -479,14 +486,14 @@ require (
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/api v0.27.3 // indirect
+	k8s.io/api v0.28.2 // indirect
 	k8s.io/apiextensions-apiserver v0.25.3 // indirect
-	k8s.io/apimachinery v0.27.3 // indirect
+	k8s.io/apimachinery v0.28.2 // indirect
 	k8s.io/cli-runtime v0.25.11 // indirect
-	k8s.io/client-go v0.27.3 // indirect
+	k8s.io/client-go v0.28.2 // indirect
 	k8s.io/component-base v0.26.2 // indirect
 	k8s.io/klog/v2 v2.100.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20230525220651-2546d827e515 // indirect
+	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
 	k8s.io/kubectl v0.25.11 // indirect
 	k8s.io/utils v0.0.0-20230711102312-30195339c3c7 // indirect
 	nhooyr.io/websocket v1.8.7 // indirect
@@ -514,7 +521,4 @@ replace (
 
 	// until merged upstream: https://github.com/mwitkow/grpc-proxy/pull/69
 	github.com/mwitkow/grpc-proxy => github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f
-
-	github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.43.1-0.20230327151049-211ae4f1f0a2
-	github.com/sercand/kuberesolver/v4 => github.com/sercand/kuberesolver/v5 v5.1.1
 )
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index 134168a8667..17ff5e3030c 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -18,507 +18,35 @@ cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHOb
 cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
 cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
 cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY=
-cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg=
-cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8=
-cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0=
-cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY=
-cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM=
-cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY=
-cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ=
-cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI=
-cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4=
-cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc=
-cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA=
-cloud.google.com/go v0.100.1/go.mod h1:fs4QogzfH5n2pBXBP9vRiU+eCny7lD2vmFZy79Iuw1U=
-cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A=
-cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc=
-cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
-cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
-cloud.google.com/go v0.107.0/go.mod h1:wpc2eNrD7hXUTy8EKS10jkxpZBjASrORK7goS+3YX2I=
-cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY=
 cloud.google.com/go v0.110.9 h1:e7ITSqGFFk4rbz/JFIqZh3G4VEHguhAL4BQcFlWtU68=
 cloud.google.com/go v0.110.9/go.mod h1:rpxevX/0Lqvlbc88b7Sc1SPNdyK1riNBTUU6JXhYNpM=
-cloud.google.com/go/accessapproval v1.4.0/go.mod h1:zybIuC3KpDOvotz59lFe5qxRZx6C75OtwbisN56xYB4=
-cloud.google.com/go/accessapproval v1.5.0/go.mod h1:HFy3tuiGvMdcd/u+Cu5b9NkO1pEICJ46IR82PoUdplw=
-cloud.google.com/go/accessapproval v1.6.0/go.mod h1:R0EiYnwV5fsRFiKZkPHr6mwyk2wxUJ30nL4j2pcFY2E=
-cloud.google.com/go/accesscontextmanager v1.3.0/go.mod h1:TgCBehyr5gNMz7ZaH9xubp+CE8dkrszb4oK9CWyvD4o=
-cloud.google.com/go/accesscontextmanager v1.4.0/go.mod h1:/Kjh7BBu/Gh83sv+K60vN9QE5NJcd80sU33vIe2IFPE=
-cloud.google.com/go/accesscontextmanager v1.6.0/go.mod h1:8XCvZWfYw3K/ji0iVnp+6pu7huxoQTLmxAbVjbloTtM=
-cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw=
-cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY=
-cloud.google.com/go/aiplatform v1.27.0/go.mod h1:Bvxqtl40l0WImSb04d0hXFU7gDOiq9jQmorivIiWcKg=
-cloud.google.com/go/aiplatform v1.35.0/go.mod h1:7MFT/vCaOyZT/4IIFfxH4ErVg/4ku6lKv3w0+tFTgXQ=
-cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI=
-cloud.google.com/go/analytics v0.12.0/go.mod h1:gkfj9h6XRf9+TS4bmuhPEShsh3hH8PAZzm/41OOhQd4=
-cloud.google.com/go/analytics v0.18.0/go.mod h1:ZkeHGQlcIPkw0R/GW+boWHhCOR43xz9RN/jn7WcqfIE=
-cloud.google.com/go/apigateway v1.3.0/go.mod h1:89Z8Bhpmxu6AmUxuVRg/ECRGReEdiP3vQtk4Z1J9rJk=
-cloud.google.com/go/apigateway v1.4.0/go.mod h1:pHVY9MKGaH9PQ3pJ4YLzoj6U5FUDeDFBllIz7WmzJoc=
-cloud.google.com/go/apigateway v1.5.0/go.mod h1:GpnZR3Q4rR7LVu5951qfXPJCHquZt02jf7xQx7kpqN8=
-cloud.google.com/go/apigeeconnect v1.3.0/go.mod h1:G/AwXFAKo0gIXkPTVfZDd2qA1TxBXJ3MgMRBQkIi9jc=
-cloud.google.com/go/apigeeconnect v1.4.0/go.mod h1:kV4NwOKqjvt2JYR0AoIWo2QGfoRtn/pkS3QlHp0Ni04=
-cloud.google.com/go/apigeeconnect v1.5.0/go.mod h1:KFaCqvBRU6idyhSNyn3vlHXc8VMDJdRmwDF6JyFRqZ8=
-cloud.google.com/go/apigeeregistry v0.4.0/go.mod h1:EUG4PGcsZvxOXAdyEghIdXwAEi/4MEaoqLMLDMIwKXY=
-cloud.google.com/go/apigeeregistry v0.5.0/go.mod h1:YR5+s0BVNZfVOUkMa5pAR2xGd0A473vA5M7j247o1wM=
-cloud.google.com/go/apikeys v0.4.0/go.mod h1:XATS/yqZbaBK0HOssf+ALHp8jAlNHUgyfprvNcBIszU=
-cloud.google.com/go/apikeys v0.5.0/go.mod h1:5aQfwY4D+ewMMWScd3hm2en3hCj+BROlyrt3ytS7KLI=
-cloud.google.com/go/appengine v1.4.0/go.mod h1:CS2NhuBuDXM9f+qscZ6V86m1MIIqPj3WC/UoEuR1Sno=
-cloud.google.com/go/appengine v1.5.0/go.mod h1:TfasSozdkFI0zeoxW3PTBLiNqRmzraodCWatWI9Dmak=
-cloud.google.com/go/appengine v1.6.0/go.mod h1:hg6i0J/BD2cKmDJbaFSYHFyZkgBEfQrDg/X0V5fJn84=
-cloud.google.com/go/area120 v0.5.0/go.mod h1:DE/n4mp+iqVyvxHN41Vf1CR602GiHQjFPusMFW6bGR4=
-cloud.google.com/go/area120 v0.6.0/go.mod h1:39yFJqWVgm0UZqWTOdqkLhjoC7uFfgXRC8g/ZegeAh0=
-cloud.google.com/go/area120 v0.7.1/go.mod h1:j84i4E1RboTWjKtZVWXPqvK5VHQFJRF2c1Nm69pWm9k=
-cloud.google.com/go/artifactregistry v1.6.0/go.mod h1:IYt0oBPSAGYj/kprzsBjZ/4LnG/zOcHyFHjWPCi6SAQ=
-cloud.google.com/go/artifactregistry v1.7.0/go.mod h1:mqTOFOnGZx8EtSqK/ZWcsm/4U8B77rbcLP6ruDU2Ixk=
-cloud.google.com/go/artifactregistry v1.8.0/go.mod h1:w3GQXkJX8hiKN0v+at4b0qotwijQbYUqF2GWkZzAhC0=
-cloud.google.com/go/artifactregistry v1.9.0/go.mod h1:2K2RqvA2CYvAeARHRkLDhMDJ3OXy26h3XW+3/Jh2uYc=
-cloud.google.com/go/artifactregistry v1.11.2/go.mod h1:nLZns771ZGAwVLzTX/7Al6R9ehma4WUEhZGWV6CeQNQ=
-cloud.google.com/go/asset v1.5.0/go.mod h1:5mfs8UvcM5wHhqtSv8J1CtxxaQq3AdBxxQi2jGW/K4o=
-cloud.google.com/go/asset v1.7.0/go.mod h1:YbENsRK4+xTiL+Ofoj5Ckf+O17kJtgp3Y3nn4uzZz5s=
-cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjbytpUaW0=
-cloud.google.com/go/asset v1.9.0/go.mod h1:83MOE6jEJBMqFKadM9NLRcs80Gdw76qGuHn8m3h8oHQ=
-cloud.google.com/go/asset v1.10.0/go.mod h1:pLz7uokL80qKhzKr4xXGvBQXnzHn5evJAEAtZiIb0wY=
-cloud.google.com/go/asset v1.11.1/go.mod h1:fSwLhbRvC9p9CXQHJ3BgFeQNM4c9x10lqlrdEUYXlJo=
-cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY=
-cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw=
-cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI=
-cloud.google.com/go/assuredworkloads v1.8.0/go.mod h1:AsX2cqyNCOvEQC8RMPnoc0yEarXQk6WEKkxYfL6kGIo=
-cloud.google.com/go/assuredworkloads v1.9.0/go.mod h1:kFuI1P78bplYtT77Tb1hi0FMxM0vVpRC7VVoJC3ZoT0=
-cloud.google.com/go/assuredworkloads v1.10.0/go.mod h1:kwdUQuXcedVdsIaKgKTp9t0UJkE5+PAVNhdQm4ZVq2E=
-cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0=
-cloud.google.com/go/automl v1.6.0/go.mod h1:ugf8a6Fx+zP0D59WLhqgTDsQI9w07o64uf/Is3Nh5p8=
-cloud.google.com/go/automl v1.7.0/go.mod h1:RL9MYCCsJEOmt0Wf3z9uzG0a7adTT1fe+aObgSpkCt8=
-cloud.google.com/go/automl v1.8.0/go.mod h1:xWx7G/aPEe/NP+qzYXktoBSDfjO+vnKMGgsApGJJquM=
-cloud.google.com/go/automl v1.12.0/go.mod h1:tWDcHDp86aMIuHmyvjuKeeHEGq76lD7ZqfGLN6B0NuU=
-cloud.google.com/go/baremetalsolution v0.3.0/go.mod h1:XOrocE+pvK1xFfleEnShBlNAXf+j5blPPxrhjKgnIFc=
-cloud.google.com/go/baremetalsolution v0.4.0/go.mod h1:BymplhAadOO/eBa7KewQ0Ppg4A4Wplbn+PsFKRLo0uI=
-cloud.google.com/go/baremetalsolution v0.5.0/go.mod h1:dXGxEkmR9BMwxhzBhV0AioD0ULBmuLZI8CdwalUxuss=
-cloud.google.com/go/batch v0.3.0/go.mod h1:TR18ZoAekj1GuirsUsR1ZTKN3FC/4UDnScjT8NXImFE=
-cloud.google.com/go/batch v0.4.0/go.mod h1:WZkHnP43R/QCGQsZ+0JyG4i79ranE2u8xvjq/9+STPE=
-cloud.google.com/go/batch v0.7.0/go.mod h1:vLZN95s6teRUqRQ4s3RLDsH8PvboqBK+rn1oevL159g=
-cloud.google.com/go/beyondcorp v0.2.0/go.mod h1:TB7Bd+EEtcw9PCPQhCJtJGjk/7TC6ckmnSFS+xwTfm4=
-cloud.google.com/go/beyondcorp v0.3.0/go.mod h1:E5U5lcrcXMsCuoDNyGrpyTm/hn7ne941Jz2vmksAxW8=
-cloud.google.com/go/beyondcorp v0.4.0/go.mod h1:3ApA0mbhHx6YImmuubf5pyW8srKnCEPON32/5hj+RmM=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
 cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
 cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
 cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/bigquery v1.42.0/go.mod h1:8dRTJxhtG+vwBKzE5OseQn/hiydoQN3EedCaOdYmxRA=
-cloud.google.com/go/bigquery v1.43.0/go.mod h1:ZMQcXHsl+xmU1z36G2jNGZmKp9zNY5BUua5wDgmNCfw=
-cloud.google.com/go/bigquery v1.44.0/go.mod h1:0Y33VqXTEsbamHJvJHdFmtqHvMIY28aK1+dFsvaChGc=
-cloud.google.com/go/bigquery v1.48.0/go.mod h1:QAwSz+ipNgfL5jxiaK7weyOhzdoAy1zFm0Nf1fysJac=
-cloud.google.com/go/billing v1.4.0/go.mod h1:g9IdKBEFlItS8bTtlrZdVLWSSdSyFUZKXNS02zKMOZY=
-cloud.google.com/go/billing v1.5.0/go.mod h1:mztb1tBc3QekhjSgmpf/CV4LzWXLzCArwpLmP2Gm88s=
-cloud.google.com/go/billing v1.6.0/go.mod h1:WoXzguj+BeHXPbKfNWkqVtDdzORazmCjraY+vrxcyvI=
-cloud.google.com/go/billing v1.7.0/go.mod h1:q457N3Hbj9lYwwRbnlD7vUpyjq6u5U1RAOArInEiD5Y=
-cloud.google.com/go/billing v1.12.0/go.mod h1:yKrZio/eu+okO/2McZEbch17O5CB5NpZhhXG6Z766ss=
-cloud.google.com/go/binaryauthorization v1.1.0/go.mod h1:xwnoWu3Y84jbuHa0zd526MJYmtnVXn0syOjaJgy4+dM=
-cloud.google.com/go/binaryauthorization v1.2.0/go.mod h1:86WKkJHtRcv5ViNABtYMhhNWRrD1Vpi//uKEy7aYEfI=
-cloud.google.com/go/binaryauthorization v1.3.0/go.mod h1:lRZbKgjDIIQvzYQS1p99A7/U1JqvqeZg0wiI5tp6tg0=
-cloud.google.com/go/binaryauthorization v1.4.0/go.mod h1:tsSPQrBd77VLplV70GUhBf/Zm3FsKmgSqgm4UmiDItk=
-cloud.google.com/go/binaryauthorization v1.5.0/go.mod h1:OSe4OU1nN/VswXKRBmciKpo9LulY41gch5c68htf3/Q=
-cloud.google.com/go/certificatemanager v1.3.0/go.mod h1:n6twGDvcUBFu9uBgt4eYvvf3sQ6My8jADcOVwHmzadg=
-cloud.google.com/go/certificatemanager v1.4.0/go.mod h1:vowpercVFyqs8ABSmrdV+GiFf2H/ch3KyudYQEMM590=
-cloud.google.com/go/certificatemanager v1.6.0/go.mod h1:3Hh64rCKjRAX8dXgRAyOcY5vQ/fE1sh8o+Mdd6KPgY8=
-cloud.google.com/go/channel v1.8.0/go.mod h1:W5SwCXDJsq/rg3tn3oG0LOxpAo6IMxNa09ngphpSlnk=
-cloud.google.com/go/channel v1.9.0/go.mod h1:jcu05W0my9Vx4mt3/rEHpfxc9eKi9XwsdDL8yBMbKUk=
-cloud.google.com/go/channel v1.11.0/go.mod h1:IdtI0uWGqhEeatSB62VOoJ8FSUhJ9/+iGkJVqp74CGE=
-cloud.google.com/go/cloudbuild v1.3.0/go.mod h1:WequR4ULxlqvMsjDEEEFnOG5ZSRSgWOywXYDb1vPE6U=
-cloud.google.com/go/cloudbuild v1.4.0/go.mod h1:5Qwa40LHiOXmz3386FrjrYM93rM/hdRr7b53sySrTqA=
-cloud.google.com/go/cloudbuild v1.7.0/go.mod h1:zb5tWh2XI6lR9zQmsm1VRA+7OCuve5d8S+zJUul8KTg=
-cloud.google.com/go/clouddms v1.3.0/go.mod h1:oK6XsCDdW4Ib3jCCBugx+gVjevp2TMXFtgxvPSee3OM=
-cloud.google.com/go/clouddms v1.4.0/go.mod h1:Eh7sUGCC+aKry14O1NRljhjyrr0NFC0G2cjwX0cByRk=
-cloud.google.com/go/clouddms v1.5.0/go.mod h1:QSxQnhikCLUw13iAbffF2CZxAER3xDGNHjsTAkQJcQA=
-cloud.google.com/go/cloudtasks v1.5.0/go.mod h1:fD92REy1x5woxkKEkLdvavGnPJGEn8Uic9nWuLzqCpY=
-cloud.google.com/go/cloudtasks v1.6.0/go.mod h1:C6Io+sxuke9/KNRkbQpihnW93SWDU3uXt92nu85HkYI=
-cloud.google.com/go/cloudtasks v1.7.0/go.mod h1:ImsfdYWwlWNJbdgPIIGJWC+gemEGTBK/SunNQQNCAb4=
-cloud.google.com/go/cloudtasks v1.8.0/go.mod h1:gQXUIwCSOI4yPVK7DgTVFiiP0ZW/eQkydWzwVMdHxrI=
-cloud.google.com/go/cloudtasks v1.9.0/go.mod h1:w+EyLsVkLWHcOaqNEyvcKAsWp9p29dL6uL9Nst1cI7Y=
-cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow=
-cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM=
-cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M=
-cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s=
-cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU=
-cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U=
-cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
-cloud.google.com/go/compute v1.12.0/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU=
-cloud.google.com/go/compute v1.12.1/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU=
-cloud.google.com/go/compute v1.13.0/go.mod h1:5aPTS0cUNMIc1CE546K+Th6weJUNQErARyZtRXDJ8GE=
-cloud.google.com/go/compute v1.14.0/go.mod h1:YfLtxrj9sU4Yxv+sXzZkyPjEyPBZfXHUvjxega5vAdo=
-cloud.google.com/go/compute v1.15.1/go.mod h1:bjjoF/NtFUrkD/urWfdHaKuOPDR5nWIs63rR+SXhcpA=
-cloud.google.com/go/compute v1.18.0/go.mod h1:1X7yHxec2Ga+Ss6jPyjxRxpu2uu7PLgsOVXvgU0yacs=
 cloud.google.com/go/compute v1.23.2 h1:nWEMDhgbBkBJjfpVySqU4jgWdc22PLR0o4vEexZHers=
 cloud.google.com/go/compute v1.23.2/go.mod h1:JJ0atRC0J/oWYiiVBmsSsrRnh92DhZPG4hFDcR04Rns=
-cloud.google.com/go/compute/metadata v0.1.0/go.mod h1:Z1VN+bulIf6bt4P/C37K4DyZYZEXYonfTBHHFPO/4UU=
-cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
-cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM=
 cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
 cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
-cloud.google.com/go/contactcenterinsights v1.3.0/go.mod h1:Eu2oemoePuEFc/xKFPjbTuPSj0fYJcPls9TFlPNnHHY=
-cloud.google.com/go/contactcenterinsights v1.4.0/go.mod h1:L2YzkGbPsv+vMQMCADxJoT9YiTTnSEd6fEvCeHTYVck=
-cloud.google.com/go/contactcenterinsights v1.6.0/go.mod h1:IIDlT6CLcDoyv79kDv8iWxMSTZhLxSCofVV5W6YFM/w=
-cloud.google.com/go/container v1.6.0/go.mod h1:Xazp7GjJSeUYo688S+6J5V+n/t+G5sKBTFkKNudGRxg=
-cloud.google.com/go/container v1.7.0/go.mod h1:Dp5AHtmothHGX3DwwIHPgq45Y8KmNsgN3amoYfxVkLo=
-cloud.google.com/go/container v1.13.1/go.mod h1:6wgbMPeQRw9rSnKBCAJXnds3Pzj03C4JHamr8asWKy4=
-cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I=
-cloud.google.com/go/containeranalysis v0.6.0/go.mod h1:HEJoiEIu+lEXM+k7+qLCci0h33lX3ZqoYFdmPcoO7s4=
-cloud.google.com/go/containeranalysis v0.7.0/go.mod h1:9aUL+/vZ55P2CXfuZjS4UjQ9AgXoSw8Ts6lemfmxBxI=
-cloud.google.com/go/datacatalog v1.3.0/go.mod h1:g9svFY6tuR+j+hrTw3J2dNcmI0dzmSiyOzm8kpLq0a0=
-cloud.google.com/go/datacatalog v1.5.0/go.mod h1:M7GPLNQeLfWqeIm3iuiruhPzkt65+Bx8dAKvScX8jvs=
-cloud.google.com/go/datacatalog v1.6.0/go.mod h1:+aEyF8JKg+uXcIdAmmaMUmZ3q1b/lKLtXCmXdnc0lbc=
-cloud.google.com/go/datacatalog v1.7.0/go.mod h1:9mEl4AuDYWw81UGc41HonIHH7/sn52H0/tc8f8ZbZIE=
-cloud.google.com/go/datacatalog v1.8.0/go.mod h1:KYuoVOv9BM8EYz/4eMFxrr4DUKhGIOXxZoKYF5wdISM=
-cloud.google.com/go/datacatalog v1.8.1/go.mod h1:RJ58z4rMp3gvETA465Vg+ag8BGgBdnRPEMMSTr5Uv+M=
-cloud.google.com/go/datacatalog v1.12.0/go.mod h1:CWae8rFkfp6LzLumKOnmVh4+Zle4A3NXLzVJ1d1mRm0=
-cloud.google.com/go/dataflow v0.6.0/go.mod h1:9QwV89cGoxjjSR9/r7eFDqqjtvbKxAK2BaYU6PVk9UM=
-cloud.google.com/go/dataflow v0.7.0/go.mod h1:PX526vb4ijFMesO1o202EaUmouZKBpjHsTlCtB4parQ=
-cloud.google.com/go/dataflow v0.8.0/go.mod h1:Rcf5YgTKPtQyYz8bLYhFoIV/vP39eL7fWNcSOyFfLJE=
-cloud.google.com/go/dataform v0.3.0/go.mod h1:cj8uNliRlHpa6L3yVhDOBrUXH+BPAO1+KFMQQNSThKo=
-cloud.google.com/go/dataform v0.4.0/go.mod h1:fwV6Y4Ty2yIFL89huYlEkwUPtS7YZinZbzzj5S9FzCE=
-cloud.google.com/go/dataform v0.5.0/go.mod h1:GFUYRe8IBa2hcomWplodVmUx/iTL0FrsauObOM3Ipr0=
-cloud.google.com/go/dataform v0.6.0/go.mod h1:QPflImQy33e29VuapFdf19oPbE4aYTJxr31OAPV+ulA=
-cloud.google.com/go/datafusion v1.4.0/go.mod h1:1Zb6VN+W6ALo85cXnM1IKiPw+yQMKMhB9TsTSRDo/38=
-cloud.google.com/go/datafusion v1.5.0/go.mod h1:Kz+l1FGHB0J+4XF2fud96WMmRiq/wj8N9u007vyXZ2w=
-cloud.google.com/go/datafusion v1.6.0/go.mod h1:WBsMF8F1RhSXvVM8rCV3AeyWVxcC2xY6vith3iw3S+8=
-cloud.google.com/go/datalabeling v0.5.0/go.mod h1:TGcJ0G2NzcsXSE/97yWjIZO0bXj0KbVlINXMG9ud42I=
-cloud.google.com/go/datalabeling v0.6.0/go.mod h1:WqdISuk/+WIGeMkpw/1q7bK/tFEZxsrFJOJdY2bXvTQ=
-cloud.google.com/go/datalabeling v0.7.0/go.mod h1:WPQb1y08RJbmpM3ww0CSUAGweL0SxByuW2E+FU+wXcM=
-cloud.google.com/go/dataplex v1.3.0/go.mod h1:hQuRtDg+fCiFgC8j0zV222HvzFQdRd+SVX8gdmFcZzA=
-cloud.google.com/go/dataplex v1.4.0/go.mod h1:X51GfLXEMVJ6UN47ESVqvlsRplbLhcsAt0kZCCKsU0A=
-cloud.google.com/go/dataplex v1.5.2/go.mod h1:cVMgQHsmfRoI5KFYq4JtIBEUbYwc3c7tXmIDhRmNNVQ=
-cloud.google.com/go/dataproc v1.7.0/go.mod h1:CKAlMjII9H90RXaMpSxQ8EU6dQx6iAYNPcYPOkSbi8s=
-cloud.google.com/go/dataproc v1.8.0/go.mod h1:5OW+zNAH0pMpw14JVrPONsxMQYMBqJuzORhIBfBn9uI=
-cloud.google.com/go/dataproc v1.12.0/go.mod h1:zrF3aX0uV3ikkMz6z4uBbIKyhRITnxvr4i3IjKsKrw4=
-cloud.google.com/go/dataqna v0.5.0/go.mod h1:90Hyk596ft3zUQ8NkFfvICSIfHFh1Bc7C4cK3vbhkeo=
-cloud.google.com/go/dataqna v0.6.0/go.mod h1:1lqNpM7rqNLVgWBJyk5NF6Uen2PHym0jtVJonplVsDA=
-cloud.google.com/go/dataqna v0.7.0/go.mod h1:Lx9OcIIeqCrw1a6KdO3/5KMP1wAmTc0slZWwP12Qq3c=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
-cloud.google.com/go/datastore v1.10.0/go.mod h1:PC5UzAmDEkAmkfaknstTYbNpgE49HAgW2J1gcgUfmdM=
-cloud.google.com/go/datastream v1.2.0/go.mod h1:i/uTP8/fZwgATHS/XFu0TcNUhuA0twZxxQ3EyCUQMwo=
-cloud.google.com/go/datastream v1.3.0/go.mod h1:cqlOX8xlyYF/uxhiKn6Hbv6WjwPPuI9W2M9SAXwaLLQ=
-cloud.google.com/go/datastream v1.4.0/go.mod h1:h9dpzScPhDTs5noEMQVWP8Wx8AFBRyS0s8KWPx/9r0g=
-cloud.google.com/go/datastream v1.5.0/go.mod h1:6TZMMNPwjUqZHBKPQ1wwXpb0d5VDVPl2/XoS5yi88q4=
-cloud.google.com/go/datastream v1.6.0/go.mod h1:6LQSuswqLa7S4rPAOZFVjHIG3wJIjZcZrw8JDEDJuIs=
-cloud.google.com/go/deploy v1.4.0/go.mod h1:5Xghikd4VrmMLNaF6FiRFDlHb59VM59YoDQnOUdsH/c=
-cloud.google.com/go/deploy v1.5.0/go.mod h1:ffgdD0B89tToyW/U/D2eL0jN2+IEV/3EMuXHA0l4r+s=
-cloud.google.com/go/deploy v1.6.0/go.mod h1:f9PTHehG/DjCom3QH0cntOVRm93uGBDt2vKzAPwpXQI=
-cloud.google.com/go/dialogflow v1.15.0/go.mod h1:HbHDWs33WOGJgn6rfzBW1Kv807BE3O1+xGbn59zZWI4=
-cloud.google.com/go/dialogflow v1.16.1/go.mod h1:po6LlzGfK+smoSmTBnbkIZY2w8ffjz/RcGSS+sh1el0=
-cloud.google.com/go/dialogflow v1.17.0/go.mod h1:YNP09C/kXA1aZdBgC/VtXX74G/TKn7XVCcVumTflA+8=
-cloud.google.com/go/dialogflow v1.18.0/go.mod h1:trO7Zu5YdyEuR+BhSNOqJezyFQ3aUzz0njv7sMx/iek=
-cloud.google.com/go/dialogflow v1.19.0/go.mod h1:JVmlG1TwykZDtxtTXujec4tQ+D8SBFMoosgy+6Gn0s0=
-cloud.google.com/go/dialogflow v1.29.0/go.mod h1:b+2bzMe+k1s9V+F2jbJwpHPzrnIyHihAdRFMtn2WXuM=
-cloud.google.com/go/dialogflow v1.31.0/go.mod h1:cuoUccuL1Z+HADhyIA7dci3N5zUssgpBJmCzI6fNRB4=
-cloud.google.com/go/dlp v1.6.0/go.mod h1:9eyB2xIhpU0sVwUixfBubDoRwP+GjeUoxxeueZmqvmM=
-cloud.google.com/go/dlp v1.7.0/go.mod h1:68ak9vCiMBjbasxeVD17hVPxDEck+ExiHavX8kiHG+Q=
-cloud.google.com/go/dlp v1.9.0/go.mod h1:qdgmqgTyReTz5/YNSSuueR8pl7hO0o9bQ39ZhtgkWp4=
-cloud.google.com/go/documentai v1.7.0/go.mod h1:lJvftZB5NRiFSX4moiye1SMxHx0Bc3x1+p9e/RfXYiU=
-cloud.google.com/go/documentai v1.8.0/go.mod h1:xGHNEB7CtsnySCNrCFdCyyMz44RhFEEX2Q7UD0c5IhU=
-cloud.google.com/go/documentai v1.9.0/go.mod h1:FS5485S8R00U10GhgBC0aNGrJxBP8ZVpEeJ7PQDZd6k=
-cloud.google.com/go/documentai v1.10.0/go.mod h1:vod47hKQIPeCfN2QS/jULIvQTugbmdc0ZvxxfQY1bg4=
-cloud.google.com/go/documentai v1.16.0/go.mod h1:o0o0DLTEZ+YnJZ+J4wNfTxmDVyrkzFvttBXXtYRMHkM=
-cloud.google.com/go/domains v0.6.0/go.mod h1:T9Rz3GasrpYk6mEGHh4rymIhjlnIuB4ofT1wTxDeT4Y=
-cloud.google.com/go/domains v0.7.0/go.mod h1:PtZeqS1xjnXuRPKE/88Iru/LdfoRyEHYA9nFQf4UKpg=
-cloud.google.com/go/domains v0.8.0/go.mod h1:M9i3MMDzGFXsydri9/vW+EWz9sWb4I6WyHqdlAk0idE=
-cloud.google.com/go/edgecontainer v0.1.0/go.mod h1:WgkZ9tp10bFxqO8BLPqv2LlfmQF1X8lZqwW4r1BTajk=
-cloud.google.com/go/edgecontainer v0.2.0/go.mod h1:RTmLijy+lGpQ7BXuTDa4C4ssxyXT34NIuHIgKuP4s5w=
-cloud.google.com/go/edgecontainer v0.3.0/go.mod h1:FLDpP4nykgwwIfcLt6zInhprzw0lEi2P1fjO6Ie0qbc=
-cloud.google.com/go/errorreporting v0.3.0/go.mod h1:xsP2yaAp+OAW4OIm60An2bbLpqIhKXdWR/tawvl7QzU=
-cloud.google.com/go/essentialcontacts v1.3.0/go.mod h1:r+OnHa5jfj90qIfZDO/VztSFqbQan7HV75p8sA+mdGI=
-cloud.google.com/go/essentialcontacts v1.4.0/go.mod h1:8tRldvHYsmnBCHdFpvU+GL75oWiBKl80BiqlFh9tp+8=
-cloud.google.com/go/essentialcontacts v1.5.0/go.mod h1:ay29Z4zODTuwliK7SnX8E86aUF2CTzdNtvv42niCX0M=
-cloud.google.com/go/eventarc v1.7.0/go.mod h1:6ctpF3zTnaQCxUjHUdcfgcA1A2T309+omHZth7gDfmc=
-cloud.google.com/go/eventarc v1.8.0/go.mod h1:imbzxkyAU4ubfsaKYdQg04WS1NvncblHEup4kvF+4gw=
-cloud.google.com/go/eventarc v1.10.0/go.mod h1:u3R35tmZ9HvswGRBnF48IlYgYeBcPUCjkr4BTdem2Kw=
-cloud.google.com/go/filestore v1.3.0/go.mod h1:+qbvHGvXU1HaKX2nD0WEPo92TP/8AQuCVEBXNY9z0+w=
-cloud.google.com/go/filestore v1.4.0/go.mod h1:PaG5oDfo9r224f8OYXURtAsY+Fbyq/bLYoINEK8XQAI=
-cloud.google.com/go/filestore v1.5.0/go.mod h1:FqBXDWBp4YLHqRnVGveOkHDf8svj9r5+mUDLupOWEDs=
 cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk=
-cloud.google.com/go/firestore v1.9.0/go.mod h1:HMkjKHNTtRyZNiMzu7YAsLr9K3X2udY2AMwDaMEQiiE=
-cloud.google.com/go/functions v1.6.0/go.mod h1:3H1UA3qiIPRWD7PeZKLvHZ9SaQhR26XIJcC0A5GbvAk=
-cloud.google.com/go/functions v1.7.0/go.mod h1:+d+QBcWM+RsrgZfV9xo6KfA1GlzJfxcfZcRPEhDDfzg=
-cloud.google.com/go/functions v1.8.0/go.mod h1:RTZ4/HsQjIqIYP9a9YPbU+QFoQsAlYgrwOXJWHn1POY=
-cloud.google.com/go/functions v1.9.0/go.mod h1:Y+Dz8yGguzO3PpIjhLTbnqV1CWmgQ5UwtlpzoyquQ08=
-cloud.google.com/go/functions v1.10.0/go.mod h1:0D3hEOe3DbEvCXtYOZHQZmD+SzYsi1YbI7dGvHfldXw=
-cloud.google.com/go/gaming v1.5.0/go.mod h1:ol7rGcxP/qHTRQE/RO4bxkXq+Fix0j6D4LFPzYTIrDM=
-cloud.google.com/go/gaming v1.6.0/go.mod h1:YMU1GEvA39Qt3zWGyAVA9bpYz/yAhTvaQ1t2sK4KPUA=
-cloud.google.com/go/gaming v1.7.0/go.mod h1:LrB8U7MHdGgFG851iHAfqUdLcKBdQ55hzXy9xBJz0+w=
-cloud.google.com/go/gaming v1.8.0/go.mod h1:xAqjS8b7jAVW0KFYeRUxngo9My3f33kFmua++Pi+ggM=
-cloud.google.com/go/gaming v1.9.0/go.mod h1:Fc7kEmCObylSWLO334NcO+O9QMDyz+TKC4v1D7X+Bc0=
-cloud.google.com/go/gkebackup v0.2.0/go.mod h1:XKvv/4LfG829/B8B7xRkk8zRrOEbKtEam6yNfuQNH60=
-cloud.google.com/go/gkebackup v0.3.0/go.mod h1:n/E671i1aOQvUxT541aTkCwExO/bTer2HDlj4TsBRAo=
-cloud.google.com/go/gkebackup v0.4.0/go.mod h1:byAyBGUwYGEEww7xsbnUTBHIYcOPy/PgUWUtOeRm9Vg=
-cloud.google.com/go/gkeconnect v0.5.0/go.mod h1:c5lsNAg5EwAy7fkqX/+goqFsU1Da/jQFqArp+wGNr/o=
-cloud.google.com/go/gkeconnect v0.6.0/go.mod h1:Mln67KyU/sHJEBY8kFZ0xTeyPtzbq9StAVvEULYK16A=
-cloud.google.com/go/gkeconnect v0.7.0/go.mod h1:SNfmVqPkaEi3bF/B3CNZOAYPYdg7sU+obZ+QTky2Myw=
-cloud.google.com/go/gkehub v0.9.0/go.mod h1:WYHN6WG8w9bXU0hqNxt8rm5uxnk8IH+lPY9J2TV7BK0=
-cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y977wO+hBH0=
-cloud.google.com/go/gkehub v0.11.0/go.mod h1:JOWHlmN+GHyIbuWQPl47/C2RFhnFKH38jH9Ascu3n0E=
-cloud.google.com/go/gkemulticloud v0.3.0/go.mod h1:7orzy7O0S+5kq95e4Hpn7RysVA7dPs8W/GgfUtsPbrA=
-cloud.google.com/go/gkemulticloud v0.4.0/go.mod h1:E9gxVBnseLWCk24ch+P9+B2CoDFJZTyIgLKSalC7tuI=
-cloud.google.com/go/gkemulticloud v0.5.0/go.mod h1:W0JDkiyi3Tqh0TJr//y19wyb1yf8llHVto2Htf2Ja3Y=
-cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc=
-cloud.google.com/go/gsuiteaddons v1.3.0/go.mod h1:EUNK/J1lZEZO8yPtykKxLXI6JSVN2rg9bN8SXOa0bgM=
-cloud.google.com/go/gsuiteaddons v1.4.0/go.mod h1:rZK5I8hht7u7HxFQcFei0+AtfS9uSushomRlg+3ua1o=
-cloud.google.com/go/gsuiteaddons v1.5.0/go.mod h1:TFCClYLd64Eaa12sFVmUyG62tk4mdIsI7pAnSXRkcFo=
-cloud.google.com/go/iam v0.1.0/go.mod h1:vcUNEa0pEm0qRVpmWepWaFMIAI8/hjB9mO8rNCJtF6c=
-cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY=
-cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc=
-cloud.google.com/go/iam v0.6.0/go.mod h1:+1AH33ueBne5MzYccyMHtEKqLE4/kJOibtffMHDMFMc=
-cloud.google.com/go/iam v0.7.0/go.mod h1:H5Br8wRaDGNc8XP3keLc4unfUUZeyH3Sfl9XpQEYOeg=
-cloud.google.com/go/iam v0.8.0/go.mod h1:lga0/y3iH6CX7sYqypWJ33hf7kkfXJag67naqGESjkE=
-cloud.google.com/go/iam v0.11.0/go.mod h1:9PiLDanza5D+oWFZiH1uG+RnRCfEGKoyl6yo4cgWZGY=
-cloud.google.com/go/iam v0.12.0/go.mod h1:knyHGviacl11zrtZUoDuYpDgLjvr28sLQaG0YB2GYAY=
 cloud.google.com/go/iam v1.1.4 h1:K6n/GZHFTtEoKT5aUG3l9diPi0VduZNQ1PfdnpkkIFk=
 cloud.google.com/go/iam v1.1.4/go.mod h1:l/rg8l1AaA+VFMho/HYx2Vv6xinPSLMF8qfhRPIZ0L8=
-cloud.google.com/go/iap v1.4.0/go.mod h1:RGFwRJdihTINIe4wZ2iCP0zF/qu18ZwyKxrhMhygBEc=
-cloud.google.com/go/iap v1.5.0/go.mod h1:UH/CGgKd4KyohZL5Pt0jSKE4m3FR51qg6FKQ/z/Ix9A=
-cloud.google.com/go/iap v1.6.0/go.mod h1:NSuvI9C/j7UdjGjIde7t7HBz+QTwBcapPE07+sSRcLk=
-cloud.google.com/go/ids v1.1.0/go.mod h1:WIuwCaYVOzHIj2OhN9HAwvW+DBdmUAdcWlFxRl+KubM=
-cloud.google.com/go/ids v1.2.0/go.mod h1:5WXvp4n25S0rA/mQWAg1YEEBBq6/s+7ml1RDCW1IrcY=
-cloud.google.com/go/ids v1.3.0/go.mod h1:JBdTYwANikFKaDP6LtW5JAi4gubs57SVNQjemdt6xV4=
-cloud.google.com/go/iot v1.3.0/go.mod h1:r7RGh2B61+B8oz0AGE+J72AhA0G7tdXItODWsaA2oLs=
-cloud.google.com/go/iot v1.4.0/go.mod h1:dIDxPOn0UvNDUMD8Ger7FIaTuvMkj+aGk94RPP0iV+g=
-cloud.google.com/go/iot v1.5.0/go.mod h1:mpz5259PDl3XJthEmh9+ap0affn/MqNSP4My77Qql9o=
-cloud.google.com/go/kms v1.4.0/go.mod h1:fajBHndQ+6ubNw6Ss2sSd+SWvjL26RNo/dr7uxsnnOA=
-cloud.google.com/go/kms v1.5.0/go.mod h1:QJS2YY0eJGBg3mnDfuaCyLauWwBJiHRboYxJ++1xJNg=
-cloud.google.com/go/kms v1.6.0/go.mod h1:Jjy850yySiasBUDi6KFUwUv2n1+o7QZFyuUJg6OgjA0=
-cloud.google.com/go/kms v1.9.0/go.mod h1:qb1tPTgfF9RQP8e1wq4cLFErVuTJv7UsSC915J8dh3w=
-cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic=
-cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI=
-cloud.google.com/go/language v1.7.0/go.mod h1:DJ6dYN/W+SQOjF8e1hLQXMF21AkH2w9wiPzPCJa2MIE=
-cloud.google.com/go/language v1.8.0/go.mod h1:qYPVHf7SPoNNiCL2Dr0FfEFNil1qi3pQEyygwpgVKB8=
-cloud.google.com/go/language v1.9.0/go.mod h1:Ns15WooPM5Ad/5no/0n81yUetis74g3zrbeJBE+ptUY=
-cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8=
-cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08=
-cloud.google.com/go/lifesciences v0.8.0/go.mod h1:lFxiEOMqII6XggGbOnKiyZ7IBwoIqA84ClvoezaA/bo=
-cloud.google.com/go/logging v1.6.1/go.mod h1:5ZO0mHHbvm8gEmeEUHrmDlTDSu5imF6MUP9OfilNXBw=
-cloud.google.com/go/logging v1.7.0/go.mod h1:3xjP2CjkM3ZkO73aj4ASA5wRPGGCRrPIAeNqVNkzY8M=
-cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
-cloud.google.com/go/longrunning v0.3.0/go.mod h1:qth9Y41RRSUE69rDcOn6DdK3HfQfsUI0YSmW3iIlLJc=
-cloud.google.com/go/longrunning v0.4.1/go.mod h1:4iWDqhBZ70CvZ6BfETbvam3T8FMvLK+eFj0E6AaRQTo=
-cloud.google.com/go/managedidentities v1.3.0/go.mod h1:UzlW3cBOiPrzucO5qWkNkh0w33KFtBJU281hacNvsdE=
-cloud.google.com/go/managedidentities v1.4.0/go.mod h1:NWSBYbEMgqmbZsLIyKvxrYbtqOsxY1ZrGM+9RgDqInM=
-cloud.google.com/go/managedidentities v1.5.0/go.mod h1:+dWcZ0JlUmpuxpIDfyP5pP5y0bLdRwOS4Lp7gMni/LA=
-cloud.google.com/go/maps v0.1.0/go.mod h1:BQM97WGyfw9FWEmQMpZ5T6cpovXXSd1cGmFma94eubI=
-cloud.google.com/go/maps v0.6.0/go.mod h1:o6DAMMfb+aINHz/p/jbcY+mYeXBoZoxTfdSQ8VAJaCw=
-cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4=
-cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w=
-cloud.google.com/go/mediatranslation v0.7.0/go.mod h1:LCnB/gZr90ONOIQLgSXagp8XUW1ODs2UmUMvcgMfI2I=
-cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE=
-cloud.google.com/go/memcache v1.5.0/go.mod h1:dk3fCK7dVo0cUU2c36jKb4VqKPS22BTkf81Xq617aWM=
-cloud.google.com/go/memcache v1.6.0/go.mod h1:XS5xB0eQZdHtTuTF9Hf8eJkKtR3pVRCcvJwtm68T3rA=
-cloud.google.com/go/memcache v1.7.0/go.mod h1:ywMKfjWhNtkQTxrWxCkCFkoPjLHPW6A7WOTVI8xy3LY=
-cloud.google.com/go/memcache v1.9.0/go.mod h1:8oEyzXCu+zo9RzlEaEjHl4KkgjlNDaXbCQeQWlzNFJM=
-cloud.google.com/go/metastore v1.5.0/go.mod h1:2ZNrDcQwghfdtCwJ33nM0+GrBGlVuh8rakL3vdPY3XY=
-cloud.google.com/go/metastore v1.6.0/go.mod h1:6cyQTls8CWXzk45G55x57DVQ9gWg7RiH65+YgPsNh9s=
-cloud.google.com/go/metastore v1.7.0/go.mod h1:s45D0B4IlsINu87/AsWiEVYbLaIMeUSoxlKKDqBGFS8=
-cloud.google.com/go/metastore v1.8.0/go.mod h1:zHiMc4ZUpBiM7twCIFQmJ9JMEkDSyZS9U12uf7wHqSI=
-cloud.google.com/go/metastore v1.10.0/go.mod h1:fPEnH3g4JJAk+gMRnrAnoqyv2lpUCqJPWOodSaf45Eo=
-cloud.google.com/go/monitoring v1.7.0/go.mod h1:HpYse6kkGo//7p6sT0wsIC6IBDET0RhIsnmlA53dvEk=
-cloud.google.com/go/monitoring v1.8.0/go.mod h1:E7PtoMJ1kQXWxPjB6mv2fhC5/15jInuulFdYYtlcvT4=
-cloud.google.com/go/monitoring v1.12.0/go.mod h1:yx8Jj2fZNEkL/GYZyTLS4ZtZEZN8WtDEiEqG4kLK50w=
-cloud.google.com/go/networkconnectivity v1.4.0/go.mod h1:nOl7YL8odKyAOtzNX73/M5/mGZgqqMeryi6UPZTk/rA=
-cloud.google.com/go/networkconnectivity v1.5.0/go.mod h1:3GzqJx7uhtlM3kln0+x5wyFvuVH1pIBJjhCpjzSt75o=
-cloud.google.com/go/networkconnectivity v1.6.0/go.mod h1:OJOoEXW+0LAxHh89nXd64uGG+FbQoeH8DtxCHVOMlaM=
-cloud.google.com/go/networkconnectivity v1.7.0/go.mod h1:RMuSbkdbPwNMQjB5HBWD5MpTBnNm39iAVpC3TmsExt8=
-cloud.google.com/go/networkconnectivity v1.10.0/go.mod h1:UP4O4sWXJG13AqrTdQCD9TnLGEbtNRqjuaaA7bNjF5E=
-cloud.google.com/go/networkmanagement v1.4.0/go.mod h1:Q9mdLLRn60AsOrPc8rs8iNV6OHXaGcDdsIQe1ohekq8=
-cloud.google.com/go/networkmanagement v1.5.0/go.mod h1:ZnOeZ/evzUdUsnvRt792H0uYEnHQEMaz+REhhzJRcf4=
-cloud.google.com/go/networkmanagement v1.6.0/go.mod h1:5pKPqyXjB/sgtvB5xqOemumoQNB7y95Q7S+4rjSOPYY=
-cloud.google.com/go/networksecurity v0.5.0/go.mod h1:xS6fOCoqpVC5zx15Z/MqkfDwH4+m/61A3ODiDV1xmiQ=
-cloud.google.com/go/networksecurity v0.6.0/go.mod h1:Q5fjhTr9WMI5mbpRYEbiexTzROf7ZbDzvzCrNl14nyU=
-cloud.google.com/go/networksecurity v0.7.0/go.mod h1:mAnzoxx/8TBSyXEeESMy9OOYwo1v+gZ5eMRnsT5bC8k=
-cloud.google.com/go/notebooks v1.2.0/go.mod h1:9+wtppMfVPUeJ8fIWPOq1UnATHISkGXGqTkxeieQ6UY=
-cloud.google.com/go/notebooks v1.3.0/go.mod h1:bFR5lj07DtCPC7YAAJ//vHskFBxA5JzYlH68kXVdk34=
-cloud.google.com/go/notebooks v1.4.0/go.mod h1:4QPMngcwmgb6uw7Po99B2xv5ufVoIQ7nOGDyL4P8AgA=
-cloud.google.com/go/notebooks v1.5.0/go.mod h1:q8mwhnP9aR8Hpfnrc5iN5IBhrXUy8S2vuYs+kBJ/gu0=
-cloud.google.com/go/notebooks v1.7.0/go.mod h1:PVlaDGfJgj1fl1S3dUwhFMXFgfYGhYQt2164xOMONmE=
-cloud.google.com/go/optimization v1.1.0/go.mod h1:5po+wfvX5AQlPznyVEZjGJTMr4+CAkJf2XSTQOOl9l4=
-cloud.google.com/go/optimization v1.2.0/go.mod h1:Lr7SOHdRDENsh+WXVmQhQTrzdu9ybg0NecjHidBq6xs=
-cloud.google.com/go/optimization v1.3.1/go.mod h1:IvUSefKiwd1a5p0RgHDbWCIbDFgKuEdB+fPPuP0IDLI=
-cloud.google.com/go/orchestration v1.3.0/go.mod h1:Sj5tq/JpWiB//X/q3Ngwdl5K7B7Y0KZ7bfv0wL6fqVA=
-cloud.google.com/go/orchestration v1.4.0/go.mod h1:6W5NLFWs2TlniBphAViZEVhrXRSMgUGDfW7vrWKvsBk=
-cloud.google.com/go/orchestration v1.6.0/go.mod h1:M62Bevp7pkxStDfFfTuCOaXgaaqRAga1yKyoMtEoWPQ=
-cloud.google.com/go/orgpolicy v1.4.0/go.mod h1:xrSLIV4RePWmP9P3tBl8S93lTmlAxjm06NSm2UTmKvE=
-cloud.google.com/go/orgpolicy v1.5.0/go.mod h1:hZEc5q3wzwXJaKrsx5+Ewg0u1LxJ51nNFlext7Tanwc=
-cloud.google.com/go/orgpolicy v1.10.0/go.mod h1:w1fo8b7rRqlXlIJbVhOMPrwVljyuW5mqssvBtU18ONc=
-cloud.google.com/go/osconfig v1.7.0/go.mod h1:oVHeCeZELfJP7XLxcBGTMBvRO+1nQ5tFG9VQTmYS2Fs=
-cloud.google.com/go/osconfig v1.8.0/go.mod h1:EQqZLu5w5XA7eKizepumcvWx+m8mJUhEwiPqWiZeEdg=
-cloud.google.com/go/osconfig v1.9.0/go.mod h1:Yx+IeIZJ3bdWmzbQU4fxNl8xsZ4amB+dygAwFPlvnNo=
-cloud.google.com/go/osconfig v1.10.0/go.mod h1:uMhCzqC5I8zfD9zDEAfvgVhDS8oIjySWh+l4WK6GnWw=
-cloud.google.com/go/osconfig v1.11.0/go.mod h1:aDICxrur2ogRd9zY5ytBLV89KEgT2MKB2L/n6x1ooPw=
-cloud.google.com/go/oslogin v1.4.0/go.mod h1:YdgMXWRaElXz/lDk1Na6Fh5orF7gvmJ0FGLIs9LId4E=
-cloud.google.com/go/oslogin v1.5.0/go.mod h1:D260Qj11W2qx/HVF29zBg+0fd6YCSjSqLUkY/qEenQU=
-cloud.google.com/go/oslogin v1.6.0/go.mod h1:zOJ1O3+dTU8WPlGEkFSh7qeHPPSoxrcMbbK1Nm2iX70=
-cloud.google.com/go/oslogin v1.7.0/go.mod h1:e04SN0xO1UNJ1M5GP0vzVBFicIe4O53FOfcixIqTyXo=
-cloud.google.com/go/oslogin v1.9.0/go.mod h1:HNavntnH8nzrn8JCTT5fj18FuJLFJc4NaZJtBnQtKFs=
-cloud.google.com/go/phishingprotection v0.5.0/go.mod h1:Y3HZknsK9bc9dMi+oE8Bim0lczMU6hrX0UpADuMefr0=
-cloud.google.com/go/phishingprotection v0.6.0/go.mod h1:9Y3LBLgy0kDTcYET8ZH3bq/7qni15yVUoAxiFxnlSUA=
-cloud.google.com/go/phishingprotection v0.7.0/go.mod h1:8qJI4QKHoda/sb/7/YmMQ2omRLSLYSu9bU0EKCNI+Lk=
-cloud.google.com/go/policytroubleshooter v1.3.0/go.mod h1:qy0+VwANja+kKrjlQuOzmlvscn4RNsAc0e15GGqfMxg=
-cloud.google.com/go/policytroubleshooter v1.4.0/go.mod h1:DZT4BcRw3QoO8ota9xw/LKtPa8lKeCByYeKTIf/vxdE=
-cloud.google.com/go/policytroubleshooter v1.5.0/go.mod h1:Rz1WfV+1oIpPdN2VvvuboLVRsB1Hclg3CKQ53j9l8vw=
-cloud.google.com/go/privatecatalog v0.5.0/go.mod h1:XgosMUvvPyxDjAVNDYxJ7wBW8//hLDDYmnsNcMGq1K0=
-cloud.google.com/go/privatecatalog v0.6.0/go.mod h1:i/fbkZR0hLN29eEWiiwue8Pb+GforiEIBnV9yrRUOKI=
-cloud.google.com/go/privatecatalog v0.7.0/go.mod h1:2s5ssIFO69F5csTXcwBP7NPFTZvps26xGzvQ2PQaBYg=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
 cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
 cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
-cloud.google.com/go/pubsub v1.26.0/go.mod h1:QgBH3U/jdJy/ftjPhTkyXNj543Tin1pRYcdcPRnFIRI=
-cloud.google.com/go/pubsub v1.27.1/go.mod h1:hQN39ymbV9geqBnfQq6Xf63yNhUAhv9CZhzp5O6qsW0=
-cloud.google.com/go/pubsub v1.28.0/go.mod h1:vuXFpwaVoIPQMGXqRyUQigu/AX1S3IWugR9xznmcXX8=
-cloud.google.com/go/pubsublite v1.5.0/go.mod h1:xapqNQ1CuLfGi23Yda/9l4bBCKz/wC3KIJ5gKcxveZg=
-cloud.google.com/go/pubsublite v1.6.0/go.mod h1:1eFCS0U11xlOuMFV/0iBqw3zP12kddMeCbj/F3FSj9k=
-cloud.google.com/go/recaptchaenterprise v1.3.1/go.mod h1:OdD+q+y4XGeAlxRaMn1Y7/GveP6zmq76byL6tjPE7d4=
-cloud.google.com/go/recaptchaenterprise/v2 v2.1.0/go.mod h1:w9yVqajwroDNTfGuhmOjPDN//rZGySaf6PtFVcSCa7o=
-cloud.google.com/go/recaptchaenterprise/v2 v2.2.0/go.mod h1:/Zu5jisWGeERrd5HnlS3EUGb/D335f9k51B/FVil0jk=
-cloud.google.com/go/recaptchaenterprise/v2 v2.3.0/go.mod h1:O9LwGCjrhGHBQET5CA7dd5NwwNQUErSgEDit1DLNTdo=
-cloud.google.com/go/recaptchaenterprise/v2 v2.4.0/go.mod h1:Am3LHfOuBstrLrNCBrlI5sbwx9LBg3te2N6hGvHn2mE=
-cloud.google.com/go/recaptchaenterprise/v2 v2.5.0/go.mod h1:O8LzcHXN3rz0j+LBC91jrwI3R+1ZSZEWrfL7XHgNo9U=
-cloud.google.com/go/recaptchaenterprise/v2 v2.6.0/go.mod h1:RPauz9jeLtB3JVzg6nCbe12qNoaa8pXc4d/YukAmcnA=
-cloud.google.com/go/recommendationengine v0.5.0/go.mod h1:E5756pJcVFeVgaQv3WNpImkFP8a+RptV6dDLGPILjvg=
-cloud.google.com/go/recommendationengine v0.6.0/go.mod h1:08mq2umu9oIqc7tDy8sx+MNJdLG0fUi3vaSVbztHgJ4=
-cloud.google.com/go/recommendationengine v0.7.0/go.mod h1:1reUcE3GIu6MeBz/h5xZJqNLuuVjNg1lmWMPyjatzac=
-cloud.google.com/go/recommender v1.5.0/go.mod h1:jdoeiBIVrJe9gQjwd759ecLJbxCDED4A6p+mqoqDvTg=
-cloud.google.com/go/recommender v1.6.0/go.mod h1:+yETpm25mcoiECKh9DEScGzIRyDKpZ0cEhWGo+8bo+c=
-cloud.google.com/go/recommender v1.7.0/go.mod h1:XLHs/W+T8olwlGOgfQenXBTbIseGclClff6lhFVe9Bs=
-cloud.google.com/go/recommender v1.8.0/go.mod h1:PkjXrTT05BFKwxaUxQmtIlrtj0kph108r02ZZQ5FE70=
-cloud.google.com/go/recommender v1.9.0/go.mod h1:PnSsnZY7q+VL1uax2JWkt/UegHssxjUVVCrX52CuEmQ=
-cloud.google.com/go/redis v1.7.0/go.mod h1:V3x5Jq1jzUcg+UNsRvdmsfuFnit1cfe3Z/PGyq/lm4Y=
-cloud.google.com/go/redis v1.8.0/go.mod h1:Fm2szCDavWzBk2cDKxrkmWBqoCiL1+Ctwq7EyqBCA/A=
-cloud.google.com/go/redis v1.9.0/go.mod h1:HMYQuajvb2D0LvMgZmLDZW8V5aOC/WxstZHiy4g8OiA=
-cloud.google.com/go/redis v1.10.0/go.mod h1:ThJf3mMBQtW18JzGgh41/Wld6vnDDc/F/F35UolRZPM=
-cloud.google.com/go/redis v1.11.0/go.mod h1:/X6eicana+BWcUda5PpwZC48o37SiFVTFSs0fWAJ7uQ=
-cloud.google.com/go/resourcemanager v1.3.0/go.mod h1:bAtrTjZQFJkiWTPDb1WBjzvc6/kifjj4QBYuKCCoqKA=
-cloud.google.com/go/resourcemanager v1.4.0/go.mod h1:MwxuzkumyTX7/a3n37gmsT3py7LIXwrShilPh3P1tR0=
-cloud.google.com/go/resourcemanager v1.5.0/go.mod h1:eQoXNAiAvCf5PXxWxXjhKQoTMaUSNrEfg+6qdf/wots=
-cloud.google.com/go/resourcesettings v1.3.0/go.mod h1:lzew8VfESA5DQ8gdlHwMrqZs1S9V87v3oCnKCWoOuQU=
-cloud.google.com/go/resourcesettings v1.4.0/go.mod h1:ldiH9IJpcrlC3VSuCGvjR5of/ezRrOxFtpJoJo5SmXg=
-cloud.google.com/go/resourcesettings v1.5.0/go.mod h1:+xJF7QSG6undsQDfsCJyqWXyBwUoJLhetkRMDRnIoXA=
-cloud.google.com/go/retail v1.8.0/go.mod h1:QblKS8waDmNUhghY2TI9O3JLlFk8jybHeV4BF19FrE4=
-cloud.google.com/go/retail v1.9.0/go.mod h1:g6jb6mKuCS1QKnH/dpu7isX253absFl6iE92nHwlBUY=
-cloud.google.com/go/retail v1.10.0/go.mod h1:2gDk9HsL4HMS4oZwz6daui2/jmKvqShXKQuB2RZ+cCc=
-cloud.google.com/go/retail v1.11.0/go.mod h1:MBLk1NaWPmh6iVFSz9MeKG/Psyd7TAgm6y/9L2B4x9Y=
-cloud.google.com/go/retail v1.12.0/go.mod h1:UMkelN/0Z8XvKymXFbD4EhFJlYKRx1FGhQkVPU5kF14=
-cloud.google.com/go/run v0.2.0/go.mod h1:CNtKsTA1sDcnqqIFR3Pb5Tq0usWxJJvsWOCPldRU3Do=
-cloud.google.com/go/run v0.3.0/go.mod h1:TuyY1+taHxTjrD0ZFk2iAR+xyOXEA0ztb7U3UNA0zBo=
-cloud.google.com/go/run v0.8.0/go.mod h1:VniEnuBwqjigv0A7ONfQUaEItaiCRVujlMqerPPiktM=
-cloud.google.com/go/scheduler v1.4.0/go.mod h1:drcJBmxF3aqZJRhmkHQ9b3uSSpQoltBPGPxGAWROx6s=
-cloud.google.com/go/scheduler v1.5.0/go.mod h1:ri073ym49NW3AfT6DZi21vLZrG07GXr5p3H1KxN5QlI=
-cloud.google.com/go/scheduler v1.6.0/go.mod h1:SgeKVM7MIwPn3BqtcBntpLyrIJftQISRrYB5ZtT+KOk=
-cloud.google.com/go/scheduler v1.7.0/go.mod h1:jyCiBqWW956uBjjPMMuX09n3x37mtyPJegEWKxRsn44=
-cloud.google.com/go/scheduler v1.8.0/go.mod h1:TCET+Y5Gp1YgHT8py4nlg2Sew8nUHMqcpousDgXJVQc=
-cloud.google.com/go/secretmanager v1.6.0/go.mod h1:awVa/OXF6IiyaU1wQ34inzQNc4ISIDIrId8qE5QGgKA=
-cloud.google.com/go/secretmanager v1.8.0/go.mod h1:hnVgi/bN5MYHd3Gt0SPuTPPp5ENina1/LxM+2W9U9J4=
-cloud.google.com/go/secretmanager v1.9.0/go.mod h1:b71qH2l1yHmWQHt9LC80akm86mX8AL6X1MA01dW8ht4=
-cloud.google.com/go/secretmanager v1.10.0/go.mod h1:MfnrdvKMPNra9aZtQFvBcvRU54hbPD8/HayQdlUgJpU=
-cloud.google.com/go/security v1.5.0/go.mod h1:lgxGdyOKKjHL4YG3/YwIL2zLqMFCKs0UbQwgyZmfJl4=
-cloud.google.com/go/security v1.7.0/go.mod h1:mZklORHl6Bg7CNnnjLH//0UlAlaXqiG7Lb9PsPXLfD0=
-cloud.google.com/go/security v1.8.0/go.mod h1:hAQOwgmaHhztFhiQ41CjDODdWP0+AE1B3sX4OFlq+GU=
-cloud.google.com/go/security v1.9.0/go.mod h1:6Ta1bO8LXI89nZnmnsZGp9lVoVWXqsVbIq/t9dzI+2Q=
-cloud.google.com/go/security v1.10.0/go.mod h1:QtOMZByJVlibUT2h9afNDWRZ1G96gVywH8T5GUSb9IA=
-cloud.google.com/go/security v1.12.0/go.mod h1:rV6EhrpbNHrrxqlvW0BWAIawFWq3X90SduMJdFwtLB8=
-cloud.google.com/go/securitycenter v1.13.0/go.mod h1:cv5qNAqjY84FCN6Y9z28WlkKXyWsgLO832YiWwkCWcU=
-cloud.google.com/go/securitycenter v1.14.0/go.mod h1:gZLAhtyKv85n52XYWt6RmeBdydyxfPeTrpToDPw4Auc=
-cloud.google.com/go/securitycenter v1.15.0/go.mod h1:PeKJ0t8MoFmmXLXWm41JidyzI3PJjd8sXWaVqg43WWk=
-cloud.google.com/go/securitycenter v1.16.0/go.mod h1:Q9GMaLQFUD+5ZTabrbujNWLtSLZIZF7SAR0wWECrjdk=
-cloud.google.com/go/securitycenter v1.18.1/go.mod h1:0/25gAzCM/9OL9vVx4ChPeM/+DlfGQJDwBy/UC8AKK0=
-cloud.google.com/go/servicecontrol v1.4.0/go.mod h1:o0hUSJ1TXJAmi/7fLJAedOovnujSEvjKCAFNXPQ1RaU=
-cloud.google.com/go/servicecontrol v1.5.0/go.mod h1:qM0CnXHhyqKVuiZnGKrIurvVImCs8gmqWsDoqe9sU1s=
-cloud.google.com/go/servicecontrol v1.11.0/go.mod h1:kFmTzYzTUIuZs0ycVqRHNaNhgR+UMUpw9n02l/pY+mc=
-cloud.google.com/go/servicedirectory v1.4.0/go.mod h1:gH1MUaZCgtP7qQiI+F+A+OpeKF/HQWgtAddhTbhL2bs=
-cloud.google.com/go/servicedirectory v1.5.0/go.mod h1:QMKFL0NUySbpZJ1UZs3oFAmdvVxhhxB6eJ/Vlp73dfg=
-cloud.google.com/go/servicedirectory v1.6.0/go.mod h1:pUlbnWsLH9c13yGkxCmfumWEPjsRs1RlmJ4pqiNjVL4=
-cloud.google.com/go/servicedirectory v1.7.0/go.mod h1:5p/U5oyvgYGYejufvxhgwjL8UVXjkuw7q5XcG10wx1U=
-cloud.google.com/go/servicedirectory v1.8.0/go.mod h1:srXodfhY1GFIPvltunswqXpVxFPpZjf8nkKQT7XcXaY=
-cloud.google.com/go/servicemanagement v1.4.0/go.mod h1:d8t8MDbezI7Z2R1O/wu8oTggo3BI2GKYbdG4y/SJTco=
-cloud.google.com/go/servicemanagement v1.5.0/go.mod h1:XGaCRe57kfqu4+lRxaFEAuqmjzF0r+gWHjWqKqBvKFo=
-cloud.google.com/go/servicemanagement v1.6.0/go.mod h1:aWns7EeeCOtGEX4OvZUWCCJONRZeFKiptqKf1D0l/Jc=
-cloud.google.com/go/serviceusage v1.3.0/go.mod h1:Hya1cozXM4SeSKTAgGXgj97GlqUvF5JaoXacR1JTP/E=
-cloud.google.com/go/serviceusage v1.4.0/go.mod h1:SB4yxXSaYVuUBYUml6qklyONXNLt83U0Rb+CXyhjEeU=
-cloud.google.com/go/serviceusage v1.5.0/go.mod h1:w8U1JvqUqwJNPEOTQjrMHkw3IaIFLoLsPLvsE3xueec=
-cloud.google.com/go/shell v1.3.0/go.mod h1:VZ9HmRjZBsjLGXusm7K5Q5lzzByZmJHf1d0IWHEN5X4=
-cloud.google.com/go/shell v1.4.0/go.mod h1:HDxPzZf3GkDdhExzD/gs8Grqk+dmYcEjGShZgYa9URw=
-cloud.google.com/go/shell v1.6.0/go.mod h1:oHO8QACS90luWgxP3N9iZVuEiSF84zNyLytb+qE2f9A=
-cloud.google.com/go/spanner v1.41.0/go.mod h1:MLYDBJR/dY4Wt7ZaMIQ7rXOTLjYrmxLE/5ve9vFfWos=
-cloud.google.com/go/spanner v1.44.0/go.mod h1:G8XIgYdOK+Fbcpbs7p2fiprDw4CaZX63whnSMLVBxjk=
-cloud.google.com/go/speech v1.6.0/go.mod h1:79tcr4FHCimOp56lwC01xnt/WPJZc4v3gzyT7FoBkCM=
-cloud.google.com/go/speech v1.7.0/go.mod h1:KptqL+BAQIhMsj1kOP2la5DSEEerPDuOP/2mmkhHhZQ=
-cloud.google.com/go/speech v1.8.0/go.mod h1:9bYIl1/tjsAnMgKGHKmBZzXKEkGgtU+MpdDPTE9f7y0=
-cloud.google.com/go/speech v1.9.0/go.mod h1:xQ0jTcmnRFFM2RfX/U+rk6FQNUF6DQlydUSyoooSpco=
-cloud.google.com/go/speech v1.14.1/go.mod h1:gEosVRPJ9waG7zqqnsHpYTOoAS4KouMRLDFMekpJ0J0=
 cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
 cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y=
-cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc=
-cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s=
-cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y=
 cloud.google.com/go/storage v1.30.1 h1:uOdMxAs8HExqBlnLtnQyP0YkvbiDpdGShGKtx6U/oNM=
 cloud.google.com/go/storage v1.30.1/go.mod h1:NfxhC0UJE1aXSx7CIIbCf7y9HKT7BiccwkR7+P7gN8E=
-cloud.google.com/go/storagetransfer v1.5.0/go.mod h1:dxNzUopWy7RQevYFHewchb29POFv3/AaBgnhqzqiK0w=
-cloud.google.com/go/storagetransfer v1.6.0/go.mod h1:y77xm4CQV/ZhFZH75PLEXY0ROiS7Gh6pSKrM8dJyg6I=
-cloud.google.com/go/storagetransfer v1.7.0/go.mod h1:8Giuj1QNb1kfLAiWM1bN6dHzfdlDAVC9rv9abHot2W4=
-cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw=
-cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g=
-cloud.google.com/go/talent v1.3.0/go.mod h1:CmcxwJ/PKfRgd1pBjQgU6W3YBwiewmUzQYH5HHmSCmM=
-cloud.google.com/go/talent v1.4.0/go.mod h1:ezFtAgVuRf8jRsvyE6EwmbTK5LKciD4KVnHuDEFmOOA=
-cloud.google.com/go/talent v1.5.0/go.mod h1:G+ODMj9bsasAEJkQSzO2uHQWXHHXUomArjWQQYkqK6c=
-cloud.google.com/go/texttospeech v1.4.0/go.mod h1:FX8HQHA6sEpJ7rCMSfXuzBcysDAuWusNNNvN9FELDd8=
-cloud.google.com/go/texttospeech v1.5.0/go.mod h1:oKPLhR4n4ZdQqWKURdwxMy0uiTS1xU161C8W57Wkea4=
-cloud.google.com/go/texttospeech v1.6.0/go.mod h1:YmwmFT8pj1aBblQOI3TfKmwibnsfvhIBzPXcW4EBovc=
-cloud.google.com/go/tpu v1.3.0/go.mod h1:aJIManG0o20tfDQlRIej44FcwGGl/cD0oiRyMKG19IQ=
-cloud.google.com/go/tpu v1.4.0/go.mod h1:mjZaX8p0VBgllCzF6wcU2ovUXN9TONFLd7iz227X2Xg=
-cloud.google.com/go/tpu v1.5.0/go.mod h1:8zVo1rYDFuW2l4yZVY0R0fb/v44xLh3llq7RuV61fPM=
-cloud.google.com/go/trace v1.3.0/go.mod h1:FFUE83d9Ca57C+K8rDl/Ih8LwOzWIV1krKgxg6N0G28=
-cloud.google.com/go/trace v1.4.0/go.mod h1:UG0v8UBqzusp+z63o7FK74SdFE+AXpCLdFb1rshXG+Y=
-cloud.google.com/go/trace v1.8.0/go.mod h1:zH7vcsbAhklH8hWFig58HvxcxyQbaIqMarMg9hn5ECA=
-cloud.google.com/go/translate v1.3.0/go.mod h1:gzMUwRjvOqj5i69y/LYLd8RrNQk+hOmIXTi9+nb3Djs=
-cloud.google.com/go/translate v1.4.0/go.mod h1:06Dn/ppvLD6WvA5Rhdp029IX2Mi3Mn7fpMRLPvXT5Wg=
-cloud.google.com/go/translate v1.6.0/go.mod h1:lMGRudH1pu7I3n3PETiOB2507gf3HnfLV8qlkHZEyos=
-cloud.google.com/go/video v1.8.0/go.mod h1:sTzKFc0bUSByE8Yoh8X0mn8bMymItVGPfTuUBUyRgxk=
-cloud.google.com/go/video v1.9.0/go.mod h1:0RhNKFRF5v92f8dQt0yhaHrEuH95m068JYOvLZYnJSw=
-cloud.google.com/go/video v1.13.0/go.mod h1:ulzkYlYgCp15N2AokzKjy7MQ9ejuynOJdf1tR5lGthk=
-cloud.google.com/go/videointelligence v1.6.0/go.mod h1:w0DIDlVRKtwPCn/C4iwZIJdvC69yInhW0cfi+p546uU=
-cloud.google.com/go/videointelligence v1.7.0/go.mod h1:k8pI/1wAhjznARtVT9U1llUaFNPh7muw8QyOUpavru4=
-cloud.google.com/go/videointelligence v1.8.0/go.mod h1:dIcCn4gVDdS7yte/w+koiXn5dWVplOZkE+xwG9FgK+M=
-cloud.google.com/go/videointelligence v1.9.0/go.mod h1:29lVRMPDYHikk3v8EdPSaL8Ku+eMzDljjuvRs105XoU=
-cloud.google.com/go/videointelligence v1.10.0/go.mod h1:LHZngX1liVtUhZvi2uNS0VQuOzNi2TkY1OakiuoUOjU=
-cloud.google.com/go/vision v1.2.0/go.mod h1:SmNwgObm5DpFBme2xpyOyasvBc1aPdjvMk2bBk0tKD0=
-cloud.google.com/go/vision/v2 v2.2.0/go.mod h1:uCdV4PpN1S0jyCyq8sIM42v2Y6zOLkZs+4R9LrGYwFo=
-cloud.google.com/go/vision/v2 v2.3.0/go.mod h1:UO61abBx9QRMFkNBbf1D8B1LXdS2cGiiCRx0vSpZoUo=
-cloud.google.com/go/vision/v2 v2.4.0/go.mod h1:VtI579ll9RpVTrdKdkMzckdnwMyX2JILb+MhPqRbPsY=
-cloud.google.com/go/vision/v2 v2.5.0/go.mod h1:MmaezXOOE+IWa+cS7OhRRLK2cNv1ZL98zhqFFZaaH2E=
-cloud.google.com/go/vision/v2 v2.6.0/go.mod h1:158Hes0MvOS9Z/bDMSFpjwsUrZ5fPrdwuyyvKSGAGMY=
-cloud.google.com/go/vmmigration v1.2.0/go.mod h1:IRf0o7myyWFSmVR1ItrBSFLFD/rJkfDCUTO4vLlJvsE=
-cloud.google.com/go/vmmigration v1.3.0/go.mod h1:oGJ6ZgGPQOFdjHuocGcLqX4lc98YQ7Ygq8YQwHh9A7g=
-cloud.google.com/go/vmmigration v1.5.0/go.mod h1:E4YQ8q7/4W9gobHjQg4JJSgXXSgY21nA5r8swQV+Xxc=
-cloud.google.com/go/vmwareengine v0.1.0/go.mod h1:RsdNEf/8UDvKllXhMz5J40XxDrNJNN4sagiox+OI208=
-cloud.google.com/go/vmwareengine v0.2.2/go.mod h1:sKdctNJxb3KLZkE/6Oui94iw/xs9PRNC2wnNLXsHvH8=
-cloud.google.com/go/vpcaccess v1.4.0/go.mod h1:aQHVbTWDYUR1EbTApSVvMq1EnT57ppDmQzZ3imqIk4w=
-cloud.google.com/go/vpcaccess v1.5.0/go.mod h1:drmg4HLk9NkZpGfCmZ3Tz0Bwnm2+DKqViEpeEpOq0m8=
-cloud.google.com/go/vpcaccess v1.6.0/go.mod h1:wX2ILaNhe7TlVa4vC5xce1bCnqE3AeH27RV31lnmZes=
-cloud.google.com/go/webrisk v1.4.0/go.mod h1:Hn8X6Zr+ziE2aNd8SliSDWpEnSS1u4R9+xXZmFiHmGE=
-cloud.google.com/go/webrisk v1.5.0/go.mod h1:iPG6fr52Tv7sGk0H6qUFzmL3HHZev1htXuWDEEsqMTg=
-cloud.google.com/go/webrisk v1.6.0/go.mod h1:65sW9V9rOosnc9ZY7A7jsy1zoHS5W9IAXv6dGqhMQMc=
-cloud.google.com/go/webrisk v1.7.0/go.mod h1:mVMHgEYH0r337nmt1JyLthzMr6YxwN1aAIEc2fTcq7A=
-cloud.google.com/go/webrisk v1.8.0/go.mod h1:oJPDuamzHXgUc+b8SiHRcVInZQuybnvEW72PqTc7sSg=
-cloud.google.com/go/websecurityscanner v1.3.0/go.mod h1:uImdKm2wyeXQevQJXeh8Uun/Ym1VqworNDlBXQevGMo=
-cloud.google.com/go/websecurityscanner v1.4.0/go.mod h1:ebit/Fp0a+FWu5j4JOmJEV8S8CzdTkAS77oDsiSqYWQ=
-cloud.google.com/go/websecurityscanner v1.5.0/go.mod h1:Y6xdCPy81yi0SQnDY1xdNTNpfY1oAgXUlcfN3B3eSng=
-cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1Vwf+KmJENM0=
-cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M=
-cloud.google.com/go/workflows v1.8.0/go.mod h1:ysGhmEajwZxGn1OhGOGKsTXc5PyxOc0vfKf5Af+to4M=
-cloud.google.com/go/workflows v1.9.0/go.mod h1:ZGkj1aFIOd9c8Gerkjjq7OW7I5+l6cSvT3ujaO/WwSA=
-cloud.google.com/go/workflows v1.10.0/go.mod h1:fZ8LmRmZQWacon9UCX1r/g/DfAXx5VcPALq2CxzdePw=
 contrib.go.opencensus.io/exporter/stackdriver v0.12.6/go.mod h1:8x999/OcIPy5ivx/wDiV7Gx4D+VUPODf0mWRGRc5kSk=
 contrib.go.opencensus.io/exporter/stackdriver v0.13.4/go.mod h1:aXENhDJ1Y4lIg4EUaVTwzvYETVNZk10Pu26tevFKLUc=
 contrib.go.opencensus.io/exporter/stackdriver v0.13.5 h1:TNaexHK16gPUoc7uzELKOU7JULqccn1NDuqUxmxSqfo=
@@ -543,40 +71,34 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7
 filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
 filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek=
 filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
-gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
-git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc=
 github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs=
 github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4=
 github.com/99designs/keyring v1.2.1 h1:tYLp1ULvO7i3fI5vE21ReQuj99QFSs7lGm0xWyJo87o=
 github.com/99designs/keyring v1.2.1/go.mod h1:fc+wB5KTk9wQ9sDx0kFXB3A0MaeGHM9AwRStKOQ5vOA=
-github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 h1:EKPd1INOIyr5hWOWhvpmQpY6tKjeG0hT1s3AMC/9fic=
-github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1/go.mod h1:VzwV+t+dZ9j/H867F1M2ziD+yLHtB46oM35FxxMJ4d0=
+github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU=
+github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
 github.com/AlekSi/pointer v1.1.0 h1:SSDMPcXD9jSl8FPy9cRzoRaMJtm9g9ggGTxecRUbQoI=
 github.com/AlekSi/pointer v1.1.0/go.mod h1:y7BvfRI3wXPWKXEBhU71nbnIEEZX0QTSB2Bj48UJIZE=
 github.com/AndreasBriese/bbloom v0.0.0-20180913140656-343706a395b7/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/Azure/azure-sdk-for-go v65.0.0+incompatible h1:HzKLt3kIwMm4KeJYTdx9EbjRYTySD/t8i1Ee/W5EGXw=
-github.com/Azure/azure-sdk-for-go v65.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.8.0 h1:9kDVnTz3vbfweTqAUmk/a/pH5pWFCHtvRpHYC0G/dcA=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.8.0/go.mod h1:3Ug6Qzto9anB6mGlEdgYMDF5zHQ+wwhEaYR4s17PHMw=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 h1:BMAjVKJM0U/CYF27gA0ZMmXGkOcvfFtD0oHVZ1TIPRI=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0/go.mod h1:1fXstnBMas5kzG+S3q8UoJcmyU6nUeunJcMDHcRYHhs=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 h1:sXr+ck84g/ZlZUOZiNELInmMgOsuGwdjjVkEIde0OtY=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0/go.mod h1:okt5dMMTOFjX/aovMlrjvvXoPMBVSPzk9185BT0+eZM=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v4 v4.2.1 h1:UPeCRD+XY7QlaGQte2EVI2iOcWvUYA2XY8w5T/8v0NQ=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v4 v4.2.1/go.mod h1:oGV6NlB0cvi1ZbYRR2UN44QHxWFyGk+iylgD0qaMXjA=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork v1.1.0 h1:QM6sE5k2ZT/vI5BEe0r7mqjsUSnhVBFbOsVkEuaEfiA=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v2 v2.2.1 h1:bWh0Z2rOEDfB/ywv/l0iHN1JgyazE6kW/aIA89+CEK0=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v2 v2.2.1/go.mod h1:Bzf34hhAE9NSxailk8xVeLEZbUjOXcC+GnU1mMKdhLw=
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
-github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
-github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
-github.com/Azure/go-autorest/autorest v0.11.28 h1:ndAExarwr5Y+GaHE6VCaY1kyS/HwwGGyuimVhWsHOEM=
-github.com/Azure/go-autorest/autorest v0.11.28/go.mod h1:MrkzG3Y3AH668QyF9KRk5neJnGgmhQ6krbhR8Q5eMvA=
-github.com/Azure/go-autorest/autorest/adal v0.9.22 h1:/GblQdIudfEM3AWWZ0mrYJQSd7JS4S/Mbzh6F0ov0Xc=
-github.com/Azure/go-autorest/autorest/adal v0.9.22/go.mod h1:XuAbAEUv2Tta//+voMI038TrJBqjKam0me7qR+L8Cmk=
-github.com/Azure/go-autorest/autorest/date v0.3.0 h1:7gUk1U5M/CQbp9WoqinNzJar+8KY+LPI6wiWrP/myHw=
-github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74=
-github.com/Azure/go-autorest/autorest/to v0.4.0 h1:oXVqrxakqqV1UZdSazDOPOLvOIz+XA683u8EctwboHk=
-github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE=
-github.com/Azure/go-autorest/autorest/validation v0.3.1 h1:AgyqjAd94fwNAoTjl/WQXg4VvFeRFpO+UhNyRXqF1ac=
-github.com/Azure/go-autorest/autorest/validation v0.3.1/go.mod h1:yhLgjC0Wda5DYXl6JAsWyUe4KVNffhoDhG0zVzUMo3E=
-github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+ZtXWSmf4Tg=
-github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
-github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo=
-github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
 github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8=
 github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1 h1:WpB/QDNLpMw72xHJc34BNNykqSOeEJDAWkhf0u12/Jk=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak=
 github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
@@ -598,7 +120,6 @@ github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo
 github.com/GeertJohan/go.rice v1.0.0/go.mod h1:eH6gbSOAUv07dQuZVnBmoDP8mgsM1rtixis4Tib9if0=
 github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM=
 github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo=
-github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk=
 github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
 github.com/K-Phoen/grabana v0.21.17 h1:mO/9DvJWC/qpTF/X5jQDm5eKgCBaCGypP/tEfXAvKfg=
 github.com/K-Phoen/grabana v0.21.17/go.mod h1:vbASQt9UiQhX4lC3/opLpJMJ8m+hsTUU2FwkQMytHK4=
@@ -628,12 +149,7 @@ github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrd
 github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
 github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
 github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
-github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9/go.mod h1:JynElWSGnm/4RlzPXRlREEwqTHAN3T56Bv2ITsFT3gY=
-github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19/go.mod h1:T13YZdzov6OU0A1+RfKZiZN9ca6VeKdBdyDV+BY97Tk=
-github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
-github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b/go.mod h1:1KcenG0jGWcpt8ov532z81sp/kMMUG485J2InIOyADM=
 github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
-github.com/alecthomas/kingpin/v2 v2.3.1/go.mod h1:oYL5vtsvEHZGHxU7DMp32Dvx+qL+ptGn6lWaot2vCNE=
 github.com/alecthomas/participle/v2 v2.0.0-alpha7 h1:cK4vjj0VSgb3lN1nuKA5F7dw+1s1pWBe5bx7nNCnN+c=
 github.com/alecthomas/participle/v2 v2.0.0-alpha7/go.mod h1:NumScqsC42o9x+dGj8/YqsIfhrIQjFEOFovxotbBirA=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -650,10 +166,7 @@ github.com/allegro/bigcache v1.2.1 h1:hg1sY1raCwic3Vnsvje6TT7/pnZba83LeFck5NrFKS
 github.com/allegro/bigcache v1.2.1/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
 github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 h1:MzBOUgng9orim59UnfUTLRjMpd09C5uEVQ6RPGeCaVI=
 github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129/go.mod h1:rFgpPQZYZ8vdbc+48xibu8ALc3yeyd64IhHS+PU6Yyg=
-github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0Ih0vcRo/gZ1M0=
-github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
@@ -670,10 +183,9 @@ github.com/avast/retry-go/v4 v4.5.1 h1:AxIx0HGi4VZ3I02jr78j5lZ3M6x1E0Ivxa6b0pUUh
 github.com/avast/retry-go/v4 v4.5.1/go.mod h1:/sipNsvNB3RRuT5iNcb6h73nw3IBmXJ/H3XrCQYSOpc=
 github.com/aws/aws-sdk-go v1.22.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
-github.com/aws/aws-sdk-go v1.44.302 h1:ST3ko6GrJKn3Xi+nAvxjG3uk/V1pW8KC52WLeIxqqNk=
-github.com/aws/aws-sdk-go v1.44.302/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/aws/aws-sdk-go v1.45.25 h1:c4fLlh5sLdK2DCRTY1z0hyuJZU4ygxX8m1FswL6/nF4=
+github.com/aws/aws-sdk-go v1.45.25/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
 github.com/aws/constructs-go/constructs/v10 v10.1.255 h1:5hARfEmhBqHSTQf/C3QLA3sWOxO2Dfja0iA1W7ZcI7g=
 github.com/aws/constructs-go/constructs/v10 v10.1.255/go.mod h1:DCdBSjN04Ck2pajCacTD4RKFqSA7Utya8d62XreYctI=
 github.com/aws/jsii-runtime-go v1.75.0 h1:NhpUfyiL7/wsRuUekFsz8FFBCYLfPD/l61kKg9kL/a4=
@@ -694,8 +206,6 @@ github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816/go.mod h1:+zsy
 github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
 github.com/blendle/zapdriver v1.3.1 h1:C3dydBOWYRiOk+B8X9IVZ5IOe+7cl+tGOexN4QqHfpE=
 github.com/blendle/zapdriver v1.3.1/go.mod h1:mdXfREi6u5MArG4j9fewC+FGnXaBR+T4Ox4J2u4eHCc=
-github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
-github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
 github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c=
 github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y=
 github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U=
@@ -719,8 +229,8 @@ github.com/bxcodec/faker v2.0.1+incompatible/go.mod h1:BNzfpVdTwnFJ6GtfYTcQu6l6r
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
 github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s=
 github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
-github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee h1:BnPxIde0gjtTnc9Er7cxvBk8DHLWhEux0SxayC8dP6I=
-github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M=
+github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b h1:6+ZFm0flnudZzdSE0JxlhR2hKnGPcNB35BjQf4RYQDY=
+github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M=
 github.com/c9s/goprocinfo v0.0.0-20210130143923-c95fcf8c64a8 h1:SjZ2GvvOononHOpK84APFuMvxqsk3tEIaKH/z4Rpu3g=
 github.com/c9s/goprocinfo v0.0.0-20210130143923-c95fcf8c64a8/go.mod h1:uEyr4WpAH4hio6LFriaPkL938XnrvLpNPmQHBdrmbIE=
 github.com/cdk8s-team/cdk8s-core-go/cdk8s/v2 v2.7.5 h1:rvc39Ol6z3MvaBzXkxFC6Nfsnixq/dRypushKDd7Nc0=
@@ -730,8 +240,6 @@ github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QH
 github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
 github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw=
 github.com/cespare/cp v1.1.1 h1:nCb6ZLdB7NRaqsm91JtQTAme2SKJzXVsdPIPkyJr1MU=
 github.com/cespare/cp v1.1.1/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s=
 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
@@ -768,16 +276,7 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
-github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
 github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k=
 github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
@@ -797,7 +296,6 @@ github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811 h1:ytcWPaNPhNoG
 github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811/go.mod h1:Nb5lgvnQ2+oGlE/EyZy4+2/CxRh9KfvCXnag1vtpxVM=
 github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ=
 github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
-github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
 github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM=
 github.com/coinbase/rosetta-sdk-go/types v1.0.0 h1:jpVIwLcPoOeCR6o1tU+Xv7r5bMONNbHU7MuEHboiFuA=
 github.com/coinbase/rosetta-sdk-go/types v1.0.0/go.mod h1:eq7W2TMRH22GTW0N0beDnN931DW0/WOI1R2sdHNHG4c=
@@ -820,7 +318,6 @@ github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmf
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-github.com/coreos/go-systemd/v22 v22.4.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
@@ -835,8 +332,8 @@ github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY
 github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
 github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE=
 github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ4GUkT+tbFI=
-github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoKuI=
-github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek=
+github.com/cosmos/gogoproto v1.4.11 h1:LZcMHrx4FjUgrqQSWeaGC1v/TeuVFqSLa43CC6aWR2g=
+github.com/cosmos/gogoproto v1.4.11/go.mod h1:/g39Mh8m17X8Q/GDEs5zYTSNaNnInBSohtaxzQnYq1Y=
 github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38=
 github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A=
 github.com/cosmos/ibc-go/v7 v7.0.1 h1:NIBNRWjlOoFvFQu1ZlgwkaSeHO5avf4C1YQiWegt8jw=
@@ -864,8 +361,6 @@ github.com/cucumber/common/gherkin/go/v22 v22.0.0 h1:4K8NqptbvdOrjL9DEea6HFjSpbd
 github.com/cucumber/common/gherkin/go/v22 v22.0.0/go.mod h1:3mJT10B2GGn3MvVPd3FwR7m2u4tLhSRhWUqJU4KN4Fg=
 github.com/cucumber/common/messages/go/v17 v17.1.1 h1:RNqopvIFyLWnKv0LfATh34SWBhXeoFTJnSrgm9cT/Ts=
 github.com/cucumber/common/messages/go/v17 v17.1.1/go.mod h1:bpGxb57tDE385Rb2EohgUadLkAbhoC4IyCFi89u/JQI=
-github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI=
-github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
 github.com/daaku/go.zipexe v1.0.0/go.mod h1:z8IiR6TsVLEYKwXAoE/I+8ys/sDkgTzSL0CLnGVd57E=
 github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0=
 github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0=
@@ -908,12 +403,14 @@ github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUn
 github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y=
 github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
-github.com/digitalocean/godo v1.97.0 h1:p9w1yCcWMZcxFSLPToNGXA96WfUVLXqoHti6GzVomL4=
-github.com/digitalocean/godo v1.97.0/go.mod h1:NRpFznZFvhHjBoqZAaOD3khVzsJ3EibzKqFL4R60dmA=
+github.com/digitalocean/godo v1.104.1 h1:SZNxjAsskM/su0YW9P8Wx3gU0W1Z13b6tZlYNpl5BnA=
+github.com/digitalocean/godo v1.104.1/go.mod h1:VAI/L5YDzMuPRU01lEEUSQ/sp5Z//1HnnFv/RBTEdbg=
+github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
+github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
 github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
 github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v24.0.5+incompatible h1:WmgcE4fxyI6EEXxBRxsHnZXrO1pQ3smi0k/jho4HLeY=
-github.com/docker/docker v24.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM=
+github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
@@ -936,16 +433,9 @@ github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5y
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
-github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
-github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
-github.com/envoyproxy/go-control-plane v0.10.3/go.mod h1:fJJn/j26vwOu972OllsvAgJJM//w9BV6Fxbg2LuVd34=
-github.com/envoyproxy/go-control-plane v0.11.0/go.mod h1:VnHyVMpzcLvCFt9yUz1UnCwHLhwx1WguiVDV7pTG/tI=
 github.com/envoyproxy/go-control-plane v0.11.1 h1:wSUXTlLfiAQRWs2F+p+EKOY9rUyis1MyGqJ2DIk5HpM=
 github.com/envoyproxy/go-control-plane v0.11.1/go.mod h1:uhMcXKCQMEJHiAb0w+YGefQLaTEw+YhGluxZkrTmD0g=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo=
-github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w=
-github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
 github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA=
 github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE=
 github.com/esote/minmaxheap v1.0.0 h1:rgA7StnXXpZG6qlM0S7pUmEv1KpWe32rYT4x8J8ntaA=
@@ -975,7 +465,6 @@ github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYF
 github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
 github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
-github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
 github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c=
@@ -983,8 +472,6 @@ github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+
 github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0=
 github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6 h1:u/UEqS66A5ckRmS4yNpjmVH56sVtS/RfclBAYocb4as=
 github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6/go.mod h1:1i71OnUq3iUe1ma7Lr6yG6/rjvM3emb6yoL7xLFzcVQ=
-github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
-github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
 github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
 github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
@@ -1039,11 +526,6 @@ github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclK
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
 github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
 github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
-github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g=
-github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks=
-github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY=
-github.com/go-fonts/liberation v0.2.0/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY=
-github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmnUIzUY=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -1053,8 +535,6 @@ github.com/go-kit/kit v0.12.0 h1:e4o3o3IsBfAKQh5Qbbiqyfu97Ku7jrO/JbohvztANh4=
 github.com/go-kit/kit v0.12.0/go.mod h1:lHd+EkCZPIwYItmGDDRdhinkzX2A1sj+M9biaEaizzs=
 github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
 github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
-github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod h1:CO1AlKB2CSIqUrmQPqA0gdRIlnLEY0gK5JGjh37zN5U=
-github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81/go.mod h1:SX0U8uGpxhq9o2S/CELCSUxEWWAuoCUcVCQWv7G2OCk=
 github.com/go-ldap/ldap/v3 v3.4.5 h1:ekEKmaDrpvR2yf5Nc/DClsGG9lAmdDixe44mLzlW5r8=
 github.com/go-ldap/ldap/v3 v3.4.5/go.mod h1:bMGIq3AGbytbaMwf8wdv5Phdxz0FWHTIYMSzyrYgnQs=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
@@ -1110,8 +590,6 @@ github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogB
 github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
 github.com/go-openapi/validate v0.22.1 h1:G+c2ub6q47kfX1sOBLwIQwzBVt8qmOAARyo/9Fqs9NU=
 github.com/go-openapi/validate v0.22.1/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg=
-github.com/go-pdf/fpdf v0.5.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M=
-github.com/go-pdf/fpdf v0.6.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
@@ -1166,13 +644,15 @@ github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWe
 github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ=
 github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0=
 github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
-github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
-github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8=
+github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
+github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
 github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
-github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo=
+github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
+github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
-github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/gobwas/ws v1.2.1 h1:F2aeBZrm2NDsc7vbovKrWSogd4wvfAxg0FQ89/iqOTk=
+github.com/gobwas/ws v1.2.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
 github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
 github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0=
@@ -1181,13 +661,11 @@ github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x
 github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw=
 github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
 github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
-github.com/gofrs/uuid v4.3.1+incompatible h1:0/KbAdpx3UXAx1kEOWHJeOkpbgRFGHVgv+CFIY7dBJI=
-github.com/gofrs/uuid v4.3.1+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
+github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
-github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
 github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0=
 github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4=
-github.com/gogo/status v1.0.3/go.mod h1:SavQ51ycCLnc7dGyJxp8YAmudx8xqiVrRf+6IXRsugc=
 github.com/gogo/status v1.1.0/go.mod h1:BFv9nrluPLmrS0EmGVvLaPNmRosr9KapBYd5/hpY1WM=
 github.com/gogo/status v1.1.1 h1:DuHXlSFHNKqTQ+/ACf5Vs6r4X/dH2EgIzR9Vr+H65kg=
 github.com/gogo/status v1.1.1/go.mod h1:jpG3dM5QPcqu19Hg8lkUhBFBa3TcLs1DG7+2Jqci7oU=
@@ -1197,10 +675,7 @@ github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOW
 github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang-jwt/jwt/v5 v5.1.0 h1:UGKbA/IPjtS6zLcdB7i5TyACMgSbOTiR8qzXgw8HWQU=
 github.com/golang-jwt/jwt/v5 v5.1.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
-github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
-github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ=
 github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo=
 github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -1216,7 +691,6 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt
 github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
-github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
 github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
 github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -1250,9 +724,10 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
 github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
-github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
 github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0=
 github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E=
+github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
+github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -1266,7 +741,6 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
-github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
@@ -1286,8 +760,6 @@ github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
-github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
 github.com/google/orderedcode v0.0.1 h1:UzfcAexk9Vhv8+9pNOgRu41f16lHq725vPwnSeiG/Us=
 github.com/google/orderedcode v0.0.1/go.mod h1:iVyU4/qPKHY5h/wSd6rZZCDcLJNxiWO6dvsYES2Sb20=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
@@ -1300,53 +772,33 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf
 github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8 h1:n6vlPhxsA+BW/XsS5+uqi7GyzaLa5MH7qlSLBZtRdiA=
-github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8/go.mod h1:Jh3hGz2jkYak8qXPD19ryItVnUgpgeqzdkY/D0EaeuA=
+github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 h1:pUa4ghanp6q4IJHwE9RwLgmVFfReJN+KbQ8ExNEUUoQ=
+github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc=
-github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
+github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o=
+github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
 github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8=
-github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8=
-github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg=
-github.com/googleapis/enterprise-certificate-proxy v0.2.1/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
-github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k=
-github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
+github.com/googleapis/enterprise-certificate-proxy v0.3.1 h1:SBWmZhjUDRorQxrN0nwzf+AHBxnbFjViHQS4P0yVpmQ=
+github.com/googleapis/enterprise-certificate-proxy v0.3.1/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
-github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM=
-github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM=
-github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM=
-github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c=
-github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo=
-github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY=
-github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=
-github.com/googleapis/gax-go/v2 v2.11.0 h1:9V9PWXEsWnPpQhu/PeQIkS4eGzMlTLGgt80cUUI8Ki4=
-github.com/googleapis/gax-go/v2 v2.11.0/go.mod h1:DxmR61SGKkGLa2xigwuZIQpkCI2S5iydzRfb3peWZJI=
-github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=
+github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas=
+github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
-github.com/gophercloud/gophercloud v1.2.0 h1:1oXyj4g54KBg/kFtCdMM6jtxSzeIyg8wv4z1HoGPp1E=
-github.com/gophercloud/gophercloud v1.2.0/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM=
+github.com/gophercloud/gophercloud v1.7.0 h1:fyJGKh0LBvIZKLvBWvQdIgkaV5yTM3Jh9EYUh+UNCAs=
+github.com/gophercloud/gophercloud v1.7.0/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4=
 github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q=
-github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/rpc v1.2.0/go.mod h1:V4h9r+4sF5HnzqbwIez0fKSpANP0zlYd3qR7p36jkTQ=
@@ -1362,12 +814,12 @@ github.com/gosimple/slug v1.13.1 h1:bQ+kpX9Qa6tHRaK+fZR0A0M2Kd7Pa5eHPPsb1JpHD+Q=
 github.com/gosimple/slug v1.13.1/go.mod h1:UiRaFH+GEilHstLUmcBgWcI42viBN7mAb818JrYOeFQ=
 github.com/gosimple/unidecode v1.0.1 h1:hZzFTMMqSswvf0LBJZCZgThIZrpDHFXux9KeGmn6T/o=
 github.com/gosimple/unidecode v1.0.1/go.mod h1:CP0Cr1Y1kogOtx0bJblKzsVWrqYaqfNOnHzpgWw4Awc=
-github.com/grafana/dskit v0.0.0-20230201083518-528d8a7d52f2 h1:IOks+FXJ6iO/pfbaVEf4efNw+YzYBYNCkCabyrbkFTM=
-github.com/grafana/dskit v0.0.0-20230201083518-528d8a7d52f2/go.mod h1:zj+5BNZAVmQafV583uLTAOzRr963KPdEm4d6NPmtbwg=
-github.com/grafana/loki v1.6.2-0.20231017135925-990ac685e6a6 h1:V5PspEXlSlNh22sMyGkgfSOVVLTsSmhbmsp1VPt8Fdc=
-github.com/grafana/loki v1.6.2-0.20231017135925-990ac685e6a6/go.mod h1:+aWr7OBDuZMT+p0rKmLfW5saO2m3YOGBnt++IlgLhVk=
-github.com/grafana/loki/pkg/push v0.0.0-20230127102416-571f88bc5765 h1:VXitROTlmZtLzvokNe8ZbUKpmwldM4Hy1zdNRO32jKU=
-github.com/grafana/loki/pkg/push v0.0.0-20230127102416-571f88bc5765/go.mod h1:DhJMrd2QInI/1CNtTN43BZuTmkccdizW1jZ+F6aHkhY=
+github.com/grafana/dskit v0.0.0-20231120170505-765e343eda4f h1:gyojr97YeWZ70pKNakWv5/tKwBHuLy3icnIeCo9gQr4=
+github.com/grafana/dskit v0.0.0-20231120170505-765e343eda4f/go.mod h1:8dsy5tQOkeNQyjXpm5mQsbCu3H5uzeBD35MzRQFznKU=
+github.com/grafana/loki v1.6.2-0.20231201111602-11ef833ed3e4 h1:YbfISHhpbiDvoFNxDPCicPOU/+9s4rdv9Fq/V3iRvTo=
+github.com/grafana/loki v1.6.2-0.20231201111602-11ef833ed3e4/go.mod h1:Tx2uhmS+H0pGmtqX94/KaDkRHWhIowt4iYtJLctAbEY=
+github.com/grafana/loki/pkg/push v0.0.0-20231201111602-11ef833ed3e4 h1:wQ0FnSeebhJIBkgYOD06Mxk9HV2KhtEG0hp/7R+5RUQ=
+github.com/grafana/loki/pkg/push v0.0.0-20231201111602-11ef833ed3e4/go.mod h1:f3JSoxBTPXX5ec4FxxeC19nTBSxoTz+cBgS3cYLMcr0=
 github.com/grafana/pyroscope-go v1.0.4 h1:oyQX0BOkL+iARXzHuCdIF5TQ7/sRSel1YFViMHC7Bm0=
 github.com/grafana/pyroscope-go v1.0.4/go.mod h1:0d7ftwSMBV/Awm7CCiYmHQEG8Y44Ma3YSjt+nWcWztY=
 github.com/grafana/pyroscope-go/godeltaprof v0.1.4 h1:mDsJ3ngul7UfrHibGQpV66PbZ3q1T8glz/tK3bQKKEk=
@@ -1391,8 +843,6 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf
 github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg=
 github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw=
@@ -1406,13 +856,13 @@ github.com/gtank/ristretto255 v0.1.2/go.mod h1:Ph5OpO6c7xKUGROZfWVLiJf9icMDwUeIv
 github.com/gxed/hashland/keccakpg v0.0.1/go.mod h1:kRzw3HkwxFU1mpmPP8v1WyQzwdGfmKFJ6tItnhQ67kU=
 github.com/gxed/hashland/murmur3 v0.0.1/go.mod h1:KjXop02n4/ckmZSnY2+HKcLud/tcmvhST0bie/0lS48=
 github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
-github.com/hashicorp/consul/api v1.22.0 h1:ydEvDooB/A0c/xpsBd8GSt7P2/zYPBui4KrNip0xGjE=
-github.com/hashicorp/consul/api v1.22.0/go.mod h1:zHpYgZ7TeYqS6zaszjwSt128OwESRpnhU9aGa6ue3Eg=
+github.com/hashicorp/consul/api v1.25.1 h1:CqrdhYzc8XZuPnhIYZWH45toM0LB9ZeYr/gvpLVI3PE=
+github.com/hashicorp/consul/api v1.25.1/go.mod h1:iiLVwR/htV7mas/sy0O+XSuEnrdBUUydemjxcUrAt4g=
 github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
 github.com/hashicorp/consul/sdk v0.14.1 h1:ZiwE2bKb+zro68sWzZ1SgHF3kRMBZ94TwOCFRF4ylPs=
 github.com/hashicorp/consul/sdk v0.14.1/go.mod h1:vFt03juSzocLRFo59NkeQHHmQa6+g7oU0pfzdI1mUhg=
-github.com/hashicorp/cronexpr v1.1.1 h1:NJZDd87hGXjoZBdvyCF9mX4DCq5Wy7+A/w+A7q0wn6c=
-github.com/hashicorp/cronexpr v1.1.1/go.mod h1:P4wA0KBl9C5q2hABiMO7cp6jcIg96CDh1Efb3g1PWA4=
+github.com/hashicorp/cronexpr v1.1.2 h1:wG/ZYIKT+RT3QkOdgYc+xsKWVRgnxJ1OJtjjy84fJ9A=
+github.com/hashicorp/cronexpr v1.1.2/go.mod h1:P4wA0KBl9C5q2hABiMO7cp6jcIg96CDh1Efb3g1PWA4=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -1437,8 +887,8 @@ github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
-github.com/hashicorp/go-retryablehttp v0.7.2 h1:AcYqCvkpalPnPF2pn0KamgwamS42TqUDDYFRKq/RAd0=
-github.com/hashicorp/go-retryablehttp v0.7.2/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8=
+github.com/hashicorp/go-retryablehttp v0.7.4 h1:ZQgVdpTdAL7WpMIwLzCfbalOcSUdkDZnpUv3/+BxzFA=
+github.com/hashicorp/go-retryablehttp v0.7.4/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8=
 github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
 github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
 github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
@@ -1470,8 +920,8 @@ github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/
 github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
 github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR/prTM=
 github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0=
-github.com/hashicorp/nomad/api v0.0.0-20230308192510-48e7d70fcd4b h1:EkuSTU8c/63q4LMayj8ilgg/4I5PXDFVcnqKfs9qcwI=
-github.com/hashicorp/nomad/api v0.0.0-20230308192510-48e7d70fcd4b/go.mod h1:bKUb1ytds5KwUioHdvdq9jmrDqCThv95si0Ub7iNeBg=
+github.com/hashicorp/nomad/api v0.0.0-20230721134942-515895c7690c h1:Nc3Mt2BAnq0/VoLEntF/nipX+K1S7pG+RgwiitSv6v0=
+github.com/hashicorp/nomad/api v0.0.0-20230721134942-515895c7690c/go.mod h1:O23qLAZuCx4htdY9zBaO4cJPXgleSFEdq6D/sezGgYE=
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY=
 github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4=
@@ -1481,8 +931,8 @@ github.com/hdevalence/ed25519consensus v0.1.0 h1:jtBwzzcHuTmFrQN6xQZn6CQEO/V9f7H
 github.com/hdevalence/ed25519consensus v0.1.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo=
 github.com/henvic/httpretty v0.0.6 h1:JdzGzKZBajBfnvlMALXXMVQWxWMF/ofTy8C3/OSUTxs=
 github.com/henvic/httpretty v0.0.6/go.mod h1:X38wLjWXHkXT7r2+uK8LjCMne9rsuNaBLJ+5cU2/Pmo=
-github.com/hetznercloud/hcloud-go v1.41.0 h1:KJGFRRc68QiVu4PrEP5BmCQVveCP2CM26UGQUKGpIUs=
-github.com/hetznercloud/hcloud-go v1.41.0/go.mod h1:NaHg47L6C77mngZhwBG652dTAztYrsZ2/iITJKhQkHA=
+github.com/hetznercloud/hcloud-go/v2 v2.4.0 h1:MqlAE+w125PLvJRCpAJmEwrIxoVdUdOyuFUhE/Ukbok=
+github.com/hetznercloud/hcloud-go/v2 v2.4.0/go.mod h1:l7fA5xsncFBzQTyw29/dw5Yr88yEGKKdc6BHf24ONS0=
 github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao=
 github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA=
 github.com/holiman/uint256 v1.2.3 h1:K8UWO1HUJpRMXBxbmaY1Y8IAMZC/RsKB+ArEnnK4l5o=
@@ -1497,7 +947,6 @@ github.com/huin/goupnp v1.0.3 h1:N8No57ls+MnjlB+JPiCVSOyy/ot7MJTqlo7rn+NYSqQ=
 github.com/huin/goupnp v1.0.3/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y=
 github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o=
 github.com/hydrogen18/memlistener v0.0.0-20200120041712-dcc25e7acd91/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE=
-github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
@@ -1509,8 +958,8 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
 github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/ionos-cloud/sdk-go/v6 v6.1.4 h1:BJHhFA8Q1SZC7VOXqKKr2BV2ysQ2/4hlk1e4hZte7GY=
-github.com/ionos-cloud/sdk-go/v6 v6.1.4/go.mod h1:Ox3W0iiEz0GHnfY9e5LmAxwklsxguuNFEUSu0gVRTME=
+github.com/ionos-cloud/sdk-go/v6 v6.1.9 h1:Iq3VIXzeEbc8EbButuACgfLMiY5TPVWUPNrF+Vsddo4=
+github.com/ionos-cloud/sdk-go/v6 v6.1.9/go.mod h1:EzEgRIDxBELvfoa/uBN0kOQaqovLjUWEB7iW4/Q+t4k=
 github.com/ipfs/go-cid v0.0.1/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
 github.com/ipfs/go-cid v0.0.2/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
 github.com/ipfs/go-cid v0.0.3/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
@@ -1655,8 +1104,6 @@ github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfV
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
-github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
-github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
 github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
 github.com/kami-zh/go-capturer v0.0.0-20171211120116-e492ea43421d/go.mod h1:P2viExyCEfeWGU259JnaQ34Inuec4R38JCyBx2edgD0=
 github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
@@ -1666,27 +1113,23 @@ github.com/kataras/iris/v12 v12.1.8/go.mod h1:LMYy4VlP67TQ3Zgriz8RE2h2kMZV2SgMYb
 github.com/kataras/neffos v0.0.14/go.mod h1:8lqADm8PnbeFfL7CLXh1WHw53dG27MC3pgi2R1rmoTE=
 github.com/kataras/pio v0.0.2/go.mod h1:hAoW0t9UmXi4R5Oyq5Z4irTbaTsOemSrDGUtaTl7Dro=
 github.com/kataras/sitemap v0.0.5/go.mod h1:KY2eugMKiPwsJgx7+U103YZehfvNGOXURubcGyk0Bz8=
-github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8=
 github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
-github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE=
 github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.9.7/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
 github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4=
 github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
-github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
-github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
+github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
+github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b h1:udzkj9S/zlT5X367kqJis0QP7YMxobob6zhzq6Yre00=
 github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b/go.mod h1:pcaDhQK0/NJZEvtCO0qQPPropqV0sJOJ6YW7X+9kRwM=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -1930,16 +1373,13 @@ github.com/libp2p/go-yamux/v2 v2.0.0 h1:vSGhAy5u6iHBq11ZDcyHH4Blcf9xlBhT4WQDoOE9
 github.com/libp2p/go-yamux/v2 v2.0.0/go.mod h1:NVWira5+sVUIU6tu1JWvaRn1dRnG+cawOJiflsAM+7U=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
-github.com/linode/linodego v1.14.1 h1:uGxQyy0BidoEpLGdvfi4cPgEW+0YUFsEGrLEhcTfjNc=
-github.com/linode/linodego v1.14.1/go.mod h1:NJlzvlNtdMRRkXb0oN6UWzUkj6t+IBsyveHgZ5Ppjyk=
+github.com/linode/linodego v1.23.0 h1:s0ReCZtuN9Z1IoUN9w1RLeYO1dMZUGPwOQ/IBFsBHtU=
+github.com/linode/linodego v1.23.0/go.mod h1:0U7wj/UQOqBNbKv1FYTXiBUXueR8DY4HvIotwE0ENgg=
 github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8=
 github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
-github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
-github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
-github.com/lyft/protoc-gen-star/v2 v2.0.1/go.mod h1:RcCdONR2ScXaYnQC5tUzxzlpA3WVYF7/opLeUgcQs/o=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
@@ -1983,12 +1423,10 @@ github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m
 github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
 github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
-github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg=
 github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k=
 github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8=
@@ -2000,15 +1438,13 @@ github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKju
 github.com/miekg/dns v1.1.28/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
 github.com/miekg/dns v1.1.31/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
 github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
-github.com/miekg/dns v1.1.55 h1:GoQ4hpsj0nFLYe+bWiCToyrBEJXkQfOOIvFGFy0lEgo=
-github.com/miekg/dns v1.1.55/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY=
+github.com/miekg/dns v1.1.56 h1:5imZaSeoRNvpM9SzWNhEcP9QliKiz20/dA2QabIGVnE=
+github.com/miekg/dns v1.1.56/go.mod h1:cRm6Oo2C8TY9ZS/TqsSrseAcncm74lfK5G+ikN2SWWY=
 github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM=
 github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 h1:QRUSJEgZn2Snx0EmT/QLXibWjSUDjKWvXIT19NBVp94=
 github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM=
-github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY=
 github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 h1:lYpkrQH5ajf0OXOcUbGjvZxxijuBwbbmlSxLiuofa+g=
 github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ=
-github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE=
 github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g=
 github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY=
 github.com/minio/sha256-simd v0.0.0-20190131020904-2d45a736cd16/go.mod h1:2FMWW+8GMoPweT6+pI63m9YE3Lmw4J71hV56Chs1E/U=
@@ -2016,8 +1452,8 @@ github.com/minio/sha256-simd v0.0.0-20190328051042-05b4dd3047e5/go.mod h1:2FMWW+
 github.com/minio/sha256-simd v0.1.0/go.mod h1:2FMWW+8GMoPweT6+pI63m9YE3Lmw4J71hV56Chs1E/U=
 github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
 github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
-github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g=
-github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM=
+github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
+github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
@@ -2177,10 +1613,8 @@ github.com/opencontainers/image-spec v1.1.0-rc4 h1:oOxKUJWnFC4YGHCCMNql1x4YaDfYB
 github.com/opencontainers/image-spec v1.1.0-rc4/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
 github.com/opencontainers/runc v1.1.7 h1:y2EZDS8sNng4Ksf0GUYNhKbTShZJPJg1FiXJNH/uoCk=
 github.com/opencontainers/runc v1.1.7/go.mod h1:CbUumNnWCuTGFukNXahoo/RFBZvDAgRh/smNYNOhA50=
-github.com/opentracing-contrib/go-grpc v0.0.0-20180928155321-4b5a12d3ff02/go.mod h1:JNdpVEzCpXBgIiv4ds+TzhN1hrtxq6ClLrTlT9OQRSc=
 github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e h1:4cPxUYdgaGzZIT5/j0IfqOrrXmq6bG8AwvwisMXpdrg=
 github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e/go.mod h1:DYR5Eij8rJl8h7gblRrOZ8g0kW1umSpKqYIBTgeDtLo=
-github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9/go.mod h1:PLldrQSroqzH70Xl+1DQcGnefIbqsKR7UDaiux3zV+w=
 github.com/opentracing-contrib/go-stdlib v1.0.0 h1:TBS7YuVotp8myLon4Pv7BtCBzOTo1DeZCld0Z63mW2w=
 github.com/opentracing-contrib/go-stdlib v1.0.0/go.mod h1:qtI1ogk+2JhVPIXVc6q+NHziSmy2W5GbdQZFUHADCBU=
 github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
@@ -2193,8 +1627,8 @@ github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU=
 github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w=
 github.com/otiai10/mint v1.5.1 h1:XaPLeE+9vGbuyEHem1JNk3bYc7KKqyI/na0/mLd/Kks=
 github.com/otiai10/mint v1.5.1/go.mod h1:MJm72SBthJjz8qhefc4z1PYEieWmy8Bku7CjcAqyUSM=
-github.com/ovh/go-ovh v1.3.0 h1:mvZaddk4E4kLcXhzb+cxBsMPYp2pHqiQpWYkInsuZPQ=
-github.com/ovh/go-ovh v1.3.0/go.mod h1:AxitLZ5HBRPyUd+Zl60Ajaag+rNTdVXWIkzfrVuTXWA=
+github.com/ovh/go-ovh v1.4.3 h1:Gs3V823zwTFpzgGLZNI6ILS4rmxZgJwJCz54Er9LwD0=
+github.com/ovh/go-ovh v1.4.3/go.mod h1:AkPXVtgwB6xlKblMjRKJJmjRp+ogrE7fz2lVgcQY8SY=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
@@ -2213,18 +1647,15 @@ github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR
 github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o=
 github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 h1:hDSdbBuw3Lefr6R18ax0tZ2BJeNB3NehB3trOwYBsdU=
 github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
-github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2dXMnm1mY=
-github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
-github.com/phpdave11/gofpdi v1.0.13/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
-github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
 github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
+github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
+github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
 github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
@@ -2235,25 +1666,20 @@ github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/pressly/goose/v3 v3.16.0 h1:xMJUsZdHLqSnCqESyKSqEfcYVYsUuup1nrOhaEFftQg=
 github.com/pressly/goose/v3 v3.16.0/go.mod h1:JwdKVnmCRhnF6XLQs2mHEQtucFD49cQBdRM4UiwkxsM=
-github.com/prometheus/alertmanager v0.25.1 h1:LGBNMspOfv8h7brb+LWj2wnwBCg2ZuuKWTh6CAVw2/Y=
-github.com/prometheus/alertmanager v0.25.1/go.mod h1:MEZ3rFVHqKZsw7IcNS/m4AWZeXThmJhumpiWR4eHU/w=
+github.com/prometheus/alertmanager v0.26.0 h1:uOMJWfIwJguc3NaM3appWNbbrh6G/OjvaHMk22aBBYc=
+github.com/prometheus/alertmanager v0.26.0/go.mod h1:rVcnARltVjavgVaNnmevxK7kOn7IZavyf0KNgHkbEpU=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
 github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
-github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
-github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ=
-github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y=
-github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk=
 github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q=
 github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
 github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
 github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
 github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
@@ -2263,29 +1689,22 @@ github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8b
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
 github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
-github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
-github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA=
-github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc=
 github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lneoxM=
 github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY=
 github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4=
 github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI=
-github.com/prometheus/exporter-toolkit v0.8.2/go.mod h1:00shzmJL7KxcsabLWcONwpyNEuWhREOnFqZW7vadFS0=
-github.com/prometheus/exporter-toolkit v0.10.0 h1:yOAzZTi4M22ZzVxD+fhy1URTuNRj/36uQJJ5S8IPza8=
-github.com/prometheus/exporter-toolkit v0.10.0/go.mod h1:+sVFzuvV5JDyw+Ih6p3zFxZNVnKQa3x5qPmDSiPu4ZY=
+github.com/prometheus/exporter-toolkit v0.10.1-0.20230714054209-2f4150c63f97 h1:oHcfzdJnM/SFppy2aUlvomk37GI33x9vgJULihE5Dt8=
+github.com/prometheus/exporter-toolkit v0.10.1-0.20230714054209-2f4150c63f97/go.mod h1:LoBCZeRh+5hX+fSULNyFnagYlQG/gBsyA/deNzROkq8=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
-github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY=
 github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
 github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
-github.com/prometheus/prometheus v0.43.1-0.20230327151049-211ae4f1f0a2 h1:i5hmbBzR+VeL5pPl1ZncsJ1bpg3SO66bwkE1msJBsMA=
-github.com/prometheus/prometheus v0.43.1-0.20230327151049-211ae4f1f0a2/go.mod h1:Mm42Acga98xgA+u5yTaC3ki3i0rJEJWFpbdHN7q2trk=
+github.com/prometheus/prometheus v0.48.0 h1:yrBloImGQ7je4h8M10ujGh4R6oxYQJQKlMuETwNskGk=
+github.com/prometheus/prometheus v0.48.0/go.mod h1:SRw624aMAxTfryAcP8rOjg4S/sHHaetx2lyJJ2nM83g=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/pyroscope-io/client v0.7.1 h1:yFRhj3vbgjBxehvxQmedmUWJQ4CAfCHhn+itPsuWsHw=
 github.com/pyroscope-io/client v0.7.1/go.mod h1:4h21iOU4pUOq0prKyDlvYRL+SCKsBc5wKiEtV+rJGqU=
@@ -2299,7 +1718,6 @@ github.com/regen-network/gocuke v0.6.2 h1:pHviZ0kKAq2U2hN2q3smKNxct6hS0mGByFMHGn
 github.com/regen-network/gocuke v0.6.2/go.mod h1:zYaqIHZobHyd0xOrHGPQjbhGJsuZ1oElx150u2o1xuk=
 github.com/regen-network/protobuf v1.3.3-alpha.regen.1 h1:OHEc+q5iIAXpqiqFKeLpu5NwTIkVXUs48vFMwzqpqY4=
 github.com/regen-network/protobuf v1.3.3-alpha.regen.1/go.mod h1:2DjTFR1HhMQhiWC5sZ4OhQ3+NtdbZ6oBDKQwq5Ou+FI=
-github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
 github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
@@ -2315,8 +1733,8 @@ github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
-github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo=
-github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
+github.com/rs/cors v1.9.0 h1:l9HGsTsHJcvW14Nk7J9KFz8bzeAWXn3CG6bgt7LsrAE=
+github.com/rs/cors v1.9.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
@@ -2329,15 +1747,13 @@ github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNl
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w=
-github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245/go.mod h1:pQAZKsJ8yyVxGRWYNEm9oFB8ieLgKFnamEyDmSA0BRk=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0=
 github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.14 h1:yFl3jyaSVLNYXlnNYM5z2pagEk1dYQhfr1p20T1NyKY=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.14/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21 h1:yWfiTPwYxB0l5fGMhl/G+liULugVIHD9AU77iNLrURQ=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
 github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g=
 github.com/scylladb/go-reflectx v1.0.1 h1:b917wZM7189pZdlND9PbIJ6NQxfDPfBvUaQ7cjj1iZQ=
 github.com/scylladb/go-reflectx v1.0.1/go.mod h1:rWnOfDIRWBGN0miMLIcoPt/Dhi2doCMZqwMCJ3KupFc=
@@ -2408,6 +1824,8 @@ github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/smola/gocompat v0.2.0/go.mod h1:1B0MlxbmoZNo3h8guHp8HztB3BSYR5itql9qtVc0ypY=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
+github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js=
+github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0=
 github.com/spacemonkeygo/openssl v0.0.0-20181017203307-c2dcc5cca94a/go.mod h1:7AyxJNCJ7SBZ1MfVQCWD6Uqo2oubI2Eq2y2eqf+A5r0=
 github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 h1:RC6RW7j+1+HkWaX/Yh71Ee5ZHaHYt7ZP4sQgUrm6cDU=
 github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572/go.mod h1:w0SWMsp6j9O/dk4/ZpIhL+3CkG8ofA2vuv7k+ltqUMc=
@@ -2415,11 +1833,8 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO
 github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
 github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
-github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
-github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
-github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
-github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk=
-github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
+github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM=
+github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA=
 github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48=
@@ -2503,10 +1918,8 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2nyfOP8=
 github.com/tyler-smith/go-bip39 v1.1.0/go.mod h1:gUYDtqQw1JS3ZJ8UWVcGTGqqr6YIN3CWg+kkNaLt55U=
-github.com/uber/jaeger-client-go v2.28.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
 github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o=
 github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
-github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
 github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg=
 github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
@@ -2539,10 +1952,6 @@ github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+
 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
 github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs=
 github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI=
-github.com/weaveworks/common v0.0.0-20230411130259-f7d83a041205 h1:gjb7t9LCnRu14LHubyLIgrE+EYlAaREiPn/VknV7R3s=
-github.com/weaveworks/common v0.0.0-20230411130259-f7d83a041205/go.mod h1:O9wmSPNVSuqxzUZPFlHnPQ8xnyvx0qBnKGFfGbj95uY=
-github.com/weaveworks/promrus v1.2.0 h1:jOLf6pe6/vss4qGHjXmGz4oDJQA+AOCqEL3FvvZGz7M=
-github.com/weaveworks/promrus v1.2.0/go.mod h1:SaE82+OJ91yqjrE1rsvBWVzNZKcHYFtMUyS1+Ogs/KA=
 github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 h1:EKhdznlJHPMoKr0XTrX+IlJs1LH3lyx2nfr1dOlZ79k=
 github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1/go.mod h1:8UvriyWtv5Q5EOgjHaSseUEdkQfvwFv1I/In/O2M9gc=
 github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc/go.mod h1:bopw91TMyo8J3tvftk8xmU2kPmlrt4nScJQZU2hE5EM=
@@ -2564,7 +1973,6 @@ github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gi
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
-github.com/xhit/go-str2duration v1.2.0/go.mod h1:3cPSlfZlUHVlneIVfePFWcJZsuwf+P1v2SRTV4cUmp4=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xlab/treeprint v1.1.0 h1:G/1DjNkPpfZCFt9CSh6b5/nY4VimlbHF3Rh4obvtzDk=
 github.com/xlab/treeprint v1.1.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0=
@@ -2581,12 +1989,9 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw=
 github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
-github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
-github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
 github.com/zondax/hid v0.9.1 h1:gQe66rtmyZ8VeGFcOpbuH3r7erYtNEAezCAYu8LdkJo=
 github.com/zondax/hid v0.9.1/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM=
@@ -2623,13 +2028,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
-go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
+go.opentelemetry.io/collector/pdata v1.0.0-rcv0016 h1:qCPXSQCoD3qeWFb1RuIks8fw9Atxpk78bmtVdi15KhE=
+go.opentelemetry.io/collector/pdata v1.0.0-rcv0016/go.mod h1:OdN0alYOlYhHXu6BDlGehrZWgtBuiDsz/rlNeJeXiNg=
+go.opentelemetry.io/collector/semconv v0.87.0 h1:BsG1jdLLRCBRlvUujk4QA86af7r/ZXnizczQpEs/gg8=
+go.opentelemetry.io/collector/semconv v0.87.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 h1:SpGay3w+nEwMpfVnbqOLH5gY52/foP8RE8UzTZ1pdSE=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1/go.mod h1:4UoMYEZOC0yN/sPGH76KPkkU7zgiEWYWL9vwmbnTJPE=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 h1:pginetY7+onl4qN1vl0xW/V/v6OBZ0vVdH+esuJgvmM=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0/go.mod h1:XiYsayHc36K3EByOO6nbAXnAWbrUxdjUROCEeeROOH8=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 h1:x8Z78aZx8cOF0+Kkazoc7lwUNMGy0LrzEMxTm4BbTxg=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0/go.mod h1:62CPTSry9QZtOaSsE3tOzhx6LzDhHnXJ6xHeMNNiM6Q=
 go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc=
 go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 h1:cl5P5/GIfFh4t6xyruOgJP5QiA1pw4fYYdv6nc6CBWw=
@@ -2643,8 +2051,6 @@ go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6
 go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc=
 go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
-go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
-go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
 go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
 go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
 go.starlark.net v0.0.0-20220817180228-f738f5508c12 h1:xOBJXWGEDwU5xSDxH6macxO11Us0AH2fTa9rmsbbF7g=
@@ -2652,7 +2058,6 @@ go.starlark.net v0.0.0-20220817180228-f738f5508c12/go.mod h1:VZcBMdr3cT3PnBoWunT
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
-go.uber.org/atomic v1.5.1/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
@@ -2720,43 +2125,26 @@ golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5
 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20221012134737-56aed061732a/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
 golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
-golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
 golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
-golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3/go.mod h1:NOZ3BPKG0ec/BKJQgnvsSFpcKLM5xXVWnvZS97DWHgE=
 golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
 golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
-golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 h1:MGwJjxBy0HJshjDNfLsYO8xppfqWlA5ZT9OhtUUhTNw=
-golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
-golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20200119044424-58c23975cae1/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20210216034530-4410531fe030/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20210607152325-775e3b0c77b9/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
-golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
-golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
-golang.org/x/image v0.0.0-20220302094943-723b81ca9867/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -2780,12 +2168,8 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
-golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
 golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -2833,9 +2217,9 @@ golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81R
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
 golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
@@ -2844,33 +2228,17 @@ golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy
 golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM=
 golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
-golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211008194852-3b03d305991f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
-golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
-golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
-golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
-golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
 golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
@@ -2883,28 +2251,10 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210413134643-5e61552d6c78/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
-golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
-golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
-golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE=
-golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE=
-golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
-golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
-golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
-golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec=
-golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I=
-golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw=
-golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4=
-golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4=
+golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY=
+golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -2917,10 +2267,7 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
 golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
@@ -2991,11 +2338,8 @@ golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210304124612-50617c2ba197/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -3007,47 +2351,27 @@ golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -3060,9 +2384,6 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn
 golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
-golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
-golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/term v0.14.0 h1:LGK9IlZ8T9jvdy6cTdfKUCltatMFOehAQo9SRC46UQ8=
@@ -3078,8 +2399,6 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
@@ -3088,16 +2407,12 @@ golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
 golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181130052023-1c3d964395ce/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
@@ -3119,7 +2434,6 @@ golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190927191325-030b2cf1153e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191010075000-0337d82405ff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -3157,7 +2471,6 @@ golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc
 golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
 golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
@@ -3165,16 +2478,10 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
 golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8=
 golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -3183,23 +2490,13 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
-golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
 gomodules.xyz/jsonpatch/v2 v2.2.0 h1:4pT439QV83L+G9FkcCriY6EkpcK6r6bK+A5FBUMI7qY=
 gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY=
-gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
-gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0=
-gonum.org/v1/gonum v0.9.3/go.mod h1:TZumC3NeyVQskjXqmyWt4S3bINhy7B4eYwW69EbyX+0=
-gonum.org/v1/gonum v0.11.0/go.mod h1:fSG4YDCxxUZQJ7rKsQrj0gMOg00Il0Z96/qMA4bVQhA=
 gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0=
 gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU=
-gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
-gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc=
-gonum.org/v1/plot v0.9.0/go.mod h1:3Pcqqmp6RHvJI72kgb8fThyUnav364FOsdDo2aGW5lY=
-gonum.org/v1/plot v0.10.1/go.mod h1:VZW5OlhkL1mysU9vaqNHnsy86inf6Ot+jB3r+BczCEo=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
 google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
@@ -3220,44 +2517,8 @@ google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz513
 google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
 google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
 google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
-google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU=
-google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94=
-google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo=
-google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4=
-google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw=
-google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU=
-google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k=
-google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
-google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
-google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI=
-google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I=
-google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo=
-google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g=
-google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA=
-google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8=
-google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs=
-google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA=
-google.golang.org/api v0.77.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA=
-google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw=
-google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg=
-google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o=
-google.golang.org/api v0.85.0/go.mod h1:AqZf8Ep9uZ2pyTvgL+x0D3Zt0eoT9b5E8fmzfu6FO2g=
-google.golang.org/api v0.90.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw=
-google.golang.org/api v0.93.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw=
-google.golang.org/api v0.95.0/go.mod h1:eADj+UBuxkh5zlrSntJghuNeg8HwQ1w5lTKkuqaETEI=
-google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s=
-google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s=
-google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
-google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
-google.golang.org/api v0.102.0/go.mod h1:3VFl6/fzoA+qNuS1N1/VfXY4LjoXN/wzeIp7TweWwGo=
-google.golang.org/api v0.103.0/go.mod h1:hGtW6nK1AC+d9si/UBhw8Xli+QMOf6xyNAyJw4qU9w0=
-google.golang.org/api v0.106.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY=
-google.golang.org/api v0.107.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY=
-google.golang.org/api v0.108.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY=
-google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI=
-google.golang.org/api v0.126.0 h1:q4GJq+cAdMAC7XP7njvQ4tvohGLiSlytuL4BQxbIZ+o=
-google.golang.org/api v0.126.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw=
+google.golang.org/api v0.147.0 h1:Can3FaQo9LlVqxJCodNmeZW/ib3/qKAY3rFeXiHo5gc=
+google.golang.org/api v0.147.0/go.mod h1:pQ/9j83DcmPd/5C9e2nFOdjjNkDZ1G+zkbK2uvdkJMs=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -3309,97 +2570,10 @@ google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6D
 google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210329143202-679c6ae281ee/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
 google.golang.org/genproto v0.0.0-20210401141331-865547bb08e2/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
-google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
-google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A=
-google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
 google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
-google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
-google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
-google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
-google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
-google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w=
-google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
-google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
-google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
-google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
-google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E=
-google.golang.org/genproto v0.0.0-20220329172620-7be39ac1afc7/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
-google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
-google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
-google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
-google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
-google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
-google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
-google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
-google.golang.org/genproto v0.0.0-20220518221133-4f43b3371335/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
-google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
-google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
-google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
-google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
-google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
-google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
-google.golang.org/genproto v0.0.0-20220722212130-b98a9ff5e252/go.mod h1:GkXuJDJ6aQ7lnJcRF+SJVgFdQhypqgl3LB1C9vabdRE=
-google.golang.org/genproto v0.0.0-20220801145646-83ce21fca29f/go.mod h1:iHe1svFLAZg9VWz891+QbRMwUv9O/1Ww+/mngYeThbc=
-google.golang.org/genproto v0.0.0-20220815135757-37a418bb8959/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
-google.golang.org/genproto v0.0.0-20220817144833-d7fd3f11b9b1/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
-google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
-google.golang.org/genproto v0.0.0-20220829144015-23454907ede3/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
-google.golang.org/genproto v0.0.0-20220829175752-36a9c930ecbf/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
-google.golang.org/genproto v0.0.0-20220913154956-18f8339a66a5/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
-google.golang.org/genproto v0.0.0-20220914142337-ca0e39ece12f/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
-google.golang.org/genproto v0.0.0-20220915135415-7fd63a7952de/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
-google.golang.org/genproto v0.0.0-20220916172020-2692e8806bfa/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
-google.golang.org/genproto v0.0.0-20220919141832-68c03719ef51/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
-google.golang.org/genproto v0.0.0-20220920201722-2b89144ce006/go.mod h1:ht8XFiar2npT/g4vkk7O0WYS1sHOHbdujxbEp7CJWbw=
-google.golang.org/genproto v0.0.0-20220926165614-551eb538f295/go.mod h1:woMGP53BroOrRY3xTxlbr8Y3eB/nzAvvFM83q7kG2OI=
-google.golang.org/genproto v0.0.0-20220926220553-6981cbe3cfce/go.mod h1:woMGP53BroOrRY3xTxlbr8Y3eB/nzAvvFM83q7kG2OI=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
-google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM=
-google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM=
-google.golang.org/genproto v0.0.0-20221024153911-1573dae28c9c/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s=
-google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s=
-google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
-google.golang.org/genproto v0.0.0-20221109142239-94d6d90a7d66/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
-google.golang.org/genproto v0.0.0-20221114212237-e4508ebdbee1/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
-google.golang.org/genproto v0.0.0-20221117204609-8f9c96812029/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
-google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
-google.golang.org/genproto v0.0.0-20221201164419-0e50fba7f41c/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
-google.golang.org/genproto v0.0.0-20221201204527-e3fa12d562f3/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
-google.golang.org/genproto v0.0.0-20221202195650-67e5cbc046fd/go.mod h1:cTsE614GARnxrLsqKREzmNYJACSWWpAWdNMwnD7c2BE=
-google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/genproto v0.0.0-20230112194545-e10362b5ecf9/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/genproto v0.0.0-20230113154510-dbe35b8444a5/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/genproto v0.0.0-20230123190316-2c411cf9d197/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/genproto v0.0.0-20230124163310-31e0e69b6fc2/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/genproto v0.0.0-20230125152338-dcaf20b6aeaa/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/genproto v0.0.0-20230127162408-596548ed4efa/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/genproto v0.0.0-20230209215440-0dfe4f8abfcc/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44/go.mod h1:8B0gmkoRebU8ukX6HP+4wrVQUY1+6PkQ44BSyIlflHA=
-google.golang.org/genproto v0.0.0-20230222225845-10f96fb3dbec/go.mod h1:3Dl5ZL0q0isWJt+FVcfpQyirqemEuLAK/iFvg1UP1Hw=
-google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s=
 google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 h1:I6WNifs6pF9tNdSob2W24JtyxIYjzFB9qDlpUC76q+U=
 google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405/go.mod h1:3WDQMjmJk36UQhjQ89emUzb1mdaHcPeeAh4SCBKznB4=
 google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b h1:CIC2YMXmIhYw6evmhPxBKJ4fmLbOFtXQN/GV3XOZR8k=
@@ -3430,29 +2604,10 @@ google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG
 google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
 google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
-google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
 google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
-google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
-google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
-google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
-google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
-google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
-google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
-google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
-google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
-google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
-google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww=
-google.golang.org/grpc v1.52.0/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY=
-google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw=
-google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8=
 google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
 google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
-google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
 google.golang.org/grpc/examples v0.0.0-20210424002626-9572fd6faeae/go.mod h1:Ly7ZA/ARzg8fnPU9TyZIxoz33sEUuWX7txiqs8lPTgE=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
@@ -3467,9 +2622,6 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
 google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
@@ -3537,8 +2689,8 @@ k8s.io/api v0.25.11 h1:4mjYDfE3yp22jrytjH0knwgzjXKkxHX4D01ZCAazvZM=
 k8s.io/api v0.25.11/go.mod h1:bK4UvD4bthtutNlvensrfBX21PRQ/vs2cIYggHkOOAo=
 k8s.io/apiextensions-apiserver v0.25.3 h1:bfI4KS31w2f9WM1KLGwnwuVlW3RSRPuIsfNF/3HzR0k=
 k8s.io/apiextensions-apiserver v0.25.3/go.mod h1:ZJqwpCkxIx9itilmZek7JgfUAM0dnTsA48I4krPqRmo=
-k8s.io/apimachinery v0.27.3 h1:Ubye8oBufD04l9QnNtW05idcOe9Z3GQN8+7PqmuVcUM=
-k8s.io/apimachinery v0.27.3/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
+k8s.io/apimachinery v0.28.2 h1:KCOJLrc6gu+wV1BYgwik4AF4vXOlVJPdiqn0yAWWwXQ=
+k8s.io/apimachinery v0.28.2/go.mod h1:RdzF87y/ngqk9H4z3EL2Rppv5jj95vGS/HaFXrLDApU=
 k8s.io/cli-runtime v0.25.11 h1:GE2yNZm1tN+MJtw1SGMOLesLF7Kp7NVAVqRSTbXfu4o=
 k8s.io/cli-runtime v0.25.11/go.mod h1:r/nEINuHVEpgGhcd2WamU7hD1t/lMnSz8XM44Autltc=
 k8s.io/client-go v0.25.11 h1:DJQ141UsbNRI6wYSlcYLP5J5BW5Wq7Bgm42Ztq2SW70=
@@ -3553,40 +2705,6 @@ k8s.io/kubectl v0.25.11 h1:6bsft5Gan6BCvQ7cJbDRFjTm4Zfq8GuUYpsWAdVngYE=
 k8s.io/kubectl v0.25.11/go.mod h1:8mIfgkFgT+yJ8/TlmPW1qoRh46H2si9q5nW8id7i9iM=
 k8s.io/utils v0.0.0-20230711102312-30195339c3c7 h1:ZgnF1KZsYxWIifwSNZFZgNtWE89WI5yiP5WwlfDoIyc=
 k8s.io/utils v0.0.0-20230711102312-30195339c3c7/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
-lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
-modernc.org/cc/v3 v3.36.0/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI=
-modernc.org/cc/v3 v3.36.2/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI=
-modernc.org/cc/v3 v3.36.3/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI=
-modernc.org/ccgo/v3 v3.0.0-20220428102840-41399a37e894/go.mod h1:eI31LL8EwEBKPpNpA4bU1/i+sKOwOrQy8D87zWUcRZc=
-modernc.org/ccgo/v3 v3.0.0-20220430103911-bc99d88307be/go.mod h1:bwdAnOoaIt8Ax9YdWGjxWsdkPcZyRPHqrOvJxaKAKGw=
-modernc.org/ccgo/v3 v3.16.4/go.mod h1:tGtX0gE9Jn7hdZFeU88slbTh1UtCYKusWOoCJuvkWsQ=
-modernc.org/ccgo/v3 v3.16.6/go.mod h1:tGtX0gE9Jn7hdZFeU88slbTh1UtCYKusWOoCJuvkWsQ=
-modernc.org/ccgo/v3 v3.16.8/go.mod h1:zNjwkizS+fIFDrDjIAgBSCLkWbJuHF+ar3QRn+Z9aws=
-modernc.org/ccgo/v3 v3.16.9/go.mod h1:zNMzC9A9xeNUepy6KuZBbugn3c0Mc9TeiJO4lgvkJDo=
-modernc.org/ccorpus v1.11.6/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ=
-modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM=
-modernc.org/libc v0.0.0-20220428101251-2d5f3daf273b/go.mod h1:p7Mg4+koNjc8jkqwcoFBJx7tXkpj00G77X7A72jXPXA=
-modernc.org/libc v1.16.0/go.mod h1:N4LD6DBE9cf+Dzf9buBlzVJndKr/iJHG97vGLHYnb5A=
-modernc.org/libc v1.16.1/go.mod h1:JjJE0eu4yeK7tab2n4S1w8tlWd9MxXLRzheaRnAKymU=
-modernc.org/libc v1.16.17/go.mod h1:hYIV5VZczAmGZAnG15Vdngn5HSF5cSkbvfz2B7GRuVU=
-modernc.org/libc v1.16.19/go.mod h1:p7Mg4+koNjc8jkqwcoFBJx7tXkpj00G77X7A72jXPXA=
-modernc.org/libc v1.17.0/go.mod h1:XsgLldpP4aWlPlsjqKRdHPqCxCjISdHfM/yeWC5GyW0=
-modernc.org/libc v1.17.1/go.mod h1:FZ23b+8LjxZs7XtFMbSzL/EhPxNbfZbErxEHc7cbD9s=
-modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/memory v1.1.1/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw=
-modernc.org/memory v1.2.0/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw=
-modernc.org/memory v1.2.1/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
-modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
-modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
-modernc.org/sqlite v1.18.1/go.mod h1:6ho+Gow7oX5V+OiOQ6Tr4xeqbx13UZ6t+Fw9IRUG4d4=
-modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw=
-modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw=
-modernc.org/tcl v1.13.1/go.mod h1:XOLfOwzhkljL4itZkK6T72ckMgvj0BDsnKNdZVUOecw=
-modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
-modernc.org/z v1.5.1/go.mod h1:eWFB510QWW5Th9YGZT81s+LwvaAs3Q2yr4sP0rmLkv8=
 nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g=
 nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
 pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA=

From bc5c3fa26b878436f23f8e0f59786b4dc41e867b Mon Sep 17 00:00:00 2001
From: Akshay Aggarwal <akshay.aggarwal@smartcontract.com>
Date: Fri, 1 Dec 2023 19:54:47 +0530
Subject: [PATCH 057/130] Add NOTE for enum duplication and todo to resovle it
 (#11444)

---
 .../plugins/ocr2keeper/evmregistry/v21/encoding/interface.go  | 4 ++++
 .../evmregistry/v21/mercury/upkeep_failure_reasons.go         | 2 ++
 .../ocr2keeper/evmregistry/v21/mercury/upkeep_states.go       | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/interface.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/interface.go
index 83ace2492f5..06a3e7b106b 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/interface.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/interface.go
@@ -11,6 +11,8 @@ import (
 )
 
 const (
+	// NOTE: This enum should be kept in sync with evmregistry/v21/mercury/upkeep_failure_reasons.go
+	// TODO (AUTO-7928) Remove this duplication
 	// upkeep failure onchain reasons
 	UpkeepFailureReasonNone                    uint8 = 0
 	UpkeepFailureReasonUpkeepCancelled         uint8 = 1
@@ -30,6 +32,8 @@ const (
 	UpkeepFailureReasonSimulationFailed        uint8 = 35
 	UpkeepFailureReasonTxHashReorged           uint8 = 36
 
+	// NOTE: This enum should be kept in sync with evmregistry/v21/mercury/upkeep_states.go
+	// TODO (AUTO-7928) Remove this duplication
 	// pipeline execution error
 	NoPipelineError        uint8 = 0
 	CheckBlockTooOld       uint8 = 1
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/upkeep_failure_reasons.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/upkeep_failure_reasons.go
index 261fc33bd46..66f8bca402f 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/upkeep_failure_reasons.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/upkeep_failure_reasons.go
@@ -2,6 +2,8 @@ package mercury
 
 type MercuryUpkeepFailureReason uint8
 
+// NOTE: This enum should be kept in sync with evmregistry/v21/encoding/interface.go
+// TODO (AUTO-7928) Remove this duplication
 const (
 	// upkeep failure onchain reasons
 	MercuryUpkeepFailureReasonNone                    MercuryUpkeepFailureReason = 0
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/upkeep_states.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/upkeep_states.go
index 4e9cd14aee3..0d8276ff2de 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/upkeep_states.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/upkeep_states.go
@@ -2,6 +2,8 @@ package mercury
 
 type MercuryUpkeepState uint8
 
+// NOTE: This enum should be kept in sync with evmregistry/v21/encoding/interface.go
+// TODO (AUTO-7928) Remove this duplication
 const (
 	NoPipelineError        MercuryUpkeepState = 0
 	RpcFlakyFailure        MercuryUpkeepState = 3

From 6ffc0d9bbc2500027cf1bc8b3c822a533740aefe Mon Sep 17 00:00:00 2001
From: Patrick <patrick.huie@smartcontract.com>
Date: Fri, 1 Dec 2023 09:29:51 -0500
Subject: [PATCH 058/130] Fix keystore enable to upsert, now restores
 accidentally deleted keys (#11438)

* Fix keystore enable to upsert, now restores accidentally deleted keys

* BCF-2828: adding evm.key_states insert for Disable keys evm route as well

---------

Co-authored-by: ilija <pavlovicilija42@gmail.com>
Co-authored-by: ilija42 <57732589+ilija42@users.noreply.github.com>
---
 core/services/keystore/eth.go      | 13 +++++++----
 core/services/keystore/eth_test.go | 35 ++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/core/services/keystore/eth.go b/core/services/keystore/eth.go
index cea7b6762e0..0e86cccacae 100644
--- a/core/services/keystore/eth.go
+++ b/core/services/keystore/eth.go
@@ -250,13 +250,18 @@ func (ks *eth) Disable(address common.Address, chainID *big.Int, qopts ...pg.QOp
 func (ks *eth) disable(address common.Address, chainID *big.Int, qopts ...pg.QOpt) error {
 	state := new(ethkey.State)
 	q := ks.q.WithOpts(qopts...)
-	sql := `UPDATE evm.key_states SET disabled = false, updated_at = NOW() WHERE address = $1 AND evm_chain_id = $2
-			RETURNING id, address, evm_chain_id, disabled, created_at, updated_at;`
+	sql := `INSERT INTO evm.key_states as key_states ("address", "evm_chain_id", "disabled", "created_at", "updated_at") VALUES ($1, $2, true, NOW(), NOW())
+			ON CONFLICT ("address", "evm_chain_id") DO UPDATE SET "disabled" = true, "updated_at" = NOW() WHERE key_states."address" = $1 AND key_states."evm_chain_id" = $2
+			RETURNING *;`
 	if err := q.Get(state, sql, address, chainID.String()); err != nil {
-		return errors.Wrap(err, "failed to enable state")
+		return errors.Wrap(err, "failed to disable state")
 	}
 
-	ks.keyStates.disable(address, chainID, state.UpdatedAt)
+	if state.CreatedAt.Equal(state.UpdatedAt) {
+		ks.keyStates.add(state)
+	} else {
+		ks.keyStates.disable(address, chainID, state.UpdatedAt)
+	}
 	ks.notify()
 	return nil
 }
diff --git a/core/services/keystore/eth_test.go b/core/services/keystore/eth_test.go
index d9c5cf5cb89..42d6c575376 100644
--- a/core/services/keystore/eth_test.go
+++ b/core/services/keystore/eth_test.go
@@ -788,3 +788,38 @@ func Test_EthKeyStore_CheckEnabled(t *testing.T) {
 		require.Contains(t, err.Error(), fmt.Sprintf("eth key with address %s exists but is disabled for chain 1337 (enabled only for chain IDs: 0)", addr2.Hex()))
 	})
 }
+
+func Test_EthKeyStore_Disable(t *testing.T) {
+	t.Parallel()
+
+	db := pgtest.NewSqlxDB(t)
+	cfg := configtest.NewTestGeneralConfig(t)
+	keyStore := cltest.NewKeyStore(t, db, cfg.Database())
+	ks := keyStore.Eth()
+
+	t.Run("creates key, deletes it unsafely and then enable creates it again", func(t *testing.T) {
+		k, _ := cltest.MustInsertRandomKeyNoChains(t, ks)
+		require.NoError(t, ks.Add(k.Address, testutils.SimulatedChainID))
+		_, err := db.Exec("DELETE FROM evm.key_states WHERE address = $1", k.Address)
+		require.NoError(t, err)
+		require.NoError(t, ks.Disable(k.Address, testutils.SimulatedChainID))
+		key, err := ks.GetState(k.Address.Hex(), testutils.SimulatedChainID)
+		require.NoError(t, err)
+		require.Equal(t, key.Disabled, true)
+	})
+
+	t.Run("creates key and enables it if it exists in the keystore, but is missing from key states db table", func(t *testing.T) {
+		k, _ := cltest.MustInsertRandomKeyNoChains(t, ks)
+		require.NoError(t, ks.Disable(k.Address, testutils.SimulatedChainID))
+		key, err := ks.GetState(k.Address.Hex(), testutils.SimulatedChainID)
+		require.NoError(t, err)
+		require.Equal(t, key.Disabled, true)
+	})
+
+	t.Run("errors if key is not present in keystore", func(t *testing.T) {
+		addrNotInKs := testutils.NewAddress()
+		require.Error(t, ks.Disable(addrNotInKs, testutils.SimulatedChainID))
+		_, err := ks.GetState(addrNotInKs.Hex(), testutils.SimulatedChainID)
+		require.Error(t, err)
+	})
+}

From 037c86be4466ad9668487c4acf9351130e734f37 Mon Sep 17 00:00:00 2001
From: Jordan Krage <jmank88@gmail.com>
Date: Fri, 1 Dec 2023 08:31:04 -0600
Subject: [PATCH 059/130] bump golang.org/x/... (#10449)

---
 core/scripts/go.mod      | 16 ++++++------
 core/scripts/go.sum      | 47 ++++++++++++++++-----------------
 go.mod                   | 20 ++++++++------
 go.sum                   | 56 +++++++++++++++++++++-------------------
 integration-tests/go.mod | 20 +++++++-------
 integration-tests/go.sum | 47 ++++++++++++++++-----------------
 6 files changed, 107 insertions(+), 99 deletions(-)

diff --git a/core/scripts/go.mod b/core/scripts/go.mod
index 2de09adab56..c2f94a7edf2 100644
--- a/core/scripts/go.mod
+++ b/core/scripts/go.mod
@@ -357,17 +357,17 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/ratelimit v0.2.0 // indirect
 	go.uber.org/zap v1.26.0 // indirect
-	golang.org/x/arch v0.4.0 // indirect
-	golang.org/x/crypto v0.15.0 // indirect
-	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
+	golang.org/x/arch v0.6.0 // indirect
+	golang.org/x/crypto v0.16.0 // indirect
+	golang.org/x/exp v0.0.0-20231127185646-65229373498e // indirect
 	golang.org/x/mod v0.14.0 // indirect
-	golang.org/x/net v0.18.0 // indirect
+	golang.org/x/net v0.19.0 // indirect
 	golang.org/x/sync v0.5.0 // indirect
-	golang.org/x/sys v0.14.0 // indirect
-	golang.org/x/term v0.14.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/term v0.15.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.15.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
+	golang.org/x/tools v0.16.0 // indirect
 	gonum.org/v1/gonum v0.14.0 // indirect
 	google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
diff --git a/core/scripts/go.sum b/core/scripts/go.sum
index 9157e968763..67752858e4c 100644
--- a/core/scripts/go.sum
+++ b/core/scripts/go.sum
@@ -26,8 +26,8 @@ cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvf
 cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
 cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
 cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/compute v1.23.2 h1:nWEMDhgbBkBJjfpVySqU4jgWdc22PLR0o4vEexZHers=
-cloud.google.com/go/compute v1.23.2/go.mod h1:JJ0atRC0J/oWYiiVBmsSsrRnh92DhZPG4hFDcR04Rns=
+cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk=
+cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI=
 cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
 cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
@@ -1761,8 +1761,8 @@ go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
 go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
 go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
-golang.org/x/arch v0.4.0 h1:A8WCeEWhLwPBKNbFi5Wv5UTCBx5zzubnXDlMOFAzFMc=
-golang.org/x/arch v0.4.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
+golang.org/x/arch v0.6.0 h1:S0JTfE48HbRj80+4tbvZDYsJ3tGv6BUU3XxyZ7CirAc=
+golang.org/x/arch v0.6.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -1800,8 +1800,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
-golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
-golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
+golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
+golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -1812,8 +1812,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
-golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
+golang.org/x/exp v0.0.0-20231127185646-65229373498e h1:Gvh4YaCaXNs6dKTlfgismwWZKyjVZXwOPfIyUaqU3No=
+golang.org/x/exp v0.0.0-20231127185646-65229373498e/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -1902,8 +1902,8 @@ golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
-golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
-golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
+golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
+golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1914,8 +1914,8 @@ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210413134643-5e61552d6c78/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY=
-golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0=
+golang.org/x/oauth2 v0.15.0 h1:s8pnnxNVzjWyrvYdFUQq5llS1PX2zhPXmccZv99h7uQ=
+golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -2024,16 +2024,16 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
-golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
-golang.org/x/term v0.14.0 h1:LGK9IlZ8T9jvdy6cTdfKUCltatMFOehAQo9SRC46UQ8=
-golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww=
+golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
+golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -2051,8 +2051,8 @@ golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
+golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181130052023-1c3d964395ce/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -2122,8 +2122,8 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8=
-golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk=
+golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM=
+golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -2131,8 +2131,8 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
-golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
-golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
+golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=
+golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
 gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0=
 gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
@@ -2164,8 +2164,9 @@ google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww
 google.golang.org/appengine v1.6.2/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
+google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
 google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
diff --git a/go.mod b/go.mod
index 670ec435ea1..a73fa5c5d16 100644
--- a/go.mod
+++ b/go.mod
@@ -89,13 +89,13 @@ require (
 	go.dedis.ch/kyber/v3 v3.1.0
 	go.uber.org/multierr v1.11.0
 	go.uber.org/zap v1.26.0
-	golang.org/x/crypto v0.15.0
-	golang.org/x/exp v0.0.0-20231006140011-7918f672742d
+	golang.org/x/crypto v0.16.0
+	golang.org/x/exp v0.0.0-20231127185646-65229373498e
 	golang.org/x/sync v0.5.0
-	golang.org/x/term v0.14.0
+	golang.org/x/term v0.15.0
 	golang.org/x/text v0.14.0
-	golang.org/x/time v0.3.0
-	golang.org/x/tools v0.15.0
+	golang.org/x/time v0.5.0
+	golang.org/x/tools v0.16.0
 	gonum.org/v1/gonum v0.14.0
 	google.golang.org/grpc v1.59.0
 	google.golang.org/protobuf v1.31.0
@@ -105,6 +105,7 @@ require (
 )
 
 require (
+	cloud.google.com/go/compute v1.23.3 // indirect
 	contrib.go.opencensus.io/exporter/stackdriver v0.13.5 // indirect
 	cosmossdk.io/api v0.3.1 // indirect
 	cosmossdk.io/core v0.5.1 // indirect
@@ -363,9 +364,12 @@ require (
 	go.opentelemetry.io/otel/trace v1.21.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
 	go.uber.org/ratelimit v0.2.0 // indirect
-	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/net v0.18.0 // indirect
-	golang.org/x/sys v0.14.0 // indirect
+	golang.org/x/arch v0.6.0 // indirect
+	golang.org/x/net v0.19.0 // indirect
+	golang.org/x/oauth2 v0.15.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
diff --git a/go.sum b/go.sum
index 74a086d6cf4..0aa3ca40a0c 100644
--- a/go.sum
+++ b/go.sum
@@ -26,8 +26,8 @@ cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvf
 cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
 cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
 cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/compute v1.23.2 h1:nWEMDhgbBkBJjfpVySqU4jgWdc22PLR0o4vEexZHers=
-cloud.google.com/go/compute v1.23.2/go.mod h1:JJ0atRC0J/oWYiiVBmsSsrRnh92DhZPG4hFDcR04Rns=
+cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk=
+cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI=
 cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
 cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
@@ -624,8 +624,8 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
 github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/enterprise-certificate-proxy v0.3.1 h1:SBWmZhjUDRorQxrN0nwzf+AHBxnbFjViHQS4P0yVpmQ=
-github.com/googleapis/enterprise-certificate-proxy v0.3.1/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0=
+github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs=
+github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas=
@@ -1765,8 +1765,8 @@ go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
 go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
 go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
-golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k=
-golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
+golang.org/x/arch v0.6.0 h1:S0JTfE48HbRj80+4tbvZDYsJ3tGv6BUU3XxyZ7CirAc=
+golang.org/x/arch v0.6.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -1805,8 +1805,8 @@ golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
-golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
-golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
+golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
+golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -1817,8 +1817,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
-golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
+golang.org/x/exp v0.0.0-20231127185646-65229373498e h1:Gvh4YaCaXNs6dKTlfgismwWZKyjVZXwOPfIyUaqU3No=
+golang.org/x/exp v0.0.0-20231127185646-65229373498e/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -1908,8 +1908,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
-golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
-golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
+golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
+golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1920,8 +1920,8 @@ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210413134643-5e61552d6c78/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY=
-golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0=
+golang.org/x/oauth2 v0.15.0 h1:s8pnnxNVzjWyrvYdFUQq5llS1PX2zhPXmccZv99h7uQ=
+golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -2030,8 +2030,8 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
-golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -2039,8 +2039,8 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
-golang.org/x/term v0.14.0 h1:LGK9IlZ8T9jvdy6cTdfKUCltatMFOehAQo9SRC46UQ8=
-golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww=
+golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
+golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -2050,6 +2050,7 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
@@ -2059,8 +2060,8 @@ golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
+golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181130052023-1c3d964395ce/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -2129,8 +2130,8 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8=
-golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk=
+golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM=
+golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -2138,8 +2139,8 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
-golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
-golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
+golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=
+golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
 gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0=
 gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
@@ -2162,8 +2163,8 @@ google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz513
 google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
 google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
 google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
-google.golang.org/api v0.147.0 h1:Can3FaQo9LlVqxJCodNmeZW/ib3/qKAY3rFeXiHo5gc=
-google.golang.org/api v0.147.0/go.mod h1:pQ/9j83DcmPd/5C9e2nFOdjjNkDZ1G+zkbK2uvdkJMs=
+google.golang.org/api v0.149.0 h1:b2CqT6kG+zqJIVKRQ3ELJVLN1PwHZ6DJ3dW8yl82rgY=
+google.golang.org/api v0.149.0/go.mod h1:Mwn1B7JTXrzXtnvmzQE2BD6bYZQ8DShKZDZbeN9I7qI=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -2171,8 +2172,9 @@ google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww
 google.golang.org/appengine v1.6.2/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
+google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
 google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index 9bcd36470b8..7f524ec4928 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -460,20 +460,20 @@ require (
 	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/goleak v1.3.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/arch v0.4.0 // indirect
-	golang.org/x/crypto v0.15.0 // indirect
-	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
+	golang.org/x/arch v0.6.0 // indirect
+	golang.org/x/crypto v0.16.0 // indirect
+	golang.org/x/exp v0.0.0-20231127185646-65229373498e // indirect
 	golang.org/x/mod v0.14.0 // indirect
-	golang.org/x/net v0.18.0 // indirect
-	golang.org/x/oauth2 v0.13.0 // indirect
-	golang.org/x/sys v0.14.0 // indirect
-	golang.org/x/term v0.14.0 // indirect
+	golang.org/x/net v0.19.0 // indirect
+	golang.org/x/oauth2 v0.15.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/term v0.15.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.15.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
+	golang.org/x/tools v0.16.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	gonum.org/v1/gonum v0.14.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index 17ff5e3030c..d4ca22912e7 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -26,8 +26,8 @@ cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvf
 cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
 cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
 cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/compute v1.23.2 h1:nWEMDhgbBkBJjfpVySqU4jgWdc22PLR0o4vEexZHers=
-cloud.google.com/go/compute v1.23.2/go.mod h1:JJ0atRC0J/oWYiiVBmsSsrRnh92DhZPG4hFDcR04Rns=
+cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk=
+cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI=
 cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
 cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
@@ -2086,8 +2086,8 @@ go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
 go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
 go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
-golang.org/x/arch v0.4.0 h1:A8WCeEWhLwPBKNbFi5Wv5UTCBx5zzubnXDlMOFAzFMc=
-golang.org/x/arch v0.4.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
+golang.org/x/arch v0.6.0 h1:S0JTfE48HbRj80+4tbvZDYsJ3tGv6BUU3XxyZ7CirAc=
+golang.org/x/arch v0.6.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -2129,8 +2129,8 @@ golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
-golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
-golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
+golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
+golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -2141,8 +2141,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
-golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
+golang.org/x/exp v0.0.0-20231127185646-65229373498e h1:Gvh4YaCaXNs6dKTlfgismwWZKyjVZXwOPfIyUaqU3No=
+golang.org/x/exp v0.0.0-20231127185646-65229373498e/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -2240,8 +2240,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
 golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
-golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
-golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
+golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
+golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -2253,8 +2253,8 @@ golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210413134643-5e61552d6c78/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY=
-golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0=
+golang.org/x/oauth2 v0.15.0 h1:s8pnnxNVzjWyrvYdFUQq5llS1PX2zhPXmccZv99h7uQ=
+golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -2377,8 +2377,8 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
-golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -2386,8 +2386,8 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
-golang.org/x/term v0.14.0 h1:LGK9IlZ8T9jvdy6cTdfKUCltatMFOehAQo9SRC46UQ8=
-golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww=
+golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
+golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -2407,8 +2407,8 @@ golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
+golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181130052023-1c3d964395ce/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -2482,8 +2482,8 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8=
-golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk=
+golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM=
+golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -2491,8 +2491,8 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
-golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
-golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
+golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=
+golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
 gomodules.xyz/jsonpatch/v2 v2.2.0 h1:4pT439QV83L+G9FkcCriY6EkpcK6r6bK+A5FBUMI7qY=
 gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY=
 gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0=
@@ -2526,8 +2526,9 @@ google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww
 google.golang.org/appengine v1.6.2/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
+google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
 google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=

From 1b20f8ae9d75796a39f62ada58975448bcb4a943 Mon Sep 17 00:00:00 2001
From: Akshay Aggarwal <akshay.aggarwal@smartcontract.com>
Date: Fri, 1 Dec 2023 21:23:47 +0530
Subject: [PATCH 060/130] Delete unused custom telemetry files (#11441)

---
 .../plugins/ocr2keeper/custom_telemetry.go    | 159 ------------------
 .../ocr2keeper/custom_telemetry_test.go       |  17 --
 2 files changed, 176 deletions(-)
 delete mode 100644 core/services/ocr2/plugins/ocr2keeper/custom_telemetry.go
 delete mode 100644 core/services/ocr2/plugins/ocr2keeper/custom_telemetry_test.go

diff --git a/core/services/ocr2/plugins/ocr2keeper/custom_telemetry.go b/core/services/ocr2/plugins/ocr2keeper/custom_telemetry.go
deleted file mode 100644
index d250df4afe1..00000000000
--- a/core/services/ocr2/plugins/ocr2keeper/custom_telemetry.go
+++ /dev/null
@@ -1,159 +0,0 @@
-package ocr2keeper
-
-import (
-	"context"
-	"encoding/hex"
-	"time"
-
-	"google.golang.org/protobuf/proto"
-
-	"github.com/smartcontractkit/libocr/commontypes"
-	"github.com/smartcontractkit/libocr/offchainreporting2plus/types"
-
-	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"
-
-	"github.com/smartcontractkit/chainlink-common/pkg/services"
-
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	evm21 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21"
-	"github.com/smartcontractkit/chainlink/v2/core/services/synchronization/telem"
-	"github.com/smartcontractkit/chainlink/v2/core/static"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
-)
-
-type AutomationCustomTelemetryService struct {
-	services.StateMachine
-	monitoringEndpoint    commontypes.MonitoringEndpoint
-	blockSubscriber       *evm21.BlockSubscriber
-	blockSubChanID        int
-	threadCtrl            utils.ThreadControl
-	lggr                  logger.Logger
-	configDigest          [32]byte
-	contractConfigTracker types.ContractConfigTracker
-}
-
-// NewAutomationCustomTelemetryService creates a telemetry service for new blocks and node version
-func NewAutomationCustomTelemetryService(me commontypes.MonitoringEndpoint,
-	lggr logger.Logger, blocksub *evm21.BlockSubscriber, configTracker types.ContractConfigTracker) (*AutomationCustomTelemetryService, error) {
-	return &AutomationCustomTelemetryService{
-		monitoringEndpoint:    me,
-		threadCtrl:            utils.NewThreadControl(),
-		lggr:                  lggr.Named("AutomationCustomTelem"),
-		contractConfigTracker: configTracker,
-		blockSubscriber:       blocksub,
-	}, nil
-}
-
-// Start starts Custom Telemetry Service, sends 1 NodeVersion message to endpoint at start and sends new BlockNumber messages
-func (e *AutomationCustomTelemetryService) Start(ctx context.Context) error {
-	return e.StartOnce("AutomationCustomTelemetryService", func() error {
-		e.lggr.Infof("Starting: Custom Telemetry Service")
-		_, configDetails, err := e.contractConfigTracker.LatestConfigDetails(ctx)
-		if err != nil {
-			e.lggr.Errorf("Error occurred while getting newestConfigDetails for initialization %s", err)
-		} else {
-			e.configDigest = configDetails
-			e.sendNodeVersionMsg()
-		}
-		e.threadCtrl.Go(func(ctx context.Context) {
-			ticker := time.NewTicker(1 * time.Minute)
-			defer ticker.Stop()
-			for {
-				select {
-				case <-ticker.C:
-					_, newConfigDigest, err := e.contractConfigTracker.LatestConfigDetails(ctx)
-					if err != nil {
-						e.lggr.Errorf("Error occurred while getting newestConfigDetails in configDigest loop %s", err)
-					}
-					if newConfigDigest != e.configDigest {
-						e.configDigest = newConfigDigest
-						e.sendNodeVersionMsg()
-					}
-				case <-ctx.Done():
-					return
-				}
-			}
-		})
-
-		chanID, blockSubscriberChan, blockSubErr := e.blockSubscriber.Subscribe()
-		if blockSubErr != nil {
-			e.lggr.Errorf("Block Subscriber Error: Subscribe(): %s", blockSubErr)
-
-		} else {
-			e.blockSubChanID = chanID
-			e.threadCtrl.Go(func(ctx context.Context) {
-				e.lggr.Infof("Started: Sending BlockNumber Messages")
-				for {
-					select {
-					case blockHistory := <-blockSubscriberChan:
-						latestBlockKey, err := blockHistory.Latest()
-						if err != nil {
-							e.lggr.Errorf("BlockSubscriber BlockHistory.Latest() failed: %s", err)
-							continue
-						}
-						e.sendBlockNumberMsg(latestBlockKey)
-					case <-ctx.Done():
-						return
-					}
-				}
-			})
-		}
-		return nil
-	})
-}
-
-// Close stops go routines and closes channels
-func (e *AutomationCustomTelemetryService) Close() error {
-	// use utils
-	return e.StopOnce("AutomationCustomTelemetryService", func() error {
-		e.lggr.Infof("Stopping: custom telemetry service")
-		e.threadCtrl.Close()
-		err := e.blockSubscriber.Unsubscribe(e.blockSubChanID)
-		if err != nil {
-			return err
-		}
-		e.lggr.Infof("Stopped: Custom telemetry service")
-		return nil
-	})
-}
-
-func (e *AutomationCustomTelemetryService) sendNodeVersionMsg() {
-	vMsg := &telem.NodeVersion{
-		Timestamp:    uint64(time.Now().UTC().UnixMilli()),
-		NodeVersion:  static.Version,
-		ConfigDigest: e.configDigest[:],
-	}
-	wrappedVMsg := &telem.AutomationTelemWrapper{
-		Msg: &telem.AutomationTelemWrapper_NodeVersion{
-			NodeVersion: vMsg,
-		},
-	}
-	bytes, err := proto.Marshal(wrappedVMsg)
-	if err != nil {
-		e.lggr.Errorf("Error occurred while marshalling the Node Version Message %s: %v", wrappedVMsg.String(), err)
-	} else {
-		e.monitoringEndpoint.SendLog(bytes)
-		e.lggr.Infof("NodeVersion Message Sent to Endpoint: %d", vMsg.Timestamp)
-	}
-}
-
-func (e *AutomationCustomTelemetryService) sendBlockNumberMsg(blockKey ocr2keepers.BlockKey) {
-	blockNumMsg := &telem.BlockNumber{
-		Timestamp:    uint64(time.Now().UTC().UnixMilli()),
-		BlockNumber:  uint64(blockKey.Number),
-		BlockHash:    hex.EncodeToString(blockKey.Hash[:]),
-		ConfigDigest: e.configDigest[:],
-	}
-	wrappedBlockNumMsg := &telem.AutomationTelemWrapper{
-		Msg: &telem.AutomationTelemWrapper_BlockNumber{
-			BlockNumber: blockNumMsg,
-		},
-	}
-	b, err := proto.Marshal(wrappedBlockNumMsg)
-	if err != nil {
-		e.lggr.Errorf("Error occurred while marshalling the Block Num Message %s: %v", wrappedBlockNumMsg.String(), err)
-	} else {
-		e.monitoringEndpoint.SendLog(b)
-		e.lggr.Infof("BlockNumber Message Sent to Endpoint: %d", blockNumMsg.Timestamp)
-	}
-}
diff --git a/core/services/ocr2/plugins/ocr2keeper/custom_telemetry_test.go b/core/services/ocr2/plugins/ocr2keeper/custom_telemetry_test.go
deleted file mode 100644
index a40a3f3525d..00000000000
--- a/core/services/ocr2/plugins/ocr2keeper/custom_telemetry_test.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package ocr2keeper
-
-import (
-	"testing"
-)
-
-func TestNewAutomationCustomTelemetryService(t *testing.T) {
-	// me := &MockMonitoringEndpoint{}
-	// lggr := &MockLogger{}
-	// blocksub := &MockBlockSubscriber{}
-	// configTracker := &MockContractConfigTracker{}
-
-	// service, err := NewAutomationCustomTelemetryService(me, lggr, blocksub, configTracker)
-	// if err != nil {
-	// 	t.Errorf("Expected no error, but got: %v", err)
-	// }
-}

From 73696e7bf2947a50692466b83cb7cfe181090057 Mon Sep 17 00:00:00 2001
From: Akshay Aggarwal <akshay.aggarwal@smartcontract.com>
Date: Fri, 1 Dec 2023 21:52:28 +0530
Subject: [PATCH 061/130] Small cleanup in mercury v0.3 request code (#11442)

---
 .../evmregistry/v21/mercury/v03/request.go    | 35 +++++++------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/v03/request.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/v03/request.go
index 7002e2f30ac..cb3c9ef3222 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/v03/request.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/v03/request.go
@@ -3,7 +3,6 @@ package v03
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -62,12 +61,11 @@ func NewClient(mercuryConfig mercury.MercuryConfigProvider, httpClient mercury.H
 }
 
 func (c *client) DoRequest(ctx context.Context, streamsLookup *mercury.StreamsLookup, pluginRetryKey string) (mercury.MercuryUpkeepState, mercury.MercuryUpkeepFailureReason, [][]byte, bool, time.Duration, error) {
-	resultLen := len(streamsLookup.Feeds)
-	ch := make(chan mercury.MercuryData, resultLen)
 	if len(streamsLookup.Feeds) == 0 {
 		return mercury.NoPipelineError, mercury.MercuryUpkeepFailureReasonInvalidRevertDataInput, [][]byte{}, false, 0 * time.Second, fmt.Errorf("invalid revert data input: feed param key %s, time param key %s, feeds %s", streamsLookup.FeedParamKey, streamsLookup.TimeParamKey, streamsLookup.Feeds)
 	}
-	resultLen = 1
+	resultLen := 1 // Only 1 multi-feed request is made for all feeds
+	ch := make(chan mercury.MercuryData, resultLen)
 	c.threadCtrl.Go(func(ctx context.Context) {
 		c.multiFeedsRequest(ctx, ch, streamsLookup)
 	})
@@ -75,29 +73,22 @@ func (c *client) DoRequest(ctx context.Context, streamsLookup *mercury.StreamsLo
 	var reqErr error
 	var retryInterval time.Duration
 	results := make([][]byte, len(streamsLookup.Feeds))
-	retryable := true
-	allSuccess := true
+	retryable := false
 	state := mercury.NoPipelineError
 
-	for i := 0; i < resultLen; i++ {
-		m := <-ch
-		if m.Error != nil {
-			reqErr = errors.Join(reqErr, m.Error)
-			retryable = retryable && m.Retryable
-			allSuccess = false
-			if m.State != mercury.NoPipelineError {
-				state = m.State
-			}
-			continue
+	m := <-ch
+	if m.Error != nil {
+		reqErr = m.Error
+		retryable = m.Retryable
+		state = m.State
+		if retryable {
+			retryInterval = mercury.CalculateRetryConfigFn(pluginRetryKey, c.mercuryConfig)
 		}
+	} else {
 		results = m.Bytes
 	}
-	// only retry when not all successful AND none are not retryable
-	if retryable && !allSuccess {
-		retryInterval = mercury.CalculateRetryConfigFn(pluginRetryKey, c.mercuryConfig)
-	}
-	// only retry when not all successful AND none are not retryable
-	return state, mercury.MercuryUpkeepFailureReasonNone, results, retryable && !allSuccess, retryInterval, reqErr
+
+	return state, mercury.MercuryUpkeepFailureReasonNone, results, retryable, retryInterval, reqErr
 }
 
 func (c *client) multiFeedsRequest(ctx context.Context, ch chan<- mercury.MercuryData, sl *mercury.StreamsLookup) {

From 3f25ba7cafe1feb354520dad230dd3da1aa9b966 Mon Sep 17 00:00:00 2001
From: Sam <samsondav@protonmail.com>
Date: Fri, 1 Dec 2023 11:35:51 -0500
Subject: [PATCH 062/130] Adjust price scaling factor from 1e8 => 1e18 (#11447)

---
 core/scripts/go.mod      | 2 +-
 core/scripts/go.sum      | 4 ++--
 go.mod                   | 2 +-
 go.sum                   | 4 ++--
 integration-tests/go.mod | 2 +-
 integration-tests/go.sum | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/scripts/go.mod b/core/scripts/go.mod
index c2f94a7edf2..c7af0541c12 100644
--- a/core/scripts/go.mod
+++ b/core/scripts/go.mod
@@ -304,7 +304,7 @@ require (
 	github.com/shirou/gopsutil/v3 v3.23.10 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231130184744-32b4198d2589 // indirect
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231201152724-d550085eb3c4 // indirect
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 // indirect
 	github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d // indirect
 	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3 // indirect
diff --git a/core/scripts/go.sum b/core/scripts/go.sum
index 67752858e4c..7cea79eb76e 100644
--- a/core/scripts/go.sum
+++ b/core/scripts/go.sum
@@ -1504,8 +1504,8 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
 github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
 github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231130184744-32b4198d2589 h1:68YZ874EBGEGwT3lcg6Y+3GZXzyNDeDDiqLHvNMBKYc=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231130184744-32b4198d2589/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231201152724-d550085eb3c4 h1:qau0/AHvPwMR3p6gWsFWC4qVfEtSEALtBetTOpHA2IU=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231201152724-d550085eb3c4/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 h1:oewYJtdRkJKUHCNDCj5C2LQe6Oq6qy975g931nfG0cc=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542/go.mod h1:EpvRoycRD+kniYlz+pCpRT5e+fmPm0mSD/vmND+0oMg=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d h1:w4MsbOtNk6nD/mcXLstHWk9hB6g7QLtcAfhPjhwvOaQ=
diff --git a/go.mod b/go.mod
index a73fa5c5d16..0343f4e7159 100644
--- a/go.mod
+++ b/go.mod
@@ -66,7 +66,7 @@ require (
 	github.com/shopspring/decimal v1.3.1
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704
 	github.com/smartcontractkit/chainlink-automation v1.0.1
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231130184744-32b4198d2589
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231201152724-d550085eb3c4
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542
 	github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d
 	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3
diff --git a/go.sum b/go.sum
index 0aa3ca40a0c..4bd90da600d 100644
--- a/go.sum
+++ b/go.sum
@@ -1507,8 +1507,8 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
 github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
 github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231130184744-32b4198d2589 h1:68YZ874EBGEGwT3lcg6Y+3GZXzyNDeDDiqLHvNMBKYc=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231130184744-32b4198d2589/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231201152724-d550085eb3c4 h1:qau0/AHvPwMR3p6gWsFWC4qVfEtSEALtBetTOpHA2IU=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231201152724-d550085eb3c4/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 h1:oewYJtdRkJKUHCNDCj5C2LQe6Oq6qy975g931nfG0cc=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542/go.mod h1:EpvRoycRD+kniYlz+pCpRT5e+fmPm0mSD/vmND+0oMg=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d h1:w4MsbOtNk6nD/mcXLstHWk9hB6g7QLtcAfhPjhwvOaQ=
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index 7f524ec4928..f95557b2bb1 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/segmentio/ksuid v1.0.4
 	github.com/slack-go/slack v0.12.2
 	github.com/smartcontractkit/chainlink-automation v1.0.1
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231130184744-32b4198d2589
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231201152724-d550085eb3c4
 	github.com/smartcontractkit/chainlink-testing-framework v1.20.0
 	github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
 	github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index d4ca22912e7..b275f6b653a 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -1792,8 +1792,8 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
 github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
 github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231130184744-32b4198d2589 h1:68YZ874EBGEGwT3lcg6Y+3GZXzyNDeDDiqLHvNMBKYc=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231130184744-32b4198d2589/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231201152724-d550085eb3c4 h1:qau0/AHvPwMR3p6gWsFWC4qVfEtSEALtBetTOpHA2IU=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231201152724-d550085eb3c4/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 h1:oewYJtdRkJKUHCNDCj5C2LQe6Oq6qy975g931nfG0cc=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542/go.mod h1:EpvRoycRD+kniYlz+pCpRT5e+fmPm0mSD/vmND+0oMg=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d h1:w4MsbOtNk6nD/mcXLstHWk9hB6g7QLtcAfhPjhwvOaQ=

From 4b60e6e5cc1897249ff83bd7a66d5c78477e025e Mon Sep 17 00:00:00 2001
From: Jordan Krage <jmank88@gmail.com>
Date: Fri, 1 Dec 2023 11:31:28 -0600
Subject: [PATCH 063/130] core/services/synchronization: track go routines to
 block close (#11443)

---
 .../telemetry_ingress_batch_client.go         | 22 ++++++++++---------
 .../telemetry_ingress_client.go               | 12 ++++++----
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/core/services/synchronization/telemetry_ingress_batch_client.go b/core/services/synchronization/telemetry_ingress_batch_client.go
index 5f286f1617b..b8dbb5e5d37 100644
--- a/core/services/synchronization/telemetry_ingress_batch_client.go
+++ b/core/services/synchronization/telemetry_ingress_batch_client.go
@@ -51,7 +51,7 @@ type telemetryIngressBatchClient struct {
 	lggr         logger.Logger
 
 	wgDone sync.WaitGroup
-	chDone chan struct{}
+	chDone services.StopChan
 
 	telemBufferSize   uint
 	telemMaxBatchSize uint
@@ -78,7 +78,7 @@ func NewTelemetryIngressBatchClient(url *url.URL, serverPubKeyHex string, ks key
 		globalLogger:      lggr,
 		logging:           logging,
 		lggr:              lggr.Named("TelemetryIngressBatchClient").Named(network).Named(chainID),
-		chDone:            make(chan struct{}),
+		chDone:            make(services.StopChan),
 		workers:           make(map[string]*telemetryIngressBatchWorker),
 		useUniConn:        useUniconn,
 	}
@@ -103,22 +103,24 @@ func (tc *telemetryIngressBatchClient) Start(ctx context.Context) error {
 		// This is used to call RPC methods on the server
 		if tc.telemClient == nil { // only preset for tests
 			if tc.useUniConn {
+				tc.wgDone.Add(1)
 				go func() {
-					// Use background context to retry forever to connect
-					// Blocks until we connect
-					conn, err := wsrpc.DialUniWithContext(ctx, tc.lggr, tc.url.String(), clientPrivKey, serverPubKey)
+					defer tc.wgDone.Done()
+					ctx2, cancel := tc.chDone.NewCtx()
+					defer cancel()
+					conn, err := wsrpc.DialUniWithContext(ctx2, tc.lggr, tc.url.String(), clientPrivKey, serverPubKey)
 					if err != nil {
-						if ctx.Err() != nil {
+						if ctx2.Err() != nil {
 							tc.lggr.Warnw("gave up connecting to telemetry endpoint", "err", err)
 						} else {
 							tc.lggr.Criticalw("telemetry endpoint dial errored unexpectedly", "err", err)
 							tc.SvcErrBuffer.Append(err)
 						}
-					} else {
-						tc.telemClient = telemPb.NewTelemClient(conn)
-						tc.close = conn.Close
-						tc.connected.Store(true)
+						return
 					}
+					tc.telemClient = telemPb.NewTelemClient(conn)
+					tc.close = conn.Close
+					tc.connected.Store(true)
 				}()
 			} else {
 				// Spawns a goroutine that will eventually connect
diff --git a/core/services/synchronization/telemetry_ingress_client.go b/core/services/synchronization/telemetry_ingress_client.go
index bcad01622ea..75aa3106a8c 100644
--- a/core/services/synchronization/telemetry_ingress_client.go
+++ b/core/services/synchronization/telemetry_ingress_client.go
@@ -65,14 +65,14 @@ func NewTelemetryIngressClient(url *url.URL, serverPubKeyHex string, ks keystore
 }
 
 // Start connects the wsrpc client to the telemetry ingress server
-func (tc *telemetryIngressClient) Start(ctx context.Context) error {
+func (tc *telemetryIngressClient) Start(context.Context) error {
 	return tc.StartOnce("TelemetryIngressClient", func() error {
 		privkey, err := tc.getCSAPrivateKey()
 		if err != nil {
 			return err
 		}
 
-		tc.connect(ctx, privkey)
+		tc.connect(privkey)
 
 		return nil
 	})
@@ -95,14 +95,15 @@ func (tc *telemetryIngressClient) HealthReport() map[string]error {
 	return map[string]error{tc.Name(): tc.Healthy()}
 }
 
-func (tc *telemetryIngressClient) connect(ctx context.Context, clientPrivKey []byte) {
+func (tc *telemetryIngressClient) connect(clientPrivKey []byte) {
 	tc.wgDone.Add(1)
 
 	go func() {
 		defer tc.wgDone.Done()
+		ctx, cancel := tc.chDone.NewCtx()
+		defer cancel()
 
 		serverPubKey := keys.FromHex(tc.serverPubKeyHex)
-
 		conn, err := wsrpc.DialWithContext(ctx, tc.url.String(), wsrpc.WithTransportCreds(clientPrivKey, serverPubKey), wsrpc.WithLogger(tc.lggr))
 		if err != nil {
 			if ctx.Err() != nil {
@@ -111,6 +112,7 @@ func (tc *telemetryIngressClient) connect(ctx context.Context, clientPrivKey []b
 				tc.lggr.Criticalw("telemetry endpoint dial errored unexpectedly", "err", err)
 				tc.SvcErrBuffer.Append(err)
 			}
+			return
 		}
 		defer conn.Close()
 
@@ -130,7 +132,9 @@ func (tc *telemetryIngressClient) connect(ctx context.Context, clientPrivKey []b
 }
 
 func (tc *telemetryIngressClient) handleTelemetry() {
+	tc.wgDone.Add(1)
 	go func() {
+		defer tc.wgDone.Done()
 		ctx, cancel := tc.chDone.NewCtx()
 		defer cancel()
 		for {

From 282bd600aace901163721aff8101b8a65597d056 Mon Sep 17 00:00:00 2001
From: Bolek <1416262+bolekk@users.noreply.github.com>
Date: Fri, 1 Dec 2023 09:41:12 -0800
Subject: [PATCH 064/130] [Functions] Fix heartbeat handler test (#11449)

Response is asynchronous so we need to "await" it.
---
 .../functions/connector_handler_test.go       | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/core/services/functions/connector_handler_test.go b/core/services/functions/connector_handler_test.go
index fe1a1baa6fc..409f9cdcc56 100644
--- a/core/services/functions/connector_handler_test.go
+++ b/core/services/functions/connector_handler_test.go
@@ -7,8 +7,10 @@ import (
 	"errors"
 	"math/big"
 	"testing"
+	"time"
 
 	geth_common "github.com/ethereum/go-ethereum/common"
+	"github.com/onsi/gomega"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
@@ -300,15 +302,19 @@ func TestFunctionsConnectorHandler(t *testing.T) {
 		connector.On("SendToGateway", mock.Anything, "gw1", mock.Anything).Return(nil).Once()
 		handler.HandleGatewayMessage(ctx, "gw1", msg)
 
-		// second call to collect the response
-		allowlist.On("Allow", addr).Return(true).Once()
-		connector.On("SendToGateway", mock.Anything, "gw1", mock.Anything).Run(func(args mock.Arguments) {
-			respMsg, ok := args[2].(*api.Message)
-			require.True(t, ok)
-			require.NoError(t, json.Unmarshal(respMsg.Body.Payload, &response))
-			require.Equal(t, functions.RequestStateInternalError, response.Status)
-		}).Return(nil).Once()
-		handler.HandleGatewayMessage(ctx, "gw1", msg)
+		// collect the response - should eventually result in an internal error
+		gomega.NewGomegaWithT(t).Eventually(func() bool {
+			returnedState := 0
+			allowlist.On("Allow", addr).Return(true).Once()
+			connector.On("SendToGateway", mock.Anything, "gw1", mock.Anything).Run(func(args mock.Arguments) {
+				respMsg, ok := args[2].(*api.Message)
+				require.True(t, ok)
+				require.NoError(t, json.Unmarshal(respMsg.Body.Payload, &response))
+				returnedState = response.Status
+			}).Return(nil).Once()
+			handler.HandleGatewayMessage(ctx, "gw1", msg)
+			return returnedState == functions.RequestStateInternalError
+		}, testutils.WaitTimeout(t), 50*time.Millisecond).Should(gomega.BeTrue())
 	})
 
 	t.Run("heartbeat sender address doesn't match", func(t *testing.T) {

From c74b403a6264403fb9bdcc6a5ca7a5052b811a06 Mon Sep 17 00:00:00 2001
From: Sam <samsondav@protonmail.com>
Date: Fri, 1 Dec 2023 12:46:55 -0500
Subject: [PATCH 065/130] mercury cache fixes (#11448)

* Properly pass through config

* Key cache by feed ID, NOT by req

req is a pointer meaning subsequent calls to LatestReport will never hit
the cache

* Remove logger from config
---
 core/cmd/shell.go                             |  1 -
 core/internal/cltest/cltest.go                |  1 -
 .../relay/evm/mercury/wsrpc/cache/cache.go    | 53 +++++++++----------
 .../evm/mercury/wsrpc/cache/cache_set.go      | 23 +++-----
 .../evm/mercury/wsrpc/cache/cache_set_test.go |  2 +-
 .../evm/mercury/wsrpc/cache/cache_test.go     | 22 ++++----
 .../relay/evm/mercury/wsrpc/client_test.go    |  4 +-
 core/services/relay/evm/mercury/wsrpc/pool.go |  5 +-
 8 files changed, 52 insertions(+), 59 deletions(-)

diff --git a/core/cmd/shell.go b/core/cmd/shell.go
index daf936b36c8..2e382be4ccf 100644
--- a/core/cmd/shell.go
+++ b/core/cmd/shell.go
@@ -160,7 +160,6 @@ func (n ChainlinkAppFactory) NewApplication(ctx context.Context, cfg chainlink.G
 	loopRegistry := plugins.NewLoopRegistry(appLggr, cfg.Tracing())
 
 	mercuryPool := wsrpc.NewPool(appLggr, cache.Config{
-		Logger:               appLggr,
 		LatestReportTTL:      cfg.Mercury().Cache().LatestReportTTL(),
 		MaxStaleAge:          cfg.Mercury().Cache().MaxStaleAge(),
 		LatestReportDeadline: cfg.Mercury().Cache().LatestReportDeadline(),
diff --git a/core/internal/cltest/cltest.go b/core/internal/cltest/cltest.go
index fc648486a03..8802d9c4b0d 100644
--- a/core/internal/cltest/cltest.go
+++ b/core/internal/cltest/cltest.go
@@ -345,7 +345,6 @@ func NewApplicationWithConfig(t testing.TB, cfg chainlink.GeneralConfig, flagsAn
 	loopRegistry := plugins.NewLoopRegistry(lggr, nil)
 
 	mercuryPool := wsrpc.NewPool(lggr, cache.Config{
-		Logger:               lggr,
 		LatestReportTTL:      cfg.Mercury().Cache().LatestReportTTL(),
 		MaxStaleAge:          cfg.Mercury().Cache().MaxStaleAge(),
 		LatestReportDeadline: cfg.Mercury().Cache().LatestReportDeadline(),
diff --git a/core/services/relay/evm/mercury/wsrpc/cache/cache.go b/core/services/relay/evm/mercury/wsrpc/cache/cache.go
index 4962210d58f..cab5654081b 100644
--- a/core/services/relay/evm/mercury/wsrpc/cache/cache.go
+++ b/core/services/relay/evm/mercury/wsrpc/cache/cache.go
@@ -63,7 +63,6 @@ type Cache interface {
 }
 
 type Config struct {
-	Logger logger.Logger
 	// LatestReportTTL controls how "stale" we will allow a price to be e.g. if
 	// set to 1s, a new price will always be fetched if the last result was
 	// from more than 1 second ago.
@@ -84,8 +83,8 @@ type Config struct {
 	LatestReportDeadline time.Duration
 }
 
-func NewCache(client Client, cfg Config) Cache {
-	return newMemCache(client, cfg)
+func NewCache(lggr logger.Logger, client Client, cfg Config) Cache {
+	return newMemCache(lggr, client, cfg)
 }
 
 type cacheVal struct {
@@ -164,9 +163,7 @@ type memCache struct {
 
 	client Client
 
-	latestPriceTTL       time.Duration
-	maxStaleAge          time.Duration
-	latestReportDeadline time.Duration
+	cfg Config
 
 	cache sync.Map
 
@@ -174,14 +171,12 @@ type memCache struct {
 	chStop services.StopChan
 }
 
-func newMemCache(client Client, cfg Config) *memCache {
+func newMemCache(lggr logger.Logger, client Client, cfg Config) *memCache {
 	return &memCache{
 		services.StateMachine{},
-		cfg.Logger.Named("MercuryMemCache"),
+		lggr.Named("MemCache"),
 		client,
-		cfg.LatestReportTTL,
-		cfg.MaxStaleAge,
-		cfg.LatestReportDeadline,
+		cfg,
 		sync.Map{},
 		sync.WaitGroup{},
 		make(chan (struct{})),
@@ -197,10 +192,11 @@ func (m *memCache) LatestReport(ctx context.Context, req *pb.LatestReportRequest
 	if req == nil {
 		return nil, errors.New("req must not be nil")
 	}
-	if m.latestPriceTTL <= 0 {
+	feedIDHex := mercuryutils.BytesToFeedID(req.FeedId).String()
+	if m.cfg.LatestReportTTL <= 0 {
 		return m.client.RawClient().LatestReport(ctx, req)
 	}
-	vi, _ := m.cache.LoadOrStore(req, &cacheVal{
+	vi, loaded := m.cache.LoadOrStore(feedIDHex, &cacheVal{
 		sync.RWMutex{},
 		false,
 		nil,
@@ -210,24 +206,26 @@ func (m *memCache) LatestReport(ctx context.Context, req *pb.LatestReportRequest
 	})
 	v := vi.(*cacheVal)
 
+	m.lggr.Tracew("LatestReport", "feedID", feedIDHex, "loaded", loaded)
+
 	// HOT PATH
 	v.RLock()
 	if time.Now().Before(v.expiresAt) {
 		// CACHE HIT
-		promCacheHitCount.WithLabelValues(m.client.ServerURL(), mercuryutils.BytesToFeedID(req.FeedId).String()).Inc()
+		promCacheHitCount.WithLabelValues(m.client.ServerURL(), feedIDHex).Inc()
 
 		defer v.RUnlock()
 		return v.val, nil
 	} else if v.fetching {
 		// CACHE WAIT
-		promCacheWaitCount.WithLabelValues(m.client.ServerURL(), mercuryutils.BytesToFeedID(req.FeedId).String()).Inc()
+		promCacheWaitCount.WithLabelValues(m.client.ServerURL(), feedIDHex).Inc()
 		// if someone else is fetching then wait for the fetch to complete
 		ch := v.fetchCh
 		v.RUnlock()
 		return v.waitForResult(ctx, ch, m.chStop)
 	}
 	// CACHE MISS
-	promCacheMissCount.WithLabelValues(m.client.ServerURL(), mercuryutils.BytesToFeedID(req.FeedId).String()).Inc()
+	promCacheMissCount.WithLabelValues(m.client.ServerURL(), feedIDHex).Inc()
 	// fallthrough to cold path and fetch
 	v.RUnlock()
 
@@ -235,19 +233,19 @@ func (m *memCache) LatestReport(ctx context.Context, req *pb.LatestReportRequest
 	v.Lock()
 	if time.Now().Before(v.expiresAt) {
 		// CACHE HIT
-		promCacheHitCount.WithLabelValues(m.client.ServerURL(), mercuryutils.BytesToFeedID(req.FeedId).String()).Inc()
+		promCacheHitCount.WithLabelValues(m.client.ServerURL(), feedIDHex).Inc()
 		defer v.RUnlock()
 		return v.val, nil
 	} else if v.fetching {
 		// CACHE WAIT
-		promCacheWaitCount.WithLabelValues(m.client.ServerURL(), mercuryutils.BytesToFeedID(req.FeedId).String()).Inc()
+		promCacheWaitCount.WithLabelValues(m.client.ServerURL(), feedIDHex).Inc()
 		// if someone else is fetching then wait for the fetch to complete
 		ch := v.fetchCh
 		v.Unlock()
 		return v.waitForResult(ctx, ch, m.chStop)
 	}
 	// CACHE MISS
-	promCacheMissCount.WithLabelValues(m.client.ServerURL(), mercuryutils.BytesToFeedID(req.FeedId).String()).Inc()
+	promCacheMissCount.WithLabelValues(m.client.ServerURL(), feedIDHex).Inc()
 	// initiate the fetch and wait for result
 	ch := v.initiateFetch()
 	v.Unlock()
@@ -269,7 +267,7 @@ const minBackoffRetryInterval = 50 * time.Millisecond
 // newBackoff creates a backoff for retrying
 func (m *memCache) newBackoff() backoff.Backoff {
 	min := minBackoffRetryInterval
-	max := m.latestPriceTTL / 2
+	max := m.cfg.LatestReportTTL / 2
 	if min > max {
 		// avoid setting a min that is greater than max
 		min = max
@@ -293,7 +291,7 @@ func (m *memCache) fetch(req *pb.LatestReportRequest, v *cacheVal) {
 	var val *pb.LatestReportResponse
 	var err error
 	defer func() {
-		v.completeFetch(val, err, t.Add(m.latestPriceTTL))
+		v.completeFetch(val, err, t.Add(m.cfg.LatestReportTTL))
 	}()
 
 	for {
@@ -301,8 +299,8 @@ func (m *memCache) fetch(req *pb.LatestReportRequest, v *cacheVal) {
 
 		ctx := memcacheCtx
 		cancel := func() {}
-		if m.latestReportDeadline > 0 {
-			ctx, cancel = context.WithTimeoutCause(memcacheCtx, m.latestReportDeadline, errors.New("latest report fetch deadline exceeded"))
+		if m.cfg.LatestReportDeadline > 0 {
+			ctx, cancel = context.WithTimeoutCause(memcacheCtx, m.cfg.LatestReportDeadline, errors.New("latest report fetch deadline exceeded"))
 		}
 
 		// NOTE: must drop down to RawClient here otherwise we enter an
@@ -330,6 +328,7 @@ func (m *memCache) fetch(req *pb.LatestReportRequest, v *cacheVal) {
 
 func (m *memCache) Start(context.Context) error {
 	return m.StartOnce(m.Name(), func() error {
+		m.lggr.Debugw("MemCache starting", "config", m.cfg)
 		m.wg.Add(1)
 		go m.runloop()
 		return nil
@@ -339,16 +338,16 @@ func (m *memCache) Start(context.Context) error {
 func (m *memCache) runloop() {
 	defer m.wg.Done()
 
-	if m.maxStaleAge == 0 {
+	if m.cfg.MaxStaleAge == 0 {
 		return
 	}
-	t := time.NewTicker(utils.WithJitter(m.maxStaleAge))
+	t := time.NewTicker(utils.WithJitter(m.cfg.MaxStaleAge))
 
 	for {
 		select {
 		case <-t.C:
 			m.cleanup()
-			t.Reset(utils.WithJitter(m.maxStaleAge))
+			t.Reset(utils.WithJitter(m.cfg.MaxStaleAge))
 		case <-m.chStop:
 			return
 		}
@@ -372,7 +371,7 @@ func (m *memCache) cleanup() {
 			// skip cleanup if fetching
 			return true
 		}
-		if time.Now().After(v.expiresAt.Add(m.maxStaleAge)) {
+		if time.Now().After(v.expiresAt.Add(m.cfg.MaxStaleAge)) {
 			// garbage collection
 			m.cache.Delete(k)
 		}
diff --git a/core/services/relay/evm/mercury/wsrpc/cache/cache_set.go b/core/services/relay/evm/mercury/wsrpc/cache/cache_set.go
index f06f1137fb3..3171c8ab643 100644
--- a/core/services/relay/evm/mercury/wsrpc/cache/cache_set.go
+++ b/core/services/relay/evm/mercury/wsrpc/cache/cache_set.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"sync"
-	"time"
 
 	"golang.org/x/exp/maps"
 
@@ -28,27 +27,26 @@ type cacheSet struct {
 	lggr   logger.Logger
 	caches map[string]Cache
 
-	latestPriceTTL time.Duration
-	maxStaleAge    time.Duration
+	cfg Config
 }
 
-func NewCacheSet(cfg Config) CacheSet {
-	return newCacheSet(cfg)
+func NewCacheSet(lggr logger.Logger, cfg Config) CacheSet {
+	return newCacheSet(lggr, cfg)
 }
 
-func newCacheSet(cfg Config) *cacheSet {
+func newCacheSet(lggr logger.Logger, cfg Config) *cacheSet {
 	return &cacheSet{
 		sync.RWMutex{},
 		services.StateMachine{},
-		cfg.Logger.Named("CacheSet"),
+		lggr.Named("CacheSet"),
 		make(map[string]Cache),
-		cfg.LatestReportTTL,
-		cfg.MaxStaleAge,
+		cfg,
 	}
 }
 
 func (cs *cacheSet) Start(context.Context) error {
 	return cs.StartOnce("CacheSet", func() error {
+		cs.lggr.Debugw("CacheSet starting", "config", cs.cfg)
 		return nil
 	})
 }
@@ -93,12 +91,7 @@ func (cs *cacheSet) get(ctx context.Context, client Client) (Fetcher, error) {
 	if exists {
 		return c, nil
 	}
-	cfg := Config{
-		Logger:          cs.lggr.With("serverURL", sURL),
-		LatestReportTTL: cs.latestPriceTTL,
-		MaxStaleAge:     cs.maxStaleAge,
-	}
-	c = newMemCache(client, cfg)
+	c = newMemCache(cs.lggr, client, cs.cfg)
 	if err := c.Start(ctx); err != nil {
 		return nil, err
 	}
diff --git a/core/services/relay/evm/mercury/wsrpc/cache/cache_set_test.go b/core/services/relay/evm/mercury/wsrpc/cache/cache_set_test.go
index 9262fb52d31..4e19c7b56de 100644
--- a/core/services/relay/evm/mercury/wsrpc/cache/cache_set_test.go
+++ b/core/services/relay/evm/mercury/wsrpc/cache/cache_set_test.go
@@ -12,7 +12,7 @@ import (
 
 func Test_CacheSet(t *testing.T) {
 	lggr := logger.TestLogger(t)
-	cs := newCacheSet(Config{Logger: lggr})
+	cs := newCacheSet(lggr, Config{})
 	ctx := testutils.Context(t)
 	require.NoError(t, cs.Start(ctx))
 	t.Cleanup(func() {
diff --git a/core/services/relay/evm/mercury/wsrpc/cache/cache_test.go b/core/services/relay/evm/mercury/wsrpc/cache/cache_test.go
index 71f74b3b3cb..6378577d8d5 100644
--- a/core/services/relay/evm/mercury/wsrpc/cache/cache_test.go
+++ b/core/services/relay/evm/mercury/wsrpc/cache/cache_test.go
@@ -12,31 +12,33 @@ import (
 
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	mercuryutils "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/utils"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/wsrpc/pb"
 )
 
 const neverExpireTTL = 1000 * time.Hour // some massive value that will never expire during a test
 
 func Test_Cache(t *testing.T) {
+	lggr := logger.TestLogger(t)
 	client := &mockClient{}
-	cfg := Config{
-		Logger: logger.TestLogger(t),
-	}
+	cfg := Config{}
 	ctx := testutils.Context(t)
 
 	req1 := &pb.LatestReportRequest{FeedId: []byte{1}}
 	req2 := &pb.LatestReportRequest{FeedId: []byte{2}}
 	req3 := &pb.LatestReportRequest{FeedId: []byte{3}}
 
+	feedID1Hex := mercuryutils.BytesToFeedID(req1.FeedId).String()
+
 	t.Run("errors with nil req", func(t *testing.T) {
-		c := newMemCache(client, cfg)
+		c := newMemCache(lggr, client, cfg)
 
 		_, err := c.LatestReport(ctx, nil)
 		assert.EqualError(t, err, "req must not be nil")
 	})
 
 	t.Run("with LatestReportTTL=0 does no caching", func(t *testing.T) {
-		c := newMemCache(client, cfg)
+		c := newMemCache(lggr, client, cfg)
 
 		req := &pb.LatestReportRequest{}
 		for i := 0; i < 5; i++ {
@@ -58,7 +60,7 @@ func Test_Cache(t *testing.T) {
 	t.Run("caches repeated calls to LatestReport, keyed by request", func(t *testing.T) {
 		cfg.LatestReportTTL = neverExpireTTL
 		client.err = nil
-		c := newMemCache(client, cfg)
+		c := newMemCache(lggr, client, cfg)
 
 		t.Run("if cache is unstarted, returns error", func(t *testing.T) {
 			// starting the cache is required for state management if we
@@ -122,8 +124,8 @@ func Test_Cache(t *testing.T) {
 		})
 
 		t.Run("re-queries when a cache item has expired", func(t *testing.T) {
-			vi, exists := c.cache.Load(req1)
-			assert.True(t, exists)
+			vi, exists := c.cache.Load(feedID1Hex)
+			require.True(t, exists)
 			v := vi.(*cacheVal)
 			v.expiresAt = time.Now().Add(-1 * time.Second)
 
@@ -167,7 +169,7 @@ func Test_Cache(t *testing.T) {
 	})
 
 	t.Run("timeouts", func(t *testing.T) {
-		c := newMemCache(client, cfg)
+		c := newMemCache(lggr, client, cfg)
 		// simulate fetch already executing in background
 		v := &cacheVal{
 			fetching:  true,
@@ -176,7 +178,7 @@ func Test_Cache(t *testing.T) {
 			err:       nil,
 			expiresAt: time.Now().Add(-1 * time.Second),
 		}
-		c.cache.Store(req1, v)
+		c.cache.Store(feedID1Hex, v)
 
 		canceledCtx, cancel := context.WithCancel(testutils.Context(t))
 		cancel()
diff --git a/core/services/relay/evm/mercury/wsrpc/client_test.go b/core/services/relay/evm/mercury/wsrpc/client_test.go
index d5d1b1b5ee5..9b0100a3cdd 100644
--- a/core/services/relay/evm/mercury/wsrpc/client_test.go
+++ b/core/services/relay/evm/mercury/wsrpc/client_test.go
@@ -140,7 +140,7 @@ func Test_Client_LatestReport(t *testing.T) {
 
 	t.Run("with cache disabled", func(t *testing.T) {
 		req := &pb.LatestReportRequest{}
-		cacheSet := cache.NewCacheSet(cache.Config{LatestReportTTL: 0, Logger: lggr})
+		cacheSet := cache.NewCacheSet(lggr, cache.Config{LatestReportTTL: 0})
 		resp := &pb.LatestReportResponse{}
 
 		var calls int
@@ -178,7 +178,7 @@ func Test_Client_LatestReport(t *testing.T) {
 	t.Run("with caching", func(t *testing.T) {
 		req := &pb.LatestReportRequest{}
 		const neverExpireTTL = 1000 * time.Hour // some massive value that will never expire during a test
-		cacheSet := cache.NewCacheSet(cache.Config{LatestReportTTL: neverExpireTTL, Logger: lggr})
+		cacheSet := cache.NewCacheSet(lggr, cache.Config{LatestReportTTL: neverExpireTTL})
 		resp := &pb.LatestReportResponse{}
 
 		var calls int
diff --git a/core/services/relay/evm/mercury/wsrpc/pool.go b/core/services/relay/evm/mercury/wsrpc/pool.go
index 6c525741ddc..76f9bc808b9 100644
--- a/core/services/relay/evm/mercury/wsrpc/pool.go
+++ b/core/services/relay/evm/mercury/wsrpc/pool.go
@@ -130,9 +130,10 @@ type pool struct {
 }
 
 func NewPool(lggr logger.Logger, cacheCfg cache.Config) Pool {
-	p := newPool(lggr.Named("Mercury.WSRPCPool"))
+	lggr = lggr.Named("Mercury.WSRPCPool")
+	p := newPool(lggr)
 	p.newClient = NewClient
-	p.cacheSet = cache.NewCacheSet(cacheCfg)
+	p.cacheSet = cache.NewCacheSet(lggr, cacheCfg)
 	return p
 }
 

From 26bf6da954101502003160522a732216cda47c61 Mon Sep 17 00:00:00 2001
From: chainchad <96362174+chainchad@users.noreply.github.com>
Date: Fri, 1 Dec 2023 13:10:39 -0500
Subject: [PATCH 066/130] Prep for CRIB (#11418)

* Make CICD work with new ECRs (#495)

* Fix ECR and publish on PRs (#496)

* Remove test file

* Add mockserver to helm chart dependency

* Add default values file

* Add security contexts

* Fix ref to values

* Use head SHA instead of commit SHA for image tagging

* Use emptyDir mount for postgres to resolve perm issues

* Fix volume mounts on postgres

* Fix /tmp writes and mount /tmp emptyDir

* Remove custom uid

* Run as same uid as postgres

* Test DOCKER_METADATA_PR_HEAD_SHA disable for root image

* Upgrade docker metadata action

* Do a full clone

* Avoid emptyDir mounts and update gid

* Use head SHA when on a PR as default input

* Downgrade metata action to latest on prev major

* Override sha tag with HEAD value

* Remove old sha tag default

* Attempt to fix sha tag

* Fix syntax error

* Remove DOCKER_METADATA_PR_HEAD_SHA env

* Refactor shared var output

* Revert "Refactor shared var output"

This reverts commit 2362fe6473974d4723cf5294cccec7090ab07a0f.

* Revert "Remove DOCKER_METADATA_PR_HEAD_SHA env"

This reverts commit a7bd01e544ad97603147ccb33576e8006056e930.

* Try to make things work again

* Set the host to localhost for K8s

* Add user to pg_isready

* Make securityContext container specific

* Create init container to create /clroot

* Fix volumes

* Add security context to init container

* Skip the chown

* Remove init container

* Breakout DB into its own deployment and service

* Fix typo

* Update localhost to db service dns

* Fix path to script

* Change geth /root path to /app

* Create emptyDir volume for geth devchain dir

* Remove full clone

* Add correct inputs to mockserver

* merge with develop

* cleanup & verify

* Add fixes for /chainlink

* Remove unused env var

* Set back to hardcoded repo name

* Reset values back to pre rebase changes

* Remove mockserver templates in favor of subchart

* fix connect.toml and rename mockserver connection

* Backout triggering on PR

* Create new build-publish workflow for chainlink-untrusted (from PR)

* Reset workflow back

* Make step name accurate

---------

Co-authored-by: skudasov <f4hrenh9it@gmail.com>
---
 .../build-sign-publish-chainlink/action.yml   |  12 +-
 .../workflows/automation-ondemand-tests.yml   |   2 +-
 .github/workflows/build-publish-pr.yml        |  44 +++++
 charts/chainlink-cluster/Chart.yaml           |   7 +-
 charts/chainlink-cluster/README.md            |   6 +-
 charts/chainlink-cluster/connect.toml         |   2 +-
 .../chainlink-cluster/dashboard/dashboard.go  |  42 ----
 charts/chainlink-cluster/devspace.yaml        | 180 ++++++++++++++++--
 ...ment.yaml => chainlink-db-deployment.yaml} |  72 ++-----
 .../templates/chainlink-db-service.yaml       |  16 ++
 .../templates/chainlink-node-deployment.yaml  |  97 ++++++++++
 ...rvice.yaml => chainlink-node-service.yaml} |   0
 .../templates/geth-config-map.yaml            |   6 +-
 .../templates/geth-deployment.yaml            |  24 ++-
 .../templates/mockserver-service.yaml         |  14 --
 .../templates/mockserver.yaml                 |  61 ------
 .../templates/runner-deployment.yaml          |   4 +
 charts/chainlink-cluster/values-raw-helm.yaml | 134 -------------
 charts/chainlink-cluster/values.yaml          | 178 +++++++++++++++++
 core/chainlink.devspace.Dockerfile            |   2 +-
 20 files changed, 554 insertions(+), 349 deletions(-)
 create mode 100644 .github/workflows/build-publish-pr.yml
 rename charts/chainlink-cluster/templates/{chainlink-deployment.yaml => chainlink-db-deployment.yaml} (60%)
 create mode 100644 charts/chainlink-cluster/templates/chainlink-db-service.yaml
 create mode 100644 charts/chainlink-cluster/templates/chainlink-node-deployment.yaml
 rename charts/chainlink-cluster/templates/{chainlink-service.yaml => chainlink-node-service.yaml} (100%)
 delete mode 100644 charts/chainlink-cluster/templates/mockserver-service.yaml
 delete mode 100755 charts/chainlink-cluster/templates/mockserver.yaml
 delete mode 100644 charts/chainlink-cluster/values-raw-helm.yaml
 create mode 100644 charts/chainlink-cluster/values.yaml

diff --git a/.github/actions/build-sign-publish-chainlink/action.yml b/.github/actions/build-sign-publish-chainlink/action.yml
index 62add53092a..8c79f651afd 100644
--- a/.github/actions/build-sign-publish-chainlink/action.yml
+++ b/.github/actions/build-sign-publish-chainlink/action.yml
@@ -34,7 +34,7 @@ inputs:
     required: false
   git-commit-sha:
     description: Git commit SHA used as metadata when building the application (appears in logs)
-    default: ${{ github.sha }}
+    default: ${{ github.event.pull_request.head.sha || github.sha }}
     required: false
   aws-role-to-assume:
     description: The AWS role to assume as the CD user, if any. Used in configuring the docker/login-action
@@ -73,7 +73,7 @@ runs:
   using: composite
   steps:
     - name: Set shared variables
-      shell: sh
+      shell: bash
       # See https://docs.github.com/en/actions/learn-github-actions/workflow-commands-for-github-actions#multiline-strings
       run: |
         SHARED_IMAGES=${{ inputs.ecr-hostname }}/${{ inputs.ecr-image-name }}
@@ -122,7 +122,9 @@ runs:
 
     - name: Generate docker metadata for root image
       id: meta-root
-      uses: docker/metadata-action@c4ee3adeed93b1fa6a762f209fb01608c1a22f1e # v4.4.4
+      uses: docker/metadata-action@2c0bd771b40637d97bf205cbccdd294a32112176 # v4.5.0
+      env:
+        DOCKER_METADATA_PR_HEAD_SHA: "true"
       with:
         # list of Docker images to use as base name for tags
         images: ${{ env.shared-images }}
@@ -164,7 +166,9 @@ runs:
 
     - name: Generate docker metadata for non-root image
       id: meta-nonroot
-      uses: docker/metadata-action@c4ee3adeed93b1fa6a762f209fb01608c1a22f1e # v4.4.4
+      uses: docker/metadata-action@2c0bd771b40637d97bf205cbccdd294a32112176 # v4.5.0
+      env:
+        DOCKER_METADATA_PR_HEAD_SHA: "true"
       with:
         flavor: |
           latest=auto
diff --git a/.github/workflows/automation-ondemand-tests.yml b/.github/workflows/automation-ondemand-tests.yml
index 5cd2182ff62..016a10252be 100644
--- a/.github/workflows/automation-ondemand-tests.yml
+++ b/.github/workflows/automation-ondemand-tests.yml
@@ -115,7 +115,7 @@ jobs:
       pull-requests: write
       id-token: write
       contents: read
-    needs: [ build-chainlink, build-test-image ]
+    needs: [build-chainlink, build-test-image]
     env:
       CHAINLINK_COMMIT_SHA: ${{ github.sha }}
       CHAINLINK_ENV_USER: ${{ github.actor }}
diff --git a/.github/workflows/build-publish-pr.yml b/.github/workflows/build-publish-pr.yml
new file mode 100644
index 00000000000..b958295cf24
--- /dev/null
+++ b/.github/workflows/build-publish-pr.yml
@@ -0,0 +1,44 @@
+name: "Build and Publish from PR"
+
+##
+# This workflow builds and publishes a Docker image for Chainlink from a PR.
+# It doesn't use an environment, has its own special IAM role, does not sign
+# the image, and publishes to a special ECR repo.
+##
+
+on:
+  pull_request:
+
+jobs:
+  build-publish-untrusted:
+    if: ${{ ! startsWith(github.ref_name, 'release/') }}
+    runs-on: ubuntu-20.04
+    permissions:
+      id-token: write
+      contents: read
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+
+      - name: Build and publish chainlink image
+        uses: ./.github/actions/build-sign-publish-chainlink
+        with:
+          publish: true
+          aws-role-to-assume: ${{ secrets.AWS_OIDC_IAM_ROLE_PUBLISH_PR_ARN }}
+          aws-role-duration-seconds: ${{ secrets.AWS_ROLE_DURATION_SECONDS_DEFAULT }}
+          aws-region: ${{ secrets.AWS_REGION }}
+          sign-images: false
+          ecr-hostname: ${{ secrets.AWS_SDLC_ECR_HOSTNAME }}
+          ecr-image-name: chainlink-untrusted
+          dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }}
+          dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }}
+
+      - name: Collect Metrics
+        if: always()
+        id: collect-gha-metrics
+        uses: smartcontractkit/push-gha-metrics-action@d1618b772a97fd87e6505de97b872ee0b1f1729a # v2.0.2
+        with:
+          basic-auth: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }}
+          hostname: ${{ secrets.GRAFANA_CLOUD_HOST }}
+          this-job-name: build-publish-untrusted
+        continue-on-error: true
diff --git a/charts/chainlink-cluster/Chart.yaml b/charts/chainlink-cluster/Chart.yaml
index bfea29c82ec..127f5b6e326 100644
--- a/charts/chainlink-cluster/Chart.yaml
+++ b/charts/chainlink-cluster/Chart.yaml
@@ -2,4 +2,9 @@ apiVersion: v1
 name: chainlink-cluster
 description: Chainlink nodes cluster
 version: 0.1.3
-appVersion: '2.6.0'
\ No newline at end of file
+appVersion: "2.6.0"
+dependencies:
+  - name: mockserver
+    version: "5.14.0"
+    repository: "@mockserver"
+    condition: mockserver.enabled
\ No newline at end of file
diff --git a/charts/chainlink-cluster/README.md b/charts/chainlink-cluster/README.md
index e3cec129a91..5fb55536635 100644
--- a/charts/chainlink-cluster/README.md
+++ b/charts/chainlink-cluster/README.md
@@ -74,10 +74,10 @@ After that all the changes will be synced automatically
 Check `.profiles` to understand what is uploaded in profiles `runner` and `node`
 
 # Helm
-If you would like to use `helm` directly, please uncomment data in `values-raw-helm.yaml`
+If you would like to use `helm` directly, please uncomment data in `values.yaml`
 ## Install from local files
 ```
-helm install -f values-raw-helm.yaml cl-cluster .
+helm install -f values.yaml cl-cluster .
 ```
 Forward all apps (in another terminal)
 ```
@@ -99,7 +99,7 @@ kubectl config set-context --current --namespace cl-cluster
 
 Install
 ```
-helm install -f values-raw-helm.yaml cl-cluster chainlink-cluster/chainlink-cluster --version v0.1.2
+helm install -f values.yaml cl-cluster .
 ```
 
 ## Create a new release
diff --git a/charts/chainlink-cluster/connect.toml b/charts/chainlink-cluster/connect.toml
index f0a74d4c144..1f49b5a6e37 100644
--- a/charts/chainlink-cluster/connect.toml
+++ b/charts/chainlink-cluster/connect.toml
@@ -9,4 +9,4 @@ cl_node_url_template = "http://app-node-%d:6688"
 cl_node_internal_dns_record_template = "app-node-%d"
 cl_node_user = "notreal@fakeemail.ch"
 cl_node_password = "fj293fbBnlQ!f9vNs"
-mockserver_url = "http://app-mockserver:1080"
\ No newline at end of file
+mockserver_url = "http://mockserver:1080"
\ No newline at end of file
diff --git a/charts/chainlink-cluster/dashboard/dashboard.go b/charts/chainlink-cluster/dashboard/dashboard.go
index b29140c0405..19a596b63e9 100644
--- a/charts/chainlink-cluster/dashboard/dashboard.go
+++ b/charts/chainlink-cluster/dashboard/dashboard.go
@@ -350,48 +350,6 @@ func (m *CLClusterDashboard) generate() error {
 				),
 			),
 		),
-		// logs
-		dashboard.Row(
-			"Logs",
-			row.Collapse(),
-			row.WithTimeSeries(
-				"Log Counters",
-				timeseries.Span(12),
-				timeseries.Height("200px"),
-				timeseries.DataSource(m.PrometheusDataSourceName),
-				timeseries.WithPrometheusTarget(
-					`log_panic_count{namespace="${namespace}"}`,
-					prometheus.Legend("{{pod}} - panic"),
-				),
-				timeseries.WithPrometheusTarget(
-					`log_fatal_count{namespace="${namespace}"}`,
-					prometheus.Legend("{{pod}} - fatal"),
-				),
-				timeseries.WithPrometheusTarget(
-					`log_critical_count{namespace="${namespace}"}`,
-					prometheus.Legend("{{pod}} - critical"),
-				),
-				timeseries.WithPrometheusTarget(
-					`log_warn_count{namespace="${namespace}"}`,
-					prometheus.Legend("{{pod}} - warn"),
-				),
-				timeseries.WithPrometheusTarget(
-					`log_error_count{namespace="${namespace}"}`,
-					prometheus.Legend("{{pod}} - error"),
-				),
-			),
-			m.logsRowOption("All errors", `
-			{namespace="${namespace}", app="app", container="node"} 
-			| json 
-			| level="error" 
-			|  line_format "{{ .instance }} {{ .level }} {{ .ts }} {{ .logger }} {{ .caller }} {{ .msg }} {{ .version }} {{ .nodeTier }} {{ .nodeName }} {{ .node }} {{ .evmChainID }} {{ .nodeOrder }} {{ .mode }} {{ .nodeState }} {{ .sentryEventID }} {{ .stacktrace }}"`),
-			m.logsRowOption("Node 1", `{namespace="${namespace}", app="app", instance="node-1", container="node"}`),
-			m.logsRowOption("Node 2", `{namespace="${namespace}", app="app", instance="node-2", container="node"}`),
-			m.logsRowOption("Node 3", `{namespace="${namespace}", app="app", instance="node-3", container="node"}`),
-			m.logsRowOption("Node 4", `{namespace="${namespace}", app="app", instance="node-4", container="node"}`),
-			m.logsRowOption("Node 5", `{namespace="${namespace}", app="app", instance="node-5", container="node"}`),
-			m.logsRowOption("Node 6", `{namespace="${namespace}", app="app", instance="node-6", container="node"}`),
-		),
 		// HeadTracker
 		dashboard.Row("Head tracker",
 			row.Collapse(),
diff --git a/charts/chainlink-cluster/devspace.yaml b/charts/chainlink-cluster/devspace.yaml
index 4f7cf8641a3..cb4c8bfce49 100644
--- a/charts/chainlink-cluster/devspace.yaml
+++ b/charts/chainlink-cluster/devspace.yaml
@@ -40,26 +40,56 @@ deployments:
       # they can be defined the same way in values.yml
       # devspace merging this "values" and "values.yml" before deploy
       values:
-        runner:
-          image: ${DEVSPACE_IMAGE}
-          stateful: false
-        geth:
-          version: v1.12.0
-          wsrpc-port: 8546
-          httprpc-port: 8544
-          networkid: 1337
-          blocktime: 1
-        mockserver:
-          port: 1080
-        db:
-          stateful: false
+        podSecurityContext:
+          fsGroup: 999
+
         chainlink:
+          securityContext:
+            capabilities:
+              drop:
+                - ALL
+            readOnlyRootFilesystem: false
+            runAsNonRoot: true
+            runAsUser: 14933
+            runAsGroup: 999
           web_port: 6688
           p2p_port: 6690
           nodes:
             - name: node-1
               image: ${DEVSPACE_IMAGE}
               version: latest
+              # override default config per node
+              # for example, use OCRv2 P2P setup, the whole config
+              #      toml: |
+              #        RootDir = './clroot'
+              #        [Log]
+              #        JSONConsole = true
+              #        Level = 'debug'
+              #        [WebServer]
+              #        AllowOrigins = '*'
+              #        SecureCookies = false
+              #        SessionTimeout = '999h0m0s'
+              #        [OCR2]
+              #        Enabled = true
+              #        [P2P]
+              #        [P2P.V2]
+              #        Enabled = false
+              #        AnnounceAddresses = []
+              #        DefaultBootstrappers = []
+              #        DeltaDial = '15s'
+              #        DeltaReconcile = '1m0s'
+              #        ListenAddresses = []
+              #        [[EVM]]
+              #        ChainID = '1337'
+              #        MinContractPayment = '0'
+              #        [[EVM.Nodes]]
+              #        Name = 'node-0'
+              #        WSURL = 'ws://geth:8546'
+              #        HTTPURL = 'http://geth:8544'
+              #        [WebServer.TLS]
+              #        HTTPSPort = 0
+              # or use overridesToml to override some part of configuration
+              #      overridesToml: |
             - name: node-2
               image: ${DEVSPACE_IMAGE}
               version: latest
@@ -75,11 +105,125 @@ deployments:
             - name: node-6
               image: ${DEVSPACE_IMAGE}
               version: latest
-        prometheusMonitor: "true"
-        podAnnotations: { }
-        nodeSelector: { }
-        tolerations: [ ]
-        affinity: { }
+          resources:
+            requests:
+              cpu: 350m
+              memory: 1024Mi
+            limits:
+              cpu: 350m
+              memory: 1024Mi
+
+        # each CL node have a dedicated PostgreSQL 11.15
+        # use StatefulSet by setting:
+        #
+        # stateful: true
+        # capacity 10Gi
+        #
+        # if you are running long tests
+        db:
+          securityContext:
+            capabilities:
+              drop:
+                - ALL
+            readOnlyRootFilesystem: false
+            runAsNonRoot: true
+            runAsUser: 999
+            runAsGroup: 999
+          stateful: false
+          resources:
+            requests:
+              cpu: 1
+              memory: 1024Mi
+            limits:
+              cpu: 1
+              memory: 1024Mi
+        # default cluster shipped with latest Geth ( dev mode by default )
+        geth:
+          securityContext:
+            capabilities:
+              drop:
+                - ALL
+            readOnlyRootFilesystem: false
+            runAsNonRoot: true
+            runAsUser: 999
+            runAsGroup: 999
+          version: v1.12.0
+          wsrpc-port: 8546
+          httprpc-port: 8544
+          networkid: 1337
+          blocktime: 1
+          resources:
+            requests:
+              cpu: 1
+              memory: 1024Mi
+            limits:
+              cpu: 1
+              memory: 1024Mi
+        # mockserver is https://www.mock-server.com/where/kubernetes.html
+        # used to stub External Adapters
+        mockserver:
+          #  image: "mockserver/mockserver"
+          #  version: "mockserver-5.15.0"
+          securityContext:
+            capabilities:
+              drop:
+                - ALL
+            readOnlyRootFilesystem: false
+            runAsNonRoot: true
+            runAsUser: 999
+            runAsGroup: 999
+          enabled: true
+          releasenameOverride: mockserver
+          app:
+            runAsUser: 999
+            readOnlyRootFilesystem: false
+          port: 1080
+          resources:
+            requests:
+              cpu: 1
+              memory: 1024Mi
+            limits:
+              cpu: 1
+              memory: 1024Mi
+        runner:
+          securityContext:
+            capabilities:
+              drop:
+                - ALL
+            readOnlyRootFilesystem: false
+            runAsNonRoot: true
+            runAsUser: 999
+            runAsGroup: 999
+          stateful: false
+          resources:
+            requests:
+              cpu: 1
+              memory: 512Mi
+            limits:
+              cpu: 1
+              memory: 512Mi
+          affinity: { }
+          tolerations: [ ]
+          nodeSelector: { }
+          ingress:
+            enabled: false
+            className: ""
+            hosts: [ ]
+            tls: [ ]
+            annotations: { }
+          service:
+            type: NodePort
+            port: 8080
+
+
+        # monitoring.coreos.com/v1 PodMonitor for each node
+        prometheusMonitor: true
+
+        # deployment placement, standard helm stuff
+        podAnnotations:
+        nodeSelector:
+        tolerations:
+        affinity:
 
 profiles:
   # this replaces only "runner" pod, usable when you'd like to run some system level tests inside k8s
diff --git a/charts/chainlink-cluster/templates/chainlink-deployment.yaml b/charts/chainlink-cluster/templates/chainlink-db-deployment.yaml
similarity index 60%
rename from charts/chainlink-cluster/templates/chainlink-deployment.yaml
rename to charts/chainlink-cluster/templates/chainlink-db-deployment.yaml
index b434c9894b0..f335130ea9f 100644
--- a/charts/chainlink-cluster/templates/chainlink-deployment.yaml
+++ b/charts/chainlink-cluster/templates/chainlink-db-deployment.yaml
@@ -6,10 +6,10 @@ kind: StatefulSet
 kind: Deployment
 {{ end }}
 metadata:
-  name: {{ $.Release.Name }}-{{ $cfg.name }}
+  name: {{ $.Release.Name }}-{{ $cfg.name }}-db
 spec:
   {{ if $.Values.db.stateful }}
-  serviceName: {{ $.Release.Name }}-{{ $cfg.name }}-service
+  serviceName: {{ $.Release.Name }}-db-${{ $cfg.name }}
   podManagementPolicy: Parallel
   volumeClaimTemplates:
     - metadata:
@@ -23,14 +23,14 @@ spec:
   {{ end }}
   selector:
     matchLabels:
-      app: {{ $.Release.Name }}
-      instance: {{ $cfg.name }}
+      app: {{ $.Release.Name }}-db
+      instance: {{ $cfg.name }}-db
       release: {{ $.Release.Name }}
   template:
     metadata:
       labels:
-        app: {{ $.Release.Name }}
-        instance: {{ $cfg.name }}
+        app: {{ $.Release.Name }}-db
+        instance: {{ $cfg.name }}-db
         release: {{ $.Release.Name }}
         {{- range $key, $value := $.Values.labels }}
         {{ $key }}: {{ $value | quote }}
@@ -44,11 +44,16 @@ spec:
         {{- end }}
     spec:
       volumes:
+        # TODO: breakout this config map into a separate one for the db.
         - name: {{ $.Release.Name }}-{{ $cfg.name }}-cm
           configMap:
             name: {{ $.Release.Name }}-{{ $cfg.name }}-cm
+      securityContext:
+        {{- toYaml $.Values.db.podSecurityContext | nindent 8 }}
       containers:
         - name: chainlink-db
+          securityContext:
+            {{- toYaml $.Values.db.securityContext | nindent 12 }}
           image: {{ default "postgres:11.15" $.Values.db.image }}
           command:
             - docker-entrypoint.sh
@@ -114,60 +119,11 @@ spec:
             - mountPath: /docker-entrypoint-initdb.d/init.sql
               name: {{ $.Release.Name }}-{{ $cfg.name }}-cm
               subPath: init.sql
-          {{ if $.Values.db.stateful }}
-          volumeMounts:
+            {{ if $.Values.db.stateful }}
             - mountPath: /var/lib/postgresql/data
               name: postgres
               subPath: postgres-db
-          {{ end }}
-        - name: node
-          image: {{ default "public.ecr.aws/chainlink/chainlink" $cfg.image }}
-          imagePullPolicy: Always
-          command: ["bash", "-c", "while ! pg_isready --host 0.0.0.0 --port 5432; do echo \"waiting for database to start\"; sleep 1; done && chainlink -c /etc/node-secrets-volume/default.toml -c /etc/node-secrets-volume/overrides.toml -secrets /etc/node-secrets-volume/secrets.toml node start -d -p /etc/node-secrets-volume/node-password -a /etc/node-secrets-volume/apicredentials --vrfpassword=/etc/node-secrets-volume/apicredentials"]
-          ports:
-            - name: access
-              containerPort: {{ $.Values.chainlink.web_port }}
-            - name: p2p
-              containerPort: {{ $.Values.chainlink.p2p_port }}
-          env:
-            - name: CL_DATABASE_URL
-              value: postgresql://postgres:verylongdatabasepassword@0.0.0.0/chainlink?sslmode=disable
-            - name: CL_DEV
-              value: "false"
-          volumeMounts:
-            - name: {{ $.Release.Name }}-{{ $cfg.name }}-cm
-              mountPath: /etc/node-secrets-volume/
-          livenessProbe:
-            httpGet:
-              path: /health
-              port: {{ $.Values.chainlink.web_port }}
-            initialDelaySeconds: 1
-            periodSeconds: 5
-            timeoutSeconds: 10
-          readinessProbe:
-            httpGet:
-              path: /health
-              port: {{ $.Values.chainlink.web_port }}
-            initialDelaySeconds: 1
-            periodSeconds: 5
-            timeoutSeconds: 10
-          startupProbe:
-            httpGet:
-              path: /
-              port: {{ $.Values.chainlink.web_port }}
-            initialDelaySeconds: 15
-            periodSeconds: 5
-            failureThreshold: 20
-          {{ if (hasKey $.Values.chainlink "resources") }}
-          resources:
-            requests:
-              memory: {{ default "1024Mi" $.Values.chainlink.resources.requests.memory }}
-              cpu: {{ default "500m" $.Values.chainlink.resources.requests.cpu }}
-            limits:
-              memory: {{ default "1024Mi" $.Values.chainlink.resources.limits.memory }}
-              cpu: {{ default "500m" $.Values.chainlink.resources.limits.cpu }}
-          {{ else }}
-          {{ end }}
+            {{ end }}
 {{- with $.Values.nodeSelector }}
       nodeSelector:
         {{ toYaml . | indent 8 }}
@@ -181,4 +137,4 @@ spec:
 {{ toYaml . | indent 8 }}
 {{- end }}
 ---
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/chainlink-cluster/templates/chainlink-db-service.yaml b/charts/chainlink-cluster/templates/chainlink-db-service.yaml
new file mode 100644
index 00000000000..f27bd9eab20
--- /dev/null
+++ b/charts/chainlink-cluster/templates/chainlink-db-service.yaml
@@ -0,0 +1,16 @@
+{{- range $cfg := .Values.chainlink.nodes }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ $.Release.Name }}-db-{{ $cfg.name }}
+spec:
+  selector:
+    app: {{ $.Release.Name }}-db
+    instance: {{ $cfg.name }}-db
+    release: {{ $.Release.Name }}
+  ports:
+    - protocol: TCP
+      port: 5432
+      targetPort: 5432
+---
+{{- end }}
\ No newline at end of file
diff --git a/charts/chainlink-cluster/templates/chainlink-node-deployment.yaml b/charts/chainlink-cluster/templates/chainlink-node-deployment.yaml
new file mode 100644
index 00000000000..463453aff93
--- /dev/null
+++ b/charts/chainlink-cluster/templates/chainlink-node-deployment.yaml
@@ -0,0 +1,97 @@
+{{- range $cfg := .Values.chainlink.nodes }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ $.Release.Name }}-{{ $cfg.name }}
+spec:
+  selector:
+    matchLabels:
+      app: {{ $.Release.Name }}
+      instance: {{ $cfg.name }}
+      release: {{ $.Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ $.Release.Name }}
+        instance: {{ $cfg.name }}
+        release: {{ $.Release.Name }}
+        {{- range $key, $value := $.Values.labels }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
+      annotations:
+        prometheus.io/scrape: 'true'
+        {{- range $key, $value := $.Values.podAnnotations }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
+    spec:
+      volumes:
+        - name: {{ $.Release.Name }}-{{ $cfg.name }}-cm
+          configMap:
+            name: {{ $.Release.Name }}-{{ $cfg.name }}-cm
+      securityContext:
+        {{- toYaml $.Values.chainlink.podSecurityContext | nindent 8 }}
+      containers:
+        - name: node
+          securityContext:
+            {{- toYaml $.Values.chainlink.securityContext | nindent 12 }}
+          image: {{ default "public.ecr.aws/chainlink/chainlink" $cfg.image }}
+          imagePullPolicy: Always
+          command: ["bash", "-c", "while ! pg_isready -U postgres --host {{ $.Release.Name }}-db-{{ $cfg.name }} --port 5432; do echo \"waiting for database to start\"; sleep 1; done && chainlink -c /etc/node-secrets-volume/default.toml -c /etc/node-secrets-volume/overrides.toml -secrets /etc/node-secrets-volume/secrets.toml node start -d -p /etc/node-secrets-volume/node-password -a /etc/node-secrets-volume/apicredentials --vrfpassword=/etc/node-secrets-volume/apicredentials"]
+          ports:
+            - name: access
+              containerPort: {{ $.Values.chainlink.web_port }}
+            - name: p2p
+              containerPort: {{ $.Values.chainlink.p2p_port }}
+          env:
+            - name: CL_DATABASE_URL
+              value: postgresql://postgres:verylongdatabasepassword@{{ $.Release.Name }}-db-{{ $cfg.name }}/chainlink?sslmode=disable
+            - name: CL_DEV
+              value: "false"
+          volumeMounts:
+            - name: {{ $.Release.Name }}-{{ $cfg.name }}-cm
+              mountPath: /etc/node-secrets-volume/
+          livenessProbe:
+            httpGet:
+              path: /health
+              port: {{ $.Values.chainlink.web_port }}
+            initialDelaySeconds: 1
+            periodSeconds: 5
+            timeoutSeconds: 10
+          readinessProbe:
+            httpGet:
+              path: /health
+              port: {{ $.Values.chainlink.web_port }}
+            initialDelaySeconds: 1
+            periodSeconds: 5
+            timeoutSeconds: 10
+          startupProbe:
+            httpGet:
+              path: /
+              port: {{ $.Values.chainlink.web_port }}
+            initialDelaySeconds: 15
+            periodSeconds: 5
+            failureThreshold: 20
+          {{ if (hasKey $.Values.chainlink "resources") }}
+          resources:
+            requests:
+              memory: {{ default "1024Mi" $.Values.chainlink.resources.requests.memory }}
+              cpu: {{ default "500m" $.Values.chainlink.resources.requests.cpu }}
+            limits:
+              memory: {{ default "1024Mi" $.Values.chainlink.resources.limits.memory }}
+              cpu: {{ default "500m" $.Values.chainlink.resources.limits.cpu }}
+          {{ else }}
+          {{ end }}
+{{- with $.Values.nodeSelector }}
+      nodeSelector:
+        {{ toYaml . | indent 8 }}
+{{- end }}
+{{- with $.Values.affinity }}
+      affinity:
+        {{ toYaml . | indent 8 }}
+{{- end }}
+{{- with $.Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+{{- end }}
+---
+{{- end }}
diff --git a/charts/chainlink-cluster/templates/chainlink-service.yaml b/charts/chainlink-cluster/templates/chainlink-node-service.yaml
similarity index 100%
rename from charts/chainlink-cluster/templates/chainlink-service.yaml
rename to charts/chainlink-cluster/templates/chainlink-node-service.yaml
diff --git a/charts/chainlink-cluster/templates/geth-config-map.yaml b/charts/chainlink-cluster/templates/geth-config-map.yaml
index f3369ba580f..022d9f2ea61 100644
--- a/charts/chainlink-cluster/templates/geth-config-map.yaml
+++ b/charts/chainlink-cluster/templates/geth-config-map.yaml
@@ -50,9 +50,9 @@ data:
   password.txt: |
   init.sh: |
     #!/bin/bash
-    if [ ! -d /root/.ethereum/keystore ]; then
-        echo "/root/.ethereum/keystore not found, running 'geth init'..."
-        geth init /root/ethconfig/genesis.json
+    if [ ! -d /app/.ethereum/keystore ]; then
+        echo "/app/.ethereum/keystore not found, running 'geth init'..."
+        geth init /app/ethconfig/genesis.json
         echo "...done!"
     fi
 
diff --git a/charts/chainlink-cluster/templates/geth-deployment.yaml b/charts/chainlink-cluster/templates/geth-deployment.yaml
index 11fb0cbee22..6948c4df288 100644
--- a/charts/chainlink-cluster/templates/geth-deployment.yaml
+++ b/charts/chainlink-cluster/templates/geth-deployment.yaml
@@ -22,31 +22,39 @@ spec:
       - name: configmap-volume
         configMap:
           name: geth-cm
+      - name: devchain-volume
+        emptyDir: {}
+      securityContext:
+        {{- toYaml $.Values.geth.podSecurityContext | nindent 8 }}
       containers:
       - name: geth-network
+        securityContext:
+          {{- toYaml $.Values.geth.securityContext | nindent 12 }}
         image: "{{ default "ethereum/client-go" .Values.geth.image }}:{{ default "stable" .Values.geth.version }}"
-        command: [ "sh", "./root/init.sh" ]
+        command: [ "sh", "/app/init.sh" ]
         volumeMounts:
+        - name: devchain-volume
+          mountPath: /app/.ethereum/devchain
         - name : configmap-volume
-          mountPath: /root/init.sh
+          mountPath: /app/init.sh
           subPath: init.sh
         - name: configmap-volume
-          mountPath: /root/config
+          mountPath: /app/config
         - name: configmap-volume
-          mountPath: /root/.ethereum/devchain/keystore/key1
+          mountPath: /app/.ethereum/devchain/keystore/key1
           subPath: key1
         - name: configmap-volume
-          mountPath: /root/.ethereum/devchain/keystore/key2
+          mountPath: /app/.ethereum/devchain/keystore/key2
           subPath: key2
         - name: configmap-volume
-          mountPath: /root/.ethereum/devchain/keystore/key3
+          mountPath: /app/.ethereum/devchain/keystore/key3
           subPath: key3
         args:
           - '--dev'
           - '--password'
-          - '/root/config/password.txt'
+          - '/app/config/password.txt'
           - '--datadir'
-          - '/root/.ethereum/devchain'
+          - '/app/.ethereum/devchain'
           - '--unlock'
           - '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266'
           - '--unlock'
diff --git a/charts/chainlink-cluster/templates/mockserver-service.yaml b/charts/chainlink-cluster/templates/mockserver-service.yaml
deleted file mode 100644
index f8ab78a84b5..00000000000
--- a/charts/chainlink-cluster/templates/mockserver-service.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-{{ if (hasKey .Values "mockserver") }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Release.Name }}-mockserver
-spec:
-  selector:
-    app: {{ .Release.Name }}-mockserver
-  ports:
-    - name: serviceport
-      port: {{ default "1080" $.Values.mockserver.port}}
-      targetPort: serviceport
-  type: ClusterIP
-{{ end }}
\ No newline at end of file
diff --git a/charts/chainlink-cluster/templates/mockserver.yaml b/charts/chainlink-cluster/templates/mockserver.yaml
deleted file mode 100755
index 14c05d0acd5..00000000000
--- a/charts/chainlink-cluster/templates/mockserver.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-{{ if (hasKey .Values "mockserver") }}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ .Release.Name }}-mockserver
-  labels:
-    app: {{ .Release.Name }}-mockserver
-spec:
-  selector:
-    matchLabels:
-      app: {{ .Release.Name }}-mockserver
-  template:
-    metadata:
-{{- if .Values.podAnnotations }}
-      annotations:
-{{ toYaml .Values.podAnnotations | indent 8 }}
-{{- end }}
-      name: {{ .Release.Name }}-mockserver
-      labels:
-        app: {{ .Release.Name }}-mockserver
-    spec:
-      containers:
-        - name: {{ .Release.Name }}-mockserver
-          image: {{ default "mockserver/mockserver" .Values.mockserver.image }}:{{ default "mockserver-5.15.0" .Values.mockserver.version }}
-          imagePullPolicy: IfNotPresent
-          securityContext:
-            runAsUser: 65534 # nonroot
-            readOnlyRootFilesystem: false
-          ports:
-            - name: serviceport
-              containerPort: {{ .Values.mockserver.port }}
-              protocol: TCP
-          env:
-            - name: LOG_LEVEL
-              value: "DEBUG"
-            - name: SERVER_PORT
-              value: {{ .Values.mockserver.port | quote }}
-          {{ if (hasKey $.Values.chainlink "resources") }}
-          resources:
-            requests:
-              memory: {{ default "1024Mi" $.Values.chainlink.resources.requests.memory }}
-              cpu: {{ default "500m" $.Values.chainlink.resources.requests.cpu }}
-            limits:
-              memory: {{ default "1024Mi" $.Values.chainlink.resources.limits.memory }}
-              cpu: {{ default "500m" $.Values.chainlink.resources.limits.cpu }}
-          {{ else }}
-          {{ end }}
-  {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{ toYaml . | indent 8 }}
-  {{- end }}
-  {{- with .Values.affinity }}
-      affinity:
-        {{ toYaml . | indent 8 }}
-  {{- end }}
-  {{- with .Values.tolerations }}
-      tolerations:
-  {{ toYaml . | indent 8 }}
-  {{- end }}
-{{- end }}
----
\ No newline at end of file
diff --git a/charts/chainlink-cluster/templates/runner-deployment.yaml b/charts/chainlink-cluster/templates/runner-deployment.yaml
index 5d9025b41c5..9d80ac1bfab 100644
--- a/charts/chainlink-cluster/templates/runner-deployment.yaml
+++ b/charts/chainlink-cluster/templates/runner-deployment.yaml
@@ -22,8 +22,12 @@ spec:
       annotations:
         prometheus.io/scrape: 'true'
     spec:
+      securityContext:
+        {{- toYaml $.Values.runner.podSecurityContext | nindent 8 }}
       containers:
         - name: runner
+          securityContext:
+            {{- toYaml $.Values.runner.securityContext | nindent 12 }}
           image: {{ default "public.ecr.aws/chainlink/chainlink" .Values.runner.image }}
           imagePullPolicy: Always
           command: [ "/bin/bash", "-c", "--" ]
diff --git a/charts/chainlink-cluster/values-raw-helm.yaml b/charts/chainlink-cluster/values-raw-helm.yaml
deleted file mode 100644
index 726a5347119..00000000000
--- a/charts/chainlink-cluster/values-raw-helm.yaml
+++ /dev/null
@@ -1,134 +0,0 @@
-# override resources for keys "chainlink", "db", or "geth" if needed
-#  resources:
-#    requests:
-#      cpu: 350m
-#      memory: 1024Mi
-#    limits:
-#      cpu: 350m
-#      memory: 1024Mi
-# images can be overriden for the same keys:
-#   image: ethereum/client-go
-#   version: stable
-chainlink:
-  web_port: 6688
-  p2p_port: 6690
-  nodes:
-    - name: node-1
-      image: "public.ecr.aws/chainlink/chainlink:latest"
-      # override default config per node
-      # for example, use OCRv2 P2P setup, the whole config
-#      toml: |
-#        RootDir = './clroot'
-#        [Log]
-#        JSONConsole = true
-#        Level = 'debug'
-#        [WebServer]
-#        AllowOrigins = '*'
-#        SecureCookies = false
-#        SessionTimeout = '999h0m0s'
-#        [OCR2]
-#        Enabled = true
-#        [P2P]
-#        [P2P.V2]
-#        Enabled = false
-#        AnnounceAddresses = []
-#        DefaultBootstrappers = []
-#        DeltaDial = '15s'
-#        DeltaReconcile = '1m0s'
-#        ListenAddresses = []
-#        [[EVM]]
-#        ChainID = '1337'
-#        MinContractPayment = '0'
-#        [[EVM.Nodes]]
-#        Name = 'node-0'
-#        WSURL = 'ws://geth:8546'
-#        HTTPURL = 'http://geth:8544'
-#        [WebServer.TLS]
-#        HTTPSPort = 0
-# or use overridesToml to override some part of configuration
-#      overridesToml: |
-    - name: node-2
-    - name: node-3
-    - name: node-4
-    - name: node-5
-    - name: node-6
-  resources:
-    requests:
-      cpu: 350m
-      memory: 1024Mi
-    limits:
-      cpu: 350m
-      memory: 1024Mi
-
-# each CL node have a dedicated PostgreSQL 11.15
-# use StatefulSet by setting:
-#
-# stateful: true
-# capacity 10Gi
-#
-# if you are running long tests
-db:
-  stateful: false
-  resources:
-    requests:
-      cpu: 1
-      memory: 1024Mi
-    limits:
-      cpu: 1
-      memory: 1024Mi
-# default cluster shipped with latest Geth ( dev mode by default )
-geth:
-  version: v1.12.0
-  wsrpc-port: 8546
-  httprpc-port: 8544
-  networkid: 1337
-  blocktime: 1
-  resources:
-    requests:
-      cpu: 1
-      memory: 1024Mi
-    limits:
-      cpu: 1
-      memory: 1024Mi
-# mockserver is https://www.mock-server.com/where/kubernetes.html
-# used to stub External Adapters
-mockserver:
-  port: 1080
-  resources:
-    requests:
-      cpu: 1
-      memory: 1024Mi
-    limits:
-      cpu: 1
-      memory: 1024Mi
-runner:
-  stateful: false
-  resources:
-    requests:
-      cpu: 1
-      memory: 512Mi
-    limits:
-      cpu: 1
-      memory: 512Mi
-  affinity: { }
-  tolerations: [ ]
-  nodeSelector: { }
-  ingress:
-    enabled: false
-    className: ""
-    hosts: [ ]
-    tls: [ ]
-    annotations: { }
-  service:
-    type: NodePort
-    port: 8080
-
-
-# monitoring.coreos.com/v1 PodMonitor for each node
-prometheusMonitor: false
-
-# deployment placement, standard helm stuff
-podAnnotations:
-nodeSelector:
-tolerations:
-affinity:
diff --git a/charts/chainlink-cluster/values.yaml b/charts/chainlink-cluster/values.yaml
new file mode 100644
index 00000000000..eb93e6cefcf
--- /dev/null
+++ b/charts/chainlink-cluster/values.yaml
@@ -0,0 +1,178 @@
+# override resources for keys "chainlink", "db", or "geth" if needed
+#  resources:
+#    requests:
+#      cpu: 350m
+#      memory: 1024Mi
+#    limits:
+#      cpu: 350m
+#      memory: 1024Mi
+# images can be overriden for the same keys:
+#   image: ethereum/client-go
+#   version: stable
+chainlink:
+  podSecurityContext:
+    fsGroup: 14933
+  securityContext:
+    capabilities:
+      drop:
+        - ALL
+    readOnlyRootFilesystem: false
+    runAsNonRoot: true
+    runAsUser: 14933
+    runAsGroup: 14933
+  web_port: 6688
+  p2p_port: 6690
+  nodes:
+    - name: node-1
+      image: "public.ecr.aws/chainlink/chainlink:latest"
+    # override default config per node
+    # for example, use OCRv2 P2P setup, the whole config
+    #      toml: |
+    #        RootDir = './clroot'
+    #        [Log]
+    #        JSONConsole = true
+    #        Level = 'debug'
+    #        [WebServer]
+    #        AllowOrigins = '*'
+    #        SecureCookies = false
+    #        SessionTimeout = '999h0m0s'
+    #        [OCR2]
+    #        Enabled = true
+    #        [P2P]
+    #        [P2P.V2]
+    #        Enabled = false
+    #        AnnounceAddresses = []
+    #        DefaultBootstrappers = []
+    #        DeltaDial = '15s'
+    #        DeltaReconcile = '1m0s'
+    #        ListenAddresses = []
+    #        [[EVM]]
+    #        ChainID = '1337'
+    #        MinContractPayment = '0'
+    #        [[EVM.Nodes]]
+    #        Name = 'node-0'
+    #        WSURL = 'ws://geth:8546'
+    #        HTTPURL = 'http://geth:8544'
+    #        [WebServer.TLS]
+    #        HTTPSPort = 0
+    # or use overridesToml to override some part of configuration
+    #      overridesToml: |
+    - name: node-2
+    - name: node-3
+    - name: node-4
+    - name: node-5
+    - name: node-6
+  resources:
+    requests:
+      cpu: 350m
+      memory: 1024Mi
+    limits:
+      cpu: 350m
+      memory: 1024Mi
+
+# each CL node have a dedicated PostgreSQL 11.15
+# use StatefulSet by setting:
+#
+# stateful: true
+# capacity 10Gi
+#
+# if you are running long tests
+db:
+  podSecurityContext:
+    fsGroup: 999
+  securityContext:
+    capabilities:
+      drop:
+        - ALL
+    readOnlyRootFilesystem: false
+    runAsNonRoot: true
+    runAsUser: 999
+    runAsGroup: 999
+  stateful: false
+  resources:
+    requests:
+      cpu: 1
+      memory: 1024Mi
+    limits:
+      cpu: 1
+      memory: 1024Mi
+# default cluster shipped with latest Geth ( dev mode by default )
+geth:
+  podSecurityContext:
+    fsGroup: 999
+  securityContext:
+    capabilities:
+      drop:
+        - ALL
+    readOnlyRootFilesystem: false
+    runAsNonRoot: true
+    runAsUser: 999
+    runAsGroup: 999
+  version: v1.12.0
+  wsrpc-port: 8546
+  httprpc-port: 8544
+  networkid: 1337
+  blocktime: 1
+  resources:
+    requests:
+      cpu: 1
+      memory: 1024Mi
+    limits:
+      cpu: 1
+      memory: 1024Mi
+# mockserver is https://www.mock-server.com/where/kubernetes.html
+# used to stub External Adapters
+mockserver:
+  enabled: true
+  releasenameOverride: mockserver
+  app:
+    runAsUser: 999
+    readOnlyRootFilesystem: false
+  port: 1080
+  resources:
+    requests:
+      cpu: 1
+      memory: 1024Mi
+    limits:
+      cpu: 1
+      memory: 1024Mi
+runner:
+  podSecurityContext:
+    fsGroup: 999
+  securityContext:
+    capabilities:
+      drop:
+        - ALL
+    readOnlyRootFilesystem: false
+    runAsNonRoot: true
+    runAsUser: 999
+    runAsGroup: 999
+  stateful: false
+  resources:
+    requests:
+      cpu: 1
+      memory: 512Mi
+    limits:
+      cpu: 1
+      memory: 512Mi
+  affinity: {}
+  tolerations: []
+  nodeSelector: {}
+  ingress:
+    enabled: false
+    className: ""
+    hosts: []
+    tls: []
+    annotations: {}
+  service:
+    type: NodePort
+    port: 8080
+
+# monitoring.coreos.com/v1 PodMonitor for each node
+prometheusMonitor: true
+
+# deployment placement, standard helm stuff
+podAnnotations:
+nodeSelector:
+tolerations:
+affinity:
diff --git a/core/chainlink.devspace.Dockerfile b/core/chainlink.devspace.Dockerfile
index 9ec061ae40d..88d3cec16ad 100644
--- a/core/chainlink.devspace.Dockerfile
+++ b/core/chainlink.devspace.Dockerfile
@@ -20,7 +20,7 @@ RUN make install-chainlink
 # Final image: ubuntu with chainlink binary
 FROM golang:1.21-bullseye
 
-ARG CHAINLINK_USER=root
+ARG CHAINLINK_USER=chainlink
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && apt-get install -y ca-certificates gnupg lsb-release curl
 

From d2bbc37aff7641a20babe0f6f6d4d66b03b6a0b0 Mon Sep 17 00:00:00 2001
From: Lei <lei.shi@smartcontract.com>
Date: Fri, 1 Dec 2023 11:04:54 -0800
Subject: [PATCH 067/130] make streams lookup modular (#11368)

* make streams lookup modular

* polish

* address comment to use pointer instead of array/map

* rebase

* get rid of slice
---
 core/scripts/chaincli/handler/debug.go        | 150 +++--
 .../handler/mercury_lookup_handler.go         | 534 ------------------
 core/scripts/go.mod                           |   3 +-
 core/scripts/go.sum                           |   2 -
 .../v21/mercury/streams/streams.go            | 143 ++---
 .../v21/mercury/streams/streams_test.go       |  20 +-
 6 files changed, 186 insertions(+), 666 deletions(-)
 delete mode 100644 core/scripts/chaincli/handler/mercury_lookup_handler.go

diff --git a/core/scripts/chaincli/handler/debug.go b/core/scripts/chaincli/handler/debug.go
index fec8c6cd414..0075862d95d 100644
--- a/core/scripts/chaincli/handler/debug.go
+++ b/core/scripts/chaincli/handler/debug.go
@@ -22,12 +22,17 @@ import (
 
 	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"
 
+	evm21 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21"
+
 	"github.com/smartcontractkit/chainlink/core/scripts/chaincli/config"
 	"github.com/smartcontractkit/chainlink/core/scripts/common"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_utils_2_1"
 	iregistry21 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/i_keeper_registry_master_wrapper_2_1"
+	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/models"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 	bigmath "github.com/smartcontractkit/chainlink/v2/core/utils/big_math"
@@ -36,12 +41,7 @@ import (
 const (
 	ConditionTrigger uint8 = iota
 	LogTrigger
-
-	blockNumber            = "blockNumber"
 	expectedTypeAndVersion = "KeeperRegistry 2.1.0"
-	feedIdHex              = "feedIdHex"
-	feedIDs                = "feedIDs"
-	timestamp              = "timestamp"
 )
 
 var packer = encoding.NewAbiPacker()
@@ -125,6 +125,8 @@ func (k *Keeper) Debug(ctx context.Context, args []string) {
 	var checkResult iregistry21.CheckUpkeep
 	var blockNum uint64
 	var performData []byte
+	var workID [32]byte
+	var trigger ocr2keepers.Trigger
 	upkeepNeeded := false
 	// check upkeep
 	if triggerType == ConditionTrigger {
@@ -177,7 +179,8 @@ func (k *Keeper) Debug(ctx context.Context, args []string) {
 		}
 		// check that tx for this upkeep / tx was not already performed
 		message(fmt.Sprintf("LogTrigger{blockNum: %d, blockHash: %s, txHash: %s, logIndex: %d}", blockNum, receipt.BlockHash.Hex(), txHash, logIndex))
-		workID := mustUpkeepWorkID(upkeepID, blockNum, receipt.BlockHash, txHash, logIndex)
+		trigger = mustAutomationTrigger(txHash, logIndex, blockNum, receipt.BlockHash)
+		workID = mustUpkeepWorkID(upkeepID, trigger)
 		message(fmt.Sprintf("workID computed: %s", hex.EncodeToString(workID[:])))
 		hasKey, err := keeperRegistry21.HasDedupKey(latestCallOpts, workID)
 		if err != nil {
@@ -229,73 +232,82 @@ func (k *Keeper) Debug(ctx context.Context, args []string) {
 	if checkResult.UpkeepFailureReason != 0 {
 		message(fmt.Sprintf("checkUpkeep failed with UpkeepFailureReason %d", checkResult.UpkeepFailureReason))
 	}
+
 	if checkResult.UpkeepFailureReason == uint8(encoding.UpkeepFailureReasonTargetCheckReverted) {
-		// TODO use the new streams lookup lib
-		//mc := &models.MercuryCredentials{k.cfg.MercuryLegacyURL, k.cfg.MercuryURL, k.cfg.MercuryID, k.cfg.MercuryKey}
-		//mercuryConfig := evm.NewMercuryConfig(mc, core.StreamsCompatibleABI)
-		//lggr, _ := logger.NewLogger()
-		//blockSub := &blockSubscriber{k.client}
-		//_ = streams.NewStreamsLookup(packer, mercuryConfig, blockSub, keeperRegistry21, k.rpcClient, lggr)
+		mc := &models.MercuryCredentials{k.cfg.MercuryLegacyURL, k.cfg.MercuryURL, k.cfg.MercuryID, k.cfg.MercuryKey}
+		mercuryConfig := evm21.NewMercuryConfig(mc, core.StreamsCompatibleABI)
+		lggr, _ := logger.NewLogger()
+		blockSub := &blockSubscriber{k.client}
+		streams := streams.NewStreamsLookup(packer, mercuryConfig, blockSub, k.rpcClient, keeperRegistry21, lggr)
 
 		streamsLookupErr, err := packer.DecodeStreamsLookupRequest(checkResult.PerformData)
 		if err == nil {
 			message("upkeep reverted with StreamsLookup")
 			message(fmt.Sprintf("StreamsLookup data: {FeedParamKey: %s, Feeds: %v, TimeParamKey: %s, Time: %d, ExtraData: %s}", streamsLookupErr.FeedParamKey, streamsLookupErr.Feeds, streamsLookupErr.TimeParamKey, streamsLookupErr.Time.Uint64(), hexutil.Encode(streamsLookupErr.ExtraData)))
-			if streamsLookupErr.FeedParamKey == feedIdHex && streamsLookupErr.TimeParamKey == blockNumber {
+
+			streamsLookup := &mercury.StreamsLookup{
+				StreamsLookupError: &mercury.StreamsLookupError{
+					FeedParamKey: streamsLookupErr.FeedParamKey,
+					Feeds:        streamsLookupErr.Feeds,
+					TimeParamKey: streamsLookupErr.TimeParamKey,
+					Time:         streamsLookupErr.Time,
+					ExtraData:    streamsLookupErr.ExtraData,
+				},
+				UpkeepId: upkeepID,
+				Block:    blockNum,
+			}
+
+			if streamsLookup.IsMercuryV02() {
 				message("using mercury lookup v0.2")
-				// handle v0.2
-				cfg, err := keeperRegistry21.GetUpkeepPrivilegeConfig(triggerCallOpts, upkeepID)
+				// check if upkeep is allowed to use mercury v0.2
+				_, _, _, allowed, err := streams.AllowedToUseMercury(latestCallOpts, upkeepID)
 				if err != nil {
-					failUnknown("failed to get upkeep privilege config ", err)
-				}
-				allowed := false
-				if len(cfg) > 0 {
-					var privilegeConfig streams.UpkeepPrivilegeConfig
-					if err := json.Unmarshal(cfg, &privilegeConfig); err != nil {
-						failUnknown("failed to unmarshal privilege config ", err)
-					}
-					allowed = privilegeConfig.MercuryEnabled
+					failUnknown("failed to check if upkeep is allowed to use mercury", err)
 				}
 				if !allowed {
 					resolveIneligible("upkeep reverted with StreamsLookup but is not allowed to access streams")
 				}
-			} else if streamsLookupErr.FeedParamKey != feedIDs || streamsLookupErr.TimeParamKey != timestamp {
+			} else if streamsLookup.IsMercuryV03() {
 				// handle v0.3
-				resolveIneligible("upkeep reverted with StreamsLookup but the configuration is invalid")
-			} else {
 				message("using mercury lookup v0.3")
+			} else {
+				resolveIneligible("upkeep reverted with StreamsLookup but the configuration is invalid")
 			}
-			streamsLookup := &StreamsLookup{streamsLookupErr.FeedParamKey, streamsLookupErr.Feeds, streamsLookupErr.TimeParamKey, streamsLookupErr.Time, streamsLookupErr.ExtraData, upkeepID, blockNum}
 
 			if k.cfg.MercuryLegacyURL == "" || k.cfg.MercuryURL == "" || k.cfg.MercuryID == "" || k.cfg.MercuryKey == "" {
 				failCheckConfig("Mercury configs not set properly, check your MERCURY_LEGACY_URL, MERCURY_URL, MERCURY_ID and MERCURY_KEY", nil)
 			}
-			handler := NewMercuryLookupHandler(&MercuryCredentials{k.cfg.MercuryLegacyURL, k.cfg.MercuryURL, k.cfg.MercuryID, k.cfg.MercuryKey}, k.rpcClient)
-			state, failureReason, values, _, err := handler.doMercuryRequest(ctx, streamsLookup)
-			if failureReason == UpkeepFailureReasonInvalidRevertDataInput {
+
+			// do mercury request
+			automationCheckResult := mustAutomationCheckResult(upkeepID, checkResult, trigger)
+			values, err := streams.DoMercuryRequest(ctx, streamsLookup, &automationCheckResult)
+
+			if automationCheckResult.IneligibilityReason == uint8(mercury.MercuryUpkeepFailureReasonInvalidRevertDataInput) {
 				resolveIneligible("upkeep used invalid revert data")
 			}
-			if state == InvalidMercuryRequest {
+			if automationCheckResult.PipelineExecutionState == uint8(mercury.InvalidMercuryRequest) {
 				resolveIneligible("the mercury request data is invalid")
 			}
 			if err != nil {
-				failCheckConfig("failed to do mercury request ", err)
+				resolveIneligible("failed to DoMercuryRequest")
 			}
-			callbackResult, err := keeperRegistry21.CheckCallback(triggerCallOpts, upkeepID, values, streamsLookup.extraData)
+
+			// do checkCallback
+			err = streams.CheckCallback(ctx, values, streamsLookup, &automationCheckResult)
 			if err != nil {
 				failUnknown("failed to execute mercury callback ", err)
 			}
-			if callbackResult.UpkeepFailureReason != 0 {
-				message(fmt.Sprintf("checkCallback failed with UpkeepFailureReason %d", checkResult.UpkeepFailureReason))
+			if automationCheckResult.IneligibilityReason != 0 {
+				message(fmt.Sprintf("checkCallback failed with UpkeepFailureReason %d", automationCheckResult.IneligibilityReason))
 			}
-			upkeepNeeded, performData = callbackResult.UpkeepNeeded, callbackResult.PerformData
-			// do tenderly simulations
-			rawCall, err := core.RegistryABI.Pack("checkCallback", upkeepID, values, streamsLookup.extraData)
+			upkeepNeeded, performData = automationCheckResult.Eligible, automationCheckResult.PerformData
+			// do tenderly simulations for checkCallback
+			rawCall, err := core.RegistryABI.Pack("checkCallback", upkeepID, values, streamsLookup.ExtraData)
 			if err != nil {
 				failUnknown("failed to pack raw checkCallback call", err)
 			}
 			addLink("checkCallback simulation", tenderlySimLink(k.cfg, chainID, blockNum, rawCall, registryAddress))
-			rawCall, err = core.StreamsCompatibleABI.Pack("checkCallback", values, streamsLookup.extraData)
+			rawCall, err = core.StreamsCompatibleABI.Pack("checkCallback", values, streamsLookup.ExtraData)
 			if err != nil {
 				failUnknown("failed to pack raw checkCallback (direct) call", err)
 			}
@@ -317,6 +329,23 @@ func (k *Keeper) Debug(ctx context.Context, args []string) {
 	}
 }
 
+func mustAutomationCheckResult(upkeepID *big.Int, checkResult iregistry21.CheckUpkeep, trigger ocr2keepers.Trigger) ocr2keepers.CheckResult {
+	upkeepIdentifier := mustUpkeepIdentifier(upkeepID)
+	checkResult2 := ocr2keepers.CheckResult{
+		Eligible:            checkResult.UpkeepNeeded,
+		IneligibilityReason: checkResult.UpkeepFailureReason,
+		UpkeepID:            upkeepIdentifier,
+		Trigger:             trigger,
+		WorkID:              core.UpkeepWorkID(upkeepIdentifier, trigger),
+		GasAllocated:        0,
+		PerformData:         checkResult.PerformData,
+		FastGasWei:          checkResult.FastGasWei,
+		LinkNative:          checkResult.LinkNative,
+	}
+
+	return checkResult2
+}
+
 type blockSubscriber struct {
 	ethClient *ethclient.Client
 }
@@ -370,9 +399,27 @@ func packTriggerData(log *types.Log, blockTime uint64) ([]byte, error) {
 	return b, nil
 }
 
-func mustUpkeepWorkID(upkeepID *big.Int, blockNum uint64, blockHash [32]byte, txHash [32]byte, logIndex int64) [32]byte {
-	// TODO - this is a copy of the code in core.UpkeepWorkID
-	// We should refactor that code to be more easily exported ex not rely on Trigger structs
+func mustUpkeepWorkID(upkeepID *big.Int, trigger ocr2keepers.Trigger) [32]byte {
+	upkeepIdentifier := mustUpkeepIdentifier(upkeepID)
+
+	workID := core.UpkeepWorkID(upkeepIdentifier, trigger)
+	workIDBytes, err := hex.DecodeString(workID)
+	if err != nil {
+		failUnknown("failed to decode workID", err)
+	}
+
+	var result [32]byte
+	copy(result[:], workIDBytes[:])
+	return result
+}
+
+func mustUpkeepIdentifier(upkeepID *big.Int) ocr2keepers.UpkeepIdentifier {
+	upkeepIdentifier := &ocr2keepers.UpkeepIdentifier{}
+	upkeepIdentifier.FromBigInt(upkeepID)
+	return *upkeepIdentifier
+}
+
+func mustAutomationTrigger(txHash [32]byte, logIndex int64, blockNum uint64, blockHash [32]byte) ocr2keepers.Trigger {
 	trigger := ocr2keepers.Trigger{
 		LogTriggerExtension: &ocr2keepers.LogTriggerExtension{
 			TxHash:      txHash,
@@ -381,16 +428,7 @@ func mustUpkeepWorkID(upkeepID *big.Int, blockNum uint64, blockHash [32]byte, tx
 			BlockHash:   blockHash,
 		},
 	}
-	upkeepIdentifier := &ocr2keepers.UpkeepIdentifier{}
-	upkeepIdentifier.FromBigInt(upkeepID)
-	workID := core.UpkeepWorkID(*upkeepIdentifier, trigger)
-	workIDBytes, err := hex.DecodeString(workID)
-	if err != nil {
-		failUnknown("failed to decode workID", err)
-	}
-	var result [32]byte
-	copy(result[:], workIDBytes[:])
-	return result
+	return trigger
 }
 
 func message(msg string) {
@@ -402,11 +440,11 @@ func warning(msg string) {
 }
 
 func resolveIneligible(msg string) {
-	exit(fmt.Sprintf("✅ %s: this upkeep is not currently elligible", msg), nil, 0)
+	exit(fmt.Sprintf("✅ %s: this upkeep is not currently eligible", msg), nil, 0)
 }
 
 func resolveEligible() {
-	exit("❌ this upkeep is currently elligible", nil, 0)
+	exit("❌ this upkeep is currently eligible", nil, 0)
 }
 
 func rerun(msg string, err error) {
@@ -507,5 +545,3 @@ func tenderlySimLink(cfg *config.Config, chainID int64, blockNumber uint64, inpu
 	}
 	return common.TenderlySimLink(responseJSON.Simulation.Id)
 }
-
-// TODO - link to performUpkeep tx if exists
diff --git a/core/scripts/chaincli/handler/mercury_lookup_handler.go b/core/scripts/chaincli/handler/mercury_lookup_handler.go
deleted file mode 100644
index 1bd4b2e183c..00000000000
--- a/core/scripts/chaincli/handler/mercury_lookup_handler.go
+++ /dev/null
@@ -1,534 +0,0 @@
-package handler
-
-import (
-	"context"
-	"crypto/hmac"
-	"crypto/sha256"
-	"encoding/hex"
-	"encoding/json"
-	"fmt"
-	"io"
-	"math/big"
-	"net/http"
-	"net/url"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/avast/retry-go"
-	ethabi "github.com/ethereum/go-ethereum/accounts/abi"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/rpc"
-	"github.com/pkg/errors"
-)
-
-// MercuryLookupHandler is responsible for initiating the calls to the Mercury server
-// to determine whether the upkeeps are eligible
-type MercuryLookupHandler struct {
-	credentials *MercuryCredentials
-	httpClient  HttpClient
-	rpcClient   *rpc.Client
-}
-
-func NewMercuryLookupHandler(
-	credentials *MercuryCredentials,
-	rpcClient *rpc.Client,
-) *MercuryLookupHandler {
-	return &MercuryLookupHandler{
-		credentials: credentials,
-		httpClient:  http.DefaultClient,
-		rpcClient:   rpcClient,
-	}
-}
-
-type MercuryVersion string
-
-type StreamsLookup struct {
-	feedParamKey string
-	feeds        []string
-	timeParamKey string
-	time         *big.Int
-	extraData    []byte
-	upkeepId     *big.Int
-	block        uint64
-}
-
-//go:generate mockery --quiet --name HttpClient --output ./mocks/ --case=underscore
-type HttpClient interface {
-	Do(req *http.Request) (*http.Response, error)
-}
-
-type MercuryCredentials struct {
-	LegacyURL string
-	URL       string
-	ClientID  string
-	ClientKey string
-}
-
-func (mc *MercuryCredentials) Validate() bool {
-	return mc.URL != "" && mc.ClientID != "" && mc.ClientKey != ""
-}
-
-type MercuryData struct {
-	Index     int
-	Error     error
-	Retryable bool
-	Bytes     [][]byte
-	State     PipelineExecutionState
-}
-
-// MercuryV02Response represents a JSON structure used by Mercury v0.2
-type MercuryV02Response struct {
-	ChainlinkBlob string `json:"chainlinkBlob"`
-}
-
-// MercuryV03Response represents a JSON structure used by Mercury v0.3
-type MercuryV03Response struct {
-	Reports []MercuryV03Report `json:"reports"`
-}
-
-type MercuryV03Report struct {
-	FeedID                string `json:"feedID"` // feed id in hex encoded
-	ValidFromTimestamp    uint32 `json:"validFromTimestamp"`
-	ObservationsTimestamp uint32 `json:"observationsTimestamp"`
-	FullReport            string `json:"fullReport"` // the actual hex encoded mercury report of this feed, can be sent to verifier
-}
-
-const (
-	// DefaultAllowListExpiration decides how long an upkeep's allow list info will be valid for.
-	DefaultAllowListExpiration = 20 * time.Minute
-	// CleanupInterval decides when the expired items in cache will be deleted.
-	CleanupInterval = 25 * time.Minute
-)
-
-const (
-	ApplicationJson     = "application/json"
-	BlockNumber         = "blockNumber" // valid for v0.2
-	FeedIDs             = "feedIDs"     // valid for v0.3
-	FeedIdHex           = "feedIdHex"   // valid for v0.2
-	HeaderAuthorization = "Authorization"
-	HeaderContentType   = "Content-Type"
-	HeaderTimestamp     = "X-Authorization-Timestamp"
-	HeaderSignature     = "X-Authorization-Signature-SHA256"
-	HeaderUpkeepId      = "X-Authorization-Upkeep-Id"
-	MercuryPathV2       = "/client?"              // only used to access mercury v0.2 server
-	MercuryBatchPathV3  = "/api/v1/reports/bulk?" // only used to access mercury v0.3 server
-	RetryDelay          = 500 * time.Millisecond
-	Timestamp           = "timestamp" // valid for v0.3
-	TotalAttempt        = 3
-	UserId              = "userId"
-)
-
-type UpkeepFailureReason uint8
-type PipelineExecutionState uint8
-
-const (
-	// upkeep failure onchain reasons
-	UpkeepFailureReasonNone                    UpkeepFailureReason = 0
-	UpkeepFailureReasonUpkeepCancelled         UpkeepFailureReason = 1
-	UpkeepFailureReasonUpkeepPaused            UpkeepFailureReason = 2
-	UpkeepFailureReasonTargetCheckReverted     UpkeepFailureReason = 3
-	UpkeepFailureReasonUpkeepNotNeeded         UpkeepFailureReason = 4
-	UpkeepFailureReasonPerformDataExceedsLimit UpkeepFailureReason = 5
-	UpkeepFailureReasonInsufficientBalance     UpkeepFailureReason = 6
-	UpkeepFailureReasonMercuryCallbackReverted UpkeepFailureReason = 7
-	UpkeepFailureReasonRevertDataExceedsLimit  UpkeepFailureReason = 8
-	UpkeepFailureReasonRegistryPaused          UpkeepFailureReason = 9
-	// leaving a gap here for more onchain failure reasons in the future
-	// upkeep failure offchain reasons
-	UpkeepFailureReasonMercuryAccessNotAllowed UpkeepFailureReason = 32
-	UpkeepFailureReasonTxHashNoLongerExists    UpkeepFailureReason = 33
-	UpkeepFailureReasonInvalidRevertDataInput  UpkeepFailureReason = 34
-	UpkeepFailureReasonSimulationFailed        UpkeepFailureReason = 35
-	UpkeepFailureReasonTxHashReorged           UpkeepFailureReason = 36
-
-	// pipeline execution error
-	NoPipelineError        PipelineExecutionState = 0
-	CheckBlockTooOld       PipelineExecutionState = 1
-	CheckBlockInvalid      PipelineExecutionState = 2
-	RpcFlakyFailure        PipelineExecutionState = 3
-	MercuryFlakyFailure    PipelineExecutionState = 4
-	PackUnpackDecodeFailed PipelineExecutionState = 5
-	MercuryUnmarshalError  PipelineExecutionState = 6
-	InvalidMercuryRequest  PipelineExecutionState = 7
-	InvalidMercuryResponse PipelineExecutionState = 8 // this will only happen if Mercury server sends bad responses
-	UpkeepNotAuthorized    PipelineExecutionState = 9
-)
-
-// UpkeepPrivilegeConfig represents the administrative offchain config for each upkeep. It can be set by s_upkeepPrivilegeManager
-// role on the registry. Upkeeps allowed to use Mercury server will have this set to true.
-type UpkeepPrivilegeConfig struct {
-	MercuryEnabled bool `json:"mercuryEnabled"`
-}
-
-// generateHMAC calculates a user HMAC for Mercury server authentication.
-func (mlh *MercuryLookupHandler) generateHMAC(method string, path string, body []byte, clientId string, secret string, ts int64) string {
-	bodyHash := sha256.New()
-	bodyHash.Write(body)
-	hashString := fmt.Sprintf("%s %s %s %s %d",
-		method,
-		path,
-		hex.EncodeToString(bodyHash.Sum(nil)),
-		clientId,
-		ts)
-	signedMessage := hmac.New(sha256.New, []byte(secret))
-	signedMessage.Write([]byte(hashString))
-	userHmac := hex.EncodeToString(signedMessage.Sum(nil))
-	return userHmac
-}
-
-// singleFeedRequest sends a v0.2 Mercury request for a single feed report.
-func (mlh *MercuryLookupHandler) singleFeedRequest(ctx context.Context, ch chan<- MercuryData, index int, ml *StreamsLookup) {
-	q := url.Values{
-		ml.feedParamKey: {ml.feeds[index]},
-		ml.timeParamKey: {ml.time.String()},
-	}
-	mercuryURL := mlh.credentials.LegacyURL
-	reqUrl := fmt.Sprintf("%s%s%s", mercuryURL, MercuryPathV2, q.Encode())
-	// mlh.logger.Debugf("request URL for upkeep %s feed %s: %s", ml.upkeepId.String(), ml.feeds[index], reqUrl)
-
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, reqUrl, nil)
-	if err != nil {
-		ch <- MercuryData{Index: index, Error: err, Retryable: false, State: InvalidMercuryRequest}
-		return
-	}
-
-	ts := time.Now().UTC().UnixMilli()
-	signature := mlh.generateHMAC(http.MethodGet, MercuryPathV2+q.Encode(), []byte{}, mlh.credentials.ClientID, mlh.credentials.ClientKey, ts)
-	req.Header.Set(HeaderContentType, ApplicationJson)
-	req.Header.Set(HeaderAuthorization, mlh.credentials.ClientID)
-	req.Header.Set(HeaderTimestamp, strconv.FormatInt(ts, 10))
-	req.Header.Set(HeaderSignature, signature)
-
-	// in the case of multiple retries here, use the last attempt's data
-	state := NoPipelineError
-	retryable := false
-	sent := false
-	retryErr := retry.Do(
-		func() error {
-			retryable = false
-			resp, err1 := mlh.httpClient.Do(req)
-			if err1 != nil {
-				// mlh.logger.Errorw("StreamsLookup GET request failed", "upkeepID", ml.upkeepId.String(), "time", ml.time.String(), "feed", ml.feeds[index], "error", err1)
-				retryable = true
-				state = MercuryFlakyFailure
-				return err1
-			}
-			defer func(Body io.ReadCloser) {
-				err := Body.Close()
-				if err != nil {
-					// mlh.logger.Errorf("Encountered error when closing the body of the response in single feed: %s", err)
-				}
-			}(resp.Body)
-
-			body, err1 := io.ReadAll(resp.Body)
-			if err1 != nil {
-				retryable = false
-				state = InvalidMercuryResponse
-				return err1
-			}
-
-			if resp.StatusCode == http.StatusNotFound || resp.StatusCode == http.StatusInternalServerError {
-				// mlh.logger.Errorw("StreamsLookup received retryable status code", "upkeepID", ml.upkeepId.String(), "time", ml.time.String(), "statusCode", resp.StatusCode, "feed", ml.feeds[index])
-				retryable = true
-				state = MercuryFlakyFailure
-				return errors.New(strconv.FormatInt(int64(resp.StatusCode), 10))
-			} else if resp.StatusCode != http.StatusOK {
-				retryable = false
-				state = InvalidMercuryRequest
-				return fmt.Errorf("StreamsLookup upkeep %s block %s received status code %d for feed %s", ml.upkeepId.String(), ml.time.String(), resp.StatusCode, ml.feeds[index])
-			}
-
-			// mlh.logger.Debugf("at block %s upkeep %s received status code %d from mercury v0.2 with BODY=%s", ml.time.String(), ml.upkeepId.String(), resp.StatusCode, hexutil.Encode(body))
-
-			var m MercuryV02Response
-			err1 = json.Unmarshal(body, &m)
-			if err1 != nil {
-				// mlh.logger.Errorw("StreamsLookup failed to unmarshal body to MercuryResponse", "upkeepID", ml.upkeepId.String(), "time", ml.time.String(), "feed", ml.feeds[index], "error", err1)
-				retryable = false
-				state = MercuryUnmarshalError
-				return err1
-			}
-			blobBytes, err1 := hexutil.Decode(m.ChainlinkBlob)
-			if err1 != nil {
-				// mlh.logger.Errorw("StreamsLookup failed to decode chainlinkBlob for feed", "upkeepID", ml.upkeepId.String(), "time", ml.time.String(), "blob", m.ChainlinkBlob, "feed", ml.feeds[index], "error", err1)
-				retryable = false
-				state = InvalidMercuryResponse
-				return err1
-			}
-			ch <- MercuryData{
-				Index:     index,
-				Bytes:     [][]byte{blobBytes},
-				Retryable: false,
-				State:     NoPipelineError,
-			}
-			sent = true
-			return nil
-		},
-		// only retry when the error is 404 Not Found or 500 Internal Server Error
-		retry.RetryIf(func(err error) bool {
-			return err.Error() == fmt.Sprintf("%d", http.StatusNotFound) || err.Error() == fmt.Sprintf("%d", http.StatusInternalServerError)
-		}),
-		retry.Context(ctx),
-		retry.Delay(RetryDelay),
-		retry.Attempts(TotalAttempt))
-
-	if !sent {
-		md := MercuryData{
-			Index:     index,
-			Bytes:     [][]byte{},
-			Retryable: retryable,
-			Error:     fmt.Errorf("failed to request feed for %s: %w", ml.feeds[index], retryErr),
-			State:     state,
-		}
-		ch <- md
-	}
-}
-
-// multiFeedsRequest sends a Mercury v0.3 request for a multi-feed report
-func (mlh *MercuryLookupHandler) multiFeedsRequest(ctx context.Context, ch chan<- MercuryData, ml *StreamsLookup) {
-	params := fmt.Sprintf("%s=%s&%s=%s", FeedIDs, strings.Join(ml.feeds, ","), Timestamp, ml.time.String())
-	reqUrl := fmt.Sprintf("%s%s%s", mlh.credentials.URL, MercuryBatchPathV3, params)
-	// mlh.logger.Debugf("request URL for upkeep %s userId %s: %s", ml.upkeepId.String(), mlh.credentials.ClientID, reqUrl)
-
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, reqUrl, nil)
-	if err != nil {
-		ch <- MercuryData{Index: 0, Error: err, Retryable: false, State: InvalidMercuryRequest}
-		return
-	}
-
-	ts := time.Now().UTC().UnixMilli()
-	signature := mlh.generateHMAC(http.MethodGet, MercuryBatchPathV3+params, []byte{}, mlh.credentials.ClientID, mlh.credentials.ClientKey, ts)
-	req.Header.Set(HeaderContentType, ApplicationJson)
-	// username here is often referred to as user id
-	req.Header.Set(HeaderAuthorization, mlh.credentials.ClientID)
-	req.Header.Set(HeaderTimestamp, strconv.FormatInt(ts, 10))
-	req.Header.Set(HeaderSignature, signature)
-	// mercury will inspect authorization headers above to make sure this user (in automation's context, this node) is eligible to access mercury
-	// and if it has an automation role. it will then look at this upkeep id to check if it has access to all the requested feeds.
-	req.Header.Set(HeaderUpkeepId, ml.upkeepId.String())
-
-	// in the case of multiple retries here, use the last attempt's data
-	state := NoPipelineError
-	retryable := false
-	sent := false
-	retryErr := retry.Do(
-		func() error {
-			retryable = false
-			resp, err1 := mlh.httpClient.Do(req)
-			if err1 != nil {
-				// mlh.logger.Errorw("StreamsLookup GET request fails for multi feed", "upkeepID", ml.upkeepId.String(), "time", ml.time.String(), "error", err1)
-				retryable = true
-				state = MercuryFlakyFailure
-				return err1
-			}
-			defer func(Body io.ReadCloser) {
-				err := Body.Close()
-				if err != nil {
-					// mlh.logger.Errorf("Encountered error when closing the body of the response in the multi feed: %s", err)
-				}
-			}(resp.Body)
-			body, err1 := io.ReadAll(resp.Body)
-			if err1 != nil {
-				retryable = false
-				state = InvalidMercuryResponse
-				return err1
-			}
-
-			// mlh.logger.Infof("at timestamp %s upkeep %s received status code %d from mercury v0.3", ml.time.String(), ml.upkeepId.String(), resp.StatusCode)
-			if resp.StatusCode == http.StatusUnauthorized {
-				retryable = false
-				state = UpkeepNotAuthorized
-				return fmt.Errorf("at timestamp %s upkeep %s received status code %d from mercury v0.3, most likely this is caused by unauthorized upkeep", ml.time.String(), ml.upkeepId.String(), resp.StatusCode)
-			} else if resp.StatusCode == http.StatusBadRequest {
-				retryable = false
-				state = InvalidMercuryRequest
-				return fmt.Errorf("at timestamp %s upkeep %s received status code %d from mercury v0.3, most likely this is caused by invalid format of timestamp", ml.time.String(), ml.upkeepId.String(), resp.StatusCode)
-			} else if resp.StatusCode == http.StatusInternalServerError {
-				retryable = true
-				state = MercuryFlakyFailure
-				return fmt.Errorf("%d", http.StatusInternalServerError)
-			} else if resp.StatusCode == 420 {
-				// in 0.3, this will happen when missing/malformed query args, missing or bad required headers, non-existent feeds, or no permissions for feeds
-				retryable = false
-				state = InvalidMercuryRequest
-				return fmt.Errorf("at timestamp %s upkeep %s received status code %d from mercury v0.3, most likely this is caused by missing/malformed query args, missing or bad required headers, non-existent feeds, or no permissions for feeds", ml.time.String(), ml.upkeepId.String(), resp.StatusCode)
-			} else if resp.StatusCode != http.StatusOK {
-				retryable = false
-				state = InvalidMercuryRequest
-				return fmt.Errorf("at timestamp %s upkeep %s received status code %d from mercury v0.3", ml.time.String(), ml.upkeepId.String(), resp.StatusCode)
-			}
-
-			var response MercuryV03Response
-			err1 = json.Unmarshal(body, &response)
-			if err1 != nil {
-				// mlh.logger.Errorw("StreamsLookup failed to unmarshal body to MercuryResponse for multi feed", "upkeepID", ml.upkeepId.String(), "time", ml.time.String(), "error", err1)
-				retryable = false
-				state = MercuryUnmarshalError
-				return err1
-			}
-			// in v0.3, if some feeds are not available, the server will only return available feeds, but we need to make sure ALL feeds are retrieved before calling user contract
-			// hence, retry in this case. retry will help when we send a very new timestamp and reports are not yet generated
-			if len(response.Reports) != len(ml.feeds) {
-				// TODO: AUTO-5044: calculate what reports are missing and log a warning
-				retryable = true
-				state = MercuryFlakyFailure
-				return fmt.Errorf("%d", http.StatusNotFound)
-			}
-			var reportBytes [][]byte
-			for _, rsp := range response.Reports {
-				b, err := hexutil.Decode(rsp.FullReport)
-				if err != nil {
-					retryable = false
-					state = InvalidMercuryResponse
-					return err
-				}
-				reportBytes = append(reportBytes, b)
-			}
-			ch <- MercuryData{
-				Index:     0,
-				Bytes:     reportBytes,
-				Retryable: false,
-				State:     NoPipelineError,
-			}
-			sent = true
-			return nil
-		},
-		// only retry when the error is 404 Not Found or 500 Internal Server Error
-		retry.RetryIf(func(err error) bool {
-			return err.Error() == fmt.Sprintf("%d", http.StatusNotFound) || err.Error() == fmt.Sprintf("%d", http.StatusInternalServerError)
-		}),
-		retry.Context(ctx),
-		retry.Delay(RetryDelay),
-		retry.Attempts(TotalAttempt))
-
-	if !sent {
-		md := MercuryData{
-			Index:     0,
-			Bytes:     [][]byte{},
-			Retryable: retryable,
-			Error:     retryErr,
-			State:     state,
-		}
-		ch <- md
-	}
-}
-
-// doMercuryRequest sends requests to Mercury API to retrieve ChainlinkBlob.
-func (mlh *MercuryLookupHandler) doMercuryRequest(ctx context.Context, ml *StreamsLookup) (PipelineExecutionState, UpkeepFailureReason, [][]byte, bool, error) {
-	var isMercuryV03 bool
-	resultLen := len(ml.feeds)
-	ch := make(chan MercuryData, resultLen)
-	if len(ml.feeds) == 0 {
-		return NoPipelineError, UpkeepFailureReasonInvalidRevertDataInput, nil, false, fmt.Errorf("invalid revert data input: feed param key %s, time param key %s, feeds %s", ml.feedParamKey, ml.timeParamKey, ml.feeds)
-	}
-	if ml.feedParamKey == FeedIdHex && ml.timeParamKey == BlockNumber {
-		// only v0.2
-		for i := range ml.feeds {
-			go mlh.singleFeedRequest(ctx, ch, i, ml)
-		}
-	} else if ml.feedParamKey == FeedIDs && ml.timeParamKey == Timestamp {
-		// only v0.3
-		resultLen = 1
-		isMercuryV03 = true
-		ch = make(chan MercuryData, resultLen)
-		go mlh.multiFeedsRequest(ctx, ch, ml)
-	} else {
-		return NoPipelineError, UpkeepFailureReasonInvalidRevertDataInput, nil, false, fmt.Errorf("invalid revert data input: feed param key %s, time param key %s, feeds %s", ml.feedParamKey, ml.timeParamKey, ml.feeds)
-	}
-
-	var reqErr error
-	results := make([][]byte, len(ml.feeds))
-	retryable := true
-	allSuccess := true
-	// in v0.2, use the last execution error as the state, if no execution errors, state will be no error
-	state := NoPipelineError
-	for i := 0; i < resultLen; i++ {
-		m := <-ch
-		if m.Error != nil {
-			if reqErr == nil {
-				reqErr = errors.New(m.Error.Error())
-			} else {
-				reqErr = errors.New(reqErr.Error() + m.Error.Error())
-			}
-			retryable = retryable && m.Retryable
-			allSuccess = false
-			if m.State != NoPipelineError {
-				state = m.State
-			}
-			continue
-		}
-		if isMercuryV03 {
-			results = m.Bytes
-		} else {
-			results[m.Index] = m.Bytes[0]
-		}
-	}
-	// only retry when not all successful AND none are not retryable
-	return state, UpkeepFailureReasonNone, results, retryable && !allSuccess, reqErr
-}
-
-// decodeStreamsLookup decodes the revert error StreamsLookup(string feedParamKey, string[] feeds, string timeParamKey, uint256 time, byte[] extraData)
-// func (mlh *MercuryLookupHandler) decodeStreamsLookup(data []byte) (*StreamsLookup, error) {
-// 	e := mlh.mercuryConfig.Abi.Errors["StreamsLookup"]
-// 	unpack, err := e.Unpack(data)
-// 	if err != nil {
-// 		return nil, fmt.Errorf("unpack error: %w", err)
-// 	}
-// 	errorParameters := unpack.([]interface{})
-
-// 	return &StreamsLookup{
-// 		feedParamKey: *abi.ConvertType(errorParameters[0], new(string)).(*string),
-// 		feeds:        *abi.ConvertType(errorParameters[1], new([]string)).(*[]string),
-// 		timeParamKey: *abi.ConvertType(errorParameters[2], new(string)).(*string),
-// 		time:         *abi.ConvertType(errorParameters[3], new(*big.Int)).(**big.Int),
-// 		extraData:    *abi.ConvertType(errorParameters[4], new([]byte)).(*[]byte),
-// 	}, nil
-// }
-
-// allowedToUseMercury retrieves upkeep's administrative offchain config and decode a mercuryEnabled bool to indicate if
-// this upkeep is allowed to use Mercury service.
-// func (mlh *MercuryLookupHandler) allowedToUseMercury(upkeep models.Upkeep) (bool, error) {
-// 	allowed, ok := mlh.mercuryConfig.AllowListCache.Get(upkeep.Admin.Hex())
-// 	if ok {
-// 		return allowed.(bool), nil
-// 	}
-
-// 	if upkeep.UpkeepPrivilegeConfig == nil {
-// 		return false, fmt.Errorf("the upkeep privilege config was not retrieved for upkeep with ID %s", upkeep.UpkeepID)
-// 	}
-
-// 	if len(upkeep.UpkeepPrivilegeConfig) == 0 {
-// 		return false, fmt.Errorf("the upkeep privilege config is empty")
-// 	}
-
-// 	var a UpkeepPrivilegeConfig
-// 	err := json.Unmarshal(upkeep.UpkeepPrivilegeConfig, &a)
-// 	if err != nil {
-// 		return false, fmt.Errorf("failed to unmarshal privilege config for upkeep ID %s: %v", upkeep.UpkeepID, err)
-// 	}
-
-// 	mlh.mercuryConfig.AllowListCache.Set(upkeep.Admin.Hex(), a.MercuryEnabled, cache.DefaultExpiration)
-// 	return a.MercuryEnabled, nil
-// }
-
-func (mlh *MercuryLookupHandler) CheckCallback(ctx context.Context, values [][]byte, lookup *StreamsLookup, registryABI ethabi.ABI, registryAddress common.Address) (hexutil.Bytes, error) {
-	payload, err := registryABI.Pack("checkCallback", lookup.upkeepId, values, lookup.extraData)
-	if err != nil {
-		return nil, err
-	}
-
-	var theBytes hexutil.Bytes
-	args := map[string]interface{}{
-		"to":   registryAddress.Hex(),
-		"data": hexutil.Bytes(payload),
-	}
-
-	// call checkCallback function at the block which OCR3 has agreed upon
-	err = mlh.rpcClient.CallContext(ctx, &theBytes, "eth_call", args, hexutil.EncodeUint64(lookup.block))
-	if err != nil {
-		return nil, err
-	}
-	return theBytes, nil
-}
diff --git a/core/scripts/go.mod b/core/scripts/go.mod
index c7af0541c12..21f00df02de 100644
--- a/core/scripts/go.mod
+++ b/core/scripts/go.mod
@@ -7,7 +7,6 @@ replace github.com/smartcontractkit/chainlink/v2 => ../../
 
 require (
 	github.com/ava-labs/coreth v0.12.1
-	github.com/avast/retry-go v3.0.0+incompatible
 	github.com/docker/docker v24.0.7+incompatible
 	github.com/docker/go-connections v0.4.0
 	github.com/ethereum/go-ethereum v1.12.0
@@ -19,7 +18,6 @@ require (
 	github.com/montanaflynn/stats v0.7.1
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/pelletier/go-toml/v2 v2.1.0
-	github.com/pkg/errors v0.9.1
 	github.com/shopspring/decimal v1.3.1
 	github.com/smartcontractkit/chainlink-automation v1.0.1
 	github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
@@ -283,6 +281,7 @@ require (
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/pressly/goose/v3 v3.16.0 // indirect
diff --git a/core/scripts/go.sum b/core/scripts/go.sum
index 7cea79eb76e..36504924e16 100644
--- a/core/scripts/go.sum
+++ b/core/scripts/go.sum
@@ -152,8 +152,6 @@ github.com/ava-labs/avalanchego v1.10.1 h1:lBeamJ1iNq+p2oKg2nAs+A65m8vhSDjkiTDbw
 github.com/ava-labs/avalanchego v1.10.1/go.mod h1:ZvSXWlbkUKlbk3BsWx29a+8eVHe/WBsOxh55BSGoeRk=
 github.com/ava-labs/coreth v0.12.1 h1:EWSkFGHGVUxmu1pnSK/2pdcxaAVHbGspHqO3Ag+i7sA=
 github.com/ava-labs/coreth v0.12.1/go.mod h1:/5x54QlIKjlPebkdzTA5ic9wXdejbWOnQosztkv9jxo=
-github.com/avast/retry-go v3.0.0+incompatible h1:4SOWQ7Qs+oroOTQOYnAHqelpCO0biHSxpiH9JdtuBj0=
-github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY=
 github.com/avast/retry-go/v4 v4.5.1 h1:AxIx0HGi4VZ3I02jr78j5lZ3M6x1E0Ivxa6b0pUUh7o=
 github.com/avast/retry-go/v4 v4.5.1/go.mod h1:/sipNsvNB3RRuT5iNcb6h73nw3IBmXJ/H3XrCQYSOpc=
 github.com/aws/aws-sdk-go v1.22.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams.go
index aec23431921..cb9e2dd6752 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams.go
@@ -16,7 +16,6 @@ import (
 	"github.com/patrickmn/go-cache"
 
 	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"
-
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
 	iregistry21 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/i_keeper_registry_master_wrapper_2_1"
@@ -92,8 +91,9 @@ func NewStreamsLookup(
 // Lookup looks through check upkeep results looking for any that need off chain lookup
 func (s *streams) Lookup(ctx context.Context, checkResults []ocr2keepers.CheckResult) []ocr2keepers.CheckResult {
 	lookups := map[int]*mercury.StreamsLookup{}
-	for i, checkResult := range checkResults {
-		s.buildResult(ctx, i, checkResult, checkResults, lookups)
+	for _, checkResult := range checkResults {
+		copyCheckResult := checkResult
+		s.buildResult(ctx, &copyCheckResult, lookups)
 	}
 
 	var wg sync.WaitGroup
@@ -101,7 +101,7 @@ func (s *streams) Lookup(ctx context.Context, checkResults []ocr2keepers.CheckRe
 		wg.Add(1)
 		func(i int, lookup *mercury.StreamsLookup) {
 			s.threadCtrl.Go(func(ctx context.Context) {
-				s.doLookup(ctx, &wg, lookup, i, checkResults)
+				s.doLookup(ctx, &wg, lookup, &checkResults[i])
 			})
 		}(i, lookup)
 	}
@@ -112,7 +112,7 @@ func (s *streams) Lookup(ctx context.Context, checkResults []ocr2keepers.CheckRe
 }
 
 // buildResult checks if the upkeep is allowed by Mercury and builds a streams lookup request from the check result
-func (s *streams) buildResult(ctx context.Context, i int, checkResult ocr2keepers.CheckResult, checkResults []ocr2keepers.CheckResult, lookups map[int]*mercury.StreamsLookup) {
+func (s *streams) buildResult(ctx context.Context, checkResult *ocr2keepers.CheckResult, lookups map[int]*mercury.StreamsLookup) {
 	lookupLggr := s.lggr.With("where", "StreamsLookup")
 	if checkResult.IneligibilityReason != uint8(mercury.MercuryUpkeepFailureReasonTargetCheckReverted) {
 		// Streams Lookup only works when upkeep target check reverts
@@ -129,7 +129,7 @@ func (s *streams) buildResult(ctx context.Context, i int, checkResult ocr2keeper
 
 	// Try to decode the revert error into streams lookup format. User upkeeps can revert with any reason, see if they
 	// tried to call mercury
-	lookupLggr.Infof("at block %d upkeep %s trying to DecodeStreamsLookupRequest performData=%s", block, upkeepId, hexutil.Encode(checkResults[i].PerformData))
+	lookupLggr.Infof("at block %d upkeep %s trying to DecodeStreamsLookupRequest performData=%s", block, upkeepId, hexutil.Encode(checkResult.PerformData))
 	streamsLookupErr, err := s.packer.DecodeStreamsLookupRequest(checkResult.PerformData)
 	if err != nil {
 		lookupLggr.Debugf("at block %d upkeep %s DecodeStreamsLookupRequest failed: %v", block, upkeepId, err)
@@ -139,7 +139,7 @@ func (s *streams) buildResult(ctx context.Context, i int, checkResult ocr2keeper
 	streamsLookupResponse := &mercury.StreamsLookup{StreamsLookupError: streamsLookupErr}
 
 	if len(streamsLookupResponse.Feeds) == 0 {
-		checkResults[i].IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonInvalidRevertDataInput)
+		checkResult.IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonInvalidRevertDataInput)
 		lookupLggr.Debugf("at block %s upkeep %s has empty feeds array", block, upkeepId)
 		return
 	}
@@ -148,21 +148,21 @@ func (s *streams) buildResult(ctx context.Context, i int, checkResult ocr2keeper
 	if streamsLookupResponse.IsMercuryV02() {
 		// check permission on the registry for mercury v0.2
 		opts := s.buildCallOpts(ctx, block)
-		if state, reason, retryable, allowed, err := s.allowedToUseMercury(opts, upkeepId.BigInt()); err != nil {
+		if state, reason, retryable, allowed, err := s.AllowedToUseMercury(opts, upkeepId.BigInt()); err != nil {
 			lookupLggr.Warnf("at block %s upkeep %s failed to query mercury allow list: %s", block, upkeepId, err)
-			checkResults[i].PipelineExecutionState = uint8(state)
-			checkResults[i].IneligibilityReason = uint8(reason)
-			checkResults[i].Retryable = retryable
+			checkResult.PipelineExecutionState = uint8(state)
+			checkResult.IneligibilityReason = uint8(reason)
+			checkResult.Retryable = retryable
 			return
 		} else if !allowed {
 			lookupLggr.Debugf("at block %d upkeep %s NOT allowed to query Mercury server", block, upkeepId)
-			checkResults[i].IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonMercuryAccessNotAllowed)
+			checkResult.IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonMercuryAccessNotAllowed)
 			return
 		}
 	} else if streamsLookupResponse.IsMercuryVersionUnkown() {
 		// if mercury version cannot be determined, set failure reason
 		lookupLggr.Debugf("at block %d upkeep %s NOT allowed to query Mercury server", block, upkeepId)
-		checkResults[i].IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonInvalidRevertDataInput)
+		checkResult.IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonInvalidRevertDataInput)
 		return
 	}
 
@@ -171,71 +171,103 @@ func (s *streams) buildResult(ctx context.Context, i int, checkResult ocr2keeper
 	// in the revert for mercury v0.2, which is denoted by time in the struct bc starting from v0.3, only timestamp will be supported
 	streamsLookupResponse.Block = uint64(block.Int64())
 	lookupLggr.Infof("at block %d upkeep %s DecodeStreamsLookupRequest feedKey=%s timeKey=%s feeds=%v time=%s extraData=%s", block, upkeepId, streamsLookupResponse.FeedParamKey, streamsLookupResponse.TimeParamKey, streamsLookupResponse.Feeds, streamsLookupResponse.Time, hexutil.Encode(streamsLookupResponse.ExtraData))
-	lookups[i] = streamsLookupResponse
+	lookups[len(lookups)] = streamsLookupResponse
 }
 
-func (s *streams) doLookup(ctx context.Context, wg *sync.WaitGroup, lookup *mercury.StreamsLookup, i int, checkResults []ocr2keepers.CheckResult) {
+func (s *streams) doLookup(ctx context.Context, wg *sync.WaitGroup, lookup *mercury.StreamsLookup, checkResult *ocr2keepers.CheckResult) {
 	defer wg.Done()
 
-	state, reason, values, retryable, retryInterval, err := mercury.NoPipelineError, mercury.MercuryUpkeepFailureReasonInvalidRevertDataInput, [][]byte{}, false, 0*time.Second, fmt.Errorf("invalid revert data input: feed param key %s, time param key %s, feeds %s", lookup.FeedParamKey, lookup.TimeParamKey, lookup.Feeds)
-	pluginRetryKey := generatePluginRetryKey(checkResults[i].WorkID, lookup.Block)
+	values, err := s.DoMercuryRequest(ctx, lookup, checkResult)
+	if err != nil {
+		s.lggr.Errorf("at block %d upkeep %s requested time %s DoMercuryRequest err: %s", lookup.Block, lookup.UpkeepId, lookup.Time, err.Error())
+	}
 
-	if lookup.IsMercuryV02() {
-		state, reason, values, retryable, retryInterval, err = s.v02Client.DoRequest(ctx, lookup, pluginRetryKey)
-	} else if lookup.IsMercuryV03() {
-		state, reason, values, retryable, retryInterval, err = s.v03Client.DoRequest(ctx, lookup, pluginRetryKey)
+	if err := s.CheckCallback(ctx, values, lookup, checkResult); err != nil {
+		s.lggr.Errorf("at block %d upkeep %s requested time %s CheckCallback err: %s", lookup.Block, lookup.UpkeepId, lookup.Time, err.Error())
 	}
+}
 
+func (s *streams) CheckCallback(ctx context.Context, values [][]byte, lookup *mercury.StreamsLookup, checkResult *ocr2keepers.CheckResult) error {
+	payload, err := s.abi.Pack("checkCallback", lookup.UpkeepId, values, lookup.ExtraData)
 	if err != nil {
-		s.lggr.Errorf("at block %d upkeep %s requested time %s retryable %v retryInterval %s doMercuryRequest: %s", lookup.Block, lookup.UpkeepId, lookup.Time, retryable, retryInterval, err.Error())
-		checkResults[i].Retryable = retryable
-		checkResults[i].RetryInterval = retryInterval
-		checkResults[i].PipelineExecutionState = uint8(state)
-		checkResults[i].IneligibilityReason = uint8(reason)
-		return
+		s.lggr.Errorf("at block %d upkeep %s checkCallback packing err: %s", lookup.Block, lookup.UpkeepId, err.Error())
+		checkResult.Retryable = false
+		checkResult.PipelineExecutionState = uint8(mercury.PackUnpackDecodeFailed)
+		return err
 	}
 
-	for j, v := range values {
-		s.lggr.Infof("at block %d upkeep %s requested time %s doMercuryRequest values[%d]: %s", lookup.Block, lookup.UpkeepId, lookup.Time, j, hexutil.Encode(v))
+	var mercuryBytes hexutil.Bytes
+	args := map[string]interface{}{
+		"to":   s.registry.Address().Hex(),
+		"data": hexutil.Bytes(payload),
 	}
 
-	state, retryable, mercuryBytes, err := s.checkCallback(ctx, values, lookup)
-	if err != nil {
+	// call checkCallback function at the block which OCR3 has agreed upon
+	if err = s.client.CallContext(ctx, &mercuryBytes, "eth_call", args, hexutil.EncodeUint64(lookup.Block)); err != nil {
 		s.lggr.Errorf("at block %d upkeep %s checkCallback err: %s", lookup.Block, lookup.UpkeepId, err.Error())
-		checkResults[i].Retryable = retryable
-		checkResults[i].PipelineExecutionState = uint8(state)
-		return
+		checkResult.Retryable = true
+		checkResult.PipelineExecutionState = uint8(mercury.RpcFlakyFailure)
+		return err
 	}
+
 	s.lggr.Infof("at block %d upkeep %s requested time %s checkCallback mercuryBytes: %s", lookup.Block, lookup.UpkeepId, lookup.Time, hexutil.Encode(mercuryBytes))
 
 	unpackCallBackState, needed, performData, failureReason, _, err := s.packer.UnpackCheckCallbackResult(mercuryBytes)
 	if err != nil {
 		s.lggr.Errorf("at block %d upkeep %s requested time %s UnpackCheckCallbackResult err: %s", lookup.Block, lookup.UpkeepId, lookup.Time, err.Error())
-		checkResults[i].PipelineExecutionState = unpackCallBackState
-		return
+		checkResult.PipelineExecutionState = unpackCallBackState
+		return err
 	}
 
 	if failureReason == uint8(mercury.MercuryUpkeepFailureReasonMercuryCallbackReverted) {
-		checkResults[i].IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonMercuryCallbackReverted)
+		checkResult.IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonMercuryCallbackReverted)
 		s.lggr.Debugf("at block %d upkeep %s requested time %s mercury callback reverts", lookup.Block, lookup.UpkeepId, lookup.Time)
-		return
+		return fmt.Errorf("at block %d upkeep %s requested time %s mercury callback reverts", lookup.Block, lookup.UpkeepId, lookup.Time)
+
 	}
 
 	if !needed {
-		checkResults[i].IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonUpkeepNotNeeded)
+		checkResult.IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonUpkeepNotNeeded)
 		s.lggr.Debugf("at block %d upkeep %s requested time %s callback reports upkeep not needed", lookup.Block, lookup.UpkeepId, lookup.Time)
-		return
+		return fmt.Errorf("at block %d upkeep %s requested time %s callback reports upkeep not needed", lookup.Block, lookup.UpkeepId, lookup.Time)
 	}
 
-	checkResults[i].IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonNone)
-	checkResults[i].Eligible = true
-	checkResults[i].PerformData = performData
+	checkResult.IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonNone)
+	checkResult.Eligible = true
+	checkResult.PerformData = performData
 	s.lggr.Infof("at block %d upkeep %s requested time %s successful with perform data: %s", lookup.Block, lookup.UpkeepId, lookup.Time, hexutil.Encode(performData))
+
+	return nil
+}
+
+func (s *streams) DoMercuryRequest(ctx context.Context, lookup *mercury.StreamsLookup, checkResult *ocr2keepers.CheckResult) ([][]byte, error) {
+	state, reason, values, retryable, retryInterval, err := mercury.NoPipelineError, mercury.MercuryUpkeepFailureReasonInvalidRevertDataInput, [][]byte{}, false, 0*time.Second, fmt.Errorf("invalid revert data input: feed param key %s, time param key %s, feeds %s", lookup.FeedParamKey, lookup.TimeParamKey, lookup.Feeds)
+	pluginRetryKey := generatePluginRetryKey(checkResult.WorkID, lookup.Block)
+
+	if lookup.IsMercuryV02() {
+		state, reason, values, retryable, retryInterval, err = s.v02Client.DoRequest(ctx, lookup, pluginRetryKey)
+	} else if lookup.IsMercuryV03() {
+		state, reason, values, retryable, retryInterval, err = s.v03Client.DoRequest(ctx, lookup, pluginRetryKey)
+	}
+
+	if err != nil {
+		s.lggr.Errorf("at block %d upkeep %s requested time %s retryable %v retryInterval %s doMercuryRequest: %s", lookup.Block, lookup.UpkeepId, lookup.Time, retryable, retryInterval, err.Error())
+		checkResult.Retryable = retryable
+		checkResult.RetryInterval = retryInterval
+		checkResult.PipelineExecutionState = uint8(state)
+		checkResult.IneligibilityReason = uint8(reason)
+		return nil, err
+	}
+
+	for j, v := range values {
+		s.lggr.Infof("at block %d upkeep %s requested time %s doMercuryRequest values[%d]: %s", lookup.Block, lookup.UpkeepId, lookup.Time, j, hexutil.Encode(v))
+	}
+	return values, nil
 }
 
-// allowedToUseMercury retrieves upkeep's administrative offchain config and decode a mercuryEnabled bool to indicate if
+// AllowedToUseMercury retrieves upkeep's administrative offchain config and decode a mercuryEnabled bool to indicate if
 // this upkeep is allowed to use Mercury service.
-func (s *streams) allowedToUseMercury(opts *bind.CallOpts, upkeepId *big.Int) (state mercury.MercuryUpkeepState, reason mercury.MercuryUpkeepFailureReason, retryable bool, allow bool, err error) {
+func (s *streams) AllowedToUseMercury(opts *bind.CallOpts, upkeepId *big.Int) (state mercury.MercuryUpkeepState, reason mercury.MercuryUpkeepFailureReason, retryable bool, allow bool, err error) {
 	allowed, ok := s.mercuryConfig.IsUpkeepAllowed(upkeepId.String())
 	if ok {
 		return mercury.NoPipelineError, mercury.MercuryUpkeepFailureReasonNone, false, allowed.(bool), nil
@@ -255,7 +287,6 @@ func (s *streams) allowedToUseMercury(opts *bind.CallOpts, upkeepId *big.Int) (s
 		"data": hexutil.Bytes(payload),
 	}
 
-	// call checkCallback function at the block which OCR3 has agreed upon
 	if err = s.client.CallContext(opts.Context, &resultBytes, "eth_call", args, hexutil.EncodeBig(opts.BlockNumber)); err != nil {
 		return mercury.RpcFlakyFailure, mercury.MercuryUpkeepFailureReasonNone, true, false, fmt.Errorf("failed to get upkeep privilege config: %v", err)
 	}
@@ -281,26 +312,6 @@ func (s *streams) allowedToUseMercury(opts *bind.CallOpts, upkeepId *big.Int) (s
 	return mercury.NoPipelineError, mercury.MercuryUpkeepFailureReasonNone, false, privilegeConfig.MercuryEnabled, nil
 }
 
-func (s *streams) checkCallback(ctx context.Context, values [][]byte, lookup *mercury.StreamsLookup) (mercury.MercuryUpkeepState, bool, hexutil.Bytes, error) {
-	payload, err := s.abi.Pack("checkCallback", lookup.UpkeepId, values, lookup.ExtraData)
-	if err != nil {
-		return mercury.PackUnpackDecodeFailed, false, nil, err
-	}
-
-	var b hexutil.Bytes
-	args := map[string]interface{}{
-		"to":   s.registry.Address().Hex(),
-		"data": hexutil.Bytes(payload),
-	}
-
-	// call checkCallback function at the block which OCR3 has agreed upon
-	if err := s.client.CallContext(ctx, &b, "eth_call", args, hexutil.EncodeUint64(lookup.Block)); err != nil {
-		return mercury.RpcFlakyFailure, true, nil, err
-	}
-
-	return mercury.NoPipelineError, false, b, nil
-}
-
 func (s *streams) buildCallOpts(ctx context.Context, block *big.Int) *bind.CallOpts {
 	opts := bind.CallOpts{
 		Context: ctx,
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams_test.go
index abcc37dca18..2475244b4d0 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams_test.go
@@ -126,6 +126,7 @@ func TestStreams_CheckCallback(t *testing.T) {
 	tests := []struct {
 		name       string
 		lookup     *mercury.StreamsLookup
+		input      []ocr2keepers.CheckResult
 		values     [][]byte
 		statusCode int
 
@@ -153,6 +154,9 @@ func TestStreams_CheckCallback(t *testing.T) {
 				UpkeepId: upkeepId,
 				Block:    bn,
 			},
+			input: []ocr2keepers.CheckResult{
+				{},
+			},
 			values:       values,
 			statusCode:   http.StatusOK,
 			callbackResp: []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 48, 120, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
@@ -185,6 +189,9 @@ func TestStreams_CheckCallback(t *testing.T) {
 				UpkeepId: upkeepId,
 				Block:    bn,
 			},
+			input: []ocr2keepers.CheckResult{
+				{},
+			},
 			values:       values,
 			statusCode:   http.StatusOK,
 			callbackResp: []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
@@ -216,6 +223,9 @@ func TestStreams_CheckCallback(t *testing.T) {
 				UpkeepId: upkeepId,
 				Block:    bn,
 			},
+			input: []ocr2keepers.CheckResult{
+				{},
+			},
 			values:       values,
 			statusCode:   http.StatusOK,
 			callbackResp: []byte{},
@@ -255,10 +265,10 @@ func TestStreams_CheckCallback(t *testing.T) {
 				}).Once()
 			s.client = client
 
-			state, retryable, _, err := s.checkCallback(testutils.Context(t), tt.values, tt.lookup)
-			tt.wantErr(t, err, fmt.Sprintf("Error asserion failed: %v", tt.name))
-			assert.Equal(t, tt.state, state)
-			assert.Equal(t, tt.retryable, retryable)
+			err = s.CheckCallback(testutils.Context(t), tt.values, tt.lookup, &tt.input[0])
+			tt.wantErr(t, err, fmt.Sprintf("Error assertion failed: %v", tt.name))
+			assert.Equal(t, uint8(tt.state), tt.input[0].PipelineExecutionState)
+			assert.Equal(t, tt.retryable, tt.input[0].Retryable)
 		})
 	}
 }
@@ -434,7 +444,7 @@ func TestStreams_AllowedToUseMercury(t *testing.T) {
 				BlockNumber: big.NewInt(10),
 			}
 
-			state, reason, retryable, allowed, err := s.allowedToUseMercury(opts, upkeepId)
+			state, reason, retryable, allowed, err := s.AllowedToUseMercury(opts, upkeepId)
 			assert.Equal(t, tt.err, err)
 			assert.Equal(t, tt.allowed, allowed)
 			assert.Equal(t, tt.state, state)

From a933ba19cc4ed1c66780659eb7848386ff5369f8 Mon Sep 17 00:00:00 2001
From: Ryan Hall <RyanRHall@users.noreply.github.com>
Date: Fri, 1 Dec 2023 14:06:55 -0500
Subject: [PATCH 068/130] write test for backwards compatibility in automation
 report encoding function (#11430)

---
 .../evmregistry/v21/encoding/encoder_test.go  | 35 +++++++++++++++++++
 .../v21/fixtures/expected_encoded_report.txt  |  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/fixtures/expected_encoded_report.txt

diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/encoder_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/encoder_test.go
index 1376e2a9bb3..aa549ab3ec8 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/encoder_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/encoder_test.go
@@ -1,7 +1,10 @@
 package encoding
 
 import (
+	"bytes"
+	"encoding/hex"
 	"math/big"
+	"os"
 	"testing"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -12,6 +15,19 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
 )
 
+var expectedEncodedReport []byte
+
+func init() {
+	b, err := os.ReadFile("../fixtures/expected_encoded_report.txt")
+	if err != nil {
+		panic(err)
+	}
+	expectedEncodedReport, err = hex.DecodeString(string(b))
+	if err != nil {
+		panic(err)
+	}
+}
+
 func TestReportEncoder_EncodeExtract(t *testing.T) {
 	encoder := reportEncoder{
 		packer: NewAbiPacker(),
@@ -93,6 +109,25 @@ func TestReportEncoder_EncodeExtract(t *testing.T) {
 	}
 }
 
+func TestReportEncoder_BackwardsCompatibility(t *testing.T) {
+	encoder := reportEncoder{
+		packer: NewAbiPacker(),
+	}
+	results := []ocr2keepers.CheckResult{
+		newResult(1, 2, core.GenUpkeepID(ocr2keepers.LogTrigger, "10"), 5, 6),
+		newResult(3, 4, core.GenUpkeepID(ocr2keepers.ConditionTrigger, "20"), 7, 8),
+	}
+	encoded, err := encoder.Encode(results...)
+	assert.NoError(t, err)
+	if !bytes.Equal(encoded, expectedEncodedReport) {
+		assert.Fail(t,
+			"encoded report does not match expected encoded report; "+
+				"this means a breaking change has been made to the report encoding function; "+
+				"only update this test if non-backwards-compatible changes are necessary",
+		)
+	}
+}
+
 func newResult(block int64, checkBlock ocr2keepers.BlockNumber, id ocr2keepers.UpkeepIdentifier, fastGasWei, linkNative int64) ocr2keepers.CheckResult {
 	tp := core.GetUpkeepType(id)
 
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/fixtures/expected_encoded_report.txt b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/fixtures/expected_encoded_report.txt
new file mode 100644
index 00000000000..3fb42146c8c
--- /dev/null
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/fixtures/expected_encoded_report.txt
@@ -0,0 +1 @@
+00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000020100000000000000000000000000000131300000000000000000000000000000010000000000000000000000000000003230000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000064000000000000000000000000000000000000000000000000000000000000006400000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000a0aaaaaaaa9012345678901234567890123456789012345678901234567890123412345678901234567890123456789012345678901234567890123456789012340000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000101020304050607080102030405060708010203040506070801020304050607080000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000301020304050607080102030405060708010203040506070801020304050607080000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000005646174613000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000056461746130000000000000000000000000000000000000000000000000000000
\ No newline at end of file

From e2b46525b9d82ccf789c857ae12f79173271348e Mon Sep 17 00:00:00 2001
From: Steve Ellis <email@steveell.is>
Date: Fri, 1 Dec 2023 20:34:11 +0100
Subject: [PATCH 069/130] remove previous Solidity code owners (#11454)

---
 CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index bd2d0419cf7..e34d3ea1bef 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -71,7 +71,7 @@ core/scripts/gateway @bolekk @pinebit
 /operator-ui/ @DeividasK @jkongie
 
 # Contracts
-/contracts/ @se3000 @connorwstein @RensR
+/contracts/ @RensR
 
 # First we match on project names to catch files like the compilation scripts,
 # gas snapshots and other files not places in the project directories.

From 10b9d44f066d6012a64d02fcef379608953f3709 Mon Sep 17 00:00:00 2001
From: Jordan Krage <jmank88@gmail.com>
Date: Fri, 1 Dec 2023 14:27:44 -0600
Subject: [PATCH 070/130] common/txmgr: initialize map before goroutines race
 ahead (#11452)

* common/txmgr: initiliaze map before goroutines race ahead

* pass ctx from Start()
---
 common/txmgr/broadcaster.go               | 18 +++++++-----------
 common/txmgr/test_helpers.go              |  4 ++--
 common/txmgr/txmgr.go                     |  6 ++++--
 core/chains/evm/txmgr/broadcaster_test.go |  4 ++--
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/common/txmgr/broadcaster.go b/common/txmgr/broadcaster.go
index ab620c51be3..54ae653f662 100644
--- a/common/txmgr/broadcaster.go
+++ b/common/txmgr/broadcaster.go
@@ -194,14 +194,14 @@ func NewBroadcaster[
 
 // Start starts Broadcaster service.
 // The provided context can be used to terminate Start sequence.
-func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Start(_ context.Context) error {
+func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Start(ctx context.Context) error {
 	return eb.StartOnce("Broadcaster", func() (err error) {
-		return eb.startInternal()
+		return eb.startInternal(ctx)
 	})
 }
 
 // startInternal can be called multiple times, in conjunction with closeInternal. The TxMgr uses this functionality to reset broadcaster multiple times in its own lifetime.
-func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) startInternal() error {
+func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) startInternal(ctx context.Context) error {
 	eb.initSync.Lock()
 	defer eb.initSync.Unlock()
 	if eb.isStarted {
@@ -222,16 +222,15 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) star
 	eb.wg = sync.WaitGroup{}
 	eb.wg.Add(len(eb.enabledAddresses))
 	eb.triggers = make(map[ADDR]chan struct{})
+	eb.sequenceLock.Lock()
+	eb.nextSequenceMap = eb.loadNextSequenceMap(ctx, eb.enabledAddresses)
+	eb.sequenceLock.Unlock()
 	for _, addr := range eb.enabledAddresses {
 		triggerCh := make(chan struct{}, 1)
 		eb.triggers[addr] = triggerCh
 		go eb.monitorTxs(addr, triggerCh)
 	}
 
-	eb.sequenceLock.Lock()
-	defer eb.sequenceLock.Unlock()
-	eb.nextSequenceMap = eb.loadNextSequenceMap(eb.enabledAddresses)
-
 	eb.isStarted = true
 	return nil
 }
@@ -286,10 +285,7 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Trig
 }
 
 // Load the next sequence map using the tx table or on-chain (if not found in tx table)
-func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) loadNextSequenceMap(addresses []ADDR) map[ADDR]SEQ {
-	ctx, cancel := eb.chStop.NewCtx()
-	defer cancel()
-
+func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) loadNextSequenceMap(ctx context.Context, addresses []ADDR) map[ADDR]SEQ {
 	nextSequenceMap := make(map[ADDR]SEQ)
 	for _, address := range addresses {
 		seq, err := eb.getSequenceForAddr(ctx, address)
diff --git a/common/txmgr/test_helpers.go b/common/txmgr/test_helpers.go
index 0f128a23af4..6c0c5680ea7 100644
--- a/common/txmgr/test_helpers.go
+++ b/common/txmgr/test_helpers.go
@@ -22,8 +22,8 @@ func (tr *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) XXXDeliverB
 	tr.mb.Deliver(blockHeight)
 }
 
-func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) XXXTestStartInternal() error {
-	return eb.startInternal()
+func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) XXXTestStartInternal(ctx context.Context) error {
+	return eb.startInternal(ctx)
 }
 
 func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) XXXTestCloseInternal() error {
diff --git a/common/txmgr/txmgr.go b/common/txmgr/txmgr.go
index 3fbdb852f8b..228ab4ec8bf 100644
--- a/common/txmgr/txmgr.go
+++ b/common/txmgr/txmgr.go
@@ -339,18 +339,20 @@ func (b *Txm[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) runLoop()
 		wg.Add(2)
 		go func() {
 			defer wg.Done()
+			ctx, cancel := b.chStop.NewCtx()
+			defer cancel()
 			// Retry indefinitely on failure
 			backoff := utils.NewRedialBackoff()
 			for {
 				select {
 				case <-time.After(backoff.Duration()):
-					if err := b.broadcaster.startInternal(); err != nil {
+					if err := b.broadcaster.startInternal(ctx); err != nil {
 						logger.Criticalw(b.logger, "Failed to start Broadcaster", "err", err)
 						b.SvcErrBuffer.Append(err)
 						continue
 					}
 					return
-				case <-b.chStop:
+				case <-ctx.Done():
 					stopOnce.Do(func() { stopped = true })
 					return
 				}
diff --git a/core/chains/evm/txmgr/broadcaster_test.go b/core/chains/evm/txmgr/broadcaster_test.go
index 26e78344b93..c6e05b0954b 100644
--- a/core/chains/evm/txmgr/broadcaster_test.go
+++ b/core/chains/evm/txmgr/broadcaster_test.go
@@ -124,9 +124,9 @@ func TestEthBroadcaster_Lifecycle(t *testing.T) {
 	require.Error(t, eb.XXXTestCloseInternal())
 
 	// Can successfully startInternal a previously closed instance
-	require.NoError(t, eb.XXXTestStartInternal())
+	require.NoError(t, eb.XXXTestStartInternal(ctx))
 	// Can't startInternal already started instance
-	require.Error(t, eb.XXXTestStartInternal())
+	require.Error(t, eb.XXXTestStartInternal(ctx))
 	// Can successfully closeInternal again
 	require.NoError(t, eb.XXXTestCloseInternal())
 }

From bb5a4510352b91dd327720097f40dc1e14a2bd6f Mon Sep 17 00:00:00 2001
From: chainchad <96362174+chainchad@users.noreply.github.com>
Date: Fri, 1 Dec 2023 16:17:57 -0500
Subject: [PATCH 071/130] Use correct image name prefix for repo (#11465)

---
 .github/workflows/build-publish-pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-publish-pr.yml b/.github/workflows/build-publish-pr.yml
index b958295cf24..a7186ee5a11 100644
--- a/.github/workflows/build-publish-pr.yml
+++ b/.github/workflows/build-publish-pr.yml
@@ -29,7 +29,7 @@ jobs:
           aws-region: ${{ secrets.AWS_REGION }}
           sign-images: false
           ecr-hostname: ${{ secrets.AWS_SDLC_ECR_HOSTNAME }}
-          ecr-image-name: chainlink-untrusted
+          ecr-image-name: crib-chainlink-untrusted
           dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }}
           dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }}
 

From 5dbcf7703d184cd04d85975a238b110412618c01 Mon Sep 17 00:00:00 2001
From: Justin Kaseman <justinkaseman@live.com>
Date: Fri, 1 Dec 2023 17:54:33 -0500
Subject: [PATCH 072/130] Rename Functions Client i_router to i_functionsRouter
 (#11450)

---
 .../src/v0.8/functions/dev/v1_X/FunctionsClient.sol    |  8 ++++----
 contracts/src/v0.8/functions/dev/v1_X/Routable.sol     | 10 +++++-----
 .../tests/v1_X/testhelpers/FunctionsClientHarness.sol  |  2 +-
 .../v1_X/testhelpers/FunctionsClientTestHelper.sol     | 10 +++++-----
 .../v1_X/testhelpers/FunctionsClientUpgradeHelper.sol  |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/contracts/src/v0.8/functions/dev/v1_X/FunctionsClient.sol b/contracts/src/v0.8/functions/dev/v1_X/FunctionsClient.sol
index 6d033d4b235..4aabef01f28 100644
--- a/contracts/src/v0.8/functions/dev/v1_X/FunctionsClient.sol
+++ b/contracts/src/v0.8/functions/dev/v1_X/FunctionsClient.sol
@@ -11,7 +11,7 @@ import {FunctionsRequest} from "./libraries/FunctionsRequest.sol";
 abstract contract FunctionsClient is IFunctionsClient {
   using FunctionsRequest for FunctionsRequest.Request;
 
-  IFunctionsRouter internal immutable i_router;
+  IFunctionsRouter internal immutable i_functionsRouter;
 
   event RequestSent(bytes32 indexed id);
   event RequestFulfilled(bytes32 indexed id);
@@ -19,7 +19,7 @@ abstract contract FunctionsClient is IFunctionsClient {
   error OnlyRouterCanFulfill();
 
   constructor(address router) {
-    i_router = IFunctionsRouter(router);
+    i_functionsRouter = IFunctionsRouter(router);
   }
 
   /// @notice Sends a Chainlink Functions request
@@ -33,7 +33,7 @@ abstract contract FunctionsClient is IFunctionsClient {
     uint32 callbackGasLimit,
     bytes32 donId
   ) internal returns (bytes32) {
-    bytes32 requestId = i_router.sendRequest(
+    bytes32 requestId = i_functionsRouter.sendRequest(
       subscriptionId,
       data,
       FunctionsRequest.REQUEST_DATA_VERSION,
@@ -53,7 +53,7 @@ abstract contract FunctionsClient is IFunctionsClient {
 
   /// @inheritdoc IFunctionsClient
   function handleOracleFulfillment(bytes32 requestId, bytes memory response, bytes memory err) external override {
-    if (msg.sender != address(i_router)) {
+    if (msg.sender != address(i_functionsRouter)) {
       revert OnlyRouterCanFulfill();
     }
     _fulfillRequest(requestId, response, err);
diff --git a/contracts/src/v0.8/functions/dev/v1_X/Routable.sol b/contracts/src/v0.8/functions/dev/v1_X/Routable.sol
index b50b1e603f9..92e23362f9e 100644
--- a/contracts/src/v0.8/functions/dev/v1_X/Routable.sol
+++ b/contracts/src/v0.8/functions/dev/v1_X/Routable.sol
@@ -8,7 +8,7 @@ import {IOwnableFunctionsRouter} from "./interfaces/IOwnableFunctionsRouter.sol"
 /// as the destinations to a route (id=>contract) on the Router.
 /// It provides a Router getter and modifiers.
 abstract contract Routable is ITypeAndVersion {
-  IOwnableFunctionsRouter private immutable i_router;
+  IOwnableFunctionsRouter private immutable i_functionsRouter;
 
   error RouterMustBeSet();
   error OnlyCallableByRouter();
@@ -19,17 +19,17 @@ abstract contract Routable is ITypeAndVersion {
     if (router == address(0)) {
       revert RouterMustBeSet();
     }
-    i_router = IOwnableFunctionsRouter(router);
+    i_functionsRouter = IOwnableFunctionsRouter(router);
   }
 
   /// @notice Return the Router
   function _getRouter() internal view returns (IOwnableFunctionsRouter router) {
-    return i_router;
+    return i_functionsRouter;
   }
 
   /// @notice Reverts if called by anyone other than the router.
   modifier onlyRouter() {
-    if (msg.sender != address(i_router)) {
+    if (msg.sender != address(i_functionsRouter)) {
       revert OnlyCallableByRouter();
     }
     _;
@@ -37,7 +37,7 @@ abstract contract Routable is ITypeAndVersion {
 
   /// @notice Reverts if called by anyone other than the router owner.
   modifier onlyRouterOwner() {
-    if (msg.sender != i_router.owner()) {
+    if (msg.sender != i_functionsRouter.owner()) {
       revert OnlyCallableByRouterOwner();
     }
     _;
diff --git a/contracts/src/v0.8/functions/tests/v1_X/testhelpers/FunctionsClientHarness.sol b/contracts/src/v0.8/functions/tests/v1_X/testhelpers/FunctionsClientHarness.sol
index ec3b5a65fea..f0cb3965b5f 100644
--- a/contracts/src/v0.8/functions/tests/v1_X/testhelpers/FunctionsClientHarness.sol
+++ b/contracts/src/v0.8/functions/tests/v1_X/testhelpers/FunctionsClientHarness.sol
@@ -10,7 +10,7 @@ contract FunctionsClientHarness is FunctionsClientUpgradeHelper {
   constructor(address router) FunctionsClientUpgradeHelper(router) {}
 
   function getRouter_HARNESS() external view returns (address) {
-    return address(i_router);
+    return address(i_functionsRouter);
   }
 
   function sendRequest_HARNESS(
diff --git a/contracts/src/v0.8/functions/tests/v1_X/testhelpers/FunctionsClientTestHelper.sol b/contracts/src/v0.8/functions/tests/v1_X/testhelpers/FunctionsClientTestHelper.sol
index bc73544205e..c300f4d2b8a 100644
--- a/contracts/src/v0.8/functions/tests/v1_X/testhelpers/FunctionsClientTestHelper.sol
+++ b/contracts/src/v0.8/functions/tests/v1_X/testhelpers/FunctionsClientTestHelper.sol
@@ -64,7 +64,7 @@ contract FunctionsClientTestHelper is FunctionsClient {
     uint32 callbackGasLimit = 20_000;
     request._initializeRequestForInlineJavaScript(sourceCode);
     bytes memory requestData = FunctionsRequest._encodeCBOR(request);
-    requestId = i_router.sendRequestToProposed(
+    requestId = i_functionsRouter.sendRequestToProposed(
       subscriptionId,
       requestData,
       FunctionsRequest.REQUEST_DATA_VERSION,
@@ -76,13 +76,13 @@ contract FunctionsClientTestHelper is FunctionsClient {
   }
 
   function acceptTermsOfService(address acceptor, address recipient, bytes32 r, bytes32 s, uint8 v) external {
-    bytes32 allowListId = i_router.getAllowListId();
-    ITermsOfServiceAllowList allowList = ITermsOfServiceAllowList(i_router.getContractById(allowListId));
+    bytes32 allowListId = i_functionsRouter.getAllowListId();
+    ITermsOfServiceAllowList allowList = ITermsOfServiceAllowList(i_functionsRouter.getContractById(allowListId));
     allowList.acceptTermsOfService(acceptor, recipient, r, s, v);
   }
 
   function acceptSubscriptionOwnerTransfer(uint64 subscriptionId) external {
-    IFunctionsSubscriptions(address(i_router)).acceptSubscriptionOwnerTransfer(subscriptionId);
+    IFunctionsSubscriptions(address(i_functionsRouter)).acceptSubscriptionOwnerTransfer(subscriptionId);
   }
 
   function _fulfillRequest(bytes32 requestId, bytes memory response, bytes memory err) internal override {
@@ -98,7 +98,7 @@ contract FunctionsClientTestHelper is FunctionsClient {
       sendSimpleRequestWithJavaScript("somedata", s_subscriptionId, s_donId, 20_000);
     }
     if (s_doInvalidReentrantOperation) {
-      IFunctionsSubscriptions(address(i_router)).cancelSubscription(s_subscriptionId, msg.sender);
+      IFunctionsSubscriptions(address(i_functionsRouter)).cancelSubscription(s_subscriptionId, msg.sender);
     }
     emit FulfillRequestInvoked(requestId, response, err);
   }
diff --git a/contracts/src/v0.8/functions/tests/v1_X/testhelpers/FunctionsClientUpgradeHelper.sol b/contracts/src/v0.8/functions/tests/v1_X/testhelpers/FunctionsClientUpgradeHelper.sol
index a52c3009927..e0f636ee89f 100644
--- a/contracts/src/v0.8/functions/tests/v1_X/testhelpers/FunctionsClientUpgradeHelper.sol
+++ b/contracts/src/v0.8/functions/tests/v1_X/testhelpers/FunctionsClientUpgradeHelper.sol
@@ -82,7 +82,7 @@ contract FunctionsClientUpgradeHelper is FunctionsClient, ConfirmedOwner {
     uint32 callbackGasLimit,
     bytes32 donId
   ) internal returns (bytes32) {
-    bytes32 requestId = i_router.sendRequestToProposed(
+    bytes32 requestId = i_functionsRouter.sendRequestToProposed(
       subscriptionId,
       data,
       FunctionsRequest.REQUEST_DATA_VERSION,

From 5fab4f7301aac9ce42485cb0138ec9f6975e97c1 Mon Sep 17 00:00:00 2001
From: Sneha Agnihotri <180277+snehaagni@users.noreply.github.com>
Date: Fri, 1 Dec 2023 15:51:44 -0800
Subject: [PATCH 073/130] Bump version and update CHANGELOG for core v2.8.0
 (#11419)

* Bump version and update CHANGELOG for core v2.8.0

* Add section for Upcoming changes

* Combine Add sections

* Consolidating Added section

* Remove duplicate text
---
 VERSION           |  2 +-
 docs/CHANGELOG.md | 24 ++++++++++++++----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/VERSION b/VERSION
index 860487ca19c..834f2629538 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.7.1
+2.8.0
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 6af224157a7..62236558c4c 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -9,8 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [dev]
 
-### Fixed
-- Fixed a bug that caused the Telemetry Manager to report incorrect health
+...
+
+## 2.8.0 - UNRELEASED
 
 ### Added
 
@@ -53,7 +54,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     `mercury_cache_wait_count`
     `mercury_cache_miss_count`
 - Added new `EVM.OCR` TOML config fields `DeltaCOverride` and `DeltaCJitterOverride` for overriding the config DeltaC.
-
+- Mercury v0.2 has improved consensus around current block that uses the most recent 5 blocks instead of only the latest one
+- Two new prom metrics for mercury, nops should consider adding alerting on these:
+    - `mercury_insufficient_blocks_count`
+    - `mercury_zero_blocks_count`
+  
 ### Changed
 
 - `PromReporter` no longer directly reads txm related status from the db, and instead uses the txStore API.
@@ -64,16 +69,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Removed `Optimism2` as a supported gas estimator mode
 
-### Added
-
-- Mercury v0.2 has improved consensus around current block that uses the most recent 5 blocks instead of only the latest one
-- Two new prom metrics for mercury, nops should consider adding alerting on these:
-    - `mercury_insufficient_blocks_count`
-    - `mercury_zero_blocks_count`
-
 ### Fixed
 
 - Corrected Ethereum Sepolia `LinkContractAddress` to `0x779877A7B0D9E8603169DdbD7836e478b4624789`
+- Fixed a bug that caused the Telemetry Manager to report incorrect health
+
+### Upcoming Required Configuration Changes
+Starting in `v2.9.0`:
+- `TelemetryIngress.URL` and `TelemetryIngress.ServerPubKey` will no longer be allowed. Any TOML configuration that sets this fields will prevent the node from booting. These fields will be replaced by `[[TelemetryIngress.Endpoints]]`
+- `P2P.V1` will no longer be supported and must not be set in TOML configuration in order to boot. Use `P2P.V2` instead. If you are using both, `V1` can simply be removed.
 
 ...
 

From 7f89813aaa986b7a502b48e1d510cc750076dee9 Mon Sep 17 00:00:00 2001
From: Anirudh Warrier <12178754+anirudhwarrier@users.noreply.github.com>
Date: Mon, 4 Dec 2023 14:49:23 +0400
Subject: [PATCH 074/130] [AUTO-7471] add automation node upgrade test to
 nightly CI (#11469)

* add automation node upgrade test to nightly CI

* increase nodes to 6 for upgrade test
---
 .../workflows/automation-nightly-tests.yml    | 108 ++++++++++++++++++
 .../workflows/automation-ondemand-tests.yml   |   2 +-
 CODEOWNERS                                    |   1 +
 3 files changed, 110 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/automation-nightly-tests.yml

diff --git a/.github/workflows/automation-nightly-tests.yml b/.github/workflows/automation-nightly-tests.yml
new file mode 100644
index 00000000000..3c05786b666
--- /dev/null
+++ b/.github/workflows/automation-nightly-tests.yml
@@ -0,0 +1,108 @@
+name: Automation Nightly Tests
+on:
+  schedule:
+    - cron: "0 0 * * *" # Run nightly
+  push:
+    tags:
+      - "*"
+  workflow_dispatch:
+
+jobs:
+  build-chainlink:
+    environment: integration
+    permissions:
+      id-token: write
+      contents: read
+    name: Build Chainlink Image
+    runs-on: ubuntu20.04-16cores-64GB
+    steps:
+      - name: Collect Metrics
+        id: collect-gha-metrics
+        uses: smartcontractkit/push-gha-metrics-action@d1618b772a97fd87e6505de97b872ee0b1f1729a # v2.0.2
+        with:
+          basic-auth: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }}
+          hostname: ${{ secrets.GRAFANA_CLOUD_HOST }}
+          this-job-name: Build Chainlink Image
+        continue-on-error: true
+      - name: Checkout the repo
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
+      - name: Build Chainlink Image
+        uses: ./.github/actions/build-chainlink-image
+        with:
+          tag_suffix: ""
+          dockerfile: core/chainlink.Dockerfile
+          git_commit_sha: ${{ github.sha }}
+          GRAFANA_CLOUD_BASIC_AUTH: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }}
+          GRAFANA_CLOUD_HOST: ${{ secrets.GRAFANA_CLOUD_HOST }}
+          AWS_REGION: ${{ secrets.QA_AWS_REGION }}
+          AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
+
+  automation-upgrade-test:
+    environment: integration
+    permissions:
+      checks: write
+      pull-requests: write
+      id-token: write
+      contents: read
+    needs: [build-chainlink]
+    env:
+      CHAINLINK_COMMIT_SHA: ${{ github.sha }}
+      CHAINLINK_ENV_USER: ${{ github.actor }}
+      TEST_LOG_LEVEL: debug
+    strategy:
+      fail-fast: false
+      matrix:
+        tests:
+          - name: Upgrade
+            suite: smoke
+            nodes: 6
+            os: ubuntu20.04-8cores-32GB
+            network: SIMULATED
+            command: -run ^TestAutomationNodeUpgrade$ ./smoke
+    runs-on: ${{ matrix.tests.os }}
+    name: Automation ${{ matrix.tests.name }} Test
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          ref: ${{ github.head_ref || github.ref_name }}
+      - name: Run Tests
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@e865e376b8c2d594028c8d645dd6c47169b72974 # v2.2.16
+        env:
+          SELECTED_NETWORKS: ${{ matrix.tests.network }}
+          TEST_SUITE: ${{ matrix.tests.suite }}
+          UPGRADE_VERSION: ${{ github.sha }}
+          UPGRADE_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
+        with:
+          test_command_to_run: cd ./integration-tests && go test -timeout 60m -count=1 -json -test.parallel=${{ matrix.tests.nodes }} ${{ matrix.tests.command }} 2>&1 | tee /tmp/gotest.log | gotestfmt
+          test_download_vendor_packages_command: cd ./integration-tests && go mod download
+          cl_repo: 'public.ecr.aws/chainlink/chainlink'
+          cl_image_tag: 'latest'
+          aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
+          artifacts_location: ./integration-tests/${{ matrix.tests.suite }}/logs
+          publish_check_name: Automation Results ${{ matrix.tests.name }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          go_mod_path: ./integration-tests/go.mod
+          QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
+          QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
+          QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
+      - name: Upload test log
+        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        if: failure()
+        with:
+          name: test-log-${{ matrix.tests.name }}
+          path: /tmp/gotest.log
+          retention-days: 7
+        continue-on-error: true
+      - name: Collect Metrics
+        if: always()
+        id: collect-gha-metrics
+        uses: smartcontractkit/push-gha-metrics-action@d1618b772a97fd87e6505de97b872ee0b1f1729a # v2.0.2
+        with:
+          basic-auth: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }}
+          hostname: ${{ secrets.GRAFANA_CLOUD_HOST }}
+          this-job-name: Automation ${{ matrix.tests.name }} Test
+          test-results-file: '{"testType":"go","filePath":"/tmp/gotest.log"}'
+        continue-on-error: true
diff --git a/.github/workflows/automation-ondemand-tests.yml b/.github/workflows/automation-ondemand-tests.yml
index 016a10252be..e023006d58b 100644
--- a/.github/workflows/automation-ondemand-tests.yml
+++ b/.github/workflows/automation-ondemand-tests.yml
@@ -140,7 +140,7 @@ jobs:
             command: -run ^TestAutomationReorg$ ./reorg
           - name: upgrade
             suite: smoke
-            nodes: 3
+            nodes: 6
             os: ubuntu20.04-8cores-32GB
             pyroscope_env: ci-automation-on-demand-upgrade
             network: SIMULATED
diff --git a/CODEOWNERS b/CODEOWNERS
index e34d3ea1bef..83505b0ed8c 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -120,6 +120,7 @@ core/scripts/gateway @bolekk @pinebit
 /.github/workflows/automation-ondemand-tests.yml @smartcontractkit/keepers
 /.github/workflows/automation-benchmark-tests.yml @smartcontractkit/keepers
 /.github/workflows/automation-load-tests.yml @smartcontractkit/keepers
+/.github/workflows/automation-nightly-tests.yml @smartcontractkit/keepers
 
 /core/chainlink.Dockerfile @smartcontractkit/prodsec-public
 

From e360c6d94b92022011b7cae99e894ad1567c8467 Mon Sep 17 00:00:00 2001
From: Jordan Krage <jmank88@gmail.com>
Date: Mon, 4 Dec 2023 09:55:58 -0600
Subject: [PATCH 075/130] core/services/relay/evm/mercury: use
 chainlink-data-streams (#11293)

---
 core/scripts/go.mod                           |  3 +-
 core/scripts/go.sum                           |  6 ++-
 .../ocr2/plugins/mercury/integration_test.go  | 17 +++---
 core/services/ocr2/plugins/mercury/plugin.go  |  6 +--
 core/services/ocrcommon/telemetry.go          | 12 ++---
 core/services/ocrcommon/telemetry_test.go     | 12 ++---
 .../services/relay/evm/mercury/transmitter.go |  4 +-
 .../relay/evm/mercury/v1/data_source.go       | 27 +++++-----
 .../relay/evm/mercury/v1/data_source_test.go  | 20 +++----
 .../mercury/v1/reportcodec/report_codec.go    |  7 ++-
 .../v1/reportcodec/report_codec_test.go       |  9 ++--
 .../relay/evm/mercury/v2/data_source.go       | 21 ++++----
 .../relay/evm/mercury/v2/data_source_test.go  | 14 ++---
 .../mercury/v2/reportcodec/report_codec.go    |  6 +--
 .../v2/reportcodec/report_codec_test.go       |  8 +--
 .../relay/evm/mercury/v3/data_source.go       | 25 ++++-----
 .../relay/evm/mercury/v3/data_source_test.go  |  8 +--
 .../mercury/v3/reportcodec/report_codec.go    |  7 ++-
 .../v3/reportcodec/report_codec_test.go       |  8 +--
 core/services/relay/evm/mercury_provider.go   | 53 ++++++++++---------
 go.mod                                        |  3 +-
 go.sum                                        |  6 ++-
 integration-tests/go.mod                      |  3 +-
 integration-tests/go.sum                      |  6 ++-
 24 files changed, 151 insertions(+), 140 deletions(-)

diff --git a/core/scripts/go.mod b/core/scripts/go.mod
index 21f00df02de..4b44c7a00ec 100644
--- a/core/scripts/go.mod
+++ b/core/scripts/go.mod
@@ -303,8 +303,9 @@ require (
 	github.com/shirou/gopsutil/v3 v3.23.10 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231201152724-d550085eb3c4 // indirect
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231204152334-1f32103bbb4c // indirect
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 // indirect
+	github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 // indirect
 	github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d // indirect
 	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3 // indirect
 	github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664 // indirect
diff --git a/core/scripts/go.sum b/core/scripts/go.sum
index 36504924e16..78faaf6839a 100644
--- a/core/scripts/go.sum
+++ b/core/scripts/go.sum
@@ -1502,10 +1502,12 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
 github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
 github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231201152724-d550085eb3c4 h1:qau0/AHvPwMR3p6gWsFWC4qVfEtSEALtBetTOpHA2IU=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231201152724-d550085eb3c4/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231204152334-1f32103bbb4c h1:YFyo0pCmKkpB4EOSykCZFueRXNxQ7OhKiCnhoVIzydo=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231204152334-1f32103bbb4c/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 h1:oewYJtdRkJKUHCNDCj5C2LQe6Oq6qy975g931nfG0cc=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542/go.mod h1:EpvRoycRD+kniYlz+pCpRT5e+fmPm0mSD/vmND+0oMg=
+github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ=
+github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1/go.mod h1:GuPvyXryvbiUZIHmPeLBz4L+yJKeyGUjrDfd1KNne+o=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d h1:w4MsbOtNk6nD/mcXLstHWk9hB6g7QLtcAfhPjhwvOaQ=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d/go.mod h1:YPAfLNowdBwiKiYOwgwtbJHi8AJWbcxkbOY0ItAvkfc=
 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3 h1:DudPr8ZNMEVgDwHBvnrpvK96JrGcGCG+LLBnlqaPGnE=
diff --git a/core/services/ocr2/plugins/mercury/integration_test.go b/core/services/ocr2/plugins/mercury/integration_test.go
index e8adb55b397..51f9eaa6683 100644
--- a/core/services/ocr2/plugins/mercury/integration_test.go
+++ b/core/services/ocr2/plugins/mercury/integration_test.go
@@ -34,10 +34,11 @@ import (
 	ocr2types "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 	"github.com/smartcontractkit/wsrpc/credentials"
 
-	relaymercury "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury"
-	relaycodecv1 "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury/v1"
-	relaycodecv2 "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury/v2"
-	relaycodecv3 "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury/v3"
+	mercurytypes "github.com/smartcontractkit/chainlink-common/pkg/types/mercury"
+	v1 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v1"
+	v2 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v2"
+	v3 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v3"
+	relaymercury "github.com/smartcontractkit/chainlink-data-streams/mercury"
 
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
@@ -62,7 +63,7 @@ var (
 	f                      = uint8(1)
 	n                      = 4 // number of nodes
 	multiplier       int64 = 100000000
-	rawOnchainConfig       = relaymercury.OnchainConfig{
+	rawOnchainConfig       = mercurytypes.OnchainConfig{
 		Min: big.NewInt(0),
 		Max: big.NewInt(math.MaxInt64),
 	}
@@ -154,7 +155,7 @@ func TestIntegration_MercuryV1(t *testing.T) {
 	serverKey := csakey.MustNewV2XXXTestingOnly(big.NewInt(-1))
 	serverPubKey := serverKey.PublicKey
 	srv := NewMercuryServer(t, ed25519.PrivateKey(serverKey.Raw()), reqs, func() []byte {
-		report, err := (&reportcodecv1.ReportCodec{}).BuildReport(relaycodecv1.ReportFields{BenchmarkPrice: big.NewInt(234567), Bid: big.NewInt(1), Ask: big.NewInt(1), CurrentBlockHash: make([]byte, 32)})
+		report, err := (&reportcodecv1.ReportCodec{}).BuildReport(v1.ReportFields{BenchmarkPrice: big.NewInt(234567), Bid: big.NewInt(1), Ask: big.NewInt(1), CurrentBlockHash: make([]byte, 32)})
 		if err != nil {
 			panic(err)
 		}
@@ -503,7 +504,7 @@ func TestIntegration_MercuryV2(t *testing.T) {
 	serverKey := csakey.MustNewV2XXXTestingOnly(big.NewInt(-1))
 	serverPubKey := serverKey.PublicKey
 	srv := NewMercuryServer(t, ed25519.PrivateKey(serverKey.Raw()), reqs, func() []byte {
-		report, err := (&reportcodecv2.ReportCodec{}).BuildReport(relaycodecv2.ReportFields{BenchmarkPrice: big.NewInt(234567), LinkFee: big.NewInt(1), NativeFee: big.NewInt(1)})
+		report, err := (&reportcodecv2.ReportCodec{}).BuildReport(v2.ReportFields{BenchmarkPrice: big.NewInt(234567), LinkFee: big.NewInt(1), NativeFee: big.NewInt(1)})
 		if err != nil {
 			panic(err)
 		}
@@ -779,7 +780,7 @@ func TestIntegration_MercuryV3(t *testing.T) {
 	serverKey := csakey.MustNewV2XXXTestingOnly(big.NewInt(-1))
 	serverPubKey := serverKey.PublicKey
 	srv := NewMercuryServer(t, ed25519.PrivateKey(serverKey.Raw()), reqs, func() []byte {
-		report, err := (&reportcodecv3.ReportCodec{}).BuildReport(relaycodecv3.ReportFields{BenchmarkPrice: big.NewInt(234567), Bid: big.NewInt(1), Ask: big.NewInt(1), LinkFee: big.NewInt(1), NativeFee: big.NewInt(1)})
+		report, err := (&reportcodecv3.ReportCodec{}).BuildReport(v3.ReportFields{BenchmarkPrice: big.NewInt(234567), Bid: big.NewInt(1), Ask: big.NewInt(1), LinkFee: big.NewInt(1), NativeFee: big.NewInt(1)})
 		if err != nil {
 			panic(err)
 		}
diff --git a/core/services/ocr2/plugins/mercury/plugin.go b/core/services/ocr2/plugins/mercury/plugin.go
index d443008334c..f5c11dc7313 100644
--- a/core/services/ocr2/plugins/mercury/plugin.go
+++ b/core/services/ocr2/plugins/mercury/plugin.go
@@ -7,10 +7,10 @@ import (
 
 	libocr2 "github.com/smartcontractkit/libocr/offchainreporting2plus"
 
-	relaymercuryv1 "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury/v1"
-	relaymercuryv2 "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury/v2"
-	relaymercuryv3 "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury/v3"
 	commontypes "github.com/smartcontractkit/chainlink-common/pkg/types"
+	relaymercuryv1 "github.com/smartcontractkit/chainlink-data-streams/mercury/v1"
+	relaymercuryv2 "github.com/smartcontractkit/chainlink-data-streams/mercury/v2"
+	relaymercuryv3 "github.com/smartcontractkit/chainlink-data-streams/mercury/v3"
 
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
diff --git a/core/services/ocrcommon/telemetry.go b/core/services/ocrcommon/telemetry.go
index c9d3e85cd2c..18080fe22b6 100644
--- a/core/services/ocrcommon/telemetry.go
+++ b/core/services/ocrcommon/telemetry.go
@@ -21,9 +21,9 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/synchronization/telem"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 
-	relaymercuryv1 "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury/v1"
-	relaymercuryv2 "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury/v2"
-	relaymercuryv3 "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury/v3"
+	v1types "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v1"
+	v2types "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v2"
+	v3types "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v3"
 )
 
 type eaTelemetry struct {
@@ -41,9 +41,9 @@ type EnhancedTelemetryData struct {
 }
 
 type EnhancedTelemetryMercuryData struct {
-	V1Observation              *relaymercuryv1.Observation
-	V2Observation              *relaymercuryv2.Observation
-	V3Observation              *relaymercuryv3.Observation
+	V1Observation              *v1types.Observation
+	V2Observation              *v2types.Observation
+	V3Observation              *v3types.Observation
 	TaskRunResults             pipeline.TaskRunResults
 	RepTimestamp               ocrtypes.ReportTimestamp
 	FeedVersion                mercuryutils.FeedVersion
diff --git a/core/services/ocrcommon/telemetry_test.go b/core/services/ocrcommon/telemetry_test.go
index 24c798259d9..ae58e89d22e 100644
--- a/core/services/ocrcommon/telemetry_test.go
+++ b/core/services/ocrcommon/telemetry_test.go
@@ -14,9 +14,9 @@ import (
 
 	"github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
-	"github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury"
-	mercuryv1 "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury/v1"
-	mercury_v2 "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury/v2"
+	"github.com/smartcontractkit/chainlink-common/pkg/types/mercury"
+	mercuryv1 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v1"
+	mercuryv2 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v2"
 
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
@@ -696,7 +696,7 @@ func TestCollectMercuryEnhancedTelemetryV2(t *testing.T) {
 
 	chTelem <- EnhancedTelemetryMercuryData{
 		TaskRunResults: trrsMercuryV2,
-		V2Observation: &mercury_v2.Observation{
+		V2Observation: &mercuryv2.Observation{
 			BenchmarkPrice:        mercury.ObsResult[*big.Int]{Val: big.NewInt(111111)},
 			MaxFinalizedTimestamp: mercury.ObsResult[int64]{Val: 321},
 			LinkPrice:             mercury.ObsResult[*big.Int]{Val: big.NewInt(4321)},
@@ -749,7 +749,7 @@ func TestCollectMercuryEnhancedTelemetryV2(t *testing.T) {
 					Value: nil,
 				}},
 		},
-		V2Observation: &mercury_v2.Observation{},
+		V2Observation: &mercuryv2.Observation{},
 		RepTimestamp: types.ReportTimestamp{
 			ConfigDigest: types.ConfigDigest{2},
 			Epoch:        11,
@@ -760,7 +760,7 @@ func TestCollectMercuryEnhancedTelemetryV2(t *testing.T) {
 	trrsMercuryV2[0].Result.Value = ""
 	chTelem <- EnhancedTelemetryMercuryData{
 		TaskRunResults: trrsMercuryV2,
-		V2Observation:  &mercury_v2.Observation{},
+		V2Observation:  &mercuryv2.Observation{},
 		RepTimestamp: types.ReportTimestamp{
 			ConfigDigest: types.ConfigDigest{2},
 			Epoch:        11,
diff --git a/core/services/relay/evm/mercury/transmitter.go b/core/services/relay/evm/mercury/transmitter.go
index d5346ad28cc..40a51b9d92d 100644
--- a/core/services/relay/evm/mercury/transmitter.go
+++ b/core/services/relay/evm/mercury/transmitter.go
@@ -21,8 +21,8 @@ import (
 	"github.com/smartcontractkit/libocr/offchainreporting2plus/chains/evmutil"
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
-	relaymercury "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/types/mercury"
 
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
@@ -89,7 +89,7 @@ var (
 )
 
 type Transmitter interface {
-	relaymercury.Transmitter
+	mercury.Transmitter
 	services.Service
 }
 
diff --git a/core/services/relay/evm/mercury/v1/data_source.go b/core/services/relay/evm/mercury/v1/data_source.go
index bc94166e566..429780ef2eb 100644
--- a/core/services/relay/evm/mercury/v1/data_source.go
+++ b/core/services/relay/evm/mercury/v1/data_source.go
@@ -1,4 +1,4 @@
-package mercury_v1
+package v1
 
 import (
 	"context"
@@ -13,8 +13,9 @@ import (
 
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
-	relaymercury "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury"
-	relaymercuryv1 "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury/v1"
+	"github.com/smartcontractkit/chainlink-common/pkg/types/mercury"
+	v1types "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v1"
+	v1 "github.com/smartcontractkit/chainlink-data-streams/mercury/v1"
 
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
@@ -41,7 +42,7 @@ var (
 	)
 )
 
-const nBlocksObservation int = relaymercuryv1.MaxAllowedBlocks
+const nBlocksObservation int = v1.MaxAllowedBlocks
 
 type Runner interface {
 	ExecuteRun(ctx context.Context, spec pipeline.Spec, vars pipeline.Vars, l logger.Logger) (run *pipeline.Run, trrs pipeline.TaskRunResults, err error)
@@ -66,7 +67,7 @@ type datasource struct {
 	mu sync.RWMutex
 
 	chEnhancedTelem    chan<- ocrcommon.EnhancedTelemetryMercuryData
-	chainReader        relaymercury.ChainReader
+	chainReader        mercury.ChainReader
 	fetcher            Fetcher
 	initialBlockNumber *int64
 
@@ -74,9 +75,9 @@ type datasource struct {
 	zeroBlocksCounter         prometheus.Counter
 }
 
-var _ relaymercuryv1.DataSource = &datasource{}
+var _ v1.DataSource = &datasource{}
 
-func NewDataSource(orm types.DataSourceORM, pr pipeline.Runner, jb job.Job, spec pipeline.Spec, lggr logger.Logger, s ocrcommon.Saver, enhancedTelemChan chan ocrcommon.EnhancedTelemetryMercuryData, chainReader relaymercury.ChainReader, fetcher Fetcher, initialBlockNumber *int64, feedID mercuryutils.FeedID) *datasource {
+func NewDataSource(orm types.DataSourceORM, pr pipeline.Runner, jb job.Job, spec pipeline.Spec, lggr logger.Logger, s ocrcommon.Saver, enhancedTelemChan chan ocrcommon.EnhancedTelemetryMercuryData, chainReader mercury.ChainReader, fetcher Fetcher, initialBlockNumber *int64, feedID mercuryutils.FeedID) *datasource {
 	return &datasource{pr, jb, spec, lggr, s, orm, reportcodec.ReportCodec{}, feedID, sync.RWMutex{}, enhancedTelemChan, chainReader, fetcher, initialBlockNumber, insufficientBlocksCount.WithLabelValues(feedID.String()), zeroBlocksCount.WithLabelValues(feedID.String())}
 }
 
@@ -90,7 +91,7 @@ func (e ErrEmptyLatestReport) Error() string {
 	return fmt.Sprintf("FetchInitialMaxFinalizedBlockNumber returned empty LatestReport; this is a new feed. No initialBlockNumber was set, tried to use current block number to determine maxFinalizedBlockNumber but got error: %v", e.Err)
 }
 
-func (ds *datasource) Observe(ctx context.Context, repts ocrtypes.ReportTimestamp, fetchMaxFinalizedBlockNum bool) (obs relaymercuryv1.Observation, pipelineExecutionErr error) {
+func (ds *datasource) Observe(ctx context.Context, repts ocrtypes.ReportTimestamp, fetchMaxFinalizedBlockNum bool) (obs v1types.Observation, pipelineExecutionErr error) {
 	// setLatestBlocks must come chronologically before observations, along
 	// with observationTimestamp, to avoid front-running
 
@@ -204,9 +205,9 @@ func toBigInt(val interface{}) (*big.Int, error) {
 }
 
 type parseOutput struct {
-	benchmarkPrice relaymercury.ObsResult[*big.Int]
-	bid            relaymercury.ObsResult[*big.Int]
-	ask            relaymercury.ObsResult[*big.Int]
+	benchmarkPrice mercury.ObsResult[*big.Int]
+	bid            mercury.ObsResult[*big.Int]
+	ask            mercury.ObsResult[*big.Int]
 }
 
 // parse expects the output of observe to be three values, in the following order:
@@ -290,7 +291,7 @@ func (ds *datasource) executeRun(ctx context.Context) (*pipeline.Run, pipeline.T
 	return run, trrs, err
 }
 
-func (ds *datasource) setLatestBlocks(ctx context.Context, obs *relaymercuryv1.Observation) error {
+func (ds *datasource) setLatestBlocks(ctx context.Context, obs *v1types.Observation) error {
 	latestBlocks, err := ds.chainReader.LatestHeads(ctx, nBlocksObservation)
 	if err != nil {
 		ds.lggr.Errorw("failed to read latest blocks", "error", err)
@@ -318,7 +319,7 @@ func (ds *datasource) setLatestBlocks(ctx context.Context, obs *relaymercuryv1.O
 	for _, block := range latestBlocks {
 		obs.LatestBlocks = append(
 			obs.LatestBlocks,
-			relaymercuryv1.NewBlock(int64(block.Number), block.Hash, block.Timestamp))
+			v1types.NewBlock(int64(block.Number), block.Hash, block.Timestamp))
 	}
 
 	return nil
diff --git a/core/services/relay/evm/mercury/v1/data_source_test.go b/core/services/relay/evm/mercury/v1/data_source_test.go
index d8d7d39dbb8..72dc4327f19 100644
--- a/core/services/relay/evm/mercury/v1/data_source_test.go
+++ b/core/services/relay/evm/mercury/v1/data_source_test.go
@@ -1,4 +1,4 @@
-package mercury_v1
+package v1
 
 import (
 	"context"
@@ -15,8 +15,9 @@ import (
 
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
-	relaymercury "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury"
-	relaymercuryv1 "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury/v1"
+	"github.com/smartcontractkit/chainlink-common/pkg/types/mercury"
+	v1 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v1"
+
 	commonmocks "github.com/smartcontractkit/chainlink/v2/common/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
@@ -25,7 +26,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
-
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
 	mercurymocks "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/mocks"
 	mercuryutils "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/utils"
@@ -33,7 +33,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
-var _ relaymercury.MercuryServerFetcher = &mockFetcher{}
+var _ mercury.ServerFetcher = &mockFetcher{}
 
 type mockFetcher struct {
 	num *int64
@@ -71,10 +71,10 @@ func (m *mockORM) LatestReport(ctx context.Context, feedID [32]byte, qopts ...pg
 
 type mockChainReader struct {
 	err error
-	obs []relaymercury.Head
+	obs []mercury.Head
 }
 
-func (m *mockChainReader) LatestHeads(context.Context, int) ([]relaymercury.Head, error) {
+func (m *mockChainReader) LatestHeads(context.Context, int) ([]mercury.Head, error) {
 	return m.obs, m.err
 }
 
@@ -391,7 +391,7 @@ func TestMercury_Observe(t *testing.T) {
 
 			obs, err := ds.Observe(ctx, repts, true)
 			assert.Error(t, err)
-			assert.Equal(t, obs, relaymercuryv1.Observation{})
+			assert.Equal(t, obs, v1.Observation{})
 		})
 	})
 }
@@ -416,7 +416,7 @@ func TestMercury_SetLatestBlocks(t *testing.T) {
 		headTracker.On("LatestChain").Return(&h, nil)
 		ds.chainReader = evm.NewChainReader(headTracker)
 
-		obs := relaymercuryv1.Observation{}
+		obs := v1.Observation{}
 		err := ds.setLatestBlocks(testutils.Context(t), &obs)
 
 		assert.NoError(t, err)
@@ -434,7 +434,7 @@ func TestMercury_SetLatestBlocks(t *testing.T) {
 		headTracker.On("LatestChain").Return((*evmtypes.Head)(nil))
 
 		ds.chainReader = evm.NewChainReader(headTracker)
-		obs := relaymercuryv1.Observation{}
+		obs := v1.Observation{}
 		err := ds.setLatestBlocks(testutils.Context(t), &obs)
 
 		assert.NoError(t, err)
diff --git a/core/services/relay/evm/mercury/v1/reportcodec/report_codec.go b/core/services/relay/evm/mercury/v1/reportcodec/report_codec.go
index 28688e3b17a..8f2eac59c33 100644
--- a/core/services/relay/evm/mercury/v1/reportcodec/report_codec.go
+++ b/core/services/relay/evm/mercury/v1/reportcodec/report_codec.go
@@ -11,8 +11,7 @@ import (
 
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
-	reportcodec "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury/v1"
-
+	v1 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v1"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/utils"
 	reporttypes "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/v1/types"
@@ -25,7 +24,7 @@ import (
 var ReportTypes = reporttypes.GetSchema()
 var maxReportLength = 32 * len(ReportTypes) // each arg is 256 bit EVM word
 
-var _ reportcodec.ReportCodec = &ReportCodec{}
+var _ v1.ReportCodec = &ReportCodec{}
 
 type ReportCodec struct {
 	logger logger.Logger
@@ -36,7 +35,7 @@ func NewReportCodec(feedID [32]byte, lggr logger.Logger) *ReportCodec {
 	return &ReportCodec{lggr, feedID}
 }
 
-func (r *ReportCodec) BuildReport(rf reportcodec.ReportFields) (ocrtypes.Report, error) {
+func (r *ReportCodec) BuildReport(rf v1.ReportFields) (ocrtypes.Report, error) {
 	var merr error
 	if rf.BenchmarkPrice == nil {
 		merr = errors.Join(merr, errors.New("benchmarkPrice may not be nil"))
diff --git a/core/services/relay/evm/mercury/v1/reportcodec/report_codec_test.go b/core/services/relay/evm/mercury/v1/reportcodec/report_codec_test.go
index f630b4522b4..2e50faf47d4 100644
--- a/core/services/relay/evm/mercury/v1/reportcodec/report_codec_test.go
+++ b/core/services/relay/evm/mercury/v1/reportcodec/report_codec_test.go
@@ -11,15 +11,14 @@ import (
 
 	"github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
-	relaymercuryv1 "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury/v1"
-
+	v1 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v1"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 var hash = hexutil.MustDecode("0x552c2cea3ab43bae137d89ee6142a01db3ae2b5678bc3c9bd5f509f537bea57b")
 
-func newValidReportFields() relaymercuryv1.ReportFields {
-	return relaymercuryv1.ReportFields{
+func newValidReportFields() v1.ReportFields {
+	return v1.ReportFields{
 		Timestamp:             242,
 		BenchmarkPrice:        big.NewInt(243),
 		Bid:                   big.NewInt(244),
@@ -35,7 +34,7 @@ func Test_ReportCodec(t *testing.T) {
 	r := ReportCodec{}
 
 	t.Run("BuildReport errors on zero fields", func(t *testing.T) {
-		_, err := r.BuildReport(relaymercuryv1.ReportFields{})
+		_, err := r.BuildReport(v1.ReportFields{})
 		require.Error(t, err)
 		assert.Contains(t, err.Error(), "benchmarkPrice may not be nil")
 		assert.Contains(t, err.Error(), "bid may not be nil")
diff --git a/core/services/relay/evm/mercury/v2/data_source.go b/core/services/relay/evm/mercury/v2/data_source.go
index ec6cf5ad106..7c2d6424fae 100644
--- a/core/services/relay/evm/mercury/v2/data_source.go
+++ b/core/services/relay/evm/mercury/v2/data_source.go
@@ -1,4 +1,4 @@
-package mercury_v2
+package v2
 
 import (
 	"context"
@@ -10,8 +10,9 @@ import (
 
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
-	relaymercury "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury"
-	relaymercuryv2 "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury/v2"
+	"github.com/smartcontractkit/chainlink-common/pkg/types/mercury"
+	v2types "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v2"
+	v2 "github.com/smartcontractkit/chainlink-data-streams/mercury/v2"
 
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
@@ -52,13 +53,13 @@ type datasource struct {
 	chEnhancedTelem chan<- ocrcommon.EnhancedTelemetryMercuryData
 }
 
-var _ relaymercuryv2.DataSource = &datasource{}
+var _ v2.DataSource = &datasource{}
 
 func NewDataSource(orm types.DataSourceORM, pr pipeline.Runner, jb job.Job, spec pipeline.Spec, feedID mercuryutils.FeedID, lggr logger.Logger, s ocrcommon.Saver, enhancedTelemChan chan ocrcommon.EnhancedTelemetryMercuryData, fetcher LatestReportFetcher, linkFeedID, nativeFeedID mercuryutils.FeedID) *datasource {
 	return &datasource{pr, jb, spec, feedID, lggr, s, orm, reportcodec.ReportCodec{}, fetcher, linkFeedID, nativeFeedID, sync.RWMutex{}, enhancedTelemChan}
 }
 
-func (ds *datasource) Observe(ctx context.Context, repts ocrtypes.ReportTimestamp, fetchMaxFinalizedTimestamp bool) (obs relaymercuryv2.Observation, pipelineExecutionErr error) {
+func (ds *datasource) Observe(ctx context.Context, repts ocrtypes.ReportTimestamp, fetchMaxFinalizedTimestamp bool) (obs v2types.Observation, pipelineExecutionErr error) {
 	var wg sync.WaitGroup
 	ctx, cancel := context.WithCancel(ctx)
 
@@ -116,8 +117,8 @@ func (ds *datasource) Observe(ctx context.Context, repts ocrtypes.ReportTimestam
 			obs.LinkPrice.Val, obs.LinkPrice.Err = ds.fetcher.LatestPrice(ctx, ds.linkFeedID)
 			if obs.LinkPrice.Val == nil && obs.LinkPrice.Err == nil {
 				mercurytypes.PriceFeedMissingCount.WithLabelValues(ds.linkFeedID.String()).Inc()
-				ds.lggr.Warnw(fmt.Sprintf("Mercury server was missing LINK feed, using sentinel value of %s", relaymercuryv2.MissingPrice), "linkFeedID", ds.linkFeedID)
-				obs.LinkPrice.Val = relaymercuryv2.MissingPrice
+				ds.lggr.Warnw(fmt.Sprintf("Mercury server was missing LINK feed, using sentinel value of %s", v2.MissingPrice), "linkFeedID", ds.linkFeedID)
+				obs.LinkPrice.Val = v2.MissingPrice
 			} else if obs.LinkPrice.Err != nil {
 				mercurytypes.PriceFeedErrorCount.WithLabelValues(ds.linkFeedID.String()).Inc()
 				ds.lggr.Errorw("Mercury server returned error querying LINK price feed", "err", obs.LinkPrice.Err, "linkFeedID", ds.linkFeedID)
@@ -134,8 +135,8 @@ func (ds *datasource) Observe(ctx context.Context, repts ocrtypes.ReportTimestam
 			obs.NativePrice.Val, obs.NativePrice.Err = ds.fetcher.LatestPrice(ctx, ds.nativeFeedID)
 			if obs.NativePrice.Val == nil && obs.NativePrice.Err == nil {
 				mercurytypes.PriceFeedMissingCount.WithLabelValues(ds.nativeFeedID.String()).Inc()
-				ds.lggr.Warnw(fmt.Sprintf("Mercury server was missing native feed, using sentinel value of %s", relaymercuryv2.MissingPrice), "nativeFeedID", ds.nativeFeedID)
-				obs.NativePrice.Val = relaymercuryv2.MissingPrice
+				ds.lggr.Warnw(fmt.Sprintf("Mercury server was missing native feed, using sentinel value of %s", v2.MissingPrice), "nativeFeedID", ds.nativeFeedID)
+				obs.NativePrice.Val = v2.MissingPrice
 			} else if obs.NativePrice.Err != nil {
 				mercurytypes.PriceFeedErrorCount.WithLabelValues(ds.nativeFeedID.String()).Inc()
 				ds.lggr.Errorw("Mercury server returned error querying native price feed", "err", obs.NativePrice.Err, "nativeFeedID", ds.nativeFeedID)
@@ -184,7 +185,7 @@ func toBigInt(val interface{}) (*big.Int, error) {
 }
 
 type parseOutput struct {
-	benchmarkPrice relaymercury.ObsResult[*big.Int]
+	benchmarkPrice mercury.ObsResult[*big.Int]
 }
 
 func (ds *datasource) parse(trrs pipeline.TaskRunResults) (o parseOutput, merr error) {
diff --git a/core/services/relay/evm/mercury/v2/data_source_test.go b/core/services/relay/evm/mercury/v2/data_source_test.go
index d1030327e10..c9ae37ae018 100644
--- a/core/services/relay/evm/mercury/v2/data_source_test.go
+++ b/core/services/relay/evm/mercury/v2/data_source_test.go
@@ -1,4 +1,4 @@
-package mercury_v2
+package v2
 
 import (
 	"context"
@@ -8,11 +8,11 @@ import (
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 
-	relaymercury "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury"
-	relaymercuryv2 "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury/v2"
-
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/types/mercury"
+	v2 "github.com/smartcontractkit/chainlink-data-streams/mercury/v2"
+
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
@@ -22,7 +22,7 @@ import (
 	reportcodecv2 "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/v2/reportcodec"
 )
 
-var _ relaymercury.MercuryServerFetcher = &mockFetcher{}
+var _ mercury.ServerFetcher = &mockFetcher{}
 
 type mockFetcher struct {
 	ts             int64
@@ -279,9 +279,9 @@ func Test_Datasource(t *testing.T) {
 				obs, err := ds.Observe(ctx, repts, false)
 				assert.NoError(t, err)
 
-				assert.Equal(t, obs.LinkPrice.Val, relaymercuryv2.MissingPrice)
+				assert.Equal(t, obs.LinkPrice.Val, v2.MissingPrice)
 				assert.Nil(t, obs.LinkPrice.Err)
-				assert.Equal(t, obs.NativePrice.Val, relaymercuryv2.MissingPrice)
+				assert.Equal(t, obs.NativePrice.Val, v2.MissingPrice)
 				assert.Nil(t, obs.NativePrice.Err)
 			})
 		})
diff --git a/core/services/relay/evm/mercury/v2/reportcodec/report_codec.go b/core/services/relay/evm/mercury/v2/reportcodec/report_codec.go
index 6b13b3b6ef8..33c5fa9a326 100644
--- a/core/services/relay/evm/mercury/v2/reportcodec/report_codec.go
+++ b/core/services/relay/evm/mercury/v2/reportcodec/report_codec.go
@@ -9,7 +9,7 @@ import (
 
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
-	reportcodec "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury/v2"
+	v2 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v2"
 
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/utils"
@@ -20,7 +20,7 @@ var ReportTypes = reporttypes.GetSchema()
 var maxReportLength = 32 * len(ReportTypes) // each arg is 256 bit EVM word
 var zero = big.NewInt(0)
 
-var _ reportcodec.ReportCodec = &ReportCodec{}
+var _ v2.ReportCodec = &ReportCodec{}
 
 type ReportCodec struct {
 	logger logger.Logger
@@ -31,7 +31,7 @@ func NewReportCodec(feedID [32]byte, lggr logger.Logger) *ReportCodec {
 	return &ReportCodec{lggr, feedID}
 }
 
-func (r *ReportCodec) BuildReport(rf reportcodec.ReportFields) (ocrtypes.Report, error) {
+func (r *ReportCodec) BuildReport(rf v2.ReportFields) (ocrtypes.Report, error) {
 	var merr error
 	if rf.BenchmarkPrice == nil {
 		merr = errors.Join(merr, errors.New("benchmarkPrice may not be nil"))
diff --git a/core/services/relay/evm/mercury/v2/reportcodec/report_codec_test.go b/core/services/relay/evm/mercury/v2/reportcodec/report_codec_test.go
index 3a58337b4ce..36b3a443880 100644
--- a/core/services/relay/evm/mercury/v2/reportcodec/report_codec_test.go
+++ b/core/services/relay/evm/mercury/v2/reportcodec/report_codec_test.go
@@ -9,11 +9,11 @@ import (
 
 	"github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
-	relaymercuryv2 "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury/v2"
+	v2 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v2"
 )
 
-func newValidReportFields() relaymercuryv2.ReportFields {
-	return relaymercuryv2.ReportFields{
+func newValidReportFields() v2.ReportFields {
+	return v2.ReportFields{
 		Timestamp:          242,
 		BenchmarkPrice:     big.NewInt(243),
 		ValidFromTimestamp: 123,
@@ -27,7 +27,7 @@ func Test_ReportCodec_BuildReport(t *testing.T) {
 	r := ReportCodec{}
 
 	t.Run("BuildReport errors on zero values", func(t *testing.T) {
-		_, err := r.BuildReport(relaymercuryv2.ReportFields{})
+		_, err := r.BuildReport(v2.ReportFields{})
 		require.Error(t, err)
 		assert.Contains(t, err.Error(), "benchmarkPrice may not be nil")
 		assert.Contains(t, err.Error(), "linkFee may not be nil")
diff --git a/core/services/relay/evm/mercury/v3/data_source.go b/core/services/relay/evm/mercury/v3/data_source.go
index d5e1e5716dd..a751149f378 100644
--- a/core/services/relay/evm/mercury/v3/data_source.go
+++ b/core/services/relay/evm/mercury/v3/data_source.go
@@ -1,4 +1,4 @@
-package mercury_v3
+package v3
 
 import (
 	"context"
@@ -11,8 +11,9 @@ import (
 
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
-	relaymercury "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury"
-	relaymercuryv3 "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury/v3"
+	"github.com/smartcontractkit/chainlink-common/pkg/types/mercury"
+	v3types "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v3"
+	v3 "github.com/smartcontractkit/chainlink-data-streams/mercury/v3"
 
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
@@ -53,13 +54,13 @@ type datasource struct {
 	chEnhancedTelem chan<- ocrcommon.EnhancedTelemetryMercuryData
 }
 
-var _ relaymercuryv3.DataSource = &datasource{}
+var _ v3.DataSource = &datasource{}
 
 func NewDataSource(orm types.DataSourceORM, pr pipeline.Runner, jb job.Job, spec pipeline.Spec, feedID mercuryutils.FeedID, lggr logger.Logger, s ocrcommon.Saver, enhancedTelemChan chan ocrcommon.EnhancedTelemetryMercuryData, fetcher LatestReportFetcher, linkFeedID, nativeFeedID mercuryutils.FeedID) *datasource {
 	return &datasource{pr, jb, spec, feedID, lggr, s, orm, reportcodec.ReportCodec{}, fetcher, linkFeedID, nativeFeedID, sync.RWMutex{}, enhancedTelemChan}
 }
 
-func (ds *datasource) Observe(ctx context.Context, repts ocrtypes.ReportTimestamp, fetchMaxFinalizedTimestamp bool) (obs relaymercuryv3.Observation, pipelineExecutionErr error) {
+func (ds *datasource) Observe(ctx context.Context, repts ocrtypes.ReportTimestamp, fetchMaxFinalizedTimestamp bool) (obs v3types.Observation, pipelineExecutionErr error) {
 	var wg sync.WaitGroup
 	ctx, cancel := context.WithCancel(ctx)
 
@@ -119,8 +120,8 @@ func (ds *datasource) Observe(ctx context.Context, repts ocrtypes.ReportTimestam
 			obs.LinkPrice.Val, obs.LinkPrice.Err = ds.fetcher.LatestPrice(ctx, ds.linkFeedID)
 			if obs.LinkPrice.Val == nil && obs.LinkPrice.Err == nil {
 				mercurytypes.PriceFeedMissingCount.WithLabelValues(ds.linkFeedID.String()).Inc()
-				ds.lggr.Warnw(fmt.Sprintf("Mercury server was missing LINK feed, using sentinel value of %s", relaymercuryv3.MissingPrice), "linkFeedID", ds.linkFeedID)
-				obs.LinkPrice.Val = relaymercuryv3.MissingPrice
+				ds.lggr.Warnw(fmt.Sprintf("Mercury server was missing LINK feed, using sentinel value of %s", v3.MissingPrice), "linkFeedID", ds.linkFeedID)
+				obs.LinkPrice.Val = v3.MissingPrice
 			} else if obs.LinkPrice.Err != nil {
 				mercurytypes.PriceFeedErrorCount.WithLabelValues(ds.linkFeedID.String()).Inc()
 				ds.lggr.Errorw("Mercury server returned error querying LINK price feed", "err", obs.LinkPrice.Err, "linkFeedID", ds.linkFeedID)
@@ -137,8 +138,8 @@ func (ds *datasource) Observe(ctx context.Context, repts ocrtypes.ReportTimestam
 			obs.NativePrice.Val, obs.NativePrice.Err = ds.fetcher.LatestPrice(ctx, ds.nativeFeedID)
 			if obs.NativePrice.Val == nil && obs.NativePrice.Err == nil {
 				mercurytypes.PriceFeedMissingCount.WithLabelValues(ds.nativeFeedID.String()).Inc()
-				ds.lggr.Warnw(fmt.Sprintf("Mercury server was missing native feed, using sentinel value of %s", relaymercuryv3.MissingPrice), "nativeFeedID", ds.nativeFeedID)
-				obs.NativePrice.Val = relaymercuryv3.MissingPrice
+				ds.lggr.Warnw(fmt.Sprintf("Mercury server was missing native feed, using sentinel value of %s", v3.MissingPrice), "nativeFeedID", ds.nativeFeedID)
+				obs.NativePrice.Val = v3.MissingPrice
 			} else if obs.NativePrice.Err != nil {
 				mercurytypes.PriceFeedErrorCount.WithLabelValues(ds.nativeFeedID.String()).Inc()
 				ds.lggr.Errorw("Mercury server returned error querying native price feed", "err", obs.NativePrice.Err, "nativeFeedID", ds.nativeFeedID)
@@ -187,9 +188,9 @@ func toBigInt(val interface{}) (*big.Int, error) {
 }
 
 type parseOutput struct {
-	benchmarkPrice relaymercury.ObsResult[*big.Int]
-	bid            relaymercury.ObsResult[*big.Int]
-	ask            relaymercury.ObsResult[*big.Int]
+	benchmarkPrice mercury.ObsResult[*big.Int]
+	bid            mercury.ObsResult[*big.Int]
+	ask            mercury.ObsResult[*big.Int]
 }
 
 func (ds *datasource) parse(trrs pipeline.TaskRunResults) (o parseOutput, merr error) {
diff --git a/core/services/relay/evm/mercury/v3/data_source_test.go b/core/services/relay/evm/mercury/v3/data_source_test.go
index e03e321d093..4ff713abb21 100644
--- a/core/services/relay/evm/mercury/v3/data_source_test.go
+++ b/core/services/relay/evm/mercury/v3/data_source_test.go
@@ -1,4 +1,4 @@
-package mercury_v3
+package v3
 
 import (
 	"context"
@@ -8,8 +8,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 
-	relaymercury "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury"
-	relaymercuryv3 "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury/v3"
+	mercurytypes "github.com/smartcontractkit/chainlink-common/pkg/types/mercury"
+	relaymercuryv3 "github.com/smartcontractkit/chainlink-data-streams/mercury/v3"
 
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
@@ -22,7 +22,7 @@ import (
 	reportcodecv3 "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/v3/reportcodec"
 )
 
-var _ relaymercury.MercuryServerFetcher = &mockFetcher{}
+var _ mercurytypes.ServerFetcher = &mockFetcher{}
 
 type mockFetcher struct {
 	ts             int64
diff --git a/core/services/relay/evm/mercury/v3/reportcodec/report_codec.go b/core/services/relay/evm/mercury/v3/reportcodec/report_codec.go
index 6b379dc1948..601431838d2 100644
--- a/core/services/relay/evm/mercury/v3/reportcodec/report_codec.go
+++ b/core/services/relay/evm/mercury/v3/reportcodec/report_codec.go
@@ -3,14 +3,13 @@ package reportcodec
 import (
 	"errors"
 	"fmt"
-
 	"math/big"
 
 	pkgerrors "github.com/pkg/errors"
 
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
-	reportcodec "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury/v3"
+	v3 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v3"
 
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/utils"
@@ -21,7 +20,7 @@ var ReportTypes = reporttypes.GetSchema()
 var maxReportLength = 32 * len(ReportTypes) // each arg is 256 bit EVM word
 var zero = big.NewInt(0)
 
-var _ reportcodec.ReportCodec = &ReportCodec{}
+var _ v3.ReportCodec = &ReportCodec{}
 
 type ReportCodec struct {
 	logger logger.Logger
@@ -32,7 +31,7 @@ func NewReportCodec(feedID [32]byte, lggr logger.Logger) *ReportCodec {
 	return &ReportCodec{lggr, feedID}
 }
 
-func (r *ReportCodec) BuildReport(rf reportcodec.ReportFields) (ocrtypes.Report, error) {
+func (r *ReportCodec) BuildReport(rf v3.ReportFields) (ocrtypes.Report, error) {
 	var merr error
 	if rf.BenchmarkPrice == nil {
 		merr = errors.Join(merr, errors.New("benchmarkPrice may not be nil"))
diff --git a/core/services/relay/evm/mercury/v3/reportcodec/report_codec_test.go b/core/services/relay/evm/mercury/v3/reportcodec/report_codec_test.go
index 88416f7ea61..752e6ce34b5 100644
--- a/core/services/relay/evm/mercury/v3/reportcodec/report_codec_test.go
+++ b/core/services/relay/evm/mercury/v3/reportcodec/report_codec_test.go
@@ -9,11 +9,11 @@ import (
 
 	"github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
-	relaymercuryv3 "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury/v3"
+	v3 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v3"
 )
 
-func newValidReportFields() relaymercuryv3.ReportFields {
-	return relaymercuryv3.ReportFields{
+func newValidReportFields() v3.ReportFields {
+	return v3.ReportFields{
 		Timestamp:          242,
 		BenchmarkPrice:     big.NewInt(243),
 		Bid:                big.NewInt(244),
@@ -29,7 +29,7 @@ func Test_ReportCodec_BuildReport(t *testing.T) {
 	r := ReportCodec{}
 
 	t.Run("BuildReport errors on zero values", func(t *testing.T) {
-		_, err := r.BuildReport(relaymercuryv3.ReportFields{})
+		_, err := r.BuildReport(v3.ReportFields{})
 		require.Error(t, err)
 		assert.Contains(t, err.Error(), "benchmarkPrice may not be nil")
 		assert.Contains(t, err.Error(), "linkFee may not be nil")
diff --git a/core/services/relay/evm/mercury_provider.go b/core/services/relay/evm/mercury_provider.go
index 90253808171..b6a2232da3f 100644
--- a/core/services/relay/evm/mercury_provider.go
+++ b/core/services/relay/evm/mercury_provider.go
@@ -6,27 +6,28 @@ import (
 
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
-	relaymercury "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury"
-	relaymercuryv1 "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury/v1"
-	relaymercuryv2 "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury/v2"
-	relaymercuryv3 "github.com/smartcontractkit/chainlink-common/pkg/reportingplugins/mercury/v3"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
-	commontypes "github.com/smartcontractkit/chainlink-common/pkg/types"
-	httypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker/types"
+	"github.com/smartcontractkit/chainlink-common/pkg/types"
+	mercurytypes "github.com/smartcontractkit/chainlink-common/pkg/types/mercury"
+	v1 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v1"
+	v2 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v2"
+	v3 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v3"
+	relaymercury "github.com/smartcontractkit/chainlink-data-streams/mercury"
 
+	httypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker/types"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury"
 )
 
-var _ commontypes.MercuryProvider = (*mercuryProvider)(nil)
+var _ types.MercuryProvider = (*mercuryProvider)(nil)
 
 type mercuryProvider struct {
 	configWatcher *configWatcher
 	transmitter   mercury.Transmitter
-	reportCodecV1 relaymercuryv1.ReportCodec
-	reportCodecV2 relaymercuryv2.ReportCodec
-	reportCodecV3 relaymercuryv3.ReportCodec
-	chainReader   relaymercury.ChainReader
+	reportCodecV1 v1.ReportCodec
+	reportCodecV2 v2.ReportCodec
+	reportCodecV3 v3.ReportCodec
+	chainReader   mercurytypes.ChainReader
 	logger        logger.Logger
 
 	ms services.MultiStart
@@ -35,10 +36,10 @@ type mercuryProvider struct {
 func NewMercuryProvider(
 	configWatcher *configWatcher,
 	transmitter mercury.Transmitter,
-	reportCodecV1 relaymercuryv1.ReportCodec,
-	reportCodecV2 relaymercuryv2.ReportCodec,
-	reportCodecV3 relaymercuryv3.ReportCodec,
-	chainReader relaymercury.ChainReader,
+	reportCodecV1 v1.ReportCodec,
+	reportCodecV2 v2.ReportCodec,
+	reportCodecV3 v3.ReportCodec,
+	chainReader mercurytypes.ChainReader,
 	lggr logger.Logger,
 ) *mercuryProvider {
 	return &mercuryProvider{
@@ -84,19 +85,19 @@ func (p *mercuryProvider) OffchainConfigDigester() ocrtypes.OffchainConfigDigest
 	return p.configWatcher.OffchainConfigDigester()
 }
 
-func (p *mercuryProvider) OnchainConfigCodec() relaymercury.OnchainConfigCodec {
+func (p *mercuryProvider) OnchainConfigCodec() mercurytypes.OnchainConfigCodec {
 	return relaymercury.StandardOnchainConfigCodec{}
 }
 
-func (p *mercuryProvider) ReportCodecV1() relaymercuryv1.ReportCodec {
+func (p *mercuryProvider) ReportCodecV1() v1.ReportCodec {
 	return p.reportCodecV1
 }
 
-func (p *mercuryProvider) ReportCodecV2() relaymercuryv2.ReportCodec {
+func (p *mercuryProvider) ReportCodecV2() v2.ReportCodec {
 	return p.reportCodecV2
 }
 
-func (p *mercuryProvider) ReportCodecV3() relaymercuryv3.ReportCodec {
+func (p *mercuryProvider) ReportCodecV3() v3.ReportCodec {
 	return p.reportCodecV3
 }
 
@@ -104,35 +105,35 @@ func (p *mercuryProvider) ContractTransmitter() ocrtypes.ContractTransmitter {
 	return p.transmitter
 }
 
-func (p *mercuryProvider) MercuryServerFetcher() relaymercury.MercuryServerFetcher {
+func (p *mercuryProvider) MercuryServerFetcher() mercurytypes.ServerFetcher {
 	return p.transmitter
 }
 
-func (p *mercuryProvider) ChainReader() relaymercury.ChainReader {
+func (p *mercuryProvider) ChainReader() mercurytypes.ChainReader {
 	return p.chainReader
 }
 
-var _ relaymercury.ChainReader = (*chainReader)(nil)
+var _ mercurytypes.ChainReader = (*chainReader)(nil)
 
 type chainReader struct {
 	tracker httypes.HeadTracker
 }
 
-func NewChainReader(h httypes.HeadTracker) relaymercury.ChainReader {
+func NewChainReader(h httypes.HeadTracker) mercurytypes.ChainReader {
 	return &chainReader{
 		tracker: h,
 	}
 }
 
-func (r *chainReader) LatestHeads(ctx context.Context, k int) ([]relaymercury.Head, error) {
+func (r *chainReader) LatestHeads(ctx context.Context, k int) ([]mercurytypes.Head, error) {
 	evmBlocks := r.tracker.LatestChain().AsSlice(k)
 	if len(evmBlocks) == 0 {
 		return nil, nil
 	}
 
-	blocks := make([]relaymercury.Head, len(evmBlocks))
+	blocks := make([]mercurytypes.Head, len(evmBlocks))
 	for x := 0; x < len(evmBlocks); x++ {
-		blocks[x] = relaymercury.Head{
+		blocks[x] = mercurytypes.Head{
 			Number:    uint64(evmBlocks[x].BlockNumber()),
 			Hash:      evmBlocks[x].Hash.Bytes(),
 			Timestamp: uint64(evmBlocks[x].Timestamp.Unix()),
diff --git a/go.mod b/go.mod
index 0343f4e7159..c209cbca43f 100644
--- a/go.mod
+++ b/go.mod
@@ -66,8 +66,9 @@ require (
 	github.com/shopspring/decimal v1.3.1
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704
 	github.com/smartcontractkit/chainlink-automation v1.0.1
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231201152724-d550085eb3c4
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231204152334-1f32103bbb4c
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542
+	github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1
 	github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d
 	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3
 	github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664
diff --git a/go.sum b/go.sum
index 4bd90da600d..08743596538 100644
--- a/go.sum
+++ b/go.sum
@@ -1507,10 +1507,12 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
 github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
 github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231201152724-d550085eb3c4 h1:qau0/AHvPwMR3p6gWsFWC4qVfEtSEALtBetTOpHA2IU=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231201152724-d550085eb3c4/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231204152334-1f32103bbb4c h1:YFyo0pCmKkpB4EOSykCZFueRXNxQ7OhKiCnhoVIzydo=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231204152334-1f32103bbb4c/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 h1:oewYJtdRkJKUHCNDCj5C2LQe6Oq6qy975g931nfG0cc=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542/go.mod h1:EpvRoycRD+kniYlz+pCpRT5e+fmPm0mSD/vmND+0oMg=
+github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ=
+github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1/go.mod h1:GuPvyXryvbiUZIHmPeLBz4L+yJKeyGUjrDfd1KNne+o=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d h1:w4MsbOtNk6nD/mcXLstHWk9hB6g7QLtcAfhPjhwvOaQ=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d/go.mod h1:YPAfLNowdBwiKiYOwgwtbJHi8AJWbcxkbOY0ItAvkfc=
 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3 h1:DudPr8ZNMEVgDwHBvnrpvK96JrGcGCG+LLBnlqaPGnE=
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index f95557b2bb1..4249cb0e9b7 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/segmentio/ksuid v1.0.4
 	github.com/slack-go/slack v0.12.2
 	github.com/smartcontractkit/chainlink-automation v1.0.1
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231201152724-d550085eb3c4
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231204152334-1f32103bbb4c
 	github.com/smartcontractkit/chainlink-testing-framework v1.20.0
 	github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
 	github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000
@@ -397,6 +397,7 @@ require (
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 // indirect
+	github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 // indirect
 	github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d // indirect
 	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3 // indirect
 	github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664 // indirect
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index b275f6b653a..d4b804101da 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -1792,10 +1792,12 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
 github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
 github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231201152724-d550085eb3c4 h1:qau0/AHvPwMR3p6gWsFWC4qVfEtSEALtBetTOpHA2IU=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231201152724-d550085eb3c4/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231204152334-1f32103bbb4c h1:YFyo0pCmKkpB4EOSykCZFueRXNxQ7OhKiCnhoVIzydo=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231204152334-1f32103bbb4c/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 h1:oewYJtdRkJKUHCNDCj5C2LQe6Oq6qy975g931nfG0cc=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542/go.mod h1:EpvRoycRD+kniYlz+pCpRT5e+fmPm0mSD/vmND+0oMg=
+github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ=
+github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1/go.mod h1:GuPvyXryvbiUZIHmPeLBz4L+yJKeyGUjrDfd1KNne+o=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d h1:w4MsbOtNk6nD/mcXLstHWk9hB6g7QLtcAfhPjhwvOaQ=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d/go.mod h1:YPAfLNowdBwiKiYOwgwtbJHi8AJWbcxkbOY0ItAvkfc=
 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3 h1:DudPr8ZNMEVgDwHBvnrpvK96JrGcGCG+LLBnlqaPGnE=

From 17cc63d7ec05f9bf28f81bb934e585a1108043c1 Mon Sep 17 00:00:00 2001
From: Anirudh Warrier <12178754+anirudhwarrier@users.noreply.github.com>
Date: Mon, 4 Dec 2023 22:32:59 +0400
Subject: [PATCH 076/130] [AUTO-7471] add notification to
 automation-nightly-test (#11473)

* fix automation-nightly-test

* add notification

* fix test-results
---
 .../workflows/automation-nightly-tests.yml    | 151 +++++++++++++++++-
 1 file changed, 149 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/automation-nightly-tests.yml b/.github/workflows/automation-nightly-tests.yml
index 3c05786b666..9fa3746f3df 100644
--- a/.github/workflows/automation-nightly-tests.yml
+++ b/.github/workflows/automation-nightly-tests.yml
@@ -7,6 +7,9 @@ on:
       - "*"
   workflow_dispatch:
 
+env:
+  CHAINLINK_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
+
 jobs:
   build-chainlink:
     environment: integration
@@ -39,7 +42,7 @@ jobs:
           AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
 
-  automation-upgrade-test:
+  automation-upgrade-tests:
     environment: integration
     permissions:
       checks: write
@@ -74,7 +77,7 @@ jobs:
           SELECTED_NETWORKS: ${{ matrix.tests.network }}
           TEST_SUITE: ${{ matrix.tests.suite }}
           UPGRADE_VERSION: ${{ github.sha }}
-          UPGRADE_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
+          UPGRADE_IMAGE: ${{ env.CHAINLINK_IMAGE }}
         with:
           test_command_to_run: cd ./integration-tests && go test -timeout 60m -count=1 -json -test.parallel=${{ matrix.tests.nodes }} ${{ matrix.tests.command }} 2>&1 | tee /tmp/gotest.log | gotestfmt
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
@@ -106,3 +109,147 @@ jobs:
           this-job-name: Automation ${{ matrix.tests.name }} Test
           test-results-file: '{"testType":"go","filePath":"/tmp/gotest.log"}'
         continue-on-error: true
+
+  test-notify:
+    name: Start Slack Thread
+    if: ${{ always() && needs.*.result != 'skipped' && needs.*.result != 'cancelled' }}
+    environment: integration
+    outputs:
+      thread_ts: ${{ steps.slack.outputs.thread_ts }}
+    permissions:
+      checks: write
+      pull-requests: write
+      id-token: write
+      contents: read
+    runs-on: ubuntu-latest
+    needs: [ automation-upgrade-tests ]
+    steps:
+      - name: Debug Result
+        run: echo ${{ join(needs.*.result, ',') }}
+      - name: Main Slack Notification
+        uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 # v1.24.0
+        id: slack
+        with:
+          channel-id: C03KJ5S7KEK
+          payload: |
+            {
+              "attachments": [
+                {
+                  "color": "${{ contains(join(needs.*.result, ','), 'failure') && '#C62828' || '#2E7D32' }}",
+                  "blocks": [
+                    {
+                      "type": "header",
+                      "text": {
+                        "type": "plain_text",
+                        "text": "Automation Nightly Tests ${{ contains(join(needs.*.result, ','), 'failure') && ':x:' || ':white_check_mark:'}}",
+                        "emoji": true
+                      }
+                    },
+                    {
+                      "type": "divider"
+                    },
+                    {
+                      "type": "section",
+                      "text": {
+                        "type": "mrkdwn",
+                        "text": "<${{ github.server_url }}/${{ github.repository }}/releases/tag/${{ github.ref_name }}|${{ github.ref_name }}> | <${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }}|${{ github.sha }}> | <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|Run>"
+                      }
+                    }
+                  ]
+                }
+              ]
+            }
+        env:
+          SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
+
+  test-results:
+    name: Post Test Results for ${{ matrix.name }}
+    if: ${{ always() && needs.*.result != 'skipped' && needs.*.result != 'cancelled' }}
+    environment: integration
+    permissions:
+      checks: write
+      pull-requests: write
+      id-token: write
+      contents: read
+    runs-on: ubuntu-latest
+    needs: test-notify
+    strategy:
+      fail-fast: false
+      matrix:
+        name: [ Upgrade ]
+    steps:
+      - name: Get Results
+        id: test-results
+        run: |
+          # I feel like there's some clever, fully jq way to do this, but I ain't got the motivation to figure it out
+          echo "Querying test results"
+
+          PARSED_RESULTS=$(curl \
+          -H "Authorization: Bearer ${{ github.token }}" \
+          'https://api.github.com/repos/${{github.repository}}/actions/runs/${{ github.run_id }}/jobs' \
+          | jq -r --arg pattern "${{ matrix.name }} Test" '.jobs[]
+          | select(.name | test($pattern)) as $job
+          | $job.steps[]
+          | select(.name == "Run Tests")
+          | { conclusion: (if .conclusion == "success" then ":white_check_mark:" else ":x:" end), product: ("*" + ($job.name | capture($pattern).product) + "*") }')
+
+          echo "Parsed Results:"
+          echo $PARSED_RESULTS
+
+          ALL_SUCCESS=true
+          for row in $(echo "$PARSED_RESULTS" | jq -s | jq -r '.[] | select(.conclusion != ":white_check_mark:")'); do
+              success=false
+              break
+          done
+
+          echo all_success=$ALL_SUCCESS >> $GITHUB_OUTPUT
+
+          FORMATTED_RESULTS=$(echo $PARSED_RESULTS | jq -s '[.[] 
+          | { 
+            conclusion: .conclusion, 
+            product: .product 
+            }
+          ]
+          | map("{\"type\": \"section\", \"text\": {\"type\": \"mrkdwn\", \"text\": \"\(.product): \(.conclusion)\"}}")
+          | join(",")')
+
+          echo "Formatted Results:"
+          echo $FORMATTED_RESULTS
+
+          # Cleans out backslashes and quotes from jq
+          CLEAN_RESULTS=$(echo "$FORMATTED_RESULTS" | sed 's/\\\"/"/g' | sed 's/^"//;s/"$//')
+
+          echo "Clean Results"
+          echo $CLEAN_RESULTS
+
+          echo results=$CLEAN_RESULTS >> $GITHUB_OUTPUT
+
+      - name: Test Details
+        uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 # v1.24.0
+        with:
+          channel-id: C03KJ5S7KEK
+          payload: |
+            {
+              "thread_ts": "${{ needs.test-notify.outputs.thread_ts }}",
+              "attachments": [
+                {
+                  "color": "${{ steps.test-results.outputs.all_success && '#2E7D32' || '#C62828' }}",
+                  "blocks": [
+                    {
+                      "type": "header",
+                      "text": {
+                        "type": "plain_text",
+                        "text": "${{ matrix.name }} ${{ steps.test-results.outputs.all_success && ':white_check_mark:' || ':x: Notifying <@U02Q14G80TY>'}}",
+                        "emoji": true
+                      }
+                    },
+                    {
+                      "type": "divider"
+                    },
+                    ${{ steps.test-results.outputs.results }}
+                  ]
+                }
+              ]
+            }
+        env:
+          SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
\ No newline at end of file

From c22b0827ed197b17106a8e8d6a59f95be6dd6164 Mon Sep 17 00:00:00 2001
From: Rens Rooimans <github@rensrooimans.nl>
Date: Mon, 4 Dec 2023 19:34:40 +0100
Subject: [PATCH 077/130] Fix solhint warnings (#11480)

* ignore old automation & fix minor vrf

* add more ignore and fix various non-automation

* fix gas diff
---
 contracts/.solhintignore                                  | 8 ++++++++
 contracts/package.json                                    | 2 +-
 contracts/src/v0.8/ChainlinkClient.sol                    | 1 +
 contracts/src/v0.8/ValidatorProxy.sol                     | 2 ++
 contracts/src/v0.8/automation/libraries/internal/Cron.sol | 1 +
 .../l2ep/dev/arbitrum/ArbitrumSequencerUptimeFeed.sol     | 4 ++++
 .../src/v0.8/l2ep/dev/arbitrum/ArbitrumValidator.sol      | 2 ++
 .../l2ep/dev/optimism/OptimismSequencerUptimeFeed.sol     | 2 ++
 contracts/src/v0.8/llo-feeds/libraries/ByteUtil.sol       | 4 ++++
 .../src/v0.8/transmission/dev/ERC-4337/Paymaster.sol      | 2 ++
 .../src/v0.8/transmission/dev/ERC-4337/SCALibrary.sol     | 1 +
 .../dev/ERC-4337/SmartContractAccountFactory.sol          | 2 ++
 .../dev/testhelpers/SmartContractAccountHelper.sol        | 3 +++
 contracts/src/v0.8/vrf/KeepersVRFConsumer.sol             | 1 +
 contracts/src/v0.8/vrf/VRF.sol                            | 7 +++++++
 contracts/src/v0.8/vrf/VRFCoordinatorV2.sol               | 1 +
 16 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/contracts/.solhintignore b/contracts/.solhintignore
index ba2aac1fb3a..569c8c51df3 100644
--- a/contracts/.solhintignore
+++ b/contracts/.solhintignore
@@ -1,6 +1,14 @@
 # 344 warnings
 #./src/v0.8/automation
 
+# Ignore frozen Automation code
+./src/v0.8/automation/v1_2
+./src/v0.8/automation/v1_3
+./src/v0.8/automation/v2_0
+./src/v0.8/automation/v2_1
+./src/v0.8/automation/mocks
+./src/v0.8/automation/testhelpers
+
 # Ignore Functions v1.0.0 code that was frozen after audit
 ./src/v0.8/functions/v1_0_0
 
diff --git a/contracts/package.json b/contracts/package.json
index 1503c822ea4..2604a12bea3 100644
--- a/contracts/package.json
+++ b/contracts/package.json
@@ -18,7 +18,7 @@
     "prepublishOnly": "pnpm compile && ./scripts/prepublish_generate_abi_folder",
     "publish-beta": "pnpm publish --tag beta",
     "publish-prod": "npm dist-tag add @chainlink/contracts@0.8.0 latest",
-    "solhint": "solhint --max-warnings 376 \"./src/v0.8/**/*.sol\""
+    "solhint": "solhint --max-warnings 83 \"./src/v0.8/**/*.sol\""
   },
   "files": [
     "src/v0.8",
diff --git a/contracts/src/v0.8/ChainlinkClient.sol b/contracts/src/v0.8/ChainlinkClient.sol
index 2d9302faef7..ef7f7943452 100644
--- a/contracts/src/v0.8/ChainlinkClient.sol
+++ b/contracts/src/v0.8/ChainlinkClient.sol
@@ -171,6 +171,7 @@ abstract contract ChainlinkClient {
     s_pendingRequests[requestId] = oracleAddress;
     emit ChainlinkRequested(requestId);
     require(s_link.transferAndCall(oracleAddress, payment, encodedRequest), "unable to transferAndCall to oracle");
+    return requestId;
   }
 
   /**
diff --git a/contracts/src/v0.8/ValidatorProxy.sol b/contracts/src/v0.8/ValidatorProxy.sol
index 627af73b395..4584bb02559 100644
--- a/contracts/src/v0.8/ValidatorProxy.sol
+++ b/contracts/src/v0.8/ValidatorProxy.sol
@@ -167,6 +167,7 @@ contract ValidatorProxy is AggregatorValidatorInterface, TypeAndVersionInterface
     current = s_currentAggregator.target;
     hasProposal = s_currentAggregator.hasNewProposal;
     proposed = s_proposedAggregator;
+    return (current, hasProposal, proposed);
   }
 
   /** VALIDATOR CONFIGURATION FUNCTIONS **/
@@ -216,6 +217,7 @@ contract ValidatorProxy is AggregatorValidatorInterface, TypeAndVersionInterface
     current = s_currentValidator.target;
     hasProposal = s_currentValidator.hasNewProposal;
     proposed = s_proposedValidator;
+    return (current, hasProposal, proposed);
   }
 
   /**
diff --git a/contracts/src/v0.8/automation/libraries/internal/Cron.sol b/contracts/src/v0.8/automation/libraries/internal/Cron.sol
index fe72c412b60..ae4f90d0d71 100644
--- a/contracts/src/v0.8/automation/libraries/internal/Cron.sol
+++ b/contracts/src/v0.8/automation/libraries/internal/Cron.sol
@@ -84,6 +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.
  */
+// solhint-disable chainlink-solidity/prefix-internal-functions-with-underscore, no-global-import
 library Cron {
   using strings for *;
 
diff --git a/contracts/src/v0.8/l2ep/dev/arbitrum/ArbitrumSequencerUptimeFeed.sol b/contracts/src/v0.8/l2ep/dev/arbitrum/ArbitrumSequencerUptimeFeed.sol
index 5250fbda278..63952ab7ba6 100644
--- a/contracts/src/v0.8/l2ep/dev/arbitrum/ArbitrumSequencerUptimeFeed.sol
+++ b/contracts/src/v0.8/l2ep/dev/arbitrum/ArbitrumSequencerUptimeFeed.sol
@@ -287,6 +287,8 @@ contract ArbitrumSequencerUptimeFeed is
     roundId = _roundId;
     updatedAt = startedAt;
     answeredInRound = roundId;
+
+    return (roundId, answer, startedAt, updatedAt, answeredInRound);
   }
 
   /// @inheritdoc AggregatorV3Interface
@@ -305,5 +307,7 @@ contract ArbitrumSequencerUptimeFeed is
     startedAt = feedState.latestTimestamp;
     updatedAt = startedAt;
     answeredInRound = roundId;
+
+    return (roundId, answer, startedAt, updatedAt, answeredInRound);
   }
 }
diff --git a/contracts/src/v0.8/l2ep/dev/arbitrum/ArbitrumValidator.sol b/contracts/src/v0.8/l2ep/dev/arbitrum/ArbitrumValidator.sol
index 2043ffa6287..66fee5053ee 100644
--- a/contracts/src/v0.8/l2ep/dev/arbitrum/ArbitrumValidator.sol
+++ b/contracts/src/v0.8/l2ep/dev/arbitrum/ArbitrumValidator.sol
@@ -204,6 +204,8 @@ contract ArbitrumValidator is TypeAndVersionInterface, AggregatorValidatorInterf
       message
     );
     emit L2WithdrawalRequested(id, amount, refundAddr);
+
+    return id;
   }
 
   /**
diff --git a/contracts/src/v0.8/l2ep/dev/optimism/OptimismSequencerUptimeFeed.sol b/contracts/src/v0.8/l2ep/dev/optimism/OptimismSequencerUptimeFeed.sol
index fcf6093e3cd..947b1b0bf5d 100644
--- a/contracts/src/v0.8/l2ep/dev/optimism/OptimismSequencerUptimeFeed.sol
+++ b/contracts/src/v0.8/l2ep/dev/optimism/OptimismSequencerUptimeFeed.sol
@@ -245,6 +245,7 @@ contract OptimismSequencerUptimeFeed is
     } else {
       revert NoDataPresent();
     }
+    return (roundId, answer, startedAt, updatedAt, answeredInRound);
   }
 
   /// @inheritdoc AggregatorV3Interface
@@ -262,5 +263,6 @@ contract OptimismSequencerUptimeFeed is
     startedAt = feedState.startedAt;
     updatedAt = feedState.updatedAt;
     answeredInRound = roundId;
+    return (roundId, answer, startedAt, updatedAt, answeredInRound);
   }
 }
diff --git a/contracts/src/v0.8/llo-feeds/libraries/ByteUtil.sol b/contracts/src/v0.8/llo-feeds/libraries/ByteUtil.sol
index 9691cfb7fea..53f79b6dc42 100644
--- a/contracts/src/v0.8/llo-feeds/libraries/ByteUtil.sol
+++ b/contracts/src/v0.8/llo-feeds/libraries/ByteUtil.sol
@@ -16,6 +16,7 @@ library ByteUtil {
    * @param offset Position to start reading from.
    * @return result The uint256 read from the byte array.
    */
+  // solhint-disable-next-line chainlink-solidity/explicit-returns
   function _readUint256(bytes memory data, uint256 offset) internal pure returns (uint256 result) {
     //bounds check
     if (offset + 32 > data.length) revert MalformedData();
@@ -32,6 +33,7 @@ library ByteUtil {
    * @param offset Position to start reading from.
    * @return result The uint192 read from the byte array.
    */
+  // solhint-disable-next-line chainlink-solidity/explicit-returns
   function _readUint192(bytes memory data, uint256 offset) internal pure returns (uint256 result) {
     //bounds check
     if (offset + 24 > data.length) revert MalformedData();
@@ -50,6 +52,7 @@ library ByteUtil {
    * @param offset Position to start reading from.
    * @return result The uint32 read from the byte array.
    */
+  // solhint-disable-next-line chainlink-solidity/explicit-returns
   function _readUint32(bytes memory data, uint256 offset) internal pure returns (uint256 result) {
     //bounds check
     if (offset + 4 > data.length) revert MalformedData();
@@ -68,6 +71,7 @@ library ByteUtil {
    * @param offset Position to start reading from.
    * @return result The uint32 read from the byte array.
    */
+  // solhint-disable-next-line chainlink-solidity/explicit-returns
   function _readAddress(bytes memory data, uint256 offset) internal pure returns (address result) {
     //bounds check
     if (offset + 20 > data.length) revert MalformedData();
diff --git a/contracts/src/v0.8/transmission/dev/ERC-4337/Paymaster.sol b/contracts/src/v0.8/transmission/dev/ERC-4337/Paymaster.sol
index 970ddf6b7e6..38b6fb57983 100644
--- a/contracts/src/v0.8/transmission/dev/ERC-4337/Paymaster.sol
+++ b/contracts/src/v0.8/transmission/dev/ERC-4337/Paymaster.sol
@@ -103,6 +103,7 @@ contract Paymaster is IPaymaster, ConfirmedOwner {
         extraCost = directFundingData.topupAmount;
       }
     }
+    return extraCost;
   }
 
   /// @dev Deducts user subscription balance after execution.
@@ -116,6 +117,7 @@ contract Paymaster is IPaymaster, ConfirmedOwner {
 
   function _getCostJuels(uint256 costWei) internal view returns (uint256 costJuels) {
     costJuels = (1e18 * costWei) / uint256(_getFeedData());
+    return costJuels;
   }
 
   function _getFeedData() internal view returns (int256) {
diff --git a/contracts/src/v0.8/transmission/dev/ERC-4337/SCALibrary.sol b/contracts/src/v0.8/transmission/dev/ERC-4337/SCALibrary.sol
index 47587e278f4..35d666a2d3d 100644
--- a/contracts/src/v0.8/transmission/dev/ERC-4337/SCALibrary.sol
+++ b/contracts/src/v0.8/transmission/dev/ERC-4337/SCALibrary.sol
@@ -31,6 +31,7 @@ library SCALibrary {
         hashOfEncoding
       )
     );
+    return fullHash;
   }
 
   function _recoverSignature(bytes memory signature, bytes32 fullHash) internal pure returns (address) {
diff --git a/contracts/src/v0.8/transmission/dev/ERC-4337/SmartContractAccountFactory.sol b/contracts/src/v0.8/transmission/dev/ERC-4337/SmartContractAccountFactory.sol
index 35719345ecd..bb0f2dbde63 100644
--- a/contracts/src/v0.8/transmission/dev/ERC-4337/SmartContractAccountFactory.sol
+++ b/contracts/src/v0.8/transmission/dev/ERC-4337/SmartContractAccountFactory.sol
@@ -27,5 +27,7 @@ contract SmartContractAccountFactory {
     }
 
     emit ContractCreated(scaAddress);
+
+    return scaAddress;
   }
 }
diff --git a/contracts/src/v0.8/transmission/dev/testhelpers/SmartContractAccountHelper.sol b/contracts/src/v0.8/transmission/dev/testhelpers/SmartContractAccountHelper.sol
index c33df49d16b..014f296f077 100644
--- a/contracts/src/v0.8/transmission/dev/testhelpers/SmartContractAccountHelper.sol
+++ b/contracts/src/v0.8/transmission/dev/testhelpers/SmartContractAccountHelper.sol
@@ -18,6 +18,7 @@ library SmartContractAccountHelper {
       SCA.executeTransactionFromEntryPoint.selector,
       abi.encode(endContract, value, block.timestamp + deadline, data)
     );
+    return encoding;
   }
 
   function getFullHashForSigning(bytes32 userOpHash, address scaAddress) public view returns (bytes32) {
@@ -29,6 +30,7 @@ library SmartContractAccountHelper {
     address entryPoint
   ) public pure returns (bytes memory initCode) {
     initCode = bytes.concat(INITIALIZE_CODE, abi.encode(owner, entryPoint));
+    return initCode;
   }
 
   function getInitCode(
@@ -46,6 +48,7 @@ library SmartContractAccountHelper {
         initializeCodeWithConstructor
       )
     );
+    return initCode;
   }
 
   /// @dev Computes the smart contract address that results from a CREATE2 operation, per EIP-1014.
diff --git a/contracts/src/v0.8/vrf/KeepersVRFConsumer.sol b/contracts/src/v0.8/vrf/KeepersVRFConsumer.sol
index a18c6e03798..20fd806b0cc 100644
--- a/contracts/src/v0.8/vrf/KeepersVRFConsumer.sol
+++ b/contracts/src/v0.8/vrf/KeepersVRFConsumer.sol
@@ -61,6 +61,7 @@ contract KeepersVRFConsumer is KeeperCompatibleInterface, VRFConsumerBaseV2 {
    * @return upkeepNeeded true if and only if at least UPKEEP_INTERVAL seconds have elapsed since the last upkeep or since construction
    * of the contract.
    */
+  // solhint-disable-next-line chainlink-solidity/explicit-returns
   function checkUpkeep(
     bytes calldata /* checkData */
   ) external view override returns (bool upkeepNeeded, bytes memory /* performData */) {
diff --git a/contracts/src/v0.8/vrf/VRF.sol b/contracts/src/v0.8/vrf/VRF.sol
index a19fc39ec3e..f7d62a272bc 100644
--- a/contracts/src/v0.8/vrf/VRF.sol
+++ b/contracts/src/v0.8/vrf/VRF.sol
@@ -205,6 +205,7 @@ contract VRF {
     while (x_ >= FIELD_SIZE) {
       x_ = uint256(keccak256(abi.encodePacked(x_)));
     }
+    return x_;
   }
 
   // Hash b to a random point which hopefully lies on secp256k1. The y ordinate
@@ -223,6 +224,7 @@ contract VRF {
         p[1] = FIELD_SIZE - p[1];
       }
     }
+    return p;
   }
 
   // Domain-separation tag for initial hash in _hashToCurve. Corresponds to
@@ -248,6 +250,7 @@ contract VRF {
     while (!_isOnCurve(rv)) {
       rv = _newCandidateSecp256k1Point(abi.encodePacked(rv[0]));
     }
+    return rv;
   }
 
   /** *********************************************************************
@@ -294,6 +297,7 @@ contract VRF {
       uint256 num2 = mulmod(FIELD_SIZE - x2, z1, FIELD_SIZE);
       (x3, z3) = (addmod(num1, num2, FIELD_SIZE), mulmod(z1, z2, FIELD_SIZE));
     }
+    return (x3, z3);
   }
 
   // Returns x1/z1*x2/z2=(x1x2)/(z1z2), in projective coordinates on P¹(𝔽ₙ)
@@ -304,6 +308,7 @@ contract VRF {
     uint256 z2
   ) internal pure returns (uint256 x3, uint256 z3) {
     (x3, z3) = (mulmod(x1, x2, FIELD_SIZE), mulmod(z1, z2, FIELD_SIZE));
+    return (x3, z3);
   }
 
   /** **************************************************************************
@@ -385,6 +390,7 @@ contract VRF {
         sz = dx;
       }
     }
+    return (sx, sy, sz);
   }
 
   // p1+p2, as affine points on secp256k1.
@@ -577,5 +583,6 @@ contract VRF {
       proof.zInv
     );
     output = uint256(keccak256(abi.encode(VRF_RANDOM_OUTPUT_HASH_PREFIX, proof.gamma)));
+    return output;
   }
 }
diff --git a/contracts/src/v0.8/vrf/VRFCoordinatorV2.sol b/contracts/src/v0.8/vrf/VRFCoordinatorV2.sol
index 5acd3e74358..5dfb51a4b13 100644
--- a/contracts/src/v0.8/vrf/VRFCoordinatorV2.sol
+++ b/contracts/src/v0.8/vrf/VRFCoordinatorV2.sol
@@ -491,6 +491,7 @@ contract VRFCoordinatorV2 is VRF, ConfirmedOwner, TypeAndVersionInterface, VRFCo
     // The seed actually used by the VRF machinery, mixing in the blockhash
     uint256 actualSeed = uint256(keccak256(abi.encodePacked(proof.seed, blockHash)));
     randomness = VRF._randomValueFromVRFProof(proof, actualSeed); // Reverts on failure
+    return (keyHash, requestId, randomness);
   }
 
   /*

From 5bfe1fa20c7b99669893c615cb10b4b7a78d9634 Mon Sep 17 00:00:00 2001
From: Jordan Krage <jmank88@gmail.com>
Date: Mon, 4 Dec 2023 12:45:04 -0600
Subject: [PATCH 078/130] bump libocr; remove P2P.V1; drop libp2p (#10872)

---
 core/cmd/jobs_commands_test.go                |   4 +-
 core/cmd/ocr-bootstrap-spec.yml               |   4 +-
 core/cmd/shell_remote_test.go                 |   5 +-
 core/config/docs/core.toml                    |  52 +--
 core/config/p2p_config.go                     |   4 -
 core/config/p2p_v1_config.go                  |  20 -
 core/config/toml/types.go                     |  74 ----
 core/internal/cltest/factories.go             |   2 +-
 core/internal/cltest/job_factories.go         |   2 +-
 core/internal/features/features_test.go       | 129 ++-----
 .../features/ocr2/features_ocr2_test.go       |   1 -
 .../testutils/configtest/general_config.go    |   1 -
 core/scripts/go.mod                           |  57 +--
 core/scripts/go.sum                           | 347 +-----------------
 core/services/chainlink/config.go             |  37 +-
 core/services/chainlink/config_general.go     |  10 -
 core/services/chainlink/config_p2p.go         |  67 +---
 core/services/chainlink/config_p2p_test.go    |  15 -
 core/services/chainlink/config_test.go        |  78 +---
 .../testdata/config-empty-effective.toml      |  13 -
 .../chainlink/testdata/config-full.toml       |  13 -
 .../config-multi-chain-effective.toml         |  13 -
 core/services/feeds/service_test.go           |   5 +-
 core/services/job/helpers_test.go             |  16 +-
 core/services/job/models.go                   |   1 -
 core/services/job/orm.go                      |   4 +-
 core/services/job/runner_integration_test.go  |  17 +-
 core/services/ocr/delegate.go                 |  30 +-
 core/services/ocr/example-job-spec.toml       |   4 +-
 core/services/ocr/validate.go                 |   7 +-
 core/services/ocr/validate_test.go            |  59 +--
 .../v1/internal/testutils.go                  |   1 -
 .../plugins/ocr2keeper/integration_test.go    |   1 -
 .../internal/ocr2vrf_integration_test.go      |   1 -
 core/services/ocrcommon/peer_wrapper.go       | 110 +-----
 core/services/ocrcommon/peer_wrapper_test.go  |  94 +----
 ..._oracle_specs_drop_p2p_bootstrap_peers.sql |   5 +
 core/testdata/testspecs/v2_specs.go           |   5 +-
 core/web/assets/index.html                    |   2 +-
 core/web/assets/index.html.gz                 | Bin 420 -> 418 bytes
 ...560e37.js => main.8f602c136d4004a835ee.js} |   2 +-
 ....js.gz => main.8f602c136d4004a835ee.js.gz} | Bin 1190421 -> 1190411 bytes
 core/web/jobs_controller_test.go              |  17 +-
 core/web/loop_registry_test.go                |   5 +-
 core/web/pipeline_runs_controller_test.go     |   9 +-
 core/web/presenters/job.go                    |   2 -
 core/web/presenters/job_test.go               |   2 -
 core/web/resolver/spec.go                     |  11 -
 core/web/resolver/spec_test.go                |   3 -
 .../testdata/config-empty-effective.toml      |  13 -
 core/web/resolver/testdata/config-full.toml   |  13 -
 .../config-multi-chain-effective.toml         |  13 -
 core/web/schema/type/spec.graphql             |   1 -
 docs/CONFIG.md                                | 110 +-----
 go.mod                                        |  57 +--
 go.sum                                        | 347 +-----------------
 integration-tests/go.mod                      |  53 +--
 integration-tests/go.sum                      | 337 +----------------
 integration-tests/types/config/node/core.go   |  14 -
 operator_ui/TAG                               |   2 +-
 testdata/scripts/node/validate/default.txtar  |  13 -
 .../disk-based-logging-disabled.txtar         |  13 -
 .../validate/disk-based-logging-no-dir.txtar  |  13 -
 .../node/validate/disk-based-logging.txtar    |  13 -
 testdata/scripts/node/validate/invalid.txtar  |  13 -
 testdata/scripts/node/validate/valid.txtar    |  13 -
 testdata/scripts/node/validate/warnings.txtar |  54 +--
 tools/benchmark/job_spec_delete_v2.sh         |   2 +-
 68 files changed, 173 insertions(+), 2282 deletions(-)
 delete mode 100644 core/config/p2p_v1_config.go
 create mode 100644 core/store/migrate/migrations/0212_ocr_oracle_specs_drop_p2p_bootstrap_peers.sql
 rename core/web/assets/{main.b0b6f79f7f4a94560e37.js => main.8f602c136d4004a835ee.js} (91%)
 rename core/web/assets/{main.b0b6f79f7f4a94560e37.js.gz => main.8f602c136d4004a835ee.js.gz} (93%)

diff --git a/core/cmd/jobs_commands_test.go b/core/cmd/jobs_commands_test.go
index 04908e18ff3..5d9b3cb3f1a 100644
--- a/core/cmd/jobs_commands_test.go
+++ b/core/cmd/jobs_commands_test.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/google/uuid"
+	"github.com/hashicorp/consul/sdk/freeport"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/urfave/cli"
@@ -368,7 +369,8 @@ func TestShell_CreateJobV2(t *testing.T) {
 	app := startNewApplicationV2(t, func(c *chainlink.Config, s *chainlink.Secrets) {
 		c.Database.Listener.FallbackPollInterval = models.MustNewDuration(100 * time.Millisecond)
 		c.OCR.Enabled = ptr(true)
-		c.P2P.V1.Enabled = ptr(true)
+		c.P2P.V2.Enabled = ptr(true)
+		c.P2P.V2.ListenAddresses = &[]string{fmt.Sprintf("127.0.0.1:%d", freeport.GetOne(t))}
 		c.P2P.PeerID = &cltest.DefaultP2PPeerID
 		c.EVM[0].Enabled = ptr(true)
 		c.EVM[0].NonceAutoSync = ptr(false)
diff --git a/core/cmd/ocr-bootstrap-spec.yml b/core/cmd/ocr-bootstrap-spec.yml
index 9db118b77cd..058fdeb2c14 100644
--- a/core/cmd/ocr-bootstrap-spec.yml
+++ b/core/cmd/ocr-bootstrap-spec.yml
@@ -4,7 +4,5 @@ contractAddress    = "0x27548a32b9aD5D64c5945EaE9Da5337bc3169D15"
 externalJobID      = "%s"
 name               = "%s"
 evmChainID         = "0"
-p2pBootstrapPeers  = [
-    "/dns4/chain.link/tcp/1234/p2p/16Uiu2HAm58SP7UL8zsnpeuwHfytLocaqgnyaYKP8wu7qRdrixLju",
-]
+p2pv2Bootstrappers = ["12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001"]
 isBootstrapPeer = true
diff --git a/core/cmd/shell_remote_test.go b/core/cmd/shell_remote_test.go
index 6143d678a90..6c8b46eda4c 100644
--- a/core/cmd/shell_remote_test.go
+++ b/core/cmd/shell_remote_test.go
@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"github.com/google/uuid"
+	"github.com/hashicorp/consul/sdk/freeport"
 	"github.com/kylelemons/godebug/diff"
 	"github.com/pelletier/go-toml"
 	"github.com/stretchr/testify/assert"
@@ -62,7 +63,6 @@ func startNewApplicationV2(t *testing.T, overrideFn func(c *chainlink.Config, s
 		c.JobPipeline.HTTPRequest.DefaultTimeout = models.MustNewDuration(30 * time.Millisecond)
 		f := false
 		c.EVM[0].Enabled = &f
-		c.P2P.V1.Enabled = &f
 		c.P2P.V2.Enabled = &f
 
 		if overrideFn != nil {
@@ -567,7 +567,8 @@ func TestShell_RunOCRJob_HappyPath(t *testing.T) {
 	app := startNewApplicationV2(t, func(c *chainlink.Config, s *chainlink.Secrets) {
 		c.EVM[0].Enabled = ptr(true)
 		c.OCR.Enabled = ptr(true)
-		c.P2P.V1.Enabled = ptr(true)
+		c.P2P.V2.Enabled = ptr(true)
+		c.P2P.V2.ListenAddresses = &[]string{fmt.Sprintf("127.0.0.1:%d", freeport.GetOne(t))}
 		c.P2P.PeerID = &cltest.DefaultP2PPeerID
 		c.EVM[0].GasEstimator.Mode = ptr("FixedPrice")
 	}, func(opts *startOptions) {
diff --git a/core/config/docs/core.toml b/core/config/docs/core.toml
index e438f4553fe..953f1feabd8 100644
--- a/core/config/docs/core.toml
+++ b/core/config/docs/core.toml
@@ -394,13 +394,7 @@ CaptureEATelemetry = false # Default
 # TraceLogging enables trace level logging.
 TraceLogging = false # Default
 
-# P2P supports multiple networking stack versions. You may configure `[P2P.V1]`, `[P2P.V2]`, or both to run simultaneously.
-# If both are configured, then for each link with another peer, V2 networking will be preferred. If V2 does not work, the link will
-# automatically fall back to V1. If V2 starts working again later, it will automatically be preferred again. This is useful
-# for migrating networks without downtime. Note that the two networking stacks _must not_ be configured to bind to the same IP/port.
-#
-# Note: P2P.V1 is deprecated will be removed in the future.
-#
+# P2P has a versioned networking stack. Currenly only `[P2P.V2]` is supported.
 # All nodes in the OCR network should share the same networking stack.
 [P2P]
 # IncomingMessageBufferSize is the per-remote number of incoming
@@ -419,50 +413,6 @@ PeerID = '12D3KooWMoejJznyDuEk5aX6GvbjaG12UzeornPCBNzMRqdwrFJw' # Example
 # TraceLogging enables trace level logging.
 TraceLogging = false # Default
 
-# P2P.V1 is deprecated and will be removed in a future version.
-[P2P.V1]
-# Enabled enables P2P V1.
-Enabled = false # Default
-# AnnounceIP should be set as the externally reachable IP address of the Chainlink node.
-AnnounceIP = '1.2.3.4' # Example
-# AnnouncePort should be set as the externally reachable port of the Chainlink node.
-AnnouncePort = 1337 # Example
-# BootstrapCheckInterval is the interval at which nodes check connections to bootstrap nodes and reconnect if any of them is lost.
-# Setting this to a small value would allow newly joined bootstrap nodes to get more connectivity
-# more quickly, which helps to make bootstrap process faster. The cost of this operation is relatively
-# cheap. We set this to 1 minute during our test.
-BootstrapCheckInterval = '20s' # Default
-# DefaultBootstrapPeers is the default set of bootstrap peers.
-DefaultBootstrapPeers = ['/dns4/example.com/tcp/1337/p2p/12D3KooWMHMRLQkgPbFSYHwD3NBuwtS1AmxhvKVUrcfyaGDASR4U', '/ip4/1.2.3.4/tcp/9999/p2p/12D3KooWLZ9uTC3MrvKfDpGju6RAQubiMDL7CuJcAgDRTYP7fh7R'] # Example
-# DHTAnnouncementCounterUserPrefix can be used to restore the node's
-# ability to announce its IP/port on the P2P network after a database
-# rollback. Make sure to only increase this value, and *never* decrease it.
-# Don't use this variable unless you really know what you're doing, since you
-# could semi-permanently exclude your node from the P2P network by
-# misconfiguring it.
-DHTAnnouncementCounterUserPrefix = 0 # Default
-# **ADVANCED**
-# DHTLookupInterval is the interval between which we do the expensive peer
-# lookup using DHT.
-#
-# Every DHTLookupInterval failures to open a stream to a peer, we will
-# attempt to lookup its IP from DHT
-DHTLookupInterval = 10 # Default
-# ListenIP is the default IP address to bind to.
-ListenIP = '0.0.0.0' # Default
-# ListenPort is the port to listen on. If left blank, the node randomly selects a different port each time it boots. It is highly recommended to set this to a static value to avoid network instability.
-ListenPort = 1337 # Example
-# **ADVANCED**
-# NewStreamTimeout is the maximum length of time to wait to open a
-# stream before we give up.
-# We shouldn't hit this in practice since libp2p will give up fast if
-# it can't get a connection, but it is here anyway as a failsafe.
-# Set to 0 to disable any timeout on top of what libp2p gives us by default.
-NewStreamTimeout = '10s' # Default
-# **ADVANCED**
-# PeerstoreWriteInterval controls how often the peerstore for the OCR V1 networking stack is persisted to the database.
-PeerstoreWriteInterval = '5m' # Default
-
 [P2P.V2]
 # Enabled enables P2P V2.
 # Note: V1.Enabled is true by default, so it must be set false in order to run V2 only.
diff --git a/core/config/p2p_config.go b/core/config/p2p_config.go
index 30693b3a259..4a7ec284173 100644
--- a/core/config/p2p_config.go
+++ b/core/config/p2p_config.go
@@ -1,15 +1,11 @@
 package config
 
 import (
-	ocrnetworking "github.com/smartcontractkit/libocr/networking"
-
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/p2pkey"
 )
 
 type P2P interface {
 	V2() V2
-	V1() V1
-	NetworkStack() (n ocrnetworking.NetworkingStack)
 	PeerID() p2pkey.PeerID
 	IncomingMessageBufferSize() int
 	OutgoingMessageBufferSize() int
diff --git a/core/config/p2p_v1_config.go b/core/config/p2p_v1_config.go
deleted file mode 100644
index 2e138285182..00000000000
--- a/core/config/p2p_v1_config.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package config
-
-import (
-	"net"
-	"time"
-)
-
-type V1 interface {
-	Enabled() bool
-	AnnounceIP() net.IP
-	AnnouncePort() uint16
-	DefaultBootstrapPeers() ([]string, error)
-	DHTAnnouncementCounterUserPrefix() uint32
-	ListenIP() net.IP
-	ListenPort() uint16
-	NewStreamTimeout() time.Duration
-	BootstrapCheckInterval() time.Duration
-	DHTLookupInterval() int
-	PeerstoreWriteInterval() time.Duration
-}
diff --git a/core/config/toml/types.go b/core/config/toml/types.go
index c420d7f3f47..e944b44853b 100644
--- a/core/config/toml/types.go
+++ b/core/config/toml/types.go
@@ -13,7 +13,6 @@ import (
 	"go.uber.org/zap/zapcore"
 
 	ocrcommontypes "github.com/smartcontractkit/libocr/commontypes"
-	ocrnetworking "github.com/smartcontractkit/libocr/networking"
 
 	"github.com/smartcontractkit/chainlink/v2/core/build"
 	"github.com/smartcontractkit/chainlink/v2/core/config"
@@ -1040,23 +1039,9 @@ type P2P struct {
 	PeerID                    *p2pkey.PeerID
 	TraceLogging              *bool
 
-	V1 P2PV1 `toml:",omitempty"`
 	V2 P2PV2 `toml:",omitempty"`
 }
 
-func (p *P2P) NetworkStack() ocrnetworking.NetworkingStack {
-	v1, v2 := *p.V1.Enabled, *p.V2.Enabled
-	switch {
-	case v1 && v2:
-		return ocrnetworking.NetworkingStackV1V2
-	case v2:
-		return ocrnetworking.NetworkingStackV2
-	case v1:
-		return ocrnetworking.NetworkingStackV1
-	}
-	return ocrnetworking.NetworkingStack(0)
-}
-
 func (p *P2P) setFrom(f *P2P) {
 	if v := f.IncomingMessageBufferSize; v != nil {
 		p.IncomingMessageBufferSize = v
@@ -1071,68 +1056,9 @@ func (p *P2P) setFrom(f *P2P) {
 		p.TraceLogging = v
 	}
 
-	p.V1.setFrom(&f.V1)
 	p.V2.setFrom(&f.V2)
 }
 
-type P2PV1 struct {
-	Enabled                          *bool
-	AnnounceIP                       *net.IP
-	AnnouncePort                     *uint16
-	BootstrapCheckInterval           *models.Duration
-	DefaultBootstrapPeers            *[]string
-	DHTAnnouncementCounterUserPrefix *uint32
-	DHTLookupInterval                *int64
-	ListenIP                         *net.IP
-	ListenPort                       *uint16
-	NewStreamTimeout                 *models.Duration
-	PeerstoreWriteInterval           *models.Duration
-}
-
-func (p *P2PV1) ValidateConfig() (err error) {
-	//TODO or empty?
-	if p.AnnouncePort != nil && p.AnnounceIP == nil {
-		err = multierr.Append(err, configutils.ErrMissing{Name: "AnnounceIP", Msg: fmt.Sprintf("required when AnnouncePort is set: %d", *p.AnnouncePort)})
-	}
-	return
-}
-
-func (p *P2PV1) setFrom(f *P2PV1) {
-	if v := f.Enabled; v != nil {
-		p.Enabled = v
-	}
-	if v := f.AnnounceIP; v != nil {
-		p.AnnounceIP = v
-	}
-	if v := f.AnnouncePort; v != nil {
-		p.AnnouncePort = v
-	}
-	if v := f.BootstrapCheckInterval; v != nil {
-		p.BootstrapCheckInterval = v
-	}
-	if v := f.DefaultBootstrapPeers; v != nil {
-		p.DefaultBootstrapPeers = v
-	}
-	if v := f.DHTAnnouncementCounterUserPrefix; v != nil {
-		p.DHTAnnouncementCounterUserPrefix = v
-	}
-	if v := f.DHTLookupInterval; v != nil {
-		p.DHTLookupInterval = v
-	}
-	if v := f.ListenIP; v != nil {
-		p.ListenIP = v
-	}
-	if v := f.ListenPort; v != nil {
-		p.ListenPort = v
-	}
-	if v := f.NewStreamTimeout; v != nil {
-		p.NewStreamTimeout = v
-	}
-	if v := f.PeerstoreWriteInterval; v != nil {
-		p.PeerstoreWriteInterval = v
-	}
-}
-
 type P2PV2 struct {
 	Enabled              *bool
 	AnnounceAddresses    *[]string
diff --git a/core/internal/cltest/factories.go b/core/internal/cltest/factories.go
index f0ce8c4ff66..c169c5fd228 100644
--- a/core/internal/cltest/factories.go
+++ b/core/internal/cltest/factories.go
@@ -339,7 +339,7 @@ func MustInsertOffchainreportingOracleSpec(t *testing.T, db *sqlx.DB, transmitte
 
 	ocrKeyID := models.MustSha256HashFromHex(DefaultOCRKeyBundleID)
 	spec := job.OCROracleSpec{}
-	require.NoError(t, db.Get(&spec, `INSERT INTO ocr_oracle_specs (created_at, updated_at, contract_address, p2p_bootstrap_peers, is_bootstrap_peer, encrypted_ocr_key_bundle_id, transmitter_address, observation_timeout, blockchain_timeout, contract_config_tracker_subscribe_interval, contract_config_tracker_poll_interval, contract_config_confirmations, database_timeout, observation_grace_period, contract_transmitter_transmit_timeout, evm_chain_id) VALUES (
+	require.NoError(t, db.Get(&spec, `INSERT INTO ocr_oracle_specs (created_at, updated_at, contract_address, p2pv2_bootstrappers, is_bootstrap_peer, encrypted_ocr_key_bundle_id, transmitter_address, observation_timeout, blockchain_timeout, contract_config_tracker_subscribe_interval, contract_config_tracker_poll_interval, contract_config_confirmations, database_timeout, observation_grace_period, contract_transmitter_transmit_timeout, evm_chain_id) VALUES (
 NOW(),NOW(),$1,'{}',false,$2,$3,0,0,0,0,0,0,0,0,0
 ) RETURNING *`, NewEIP55Address(), &ocrKeyID, &transmitterAddress))
 	return spec
diff --git a/core/internal/cltest/job_factories.go b/core/internal/cltest/job_factories.go
index a9e403fb608..399e71ff216 100644
--- a/core/internal/cltest/job_factories.go
+++ b/core/internal/cltest/job_factories.go
@@ -25,7 +25,7 @@ const (
 			contractAddress    = "%s"
 			evmChainID		   = "0"
 			p2pPeerID          = "%s"
-			p2pBootstrapPeers  = ["/dns4/chain.link/tcp/1234/p2p/16Uiu2HAm58SP7UL8zsnpeuwHfytLocaqgnyaYKP8wu7qRdrixLju"]
+			p2pv2Bootstrappers = ["12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001"]
 			isBootstrapPeer    = false
 			transmitterAddress = "%s"
 			keyBundleID = "%s"
diff --git a/core/internal/features/features_test.go b/core/internal/features/features_test.go
index 35fd3a31ff8..7b29fdae4fa 100644
--- a/core/internal/features/features_test.go
+++ b/core/internal/features/features_test.go
@@ -37,7 +37,6 @@ import (
 	ocrcommontypes "github.com/smartcontractkit/libocr/commontypes"
 	"github.com/smartcontractkit/libocr/gethwrappers/offchainaggregator"
 	"github.com/smartcontractkit/libocr/gethwrappers/testoffchainaggregator"
-	ocrnetworking "github.com/smartcontractkit/libocr/networking"
 	"github.com/smartcontractkit/libocr/offchainreporting/confighelper"
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting/types"
 
@@ -675,8 +674,8 @@ func setupOCRContracts(t *testing.T) (*bind.TransactOpts, *backends.SimulatedBac
 	return owner, b, ocrContractAddress, ocrContract, flagsContract, flagsContractAddress
 }
 
-func setupNode(t *testing.T, owner *bind.TransactOpts, portV1, portV2 int,
-	b *backends.SimulatedBackend, ns ocrnetworking.NetworkingStack, overrides func(c *chainlink.Config, s *chainlink.Secrets),
+func setupNode(t *testing.T, owner *bind.TransactOpts, portV2 int,
+	b *backends.SimulatedBackend, overrides func(c *chainlink.Config, s *chainlink.Secrets),
 ) (*cltest.TestApplication, string, common.Address, ocrkey.KeyV2) {
 	p2pKey := keystest.NewP2PKeyV2(t)
 	config, _ := heavyweight.FullTestDBV2(t, func(c *chainlink.Config, s *chainlink.Secrets) {
@@ -686,32 +685,10 @@ func setupNode(t *testing.T, owner *bind.TransactOpts, portV1, portV2 int,
 		c.OCR2.Enabled = ptr(true)
 
 		c.P2P.PeerID = ptr(p2pKey.PeerID())
-		switch ns {
-		case ocrnetworking.NetworkingStackV1:
-			c.P2P.V1.Enabled = ptr(true)
-			c.P2P.V2.Enabled = ptr(false)
-			// We want to quickly poll for the bootstrap node to come up, but if we poll too quickly
-			// we'll flood it with messages and slow things down. 5s is about how long it takes the
-			// bootstrap node to come up.
-			c.P2P.V1.BootstrapCheckInterval = models.MustNewDuration(5 * time.Second)
-			c.P2P.V1.ListenPort = ptr(uint16(portV1))
-
-		case ocrnetworking.NetworkingStackV2:
-			c.P2P.V1.Enabled = ptr(false)
-			c.P2P.V2.Enabled = ptr(true)
-			c.P2P.V2.ListenAddresses = &[]string{fmt.Sprintf("127.0.0.1:%d", portV2)}
-			c.P2P.V2.DeltaReconcile = models.MustNewDuration(5 * time.Second)
-
-		case ocrnetworking.NetworkingStackV1V2:
-			c.P2P.V1.Enabled = ptr(true)
-			c.P2P.V2.Enabled = ptr(true)
-			c.P2P.V1.BootstrapCheckInterval = models.MustNewDuration(5 * time.Second)
-			// Note v1 and v2 ports must be distinct,
-			// v1v2 mode will listen on both.
-			c.P2P.V1.ListenPort = ptr(uint16(portV1))
-			c.P2P.V2.ListenAddresses = &[]string{fmt.Sprintf("127.0.0.1:%d", portV2)}
-			c.P2P.V2.DeltaReconcile = models.MustNewDuration(5 * time.Second)
-		}
+
+		c.P2P.V2.Enabled = ptr(true)
+		c.P2P.V2.ListenAddresses = &[]string{fmt.Sprintf("127.0.0.1:%d", portV2)}
+		c.P2P.V2.DeltaReconcile = models.MustNewDuration(5 * time.Second)
 
 		// GracePeriod < ObservationTimeout
 		c.EVM[0].OCR.ObservationGracePeriod = models.MustNewDuration(100 * time.Millisecond)
@@ -743,21 +720,7 @@ func setupNode(t *testing.T, owner *bind.TransactOpts, portV1, portV2 int,
 	return app, p2pKey.PeerID().Raw(), transmitter, key
 }
 
-func setupForwarderEnabledNode(
-	t *testing.T,
-	owner *bind.TransactOpts,
-	portV1,
-	portV2 int,
-	b *backends.SimulatedBackend,
-	ns ocrnetworking.NetworkingStack,
-	overrides func(c *chainlink.Config, s *chainlink.Secrets),
-) (
-	*cltest.TestApplication,
-	string,
-	common.Address,
-	common.Address,
-	ocrkey.KeyV2,
-) {
+func setupForwarderEnabledNode(t *testing.T, owner *bind.TransactOpts, portV2 int, b *backends.SimulatedBackend, overrides func(c *chainlink.Config, s *chainlink.Secrets)) (*cltest.TestApplication, string, common.Address, common.Address, ocrkey.KeyV2) {
 	p2pKey := keystest.NewP2PKeyV2(t)
 	config, _ := heavyweight.FullTestDBV2(t, func(c *chainlink.Config, s *chainlink.Secrets) {
 		c.Insecure.OCRDevelopmentMode = ptr(true) // Disables ocr spec validation so we can have fast polling for the test.
@@ -766,32 +729,9 @@ func setupForwarderEnabledNode(
 		c.OCR2.Enabled = ptr(true)
 
 		c.P2P.PeerID = ptr(p2pKey.PeerID())
-		switch ns {
-		case ocrnetworking.NetworkingStackV1:
-			c.P2P.V1.Enabled = ptr(true)
-			c.P2P.V2.Enabled = ptr(false)
-			// We want to quickly poll for the bootstrap node to come up, but if we poll too quickly
-			// we'll flood it with messages and slow things down. 5s is about how long it takes the
-			// bootstrap node to come up.
-			c.P2P.V1.BootstrapCheckInterval = models.MustNewDuration(5 * time.Second)
-			c.P2P.V1.ListenPort = ptr(uint16(portV1))
-
-		case ocrnetworking.NetworkingStackV2:
-			c.P2P.V1.Enabled = ptr(false)
-			c.P2P.V2.Enabled = ptr(true)
-			c.P2P.V2.ListenAddresses = &[]string{fmt.Sprintf("127.0.0.1:%d", portV2)}
-			c.P2P.V2.DeltaReconcile = models.MustNewDuration(5 * time.Second)
-
-		case ocrnetworking.NetworkingStackV1V2:
-			c.P2P.V1.Enabled = ptr(true)
-			c.P2P.V2.Enabled = ptr(true)
-			c.P2P.V1.BootstrapCheckInterval = models.MustNewDuration(5 * time.Second)
-			// Note v1 and v2 ports must be distinct,
-			// v1v2 mode will listen on both.
-			c.P2P.V1.ListenPort = ptr(uint16(portV1))
-			c.P2P.V2.ListenAddresses = &[]string{fmt.Sprintf("127.0.0.1:%d", portV2)}
-			c.P2P.V2.DeltaReconcile = models.MustNewDuration(5 * time.Second)
-		}
+		c.P2P.V2.Enabled = ptr(true)
+		c.P2P.V2.ListenAddresses = &[]string{fmt.Sprintf("127.0.0.1:%d", portV2)}
+		c.P2P.V2.DeltaReconcile = models.MustNewDuration(5 * time.Second)
 
 		c.EVM[0].Transactions.ForwardersEnabled = ptr(true)
 
@@ -842,16 +782,12 @@ func TestIntegration_OCR(t *testing.T) {
 	testutils.SkipShort(t, "long test")
 	t.Parallel()
 	tests := []struct {
-		id        int
-		portStart int // Test need to run in parallel, all need distinct port ranges.
-		name      string
-		eip1559   bool
-		ns        ocrnetworking.NetworkingStack
+		id      int
+		name    string
+		eip1559 bool
 	}{
-		{1, 20000, "legacy mode", false, ocrnetworking.NetworkingStackV1},
-		{2, 20010, "eip1559 mode", true, ocrnetworking.NetworkingStackV1},
-		{3, 20020, "legacy mode V1V2", false, ocrnetworking.NetworkingStackV1V2},
-		{4, 20030, "legacy mode V2", false, ocrnetworking.NetworkingStackV2},
+		{1, "legacy mode", false},
+		{2, "eip1559 mode", true},
 	}
 
 	numOracles := 4
@@ -859,31 +795,27 @@ func TestIntegration_OCR(t *testing.T) {
 		test := tt
 		t.Run(test.name, func(t *testing.T) {
 			t.Parallel()
-			bootstrapNodePortV1 := freeport.GetOne(t)
 			bootstrapNodePortV2 := freeport.GetOne(t)
 			g := gomega.NewWithT(t)
 			owner, b, ocrContractAddress, ocrContract, flagsContract, flagsContractAddress := setupOCRContracts(t)
 
 			// Note it's plausible these ports could be occupied on a CI machine.
 			// May need a port randomize + retry approach if we observe collisions.
-			appBootstrap, bootstrapPeerID, _, _ := setupNode(t, owner, bootstrapNodePortV1, bootstrapNodePortV2, b, test.ns, nil)
+			appBootstrap, bootstrapPeerID, _, _ := setupNode(t, owner, bootstrapNodePortV2, b, nil)
 			var (
 				oracles      []confighelper.OracleIdentityExtra
 				transmitters []common.Address
 				keys         []ocrkey.KeyV2
 				apps         []*cltest.TestApplication
 			)
-			ports := freeport.GetN(t, 2*numOracles)
+			ports := freeport.GetN(t, numOracles)
 			for i := 0; i < numOracles; i++ {
-				portV1 := ports[2*i]
-				portV2 := ports[2*i+1]
-				app, peerID, transmitter, key := setupNode(t, owner, portV1, portV2, b, test.ns, func(c *chainlink.Config, s *chainlink.Secrets) {
+				app, peerID, transmitter, key := setupNode(t, owner, ports[i], b, func(c *chainlink.Config, s *chainlink.Secrets) {
 					c.EVM[0].FlagsContractAddress = ptr(ethkey.EIP55AddressFromAddress(flagsContractAddress))
 					c.EVM[0].GasEstimator.EIP1559DynamicFees = ptr(test.eip1559)
-					if test.ns != ocrnetworking.NetworkingStackV1 {
-						c.P2P.V2.DefaultBootstrappers = &[]ocrcommontypes.BootstrapperLocator{
-							{PeerID: bootstrapPeerID, Addrs: []string{fmt.Sprintf("127.0.0.1:%d", bootstrapNodePortV2)}},
-						}
+
+					c.P2P.V2.DefaultBootstrappers = &[]ocrcommontypes.BootstrapperLocator{
+						{PeerID: bootstrapPeerID, Addrs: []string{fmt.Sprintf("127.0.0.1:%d", bootstrapNodePortV2)}},
 					}
 				})
 
@@ -1007,9 +939,6 @@ name               = "web oracle spec"
 contractAddress    = "%s"
 evmChainID		   = "%s"
 isBootstrapPeer    = false
-p2pBootstrapPeers  = [
-    "/ip4/127.0.0.1/tcp/%d/p2p/%s"
-]
 keyBundleID        = "%s"
 transmitterAddress = "%s"
 observationTimeout = "100ms"
@@ -1031,7 +960,7 @@ observationSource = """
 
 	answer1 [type=median index=0];
 """
-`, ocrContractAddress, testutils.SimulatedChainID.String(), bootstrapNodePortV1, bootstrapPeerID, keys[i].ID(), transmitters[i], fmt.Sprintf("bridge%d", i), i, slowServers[i].URL, i))
+`, ocrContractAddress, testutils.SimulatedChainID.String(), keys[i].ID(), transmitters[i], fmt.Sprintf("bridge%d", i), i, slowServers[i].URL, i))
 				require.NoError(t, err)
 				jb.Name = null.NewString("testocr", true)
 				err = apps[i].AddJobV2(testutils.Context(t), &jb)
@@ -1084,14 +1013,13 @@ func TestIntegration_OCR_ForwarderFlow(t *testing.T) {
 	t.Parallel()
 	numOracles := 4
 	t.Run("ocr_forwarder_flow", func(t *testing.T) {
-		bootstrapNodePortV1 := freeport.GetOne(t)
 		bootstrapNodePortV2 := freeport.GetOne(t)
 		g := gomega.NewWithT(t)
 		owner, b, ocrContractAddress, ocrContract, flagsContract, flagsContractAddress := setupOCRContracts(t)
 
 		// Note it's plausible these ports could be occupied on a CI machine.
 		// May need a port randomize + retry approach if we observe collisions.
-		appBootstrap, bootstrapPeerID, _, _ := setupNode(t, owner, bootstrapNodePortV1, bootstrapNodePortV2, b, ocrnetworking.NetworkingStackV2, nil)
+		appBootstrap, bootstrapPeerID, _, _ := setupNode(t, owner, bootstrapNodePortV2, b, nil)
 
 		var (
 			oracles             []confighelper.OracleIdentityExtra
@@ -1100,11 +1028,9 @@ func TestIntegration_OCR_ForwarderFlow(t *testing.T) {
 			keys                []ocrkey.KeyV2
 			apps                []*cltest.TestApplication
 		)
-		ports := freeport.GetN(t, 2*numOracles)
+		ports := freeport.GetN(t, numOracles)
 		for i := 0; i < numOracles; i++ {
-			portV1 := ports[2*i]
-			portV2 := ports[2*i+1]
-			app, peerID, transmitter, forwarder, key := setupForwarderEnabledNode(t, owner, portV1, portV2, b, ocrnetworking.NetworkingStackV2, func(c *chainlink.Config, s *chainlink.Secrets) {
+			app, peerID, transmitter, forwarder, key := setupForwarderEnabledNode(t, owner, ports[i], b, func(c *chainlink.Config, s *chainlink.Secrets) {
 				c.Feature.LogPoller = ptr(true)
 				c.EVM[0].FlagsContractAddress = ptr(ethkey.EIP55AddressFromAddress(flagsContractAddress))
 				c.EVM[0].GasEstimator.EIP1559DynamicFees = ptr(true)
@@ -1241,9 +1167,6 @@ contractAddress    = "%s"
 evmChainID         = "%s"
 forwardingAllowed  = true
 isBootstrapPeer    = false
-p2pBootstrapPeers  = [
-    "/ip4/127.0.0.1/tcp/%d/p2p/%s"
-]
 keyBundleID        = "%s"
 transmitterAddress = "%s"
 observationTimeout = "100ms"
@@ -1265,7 +1188,7 @@ observationSource = """
 
 	answer1 [type=median index=0];
 """
-`, ocrContractAddress, testutils.SimulatedChainID.String(), bootstrapNodePortV1, bootstrapPeerID, keys[i].ID(), transmitters[i], fmt.Sprintf("bridge%d", i), i, slowServers[i].URL, i))
+`, ocrContractAddress, testutils.SimulatedChainID.String(), keys[i].ID(), transmitters[i], fmt.Sprintf("bridge%d", i), i, slowServers[i].URL, i))
 			require.NoError(t, err)
 			jb.Name = null.NewString("testocr", true)
 			err = apps[i].AddJobV2(testutils.Context(t), &jb)
diff --git a/core/internal/features/ocr2/features_ocr2_test.go b/core/internal/features/ocr2/features_ocr2_test.go
index 387b15f76c8..295bb7fb14a 100644
--- a/core/internal/features/ocr2/features_ocr2_test.go
+++ b/core/internal/features/ocr2/features_ocr2_test.go
@@ -119,7 +119,6 @@ func setupNodeOCR2(
 		c.OCR2.Enabled = ptr(true)
 
 		c.P2P.PeerID = ptr(p2pKey.PeerID())
-		c.P2P.V1.Enabled = ptr(false)
 		c.P2P.V2.Enabled = ptr(true)
 		c.P2P.V2.DeltaDial = models.MustNewDuration(500 * time.Millisecond)
 		c.P2P.V2.DeltaReconcile = models.MustNewDuration(5 * time.Second)
diff --git a/core/internal/testutils/configtest/general_config.go b/core/internal/testutils/configtest/general_config.go
index 93d388b2d30..f076521b71c 100644
--- a/core/internal/testutils/configtest/general_config.go
+++ b/core/internal/testutils/configtest/general_config.go
@@ -56,7 +56,6 @@ func overrides(c *chainlink.Config, s *chainlink.Secrets) {
 
 	c.JobPipeline.ReaperInterval = models.MustNewDuration(0)
 
-	c.P2P.V1.Enabled = ptr(false)
 	c.P2P.V2.Enabled = ptr(false)
 
 	c.WebServer.SessionTimeout = models.MustNewDuration(2 * time.Minute)
diff --git a/core/scripts/go.mod b/core/scripts/go.mod
index 4b44c7a00ec..89ddc54ca7e 100644
--- a/core/scripts/go.mod
+++ b/core/scripts/go.mod
@@ -22,7 +22,7 @@ require (
 	github.com/smartcontractkit/chainlink-automation v1.0.1
 	github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
 	github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000
-	github.com/smartcontractkit/libocr v0.0.0-20231107151413-13e0202ae8d7
+	github.com/smartcontractkit/libocr v0.0.0-20231130143053-c5102a9c0fb7
 	github.com/spf13/cobra v1.6.1
 	github.com/spf13/viper v1.15.0
 	github.com/stretchr/testify v1.8.4
@@ -70,7 +70,7 @@ require (
 	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
 	github.com/cockroachdb/errors v1.9.1 // indirect
 	github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
-	github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811 // indirect
+	github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06 // indirect
 	github.com/cockroachdb/redact v1.1.3 // indirect
 	github.com/cometbft/cometbft v0.37.2 // indirect
 	github.com/cometbft/cometbft-db v0.7.0 // indirect
@@ -88,7 +88,6 @@ require (
 	github.com/danieljoos/wincred v1.1.2 // indirect
 	github.com/danielkov/gin-helmet v0.0.0-20171108135313-1387e224435e // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
 	github.com/deckarep/golang-set v1.8.0 // indirect
 	github.com/deckarep/golang-set/v2 v2.3.0 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
@@ -102,7 +101,6 @@ require (
 	github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
 	github.com/esote/minmaxheap v1.0.0 // indirect
 	github.com/fatih/color v1.16.0 // indirect
-	github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/fxamacker/cbor/v2 v2.5.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
@@ -146,7 +144,6 @@ require (
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/go-tpm v0.9.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/gopacket v1.1.19 // indirect
 	github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 // indirect
 	github.com/gorilla/context v1.1.1 // indirect
 	github.com/gorilla/securecookie v1.1.2 // indirect
@@ -164,10 +161,8 @@ require (
 	github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
 	github.com/gtank/merlin v0.1.1 // indirect
 	github.com/gtank/ristretto255 v0.1.2 // indirect
-	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-hclog v1.5.0 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
-	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-plugin v1.5.2 // indirect
 	github.com/hashicorp/golang-lru v0.6.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
@@ -175,14 +170,11 @@ require (
 	github.com/hdevalence/ed25519consensus v0.1.0 // indirect
 	github.com/holiman/big v0.0.0-20221017200358-a027dc42d04e // indirect
 	github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
-	github.com/holiman/uint256 v1.2.2 // indirect
+	github.com/holiman/uint256 v1.2.3 // indirect
 	github.com/huandu/skiplist v1.2.0 // indirect
-	github.com/huin/goupnp v1.0.3 // indirect
+	github.com/huin/goupnp v1.3.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/ipfs/go-cid v0.0.7 // indirect
-	github.com/ipfs/go-datastore v0.4.5 // indirect
-	github.com/ipfs/go-ipfs-util v0.0.2 // indirect
-	github.com/ipfs/go-ipns v0.0.2 // indirect
 	github.com/ipfs/go-log v1.0.4 // indirect
 	github.com/ipfs/go-log/v2 v2.1.1 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
@@ -194,58 +186,21 @@ require (
 	github.com/jackc/pgtype v1.14.0 // indirect
 	github.com/jackc/pgx/v4 v4.18.1 // indirect
 	github.com/jackpal/go-nat-pmp v1.0.2 // indirect
-	github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
-	github.com/jbenet/goprocess v0.1.4 // indirect
 	github.com/jmhodges/levigo v1.0.0 // indirect
 	github.com/jpillora/backoff v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/compress v1.17.2 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
-	github.com/koron/go-ssdp v0.0.2 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/leanovate/gopter v0.2.10-0.20210127095200-9abe2343507a // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/lib/pq v1.10.9 // indirect
-	github.com/libp2p/go-addr-util v0.0.2 // indirect
 	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
-	github.com/libp2p/go-cidranger v1.1.0 // indirect
-	github.com/libp2p/go-conn-security-multistream v0.2.0 // indirect
-	github.com/libp2p/go-eventbus v0.2.1 // indirect
-	github.com/libp2p/go-flow-metrics v0.0.3 // indirect
-	github.com/libp2p/go-libp2p v0.13.0 // indirect
-	github.com/libp2p/go-libp2p-asn-util v0.0.0-20201026210036-4f868c957324 // indirect
-	github.com/libp2p/go-libp2p-autonat v0.4.0 // indirect
-	github.com/libp2p/go-libp2p-blankhost v0.2.0 // indirect
-	github.com/libp2p/go-libp2p-circuit v0.4.0 // indirect
 	github.com/libp2p/go-libp2p-core v0.8.5 // indirect
-	github.com/libp2p/go-libp2p-discovery v0.5.0 // indirect
-	github.com/libp2p/go-libp2p-kad-dht v0.11.1 // indirect
-	github.com/libp2p/go-libp2p-kbucket v0.4.7 // indirect
-	github.com/libp2p/go-libp2p-loggables v0.1.0 // indirect
-	github.com/libp2p/go-libp2p-mplex v0.4.1 // indirect
-	github.com/libp2p/go-libp2p-nat v0.0.6 // indirect
-	github.com/libp2p/go-libp2p-noise v0.1.2 // indirect
 	github.com/libp2p/go-libp2p-peerstore v0.2.7 // indirect
-	github.com/libp2p/go-libp2p-pnet v0.2.0 // indirect
-	github.com/libp2p/go-libp2p-record v0.1.3 // indirect
-	github.com/libp2p/go-libp2p-swarm v0.4.0 // indirect
-	github.com/libp2p/go-libp2p-tls v0.1.3 // indirect
-	github.com/libp2p/go-libp2p-transport-upgrader v0.4.0 // indirect
-	github.com/libp2p/go-libp2p-yamux v0.5.1 // indirect
-	github.com/libp2p/go-mplex v0.3.0 // indirect
-	github.com/libp2p/go-msgio v0.0.6 // indirect
-	github.com/libp2p/go-nat v0.0.5 // indirect
-	github.com/libp2p/go-netroute v0.1.4 // indirect
 	github.com/libp2p/go-openssl v0.0.7 // indirect
-	github.com/libp2p/go-reuseport v0.0.2 // indirect
-	github.com/libp2p/go-reuseport-transport v0.0.4 // indirect
-	github.com/libp2p/go-sockaddr v0.1.0 // indirect
-	github.com/libp2p/go-stream-muxer-multistream v0.3.0 // indirect
-	github.com/libp2p/go-tcp-transport v0.2.1 // indirect
-	github.com/libp2p/go-ws-transport v0.4.0 // indirect
-	github.com/libp2p/go-yamux/v2 v2.0.0 // indirect
 	github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
@@ -266,12 +221,10 @@ require (
 	github.com/multiformats/go-base32 v0.0.3 // indirect
 	github.com/multiformats/go-base36 v0.1.0 // indirect
 	github.com/multiformats/go-multiaddr v0.3.3 // indirect
-	github.com/multiformats/go-multiaddr-dns v0.2.0 // indirect
 	github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
 	github.com/multiformats/go-multiaddr-net v0.2.0 // indirect
 	github.com/multiformats/go-multibase v0.0.3 // indirect
 	github.com/multiformats/go-multihash v0.0.14 // indirect
-	github.com/multiformats/go-multistream v0.2.0 // indirect
 	github.com/multiformats/go-varint v0.0.6 // indirect
 	github.com/mwitkow/grpc-proxy v0.0.0-20230212185441-f345521cb9c9 // indirect
 	github.com/oklog/run v1.1.0 // indirect
@@ -337,8 +290,6 @@ require (
 	github.com/ulule/limiter/v3 v3.11.2 // indirect
 	github.com/unrolled/secure v1.13.0 // indirect
 	github.com/valyala/fastjson v1.4.1 // indirect
-	github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
-	github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/yusufpapurcu/wmi v1.2.3 // indirect
 	github.com/zondax/hid v0.9.1 // indirect
diff --git a/core/scripts/go.sum b/core/scripts/go.sum
index 78faaf6839a..5f0e22fba03 100644
--- a/core/scripts/go.sum
+++ b/core/scripts/go.sum
@@ -75,7 +75,6 @@ github.com/99designs/keyring v1.2.1 h1:tYLp1ULvO7i3fI5vE21ReQuj99QFSs7lGm0xWyJo8
 github.com/99designs/keyring v1.2.1/go.mod h1:fc+wB5KTk9wQ9sDx0kFXB3A0MaeGHM9AwRStKOQ5vOA=
 github.com/AlekSi/pointer v1.1.0 h1:SSDMPcXD9jSl8FPy9cRzoRaMJtm9g9ggGTxecRUbQoI=
 github.com/AlekSi/pointer v1.1.0/go.mod h1:y7BvfRI3wXPWKXEBhU71nbnIEEZX0QTSB2Bj48UJIZE=
-github.com/AndreasBriese/bbloom v0.0.0-20180913140656-343706a395b7/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
@@ -105,7 +104,6 @@ github.com/Depado/ginprom v1.7.11/go.mod h1:49mxL3NTQwDrhpDbY4V1mAIB3us9B+b2hP1+
 github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0=
 github.com/GeertJohan/go.rice v1.0.0/go.mod h1:eH6gbSOAUv07dQuZVnBmoDP8mgsM1rtixis4Tib9if0=
 github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
-github.com/Kubuxu/go-os-helper v0.0.1/go.mod h1:N8B+I7vPCT80IcP58r50u4+gEEcsZETFUpAzWW2ep1Y=
 github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0=
 github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
@@ -230,15 +228,16 @@ github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b80
 github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw=
 github.com/cockroachdb/apd/v3 v3.1.0 h1:MK3Ow7LH0W8zkd5GMKA1PvS9qG3bWFI95WaVNfyZJ/w=
 github.com/cockroachdb/apd/v3 v3.1.0/go.mod h1:6qgPBMXjATAdD/VefbRP9NoSLKjbB4LCoA7gN4LpHs4=
-github.com/cockroachdb/datadriven v1.0.2 h1:H9MtNqVoVhvd9nCBwOyDjUEdZCREqbIdCJD93PBm/jA=
 github.com/cockroachdb/datadriven v1.0.2/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU=
+github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877 h1:1MLK4YpFtIEo3ZtMA5C795Wtv5VuUnrXX7mQG+aHg6o=
+github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU=
 github.com/cockroachdb/errors v1.9.1 h1:yFVvsI0VxmRShfawbt/laCIDy/mtTqqnvoNgiy5bEV8=
 github.com/cockroachdb/errors v1.9.1/go.mod h1:2sxOtL2WIc096WSZqZ5h8fa17rdDq9HZOZLBCor4mBk=
 github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
 github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE=
 github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
-github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811 h1:ytcWPaNPhNoGMWEhDvS3zToKcDpRsLuRolQJBVGdozk=
-github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811/go.mod h1:Nb5lgvnQ2+oGlE/EyZy4+2/CxRh9KfvCXnag1vtpxVM=
+github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06 h1:T+Np/xtzIjYM/P5NAw0e2Rf1FGvzDau1h54MKvx8G7w=
+github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06/go.mod h1:bynZ3gvVyhlvjLI7PT6dmZ7g76xzJ7HpxfjgkzCGz6s=
 github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ=
 github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
 github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM=
@@ -257,7 +256,6 @@ github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc
 github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
@@ -306,9 +304,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davidlazar/go-crypto v0.0.0-20170701192655-dcfb0a7ac018/go.mod h1:rQYf4tfk5sSwFsnDg3qYaBxSjsD9S8+59vW0dKUgme4=
-github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c h1:pFUpOrbxDR6AkioZ1ySsx5yxlDQZ8stG2b88gTPxgJU=
-github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c/go.mod h1:6UhI8N9EjYm1c2odKpFpAYeR8dsBeM7PtzQhRgxRr9U=
 github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4=
 github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo=
 github.com/deckarep/golang-set/v2 v2.3.0 h1:qs18EKUfHm2X9fA50Mr/M5hccg2tNnVqsiBImnyDs0g=
@@ -323,8 +318,6 @@ github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFM
 github.com/dfuse-io/logging v0.0.0-20201110202154-26697de88c79/go.mod h1:V+ED4kT/t/lKtH99JQmKIb0v9WL3VaYkJ36CfHlVECI=
 github.com/dfuse-io/logging v0.0.0-20210109005628-b97a57253f70 h1:CuJS05R9jmNlUK8GOxrEELPbfXm0EuGh/30LjkjN5vo=
 github.com/dfuse-io/logging v0.0.0-20210109005628-b97a57253f70/go.mod h1:EoK/8RFbMEteaCaz89uessDTnCWjbbcr+DXcBh4el5o=
-github.com/dgraph-io/badger v1.5.5-0.20190226225317-8115aed38f8f/go.mod h1:VZxzAIRPHRVNRKRo6AXrX9BJegn6il06VMTZVJYCIjQ=
-github.com/dgraph-io/badger v1.6.0-rc1/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
 github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
 github.com/dgraph-io/badger v1.6.1/go.mod h1:FRmFw3uxvcpa8zG3Rxs0th+hCLIuaQg8HlNV5bjgnuU=
 github.com/dgraph-io/badger/v2 v2.2007.4 h1:TRWBQg8UrlUhaFdco01nO2uXwzKS7zd+HVdwV/GHc4o=
@@ -334,7 +327,6 @@ github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KP
 github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8=
 github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/dgryski/go-farm v0.0.0-20190104051053-3adb47b1fb0f/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y=
 github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
@@ -390,8 +382,6 @@ github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBd
 github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c=
 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
-github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6 h1:u/UEqS66A5ckRmS4yNpjmVH56sVtS/RfclBAYocb4as=
-github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6/go.mod h1:1i71OnUq3iUe1ma7Lr6yG6/rjvM3emb6yoL7xLFzcVQ=
 github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
 github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
 github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
@@ -591,10 +581,6 @@ github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSN
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/gopacket v1.1.17/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM=
-github.com/google/gopacket v1.1.18/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM=
-github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
-github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -674,15 +660,11 @@ github.com/gtank/merlin v0.1.1 h1:eQ90iG7K9pOhtereWsmyRJ6RAwcP4tHTDBHXNg+u5is=
 github.com/gtank/merlin v0.1.1/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s=
 github.com/gtank/ristretto255 v0.1.2 h1:JEqUCPA1NvLq5DwYtuzigd7ss8fwbYay9fi4/5uMzcc=
 github.com/gtank/ristretto255 v0.1.2/go.mod h1:Ph5OpO6c7xKUGROZfWVLiJf9icMDwUeIvY4OmlYW69o=
-github.com/gxed/hashland/keccakpg v0.0.1/go.mod h1:kRzw3HkwxFU1mpmPP8v1WyQzwdGfmKFJ6tItnhQ67kU=
-github.com/gxed/hashland/murmur3 v0.0.1/go.mod h1:KjXop02n4/ckmZSnY2+HKcLud/tcmvhST0bie/0lS48=
 github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
 github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
 github.com/hashicorp/consul/sdk v0.14.1 h1:ZiwE2bKb+zro68sWzZ1SgHF3kRMBZ94TwOCFRF4ylPs=
 github.com/hashicorp/consul/sdk v0.14.1/go.mod h1:vFt03juSzocLRFo59NkeQHHmQa6+g7oU0pfzdI1mUhg=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
-github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpxn4uE=
 github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0=
 github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
@@ -698,9 +680,6 @@ github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJ
 github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
-github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
-github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
-github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
 github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
 github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo=
@@ -735,17 +714,15 @@ github.com/holiman/big v0.0.0-20221017200358-a027dc42d04e h1:pIYdhNkDh+YENVNi3gt
 github.com/holiman/big v0.0.0-20221017200358-a027dc42d04e/go.mod h1:j9cQbcqHQujT0oKJ38PylVfqohClLr3CvDC+Qcg+lhU=
 github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao=
 github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA=
-github.com/holiman/uint256 v1.2.2 h1:TXKcSGc2WaxPD2+bmzAsVthL4+pEN0YwXcL5qED83vk=
-github.com/holiman/uint256 v1.2.2/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw=
+github.com/holiman/uint256 v1.2.3 h1:K8UWO1HUJpRMXBxbmaY1Y8IAMZC/RsKB+ArEnnK4l5o=
+github.com/holiman/uint256 v1.2.3/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huandu/go-assert v1.1.5 h1:fjemmA7sSfYHJD7CUqs9qTwwfdNAx7/j2/ZlHXzNB3c=
 github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0JrPVhn/06U=
 github.com/huandu/skiplist v1.2.0 h1:gox56QD77HzSC0w+Ws3MH3iie755GBJU1OER3h5VsYw=
 github.com/huandu/skiplist v1.2.0/go.mod h1:7v3iFjLcSAzO4fN5B8dvebvo/qsfumiLiDXMrPiHF9w=
-github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc=
-github.com/huin/goupnp v1.0.3 h1:N8No57ls+MnjlB+JPiCVSOyy/ot7MJTqlo7rn+NYSqQ=
-github.com/huin/goupnp v1.0.3/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y=
-github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o=
+github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc=
+github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8=
 github.com/hydrogen18/memlistener v0.0.0-20200120041712-dcc25e7acd91/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
@@ -758,45 +735,18 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
 github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/ipfs/go-cid v0.0.1/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
-github.com/ipfs/go-cid v0.0.2/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
-github.com/ipfs/go-cid v0.0.3/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
-github.com/ipfs/go-cid v0.0.4/go.mod h1:4LLaPOQwmk5z9LBgQnpkivrx8BJjUyGwTXCd5Xfj6+M=
 github.com/ipfs/go-cid v0.0.5/go.mod h1:plgt+Y5MnOey4vO4UlUazGqdbEXuFYitED67FexhXog=
-github.com/ipfs/go-cid v0.0.6/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I=
 github.com/ipfs/go-cid v0.0.7 h1:ysQJVJA3fNDF1qigJbsSQOdjhVLsOEoPdh0+R97k3jY=
 github.com/ipfs/go-cid v0.0.7/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I=
-github.com/ipfs/go-datastore v0.0.1/go.mod h1:d4KVXhMt913cLBEI/PXAy6ko+W7e9AhyAKBGh803qeE=
-github.com/ipfs/go-datastore v0.1.0/go.mod h1:d4KVXhMt913cLBEI/PXAy6ko+W7e9AhyAKBGh803qeE=
-github.com/ipfs/go-datastore v0.1.1/go.mod h1:w38XXW9kVFNp57Zj5knbKWM2T+KOZCGDRVNdgPHtbHw=
-github.com/ipfs/go-datastore v0.4.0/go.mod h1:SX/xMIKoCszPqp+z9JhPYCmoOoXTvaa13XEbGtsFUhA=
 github.com/ipfs/go-datastore v0.4.1/go.mod h1:SX/xMIKoCszPqp+z9JhPYCmoOoXTvaa13XEbGtsFUhA=
 github.com/ipfs/go-datastore v0.4.4/go.mod h1:SX/xMIKoCszPqp+z9JhPYCmoOoXTvaa13XEbGtsFUhA=
-github.com/ipfs/go-datastore v0.4.5 h1:cwOUcGMLdLPWgu3SlrCckCMznaGADbPqE0r8h768/Dg=
-github.com/ipfs/go-datastore v0.4.5/go.mod h1:eXTcaaiN6uOlVCLS9GjJUJtlvJfM3xk23w3fyfrmmJs=
-github.com/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk=
-github.com/ipfs/go-detect-race v0.0.1/go.mod h1:8BNT7shDZPo99Q74BpGMK+4D8Mn4j46UU0LZ723meps=
-github.com/ipfs/go-ds-badger v0.0.2/go.mod h1:Y3QpeSFWQf6MopLTiZD+VT6IC1yZqaGmjvRcKeSGij8=
-github.com/ipfs/go-ds-badger v0.0.5/go.mod h1:g5AuuCGmr7efyzQhLL8MzwqcauPojGPUaHzfGTzuE3s=
-github.com/ipfs/go-ds-badger v0.0.7/go.mod h1:qt0/fWzZDoPW6jpQeqUjR5kBfhDNB65jd9YlmAvpQBk=
-github.com/ipfs/go-ds-badger v0.2.1/go.mod h1:Tx7l3aTph3FMFrRS838dcSJh+jjA7cX9DrGVwx/NOwE=
 github.com/ipfs/go-ds-badger v0.2.3/go.mod h1:pEYw0rgg3FIrywKKnL+Snr+w/LjJZVMTBRn4FS6UHUk=
-github.com/ipfs/go-ds-leveldb v0.0.1/go.mod h1:feO8V3kubwsEF22n0YRQCffeb79OOYIykR4L04tMOYc=
-github.com/ipfs/go-ds-leveldb v0.1.0/go.mod h1:hqAW8y4bwX5LWcCtku2rFNX3vjDZCy5LZCg+cSZvYb8=
-github.com/ipfs/go-ds-leveldb v0.4.1/go.mod h1:jpbku/YqBSsBc1qgME8BkWS4AxzF2cEu1Ii2r79Hh9s=
 github.com/ipfs/go-ds-leveldb v0.4.2/go.mod h1:jpbku/YqBSsBc1qgME8BkWS4AxzF2cEu1Ii2r79Hh9s=
 github.com/ipfs/go-ipfs-delay v0.0.0-20181109222059-70721b86a9a8/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw=
-github.com/ipfs/go-ipfs-util v0.0.1/go.mod h1:spsl5z8KUnrve+73pOhSVZND1SIxPW5RyBCNzQxlJBc=
-github.com/ipfs/go-ipfs-util v0.0.2 h1:59Sswnk1MFaiq+VcaknX7aYEyGyGDAA73ilhEK2POp8=
-github.com/ipfs/go-ipfs-util v0.0.2/go.mod h1:CbPtkWJzjLdEcezDns2XYaehFVNXG9zrdrtMecczcsQ=
-github.com/ipfs/go-ipns v0.0.2 h1:oq4ErrV4hNQ2Eim257RTYRgfOSV/s8BDaf9iIl4NwFs=
-github.com/ipfs/go-ipns v0.0.2/go.mod h1:WChil4e0/m9cIINWLxZe1Jtf77oz5L05rO2ei/uKJ5U=
 github.com/ipfs/go-log v0.0.1/go.mod h1:kL1d2/hzSpI0thNYjiKfjanbVNU+IIGA/WnNESY9leM=
-github.com/ipfs/go-log v1.0.2/go.mod h1:1MNjMxe0u6xvJZgeqbJ8vdo2TKaGwZ1a0Bpza+sr2Sk=
 github.com/ipfs/go-log v1.0.3/go.mod h1:OsLySYkwIbiSUR/yBTdv1qPtcE4FW3WPWk/ewz9Ru+A=
 github.com/ipfs/go-log v1.0.4 h1:6nLQdX4W8P9yZZFH7mO+X/PzjN8Laozm/lMJ6esdgzY=
 github.com/ipfs/go-log v1.0.4/go.mod h1:oDCg2FkjogeFOhqqb+N39l2RpTNPL6F/StPkB3kPgcs=
-github.com/ipfs/go-log/v2 v2.0.2/go.mod h1:O7P1lJt27vWHhOwQmcFEvlmo49ry2VY2+JfBWFaa9+0=
 github.com/ipfs/go-log/v2 v2.0.3/go.mod h1:O7P1lJt27vWHhOwQmcFEvlmo49ry2VY2+JfBWFaa9+0=
 github.com/ipfs/go-log/v2 v2.0.5/go.mod h1:eZs4Xt4ZUJQFM3DlanGhy7TkwwawCZcSByscwkWG+dw=
 github.com/ipfs/go-log/v2 v2.1.1 h1:G4TtqN+V9y9HY9TA6BwbCVyyBZ2B9MbCjR2MtGx8FR0=
@@ -860,19 +810,10 @@ github.com/jackc/puddle v1.3.0 h1:eHK/5clGOatcjX3oWGBO/MpxpbHzSwud5EWTSCI+MX0=
 github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk=
 github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
-github.com/jackpal/gateway v1.0.5/go.mod h1:lTpwd4ACLXmpyiCTRtfiNyVnUmqT9RivzCDQetPfnjA=
-github.com/jackpal/go-nat-pmp v1.0.1/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
 github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
 github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
-github.com/jbenet/go-cienv v0.0.0-20150120210510-1bb1476777ec/go.mod h1:rGaEvXB4uRSZMmzKNLoXvTu1sfx+1kv/DojUlPrSZGs=
-github.com/jbenet/go-cienv v0.1.0 h1:Vc/s0QbQtoxX8MwwSLWWh+xNNZvM3Lw7NsTcHrvvhMc=
 github.com/jbenet/go-cienv v0.1.0/go.mod h1:TqNnHUmJgXau0nCzC7kXWeotg3J9W34CUv5Djy1+FlA=
-github.com/jbenet/go-temp-err-catcher v0.0.0-20150120210811-aac704a3f4f2/go.mod h1:8GXXJV31xl8whumTzdZsTt3RnUIiPqzkyf7mxToRCMs=
-github.com/jbenet/go-temp-err-catcher v0.1.0 h1:zpb3ZH6wIE8Shj2sKS+khgRvf7T7RABoLk/+KKHggpk=
-github.com/jbenet/go-temp-err-catcher v0.1.0/go.mod h1:0kJRvmDZXNMIiJirNPEYfhpPwbGVtZVWC34vc5WLsDk=
 github.com/jbenet/goprocess v0.0.0-20160826012719-b497e2f366b8/go.mod h1:Ly/wlsjFq/qrU3Rar62tu1gASgGw6chQbSh/XgIIXCY=
-github.com/jbenet/goprocess v0.1.3/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZlqdZVfqY4=
-github.com/jbenet/goprocess v0.1.4 h1:DRGOFReOMqqDNXwW70QkacFW0YN9QnwLV0Vqk+3oU0o=
 github.com/jbenet/goprocess v0.1.4/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZlqdZVfqY4=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=
@@ -903,7 +844,6 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
-github.com/kami-zh/go-capturer v0.0.0-20171211120116-e492ea43421d/go.mod h1:P2viExyCEfeWGU259JnaQ34Inuec4R38JCyBx2edgD0=
 github.com/kataras/golog v0.0.10/go.mod h1:yJ8YKCmyL+nWjERB90Qwn+bdyBZsaQwU3bTVFgkFIp8=
 github.com/kataras/iris/v12 v12.1.8/go.mod h1:LMYy4VlP67TQ3Zgriz8RE2h2kMZV2SgMYbq3UhfoFmE=
 github.com/kataras/neffos v0.0.14/go.mod h1:8lqADm8PnbeFfL7CLXh1WHw53dG27MC3pgi2R1rmoTE=
@@ -927,9 +867,6 @@ github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZX
 github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/koron/go-ssdp v0.0.0-20191105050749-2e1c40ed0b5d/go.mod h1:5Ky9EC2xfoUKUor0Hjgi2BJhCSXJfMOFlmyYrVKGQMk=
-github.com/koron/go-ssdp v0.0.2 h1:fL3wAoyT6hXHQlORyXUW4Q23kkQpJRgEAYcZB5BR71o=
-github.com/koron/go-ssdp v0.0.2/go.mod h1:XoLfkAiA2KeZsYh4DbHxD7h3nR2AZNqVQOa+LJuqPYs=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -958,211 +895,22 @@ github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/libp2p/go-addr-util v0.0.1/go.mod h1:4ac6O7n9rIAKB1dnd+s8IbbMXkt+oBpzX4/+RACcnlQ=
-github.com/libp2p/go-addr-util v0.0.2 h1:7cWK5cdA5x72jX0g8iLrQWm5TRJZ6CzGdPEhWj7plWU=
-github.com/libp2p/go-addr-util v0.0.2/go.mod h1:Ecd6Fb3yIuLzq4bD7VcywcVSBtefcAwnUISBM3WG15E=
 github.com/libp2p/go-buffer-pool v0.0.1/go.mod h1:xtyIz9PMobb13WaxR6Zo1Pd1zXJKYg0a8KiIvDp3TzQ=
 github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM=
 github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8=
 github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg=
-github.com/libp2p/go-cidranger v1.1.0 h1:ewPN8EZ0dd1LSnrtuwd4709PXVcITVeuwbag38yPW7c=
-github.com/libp2p/go-cidranger v1.1.0/go.mod h1:KWZTfSr+r9qEo9OkI9/SIEeAtw+NNoU0dXIXt15Okic=
-github.com/libp2p/go-conn-security-multistream v0.1.0/go.mod h1:aw6eD7LOsHEX7+2hJkDxw1MteijaVcI+/eP2/x3J1xc=
-github.com/libp2p/go-conn-security-multistream v0.2.0 h1:uNiDjS58vrvJTg9jO6bySd1rMKejieG7v45ekqHbZ1M=
-github.com/libp2p/go-conn-security-multistream v0.2.0/go.mod h1:hZN4MjlNetKD3Rq5Jb/P5ohUnFLNzEAR4DLSzpn2QLU=
-github.com/libp2p/go-eventbus v0.1.0/go.mod h1:vROgu5cs5T7cv7POWlWxBaVLxfSegC5UGQf8A2eEmx4=
-github.com/libp2p/go-eventbus v0.2.1 h1:VanAdErQnpTioN2TowqNcOijf6YwhuODe4pPKSDpxGc=
-github.com/libp2p/go-eventbus v0.2.1/go.mod h1:jc2S4SoEVPP48H9Wpzm5aiGwUCBMfGhVhhBjyhhCJs8=
-github.com/libp2p/go-flow-metrics v0.0.1/go.mod h1:Iv1GH0sG8DtYN3SVJ2eG221wMiNpZxBdp967ls1g+k8=
-github.com/libp2p/go-flow-metrics v0.0.2/go.mod h1:HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs=
-github.com/libp2p/go-flow-metrics v0.0.3 h1:8tAs/hSdNvUiLgtlSy3mxwxWP4I9y/jlkPFT7epKdeM=
 github.com/libp2p/go-flow-metrics v0.0.3/go.mod h1:HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs=
-github.com/libp2p/go-libp2p v0.6.1/go.mod h1:CTFnWXogryAHjXAKEbOf1OWY+VeAP3lDMZkfEI5sT54=
-github.com/libp2p/go-libp2p v0.7.0/go.mod h1:hZJf8txWeCduQRDC/WSqBGMxaTHCOYHt2xSU1ivxn0k=
-github.com/libp2p/go-libp2p v0.7.4/go.mod h1:oXsBlTLF1q7pxr+9w6lqzS1ILpyHsaBPniVO7zIHGMw=
-github.com/libp2p/go-libp2p v0.8.1/go.mod h1:QRNH9pwdbEBpx5DTJYg+qxcVaDMAz3Ee/qDKwXujH5o=
-github.com/libp2p/go-libp2p v0.12.0/go.mod h1:FpHZrfC1q7nA8jitvdjKBDF31hguaC676g/nT9PgQM0=
-github.com/libp2p/go-libp2p v0.13.0 h1:tDdrXARSghmusdm0nf1U/4M8aj8Rr0V2IzQOXmbzQ3s=
-github.com/libp2p/go-libp2p v0.13.0/go.mod h1:pM0beYdACRfHO1WcJlp65WXyG2A6NqYM+t2DTVAJxMo=
-github.com/libp2p/go-libp2p-asn-util v0.0.0-20200825225859-85005c6cf052/go.mod h1:nRMRTab+kZuk0LnKZpxhOVH/ndsdr2Nr//Zltc/vwgo=
-github.com/libp2p/go-libp2p-asn-util v0.0.0-20201026210036-4f868c957324 h1:2H/P+forDWBHije1WULwPfGduByUmC4fthndHVRpYNU=
-github.com/libp2p/go-libp2p-asn-util v0.0.0-20201026210036-4f868c957324/go.mod h1:nRMRTab+kZuk0LnKZpxhOVH/ndsdr2Nr//Zltc/vwgo=
-github.com/libp2p/go-libp2p-autonat v0.1.1/go.mod h1:OXqkeGOY2xJVWKAGV2inNF5aKN/djNA3fdpCWloIudE=
-github.com/libp2p/go-libp2p-autonat v0.2.0/go.mod h1:DX+9teU4pEEoZUqR1PiMlqliONQdNbfzE1C718tcViI=
-github.com/libp2p/go-libp2p-autonat v0.2.1/go.mod h1:MWtAhV5Ko1l6QBsHQNSuM6b1sRkXrpk0/LqCr+vCVxI=
-github.com/libp2p/go-libp2p-autonat v0.2.2/go.mod h1:HsM62HkqZmHR2k1xgX34WuWDzk/nBwNHoeyyT4IWV6A=
-github.com/libp2p/go-libp2p-autonat v0.4.0 h1:3y8XQbpr+ssX8QfZUHekjHCYK64sj6/4hnf/awD4+Ug=
-github.com/libp2p/go-libp2p-autonat v0.4.0/go.mod h1:YxaJlpr81FhdOv3W3BTconZPfhaYivRdf53g+S2wobk=
-github.com/libp2p/go-libp2p-blankhost v0.1.1/go.mod h1:pf2fvdLJPsC1FsVrNP3DUUvMzUts2dsLLBEpo1vW1ro=
-github.com/libp2p/go-libp2p-blankhost v0.1.4/go.mod h1:oJF0saYsAXQCSfDq254GMNmLNz6ZTHTOvtF4ZydUvwU=
-github.com/libp2p/go-libp2p-blankhost v0.2.0 h1:3EsGAi0CBGcZ33GwRuXEYJLLPoVWyXJ1bcJzAJjINkk=
-github.com/libp2p/go-libp2p-blankhost v0.2.0/go.mod h1:eduNKXGTioTuQAUcZ5epXi9vMl+t4d8ugUBRQ4SqaNQ=
-github.com/libp2p/go-libp2p-circuit v0.1.4/go.mod h1:CY67BrEjKNDhdTk8UgBX1Y/H5c3xkAcs3gnksxY7osU=
-github.com/libp2p/go-libp2p-circuit v0.2.1/go.mod h1:BXPwYDN5A8z4OEY9sOfr2DUQMLQvKt/6oku45YUmjIo=
-github.com/libp2p/go-libp2p-circuit v0.4.0 h1:eqQ3sEYkGTtybWgr6JLqJY6QLtPWRErvFjFDfAOO1wc=
-github.com/libp2p/go-libp2p-circuit v0.4.0/go.mod h1:t/ktoFIUzM6uLQ+o1G6NuBl2ANhBKN9Bc8jRIk31MoA=
-github.com/libp2p/go-libp2p-core v0.0.1/go.mod h1:g/VxnTZ/1ygHxH3dKok7Vno1VfpvGcGip57wjTU4fco=
-github.com/libp2p/go-libp2p-core v0.0.4/go.mod h1:jyuCQP356gzfCFtRKyvAbNkyeuxb7OlyhWZ3nls5d2I=
-github.com/libp2p/go-libp2p-core v0.2.0/go.mod h1:X0eyB0Gy93v0DZtSYbEM7RnMChm9Uv3j7yRXjO77xSI=
-github.com/libp2p/go-libp2p-core v0.2.2/go.mod h1:8fcwTbsG2B+lTgRJ1ICZtiM5GWCWZVoVrLaDRvIRng0=
-github.com/libp2p/go-libp2p-core v0.2.4/go.mod h1:STh4fdfa5vDYr0/SzYYeqnt+E6KfEV5VxfIrm0bcI0g=
-github.com/libp2p/go-libp2p-core v0.2.5/go.mod h1:6+5zJmKhsf7yHn1RbmYDu08qDUpIUxGdqHuEZckmZOA=
-github.com/libp2p/go-libp2p-core v0.3.0/go.mod h1:ACp3DmS3/N64c2jDzcV429ukDpicbL6+TrrxANBjPGw=
-github.com/libp2p/go-libp2p-core v0.3.1/go.mod h1:thvWy0hvaSBhnVBaW37BvzgVV68OUhgJJLAa6almrII=
-github.com/libp2p/go-libp2p-core v0.4.0/go.mod h1:49XGI+kc38oGVwqSBhDEwytaAxgZasHhFfQKibzTls0=
-github.com/libp2p/go-libp2p-core v0.5.0/go.mod h1:49XGI+kc38oGVwqSBhDEwytaAxgZasHhFfQKibzTls0=
-github.com/libp2p/go-libp2p-core v0.5.1/go.mod h1:uN7L2D4EvPCvzSH5SrhR72UWbnSGpt5/a35Sm4upn4Y=
-github.com/libp2p/go-libp2p-core v0.5.3/go.mod h1:uN7L2D4EvPCvzSH5SrhR72UWbnSGpt5/a35Sm4upn4Y=
 github.com/libp2p/go-libp2p-core v0.5.4/go.mod h1:uN7L2D4EvPCvzSH5SrhR72UWbnSGpt5/a35Sm4upn4Y=
-github.com/libp2p/go-libp2p-core v0.5.5/go.mod h1:vj3awlOr9+GMZJFH9s4mpt9RHHgGqeHCopzbYKZdRjM=
-github.com/libp2p/go-libp2p-core v0.5.6/go.mod h1:txwbVEhHEXikXn9gfC7/UDDw7rkxuX0bJvM49Ykaswo=
-github.com/libp2p/go-libp2p-core v0.5.7/go.mod h1:txwbVEhHEXikXn9gfC7/UDDw7rkxuX0bJvM49Ykaswo=
-github.com/libp2p/go-libp2p-core v0.6.0/go.mod h1:txwbVEhHEXikXn9gfC7/UDDw7rkxuX0bJvM49Ykaswo=
-github.com/libp2p/go-libp2p-core v0.6.1/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8=
-github.com/libp2p/go-libp2p-core v0.7.0/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8=
-github.com/libp2p/go-libp2p-core v0.8.0/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8=
 github.com/libp2p/go-libp2p-core v0.8.5 h1:aEgbIcPGsKy6zYcC+5AJivYFedhYa4sW7mIpWpUaLKw=
 github.com/libp2p/go-libp2p-core v0.8.5/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8=
-github.com/libp2p/go-libp2p-crypto v0.1.0/go.mod h1:sPUokVISZiy+nNuTTH/TY+leRSxnFj/2GLjtOTW90hI=
-github.com/libp2p/go-libp2p-discovery v0.2.0/go.mod h1:s4VGaxYMbw4+4+tsoQTqh7wfxg97AEdo4GYBt6BadWg=
-github.com/libp2p/go-libp2p-discovery v0.3.0/go.mod h1:o03drFnz9BVAZdzC/QUQ+NeQOu38Fu7LJGEOK2gQltw=
-github.com/libp2p/go-libp2p-discovery v0.5.0 h1:Qfl+e5+lfDgwdrXdu4YNCWyEo3fWuP+WgN9mN0iWviQ=
-github.com/libp2p/go-libp2p-discovery v0.5.0/go.mod h1:+srtPIU9gDaBNu//UHvcdliKBIcr4SfDcm0/PfPJLug=
-github.com/libp2p/go-libp2p-kad-dht v0.11.1 h1:FsriVQhOUZpCotWIjyFSjEDNJmUzuMma/RyyTDZanwc=
-github.com/libp2p/go-libp2p-kad-dht v0.11.1/go.mod h1:5ojtR2acDPqh/jXf5orWy8YGb8bHQDS+qeDcoscL/PI=
-github.com/libp2p/go-libp2p-kbucket v0.4.7 h1:spZAcgxifvFZHBD8tErvppbnNiKA5uokDu3CV7axu70=
-github.com/libp2p/go-libp2p-kbucket v0.4.7/go.mod h1:XyVo99AfQH0foSf176k4jY1xUJ2+jUJIZCSDm7r2YKk=
-github.com/libp2p/go-libp2p-loggables v0.1.0 h1:h3w8QFfCt2UJl/0/NW4K829HX/0S4KD31PQ7m8UXXO8=
-github.com/libp2p/go-libp2p-loggables v0.1.0/go.mod h1:EyumB2Y6PrYjr55Q3/tiJ/o3xoDasoRYM7nOzEpoa90=
-github.com/libp2p/go-libp2p-mplex v0.2.0/go.mod h1:Ejl9IyjvXJ0T9iqUTE1jpYATQ9NM3g+OtR+EMMODbKo=
-github.com/libp2p/go-libp2p-mplex v0.2.1/go.mod h1:SC99Rxs8Vuzrf/6WhmH41kNn13TiYdAWNYHrwImKLnE=
-github.com/libp2p/go-libp2p-mplex v0.2.2/go.mod h1:74S9eum0tVQdAfFiKxAyKzNdSuLqw5oadDq7+L/FELo=
-github.com/libp2p/go-libp2p-mplex v0.2.3/go.mod h1:CK3p2+9qH9x+7ER/gWWDYJ3QW5ZxWDkm+dVvjfuG3ek=
-github.com/libp2p/go-libp2p-mplex v0.3.0/go.mod h1:l9QWxRbbb5/hQMECEb908GbS9Sm2UAR2KFZKUJEynEs=
-github.com/libp2p/go-libp2p-mplex v0.4.0/go.mod h1:yCyWJE2sc6TBTnFpjvLuEJgTSw/u+MamvzILKdX7asw=
-github.com/libp2p/go-libp2p-mplex v0.4.1 h1:/pyhkP1nLwjG3OM+VuaNJkQT/Pqq73WzB3aDN3Fx1sc=
-github.com/libp2p/go-libp2p-mplex v0.4.1/go.mod h1:cmy+3GfqfM1PceHTLL7zQzAAYaryDu6iPSC+CIb094g=
-github.com/libp2p/go-libp2p-nat v0.0.5/go.mod h1:1qubaE5bTZMJE+E/uu2URroMbzdubFz1ChgiN79yKPE=
-github.com/libp2p/go-libp2p-nat v0.0.6 h1:wMWis3kYynCbHoyKLPBEMu4YRLltbm8Mk08HGSfvTkU=
-github.com/libp2p/go-libp2p-nat v0.0.6/go.mod h1:iV59LVhB3IkFvS6S6sauVTSOrNEANnINbI/fkaLimiw=
-github.com/libp2p/go-libp2p-netutil v0.1.0 h1:zscYDNVEcGxyUpMd0JReUZTrpMfia8PmLKcKF72EAMQ=
-github.com/libp2p/go-libp2p-netutil v0.1.0/go.mod h1:3Qv/aDqtMLTUyQeundkKsA+YCThNdbQD54k3TqjpbFU=
-github.com/libp2p/go-libp2p-noise v0.1.1/go.mod h1:QDFLdKX7nluB7DEnlVPbz7xlLHdwHFA9HiohJRr3vwM=
-github.com/libp2p/go-libp2p-noise v0.1.2 h1:IH9GRihQJTx56obm+GnpdPX4KeVIlvpXrP6xnJ0wxWk=
-github.com/libp2p/go-libp2p-noise v0.1.2/go.mod h1:9B10b7ueo7TIxZHHcjcDCo5Hd6kfKT2m77by82SFRfE=
-github.com/libp2p/go-libp2p-peer v0.2.0/go.mod h1:RCffaCvUyW2CJmG2gAWVqwePwW7JMgxjsHm7+J5kjWY=
-github.com/libp2p/go-libp2p-peerstore v0.1.0/go.mod h1:2CeHkQsr8svp4fZ+Oi9ykN1HBb6u0MOvdJ7YIsmcwtY=
-github.com/libp2p/go-libp2p-peerstore v0.1.3/go.mod h1:BJ9sHlm59/80oSkpWgr1MyY1ciXAXV397W6h1GH/uKI=
-github.com/libp2p/go-libp2p-peerstore v0.1.4/go.mod h1:+4BDbDiiKf4PzpANZDAT+knVdLxvqh7hXOujessqdzs=
-github.com/libp2p/go-libp2p-peerstore v0.2.0/go.mod h1:N2l3eVIeAitSg3Pi2ipSrJYnqhVnMNQZo9nkSCuAbnQ=
-github.com/libp2p/go-libp2p-peerstore v0.2.1/go.mod h1:NQxhNjWxf1d4w6PihR8btWIRjwRLBr4TYKfNgrUkOPA=
-github.com/libp2p/go-libp2p-peerstore v0.2.2/go.mod h1:NQxhNjWxf1d4w6PihR8btWIRjwRLBr4TYKfNgrUkOPA=
-github.com/libp2p/go-libp2p-peerstore v0.2.6/go.mod h1:ss/TWTgHZTMpsU/oKVVPQCGuDHItOpf2W8RxAi50P2s=
 github.com/libp2p/go-libp2p-peerstore v0.2.7 h1:83JoLxyR9OYTnNfB5vvFqvMUv/xDNa6NoPHnENhBsGw=
 github.com/libp2p/go-libp2p-peerstore v0.2.7/go.mod h1:ss/TWTgHZTMpsU/oKVVPQCGuDHItOpf2W8RxAi50P2s=
-github.com/libp2p/go-libp2p-pnet v0.2.0 h1:J6htxttBipJujEjz1y0a5+eYoiPcFHhSYHH6na5f0/k=
-github.com/libp2p/go-libp2p-pnet v0.2.0/go.mod h1:Qqvq6JH/oMZGwqs3N1Fqhv8NVhrdYcO0BW4wssv21LA=
-github.com/libp2p/go-libp2p-record v0.1.2/go.mod h1:pal0eNcT5nqZaTV7UGhqeGqxFgGdsU/9W//C8dqjQDk=
-github.com/libp2p/go-libp2p-record v0.1.3 h1:R27hoScIhQf/A8XJZ8lYpnqh9LatJ5YbHs28kCIfql0=
-github.com/libp2p/go-libp2p-record v0.1.3/go.mod h1:yNUff/adKIfPnYQXgp6FQmNu3gLJ6EMg7+/vv2+9pY4=
-github.com/libp2p/go-libp2p-routing-helpers v0.2.3/go.mod h1:795bh+9YeoFl99rMASoiVgHdi5bjack0N1+AFAdbvBw=
-github.com/libp2p/go-libp2p-secio v0.1.0/go.mod h1:tMJo2w7h3+wN4pgU2LSYeiKPrfqBgkOsdiKK77hE7c8=
-github.com/libp2p/go-libp2p-secio v0.2.0/go.mod h1:2JdZepB8J5V9mBp79BmwsaPQhRPNN2NrnB2lKQcdy6g=
-github.com/libp2p/go-libp2p-secio v0.2.1/go.mod h1:cWtZpILJqkqrSkiYcDBh5lA3wbT2Q+hz3rJQq3iftD8=
-github.com/libp2p/go-libp2p-secio v0.2.2/go.mod h1:wP3bS+m5AUnFA+OFO7Er03uO1mncHG0uVwGrwvjYlNY=
-github.com/libp2p/go-libp2p-swarm v0.1.0/go.mod h1:wQVsCdjsuZoc730CgOvh5ox6K8evllckjebkdiY5ta4=
-github.com/libp2p/go-libp2p-swarm v0.2.2/go.mod h1:fvmtQ0T1nErXym1/aa1uJEyN7JzaTNyBcHImCxRpPKU=
-github.com/libp2p/go-libp2p-swarm v0.2.3/go.mod h1:P2VO/EpxRyDxtChXz/VPVXyTnszHvokHKRhfkEgFKNM=
-github.com/libp2p/go-libp2p-swarm v0.2.8/go.mod h1:JQKMGSth4SMqonruY0a8yjlPVIkb0mdNSwckW7OYziM=
-github.com/libp2p/go-libp2p-swarm v0.3.0/go.mod h1:hdv95GWCTmzkgeJpP+GK/9D9puJegb7H57B5hWQR5Kk=
-github.com/libp2p/go-libp2p-swarm v0.3.1/go.mod h1:hdv95GWCTmzkgeJpP+GK/9D9puJegb7H57B5hWQR5Kk=
-github.com/libp2p/go-libp2p-swarm v0.4.0 h1:hahq/ijRoeH6dgROOM8x7SeaKK5VgjjIr96vdrT+NUA=
-github.com/libp2p/go-libp2p-swarm v0.4.0/go.mod h1:XVFcO52VoLoo0eitSxNQWYq4D6sydGOweTOAjJNraCw=
-github.com/libp2p/go-libp2p-testing v0.0.2/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
-github.com/libp2p/go-libp2p-testing v0.0.3/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
-github.com/libp2p/go-libp2p-testing v0.0.4/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
-github.com/libp2p/go-libp2p-testing v0.1.0/go.mod h1:xaZWMJrPUM5GlDBxCeGUi7kI4eqnjVyavGroI2nxEM0=
-github.com/libp2p/go-libp2p-testing v0.1.1/go.mod h1:xaZWMJrPUM5GlDBxCeGUi7kI4eqnjVyavGroI2nxEM0=
-github.com/libp2p/go-libp2p-testing v0.1.2-0.20200422005655-8775583591d8/go.mod h1:Qy8sAncLKpwXtS2dSnDOP8ktexIAHKu+J+pnZOFZLTc=
-github.com/libp2p/go-libp2p-testing v0.3.0/go.mod h1:efZkql4UZ7OVsEfaxNHZPzIehtsBXMrXnCfJIgDti5g=
-github.com/libp2p/go-libp2p-testing v0.4.0 h1:PrwHRi0IGqOwVQWR3xzgigSlhlLfxgfXgkHxr77EghQ=
-github.com/libp2p/go-libp2p-testing v0.4.0/go.mod h1:Q+PFXYoiYFN5CAEG2w3gLPEzotlKsNSbKQ/lImlOWF0=
-github.com/libp2p/go-libp2p-tls v0.1.3 h1:twKMhMu44jQO+HgQK9X8NHO5HkeJu2QbhLzLJpa8oNM=
-github.com/libp2p/go-libp2p-tls v0.1.3/go.mod h1:wZfuewxOndz5RTnCAxFliGjvYSDA40sKitV4c50uI1M=
-github.com/libp2p/go-libp2p-transport-upgrader v0.1.1/go.mod h1:IEtA6or8JUbsV07qPW4r01GnTenLW4oi3lOPbUMGJJA=
-github.com/libp2p/go-libp2p-transport-upgrader v0.2.0/go.mod h1:mQcrHj4asu6ArfSoMuyojOdjx73Q47cYD7s5+gZOlns=
-github.com/libp2p/go-libp2p-transport-upgrader v0.3.0/go.mod h1:i+SKzbRnvXdVbU3D1dwydnTmKRPXiAR/fyvi1dXuL4o=
-github.com/libp2p/go-libp2p-transport-upgrader v0.4.0 h1:xwj4h3hJdBrxqMOyMUjwscjoVst0AASTsKtZiTChoHI=
-github.com/libp2p/go-libp2p-transport-upgrader v0.4.0/go.mod h1:J4ko0ObtZSmgn5BX5AmegP+dK3CSnU2lMCKsSq/EY0s=
-github.com/libp2p/go-libp2p-yamux v0.2.0/go.mod h1:Db2gU+XfLpm6E4rG5uGCFX6uXA8MEXOxFcRoXUODaK8=
-github.com/libp2p/go-libp2p-yamux v0.2.2/go.mod h1:lIohaR0pT6mOt0AZ0L2dFze9hds9Req3OfS+B+dv4qw=
-github.com/libp2p/go-libp2p-yamux v0.2.5/go.mod h1:Zpgj6arbyQrmZ3wxSZxfBmbdnWtbZ48OpsfmQVTErwA=
-github.com/libp2p/go-libp2p-yamux v0.2.7/go.mod h1:X28ENrBMU/nm4I3Nx4sZ4dgjZ6VhLEn0XhIoZ5viCwU=
-github.com/libp2p/go-libp2p-yamux v0.2.8/go.mod h1:/t6tDqeuZf0INZMTgd0WxIRbtK2EzI2h7HbFm9eAKI4=
-github.com/libp2p/go-libp2p-yamux v0.4.0/go.mod h1:+DWDjtFMzoAwYLVkNZftoucn7PelNoy5nm3tZ3/Zw30=
-github.com/libp2p/go-libp2p-yamux v0.5.0/go.mod h1:AyR8k5EzyM2QN9Bbdg6X1SkVVuqLwTGf0L4DFq9g6po=
-github.com/libp2p/go-libp2p-yamux v0.5.1 h1:sX4WQPHMhRxJE5UZTfjEuBvlQWXB5Bo3A2JK9ZJ9EM0=
-github.com/libp2p/go-libp2p-yamux v0.5.1/go.mod h1:dowuvDu8CRWmr0iqySMiSxK+W0iL5cMVO9S94Y6gkv4=
-github.com/libp2p/go-maddr-filter v0.0.4/go.mod h1:6eT12kSQMA9x2pvFQa+xesMKUBlj9VImZbj3B9FBH/Q=
-github.com/libp2p/go-maddr-filter v0.0.5/go.mod h1:Jk+36PMfIqCJhAnaASRH83bdAvfDRp/w6ENFaC9bG+M=
 github.com/libp2p/go-maddr-filter v0.1.0/go.mod h1:VzZhTXkMucEGGEOSKddrwGiOv0tUhgnKqNEmIAz/bPU=
-github.com/libp2p/go-mplex v0.0.3/go.mod h1:pK5yMLmOoBR1pNCqDlA2GQrdAVTMkqFalaTWe7l4Yd0=
-github.com/libp2p/go-mplex v0.1.0/go.mod h1:SXgmdki2kwCUlCCbfGLEgHjC4pFqhTp0ZoV6aiKgxDU=
-github.com/libp2p/go-mplex v0.1.1/go.mod h1:Xgz2RDCi3co0LeZfgjm4OgUF15+sVR8SRcu3SFXI1lk=
-github.com/libp2p/go-mplex v0.1.2/go.mod h1:Xgz2RDCi3co0LeZfgjm4OgUF15+sVR8SRcu3SFXI1lk=
-github.com/libp2p/go-mplex v0.2.0/go.mod h1:0Oy/A9PQlwBytDRp4wSkFnzHYDKcpLot35JQ6msjvYQ=
-github.com/libp2p/go-mplex v0.3.0 h1:U1T+vmCYJaEoDJPV1aq31N56hS+lJgb397GsylNSgrU=
-github.com/libp2p/go-mplex v0.3.0/go.mod h1:0Oy/A9PQlwBytDRp4wSkFnzHYDKcpLot35JQ6msjvYQ=
-github.com/libp2p/go-msgio v0.0.2/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
 github.com/libp2p/go-msgio v0.0.4/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
-github.com/libp2p/go-msgio v0.0.6 h1:lQ7Uc0kS1wb1EfRxO2Eir/RJoHkHn7t6o+EiwsYIKJA=
 github.com/libp2p/go-msgio v0.0.6/go.mod h1:4ecVB6d9f4BDSL5fqvPiC4A3KivjWn+Venn/1ALLMWA=
-github.com/libp2p/go-nat v0.0.4/go.mod h1:Nmw50VAvKuk38jUBcmNh6p9lUJLoODbJRvYAa/+KSDo=
-github.com/libp2p/go-nat v0.0.5 h1:qxnwkco8RLKqVh1NmjQ+tJ8p8khNLFxuElYG/TwqW4Q=
-github.com/libp2p/go-nat v0.0.5/go.mod h1:B7NxsVNPZmRLvMOwiEO1scOSyjA56zxYAGv1yQgRkEU=
-github.com/libp2p/go-netroute v0.1.2/go.mod h1:jZLDV+1PE8y5XxBySEBgbuVAXbhtuHSdmLPL2n9MKbk=
-github.com/libp2p/go-netroute v0.1.3/go.mod h1:jZLDV+1PE8y5XxBySEBgbuVAXbhtuHSdmLPL2n9MKbk=
-github.com/libp2p/go-netroute v0.1.4 h1:47V0+hJfYaqj1WO0A+cDkRc9xr9qKiK7i8zaoGv8Mmo=
-github.com/libp2p/go-netroute v0.1.4/go.mod h1:jZLDV+1PE8y5XxBySEBgbuVAXbhtuHSdmLPL2n9MKbk=
-github.com/libp2p/go-openssl v0.0.2/go.mod h1:v8Zw2ijCSWBQi8Pq5GAixw6DbFfa9u6VIYDXnvOXkc0=
-github.com/libp2p/go-openssl v0.0.3/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
 github.com/libp2p/go-openssl v0.0.4/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
-github.com/libp2p/go-openssl v0.0.5/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
 github.com/libp2p/go-openssl v0.0.7 h1:eCAzdLejcNVBzP/iZM9vqHnQm+XyCEbSSIheIPRGNsw=
 github.com/libp2p/go-openssl v0.0.7/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
-github.com/libp2p/go-reuseport v0.0.1/go.mod h1:jn6RmB1ufnQwl0Q1f+YxAj8isJgDCQzaaxIFYDhcYEA=
-github.com/libp2p/go-reuseport v0.0.2 h1:XSG94b1FJfGA01BUrT82imejHQyTxO4jEWqheyCXYvU=
-github.com/libp2p/go-reuseport v0.0.2/go.mod h1:SPD+5RwGC7rcnzngoYC86GjPzjSywuQyMVAheVBD9nQ=
-github.com/libp2p/go-reuseport-transport v0.0.2/go.mod h1:YkbSDrvjUVDL6b8XqriyA20obEtsW9BLkuOUyQAOCbs=
-github.com/libp2p/go-reuseport-transport v0.0.3/go.mod h1:Spv+MPft1exxARzP2Sruj2Wb5JSyHNncjf1Oi2dEbzM=
-github.com/libp2p/go-reuseport-transport v0.0.4 h1:OZGz0RB620QDGpv300n1zaOcKGGAoGVf8h9txtt/1uM=
-github.com/libp2p/go-reuseport-transport v0.0.4/go.mod h1:trPa7r/7TJK/d+0hdBLOCGvpQQVOU74OXbNCIMkufGw=
-github.com/libp2p/go-sockaddr v0.0.2/go.mod h1:syPvOmNs24S3dFVGJA1/mrqdeijPxLV2Le3BRLKd68k=
-github.com/libp2p/go-sockaddr v0.1.0 h1:Y4s3/jNoryVRKEBrkJ576F17CPOaMIzUeCsg7dlTDj0=
-github.com/libp2p/go-sockaddr v0.1.0/go.mod h1:syPvOmNs24S3dFVGJA1/mrqdeijPxLV2Le3BRLKd68k=
-github.com/libp2p/go-stream-muxer v0.0.1/go.mod h1:bAo8x7YkSpadMTbtTaxGVHWUQsR/l5MEaHbKaliuT14=
-github.com/libp2p/go-stream-muxer-multistream v0.2.0/go.mod h1:j9eyPol/LLRqT+GPLSxvimPhNph4sfYfMoDPd7HkzIc=
-github.com/libp2p/go-stream-muxer-multistream v0.3.0 h1:TqnSHPJEIqDEO7h1wZZ0p3DXdvDSiLHQidKKUGZtiOY=
-github.com/libp2p/go-stream-muxer-multistream v0.3.0/go.mod h1:yDh8abSIzmZtqtOt64gFJUXEryejzNb0lisTt+fAMJA=
-github.com/libp2p/go-tcp-transport v0.1.0/go.mod h1:oJ8I5VXryj493DEJ7OsBieu8fcg2nHGctwtInJVpipc=
-github.com/libp2p/go-tcp-transport v0.1.1/go.mod h1:3HzGvLbx6etZjnFlERyakbaYPdfjg2pWP97dFZworkY=
-github.com/libp2p/go-tcp-transport v0.2.0/go.mod h1:vX2U0CnWimU4h0SGSEsg++AzvBcroCGYw28kh94oLe0=
-github.com/libp2p/go-tcp-transport v0.2.1 h1:ExZiVQV+h+qL16fzCWtd1HSzPsqWottJ8KXwWaVi8Ns=
-github.com/libp2p/go-tcp-transport v0.2.1/go.mod h1:zskiJ70MEfWz2MKxvFB/Pv+tPIB1PpPUrHIWQ8aFw7M=
-github.com/libp2p/go-ws-transport v0.2.0/go.mod h1:9BHJz/4Q5A9ludYWKoGCFC5gUElzlHoKzu0yY9p/klM=
-github.com/libp2p/go-ws-transport v0.3.0/go.mod h1:bpgTJmRZAvVHrgHybCVyqoBmyLQ1fiZuEaBYusP5zsk=
-github.com/libp2p/go-ws-transport v0.3.1/go.mod h1:bpgTJmRZAvVHrgHybCVyqoBmyLQ1fiZuEaBYusP5zsk=
-github.com/libp2p/go-ws-transport v0.4.0 h1:9tvtQ9xbws6cA5LvqdE6Ne3vcmGB4f1z9SByggk4s0k=
-github.com/libp2p/go-ws-transport v0.4.0/go.mod h1:EcIEKqf/7GDjth6ksuS/6p7R49V4CBY6/E7R/iyhYUA=
-github.com/libp2p/go-yamux v1.2.2/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow=
-github.com/libp2p/go-yamux v1.3.0/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow=
-github.com/libp2p/go-yamux v1.3.3/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow=
-github.com/libp2p/go-yamux v1.3.5/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow=
-github.com/libp2p/go-yamux v1.3.7/go.mod h1:fr7aVgmdNGJK+N1g+b6DW6VxzbRCjCOejR/hkmpooHE=
-github.com/libp2p/go-yamux v1.4.0/go.mod h1:fr7aVgmdNGJK+N1g+b6DW6VxzbRCjCOejR/hkmpooHE=
-github.com/libp2p/go-yamux v1.4.1/go.mod h1:fr7aVgmdNGJK+N1g+b6DW6VxzbRCjCOejR/hkmpooHE=
-github.com/libp2p/go-yamux/v2 v2.0.0 h1:vSGhAy5u6iHBq11ZDcyHH4Blcf9xlBhT4WQDoOE90LU=
-github.com/libp2p/go-yamux/v2 v2.0.0/go.mod h1:NVWira5+sVUIU6tu1JWvaRn1dRnG+cawOJiflsAM+7U=
 github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8=
 github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
@@ -1170,7 +918,6 @@ github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czP
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
-github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA=
 github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg=
 github.com/manyminds/api2go v0.0.0-20171030193247-e7b693844a6f h1:tVvGiZQFjOXP+9YyGqSA6jE55x1XVxmoPYudncxrZ8U=
@@ -1187,7 +934,6 @@ github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
@@ -1209,12 +955,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5
 github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg=
 github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k=
 github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8=
-github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
 github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
-github.com/miekg/dns v1.1.12/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
-github.com/miekg/dns v1.1.28/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
-github.com/miekg/dns v1.1.31/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
 github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM=
 github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 h1:QRUSJEgZn2Snx0EmT/QLXibWjSUDjKWvXIT19NBVp94=
 github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM=
@@ -1222,9 +964,6 @@ github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 h1:lYpkrQH5ajf0
 github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ=
 github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g=
 github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY=
-github.com/minio/sha256-simd v0.0.0-20190131020904-2d45a736cd16/go.mod h1:2FMWW+8GMoPweT6+pI63m9YE3Lmw4J71hV56Chs1E/U=
-github.com/minio/sha256-simd v0.0.0-20190328051042-05b4dd3047e5/go.mod h1:2FMWW+8GMoPweT6+pI63m9YE3Lmw4J71hV56Chs1E/U=
-github.com/minio/sha256-simd v0.1.0/go.mod h1:2FMWW+8GMoPweT6+pI63m9YE3Lmw4J71hV56Chs1E/U=
 github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
 github.com/minio/sha256-simd v0.1.1 h1:5QHSlgo3nt5yKOJrC7W8w7X+NFl8cMPZm96iu8kKUJU=
 github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
@@ -1260,7 +999,6 @@ github.com/mostynb/zstdpool-freelist v0.0.0-20201229113212-927304c0c3b1 h1:mPMvm
 github.com/mostynb/zstdpool-freelist v0.0.0-20201229113212-927304c0c3b1/go.mod h1:ye2e/VUEtE2BHE+G/QcKkcLQVAEJoYRFj5VUOQatCRE=
 github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ=
 github.com/mr-tron/base58 v1.1.0/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8=
-github.com/mr-tron/base58 v1.1.1/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8=
 github.com/mr-tron/base58 v1.1.2/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/mr-tron/base58 v1.1.3/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
@@ -1271,50 +1009,24 @@ github.com/multiformats/go-base32 v0.0.3 h1:tw5+NhuwaOjJCC5Pp82QuXbrmLzWg7uxlMFp
 github.com/multiformats/go-base32 v0.0.3/go.mod h1:pLiuGC8y0QR3Ue4Zug5UzK9LjgbkL8NSQj0zQ5Nz/AA=
 github.com/multiformats/go-base36 v0.1.0 h1:JR6TyF7JjGd3m6FbLU2cOxhC0Li8z8dLNGQ89tUg4F4=
 github.com/multiformats/go-base36 v0.1.0/go.mod h1:kFGE83c6s80PklsHO9sRn2NCoffoRdUUOENyW/Vv6sM=
-github.com/multiformats/go-multiaddr v0.0.1/go.mod h1:xKVEak1K9cS1VdmPZW3LSIb6lgmoS58qz/pzqmAxV44=
-github.com/multiformats/go-multiaddr v0.0.2/go.mod h1:xKVEak1K9cS1VdmPZW3LSIb6lgmoS58qz/pzqmAxV44=
-github.com/multiformats/go-multiaddr v0.0.4/go.mod h1:xKVEak1K9cS1VdmPZW3LSIb6lgmoS58qz/pzqmAxV44=
-github.com/multiformats/go-multiaddr v0.1.0/go.mod h1:xKVEak1K9cS1VdmPZW3LSIb6lgmoS58qz/pzqmAxV44=
 github.com/multiformats/go-multiaddr v0.1.1/go.mod h1:aMKBKNEYmzmDmxfX88/vz+J5IU55txyt0p4aiWVohjo=
-github.com/multiformats/go-multiaddr v0.2.0/go.mod h1:0nO36NvPpyV4QzvTLi/lafl2y95ncPj0vFwVF6k6wJ4=
 github.com/multiformats/go-multiaddr v0.2.1/go.mod h1:s/Apk6IyxfvMjDafnhJgJ3/46z7tZ04iMk5wP4QMGGE=
 github.com/multiformats/go-multiaddr v0.2.2/go.mod h1:NtfXiOtHvghW9KojvtySjH5y0u0xW5UouOmQQrn6a3Y=
 github.com/multiformats/go-multiaddr v0.3.0/go.mod h1:dF9kph9wfJ+3VLAaeBqo9Of8x4fJxp6ggJGteB8HQTI=
-github.com/multiformats/go-multiaddr v0.3.1/go.mod h1:uPbspcUPd5AfaP6ql3ujFY+QWzmBD8uLLL4bXW0XfGc=
 github.com/multiformats/go-multiaddr v0.3.3 h1:vo2OTSAqnENB2rLk79pLtr+uhj+VAzSe3uef5q0lRSs=
 github.com/multiformats/go-multiaddr v0.3.3/go.mod h1:lCKNGP1EQ1eZ35Za2wlqnabm9xQkib3fyB+nZXHLag0=
-github.com/multiformats/go-multiaddr-dns v0.0.1/go.mod h1:9kWcqw/Pj6FwxAwW38n/9403szc57zJPs45fmnznu3Q=
-github.com/multiformats/go-multiaddr-dns v0.0.2/go.mod h1:9kWcqw/Pj6FwxAwW38n/9403szc57zJPs45fmnznu3Q=
-github.com/multiformats/go-multiaddr-dns v0.2.0 h1:YWJoIDwLePniH7OU5hBnDZV6SWuvJqJ0YtN6pLeH9zA=
-github.com/multiformats/go-multiaddr-dns v0.2.0/go.mod h1:TJ5pr5bBO7Y1B18djPuRsVkduhQH2YqYSbxWJzYGdK0=
-github.com/multiformats/go-multiaddr-fmt v0.0.1/go.mod h1:aBYjqL4T/7j4Qx+R73XSv/8JsgnRFlf0w2KGLCmXl3Q=
 github.com/multiformats/go-multiaddr-fmt v0.1.0 h1:WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E=
 github.com/multiformats/go-multiaddr-fmt v0.1.0/go.mod h1:hGtDIW4PU4BqJ50gW2quDuPVjyWNZxToGUh/HwTZYJo=
-github.com/multiformats/go-multiaddr-net v0.0.1/go.mod h1:nw6HSxNmCIQH27XPGBuX+d1tnvM7ihcFwHMSstNAVUU=
-github.com/multiformats/go-multiaddr-net v0.1.0/go.mod h1:5JNbcfBOP4dnhoZOv10JJVkJO0pCCEf8mTnipAo2UZQ=
-github.com/multiformats/go-multiaddr-net v0.1.1/go.mod h1:5JNbcfBOP4dnhoZOv10JJVkJO0pCCEf8mTnipAo2UZQ=
-github.com/multiformats/go-multiaddr-net v0.1.2/go.mod h1:QsWt3XK/3hwvNxZJp92iMQKME1qHfpYmyIjFVsSOY6Y=
-github.com/multiformats/go-multiaddr-net v0.1.3/go.mod h1:ilNnaM9HbmVFqsb/qcNysjCu4PVONlrBZpHIrw/qQuA=
 github.com/multiformats/go-multiaddr-net v0.1.4/go.mod h1:ilNnaM9HbmVFqsb/qcNysjCu4PVONlrBZpHIrw/qQuA=
-github.com/multiformats/go-multiaddr-net v0.1.5/go.mod h1:ilNnaM9HbmVFqsb/qcNysjCu4PVONlrBZpHIrw/qQuA=
 github.com/multiformats/go-multiaddr-net v0.2.0 h1:MSXRGN0mFymt6B1yo/6BPnIRpLPEnKgQNvVfCX5VDJk=
 github.com/multiformats/go-multiaddr-net v0.2.0/go.mod h1:gGdH3UXny6U3cKKYCvpXI5rnK7YaOIEOPVDI9tsJbEA=
 github.com/multiformats/go-multibase v0.0.1/go.mod h1:bja2MqRZ3ggyXtZSEDKpl0uO/gviWFaSteVbWT51qgs=
 github.com/multiformats/go-multibase v0.0.3 h1:l/B6bJDQjvQ5G52jw4QGSYeOTZoAwIO77RblWplfIqk=
 github.com/multiformats/go-multibase v0.0.3/go.mod h1:5+1R4eQrT3PkYZ24C3W2Ue2tPwIdYQD509ZjSb5y9Oc=
-github.com/multiformats/go-multihash v0.0.1/go.mod h1:w/5tugSrLEbWqlcgJabL3oHFKTwfvkofsjW2Qa1ct4U=
-github.com/multiformats/go-multihash v0.0.5/go.mod h1:lt/HCbqlQwlPBz7lv0sQCdtfcMtlJvakRUn/0Ual8po=
 github.com/multiformats/go-multihash v0.0.8/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=
-github.com/multiformats/go-multihash v0.0.9/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=
-github.com/multiformats/go-multihash v0.0.10/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=
 github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
 github.com/multiformats/go-multihash v0.0.14 h1:QoBceQYQQtNUuf6s7wHxnE2c8bhbMqhfGzNI032se/I=
 github.com/multiformats/go-multihash v0.0.14/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
-github.com/multiformats/go-multistream v0.1.0/go.mod h1:fJTiDfXJVmItycydCnNx4+wSzZ5NwG2FEVAI30fiovg=
-github.com/multiformats/go-multistream v0.1.1/go.mod h1:KmHZ40hzVxiaiwlj3MEbYgK9JFk2/9UktWZAF54Du38=
-github.com/multiformats/go-multistream v0.2.0 h1:6AuNmQVKUkRnddw2YiDjt5Elit40SFxMJkVnhmETXtU=
-github.com/multiformats/go-multistream v0.2.0/go.mod h1:5GZPQZbkWOLOn3J2y4Y99vVW7vOfsAflxARk3x14o6k=
-github.com/multiformats/go-varint v0.0.1/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
 github.com/multiformats/go-varint v0.0.2/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
 github.com/multiformats/go-varint v0.0.5/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
 github.com/multiformats/go-varint v0.0.6 h1:gk85QWKxh3TazbLxED/NlDVv8+q+ReFJk7Y2W/KhfNY=
@@ -1338,9 +1050,7 @@ github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
@@ -1348,9 +1058,7 @@ github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042
 github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
 github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
-github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
@@ -1520,8 +1228,8 @@ github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306 h1:ko88
 github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306/go.mod h1:w1sAEES3g3PuV/RzUrgow20W2uErMly84hhD3um1WL4=
 github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f h1:hgJif132UCdjo8u43i7iPN1/MFnu49hv7lFGFftCHKU=
 github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f/go.mod h1:MvMXoufZAtqExNexqi4cjrNYE9MefKddKylxjS+//n0=
-github.com/smartcontractkit/libocr v0.0.0-20231107151413-13e0202ae8d7 h1:21V61XOYSxpFmFqlhr5IaEh1uQ1F6CewJ30D/U/P34c=
-github.com/smartcontractkit/libocr v0.0.0-20231107151413-13e0202ae8d7/go.mod h1:2lyRkw/qLQgUWlrWWmq5nj0y90rWeO6Y+v+fCakRgb0=
+github.com/smartcontractkit/libocr v0.0.0-20231130143053-c5102a9c0fb7 h1:AA7vf29c6lFsZm+MtIEtXtg6VUOQV6waJo5MUuHfRjQ=
+github.com/smartcontractkit/libocr v0.0.0-20231130143053-c5102a9c0fb7/go.mod h1:WcuWFMskcGK0MYZuH5hEhGJOzdJRUFeNEM4PAKlejI4=
 github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 h1:yiKnypAqP8l0OX0P3klzZ7SCcBUxy5KqTAKZmQOvSQE=
 github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1/go.mod h1:q6f4fe39oZPdsh1i57WznEZgxd8siidMaSFq3wdPmVg=
 github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1 h1:Dai1bn+Q5cpeGMQwRdjOdVjG8mmFFROVkSKuUgBErRQ=
@@ -1530,9 +1238,7 @@ github.com/smartcontractkit/wsrpc v0.7.2 h1:iBXzMeg7vc5YoezIQBq896y25BARw7OKbhrb
 github.com/smartcontractkit/wsrpc v0.7.2/go.mod h1:sj7QX2NQibhkhxTfs3KOhAj/5xwgqMipTvJVSssT9i0=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-github.com/smola/gocompat v0.2.0/go.mod h1:1B0MlxbmoZNo3h8guHp8HztB3BSYR5itql9qtVc0ypY=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
-github.com/spacemonkeygo/openssl v0.0.0-20181017203307-c2dcc5cca94a/go.mod h1:7AyxJNCJ7SBZ1MfVQCWD6Uqo2oubI2Eq2y2eqf+A5r0=
 github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 h1:RC6RW7j+1+HkWaX/Yh71Ee5ZHaHYt7ZP4sQgUrm6cDU=
 github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572/go.mod h1:w0SWMsp6j9O/dk4/ZpIhL+3CkG8ofA2vuv7k+ltqUMc=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
@@ -1559,7 +1265,6 @@ github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5q
 github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
 github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU=
 github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA=
-github.com/src-d/envconfig v1.0.0/go.mod h1:Q9YQZ7BKITldTBnoxsE5gOeB5y66RyPXeue/R4aaNBc=
 github.com/status-im/keycard-go v0.2.0 h1:QDLFswOQu1r5jsycloeQh3bVU8n/NatHHaZobtDnDzA=
 github.com/status-im/keycard-go v0.2.0/go.mod h1:wlp8ZLbsmrF6g6WjugPAx+IzoLrkdf9+mHxBEeo3Hbg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -1637,8 +1342,8 @@ github.com/unrolled/secure v1.13.0 h1:sdr3Phw2+f8Px8HE5sd1EHdj1aV3yUwed/uZXChLFs
 github.com/unrolled/secure v1.13.0/go.mod h1:BmF5hyM6tXczk3MpQkFf1hpKSRqCyhqcbiQtiAF7+40=
 github.com/urfave/cli v1.22.14 h1:ebbhrRiGK2i4naQJr+1Xj92HXZCrK7MsyTS/ob3HnAk=
 github.com/urfave/cli v1.22.14/go.mod h1:X0eDS6pD6Exaclxm99NJ3FiCDRED7vIHpx2mDOHLvkA=
-github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa h1:5SqCsI/2Qya2bCzK15ozrqo2sZxkh0FHynJZOTVoV6Q=
-github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa/go.mod h1:1CNUng3PtjQMtRzJO4FMXBQvkGtuYRxxiR9xMa7jMwI=
+github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs=
+github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
 github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w=
@@ -1649,15 +1354,8 @@ github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+
 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
 github.com/vertica/vertica-sql-go v1.3.3 h1:fL+FKEAEy5ONmsvya2WH5T8bhkvY27y/Ik3ReR2T+Qw=
 github.com/vertica/vertica-sql-go v1.3.3/go.mod h1:jnn2GFuv+O2Jcjktb7zyc4Utlbu9YVqpHH/lx63+1M4=
-github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 h1:EKhdznlJHPMoKr0XTrX+IlJs1LH3lyx2nfr1dOlZ79k=
 github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1/go.mod h1:8UvriyWtv5Q5EOgjHaSseUEdkQfvwFv1I/In/O2M9gc=
 github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc/go.mod h1:bopw91TMyo8J3tvftk8xmU2kPmlrt4nScJQZU2hE5EM=
-github.com/whyrusleeping/go-logging v0.0.1/go.mod h1:lDPYj54zutzG1XYfHAhcc7oNXEburHQBn+Iqd4yS4vE=
-github.com/whyrusleeping/mafmt v1.2.8/go.mod h1:faQJFPbLSxzD9xpA02ttW/tS9vZykNvXwGvqIpk20FA=
-github.com/whyrusleeping/mdns v0.0.0-20190826153040-b9b60ed33aa9/go.mod h1:j4l84WPFclQPj320J9gp0XwNKBb3U0zt5CBqjPp22G4=
-github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7 h1:E9S12nwJwEOXe2d6gT6qxdvqMnNq+VnSsKPgm2ZZNds=
-github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7/go.mod h1:X2c0RVCI1eSUFI8eLcY3c0423ykwiUdxLJtkDvruhjI=
-github.com/x-cray/logrus-prefixed-formatter v0.5.2/go.mod h1:2duySbKsL6M18s5GU7VPsoEPHyzalCE06qoARUCeBBE=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
@@ -1755,7 +1453,6 @@ go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
 go.uber.org/zap v1.14.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
 go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
-go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
 go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ=
 go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
 go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
@@ -1767,26 +1464,18 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190225124518-7f87c0fbb88b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
-golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190618222545-ea8f1a30c443/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200602180216-279210d13fed/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
@@ -1847,7 +1536,6 @@ golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1883,7 +1571,6 @@ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
@@ -1942,17 +1629,13 @@ golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190124100055-b90733256f2e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190219092855-153ac476189d/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190526052359-791d8a0f4d09/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -1961,7 +1644,6 @@ golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -1981,7 +1663,6 @@ golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -2054,7 +1735,6 @@ golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181130052023-1c3d964395ce/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -2230,7 +1910,6 @@ google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
-google.golang.org/grpc v1.28.1/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
 google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
@@ -2286,8 +1965,6 @@ gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24
 gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU=
 gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
-gopkg.in/src-d/go-cli.v0 v0.0.0-20181105080154-d492247bbc0d/go.mod h1:z+K8VcOYVYcSwSjGebuDL6176A1XskgbtNl64NSg+n8=
-gopkg.in/src-d/go-log.v1 v1.0.1/go.mod h1:GN34hKP0g305ysm2/hctJ0Y8nWP3zxXXJ8GFabTyABE=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/urfave/cli.v1 v1.20.0 h1:NdAVW6RYxDif9DhDHaAortIu956m2c0v+09AZBPTbE0=
diff --git a/core/services/chainlink/config.go b/core/services/chainlink/config.go
index 5d8b1019e8c..b2f60384ec8 100644
--- a/core/services/chainlink/config.go
+++ b/core/services/chainlink/config.go
@@ -76,42 +76,7 @@ func (c *Config) valueWarnings() (err error) {
 // deprecationWarnings returns an error if the Config contains deprecated fields.
 // This is typically used before defaults have been applied, with input from the user.
 func (c *Config) deprecationWarnings() (err error) {
-	if c.P2P.V1 != (toml.P2PV1{}) {
-		err = multierr.Append(err, config.ErrDeprecated{Name: "P2P.V1"})
-		var err2 error
-		if c.P2P.V1.AnnounceIP != nil {
-			err2 = multierr.Append(err2, config.ErrDeprecated{Name: "AnnounceIP"})
-		}
-		if c.P2P.V1.AnnouncePort != nil {
-			err2 = multierr.Append(err2, config.ErrDeprecated{Name: "AnnouncePort"})
-		}
-		if c.P2P.V1.BootstrapCheckInterval != nil {
-			err2 = multierr.Append(err2, config.ErrDeprecated{Name: "BootstrapCheckInterval"})
-		}
-		if c.P2P.V1.DefaultBootstrapPeers != nil {
-			err2 = multierr.Append(err2, config.ErrDeprecated{Name: "DefaultBootstrapPeers"})
-		}
-		if c.P2P.V1.DHTAnnouncementCounterUserPrefix != nil {
-			err2 = multierr.Append(err2, config.ErrDeprecated{Name: "DHTAnnouncementCounterUserPrefix"})
-		}
-		if c.P2P.V1.DHTLookupInterval != nil {
-			err2 = multierr.Append(err2, config.ErrDeprecated{Name: "DHTLookupInterval"})
-		}
-		if c.P2P.V1.ListenIP != nil {
-			err2 = multierr.Append(err2, config.ErrDeprecated{Name: "ListenIP"})
-		}
-		if c.P2P.V1.ListenPort != nil {
-			err2 = multierr.Append(err2, config.ErrDeprecated{Name: "ListenPort"})
-		}
-		if c.P2P.V1.NewStreamTimeout != nil {
-			err2 = multierr.Append(err2, config.ErrDeprecated{Name: "NewStreamTimeout"})
-		}
-		if c.P2P.V1.PeerstoreWriteInterval != nil {
-			err2 = multierr.Append(err2, config.ErrDeprecated{Name: "PeerstoreWriteInterval"})
-		}
-		err2 = config.NamedMultiErrorList(err2, "P2P.V1")
-		err = multierr.Append(err, err2)
-	}
+	// none
 	return
 }
 
diff --git a/core/services/chainlink/config_general.go b/core/services/chainlink/config_general.go
index c7d9cc6ce5d..5df2b177bdd 100644
--- a/core/services/chainlink/config_general.go
+++ b/core/services/chainlink/config_general.go
@@ -13,8 +13,6 @@ import (
 	"go.uber.org/multierr"
 	"go.uber.org/zap/zapcore"
 
-	ocrnetworking "github.com/smartcontractkit/libocr/networking"
-
 	coscfg "github.com/smartcontractkit/chainlink-cosmos/pkg/cosmos/config"
 	"github.com/smartcontractkit/chainlink-solana/pkg/solana"
 	starknet "github.com/smartcontractkit/chainlink-starknet/relayer/pkg/chainlink/config"
@@ -443,14 +441,6 @@ func (g *generalConfig) P2P() config.P2P {
 	return &p2p{c: g.c.P2P}
 }
 
-func (g *generalConfig) P2PNetworkingStack() (n ocrnetworking.NetworkingStack) {
-	return g.c.P2P.NetworkStack()
-}
-
-func (g *generalConfig) P2PNetworkingStackRaw() string {
-	return g.c.P2P.NetworkStack().String()
-}
-
 func (g *generalConfig) P2PPeerID() p2pkey.PeerID {
 	return *g.c.P2P.PeerID
 }
diff --git a/core/services/chainlink/config_p2p.go b/core/services/chainlink/config_p2p.go
index 35b80cc5f79..596a4fe0cae 100644
--- a/core/services/chainlink/config_p2p.go
+++ b/core/services/chainlink/config_p2p.go
@@ -1,11 +1,7 @@
 package chainlink
 
 import (
-	"net"
-	"time"
-
 	"github.com/smartcontractkit/libocr/commontypes"
-	ocrnetworking "github.com/smartcontractkit/libocr/networking"
 
 	"github.com/smartcontractkit/chainlink/v2/core/config"
 	"github.com/smartcontractkit/chainlink/v2/core/config/toml"
@@ -18,11 +14,7 @@ type p2p struct {
 }
 
 func (p *p2p) Enabled() bool {
-	return p.V1().Enabled() || p.V2().Enabled()
-}
-
-func (p *p2p) NetworkStack() (n ocrnetworking.NetworkingStack) {
-	return p.c.NetworkStack()
+	return p.V2().Enabled()
 }
 
 func (p *p2p) PeerID() p2pkey.PeerID {
@@ -45,63 +37,6 @@ func (p *p2p) V2() config.V2 {
 	return &p2pv2{p.c.V2}
 }
 
-func (p *p2p) V1() config.V1 {
-	return &p2pv1{p.c.V1}
-}
-
-type p2pv1 struct {
-	c toml.P2PV1
-}
-
-func (v *p2pv1) Enabled() bool {
-	return *v.c.Enabled
-}
-
-func (v *p2pv1) AnnounceIP() net.IP {
-	return *v.c.AnnounceIP
-}
-
-func (v *p2pv1) AnnouncePort() uint16 {
-	return *v.c.AnnouncePort
-}
-
-func (v *p2pv1) DefaultBootstrapPeers() ([]string, error) {
-	p := *v.c.DefaultBootstrapPeers
-	if p == nil {
-		p = []string{}
-	}
-	return p, nil
-}
-
-func (v *p2pv1) DHTAnnouncementCounterUserPrefix() uint32 {
-	return *v.c.DHTAnnouncementCounterUserPrefix
-}
-
-func (v *p2pv1) ListenIP() net.IP {
-	return *v.c.ListenIP
-}
-
-func (v *p2pv1) ListenPort() uint16 {
-	p := *v.c.ListenPort
-	return p
-}
-
-func (v *p2pv1) NewStreamTimeout() time.Duration {
-	return v.c.NewStreamTimeout.Duration()
-}
-
-func (v *p2pv1) BootstrapCheckInterval() time.Duration {
-	return v.c.BootstrapCheckInterval.Duration()
-}
-
-func (v *p2pv1) DHTLookupInterval() int {
-	return int(*v.c.DHTLookupInterval)
-}
-
-func (v *p2pv1) PeerstoreWriteInterval() time.Duration {
-	return v.c.PeerstoreWriteInterval.Duration()
-}
-
 type p2pv2 struct {
 	c toml.P2PV2
 }
diff --git a/core/services/chainlink/config_p2p_test.go b/core/services/chainlink/config_p2p_test.go
index 21ce8f17e48..c23f3296ef8 100644
--- a/core/services/chainlink/config_p2p_test.go
+++ b/core/services/chainlink/config_p2p_test.go
@@ -23,21 +23,6 @@ func TestP2PConfig(t *testing.T) {
 	assert.Equal(t, 17, p2p.OutgoingMessageBufferSize())
 	assert.True(t, p2p.TraceLogging())
 
-	v1 := p2p.V1()
-	assert.True(t, v1.Enabled())
-	assert.Equal(t, "1.2.3.4", v1.AnnounceIP().String())
-	assert.Equal(t, uint16(1234), v1.AnnouncePort())
-	assert.Equal(t, time.Minute, v1.BootstrapCheckInterval())
-	p, err := v1.DefaultBootstrapPeers()
-	require.NoError(t, err)
-	assert.Equal(t, []string{"foo", "bar", "should", "these", "be", "typed"}, p)
-	assert.Equal(t, uint32(4321), v1.DHTAnnouncementCounterUserPrefix())
-	assert.Equal(t, 9, v1.DHTLookupInterval())
-	assert.Equal(t, "4.3.2.1", v1.ListenIP().String())
-	assert.Equal(t, uint16(9), v1.ListenPort())
-	assert.Equal(t, time.Second, v1.NewStreamTimeout())
-	assert.Equal(t, time.Minute, v1.PeerstoreWriteInterval())
-
 	v2 := p2p.V2()
 	assert.False(t, v2.Enabled())
 	assert.Equal(t, []string{"a", "b", "c"}, v2.AnnounceAddresses())
diff --git a/core/services/chainlink/config_test.go b/core/services/chainlink/config_test.go
index 2966a896902..6453fe05e00 100644
--- a/core/services/chainlink/config_test.go
+++ b/core/services/chainlink/config_test.go
@@ -410,19 +410,6 @@ func TestConfig_Marshal(t *testing.T) {
 		OutgoingMessageBufferSize: ptr[int64](17),
 		PeerID:                    mustPeerID("12D3KooWMoejJznyDuEk5aX6GvbjaG12UzeornPCBNzMRqdwrFJw"),
 		TraceLogging:              ptr(true),
-		V1: toml.P2PV1{
-			Enabled:                          ptr(true),
-			AnnounceIP:                       mustIP("1.2.3.4"),
-			AnnouncePort:                     ptr[uint16](1234),
-			BootstrapCheckInterval:           models.MustNewDuration(time.Minute),
-			DefaultBootstrapPeers:            &[]string{"foo", "bar", "should", "these", "be", "typed"},
-			DHTAnnouncementCounterUserPrefix: ptr[uint32](4321),
-			DHTLookupInterval:                ptr[int64](9),
-			ListenIP:                         mustIP("4.3.2.1"),
-			ListenPort:                       ptr[uint16](9),
-			NewStreamTimeout:                 models.MustNewDuration(time.Second),
-			PeerstoreWriteInterval:           models.MustNewDuration(time.Minute),
-		},
 		V2: toml.P2PV2{
 			Enabled:           ptr(false),
 			AnnounceAddresses: &[]string{"a", "b", "c"},
@@ -872,19 +859,6 @@ OutgoingMessageBufferSize = 17
 PeerID = '12D3KooWMoejJznyDuEk5aX6GvbjaG12UzeornPCBNzMRqdwrFJw'
 TraceLogging = true
 
-[P2P.V1]
-Enabled = true
-AnnounceIP = '1.2.3.4'
-AnnouncePort = 1234
-BootstrapCheckInterval = '1m0s'
-DefaultBootstrapPeers = ['foo', 'bar', 'should', 'these', 'be', 'typed']
-DHTAnnouncementCounterUserPrefix = 4321
-DHTLookupInterval = 9
-ListenIP = '4.3.2.1'
-ListenPort = 9
-NewStreamTimeout = '1s'
-PeerstoreWriteInterval = '1m0s'
-
 [P2P.V2]
 Enabled = false
 AnnounceAddresses = ['a', 'b', 'c']
@@ -1320,19 +1294,7 @@ func Test_generalConfig_LogConfiguration(t *testing.T) {
 		effective = "# Effective Configuration, with defaults applied:\n"
 		warning   = "# Configuration warning:\n"
 
-		deprecated = `2 errors:
-	- P2P.V1: is deprecated and will be removed in a future version
-	- P2P.V1: 10 errors:
-		- AnnounceIP: is deprecated and will be removed in a future version
-		- AnnouncePort: is deprecated and will be removed in a future version
-		- BootstrapCheckInterval: is deprecated and will be removed in a future version
-		- DefaultBootstrapPeers: is deprecated and will be removed in a future version
-		- DHTAnnouncementCounterUserPrefix: is deprecated and will be removed in a future version
-		- DHTLookupInterval: is deprecated and will be removed in a future version
-		- ListenIP: is deprecated and will be removed in a future version
-		- ListenPort: is deprecated and will be removed in a future version
-		- NewStreamTimeout: is deprecated and will be removed in a future version
-		- PeerstoreWriteInterval: is deprecated and will be removed in a future version`
+		deprecated = `` // none
 	)
 	tests := []struct {
 		name         string
@@ -1558,7 +1520,7 @@ func TestConfig_SetFrom(t *testing.T) {
 	}
 }
 
-func TestConfig_Warnings(t *testing.T) {
+func TestConfig_warnings(t *testing.T) {
 	tests := []struct {
 		name           string
 		config         Config
@@ -1582,42 +1544,6 @@ func TestConfig_Warnings(t *testing.T) {
 			},
 			expectedErrors: []string{"Tracing.TLSCertPath: invalid value (/path/to/cert.pem): must be empty when Tracing.Mode is 'unencrypted'"},
 		},
-		{
-			name: "Deprecation warning - P2P.V1 fields set",
-			config: Config{
-				Core: toml.Core{
-					P2P: toml.P2P{
-						V1: toml.P2PV1{
-							Enabled: ptr(true),
-						},
-					},
-				},
-			},
-			expectedErrors: []string{
-				"P2P.V1: is deprecated and will be removed in a future version",
-			},
-		},
-		{
-			name: "Value warning and deprecation warning",
-			config: Config{
-				Core: toml.Core{
-					P2P: toml.P2P{
-						V1: toml.P2PV1{
-							Enabled: ptr(true),
-						},
-					},
-					Tracing: toml.Tracing{
-						Enabled:     ptr(true),
-						Mode:        ptr("unencrypted"),
-						TLSCertPath: ptr("/path/to/cert.pem"),
-					},
-				},
-			},
-			expectedErrors: []string{
-				"Tracing.TLSCertPath: invalid value (/path/to/cert.pem): must be empty when Tracing.Mode is 'unencrypted'",
-				"P2P.V1: is deprecated and will be removed in a future version",
-			},
-		},
 	}
 
 	for _, tt := range tests {
diff --git a/core/services/chainlink/testdata/config-empty-effective.toml b/core/services/chainlink/testdata/config-empty-effective.toml
index 2531e7c281d..9efad05c03a 100644
--- a/core/services/chainlink/testdata/config-empty-effective.toml
+++ b/core/services/chainlink/testdata/config-empty-effective.toml
@@ -161,19 +161,6 @@ OutgoingMessageBufferSize = 10
 PeerID = ''
 TraceLogging = false
 
-[P2P.V1]
-Enabled = false
-AnnounceIP = ''
-AnnouncePort = 0
-BootstrapCheckInterval = '20s'
-DefaultBootstrapPeers = []
-DHTAnnouncementCounterUserPrefix = 0
-DHTLookupInterval = 10
-ListenIP = '0.0.0.0'
-ListenPort = 0
-NewStreamTimeout = '10s'
-PeerstoreWriteInterval = '5m0s'
-
 [P2P.V2]
 Enabled = true
 AnnounceAddresses = []
diff --git a/core/services/chainlink/testdata/config-full.toml b/core/services/chainlink/testdata/config-full.toml
index 46d9dc2c239..c6387e4ef67 100644
--- a/core/services/chainlink/testdata/config-full.toml
+++ b/core/services/chainlink/testdata/config-full.toml
@@ -167,19 +167,6 @@ OutgoingMessageBufferSize = 17
 PeerID = '12D3KooWMoejJznyDuEk5aX6GvbjaG12UzeornPCBNzMRqdwrFJw'
 TraceLogging = true
 
-[P2P.V1]
-Enabled = true
-AnnounceIP = '1.2.3.4'
-AnnouncePort = 1234
-BootstrapCheckInterval = '1m0s'
-DefaultBootstrapPeers = ['foo', 'bar', 'should', 'these', 'be', 'typed']
-DHTAnnouncementCounterUserPrefix = 4321
-DHTLookupInterval = 9
-ListenIP = '4.3.2.1'
-ListenPort = 9
-NewStreamTimeout = '1s'
-PeerstoreWriteInterval = '1m0s'
-
 [P2P.V2]
 Enabled = false
 AnnounceAddresses = ['a', 'b', 'c']
diff --git a/core/services/chainlink/testdata/config-multi-chain-effective.toml b/core/services/chainlink/testdata/config-multi-chain-effective.toml
index 74d83035cd5..40c18f28eb9 100644
--- a/core/services/chainlink/testdata/config-multi-chain-effective.toml
+++ b/core/services/chainlink/testdata/config-multi-chain-effective.toml
@@ -161,19 +161,6 @@ OutgoingMessageBufferSize = 10
 PeerID = ''
 TraceLogging = false
 
-[P2P.V1]
-Enabled = false
-AnnounceIP = ''
-AnnouncePort = 0
-BootstrapCheckInterval = '20s'
-DefaultBootstrapPeers = []
-DHTAnnouncementCounterUserPrefix = 0
-DHTLookupInterval = 10
-ListenIP = '0.0.0.0'
-ListenPort = 0
-NewStreamTimeout = '10s'
-PeerstoreWriteInterval = '5m0s'
-
 [P2P.V2]
 Enabled = true
 AnnounceAddresses = []
diff --git a/core/services/feeds/service_test.go b/core/services/feeds/service_test.go
index d811a4461fd..271321a1169 100644
--- a/core/services/feeds/service_test.go
+++ b/core/services/feeds/service_test.go
@@ -75,10 +75,7 @@ name              = "%s"
 externalJobID       = "%s"
 evmChainID 		   = 0
 contractAddress    = "0x613a38AC1659769640aaE063C651F48E0250454C"
-p2pBootstrapPeers  = [
-	"/dns4/chain.link/tcp/1234/p2p/16Uiu2HAm58SP7UL8zsnpeuwHfytLocaqgnyaYKP8wu7qRdrixLju",
-]
-p2pv2Bootstrappers = []
+p2pv2Bootstrappers = ["12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001"]
 keyBundleID        = "f5bf259689b26f1374efb3c9a9868796953a0f814bb2d39b968d0e61b58620a5"
 transmitterAddress = "0x613a38AC1659769640aaE063C651F48E0250454C"
 isBootstrapPeer		= false
diff --git a/core/services/job/helpers_test.go b/core/services/job/helpers_test.go
index 4151ed401c8..a7543753d63 100644
--- a/core/services/job/helpers_test.go
+++ b/core/services/job/helpers_test.go
@@ -36,10 +36,7 @@ type               = "offchainreporting"
 schemaVersion      = 1
 contractAddress    = "%s"
 evmChainID		   = "0"
-p2pBootstrapPeers  = [
-    "/dns4/chain.link/tcp/1234/p2p/16Uiu2HAm58SP7UL8zsnpeuwHfytLocaqgnyaYKP8wu7qRdrixLju",
-]
-p2pv2Bootstrappers = []
+p2pv2Bootstrappers = ["12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001"]
 isBootstrapPeer    = false
 keyBundleID        = "%s"
 monitoringEndpoint = "chain.link:4321"
@@ -108,7 +105,7 @@ ds1 -> ds1_parse -> ds1_multiply;
 		type               = "offchainreporting"
 		schemaVersion      = 1
 		contractAddress    = "%s"
-		p2pBootstrapPeers  = ["/dns4/chain.link/tcp/1234/p2p/16Uiu2HAm58SP7UL8zsnpeuwHfytLocaqgnyaYKP8wu7qRdrixLju"]
+		p2pv2Bootstrappers = ["12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001"]
 		isBootstrapPeer    = false
 		transmitterAddress = "%s"
 		keyBundleID = "%s"
@@ -125,7 +122,6 @@ ds1 -> ds1_parse;
 		schemaVersion      = 1
 		contractAddress    = "%s"
 		evmChainID		   = "0"
-		p2pBootstrapPeers  = []
 		isBootstrapPeer    = true
 `
 	ocrJobSpecText = `
@@ -134,10 +130,7 @@ schemaVersion      = 1
 contractAddress    = "%s"
 evmChainID		   = "0"
 p2pPeerID          = "%s"
-p2pBootstrapPeers  = [
-    "/dns4/chain.link/tcp/1234/p2p/16Uiu2HAm58SP7UL8zsnpeuwHfytLocaqgnyaYKP8wu7qRdrixLju",
-]
-p2pv2Bootstrappers = []
+p2pv2Bootstrappers = ["12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001"]
 isBootstrapPeer    = false
 keyBundleID        = "%s"
 monitoringEndpoint = "chain.link:4321"
@@ -194,7 +187,7 @@ func makeOCRJobSpec(t *testing.T, transmitterAddress common.Address, b1, b2 stri
 func compareOCRJobSpecs(t *testing.T, expected, actual job.Job) {
 	require.NotNil(t, expected.OCROracleSpec)
 	require.Equal(t, expected.OCROracleSpec.ContractAddress, actual.OCROracleSpec.ContractAddress)
-	require.Equal(t, expected.OCROracleSpec.P2PBootstrapPeers, actual.OCROracleSpec.P2PBootstrapPeers)
+	require.Equal(t, expected.OCROracleSpec.P2PV2Bootstrappers, actual.OCROracleSpec.P2PV2Bootstrappers)
 	require.Equal(t, expected.OCROracleSpec.IsBootstrapPeer, actual.OCROracleSpec.IsBootstrapPeer)
 	require.Equal(t, expected.OCROracleSpec.EncryptedOCRKeyBundleID, actual.OCROracleSpec.EncryptedOCRKeyBundleID)
 	require.Equal(t, expected.OCROracleSpec.TransmitterAddress, actual.OCROracleSpec.TransmitterAddress)
@@ -207,7 +200,6 @@ func compareOCRJobSpecs(t *testing.T, expected, actual job.Job) {
 
 func makeMinimalHTTPOracleSpec(t *testing.T, db *sqlx.DB, cfg chainlink.GeneralConfig, contractAddress, transmitterAddress, keyBundle, fetchUrl, timeout string) *job.Job {
 	var ocrSpec = job.OCROracleSpec{
-		P2PBootstrapPeers:                      pq.StringArray{},
 		P2PV2Bootstrappers:                     pq.StringArray{},
 		ObservationTimeout:                     models.Interval(10 * time.Second),
 		BlockchainTimeout:                      models.Interval(20 * time.Second),
diff --git a/core/services/job/models.go b/core/services/job/models.go
index 05dcab831f1..18a0cb79e2a 100644
--- a/core/services/job/models.go
+++ b/core/services/job/models.go
@@ -237,7 +237,6 @@ func (pr *PipelineRun) SetID(value string) error {
 type OCROracleSpec struct {
 	ID                                     int32                `toml:"-"`
 	ContractAddress                        ethkey.EIP55Address  `toml:"contractAddress"`
-	P2PBootstrapPeers                      pq.StringArray       `toml:"p2pBootstrapPeers" db:"p2p_bootstrap_peers"`
 	P2PV2Bootstrappers                     pq.StringArray       `toml:"p2pv2Bootstrappers" db:"p2pv2_bootstrappers"`
 	IsBootstrapPeer                        bool                 `toml:"isBootstrapPeer"`
 	EncryptedOCRKeyBundleID                *models.Sha256Hash   `toml:"keyBundleID"`
diff --git a/core/services/job/orm.go b/core/services/job/orm.go
index c5f533c3d20..482d3d851e4 100644
--- a/core/services/job/orm.go
+++ b/core/services/job/orm.go
@@ -212,10 +212,10 @@ func (o *orm) CreateJob(jb *Job, qopts ...pg.QOpt) error {
 				return errors.Errorf("a job with contract address %s already exists for chain ID %s", jb.OCROracleSpec.ContractAddress, newChainID)
 			}
 
-			sql := `INSERT INTO ocr_oracle_specs (contract_address, p2p_bootstrap_peers, p2pv2_bootstrappers, is_bootstrap_peer, encrypted_ocr_key_bundle_id, transmitter_address,
+			sql := `INSERT INTO ocr_oracle_specs (contract_address, p2pv2_bootstrappers, is_bootstrap_peer, encrypted_ocr_key_bundle_id, transmitter_address,
 					observation_timeout, blockchain_timeout, contract_config_tracker_subscribe_interval, contract_config_tracker_poll_interval, contract_config_confirmations, evm_chain_id,
 					created_at, updated_at, database_timeout, observation_grace_period, contract_transmitter_transmit_timeout)
-			VALUES (:contract_address, :p2p_bootstrap_peers, :p2pv2_bootstrappers, :is_bootstrap_peer, :encrypted_ocr_key_bundle_id, :transmitter_address,
+			VALUES (:contract_address, :p2pv2_bootstrappers, :is_bootstrap_peer, :encrypted_ocr_key_bundle_id, :transmitter_address,
 					:observation_timeout, :blockchain_timeout, :contract_config_tracker_subscribe_interval, :contract_config_tracker_poll_interval, :contract_config_confirmations, :evm_chain_id,
 					NOW(), NOW(), :database_timeout, :observation_grace_period, :contract_transmitter_transmit_timeout)
 			RETURNING id;`
diff --git a/core/services/job/runner_integration_test.go b/core/services/job/runner_integration_test.go
index eb6af3607f3..ef0458312bc 100644
--- a/core/services/job/runner_integration_test.go
+++ b/core/services/job/runner_integration_test.go
@@ -14,6 +14,7 @@ import (
 	"time"
 
 	"github.com/google/uuid"
+	"github.com/hashicorp/consul/sdk/freeport"
 	"github.com/pelletier/go-toml"
 	"github.com/pkg/errors"
 	"github.com/shopspring/decimal"
@@ -58,11 +59,8 @@ func TestRunner(t *testing.T) {
 	require.NoError(t, keyStore.OCR().Add(cltest.DefaultOCRKey))
 
 	config := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
-		c.P2P.V1.Enabled = ptr(true)
-		c.P2P.V1.DefaultBootstrapPeers = &[]string{
-			"/dns4/chain.link/tcp/1234/p2p/16Uiu2HAm58SP7UL8zsnpeuwHfytLocaqgnyaYKP8wu7qRdrixLju",
-			"/dns4/chain.link/tcp/1235/p2p/16Uiu2HAm58SP7UL8zsnpeuwHfytLocaqgnyaYKP8wu7qRdrixLju",
-		}
+		c.P2P.V2.Enabled = ptr(true)
+		c.P2P.V2.ListenAddresses = &[]string{fmt.Sprintf("127.0.0.1:%d", freeport.GetOne(t))}
 		kb, err := keyStore.OCR().Create()
 		require.NoError(t, err)
 		kbid := models.MustSha256HashFromHex(kb.ID())
@@ -78,7 +76,10 @@ func TestRunner(t *testing.T) {
 	ethClient.On("HeadByNumber", mock.Anything, (*big.Int)(nil)).Return(cltest.Head(10), nil)
 	ethClient.On("CallContract", mock.Anything, mock.Anything, mock.Anything).Maybe().Return(nil, nil)
 
+	ctx := testutils.Context(t)
 	pipelineORM := pipeline.NewORM(db, logger.TestLogger(t), config.Database(), config.JobPipeline().MaxSuccessfulRuns())
+	require.NoError(t, pipelineORM.Start(ctx))
+	t.Cleanup(func() { assert.NoError(t, pipelineORM.Close()) })
 	btORM := bridges.NewORM(db, logger.TestLogger(t), config.Database())
 	relayExtenders := evmtest.NewChainRelayExtenders(t, evmtest.TestChainOpts{DB: db, Client: ethClient, GeneralConfig: config, KeyStore: ethKeyStore})
 	legacyChains := evmrelay.NewLegacyChainsFromRelayerExtenders(relayExtenders)
@@ -86,10 +87,11 @@ func TestRunner(t *testing.T) {
 
 	runner := pipeline.NewRunner(pipelineORM, btORM, config.JobPipeline(), config.WebServer(), legacyChains, nil, nil, logger.TestLogger(t), c, c)
 	jobORM := NewTestORM(t, db, pipelineORM, btORM, keyStore, config.Database())
+	t.Cleanup(func() { assert.NoError(t, jobORM.Close()) })
 
 	_, placeHolderAddress := cltest.MustInsertRandomKey(t, keyStore.Eth())
 
-	require.NoError(t, runner.Start(testutils.Context(t)))
+	require.NoError(t, runner.Start(ctx))
 	t.Cleanup(func() { assert.NoError(t, runner.Close()) })
 
 	t.Run("gets the election result winner", func(t *testing.T) {
@@ -545,7 +547,8 @@ answer1      [type=median index=0];
 		for _, tc := range testCases {
 
 			config = configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
-				c.P2P.V1.Enabled = ptr(true)
+				c.P2P.V2.Enabled = ptr(true)
+				c.P2P.V2.ListenAddresses = &[]string{fmt.Sprintf("127.0.0.1:%d", freeport.GetOne(t))}
 				c.OCR.CaptureEATelemetry = ptr(tc.specCaptureEATelemetry)
 			})
 
diff --git a/core/services/ocr/delegate.go b/core/services/ocr/delegate.go
index f473c93b1f0..d3d133e7121 100644
--- a/core/services/ocr/delegate.go
+++ b/core/services/ocr/delegate.go
@@ -14,7 +14,6 @@ import (
 	commonlogger "github.com/smartcontractkit/chainlink-common/pkg/logger"
 
 	"github.com/smartcontractkit/libocr/gethwrappers/offchainaggregator"
-	ocrnetworking "github.com/smartcontractkit/libocr/networking"
 	ocr "github.com/smartcontractkit/libocr/offchainreporting"
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting/types"
 
@@ -146,16 +145,6 @@ func (d *Delegate) ServicesForSpec(jb job.Job) (services []job.ServiceCtx, err e
 		return nil, errors.New("peerWrapper is not started. OCR jobs require a started and running p2p peer")
 	}
 
-	var v1BootstrapPeers []string
-	if concreteSpec.P2PBootstrapPeers != nil {
-		v1BootstrapPeers = concreteSpec.P2PBootstrapPeers
-	} else {
-		v1BootstrapPeers, err = chain.Config().P2P().V1().DefaultBootstrapPeers()
-		if err != nil {
-			return nil, err
-		}
-	}
-
 	v2Bootstrappers, err := ocrcommon.ParseBootstrapPeers(concreteSpec.P2PV2Bootstrappers)
 	if err != nil {
 		return nil, err
@@ -181,7 +170,6 @@ func (d *Delegate) ServicesForSpec(jb job.Job) (services []job.ServiceCtx, err e
 		var bootstrapper *ocr.BootstrapNode
 		bootstrapper, err = ocr.NewBootstrapNode(ocr.BootstrapNodeArgs{
 			BootstrapperFactory:   peerWrapper.Peer1,
-			V1Bootstrappers:       v1BootstrapPeers,
 			V2Bootstrappers:       v2Bootstrappers,
 			ContractConfigTracker: tracker,
 			Database:              ocrDB,
@@ -194,20 +182,9 @@ func (d *Delegate) ServicesForSpec(jb job.Job) (services []job.ServiceCtx, err e
 		bootstrapperCtx := job.NewServiceAdapter(bootstrapper)
 		services = append(services, bootstrapperCtx)
 	} else {
-		// In V1 or V1V2 mode, p2pv1BootstrapPeers must be defined either in
-		//   node config or in job spec
-		if peerWrapper.P2PConfig().NetworkStack() != ocrnetworking.NetworkingStackV2 {
-			if len(v1BootstrapPeers) < 1 {
-				return nil, errors.New("Need at least one v1 bootstrap peer defined")
-			}
-		}
-
-		// In V1V2 or V2 mode, p2pv2Bootstrappers must be defined either in
-		//   node config or in job spec
-		if peerWrapper.P2PConfig().NetworkStack() != ocrnetworking.NetworkingStackV1 {
-			if len(v2Bootstrappers) < 1 {
-				return nil, errors.New("Need at least one v2 bootstrap peer defined")
-			}
+		// p2pv2Bootstrappers must be defined either in node config or in job spec
+		if len(v2Bootstrappers) < 1 {
+			return nil, errors.New("Need at least one v2 bootstrap peer defined")
 		}
 
 		ocrkey, err := d.keyStore.OCR().Get(concreteSpec.EncryptedOCRKeyBundleID.String())
@@ -325,7 +302,6 @@ func (d *Delegate) ServicesForSpec(jb job.Job) (services []job.ServiceCtx, err e
 			PrivateKeys:                  ocrkey,
 			BinaryNetworkEndpointFactory: peerWrapper.Peer1,
 			Logger:                       ocrLogger,
-			V1Bootstrappers:              v1BootstrapPeers,
 			V2Bootstrappers:              v2Bootstrappers,
 			MonitoringEndpoint:           d.monitoringEndpointGen.GenMonitoringEndpoint("EVM", chain.ID().String(), concreteSpec.ContractAddress.String(), synchronization.OCR),
 			ConfigOverrider:              configOverrider,
diff --git a/core/services/ocr/example-job-spec.toml b/core/services/ocr/example-job-spec.toml
index f8854a0a0b2..7622c45f212 100644
--- a/core/services/ocr/example-job-spec.toml
+++ b/core/services/ocr/example-job-spec.toml
@@ -2,9 +2,7 @@ type               = "offchainreporting"
 schemaVersion      = 1
 contractAddress    = "0x613a38AC1659769640aaE063C651F48E0250454C"
 p2pPeerID          = "12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq"
-p2pBootstrapPeers  = [
-    "/dns4/chain.link/tcp/1234/p2p/16Uiu2HAm58SP7UL8zsnpeuwHfytLocaqgnyaYKP8wu7qRdrixLju",
-]
+p2pv2Bootstrappers = ["12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001"]
 isBootstrapPeer    = false
 keyBundleID        = "73e8966a78ca09bb912e9565cfb79fbe8a6048fab1f0cf49b18047c3895e0447"
 monitoringEndpoint = "chain.link:4321"
diff --git a/core/services/ocr/validate.go b/core/services/ocr/validate.go
index a780ebb0821..0524ed24d0b 100644
--- a/core/services/ocr/validate.go
+++ b/core/services/ocr/validate.go
@@ -5,9 +5,9 @@ import (
 	"time"
 
 	"github.com/lib/pq"
-	"github.com/multiformats/go-multiaddr"
 	"github.com/pelletier/go-toml"
 	"github.com/pkg/errors"
+
 	"github.com/smartcontractkit/libocr/offchainreporting"
 
 	"github.com/smartcontractkit/chainlink/v2/common/config"
@@ -77,11 +77,6 @@ func ValidatedOracleSpecTomlCfg(configFn func(id *big.Int) (evmconfig.ChainScope
 	if !tree.Has("isBootstrapPeer") {
 		return jb, errors.New("isBootstrapPeer is not defined")
 	}
-	for i := range spec.P2PBootstrapPeers {
-		if _, err = multiaddr.NewMultiaddr(spec.P2PBootstrapPeers[i]); err != nil {
-			return jb, errors.Wrapf(err, "p2p bootstrap peer %v is invalid", spec.P2PBootstrapPeers[i])
-		}
-	}
 
 	if len(spec.P2PV2Bootstrappers) > 0 {
 		_, err = ocrcommon.ParseBootstrapPeers(spec.P2PV2Bootstrappers)
diff --git a/core/services/ocr/validate_test.go b/core/services/ocr/validate_test.go
index 0164fd82c54..4d8a9ae26c8 100644
--- a/core/services/ocr/validate_test.go
+++ b/core/services/ocr/validate_test.go
@@ -60,9 +60,7 @@ type               = "offchainreporting"
 schemaVersion      = 1
 contractAddress    = "0x613a38AC1659769640aaE063C651F48E0250454C"
 p2pPeerID          = "12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq"
-p2pBootstrapPeers  = [
-"/dns4/chain.link/tcp/1234/p2p/16Uiu2HAm58SP7UL8zsnpeuwHfytLocaqgnyaYKP8wu7qRdrixLju",
-]
+p2pv2Bootstrappers = ["12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001"]
 isBootstrapPeer    = false
 keyBundleID        = "73e8966a78ca09bb912e9565cfb79fbe8a6048fab1f0cf49b18047c3895e0447"
 monitoringEndpoint = "chain.link:4321"
@@ -92,7 +90,7 @@ type               = "offchainreporting"
 schemaVersion      = 1
 contractAddress    = "0x613a38AC1659769640aaE063C651F48E0250454C"
 p2pPeerID          = "12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq"
-p2pBootstrapPeers  = []
+p2pv2Bootstrappers = ["12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001"]
 isBootstrapPeer    = true
 `,
 			assertion: func(t *testing.T, os job.Job, err error) {
@@ -108,9 +106,7 @@ type               = "offchainreporting"
 schemaVersion      = 1
 contractAddress    = "0x613a38AC1659769640aaE063C651F48E0250454C"
 p2pPeerID          = "12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq"
-p2pBootstrapPeers  = [
-"/dns4/chain.link/tcp/1234/p2p/16Uiu2HAm58SP7UL8zsnpeuwHfytLocaqgnyaYKP8wu7qRdrixLju",
-]
+p2pv2Bootstrappers = ["12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001"]
 isBootstrapPeer    = true
 keyBundleID        = "73e8966a78ca09bb912e9565cfb79fbe8a6048fab1f0cf49b18047c3895e0447"
 monitoringEndpoint = "chain.link:4321"
@@ -136,7 +132,7 @@ type               = "offchainreporting"
 schemaVersion      = 1
 contractAddress    = "0x613a38AC1659769640aaE063C651F48E0250454C"
 p2pPeerID          = "12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq"
-p2pBootstrapPeers  = []
+p2pv2Bootstrappers = ["12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001"]
 isBootstrapPeer    = false
 `,
 			assertion: func(t *testing.T, os job.Job, err error) {
@@ -150,28 +146,11 @@ type               = "offchainreporting"
 schemaVersion      = 1
 contractAddress    = "0x613a38AC1659769640aaE063C651F48E0250454C"
 p2pPeerID          = "12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq"
-p2pBootstrapPeers  = []
+p2pv2Bootstrappers = ["12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001"]
 isBootstrapPeer    = false
 observationSource = """
 ->
 """
-`,
-			assertion: func(t *testing.T, os job.Job, err error) {
-				require.Error(t, err)
-			},
-		},
-		{
-			name: "invalid v1 bootstrap peer address",
-			toml: `
-type               = "offchainreporting"
-schemaVersion      = 1
-contractAddress    = "0x613a38AC1659769640aaE063C651F48E0250454C"
-p2pPeerID          = "12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq"
-p2pBootstrapPeers  = ["/invalid/peer/address"]
-isBootstrapPeer    = false
-observationSource = """
-blah
-"""
 `,
 			assertion: func(t *testing.T, os job.Job, err error) {
 				require.Error(t, err)
@@ -184,9 +163,6 @@ type               = "offchainreporting"
 schemaVersion      = 1
 contractAddress    = "0x613a38AC1659769640aaE063C651F48E0250454C"
 p2pPeerID          = "12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq"
-p2pBootstrapPeers  = [
-"/dns4/chain.link/tcp/1234/p2p/16Uiu2HAm58SP7UL8zsnpeuwHfytLocaqgnyaYKP8wu7qRdrixLju",
-]
 p2pv2Bootstrappers = ["invalid bootstrapper /#@ address"]
 isBootstrapPeer    = false
 observationSource = """
@@ -204,7 +180,6 @@ type               = "offchainreporting"
 schemaVersion      = 1
 contractAddress    = "0x613a38AC1659769640aaE063C651F48E0250454C"
 p2pPeerID          = "12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq"
-p2pBootstrapPeers  = ["/dns4/chain.link/tcp/1234/p2p/16Uiu2HAm58SP7UL8zsnpeuwHfytLocaqgnyaYKP8wu7qRdrixLju"]
 p2pv2Bootstrappers = [
 "12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001",
 ]
@@ -225,7 +200,6 @@ type               = "offchainreporting"
 schemaVersion      = 1
 contractAddress    = "0x613a38AC1659769640aaE063C651F48E0250454C"
 p2pPeerID          = "12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq"
-p2pBootstrapPeers  = ["/dns4/chain.link/tcp/1234/p2p/16Uiu2HAm58SP7UL8zsnpeuwHfytLocaqgnyaYKP8wu7qRdrixLju"]
 p2pv2Bootstrappers = [
 "12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001",
 ]
@@ -246,7 +220,7 @@ type               = "offchainreporting"
 schemaVersion      = 1
 contractAddress    = "0x613a38AC1659769640aaE063C651F48E0250454C"
 p2pPeerID          = "12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq"
-p2pBootstrapPeers  = ["/dns4/chain.link/tcp/1234/p2p/16Uiu2HAm58SP7UL8zsnpeuwHfytLocaqgnyaYKP8wu7qRdrixLju"]
+p2pv2Bootstrappers = ["12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001"]
 isBootstrapPeer    = false
 observationGracePeriod = "0s"
 observationSource = """
@@ -264,7 +238,7 @@ type               = "offchainreporting"
 schemaVersion      = 1
 contractAddress    = "0x613a38AC1659769640aaE063C651F48E0250454C"
 p2pPeerID          = "12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq"
-p2pBootstrapPeers  = ["/dns4/chain.link/tcp/1234/p2p/16Uiu2HAm58SP7UL8zsnpeuwHfytLocaqgnyaYKP8wu7qRdrixLju"]
+p2pv2Bootstrappers = ["12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001"]
 isBootstrapPeer    = false
 contractTransmitterTransmitTimeout = "0s"
 observationSource = """
@@ -282,7 +256,7 @@ type               = "offchainreporting"
 schemaVersion      = 1
 contractAddress    = "0x613a38AC1659769640aaE063C651F48E0250454C"
 p2pPeerID          = "12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq"
-p2pBootstrapPeers  = ["/dns4/chain.link/tcp/1234/p2p/16Uiu2HAm58SP7UL8zsnpeuwHfytLocaqgnyaYKP8wu7qRdrixLju"]
+p2pv2Bootstrappers = ["12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001"]
 isBootstrapPeer    = false
 contractConfigTrackerSubscribeInterval = "0s"
 observationSource = """
@@ -300,13 +274,12 @@ type               = "offchainreporting"
 schemaVersion      = 1
 contractAddress    = "0x613a38AC1659769640aaE063C651F48E0250454C"
 p2pPeerID          = "12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq"
-p2pBootstrapPeers  = []
-p2pv2Bootstrappers = []
+p2pv2Bootstrappers = ["12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001"]
 isBootstrapPeer    = true
 monitoringEndpoint = "\t/fd\2ff )(*&^%$#@"
 `,
 			assertion: func(t *testing.T, os job.Job, err error) {
-				require.EqualError(t, err, "toml error on load: (9, 23): invalid escape sequence: \\2")
+				require.EqualError(t, err, "toml error on load: (8, 23): invalid escape sequence: \\2")
 			},
 		},
 		{
@@ -317,9 +290,7 @@ maxTaskDuration    = "30s"
 schemaVersion      = 1
 contractAddress    = "0x613a38AC1659769640aaE063C651F48E0250454C"
 p2pPeerID          = "12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq"
-p2pBootstrapPeers  = [
-"/dns4/chain.link/tcp/1234/p2p/16Uiu2HAm58SP7UL8zsnpeuwHfytLocaqgnyaYKP8wu7qRdrixLju",
-]
+p2pv2Bootstrappers = ["12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001"]
 isBootstrapPeer    = false
 keyBundleID        = "73e8966a78ca09bb912e9565cfb79fbe8a6048fab1f0cf49b18047c3895e0447"
 monitoringEndpoint = "chain.link:4321"
@@ -341,9 +312,7 @@ type               = "offchainreporting"
 schemaVersion      = 1
 contractAddress    = "0x613a38AC1659769640aaE063C651F48E0250454C"
 p2pPeerID          = "12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq"
-p2pBootstrapPeers  = [
-"/dns4/chain.link/tcp/1234/p2p/16Uiu2HAm58SP7UL8zsnpeuwHfytLocaqgnyaYKP8wu7qRdrixLju",
-]
+p2pv2Bootstrappers = ["12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001"]
 isBootstrapPeer    = false
 keyBundleID        = "73e8966a78ca09bb912e9565cfb79fbe8a6048fab1f0cf49b18047c3895e0447"
 monitoringEndpoint = "chain.link:4321"
@@ -372,9 +341,7 @@ type               = "offchainreporting"
 schemaVersion      = 1
 contractAddress    = "0x613a38AC1659769640aaE063C651F48E0250454C"
 p2pPeerID          = "12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq"
-p2pBootstrapPeers  = [
-"/dns4/chain.link/tcp/1234/p2p/16Uiu2HAm58SP7UL8zsnpeuwHfytLocaqgnyaYKP8wu7qRdrixLju",
-]
+p2pv2Bootstrappers = ["12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001"]
 isBootstrapPeer    = false
 keyBundleID        = "73e8966a78ca09bb912e9565cfb79fbe8a6048fab1f0cf49b18047c3895e0447"
 monitoringEndpoint = "chain.link:4321"
diff --git a/core/services/ocr2/plugins/functions/integration_tests/v1/internal/testutils.go b/core/services/ocr2/plugins/functions/integration_tests/v1/internal/testutils.go
index e576e829677..22a59feb3ae 100644
--- a/core/services/ocr2/plugins/functions/integration_tests/v1/internal/testutils.go
+++ b/core/services/ocr2/plugins/functions/integration_tests/v1/internal/testutils.go
@@ -318,7 +318,6 @@ func StartNewNode(
 		c.OCR2.Enabled = ptr(true)
 
 		c.P2P.PeerID = ptr(p2pKey.PeerID())
-		c.P2P.V1.Enabled = ptr(false)
 		c.P2P.V2.Enabled = ptr(true)
 		c.P2P.V2.DeltaDial = models.MustNewDuration(500 * time.Millisecond)
 		c.P2P.V2.DeltaReconcile = models.MustNewDuration(5 * time.Second)
diff --git a/core/services/ocr2/plugins/ocr2keeper/integration_test.go b/core/services/ocr2/plugins/ocr2keeper/integration_test.go
index 1ab9194c496..58c1e38e017 100644
--- a/core/services/ocr2/plugins/ocr2keeper/integration_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/integration_test.go
@@ -123,7 +123,6 @@ func setupNode(
 		c.OCR2.Enabled = ptr(true)
 
 		c.P2P.PeerID = ptr(p2pKey.PeerID())
-		c.P2P.V1.Enabled = ptr(false)
 		c.P2P.V2.Enabled = ptr(true)
 		c.P2P.V2.DeltaDial = models.MustNewDuration(500 * time.Millisecond)
 		c.P2P.V2.DeltaReconcile = models.MustNewDuration(5 * time.Second)
diff --git a/core/services/ocr2/plugins/ocr2vrf/internal/ocr2vrf_integration_test.go b/core/services/ocr2/plugins/ocr2vrf/internal/ocr2vrf_integration_test.go
index e93824283ba..4a583e5db3f 100644
--- a/core/services/ocr2/plugins/ocr2vrf/internal/ocr2vrf_integration_test.go
+++ b/core/services/ocr2/plugins/ocr2vrf/internal/ocr2vrf_integration_test.go
@@ -232,7 +232,6 @@ func setupNodeOCR2(
 		c.Feature.LogPoller = ptr(true)
 
 		c.P2P.PeerID = ptr(p2pKey.PeerID())
-		c.P2P.V1.Enabled = ptr(false)
 		c.P2P.V2.Enabled = ptr(true)
 		c.P2P.V2.DeltaDial = models.MustNewDuration(500 * time.Millisecond)
 		c.P2P.V2.DeltaReconcile = models.MustNewDuration(5 * time.Second)
diff --git a/core/services/ocrcommon/peer_wrapper.go b/core/services/ocrcommon/peer_wrapper.go
index a7d510ef901..ff666eefdba 100644
--- a/core/services/ocrcommon/peer_wrapper.go
+++ b/core/services/ocrcommon/peer_wrapper.go
@@ -2,19 +2,17 @@ package ocrcommon
 
 import (
 	"context"
+	"crypto/ed25519"
 	"fmt"
 	"io"
-	"net"
 
 	p2ppeer "github.com/libp2p/go-libp2p-core/peer"
-	p2ppeerstore "github.com/libp2p/go-libp2p-core/peerstore"
 	"github.com/pkg/errors"
 	"go.uber.org/multierr"
 
 	"github.com/jmoiron/sqlx"
 
 	ocrnetworking "github.com/smartcontractkit/libocr/networking"
-	ocrnetworkingtypes "github.com/smartcontractkit/libocr/networking/types"
 	ocr1types "github.com/smartcontractkit/libocr/offchainreporting/types"
 	ocr2types "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
@@ -67,20 +65,8 @@ type (
 )
 
 func ValidatePeerWrapperConfig(config config.P2P) error {
-	switch config.NetworkStack() {
-	case ocrnetworking.NetworkingStackV1:
-		// Note: If P2PListenPort isn't set, the peer wrapper will generate a random one itself.
-		return nil
-	case ocrnetworking.NetworkingStackV2:
-		if len(config.V2().ListenAddresses()) == 0 {
-			return errors.New("networking stack v2 selected but no P2P.V2.ListenAddresses specified")
-		}
-	case ocrnetworking.NetworkingStackV1V2:
-		if len(config.V2().ListenAddresses()) == 0 {
-			return errors.New("networking stack v1v2 selected but no P2P.V2.ListenAddresses specified")
-		}
-	default:
-		return errors.New("unknown networking stack")
+	if len(config.V2().ListenAddresses()) == 0 {
+		return errors.New("no P2P.V2.ListenAddresses specified")
 	}
 	return nil
 }
@@ -139,70 +125,16 @@ func (p *SingletonPeerWrapper) peerConfig() (ocrnetworking.PeerConfig, error) {
 	}
 	p.PeerID = key.PeerID()
 
-	v1 := p.p2pCfg.V1()
-	p2pPort := v1.ListenPort()
-	// We need to start the peer store wrapper if v1 is required.
-	// Also fallback to listen params if announce params not specified.
-	ns := p.p2pCfg.NetworkStack()
-	// NewPeer requires that these are both set or unset, otherwise it will error out.
-	v1AnnounceIP, v1AnnouncePort := v1.AnnounceIP(), v1.AnnouncePort()
-	var peerStore p2ppeerstore.Peerstore
-	if ns == ocrnetworking.NetworkingStackV1 || ns == ocrnetworking.NetworkingStackV1V2 {
-		p.pstoreWrapper, err = NewPeerstoreWrapper(p.db, v1.PeerstoreWriteInterval(), p.PeerID, p.lggr, p.dbConfig)
-		if err != nil {
-			return ocrnetworking.PeerConfig{}, errors.Wrap(err, "could not make new pstorewrapper")
-		}
-		if err = p.pstoreWrapper.Start(); err != nil {
-			return ocrnetworking.PeerConfig{}, errors.Wrap(err, "failed to start peer store wrapper")
-		}
-
-		peerStore = p.pstoreWrapper.Peerstore
-
-		// Use a random port if the port hasn't been set explicitly.
-		if p2pPort == 0 {
-			port, perr := p.randomPort()
-			if perr != nil {
-				return ocrnetworking.PeerConfig{}, perr
-			}
-			p2pPort = port
-
-			p.lggr.Warnw(
-				fmt.Sprintf("P2PListenPort was not set, listening on random port %d. A new random port will be generated on every boot, for stability it is recommended to set P2PListenPort to a fixed value in your environment", p2pPort),
-				"p2pPort",
-				p2pPort,
-			)
-		}
-
-		// Support someone specifying only the announce IP but leaving out
-		// the port.
-		// We _should not_ handle the case of someone specifying only the
-		// port but leaving out the IP, because the listen IP is typically
-		// an unspecified IP (https://pkg.go.dev/net#IP.IsUnspecified) and
-		// using that for the announce IP will cause other peers to not be
-		// able to connect.
-		if v1AnnounceIP != nil && v1AnnouncePort == 0 {
-			v1AnnouncePort = p2pPort
-		}
-	}
-
-	// Discover DB is only required for v2
-	var discovererDB ocrnetworkingtypes.DiscovererDatabase
-	if ns == ocrnetworking.NetworkingStackV2 || ns == ocrnetworking.NetworkingStackV1V2 {
-		discovererDB = NewDiscovererDatabase(p.db.DB, p2ppeer.ID(p.PeerID))
-	}
+	discovererDB := NewDiscovererDatabase(p.db.DB, p2ppeer.ID(p.PeerID))
 
 	config := p.p2pCfg
+	pk, err := key.PrivKey.Raw()
+	if err != nil {
+		return ocrnetworking.PeerConfig{}, fmt.Errorf("failed to get raw private key: %w", err)
+	}
 	peerConfig := ocrnetworking.PeerConfig{
-		NetworkingStack: config.NetworkStack(),
-		PrivKey:         key.PrivKey,
-		Logger:          commonlogger.NewOCRWrapper(p.lggr, p.ocrCfg.TraceLogging(), func(string) {}),
-		// V1 config
-		V1ListenIP:                         config.V1().ListenIP(),
-		V1ListenPort:                       p2pPort,
-		V1AnnounceIP:                       v1AnnounceIP,
-		V1AnnouncePort:                     v1AnnouncePort,
-		V1Peerstore:                        peerStore,
-		V1DHTAnnouncementCounterUserPrefix: config.V1().DHTAnnouncementCounterUserPrefix(),
+		PrivKey: ed25519.PrivateKey(pk),
+		Logger:  commonlogger.NewOCRWrapper(p.lggr, p.ocrCfg.TraceLogging(), func(string) {}),
 
 		// V2 config
 		V2ListenAddresses:    config.V2().ListenAddresses(),
@@ -211,14 +143,6 @@ func (p *SingletonPeerWrapper) peerConfig() (ocrnetworking.PeerConfig, error) {
 		V2DeltaDial:          config.V2().DeltaDial().Duration(),
 		V2DiscovererDatabase: discovererDB,
 
-		V1EndpointConfig: ocrnetworking.EndpointConfigV1{
-			IncomingMessageBufferSize: config.IncomingMessageBufferSize(),
-			OutgoingMessageBufferSize: config.OutgoingMessageBufferSize(),
-			NewStreamTimeout:          config.V1().NewStreamTimeout(),
-			DHTLookupInterval:         config.V1().DHTLookupInterval(),
-			BootstrapCheckInterval:    config.V1().BootstrapCheckInterval(),
-		},
-
 		V2EndpointConfig: ocrnetworking.EndpointConfigV2{
 			IncomingMessageBufferSize: config.IncomingMessageBufferSize(),
 			OutgoingMessageBufferSize: config.OutgoingMessageBufferSize(),
@@ -228,20 +152,6 @@ func (p *SingletonPeerWrapper) peerConfig() (ocrnetworking.PeerConfig, error) {
 	return peerConfig, nil
 }
 
-func (p *SingletonPeerWrapper) randomPort() (uint16, error) {
-	addr, err := net.ResolveTCPAddr("tcp", "localhost:0")
-	if err != nil {
-		return 0, fmt.Errorf("unexpected ResolveTCPAddr error generating random P2PListenPort: %w", err)
-	}
-	l, err := net.ListenTCP("tcp", addr)
-	if err != nil {
-		return 0, fmt.Errorf("unexpected ListenTCP error generating random P2PListenPort: %w", err)
-	}
-	defer l.Close()
-
-	return uint16(l.Addr().(*net.TCPAddr).Port), nil
-}
-
 // Close closes the peer and peerstore
 func (p *SingletonPeerWrapper) Close() error {
 	return p.StopOnce("SingletonPeerWrapper", func() (err error) {
diff --git a/core/services/ocrcommon/peer_wrapper_test.go b/core/services/ocrcommon/peer_wrapper_test.go
index 209bc6b969b..854ecb153ea 100644
--- a/core/services/ocrcommon/peer_wrapper_test.go
+++ b/core/services/ocrcommon/peer_wrapper_test.go
@@ -1,11 +1,12 @@
 package ocrcommon_test
 
 import (
+	"fmt"
 	"testing"
 	"time"
 
+	"github.com/hashicorp/consul/sdk/freeport"
 	p2ppeer "github.com/libp2p/go-libp2p-core/peer"
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
@@ -17,7 +18,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/p2pkey"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocrcommon"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func Test_SingletonPeerWrapper_Start(t *testing.T) {
@@ -30,7 +30,7 @@ func Test_SingletonPeerWrapper_Start(t *testing.T) {
 
 	t.Run("with no p2p keys returns error", func(t *testing.T) {
 		cfg := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
-			c.P2P.V1.Enabled = ptr(true)
+			c.P2P.V2.Enabled = ptr(true)
 		})
 		keyStore := cltest.NewKeyStore(t, db, cfg.Database())
 		pw := ocrcommon.NewSingletonPeerWrapper(keyStore, cfg.P2P(), cfg.OCR(), cfg.Database(), db, logger.TestLogger(t))
@@ -39,14 +39,15 @@ func Test_SingletonPeerWrapper_Start(t *testing.T) {
 
 	t.Run("with one p2p key and matching P2P.PeerID returns nil", func(t *testing.T) {
 		cfg := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
-			c.P2P.V1.Enabled = ptr(true)
+			c.P2P.V2.Enabled = ptr(true)
 		})
 		keyStore := cltest.NewKeyStore(t, db, cfg.Database())
 		k, err := keyStore.P2P().Create()
 		require.NoError(t, err)
 
 		cfg = configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
-			c.P2P.V1.Enabled = ptr(true)
+			c.P2P.V2.Enabled = ptr(true)
+			c.P2P.V2.ListenAddresses = &[]string{fmt.Sprintf("127.0.0.1:%d", freeport.GetOne(t))}
 			c.P2P.PeerID = ptr(k.PeerID())
 		})
 		pw := ocrcommon.NewSingletonPeerWrapper(keyStore, cfg.P2P(), cfg.OCR(), cfg.Database(), db, logger.TestLogger(t))
@@ -58,7 +59,7 @@ func Test_SingletonPeerWrapper_Start(t *testing.T) {
 
 	t.Run("with one p2p key and mismatching P2P.PeerID returns error", func(t *testing.T) {
 		cfg := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
-			c.P2P.V1.Enabled = ptr(true)
+			c.P2P.V2.Enabled = ptr(true)
 			c.P2P.PeerID = ptr(p2pkey.PeerID(peerID))
 		})
 		keyStore := cltest.NewKeyStore(t, db, cfg.Database())
@@ -73,14 +74,16 @@ func Test_SingletonPeerWrapper_Start(t *testing.T) {
 
 	t.Run("with multiple p2p keys and valid P2P.PeerID returns nil", func(t *testing.T) {
 		cfg := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
-			c.P2P.V1.Enabled = ptr(true)
+			c.P2P.V2.Enabled = ptr(true)
+			c.P2P.V2.ListenAddresses = &[]string{fmt.Sprintf("127.0.0.1:%d", freeport.GetOne(t))}
 		})
 		keyStore := cltest.NewKeyStore(t, db, cfg.Database())
 		k2, err := keyStore.P2P().Create()
 		require.NoError(t, err)
 
 		cfg = configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
-			c.P2P.V1.Enabled = ptr(true)
+			c.P2P.V2.Enabled = ptr(true)
+			c.P2P.V2.ListenAddresses = &[]string{fmt.Sprintf("127.0.0.1:%d", freeport.GetOne(t))}
 			c.P2P.PeerID = ptr(k2.PeerID())
 		})
 
@@ -93,7 +96,8 @@ func Test_SingletonPeerWrapper_Start(t *testing.T) {
 
 	t.Run("with multiple p2p keys and mismatching P2P.PeerID returns error", func(t *testing.T) {
 		cfg := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
-			c.P2P.V1.Enabled = ptr(true)
+			c.P2P.V2.Enabled = ptr(true)
+			c.P2P.V2.ListenAddresses = &[]string{fmt.Sprintf("127.0.0.1:%d", freeport.GetOne(t))}
 			c.P2P.PeerID = ptr(p2pkey.PeerID(peerID))
 		})
 		keyStore := cltest.NewKeyStore(t, db, cfg.Database())
@@ -122,7 +126,6 @@ func Test_SingletonPeerWrapper_Close(t *testing.T) {
 		c.P2P.PeerID = ptr(k.PeerID())
 		c.P2P.V2.DeltaDial = models.MustNewDuration(100 * time.Millisecond)
 		c.P2P.V2.DeltaReconcile = models.MustNewDuration(1 * time.Second)
-		c.P2P.V1.ListenPort = ptr[uint16](0)
 
 		p2paddresses := []string{
 			"127.0.0.1:17193",
@@ -146,75 +149,4 @@ func Test_SingletonPeerWrapper_Close(t *testing.T) {
 	require.NoError(t, pw.Close())
 }
 
-func TestSingletonPeerWrapper_PeerConfig(t *testing.T) {
-	t.Parallel()
-
-	db := pgtest.NewSqlxDB(t)
-
-	require.NoError(t, utils.JustError(db.Exec(`DELETE FROM encrypted_key_rings`)))
-
-	cfg := configtest.NewGeneralConfig(t, nil)
-	keyStore := cltest.NewKeyStore(t, db, cfg.Database())
-	k, err := keyStore.P2P().Create()
-	require.NoError(t, err)
-
-	t.Run("generates a random port if v1 enabled and listen port isn't set", func(t *testing.T) {
-		cfg = configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
-			c.P2P.V1.Enabled = ptr(true)
-			c.P2P.V1.ListenPort = ptr(uint16(0))
-			c.P2P.PeerID = ptr(k.PeerID())
-		})
-
-		pw := ocrcommon.NewSingletonPeerWrapper(keyStore, cfg.P2P(), cfg.OCR(), cfg.Database(), db, logger.TestLogger(t))
-		peerConfig, err := pw.PeerConfig()
-		require.NoError(t, err)
-
-		assert.NotEqual(t, peerConfig.V1ListenPort, 0)
-	})
-
-	t.Run("generates a random port if v1v2 enabled and listen port isn't set", func(t *testing.T) {
-		cfg = configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
-			c.P2P.V1.Enabled = ptr(true)
-			c.P2P.V2.Enabled = ptr(true)
-			c.P2P.V1.ListenPort = ptr(uint16(0))
-			c.P2P.PeerID = ptr(k.PeerID())
-		})
-
-		pw := ocrcommon.NewSingletonPeerWrapper(keyStore, cfg.P2P(), cfg.OCR(), cfg.Database(), db, logger.TestLogger(t))
-		peerConfig, err := pw.PeerConfig()
-		require.NoError(t, err)
-
-		assert.NotEqual(t, peerConfig.V1ListenPort, 0)
-	})
-
-	t.Run("doesnt generate a port if v2 is enabled", func(t *testing.T) {
-		cfg = configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
-			c.P2P.V2.Enabled = ptr(true)
-			c.P2P.V1.ListenPort = ptr(uint16(0))
-			c.P2P.PeerID = ptr(k.PeerID())
-		})
-
-		pw := ocrcommon.NewSingletonPeerWrapper(keyStore, cfg.P2P(), cfg.OCR(), cfg.Database(), db, logger.TestLogger(t))
-		peerConfig, err := pw.PeerConfig()
-		require.NoError(t, err)
-
-		assert.NotEqual(t, peerConfig.V1ListenPort, 0)
-	})
-
-	t.Run("doesnt override a port if listenport is set", func(t *testing.T) {
-		portNo := uint16(33247)
-		cfg = configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
-			c.P2P.V1.Enabled = ptr(true)
-			c.P2P.V1.ListenPort = ptr(uint16(33247))
-			c.P2P.PeerID = ptr(k.PeerID())
-		})
-
-		pw := ocrcommon.NewSingletonPeerWrapper(keyStore, cfg.P2P(), cfg.OCR(), cfg.Database(), db, logger.TestLogger(t))
-		peerConfig, err := pw.PeerConfig()
-		require.NoError(t, err)
-
-		assert.Equal(t, peerConfig.V1ListenPort, portNo)
-	})
-}
-
 func ptr[T any](t T) *T { return &t }
diff --git a/core/store/migrate/migrations/0212_ocr_oracle_specs_drop_p2p_bootstrap_peers.sql b/core/store/migrate/migrations/0212_ocr_oracle_specs_drop_p2p_bootstrap_peers.sql
new file mode 100644
index 00000000000..d38370e3f2e
--- /dev/null
+++ b/core/store/migrate/migrations/0212_ocr_oracle_specs_drop_p2p_bootstrap_peers.sql
@@ -0,0 +1,5 @@
+-- +goose Up
+ALTER TABLE ocr_oracle_specs DROP COLUMN p2p_bootstrap_peers;
+
+-- +goose Down
+ALTER TABLE ocr_oracle_specs ADD COLUMN p2p_bootstrap_peers text[];
diff --git a/core/testdata/testspecs/v2_specs.go b/core/testdata/testspecs/v2_specs.go
index 0ecb85f1e49..00297ebdb12 100644
--- a/core/testdata/testspecs/v2_specs.go
+++ b/core/testdata/testspecs/v2_specs.go
@@ -511,10 +511,7 @@ contractAddress    = "%s"
 evmChainID         = %s
 p2pPeerID          = "12D3KooWPjceQrSwdWXPyLLeABRXmuqt69Rg3sBYbU1Nft9HyQ6X"
 externalJobID      =  "%s"
-p2pBootstrapPeers  = [
-    "/dns4/chain.link/tcp/1234/p2p/16Uiu2HAm58SP7UL8zsnpeuwHfytLocaqgnyaYKP8wu7qRdrixLju",
-]
-p2pv2Bootstrappers = []
+p2pv2Bootstrappers = ["12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001"]
 isBootstrapPeer    = false
 keyBundleID        = "f5bf259689b26f1374efb3c9a9868796953a0f814bb2d39b968d0e61b58620a5"
 monitoringEndpoint = "chain.link:4321"
diff --git a/core/web/assets/index.html b/core/web/assets/index.html
index 601453b4eac..f2257bfbfae 100644
--- a/core/web/assets/index.html
+++ b/core/web/assets/index.html
@@ -1 +1 @@
-<!doctype html><html><head><meta charset="UTF-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><title>Operator UI</title><link rel="shortcut icon" href="https://smartcontract.imgix.net/chainlink.ico?auto=compress%2Cformat"/><link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet"/><link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"/><link href="/favicon.ico" rel="shortcut icon" type="image/x-icon"/><title>Chainlink</title><script defer="defer" src="/assets/main.b0b6f79f7f4a94560e37.js"></script></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
\ No newline at end of file
+<!doctype html><html><head><meta charset="UTF-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><title>Operator UI</title><link rel="shortcut icon" href="https://smartcontract.imgix.net/chainlink.ico?auto=compress%2Cformat"/><link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet"/><link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"/><link href="/favicon.ico" rel="shortcut icon" type="image/x-icon"/><title>Chainlink</title><script defer="defer" src="/assets/main.8f602c136d4004a835ee.js"></script></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
\ No newline at end of file
diff --git a/core/web/assets/index.html.gz b/core/web/assets/index.html.gz
index 24cc3068f6e66871c3c3479164b48ea3e892d6ee..4d09643ee1b9aebe70088e318891e5418c6f45b6 100644
GIT binary patch
literal 418
zcmV;T0bTwdiwFP!000021C^3ZYuqpphX0Bp$f;S&$tGb5mU9RMQV4;zIrKOyjn_)`
zVWe3n`|mrpHw%SA=|Ph9TJJL-QgddLp~HZpr{LS>I3w7$2}mGJ54j*|`TFB=wUO#5
zM+m6p=<t0=nWQi&5=K7u?kx4%;^+*n=FNqRjvV+^G2l^OP7HG7v3(gZ1EnlppBlAD
zjd$^v$mq2!J(JCzgk!iAea249o@gj{N|gZolY?e3RJpKoA5}zBoUV%#qhi-R>?vuJ
z!jQ3)^Q(t0<p4A#Fo*dQ*)gqDyOeewVQ{5lqcWx3cMzOE=x=G8DBZ2=`r?|$O<l`l
zqIB?Bdc^-CPgQ-QpMfxQi@rRuSpJ1o9gLHEDpCHmSJQ=R=>qIfeXM5f)bxkX4xL(F
zOm+haiydYy=S7N=4M&2)cVARsOSS24>nn4)zO`KbHEh;5h}Bz>ZKD<fe=HAYo9v-&
zVmit{(_TbGD<}z!u=Oau!U*4&uq@_%6x6#SU>K@Kos5ljqi|NsoDxlOc+c~KSMyW-
M4L7Cb62Jlg09%;KA^-pY

literal 420
zcmV;V0bBkbiwFP!000021C^3bZ`3dl#lMQN#EEVk=(bC%I6YKCDiT7X^uTdqPc{bs
zi9EAu_uJzn+m(=z5QjMNi{I~!$8O%(WcWCu7&!R0IgJRmZ2~d~Ge9O}EuX%B+I*Di
zBu5CS<>c^rOqr!HDKf^g?Aci!w8hC8+$@s|7acqB8#3Tgzn>ZG*kk*3#0;FWczS5m
zDmC84Um~N|l7>Py2Ntftr5G~yS`N%3-6}-^%Fhy-!Eoim-n~>2S(S2KoEcSd-NAvA
zHYto5iQay=?^6!Ia{)`tpUA$@sM@Er_Xwk-su-0ay6Yi0f7IVnmpI*C*7e1<JXdus
zPlfW)BMpfEMV@!{iv9wOxwPorLlNm;Sk=QcyXP&+zxHZAP%T}6J*t<@qMe(5|JtE*
z%gJOnvar}=)^d4CLD`ffpmO%4La|g`-Cg&)n|{}C;bwbvUE}4h`bn~F)JiBH>&5Ak
zJ+@6uC;3M@h=^zfCxH<<kK!{-@VLenF(0Df!I6M*tQvJTHr7qTSuJx)Jm-{o8CSeo
OuIg_9w+r{c0ssKS^U>x2

diff --git a/core/web/assets/main.b0b6f79f7f4a94560e37.js b/core/web/assets/main.8f602c136d4004a835ee.js
similarity index 91%
rename from core/web/assets/main.b0b6f79f7f4a94560e37.js
rename to core/web/assets/main.8f602c136d4004a835ee.js
index 6c9f23d1cca..de75dc2b1c6 100644
--- a/core/web/assets/main.b0b6f79f7f4a94560e37.js
+++ b/core/web/assets/main.8f602c136d4004a835ee.js
@@ -184,4 +184,4 @@ object-assign
  */ Object.defineProperty(t,"__esModule",{value:!0}),"undefined"==typeof window||"function"!=typeof MessageChannel){var n,r,i,a,o,s=null,u=null,c=function(){if(null!==s)try{var e=t.unstable_now();s(!0,e),s=null}catch(n){throw setTimeout(c,0),n}},l=Date.now();t.unstable_now=function(){return Date.now()-l},n=function(e){null!==s?setTimeout(n,0,e):(s=e,setTimeout(c,0))},r=function(e,t){u=setTimeout(e,t)},i=function(){clearTimeout(u)},a=function(){return!1},o=t.unstable_forceFrameRate=function(){}}else{var f=window.performance,d=window.Date,h=window.setTimeout,p=window.clearTimeout;if("undefined"!=typeof console){var b=window.cancelAnimationFrame;"function"!=typeof window.requestAnimationFrame&&console.error("This browser doesn't support requestAnimationFrame. Make sure that you load a polyfill in older browsers. https://fb.me/react-polyfills"),"function"!=typeof b&&console.error("This browser doesn't support cancelAnimationFrame. Make sure that you load a polyfill in older browsers. https://fb.me/react-polyfills")}if("object"==typeof f&&"function"==typeof f.now)t.unstable_now=function(){return f.now()};else{var m=d.now();t.unstable_now=function(){return d.now()-m}}var g=!1,v=null,y=-1,w=5,_=0;a=function(){return t.unstable_now()>=_},o=function(){},t.unstable_forceFrameRate=function(e){0>e||125<e?console.error("forceFrameRate takes a positive int between 0 and 125, forcing framerates higher than 125 fps is not unsupported"):w=0<e?Math.floor(1e3/e):5};var E=new MessageChannel,S=E.port2;E.port1.onmessage=function(){if(null!==v){var e=t.unstable_now();_=e+w;try{v(!0,e)?S.postMessage(null):(g=!1,v=null)}catch(n){throw S.postMessage(null),n}}else g=!1},n=function(e){v=e,g||(g=!0,S.postMessage(null))},r=function(e,n){y=h(function(){e(t.unstable_now())},n)},i=function(){p(y),y=-1}}function k(e,t){var n=e.length;e.push(t);a:for(;;){var r=Math.floor((n-1)/2),i=e[r];if(void 0!==i&&0<M(i,t))e[r]=t,e[n]=i,n=r;else break a}}function x(e){return void 0===(e=e[0])?null:e}function T(e){var t=e[0];if(void 0!==t){var n=e.pop();if(n!==t){e[0]=n;a:for(var r=0,i=e.length;r<i;){var a=2*(r+1)-1,o=e[a],s=a+1,u=e[s];if(void 0!==o&&0>M(o,n))void 0!==u&&0>M(u,o)?(e[r]=u,e[s]=n,r=s):(e[r]=o,e[a]=n,r=a);else if(void 0!==u&&0>M(u,n))e[r]=u,e[s]=n,r=s;else break a}}return t}return null}function M(e,t){var n=e.sortIndex-t.sortIndex;return 0!==n?n:e.id-t.id}var O=[],A=[],L=1,C=null,I=3,D=!1,N=!1,P=!1;function R(e){for(var t=x(A);null!==t;){if(null===t.callback)T(A);else if(t.startTime<=e)T(A),t.sortIndex=t.expirationTime,k(O,t);else break;t=x(A)}}function j(e){if(P=!1,R(e),!N){if(null!==x(O))N=!0,n(F);else{var t=x(A);null!==t&&r(j,t.startTime-e)}}}function F(e,n){N=!1,P&&(P=!1,i()),D=!0;var o=I;try{for(R(n),C=x(O);null!==C&&(!(C.expirationTime>n)||e&&!a());){var s=C.callback;if(null!==s){C.callback=null,I=C.priorityLevel;var u=s(C.expirationTime<=n);n=t.unstable_now(),"function"==typeof u?C.callback=u:C===x(O)&&T(O),R(n)}else T(O);C=x(O)}if(null!==C)var c=!0;else{var l=x(A);null!==l&&r(j,l.startTime-n),c=!1}return c}finally{C=null,I=o,D=!1}}function Y(e){switch(e){case 1:return -1;case 2:return 250;case 5:return 1073741823;case 4:return 1e4;default:return 5e3}}var B=o;t.unstable_ImmediatePriority=1,t.unstable_UserBlockingPriority=2,t.unstable_NormalPriority=3,t.unstable_IdlePriority=5,t.unstable_LowPriority=4,t.unstable_runWithPriority=function(e,t){switch(e){case 1:case 2:case 3:case 4:case 5:break;default:e=3}var n=I;I=e;try{return t()}finally{I=n}},t.unstable_next=function(e){switch(I){case 1:case 2:case 3:var t=3;break;default:t=I}var n=I;I=t;try{return e()}finally{I=n}},t.unstable_scheduleCallback=function(e,a,o){var s=t.unstable_now();if("object"==typeof o&&null!==o){var u=o.delay;u="number"==typeof u&&0<u?s+u:s,o="number"==typeof o.timeout?o.timeout:Y(e)}else o=Y(e),u=s;return o=u+o,e={id:L++,callback:a,priorityLevel:e,startTime:u,expirationTime:o,sortIndex:-1},u>s?(e.sortIndex=u,k(A,e),null===x(O)&&e===x(A)&&(P?i():P=!0,r(j,u-s))):(e.sortIndex=o,k(O,e),N||D||(N=!0,n(F))),e},t.unstable_cancelCallback=function(e){e.callback=null},t.unstable_wrapCallback=function(e){var t=I;return function(){var n=I;I=t;try{return e.apply(this,arguments)}finally{I=n}}},t.unstable_getCurrentPriorityLevel=function(){return I},t.unstable_shouldYield=function(){var e=t.unstable_now();R(e);var n=x(O);return n!==C&&null!==C&&null!==n&&null!==n.callback&&n.startTime<=e&&n.expirationTime<C.expirationTime||a()},t.unstable_requestPaint=B,t.unstable_continueExecution=function(){N||D||(N=!0,n(F))},t.unstable_pauseExecution=function(){},t.unstable_getFirstCallbackNode=function(){return x(O)},t.unstable_Profiling=null},63840(e,t,n){"use strict";e.exports=n(60053)},36582(e,t){"use strict";t.Q=o,n=s;var n,r="",i=" ",a=/[ \t\n\r\f]+/g;function o(e){var t=String(e||r).trim();return t===r?[]:t.split(a)}function s(e){return e.join(i).trim()}},42830(e,t,n){e.exports=i;var r=n(17187).EventEmitter;function i(){r.call(this)}n(35717)(i,r),i.Readable=n(79481),i.Writable=n(64229),i.Duplex=n(56753),i.Transform=n(74605),i.PassThrough=n(82725),i.finished=n(8610),i.pipeline=n(59946),i.Stream=i,i.prototype.pipe=function(e,t){var n=this;function i(t){e.writable&&!1===e.write(t)&&n.pause&&n.pause()}function a(){n.readable&&n.resume&&n.resume()}n.on("data",i),e.on("drain",a),e._isStdio||t&&!1===t.end||(n.on("end",s),n.on("close",u));var o=!1;function s(){o||(o=!0,e.end())}function u(){o||(o=!0,"function"==typeof e.destroy&&e.destroy())}function c(e){if(l(),0===r.listenerCount(this,"error"))throw e}function l(){n.removeListener("data",i),e.removeListener("drain",a),n.removeListener("end",s),n.removeListener("close",u),n.removeListener("error",c),e.removeListener("error",c),n.removeListener("end",l),n.removeListener("close",l),e.removeListener("close",l)}return n.on("error",c),e.on("error",c),n.on("end",l),n.on("close",l),e.on("close",l),e.emit("pipe",n),e}},32553(e,t,n){"use strict";var r=n(89509).Buffer,i=r.isEncoding||function(e){switch((e=""+e)&&e.toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"binary":case"base64":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":case"raw":return!0;default:return!1}};function a(e){var t;if(!e)return"utf8";for(;;)switch(e){case"utf8":case"utf-8":return"utf8";case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return"utf16le";case"latin1":case"binary":return"latin1";case"base64":case"ascii":case"hex":return e;default:if(t)return;e=(""+e).toLowerCase(),t=!0}}function o(e){var t=a(e);if("string"!=typeof t&&(r.isEncoding===i||!i(e)))throw Error("Unknown encoding: "+e);return t||e}function s(e){var t;switch(this.encoding=o(e),this.encoding){case"utf16le":this.text=p,this.end=b,t=4;break;case"utf8":this.fillLast=f,t=4;break;case"base64":this.text=m,this.end=g,t=3;break;default:this.write=v,this.end=y;return}this.lastNeed=0,this.lastTotal=0,this.lastChar=r.allocUnsafe(t)}function u(e){return e<=127?0:e>>5==6?2:e>>4==14?3:e>>3==30?4:e>>6==2?-1:-2}function c(e,t,n){var r=t.length-1;if(r<n)return 0;var i=u(t[r]);return i>=0?(i>0&&(e.lastNeed=i-1),i):--r<n||-2===i?0:(i=u(t[r]))>=0?(i>0&&(e.lastNeed=i-2),i):--r<n||-2===i?0:(i=u(t[r]))>=0?(i>0&&(2===i?i=0:e.lastNeed=i-3),i):0}function l(e,t,n){if((192&t[0])!=128)return e.lastNeed=0,"�";if(e.lastNeed>1&&t.length>1){if((192&t[1])!=128)return e.lastNeed=1,"�";if(e.lastNeed>2&&t.length>2&&(192&t[2])!=128)return e.lastNeed=2,"�"}}function f(e){var t=this.lastTotal-this.lastNeed,n=l(this,e,t);return void 0!==n?n:this.lastNeed<=e.length?(e.copy(this.lastChar,t,0,this.lastNeed),this.lastChar.toString(this.encoding,0,this.lastTotal)):void(e.copy(this.lastChar,t,0,e.length),this.lastNeed-=e.length)}function d(e,t){var n=c(this,e,t);if(!this.lastNeed)return e.toString("utf8",t);this.lastTotal=n;var r=e.length-(n-this.lastNeed);return e.copy(this.lastChar,0,r),e.toString("utf8",t,r)}function h(e){var t=e&&e.length?this.write(e):"";return this.lastNeed?t+"�":t}function p(e,t){if((e.length-t)%2==0){var n=e.toString("utf16le",t);if(n){var r=n.charCodeAt(n.length-1);if(r>=55296&&r<=56319)return this.lastNeed=2,this.lastTotal=4,this.lastChar[0]=e[e.length-2],this.lastChar[1]=e[e.length-1],n.slice(0,-1)}return n}return this.lastNeed=1,this.lastTotal=2,this.lastChar[0]=e[e.length-1],e.toString("utf16le",t,e.length-1)}function b(e){var t=e&&e.length?this.write(e):"";if(this.lastNeed){var n=this.lastTotal-this.lastNeed;return t+this.lastChar.toString("utf16le",0,n)}return t}function m(e,t){var n=(e.length-t)%3;return 0===n?e.toString("base64",t):(this.lastNeed=3-n,this.lastTotal=3,1===n?this.lastChar[0]=e[e.length-1]:(this.lastChar[0]=e[e.length-2],this.lastChar[1]=e[e.length-1]),e.toString("base64",t,e.length-n))}function g(e){var t=e&&e.length?this.write(e):"";return this.lastNeed?t+this.lastChar.toString("base64",0,3-this.lastNeed):t}function v(e){return e.toString(this.encoding)}function y(e){return e&&e.length?this.write(e):""}t.s=s,s.prototype.write=function(e){var t,n;if(0===e.length)return"";if(this.lastNeed){if(void 0===(t=this.fillLast(e)))return"";n=this.lastNeed,this.lastNeed=0}else n=0;return n<e.length?t?t+this.text(e,n):this.text(e,n):t||""},s.prototype.end=h,s.prototype.text=d,s.prototype.fillLast=function(e){if(this.lastNeed<=e.length)return e.copy(this.lastChar,this.lastTotal-this.lastNeed,0,this.lastNeed),this.lastChar.toString(this.encoding,0,this.lastTotal);e.copy(this.lastChar,this.lastTotal-this.lastNeed,0,e.length),this.lastNeed-=e.length}},93379(e,t,n){"use strict";var r,i,a=function(){return void 0===r&&(r=Boolean(window&&document&&document.all&&!window.atob)),r},o=(i={},function(e){if(void 0===i[e]){var t=document.querySelector(e);if(window.HTMLIFrameElement&&t instanceof window.HTMLIFrameElement)try{t=t.contentDocument.head}catch(n){t=null}i[e]=t}return i[e]}),s=[];function u(e){for(var t=-1,n=0;n<s.length;n++)if(s[n].identifier===e){t=n;break}return t}function c(e,t){for(var n={},r=[],i=0;i<e.length;i++){var a=e[i],o=t.base?a[0]+t.base:a[0],c=n[o]||0,l="".concat(o," ").concat(c);n[o]=c+1;var f=u(l),d={css:a[1],media:a[2],sourceMap:a[3]};-1!==f?(s[f].references++,s[f].updater(d)):s.push({identifier:l,updater:v(d,t),references:1}),r.push(l)}return r}function l(e){var t=document.createElement("style"),r=e.attributes||{};if(void 0===r.nonce){var i=n.nc;i&&(r.nonce=i)}if(Object.keys(r).forEach(function(e){t.setAttribute(e,r[e])}),"function"==typeof e.insert)e.insert(t);else{var a=o(e.insert||"head");if(!a)throw Error("Couldn't find a style target. This probably means that the value for the 'insert' parameter is invalid.");a.appendChild(t)}return t}function f(e){if(null===e.parentNode)return!1;e.parentNode.removeChild(e)}var d,h=(d=[],function(e,t){return d[e]=t,d.filter(Boolean).join("\n")});function p(e,t,n,r){var i=n?"":r.media?"@media ".concat(r.media," {").concat(r.css,"}"):r.css;if(e.styleSheet)e.styleSheet.cssText=h(t,i);else{var a=document.createTextNode(i),o=e.childNodes;o[t]&&e.removeChild(o[t]),o.length?e.insertBefore(a,o[t]):e.appendChild(a)}}function b(e,t,n){var r=n.css,i=n.media,a=n.sourceMap;if(i?e.setAttribute("media",i):e.removeAttribute("media"),a&&"undefined"!=typeof btoa&&(r+="\n/*# sourceMappingURL=data:application/json;base64,".concat(btoa(unescape(encodeURIComponent(JSON.stringify(a))))," */")),e.styleSheet)e.styleSheet.cssText=r;else{for(;e.firstChild;)e.removeChild(e.firstChild);e.appendChild(document.createTextNode(r))}}var m=null,g=0;function v(e,t){if(t.singleton){var n,r,i,a=g++;n=m||(m=l(t)),r=p.bind(null,n,a,!1),i=p.bind(null,n,a,!0)}else n=l(t),r=b.bind(null,n,t),i=function(){f(n)};return r(e),function(t){t?(t.css!==e.css||t.media!==e.media||t.sourceMap!==e.sourceMap)&&r(e=t):i()}}e.exports=function(e,t){(t=t||{}).singleton||"boolean"==typeof t.singleton||(t.singleton=a()),e=e||[];var n=c(e,t);return function(e){if(e=e||[],"[object Array]"===Object.prototype.toString.call(e)){for(var r=0;r<n.length;r++){var i=u(n[r]);s[i].references--}for(var a=c(e,t),o=0;o<n.length;o++){var l=u(n[o]);0===s[l].references&&(s[l].updater(),s.splice(l,1))}n=a}}}},47545(e,t,n){"use strict";n.d(t,{Z:()=>OB});var r,i,a,o,s,u,c,l=n(67294),f=n.t(l,2),d=n(97779),h=n(47886),p=n(57209),b=n(32316),m=n(95880),g=n(17051),v=n(71381),y=n(81701),w=n(3022),_=n(60323),E=n(87591),S=n(25649),k=n(28902),x=n(71426),T=n(48884),M=n(94184),O=n.n(M),A=n(55977),L=n(73935),C=function(){if("undefined"!=typeof Map)return Map;function e(e,t){var n=-1;return e.some(function(e,r){return e[0]===t&&(n=r,!0)}),n}return function(){function t(){this.__entries__=[]}return Object.defineProperty(t.prototype,"size",{get:function(){return this.__entries__.length},enumerable:!0,configurable:!0}),t.prototype.get=function(t){var n=e(this.__entries__,t),r=this.__entries__[n];return r&&r[1]},t.prototype.set=function(t,n){var r=e(this.__entries__,t);~r?this.__entries__[r][1]=n:this.__entries__.push([t,n])},t.prototype.delete=function(t){var n=this.__entries__,r=e(n,t);~r&&n.splice(r,1)},t.prototype.has=function(t){return!!~e(this.__entries__,t)},t.prototype.clear=function(){this.__entries__.splice(0)},t.prototype.forEach=function(e,t){void 0===t&&(t=null);for(var n=0,r=this.__entries__;n<r.length;n++){var i=r[n];e.call(t,i[1],i[0])}},t}()}(),I="undefined"!=typeof window&&"undefined"!=typeof document&&window.document===document,D=void 0!==n.g&&n.g.Math===Math?n.g:"undefined"!=typeof self&&self.Math===Math?self:"undefined"!=typeof window&&window.Math===Math?window:Function("return this")(),N="function"==typeof requestAnimationFrame?requestAnimationFrame.bind(D):function(e){return setTimeout(function(){return e(Date.now())},1e3/60)},P=2;function R(e,t){var n=!1,r=!1,i=0;function a(){n&&(n=!1,e()),r&&s()}function o(){N(a)}function s(){var e=Date.now();if(n){if(e-i<P)return;r=!0}else n=!0,r=!1,setTimeout(o,t);i=e}return s}var j=20,F=["top","right","bottom","left","width","height","size","weight"],Y="undefined"!=typeof MutationObserver,B=function(){function e(){this.connected_=!1,this.mutationEventsAdded_=!1,this.mutationsObserver_=null,this.observers_=[],this.onTransitionEnd_=this.onTransitionEnd_.bind(this),this.refresh=R(this.refresh.bind(this),j)}return e.prototype.addObserver=function(e){~this.observers_.indexOf(e)||this.observers_.push(e),this.connected_||this.connect_()},e.prototype.removeObserver=function(e){var t=this.observers_,n=t.indexOf(e);~n&&t.splice(n,1),!t.length&&this.connected_&&this.disconnect_()},e.prototype.refresh=function(){this.updateObservers_()&&this.refresh()},e.prototype.updateObservers_=function(){var e=this.observers_.filter(function(e){return e.gatherActive(),e.hasActive()});return e.forEach(function(e){return e.broadcastActive()}),e.length>0},e.prototype.connect_=function(){I&&!this.connected_&&(document.addEventListener("transitionend",this.onTransitionEnd_),window.addEventListener("resize",this.refresh),Y?(this.mutationsObserver_=new MutationObserver(this.refresh),this.mutationsObserver_.observe(document,{attributes:!0,childList:!0,characterData:!0,subtree:!0})):(document.addEventListener("DOMSubtreeModified",this.refresh),this.mutationEventsAdded_=!0),this.connected_=!0)},e.prototype.disconnect_=function(){I&&this.connected_&&(document.removeEventListener("transitionend",this.onTransitionEnd_),window.removeEventListener("resize",this.refresh),this.mutationsObserver_&&this.mutationsObserver_.disconnect(),this.mutationEventsAdded_&&document.removeEventListener("DOMSubtreeModified",this.refresh),this.mutationsObserver_=null,this.mutationEventsAdded_=!1,this.connected_=!1)},e.prototype.onTransitionEnd_=function(e){var t=e.propertyName,n=void 0===t?"":t;F.some(function(e){return!!~n.indexOf(e)})&&this.refresh()},e.getInstance=function(){return this.instance_||(this.instance_=new e),this.instance_},e.instance_=null,e}(),U=function(e,t){for(var n=0,r=Object.keys(t);n<r.length;n++){var i=r[n];Object.defineProperty(e,i,{value:t[i],enumerable:!1,writable:!1,configurable:!0})}return e},H=function(e){return e&&e.ownerDocument&&e.ownerDocument.defaultView||D},$=Q(0,0,0,0);function z(e){return parseFloat(e)||0}function G(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];return t.reduce(function(t,n){return t+z(e["border-"+n+"-width"])},0)}function W(e){for(var t=["top","right","bottom","left"],n={},r=0,i=t;r<i.length;r++){var a=i[r],o=e["padding-"+a];n[a]=z(o)}return n}function K(e){var t=e.getBBox();return Q(0,0,t.width,t.height)}function V(e){var t=e.clientWidth,n=e.clientHeight;if(!t&&!n)return $;var r=H(e).getComputedStyle(e),i=W(r),a=i.left+i.right,o=i.top+i.bottom,s=z(r.width),u=z(r.height);if("border-box"===r.boxSizing&&(Math.round(s+a)!==t&&(s-=G(r,"left","right")+a),Math.round(u+o)!==n&&(u-=G(r,"top","bottom")+o)),!Z(e)){var c=Math.round(s+a)-t,l=Math.round(u+o)-n;1!==Math.abs(c)&&(s-=c),1!==Math.abs(l)&&(u-=l)}return Q(i.left,i.top,s,u)}var q="undefined"!=typeof SVGGraphicsElement?function(e){return e instanceof H(e).SVGGraphicsElement}:function(e){return e instanceof H(e).SVGElement&&"function"==typeof e.getBBox};function Z(e){return e===H(e).document.documentElement}function X(e){return I?q(e)?K(e):V(e):$}function J(e){var t=e.x,n=e.y,r=e.width,i=e.height,a=Object.create(("undefined"!=typeof DOMRectReadOnly?DOMRectReadOnly:Object).prototype);return U(a,{x:t,y:n,width:r,height:i,top:n,right:t+r,bottom:i+n,left:t}),a}function Q(e,t,n,r){return{x:e,y:t,width:n,height:r}}var ee=function(){function e(e){this.broadcastWidth=0,this.broadcastHeight=0,this.contentRect_=Q(0,0,0,0),this.target=e}return e.prototype.isActive=function(){var e=X(this.target);return this.contentRect_=e,e.width!==this.broadcastWidth||e.height!==this.broadcastHeight},e.prototype.broadcastRect=function(){var e=this.contentRect_;return this.broadcastWidth=e.width,this.broadcastHeight=e.height,e},e}(),et=function(){function e(e,t){var n=J(t);U(this,{target:e,contentRect:n})}return e}(),en=function(){function e(e,t,n){if(this.activeObservations_=[],this.observations_=new C,"function"!=typeof e)throw TypeError("The callback provided as parameter 1 is not a function.");this.callback_=e,this.controller_=t,this.callbackCtx_=n}return e.prototype.observe=function(e){if(!arguments.length)throw TypeError("1 argument required, but only 0 present.");if("undefined"!=typeof Element&&Element instanceof Object){if(!(e instanceof H(e).Element))throw TypeError('parameter 1 is not of type "Element".');var t=this.observations_;!t.has(e)&&(t.set(e,new ee(e)),this.controller_.addObserver(this),this.controller_.refresh())}},e.prototype.unobserve=function(e){if(!arguments.length)throw TypeError("1 argument required, but only 0 present.");if("undefined"!=typeof Element&&Element instanceof Object){if(!(e instanceof H(e).Element))throw TypeError('parameter 1 is not of type "Element".');var t=this.observations_;t.has(e)&&(t.delete(e),t.size||this.controller_.removeObserver(this))}},e.prototype.disconnect=function(){this.clearActive(),this.observations_.clear(),this.controller_.removeObserver(this)},e.prototype.gatherActive=function(){var e=this;this.clearActive(),this.observations_.forEach(function(t){t.isActive()&&e.activeObservations_.push(t)})},e.prototype.broadcastActive=function(){if(this.hasActive()){var e=this.callbackCtx_,t=this.activeObservations_.map(function(e){return new et(e.target,e.broadcastRect())});this.callback_.call(e,t,e),this.clearActive()}},e.prototype.clearActive=function(){this.activeObservations_.splice(0)},e.prototype.hasActive=function(){return this.activeObservations_.length>0},e}(),er="undefined"!=typeof WeakMap?new WeakMap:new C,ei=function(){function e(t){if(!(this instanceof e))throw TypeError("Cannot call a class as a function.");if(!arguments.length)throw TypeError("1 argument required, but only 0 present.");var n=B.getInstance(),r=new en(t,n,this);er.set(this,r)}return e}();["observe","unobserve","disconnect"].forEach(function(e){ei.prototype[e]=function(){var t;return(t=er.get(this))[e].apply(t,arguments)}});var ea=void 0!==D.ResizeObserver?D.ResizeObserver:ei;let eo=ea;var es=function(e){var t=[],n=null,r=function(){for(var r=arguments.length,i=Array(r),a=0;a<r;a++)i[a]=arguments[a];t=i,!n&&(n=requestAnimationFrame(function(){n=null,e.apply(void 0,t)}))};return r.cancel=function(){n&&(cancelAnimationFrame(n),n=null)},r};let eu=es;var ec=n(45697),el=n.n(ec);function ef(e){var t=typeof e;return null!=e&&("object"==t||"function"==t)}let ed=ef;var eh=n(56169),ep=function(){return eh.Z.Date.now()};let eb=ep;var em=eh.Z.Symbol;let eg=em;var ev=Object.prototype,ey=ev.hasOwnProperty,ew=ev.toString,e_=eg?eg.toStringTag:void 0;function eE(e){var t=ey.call(e,e_),n=e[e_];try{e[e_]=void 0;var r=!0}catch(i){}var a=ew.call(e);return r&&(t?e[e_]=n:delete e[e_]),a}let eS=eE;var ek=Object.prototype.toString;function ex(e){return ek.call(e)}let eT=ex;var eM="[object Null]",eO="[object Undefined]",eA=eg?eg.toStringTag:void 0;function eL(e){return null==e?void 0===e?eO:eM:eA&&eA in Object(e)?eS(e):eT(e)}let eC=eL;function eI(e){return null!=e&&"object"==typeof e}let eD=eI;var eN="[object Symbol]";function eP(e){return"symbol"==typeof e||eD(e)&&eC(e)==eN}let eR=eP;var ej=0/0,eF=/^\s+|\s+$/g,eY=/^[-+]0x[0-9a-f]+$/i,eB=/^0b[01]+$/i,eU=/^0o[0-7]+$/i,eH=parseInt;function e$(e){if("number"==typeof e)return e;if(eR(e))return ej;if(ed(e)){var t="function"==typeof e.valueOf?e.valueOf():e;e=ed(t)?t+"":t}if("string"!=typeof e)return 0===e?e:+e;e=e.replace(eF,"");var n=eB.test(e);return n||eU.test(e)?eH(e.slice(2),n?2:8):eY.test(e)?ej:+e}let ez=e$;var eG="Expected a function",eW=Math.max,eK=Math.min;function eV(e,t,n){var r,i,a,o,s,u,c=0,l=!1,f=!1,d=!0;if("function"!=typeof e)throw TypeError(eG);function h(t){var n=r,a=i;return r=i=void 0,c=t,o=e.apply(a,n)}function p(e){return c=e,s=setTimeout(g,t),l?h(e):o}function b(e){var n=e-u,r=e-c,i=t-n;return f?eK(i,a-r):i}function m(e){var n=e-u,r=e-c;return void 0===u||n>=t||n<0||f&&r>=a}function g(){var e=eb();if(m(e))return v(e);s=setTimeout(g,b(e))}function v(e){return(s=void 0,d&&r)?h(e):(r=i=void 0,o)}function y(){void 0!==s&&clearTimeout(s),c=0,r=u=i=s=void 0}function w(){return void 0===s?o:v(eb())}function _(){var e=eb(),n=m(e);if(r=arguments,i=this,u=e,n){if(void 0===s)return p(u);if(f)return clearTimeout(s),s=setTimeout(g,t),h(u)}return void 0===s&&(s=setTimeout(g,t)),o}return t=ez(t)||0,ed(n)&&(l=!!n.leading,a=(f="maxWait"in n)?eW(ez(n.maxWait)||0,t):a,d="trailing"in n?!!n.trailing:d),_.cancel=y,_.flush=w,_}let eq=eV;var eZ="Expected a function";function eX(e,t,n){var r=!0,i=!0;if("function"!=typeof e)throw TypeError(eZ);return ed(n)&&(r="leading"in n?!!n.leading:r,i="trailing"in n?!!n.trailing:i),eq(e,t,{leading:r,maxWait:t,trailing:i})}let eJ=eX;var eQ={debounce:eq,throttle:eJ},e1=function(e){return eQ[e]},e0=function(e){return"function"==typeof e},e2=function(){return"undefined"==typeof window},e3=function(e){return e instanceof Element||e instanceof HTMLDocument};function e4(e){return(e4="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function e5(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}function e6(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function e9(e,t,n){return t&&e6(e.prototype,t),n&&e6(e,n),e}function e8(e,t){return t&&("object"===e4(t)||"function"==typeof t)?t:e7(e)}function e7(e){if(void 0===e)throw ReferenceError("this hasn't been initialised - super() hasn't been called");return e}function te(e){return(te=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function tt(e,t){if("function"!=typeof t&&null!==t)throw TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&tn(e,t)}function tn(e,t){return(tn=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}var tr=function(e){function t(){return e5(this,t),e8(this,te(t).apply(this,arguments))}return tt(t,e),e9(t,[{key:"render",value:function(){return this.props.children}}]),t}(l.PureComponent);let ti=tr;function ta(e){return(ta="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function to(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}function ts(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function tu(e,t,n){return t&&ts(e.prototype,t),n&&ts(e,n),e}function tc(e,t){return t&&("object"===ta(t)||"function"==typeof t)?t:tf(e)}function tl(e){return(tl=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function tf(e){if(void 0===e)throw ReferenceError("this hasn't been initialised - super() hasn't been called");return e}function td(e,t){if("function"!=typeof t&&null!==t)throw TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&th(e,t)}function th(e,t){return(th=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function tp(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var tb=function(e){function t(e){to(this,t),n=tc(this,tl(t).call(this,e)),tp(tf(n),"cancelHandler",function(){n.resizeHandler&&n.resizeHandler.cancel&&(n.resizeHandler.cancel(),n.resizeHandler=null)}),tp(tf(n),"rafClean",function(){n.raf&&n.raf.cancel&&(n.raf.cancel(),n.raf=null)}),tp(tf(n),"toggleObserver",function(e){var t=n.getElement();t&&n.resizeObserver[e]&&n.resizeObserver[e](t)}),tp(tf(n),"getElement",function(){var e=n.props,t=e.querySelector,r=e.targetDomEl;if(!e2()){if(t)return document.querySelector(t);if(r&&e3(r))return r;var i=n.element&&(0,L.findDOMNode)(n.element);if(i)return i.parentElement}}),tp(tf(n),"createUpdater",function(){return n.rafClean(),n.raf=eu(function(e){var t=e.width,r=e.height,i=n.props.onResize;e0(i)&&i(t,r),n.setState({width:t,height:r})}),n.raf}),tp(tf(n),"createResizeHandler",function(e){var t=n.state,r=t.width,i=t.height,a=n.props,o=a.handleWidth,s=a.handleHeight;if(o||s){var u=n.createUpdater();e.forEach(function(e){var t=e&&e.contentRect||{},a=t.width,c=t.height,l=o&&r!==a,f=s&&i!==c,d=l||f;n.skipOnMount||!d||e2()||u({width:a,height:c}),n.skipOnMount=!1})}}),tp(tf(n),"onRef",function(e){n.element=e}),tp(tf(n),"getRenderType",function(){var e=n.props,t=e.render,r=e.children;return e0(t)?"renderProp":e0(r)?"childFunction":(0,l.isValidElement)(r)?"child":Array.isArray(r)?"childArray":"parent"}),tp(tf(n),"getTargetComponent",function(){var e,t=n.props,r=t.render,i=t.children,a=t.nodeType,o=n.state,s={width:o.width,height:o.height},u=n.getRenderType();switch(u){case"renderProp":return(0,l.cloneElement)(r(s),{key:"resize-detector"});case"childFunction":return(0,l.cloneElement)(i(s));case"child":return(0,l.cloneElement)(i,s);case"childArray":return i.map(function(e){return!!e&&(0,l.cloneElement)(e,s)});default:return(0,l.createElement)(a)}});var n,r=e.skipOnMount,i=e.refreshMode,a=e.refreshRate,o=e.refreshOptions;n.state={width:void 0,height:void 0},n.skipOnMount=r,n.raf=null,n.element=null,n.unmounted=!1;var s=e1(i);return n.resizeHandler=s?s(n.createResizeHandler,a,o):n.createResizeHandler,n.resizeObserver=new eo(n.resizeHandler),n}return td(t,e),tu(t,[{key:"componentDidMount",value:function(){this.toggleObserver("observe")}},{key:"componentWillUnmount",value:function(){this.toggleObserver("unobserve"),this.rafClean(),this.cancelHandler(),this.unmounted=!0}},{key:"render",value:function(){return l.createElement(ti,{ref:this.onRef},this.getTargetComponent())}}]),t}(l.PureComponent);tb.propTypes={handleWidth:ec.bool,handleHeight:ec.bool,skipOnMount:ec.bool,refreshRate:ec.number,refreshMode:ec.string,refreshOptions:(0,ec.shape)({leading:ec.bool,trailing:ec.bool}),querySelector:ec.string,targetDomEl:ec.any,onResize:ec.func,render:ec.func,children:ec.any,nodeType:ec.node},tb.defaultProps={handleWidth:!1,handleHeight:!1,skipOnMount:!1,refreshRate:1e3,refreshMode:void 0,refreshOptions:void 0,querySelector:null,targetDomEl:null,onResize:null,render:void 0,children:null,nodeType:"div"};let tm=tb,tg=tm;var tv=n(15857),ty=n(26842),tw=n(82067),t_=n(70087),tE=n(31126);function tS(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function tk(e){if(Array.isArray(e))return e}function tx(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function tT(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function tM(e,t){return tk(e)||tx(e,t)||tO(e,t)||tT()}function tO(e,t){if(e){if("string"==typeof e)return tS(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return tS(e,t)}}var tA=function(e){return{accountButton:{fontSize:32,color:e.palette.primary.main},menuList:{paddingTop:0,paddingBottom:0}}},tL=(0,b.withStyles)(tA)(function(e){var t=e.classes,n=(0,A.I0)(),r=tM(l.useState(null),2),i=r[0],a=r[1],o=function(e){a(e.currentTarget)},s=function(){a(null)},u=function(){n((0,ty.EO)()),s()},c=function(){n((0,ty.iw)()),s()};return l.createElement(l.Fragment,null,l.createElement(y.default,{disableRipple:!0,onClick:o},l.createElement(tw.Z,{className:t.accountButton})),l.createElement(t_.Z,{id:"account-menu",anchorEl:i,getContentAnchorEl:null,anchorOrigin:{vertical:"bottom",horizontal:"center"},transformOrigin:{vertical:8,horizontal:64},open:Boolean(i),onClose:s,disableAutoFocusItem:!0,MenuListProps:{className:t.menuList}},l.createElement(tE.default,{onClick:c},"Register MFA Token"),l.createElement(tE.default,{onClick:u},"Log out")))}),tC=n(9969),tI=n(76);function tD(){return(tD=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}var tN=function(e){return l.createElement(tE.default,tD({button:!0},e,{component:tI.rU}),e.children)};function tP(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function tR(e){if(Array.isArray(e))return e}function tj(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function tF(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function tY(e,t){return tR(e)||tj(e,t)||tB(e,t)||tF()}function tB(e,t){if(e){if("string"==typeof e)return tP(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return tP(e,t)}}var tU=function(e){return{iconButton:{fontSize:32,color:e.palette.primary.main},menuList:{paddingTop:0,paddingBottom:0}}},tH=(0,b.withStyles)(tU)(function(e){var t=e.classes,n=tY(l.useState(null),2),r=n[0],i=n[1],a=function(e){i(e.currentTarget)},o=function(){i(null)};return l.createElement(l.Fragment,null,l.createElement(y.default,{disableRipple:!0,onClick:a},l.createElement(tC.Z,{className:t.iconButton})),l.createElement(t_.Z,{id:"settings-menu",anchorEl:r,getContentAnchorEl:null,anchorOrigin:{vertical:"bottom",horizontal:"center"},transformOrigin:{vertical:8,horizontal:128},open:Boolean(r),onClose:o,disableAutoFocusItem:!0,MenuListProps:{className:t.menuList}},l.createElement(tN,{onClick:o,to:"/keys"},"Key Management"),l.createElement(tN,{onClick:o,to:"/config"},"Configuration")))}),t$=function(e){var t=e.children,n=e.href,r=e.id,i=e.className,a=e.onClick;return l.createElement(tI.rU,{to:n,id:r,className:i,onClick:a},t)};let tz=t$;var tG=n(79424),tW=function(e){return{root:{flexGrow:1,height:3,overflow:"hidden"},colorPrimary:{backgroundColor:e.palette.background.default},barColorPrimary:{backgroundColor:e.palette.primary.main}}},tK=function(e){var t=e.classes,n=e.fetchCount,r={colorPrimary:t.colorPrimary,barColorPrimary:t.barColorPrimary};return l.createElement("div",{className:t.root},n>0&&l.createElement(tG.Z,{variant:"indeterminate",classes:r}))};tK.propTypes={fetchCount:el().number.isRequired};let tV=(0,b.withStyles)(tW)(tK);var tq=n(5536);let tZ=n.p+"ba8bbf16ebf8e1d05bef.svg";function tX(){return(tX=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}var tJ=function(e){return l.createElement(tq.T,tX({src:tZ,alt:"Chainlink Operator"},e))};tJ.propTypes={width:el().number,height:el().number};let tQ=tJ;function t1(e){return e.fetching.count}var t0=n(70655);function t2(e){return(t2="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function t3(e){return"object"==t2(e)&&null!==e}var t4=n(99763);function t5(e,t){for(var n,r=/\r\n|[\n\r]/g,i=1,a=t+1;(n=r.exec(e.body))&&n.index<t;)i+=1,a=t+1-(n.index+n[0].length);return{line:i,column:a}}function t6(e){return t9(e.source,t5(e.source,e.start))}function t9(e,t){var n=e.locationOffset.column-1,r=t7(n)+e.body,i=t.line-1,a=e.locationOffset.line-1,o=t.line+a,s=1===t.line?n:0,u=t.column+s,c="".concat(e.name,":").concat(o,":").concat(u,"\n"),l=r.split(/\r\n|[\n\r]/g),f=l[i];if(f.length>120){for(var d=Math.floor(u/80),h=u%80,p=[],b=0;b<f.length;b+=80)p.push(f.slice(b,b+80));return c+t8([["".concat(o),p[0]]].concat(p.slice(1,d+1).map(function(e){return["",e]}),[[" ",t7(h-1)+"^"],["",p[d+1]]]))}return c+t8([["".concat(o-1),l[i-1]],["".concat(o),f],["",t7(u-1)+"^"],["".concat(o+1),l[i+1]]])}function t8(e){var t=e.filter(function(e){return e[0],void 0!==e[1]}),n=Math.max.apply(Math,t.map(function(e){return e[0].length}));return t.map(function(e){var t=e[0],r=e[1];return ne(n,t)+(r?" | "+r:" |")}).join("\n")}function t7(e){return Array(e+1).join(" ")}function ne(e,t){return t7(e-t.length)+t}function nt(e){return(nt="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function nn(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),n.push.apply(n,r)}return n}function nr(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{};t%2?nn(Object(n),!0).forEach(function(t){ni(e,t,n[t])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):nn(Object(n)).forEach(function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))})}return e}function ni(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function na(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}function no(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function ns(e,t,n){return t&&no(e.prototype,t),n&&no(e,n),e}function nu(e,t){if("function"!=typeof t&&null!==t)throw TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&nm(e,t)}function nc(e){var t=np();return function(){var n,r=ng(e);if(t){var i=ng(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return nl(this,n)}}function nl(e,t){return t&&("object"===nt(t)||"function"==typeof t)?t:nf(e)}function nf(e){if(void 0===e)throw ReferenceError("this hasn't been initialised - super() hasn't been called");return e}function nd(e){var t="function"==typeof Map?new Map:void 0;return(nd=function(e){if(null===e||!nb(e))return e;if("function"!=typeof e)throw TypeError("Super expression must either be null or a function");if(void 0!==t){if(t.has(e))return t.get(e);t.set(e,n)}function n(){return nh(e,arguments,ng(this).constructor)}return n.prototype=Object.create(e.prototype,{constructor:{value:n,enumerable:!1,writable:!0,configurable:!0}}),nm(n,e)})(e)}function nh(e,t,n){return(nh=np()?Reflect.construct:function(e,t,n){var r=[null];r.push.apply(r,t);var i=new(Function.bind.apply(e,r));return n&&nm(i,n.prototype),i}).apply(null,arguments)}function np(){if("undefined"==typeof Reflect||!Reflect.construct||Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],function(){})),!0}catch(e){return!1}}function nb(e){return -1!==Function.toString.call(e).indexOf("[native code]")}function nm(e,t){return(nm=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function ng(e){return(ng=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}var nv=function(e){nu(n,e);var t=nc(n);function n(e,r,i,a,o,s,u){na(this,n),(b=t.call(this,e)).name="GraphQLError",b.originalError=null!=s?s:void 0,b.nodes=ny(Array.isArray(r)?r:r?[r]:void 0);for(var c=[],l=0,f=null!==(m=b.nodes)&&void 0!==m?m:[];l<f.length;l++){var d,h,p,b,m,g=f[l].loc;null!=g&&c.push(g)}c=ny(c),b.source=null!=i?i:null===(d=c)||void 0===d?void 0:d[0].source,b.positions=null!=a?a:null===(h=c)||void 0===h?void 0:h.map(function(e){return e.start}),b.locations=a&&i?a.map(function(e){return t5(i,e)}):null===(p=c)||void 0===p?void 0:p.map(function(e){return t5(e.source,e.start)}),b.path=null!=o?o:void 0;var v=null==s?void 0:s.extensions;return(null==u&&t3(v)?b.extensions=nr({},v):b.extensions=null!=u?u:{},Object.defineProperties(nf(b),{message:{enumerable:!0},locations:{enumerable:null!=b.locations},path:{enumerable:null!=b.path},extensions:{enumerable:null!=b.extensions&&Object.keys(b.extensions).length>0},name:{enumerable:!1},nodes:{enumerable:!1},source:{enumerable:!1},positions:{enumerable:!1},originalError:{enumerable:!1}}),null!=s&&s.stack)?(Object.defineProperty(nf(b),"stack",{value:s.stack,writable:!0,configurable:!0}),nl(b)):(Error.captureStackTrace?Error.captureStackTrace(nf(b),n):Object.defineProperty(nf(b),"stack",{value:Error().stack,writable:!0,configurable:!0}),b)}return ns(n,[{key:"toString",value:function(){return nw(this)}},{key:t4.YF,get:function(){return"Object"}}]),n}(nd(Error));function ny(e){return void 0===e||0===e.length?void 0:e}function nw(e){var t=e.message;if(e.nodes)for(var n=0,r=e.nodes;n<r.length;n++){var i=r[n];i.loc&&(t+="\n\n"+t6(i.loc))}else if(e.source&&e.locations)for(var a=0,o=e.locations;a<o.length;a++){var s=o[a];t+="\n\n"+t9(e.source,s)}return t}function n_(e,t,n){return new nv("Syntax Error: ".concat(n),void 0,e,[t])}var nE=n(97359),nS=n(25217),nk=Object.freeze({SOF:"<SOF>",EOF:"<EOF>",BANG:"!",DOLLAR:"$",AMP:"&",PAREN_L:"(",PAREN_R:")",SPREAD:"...",COLON:":",EQUALS:"=",AT:"@",BRACKET_L:"[",BRACKET_R:"]",BRACE_L:"{",PIPE:"|",BRACE_R:"}",NAME:"Name",INT:"Int",FLOAT:"Float",STRING:"String",BLOCK_STRING:"BlockString",COMMENT:"Comment"}),nx=n(10143),nT=Object.freeze({QUERY:"QUERY",MUTATION:"MUTATION",SUBSCRIPTION:"SUBSCRIPTION",FIELD:"FIELD",FRAGMENT_DEFINITION:"FRAGMENT_DEFINITION",FRAGMENT_SPREAD:"FRAGMENT_SPREAD",INLINE_FRAGMENT:"INLINE_FRAGMENT",VARIABLE_DEFINITION:"VARIABLE_DEFINITION",SCHEMA:"SCHEMA",SCALAR:"SCALAR",OBJECT:"OBJECT",FIELD_DEFINITION:"FIELD_DEFINITION",ARGUMENT_DEFINITION:"ARGUMENT_DEFINITION",INTERFACE:"INTERFACE",UNION:"UNION",ENUM:"ENUM",ENUM_VALUE:"ENUM_VALUE",INPUT_OBJECT:"INPUT_OBJECT",INPUT_FIELD_DEFINITION:"INPUT_FIELD_DEFINITION"}),nM=n(87392),nO=function(){function e(e){var t=new nS.WU(nk.SOF,0,0,0,0,null);this.source=e,this.lastToken=t,this.token=t,this.line=1,this.lineStart=0}var t=e.prototype;return t.advance=function(){return this.lastToken=this.token,this.token=this.lookahead()},t.lookahead=function(){var e,t=this.token;if(t.kind!==nk.EOF)do t=null!==(e=t.next)&&void 0!==e?e:t.next=nC(this,t);while(t.kind===nk.COMMENT)return t},e}();function nA(e){return e===nk.BANG||e===nk.DOLLAR||e===nk.AMP||e===nk.PAREN_L||e===nk.PAREN_R||e===nk.SPREAD||e===nk.COLON||e===nk.EQUALS||e===nk.AT||e===nk.BRACKET_L||e===nk.BRACKET_R||e===nk.BRACE_L||e===nk.PIPE||e===nk.BRACE_R}function nL(e){return isNaN(e)?nk.EOF:e<127?JSON.stringify(String.fromCharCode(e)):'"\\u'.concat(("00"+e.toString(16).toUpperCase()).slice(-4),'"')}function nC(e,t){for(var n=e.source,r=n.body,i=r.length,a=t.end;a<i;){var o=r.charCodeAt(a),s=e.line,u=1+a-e.lineStart;switch(o){case 65279:case 9:case 32:case 44:++a;continue;case 10:++a,++e.line,e.lineStart=a;continue;case 13:10===r.charCodeAt(a+1)?a+=2:++a,++e.line,e.lineStart=a;continue;case 33:return new nS.WU(nk.BANG,a,a+1,s,u,t);case 35:return nD(n,a,s,u,t);case 36:return new nS.WU(nk.DOLLAR,a,a+1,s,u,t);case 38:return new nS.WU(nk.AMP,a,a+1,s,u,t);case 40:return new nS.WU(nk.PAREN_L,a,a+1,s,u,t);case 41:return new nS.WU(nk.PAREN_R,a,a+1,s,u,t);case 46:if(46===r.charCodeAt(a+1)&&46===r.charCodeAt(a+2))return new nS.WU(nk.SPREAD,a,a+3,s,u,t);break;case 58:return new nS.WU(nk.COLON,a,a+1,s,u,t);case 61:return new nS.WU(nk.EQUALS,a,a+1,s,u,t);case 64:return new nS.WU(nk.AT,a,a+1,s,u,t);case 91:return new nS.WU(nk.BRACKET_L,a,a+1,s,u,t);case 93:return new nS.WU(nk.BRACKET_R,a,a+1,s,u,t);case 123:return new nS.WU(nk.BRACE_L,a,a+1,s,u,t);case 124:return new nS.WU(nk.PIPE,a,a+1,s,u,t);case 125:return new nS.WU(nk.BRACE_R,a,a+1,s,u,t);case 34:if(34===r.charCodeAt(a+1)&&34===r.charCodeAt(a+2))return nj(n,a,s,u,t,e);return nR(n,a,s,u,t);case 45:case 48:case 49:case 50:case 51:case 52:case 53:case 54:case 55:case 56:case 57:return nN(n,a,o,s,u,t);case 65:case 66:case 67:case 68:case 69:case 70:case 71:case 72:case 73:case 74:case 75:case 76:case 77:case 78:case 79:case 80:case 81:case 82:case 83:case 84:case 85:case 86:case 87:case 88:case 89:case 90:case 95:case 97:case 98:case 99:case 100:case 101:case 102:case 103:case 104:case 105:case 106:case 107:case 108:case 109:case 110:case 111:case 112:case 113:case 114:case 115:case 116:case 117:case 118:case 119:case 120:case 121:case 122:return nB(n,a,s,u,t)}throw n_(n,a,nI(o))}var c=e.line,l=1+a-e.lineStart;return new nS.WU(nk.EOF,i,i,c,l,t)}function nI(e){return e<32&&9!==e&&10!==e&&13!==e?"Cannot contain the invalid character ".concat(nL(e),"."):39===e?"Unexpected single quote character ('), did you mean to use a double quote (\")?":"Cannot parse the unexpected character ".concat(nL(e),".")}function nD(e,t,n,r,i){var a,o=e.body,s=t;do a=o.charCodeAt(++s);while(!isNaN(a)&&(a>31||9===a))return new nS.WU(nk.COMMENT,t,s,n,r,i,o.slice(t+1,s))}function nN(e,t,n,r,i,a){var o=e.body,s=n,u=t,c=!1;if(45===s&&(s=o.charCodeAt(++u)),48===s){if((s=o.charCodeAt(++u))>=48&&s<=57)throw n_(e,u,"Invalid number, unexpected digit after 0: ".concat(nL(s),"."))}else u=nP(e,u,s),s=o.charCodeAt(u);if(46===s&&(c=!0,s=o.charCodeAt(++u),u=nP(e,u,s),s=o.charCodeAt(u)),(69===s||101===s)&&(c=!0,(43===(s=o.charCodeAt(++u))||45===s)&&(s=o.charCodeAt(++u)),u=nP(e,u,s),s=o.charCodeAt(u)),46===s||nU(s))throw n_(e,u,"Invalid number, expected digit but got: ".concat(nL(s),"."));return new nS.WU(c?nk.FLOAT:nk.INT,t,u,r,i,a,o.slice(t,u))}function nP(e,t,n){var r=e.body,i=t,a=n;if(a>=48&&a<=57){do a=r.charCodeAt(++i);while(a>=48&&a<=57)return i}throw n_(e,i,"Invalid number, expected digit but got: ".concat(nL(a),"."))}function nR(e,t,n,r,i){for(var a=e.body,o=t+1,s=o,u=0,c="";o<a.length&&!isNaN(u=a.charCodeAt(o))&&10!==u&&13!==u;){if(34===u)return c+=a.slice(s,o),new nS.WU(nk.STRING,t,o+1,n,r,i,c);if(u<32&&9!==u)throw n_(e,o,"Invalid character within String: ".concat(nL(u),"."));if(++o,92===u){switch(c+=a.slice(s,o-1),u=a.charCodeAt(o)){case 34:c+='"';break;case 47:c+="/";break;case 92:c+="\\";break;case 98:c+="\b";break;case 102:c+="\f";break;case 110:c+="\n";break;case 114:c+="\r";break;case 116:c+="	";break;case 117:var l=nF(a.charCodeAt(o+1),a.charCodeAt(o+2),a.charCodeAt(o+3),a.charCodeAt(o+4));if(l<0){var f=a.slice(o+1,o+5);throw n_(e,o,"Invalid character escape sequence: \\u".concat(f,"."))}c+=String.fromCharCode(l),o+=4;break;default:throw n_(e,o,"Invalid character escape sequence: \\".concat(String.fromCharCode(u),"."))}s=++o}}throw n_(e,o,"Unterminated string.")}function nj(e,t,n,r,i,a){for(var o=e.body,s=t+3,u=s,c=0,l="";s<o.length&&!isNaN(c=o.charCodeAt(s));){if(34===c&&34===o.charCodeAt(s+1)&&34===o.charCodeAt(s+2))return l+=o.slice(u,s),new nS.WU(nk.BLOCK_STRING,t,s+3,n,r,i,(0,nM.W7)(l));if(c<32&&9!==c&&10!==c&&13!==c)throw n_(e,s,"Invalid character within String: ".concat(nL(c),"."));10===c?(++s,++a.line,a.lineStart=s):13===c?(10===o.charCodeAt(s+1)?s+=2:++s,++a.line,a.lineStart=s):92===c&&34===o.charCodeAt(s+1)&&34===o.charCodeAt(s+2)&&34===o.charCodeAt(s+3)?(l+=o.slice(u,s)+'"""',s+=4,u=s):++s}throw n_(e,s,"Unterminated string.")}function nF(e,t,n,r){return nY(e)<<12|nY(t)<<8|nY(n)<<4|nY(r)}function nY(e){return e>=48&&e<=57?e-48:e>=65&&e<=70?e-55:e>=97&&e<=102?e-87:-1}function nB(e,t,n,r,i){for(var a=e.body,o=a.length,s=t+1,u=0;s!==o&&!isNaN(u=a.charCodeAt(s))&&(95===u||u>=48&&u<=57||u>=65&&u<=90||u>=97&&u<=122);)++s;return new nS.WU(nk.NAME,t,s,n,r,i,a.slice(t,s))}function nU(e){return 95===e||e>=65&&e<=90||e>=97&&e<=122}function nH(e,t){return new n$(e,t).parseDocument()}var n$=function(){function e(e,t){var n=(0,nx.T)(e)?e:new nx.H(e);this._lexer=new nO(n),this._options=t}var t=e.prototype;return t.parseName=function(){var e=this.expectToken(nk.NAME);return{kind:nE.h.NAME,value:e.value,loc:this.loc(e)}},t.parseDocument=function(){var e=this._lexer.token;return{kind:nE.h.DOCUMENT,definitions:this.many(nk.SOF,this.parseDefinition,nk.EOF),loc:this.loc(e)}},t.parseDefinition=function(){if(this.peek(nk.NAME))switch(this._lexer.token.value){case"query":case"mutation":case"subscription":return this.parseOperationDefinition();case"fragment":return this.parseFragmentDefinition();case"schema":case"scalar":case"type":case"interface":case"union":case"enum":case"input":case"directive":return this.parseTypeSystemDefinition();case"extend":return this.parseTypeSystemExtension()}else if(this.peek(nk.BRACE_L))return this.parseOperationDefinition();else if(this.peekDescription())return this.parseTypeSystemDefinition();throw this.unexpected()},t.parseOperationDefinition=function(){var e,t=this._lexer.token;if(this.peek(nk.BRACE_L))return{kind:nE.h.OPERATION_DEFINITION,operation:"query",name:void 0,variableDefinitions:[],directives:[],selectionSet:this.parseSelectionSet(),loc:this.loc(t)};var n=this.parseOperationType();return this.peek(nk.NAME)&&(e=this.parseName()),{kind:nE.h.OPERATION_DEFINITION,operation:n,name:e,variableDefinitions:this.parseVariableDefinitions(),directives:this.parseDirectives(!1),selectionSet:this.parseSelectionSet(),loc:this.loc(t)}},t.parseOperationType=function(){var e=this.expectToken(nk.NAME);switch(e.value){case"query":return"query";case"mutation":return"mutation";case"subscription":return"subscription"}throw this.unexpected(e)},t.parseVariableDefinitions=function(){return this.optionalMany(nk.PAREN_L,this.parseVariableDefinition,nk.PAREN_R)},t.parseVariableDefinition=function(){var e=this._lexer.token;return{kind:nE.h.VARIABLE_DEFINITION,variable:this.parseVariable(),type:(this.expectToken(nk.COLON),this.parseTypeReference()),defaultValue:this.expectOptionalToken(nk.EQUALS)?this.parseValueLiteral(!0):void 0,directives:this.parseDirectives(!0),loc:this.loc(e)}},t.parseVariable=function(){var e=this._lexer.token;return this.expectToken(nk.DOLLAR),{kind:nE.h.VARIABLE,name:this.parseName(),loc:this.loc(e)}},t.parseSelectionSet=function(){var e=this._lexer.token;return{kind:nE.h.SELECTION_SET,selections:this.many(nk.BRACE_L,this.parseSelection,nk.BRACE_R),loc:this.loc(e)}},t.parseSelection=function(){return this.peek(nk.SPREAD)?this.parseFragment():this.parseField()},t.parseField=function(){var e,t,n=this._lexer.token,r=this.parseName();return this.expectOptionalToken(nk.COLON)?(e=r,t=this.parseName()):t=r,{kind:nE.h.FIELD,alias:e,name:t,arguments:this.parseArguments(!1),directives:this.parseDirectives(!1),selectionSet:this.peek(nk.BRACE_L)?this.parseSelectionSet():void 0,loc:this.loc(n)}},t.parseArguments=function(e){var t=e?this.parseConstArgument:this.parseArgument;return this.optionalMany(nk.PAREN_L,t,nk.PAREN_R)},t.parseArgument=function(){var e=this._lexer.token,t=this.parseName();return this.expectToken(nk.COLON),{kind:nE.h.ARGUMENT,name:t,value:this.parseValueLiteral(!1),loc:this.loc(e)}},t.parseConstArgument=function(){var e=this._lexer.token;return{kind:nE.h.ARGUMENT,name:this.parseName(),value:(this.expectToken(nk.COLON),this.parseValueLiteral(!0)),loc:this.loc(e)}},t.parseFragment=function(){var e=this._lexer.token;this.expectToken(nk.SPREAD);var t=this.expectOptionalKeyword("on");return!t&&this.peek(nk.NAME)?{kind:nE.h.FRAGMENT_SPREAD,name:this.parseFragmentName(),directives:this.parseDirectives(!1),loc:this.loc(e)}:{kind:nE.h.INLINE_FRAGMENT,typeCondition:t?this.parseNamedType():void 0,directives:this.parseDirectives(!1),selectionSet:this.parseSelectionSet(),loc:this.loc(e)}},t.parseFragmentDefinition=function(){var e,t=this._lexer.token;return(this.expectKeyword("fragment"),(null===(e=this._options)||void 0===e?void 0:e.experimentalFragmentVariables)===!0)?{kind:nE.h.FRAGMENT_DEFINITION,name:this.parseFragmentName(),variableDefinitions:this.parseVariableDefinitions(),typeCondition:(this.expectKeyword("on"),this.parseNamedType()),directives:this.parseDirectives(!1),selectionSet:this.parseSelectionSet(),loc:this.loc(t)}:{kind:nE.h.FRAGMENT_DEFINITION,name:this.parseFragmentName(),typeCondition:(this.expectKeyword("on"),this.parseNamedType()),directives:this.parseDirectives(!1),selectionSet:this.parseSelectionSet(),loc:this.loc(t)}},t.parseFragmentName=function(){if("on"===this._lexer.token.value)throw this.unexpected();return this.parseName()},t.parseValueLiteral=function(e){var t=this._lexer.token;switch(t.kind){case nk.BRACKET_L:return this.parseList(e);case nk.BRACE_L:return this.parseObject(e);case nk.INT:return this._lexer.advance(),{kind:nE.h.INT,value:t.value,loc:this.loc(t)};case nk.FLOAT:return this._lexer.advance(),{kind:nE.h.FLOAT,value:t.value,loc:this.loc(t)};case nk.STRING:case nk.BLOCK_STRING:return this.parseStringLiteral();case nk.NAME:switch(this._lexer.advance(),t.value){case"true":return{kind:nE.h.BOOLEAN,value:!0,loc:this.loc(t)};case"false":return{kind:nE.h.BOOLEAN,value:!1,loc:this.loc(t)};case"null":return{kind:nE.h.NULL,loc:this.loc(t)};default:return{kind:nE.h.ENUM,value:t.value,loc:this.loc(t)}}case nk.DOLLAR:if(!e)return this.parseVariable()}throw this.unexpected()},t.parseStringLiteral=function(){var e=this._lexer.token;return this._lexer.advance(),{kind:nE.h.STRING,value:e.value,block:e.kind===nk.BLOCK_STRING,loc:this.loc(e)}},t.parseList=function(e){var t=this,n=this._lexer.token,r=function(){return t.parseValueLiteral(e)};return{kind:nE.h.LIST,values:this.any(nk.BRACKET_L,r,nk.BRACKET_R),loc:this.loc(n)}},t.parseObject=function(e){var t=this,n=this._lexer.token,r=function(){return t.parseObjectField(e)};return{kind:nE.h.OBJECT,fields:this.any(nk.BRACE_L,r,nk.BRACE_R),loc:this.loc(n)}},t.parseObjectField=function(e){var t=this._lexer.token,n=this.parseName();return this.expectToken(nk.COLON),{kind:nE.h.OBJECT_FIELD,name:n,value:this.parseValueLiteral(e),loc:this.loc(t)}},t.parseDirectives=function(e){for(var t=[];this.peek(nk.AT);)t.push(this.parseDirective(e));return t},t.parseDirective=function(e){var t=this._lexer.token;return this.expectToken(nk.AT),{kind:nE.h.DIRECTIVE,name:this.parseName(),arguments:this.parseArguments(e),loc:this.loc(t)}},t.parseTypeReference=function(){var e,t=this._lexer.token;return(this.expectOptionalToken(nk.BRACKET_L)?(e=this.parseTypeReference(),this.expectToken(nk.BRACKET_R),e={kind:nE.h.LIST_TYPE,type:e,loc:this.loc(t)}):e=this.parseNamedType(),this.expectOptionalToken(nk.BANG))?{kind:nE.h.NON_NULL_TYPE,type:e,loc:this.loc(t)}:e},t.parseNamedType=function(){var e=this._lexer.token;return{kind:nE.h.NAMED_TYPE,name:this.parseName(),loc:this.loc(e)}},t.parseTypeSystemDefinition=function(){var e=this.peekDescription()?this._lexer.lookahead():this._lexer.token;if(e.kind===nk.NAME)switch(e.value){case"schema":return this.parseSchemaDefinition();case"scalar":return this.parseScalarTypeDefinition();case"type":return this.parseObjectTypeDefinition();case"interface":return this.parseInterfaceTypeDefinition();case"union":return this.parseUnionTypeDefinition();case"enum":return this.parseEnumTypeDefinition();case"input":return this.parseInputObjectTypeDefinition();case"directive":return this.parseDirectiveDefinition()}throw this.unexpected(e)},t.peekDescription=function(){return this.peek(nk.STRING)||this.peek(nk.BLOCK_STRING)},t.parseDescription=function(){if(this.peekDescription())return this.parseStringLiteral()},t.parseSchemaDefinition=function(){var e=this._lexer.token,t=this.parseDescription();this.expectKeyword("schema");var n=this.parseDirectives(!0),r=this.many(nk.BRACE_L,this.parseOperationTypeDefinition,nk.BRACE_R);return{kind:nE.h.SCHEMA_DEFINITION,description:t,directives:n,operationTypes:r,loc:this.loc(e)}},t.parseOperationTypeDefinition=function(){var e=this._lexer.token,t=this.parseOperationType();this.expectToken(nk.COLON);var n=this.parseNamedType();return{kind:nE.h.OPERATION_TYPE_DEFINITION,operation:t,type:n,loc:this.loc(e)}},t.parseScalarTypeDefinition=function(){var e=this._lexer.token,t=this.parseDescription();this.expectKeyword("scalar");var n=this.parseName(),r=this.parseDirectives(!0);return{kind:nE.h.SCALAR_TYPE_DEFINITION,description:t,name:n,directives:r,loc:this.loc(e)}},t.parseObjectTypeDefinition=function(){var e=this._lexer.token,t=this.parseDescription();this.expectKeyword("type");var n=this.parseName(),r=this.parseImplementsInterfaces(),i=this.parseDirectives(!0),a=this.parseFieldsDefinition();return{kind:nE.h.OBJECT_TYPE_DEFINITION,description:t,name:n,interfaces:r,directives:i,fields:a,loc:this.loc(e)}},t.parseImplementsInterfaces=function(){var e;if(!this.expectOptionalKeyword("implements"))return[];if((null===(e=this._options)||void 0===e?void 0:e.allowLegacySDLImplementsInterfaces)===!0){var t=[];this.expectOptionalToken(nk.AMP);do t.push(this.parseNamedType());while(this.expectOptionalToken(nk.AMP)||this.peek(nk.NAME))return t}return this.delimitedMany(nk.AMP,this.parseNamedType)},t.parseFieldsDefinition=function(){var e;return(null===(e=this._options)||void 0===e?void 0:e.allowLegacySDLEmptyFields)===!0&&this.peek(nk.BRACE_L)&&this._lexer.lookahead().kind===nk.BRACE_R?(this._lexer.advance(),this._lexer.advance(),[]):this.optionalMany(nk.BRACE_L,this.parseFieldDefinition,nk.BRACE_R)},t.parseFieldDefinition=function(){var e=this._lexer.token,t=this.parseDescription(),n=this.parseName(),r=this.parseArgumentDefs();this.expectToken(nk.COLON);var i=this.parseTypeReference(),a=this.parseDirectives(!0);return{kind:nE.h.FIELD_DEFINITION,description:t,name:n,arguments:r,type:i,directives:a,loc:this.loc(e)}},t.parseArgumentDefs=function(){return this.optionalMany(nk.PAREN_L,this.parseInputValueDef,nk.PAREN_R)},t.parseInputValueDef=function(){var e,t=this._lexer.token,n=this.parseDescription(),r=this.parseName();this.expectToken(nk.COLON);var i=this.parseTypeReference();this.expectOptionalToken(nk.EQUALS)&&(e=this.parseValueLiteral(!0));var a=this.parseDirectives(!0);return{kind:nE.h.INPUT_VALUE_DEFINITION,description:n,name:r,type:i,defaultValue:e,directives:a,loc:this.loc(t)}},t.parseInterfaceTypeDefinition=function(){var e=this._lexer.token,t=this.parseDescription();this.expectKeyword("interface");var n=this.parseName(),r=this.parseImplementsInterfaces(),i=this.parseDirectives(!0),a=this.parseFieldsDefinition();return{kind:nE.h.INTERFACE_TYPE_DEFINITION,description:t,name:n,interfaces:r,directives:i,fields:a,loc:this.loc(e)}},t.parseUnionTypeDefinition=function(){var e=this._lexer.token,t=this.parseDescription();this.expectKeyword("union");var n=this.parseName(),r=this.parseDirectives(!0),i=this.parseUnionMemberTypes();return{kind:nE.h.UNION_TYPE_DEFINITION,description:t,name:n,directives:r,types:i,loc:this.loc(e)}},t.parseUnionMemberTypes=function(){return this.expectOptionalToken(nk.EQUALS)?this.delimitedMany(nk.PIPE,this.parseNamedType):[]},t.parseEnumTypeDefinition=function(){var e=this._lexer.token,t=this.parseDescription();this.expectKeyword("enum");var n=this.parseName(),r=this.parseDirectives(!0),i=this.parseEnumValuesDefinition();return{kind:nE.h.ENUM_TYPE_DEFINITION,description:t,name:n,directives:r,values:i,loc:this.loc(e)}},t.parseEnumValuesDefinition=function(){return this.optionalMany(nk.BRACE_L,this.parseEnumValueDefinition,nk.BRACE_R)},t.parseEnumValueDefinition=function(){var e=this._lexer.token,t=this.parseDescription(),n=this.parseName(),r=this.parseDirectives(!0);return{kind:nE.h.ENUM_VALUE_DEFINITION,description:t,name:n,directives:r,loc:this.loc(e)}},t.parseInputObjectTypeDefinition=function(){var e=this._lexer.token,t=this.parseDescription();this.expectKeyword("input");var n=this.parseName(),r=this.parseDirectives(!0),i=this.parseInputFieldsDefinition();return{kind:nE.h.INPUT_OBJECT_TYPE_DEFINITION,description:t,name:n,directives:r,fields:i,loc:this.loc(e)}},t.parseInputFieldsDefinition=function(){return this.optionalMany(nk.BRACE_L,this.parseInputValueDef,nk.BRACE_R)},t.parseTypeSystemExtension=function(){var e=this._lexer.lookahead();if(e.kind===nk.NAME)switch(e.value){case"schema":return this.parseSchemaExtension();case"scalar":return this.parseScalarTypeExtension();case"type":return this.parseObjectTypeExtension();case"interface":return this.parseInterfaceTypeExtension();case"union":return this.parseUnionTypeExtension();case"enum":return this.parseEnumTypeExtension();case"input":return this.parseInputObjectTypeExtension()}throw this.unexpected(e)},t.parseSchemaExtension=function(){var e=this._lexer.token;this.expectKeyword("extend"),this.expectKeyword("schema");var t=this.parseDirectives(!0),n=this.optionalMany(nk.BRACE_L,this.parseOperationTypeDefinition,nk.BRACE_R);if(0===t.length&&0===n.length)throw this.unexpected();return{kind:nE.h.SCHEMA_EXTENSION,directives:t,operationTypes:n,loc:this.loc(e)}},t.parseScalarTypeExtension=function(){var e=this._lexer.token;this.expectKeyword("extend"),this.expectKeyword("scalar");var t=this.parseName(),n=this.parseDirectives(!0);if(0===n.length)throw this.unexpected();return{kind:nE.h.SCALAR_TYPE_EXTENSION,name:t,directives:n,loc:this.loc(e)}},t.parseObjectTypeExtension=function(){var e=this._lexer.token;this.expectKeyword("extend"),this.expectKeyword("type");var t=this.parseName(),n=this.parseImplementsInterfaces(),r=this.parseDirectives(!0),i=this.parseFieldsDefinition();if(0===n.length&&0===r.length&&0===i.length)throw this.unexpected();return{kind:nE.h.OBJECT_TYPE_EXTENSION,name:t,interfaces:n,directives:r,fields:i,loc:this.loc(e)}},t.parseInterfaceTypeExtension=function(){var e=this._lexer.token;this.expectKeyword("extend"),this.expectKeyword("interface");var t=this.parseName(),n=this.parseImplementsInterfaces(),r=this.parseDirectives(!0),i=this.parseFieldsDefinition();if(0===n.length&&0===r.length&&0===i.length)throw this.unexpected();return{kind:nE.h.INTERFACE_TYPE_EXTENSION,name:t,interfaces:n,directives:r,fields:i,loc:this.loc(e)}},t.parseUnionTypeExtension=function(){var e=this._lexer.token;this.expectKeyword("extend"),this.expectKeyword("union");var t=this.parseName(),n=this.parseDirectives(!0),r=this.parseUnionMemberTypes();if(0===n.length&&0===r.length)throw this.unexpected();return{kind:nE.h.UNION_TYPE_EXTENSION,name:t,directives:n,types:r,loc:this.loc(e)}},t.parseEnumTypeExtension=function(){var e=this._lexer.token;this.expectKeyword("extend"),this.expectKeyword("enum");var t=this.parseName(),n=this.parseDirectives(!0),r=this.parseEnumValuesDefinition();if(0===n.length&&0===r.length)throw this.unexpected();return{kind:nE.h.ENUM_TYPE_EXTENSION,name:t,directives:n,values:r,loc:this.loc(e)}},t.parseInputObjectTypeExtension=function(){var e=this._lexer.token;this.expectKeyword("extend"),this.expectKeyword("input");var t=this.parseName(),n=this.parseDirectives(!0),r=this.parseInputFieldsDefinition();if(0===n.length&&0===r.length)throw this.unexpected();return{kind:nE.h.INPUT_OBJECT_TYPE_EXTENSION,name:t,directives:n,fields:r,loc:this.loc(e)}},t.parseDirectiveDefinition=function(){var e=this._lexer.token,t=this.parseDescription();this.expectKeyword("directive"),this.expectToken(nk.AT);var n=this.parseName(),r=this.parseArgumentDefs(),i=this.expectOptionalKeyword("repeatable");this.expectKeyword("on");var a=this.parseDirectiveLocations();return{kind:nE.h.DIRECTIVE_DEFINITION,description:t,name:n,arguments:r,repeatable:i,locations:a,loc:this.loc(e)}},t.parseDirectiveLocations=function(){return this.delimitedMany(nk.PIPE,this.parseDirectiveLocation)},t.parseDirectiveLocation=function(){var e=this._lexer.token,t=this.parseName();if(void 0!==nT[t.value])return t;throw this.unexpected(e)},t.loc=function(e){var t;if((null===(t=this._options)||void 0===t?void 0:t.noLocation)!==!0)return new nS.Ye(e,this._lexer.lastToken,this._lexer.source)},t.peek=function(e){return this._lexer.token.kind===e},t.expectToken=function(e){var t=this._lexer.token;if(t.kind===e)return this._lexer.advance(),t;throw n_(this._lexer.source,t.start,"Expected ".concat(nG(e),", found ").concat(nz(t),"."))},t.expectOptionalToken=function(e){var t=this._lexer.token;if(t.kind===e)return this._lexer.advance(),t},t.expectKeyword=function(e){var t=this._lexer.token;if(t.kind===nk.NAME&&t.value===e)this._lexer.advance();else throw n_(this._lexer.source,t.start,'Expected "'.concat(e,'", found ').concat(nz(t),"."))},t.expectOptionalKeyword=function(e){var t=this._lexer.token;return t.kind===nk.NAME&&t.value===e&&(this._lexer.advance(),!0)},t.unexpected=function(e){var t=null!=e?e:this._lexer.token;return n_(this._lexer.source,t.start,"Unexpected ".concat(nz(t),"."))},t.any=function(e,t,n){this.expectToken(e);for(var r=[];!this.expectOptionalToken(n);)r.push(t.call(this));return r},t.optionalMany=function(e,t,n){if(this.expectOptionalToken(e)){var r=[];do r.push(t.call(this));while(!this.expectOptionalToken(n))return r}return[]},t.many=function(e,t,n){this.expectToken(e);var r=[];do r.push(t.call(this));while(!this.expectOptionalToken(n))return r},t.delimitedMany=function(e,t){this.expectOptionalToken(e);var n=[];do n.push(t.call(this));while(this.expectOptionalToken(e))return n},e}();function nz(e){var t=e.value;return nG(e.kind)+(null!=t?' "'.concat(t,'"'):"")}function nG(e){return nA(e)?'"'.concat(e,'"'):e}var nW=new Map,nK=new Map,nV=!0,nq=!1;function nZ(e){return e.replace(/[\s,]+/g," ").trim()}function nX(e){return nZ(e.source.body.substring(e.start,e.end))}function nJ(e){var t=new Set,n=[];return e.definitions.forEach(function(e){if("FragmentDefinition"===e.kind){var r=e.name.value,i=nX(e.loc),a=nK.get(r);a&&!a.has(i)?nV&&console.warn("Warning: fragment with name "+r+" already exists.\ngraphql-tag enforces all fragment names across your application to be unique; read more about\nthis in the docs: http://dev.apollodata.com/core/fragments.html#unique-names"):a||nK.set(r,a=new Set),a.add(i),t.has(i)||(t.add(i),n.push(e))}else n.push(e)}),(0,t0.pi)((0,t0.pi)({},e),{definitions:n})}function nQ(e){var t=new Set(e.definitions);t.forEach(function(e){e.loc&&delete e.loc,Object.keys(e).forEach(function(n){var r=e[n];r&&"object"==typeof r&&t.add(r)})});var n=e.loc;return n&&(delete n.startToken,delete n.endToken),e}function n1(e){var t=nZ(e);if(!nW.has(t)){var n=nH(e,{experimentalFragmentVariables:nq,allowLegacyFragmentVariables:nq});if(!n||"Document"!==n.kind)throw Error("Not a valid GraphQL document.");nW.set(t,nQ(nJ(n)))}return nW.get(t)}function n0(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];"string"==typeof e&&(e=[e]);var r=e[0];return t.forEach(function(t,n){t&&"Document"===t.kind?r+=t.loc.source.body:r+=t,r+=e[n+1]}),n1(r)}function n2(){nW.clear(),nK.clear()}function n3(){nV=!1}function n4(){nq=!0}function n5(){nq=!1}var n6,n9={gql:n0,resetCaches:n2,disableFragmentWarnings:n3,enableExperimentalFragmentVariables:n4,disableExperimentalFragmentVariables:n5};(n6=n0||(n0={})).gql=n9.gql,n6.resetCaches=n9.resetCaches,n6.disableFragmentWarnings=n9.disableFragmentWarnings,n6.enableExperimentalFragmentVariables=n9.enableExperimentalFragmentVariables,n6.disableExperimentalFragmentVariables=n9.disableExperimentalFragmentVariables,n0.default=n0;var n8=n(23564),n7=n(83952),re=n(30320),rt=!1,rn=f.useSyncExternalStore||function(e,t,n){var r=t();__DEV__&&!rt&&r!==t()&&(rt=!0,__DEV__&&n7.kG.error("The result of getSnapshot should be cached to avoid an infinite loop"));var i=l.useState({inst:{value:r,getSnapshot:t}}),a=i[0].inst,o=i[1];return re.JC?l.useLayoutEffect(function(){Object.assign(a,{value:r,getSnapshot:t}),rr(a)&&o({inst:a})},[e,r,t]):Object.assign(a,{value:r,getSnapshot:t}),l.useEffect(function(){return rr(a)&&o({inst:a}),e(function(){rr(a)&&o({inst:a})})},[e]),r};function rr(e){var t=e.value,n=e.getSnapshot;try{return t!==n()}catch(r){return!0}}var ri,ra=n(82152),ro=n(14012),rs=n(85317),ru=n(30990),rc=n(1644);(ri=r||(r={}))[ri.Query=0]="Query",ri[ri.Mutation=1]="Mutation",ri[ri.Subscription=2]="Subscription";var rl=new Map;function rf(e){var t;switch(e){case r.Query:t="Query";break;case r.Mutation:t="Mutation";break;case r.Subscription:t="Subscription"}return t}function rd(e){var t,n,i,a=rl.get(e);if(a)return a;__DEV__?(0,n7.kG)(!!e&&!!e.kind,"Argument of ".concat(e," passed to parser was not a valid GraphQL ")+"DocumentNode. You may need to use 'graphql-tag' or another method to convert your operation into a document"):(0,n7.kG)(!!e&&!!e.kind,33);for(var o=[],s=[],u=[],c=[],l=0,f=e.definitions;l<f.length;l++){var d=f[l];if("FragmentDefinition"===d.kind){o.push(d);continue}if("OperationDefinition"===d.kind)switch(d.operation){case"query":s.push(d);break;case"mutation":u.push(d);break;case"subscription":c.push(d)}}__DEV__?(0,n7.kG)(!o.length||s.length||u.length||c.length,"Passing only a fragment to 'graphql' is not yet supported. You must include a query, subscription or mutation as well"):(0,n7.kG)(!o.length||s.length||u.length||c.length,34),__DEV__?(0,n7.kG)(s.length+u.length+c.length<=1,"react-apollo only supports a query, subscription, or a mutation per HOC. "+"".concat(e," had ").concat(s.length," queries, ").concat(c.length," ")+"subscriptions and ".concat(u.length," mutations. ")+"You can use 'compose' to join multiple operation types to a component"):(0,n7.kG)(s.length+u.length+c.length<=1,35),n=s.length?r.Query:r.Mutation,s.length||u.length||(n=r.Subscription);var h=s.length?s:u.length?u:c;__DEV__?(0,n7.kG)(1===h.length,"react-apollo only supports one definition per HOC. ".concat(e," had ")+"".concat(h.length," definitions. ")+"You can use 'compose' to join multiple operation types to a component"):(0,n7.kG)(1===h.length,36);var p=h[0];t=p.variableDefinitions||[];var b={name:i=p.name&&"Name"===p.name.kind?p.name.value:"data",type:n,variables:t};return rl.set(e,b),b}function rh(e,t){var n=rd(e),r=rf(t),i=rf(n.type);__DEV__?(0,n7.kG)(n.type===t,"Running a ".concat(r," requires a graphql ")+"".concat(r,", but a ").concat(i," was used instead.")):(0,n7.kG)(n.type===t,37)}function rp(e){var t=(0,l.useContext)((0,rs.K)()),n=e||t.client;return __DEV__?(0,n7.kG)(!!n,'Could not find "client" in the context or passed in as an option. Wrap the root component in an <ApolloProvider>, or pass an ApolloClient instance in via options.'):(0,n7.kG)(!!n,32),n}var rb=n(10542),rm=n(53712),rg=n(21436),rv=Object.prototype.hasOwnProperty;function ry(e,t){return void 0===t&&(t=Object.create(null)),rw(rp(t.client),e).useQuery(t)}function rw(e,t){var n=(0,l.useRef)();n.current&&e===n.current.client&&t===n.current.query||(n.current=new r_(e,t,n.current));var r=n.current,i=(0,l.useState)(0),a=(i[0],i[1]);return r.forceUpdate=function(){a(function(e){return e+1})},r}var r_=function(){function e(e,t,n){this.client=e,this.query=t,this.ssrDisabledResult=(0,rb.J)({loading:!0,data:void 0,error:void 0,networkStatus:rc.I.loading}),this.skipStandbyResult=(0,rb.J)({loading:!1,data:void 0,error:void 0,networkStatus:rc.I.ready}),this.toQueryResultCache=new(re.mr?WeakMap:Map),rh(t,r.Query);var i=n&&n.result,a=i&&i.data;a&&(this.previousData=a)}return e.prototype.forceUpdate=function(){__DEV__&&n7.kG.warn("Calling default no-op implementation of InternalState#forceUpdate")},e.prototype.executeQuery=function(e){var t,n=this;e.query&&Object.assign(this,{query:e.query}),this.watchQueryOptions=this.createWatchQueryOptions(this.queryHookOptions=e);var r=this.observable.reobserveAsConcast(this.getObsQueryOptions());return this.previousData=(null===(t=this.result)||void 0===t?void 0:t.data)||this.previousData,this.result=void 0,this.forceUpdate(),new Promise(function(e){var t;r.subscribe({next:function(e){t=e},error:function(){e(n.toQueryResult(n.observable.getCurrentResult()))},complete:function(){e(n.toQueryResult(t))}})})},e.prototype.useQuery=function(e){var t=this;this.renderPromises=(0,l.useContext)((0,rs.K)()).renderPromises,this.useOptions(e);var n=this.useObservableQuery(),r=rn((0,l.useCallback)(function(){if(t.renderPromises)return function(){};var e=function(){var e=t.result,r=n.getCurrentResult();!(e&&e.loading===r.loading&&e.networkStatus===r.networkStatus&&(0,ra.D)(e.data,r.data))&&t.setResult(r)},r=function(a){var o=n.last;i.unsubscribe();try{n.resetLastResults(),i=n.subscribe(e,r)}finally{n.last=o}if(!rv.call(a,"graphQLErrors"))throw a;var s=t.result;(!s||s&&s.loading||!(0,ra.D)(a,s.error))&&t.setResult({data:s&&s.data,error:a,loading:!1,networkStatus:rc.I.error})},i=n.subscribe(e,r);return function(){return setTimeout(function(){return i.unsubscribe()})}},[n,this.renderPromises,this.client.disableNetworkFetches,]),function(){return t.getCurrentResult()},function(){return t.getCurrentResult()});return this.unsafeHandlePartialRefetch(r),this.toQueryResult(r)},e.prototype.useOptions=function(t){var n,r=this.createWatchQueryOptions(this.queryHookOptions=t),i=this.watchQueryOptions;!(0,ra.D)(r,i)&&(this.watchQueryOptions=r,i&&this.observable&&(this.observable.reobserve(this.getObsQueryOptions()),this.previousData=(null===(n=this.result)||void 0===n?void 0:n.data)||this.previousData,this.result=void 0)),this.onCompleted=t.onCompleted||e.prototype.onCompleted,this.onError=t.onError||e.prototype.onError,(this.renderPromises||this.client.disableNetworkFetches)&&!1===this.queryHookOptions.ssr&&!this.queryHookOptions.skip?this.result=this.ssrDisabledResult:this.queryHookOptions.skip||"standby"===this.watchQueryOptions.fetchPolicy?this.result=this.skipStandbyResult:(this.result===this.ssrDisabledResult||this.result===this.skipStandbyResult)&&(this.result=void 0)},e.prototype.getObsQueryOptions=function(){var e=[],t=this.client.defaultOptions.watchQuery;return t&&e.push(t),this.queryHookOptions.defaultOptions&&e.push(this.queryHookOptions.defaultOptions),e.push((0,rm.o)(this.observable&&this.observable.options,this.watchQueryOptions)),e.reduce(ro.J)},e.prototype.createWatchQueryOptions=function(e){void 0===e&&(e={});var t,n=e.skip,r=Object.assign((e.ssr,e.onCompleted,e.onError,e.defaultOptions,(0,n8._T)(e,["skip","ssr","onCompleted","onError","defaultOptions"])),{query:this.query});if(this.renderPromises&&("network-only"===r.fetchPolicy||"cache-and-network"===r.fetchPolicy)&&(r.fetchPolicy="cache-first"),r.variables||(r.variables={}),n){var i=r.fetchPolicy,a=void 0===i?this.getDefaultFetchPolicy():i,o=r.initialFetchPolicy;Object.assign(r,{initialFetchPolicy:void 0===o?a:o,fetchPolicy:"standby"})}else r.fetchPolicy||(r.fetchPolicy=(null===(t=this.observable)||void 0===t?void 0:t.options.initialFetchPolicy)||this.getDefaultFetchPolicy());return r},e.prototype.getDefaultFetchPolicy=function(){var e,t;return(null===(e=this.queryHookOptions.defaultOptions)||void 0===e?void 0:e.fetchPolicy)||(null===(t=this.client.defaultOptions.watchQuery)||void 0===t?void 0:t.fetchPolicy)||"cache-first"},e.prototype.onCompleted=function(e){},e.prototype.onError=function(e){},e.prototype.useObservableQuery=function(){var e=this.observable=this.renderPromises&&this.renderPromises.getSSRObservable(this.watchQueryOptions)||this.observable||this.client.watchQuery(this.getObsQueryOptions());this.obsQueryFields=(0,l.useMemo)(function(){return{refetch:e.refetch.bind(e),reobserve:e.reobserve.bind(e),fetchMore:e.fetchMore.bind(e),updateQuery:e.updateQuery.bind(e),startPolling:e.startPolling.bind(e),stopPolling:e.stopPolling.bind(e),subscribeToMore:e.subscribeToMore.bind(e)}},[e]);var t=!(!1===this.queryHookOptions.ssr||this.queryHookOptions.skip);return this.renderPromises&&t&&(this.renderPromises.registerSSRObservable(e),e.getCurrentResult().loading&&this.renderPromises.addObservableQueryPromise(e)),e},e.prototype.setResult=function(e){var t=this.result;t&&t.data&&(this.previousData=t.data),this.result=e,this.forceUpdate(),this.handleErrorOrCompleted(e)},e.prototype.handleErrorOrCompleted=function(e){var t=this;if(!e.loading){var n=this.toApolloError(e);Promise.resolve().then(function(){n?t.onError(n):e.data&&t.onCompleted(e.data)}).catch(function(e){__DEV__&&n7.kG.warn(e)})}},e.prototype.toApolloError=function(e){return(0,rg.O)(e.errors)?new ru.cA({graphQLErrors:e.errors}):e.error},e.prototype.getCurrentResult=function(){return this.result||this.handleErrorOrCompleted(this.result=this.observable.getCurrentResult()),this.result},e.prototype.toQueryResult=function(e){var t=this.toQueryResultCache.get(e);if(t)return t;var n=e.data,r=(e.partial,(0,n8._T)(e,["data","partial"]));return this.toQueryResultCache.set(e,t=(0,n8.pi)((0,n8.pi)((0,n8.pi)({data:n},r),this.obsQueryFields),{client:this.client,observable:this.observable,variables:this.observable.variables,called:!this.queryHookOptions.skip,previousData:this.previousData})),!t.error&&(0,rg.O)(e.errors)&&(t.error=new ru.cA({graphQLErrors:e.errors})),t},e.prototype.unsafeHandlePartialRefetch=function(e){e.partial&&this.queryHookOptions.partialRefetch&&!e.loading&&(!e.data||0===Object.keys(e.data).length)&&"cache-only"!==this.observable.options.fetchPolicy&&(Object.assign(e,{loading:!0,networkStatus:rc.I.refetch}),this.observable.refetch())},e}();function rE(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function rS(e){if(Array.isArray(e))return e}function rk(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function rx(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function rT(e,t){return rS(e)||rk(e,t)||rO(e,t)||rx()}function rM(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function rO(e,t){if(e){if("string"==typeof e)return rE(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return rE(e,t)}}function rA(){var e=rM(["\n  query FetchFeatures {\n    features {\n      ... on Features {\n        __typename\n        csa\n        feedsManager\n      }\n    }\n  }\n"]);return rA=function(){return e},e}(ag=i||(i={})).CSA="csa",ag.FeedsManager="feeds_manager";var rL=n0(rA());function rC(e){var t=ry(rL,{fetchPolicy:"network-only"}).data,n=rT(l.useState(!1),2),r=n[0],a=n[1];return l.useEffect(function(){if((null==t?void 0:t.features.__typename)=="Features")switch(e){case i.CSA:a(null==t?void 0:t.features.csa);break;case i.FeedsManager:a(null==t?void 0:t.features.feedsManager);break;default:a(!1)}},[t,e]),r}function rI(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function rD(e){if(Array.isArray(e))return e}function rN(e){if(Array.isArray(e))return rI(e)}function rP(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function rR(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function rj(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function rF(){throw TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function rY(e,t){return rD(e)||rR(e,t)||rU(e,t)||rj()}function rB(e){return rN(e)||rP(e)||rU(e)||rF()}function rU(e,t){if(e){if("string"==typeof e)return rI(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return rI(e,t)}}var rH=[["/jobs","Jobs"],["/runs","Runs"],["/chains","Chains"],["/nodes","Nodes"],["/bridges","Bridges"],["/transactions","Transactions"],],r$=rB(rH).concat([["/keys","Keys"],["/config","Configuration"],]),rz=240,rG=function(e){var t=e.palette,n=e.spacing;return(0,b.createStyles)({menuitem:{padding:3*n.unit,display:"block"},drawerPaper:{backgroundColor:t.common.white,paddingTop:7*n.unit,width:rz},drawerList:{padding:0}})},rW=(0,b.withStyles)(rG)(function(e){var t=e.drawerOpen,n=e.toggleDrawer,r=e.authenticated,i=e.classes,a=e.submitSignOut,o=e.isFeedsManagerFeatureEnabled;return l.createElement(g.Z,{anchor:"right",open:t,classes:{paper:i.drawerPaper},onClose:n},l.createElement("div",{tabIndex:0,role:"button",onClick:n},l.createElement(w.default,{className:i.drawerList},r$.map(function(e){var t=rY(e,2),n=t[0],r=t[1];return l.createElement(_.default,{key:n,button:!0,component:function(){return l.createElement(tz,{href:n},l.createElement(E.Z,{primary:r}))},className:i.menuitem})}),o&&l.createElement(_.default,{button:!0,component:function(){return l.createElement(tz,{href:"/feeds_manager"},l.createElement(E.Z,{primary:"Feeds Manager"}))},className:i.menuitem}),r&&l.createElement(_.default,{button:!0,onClick:a,className:i.menuitem},l.createElement(E.Z,{primary:"Sign Out"})))))}),rK=function(e){var t=e.palette,n=e.spacing;return(0,b.createStyles)({horizontalNav:{paddingTop:0,paddingBottom:0},horizontalNavItem:{display:"inline"},horizontalNavLink:{color:t.secondary.main,paddingTop:3*n.unit,paddingBottom:3*n.unit,textDecoration:"none",display:"inline-block",borderBottom:"solid 1px",borderBottomColor:t.common.white,"&:hover":{borderBottomColor:t.primary.main}},activeNavLink:{color:t.primary.main,borderBottomColor:t.primary.main}})},rV=(0,b.withStyles)(rK)(function(e){var t=e.authenticated,n=e.classes,r=e.isFeedsManagerFeatureEnabled,i=(0,h.TH)().pathname;return l.createElement(x.default,{variant:"body1",component:"div"},l.createElement(w.default,{className:n.horizontalNav},rH.map(function(e){var t=rY(e,2),r=t[0],a=t[1];return l.createElement(_.default,{key:r,className:n.horizontalNavItem},l.createElement(tz,{key:r,href:r,className:O()(n.horizontalNavLink,i.startsWith(r)&&n.activeNavLink)},a))}),r&&l.createElement(_.default,{className:n.horizontalNavItem},l.createElement(tz,{href:"/feeds_manager",className:O()(n.horizontalNavLink,i.includes("/feeds_manager")&&n.activeNavLink)},"Feeds Manager")),t&&l.createElement(l.Fragment,null,l.createElement(_.default,{className:n.horizontalNavItem},l.createElement(tH,null),l.createElement(tL,null)))))}),rq=function(e){var t=e.palette,n=e.spacing,r=e.zIndex;return(0,b.createStyles)({appBar:{backgroundColor:t.common.white,zIndex:r.modal-1},toolbar:{paddingLeft:5*n.unit,paddingRight:5*n.unit}})},rZ=(0,b.withStyles)(rq)(function(e){var t=e.authenticated,n=e.classes,r=e.fetchCount,a=e.drawerContainer,o=e.onResize,s=e.submitSignOut,u=rY(l.useState(!1),2),c=u[0],f=u[1],h=rC(i.FeedsManager),p=function(){f(!c)};return l.createElement(m.Z,{className:n.appBar,color:"default",position:"absolute"},l.createElement(tg,{refreshMode:"debounce",refreshRate:200,onResize:o,handleHeight:!0},l.createElement(tV,{fetchCount:r}),l.createElement(k.default,{className:n.toolbar},l.createElement(d.Z,{container:!0,alignItems:"center"},l.createElement(d.Z,{item:!0,xs:11,sm:6,md:4},l.createElement(tz,{href:"/"},l.createElement(tQ,{width:200}))),l.createElement(d.Z,{item:!0,xs:1,sm:6,md:8},l.createElement(d.Z,{container:!0,justify:"flex-end"},l.createElement(d.Z,{item:!0},l.createElement(v.Z,{mdUp:!0},l.createElement(y.default,{"aria-label":"open drawer",onClick:p},l.createElement(T.Z,null))),l.createElement(v.Z,{smDown:!0},l.createElement(rV,{authenticated:t,isFeedsManagerFeatureEnabled:h})))))))),l.createElement(S.default,{container:a},l.createElement(rW,{isFeedsManagerFeatureEnabled:h,toggleDrawer:p,drawerOpen:c,authenticated:t,submitSignOut:s})))}),rX=function(e){return{authenticated:e.authentication.allowed,fetchCount:t1(e),url:e.notifications.currentUrl}},rJ=function(e){return(0,tv.DE)({submitSignOut:ty.EO},e)},rQ=(0,A.$j)(rX,rJ)(rZ);let r1=(0,b.withStyles)(rq)(rQ);var r0=n(3950),r2=n(16353),r3=n(19084);function r4(){return(r4=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}var r5=function(e){var t=(0,A.I0)(),n=(0,h.TH)().pathname;return(l.useEffect(function(){t({type:r3.di.MATCH_ROUTE,pathname:n})},[t,n]),(0,r2.rH)(function(e){return e.authentication.allowed}))?l.createElement(h.AW,r4({},e)):l.createElement(h.l_,{to:"/signin"})};let r6=r5;var r9=n(82204),r8=n(15417),r7=n(90070),ie=n(72883),it=n(51531),ir=n(18217),ii=n(17175),ia=n(68821),io=n(21727),is=function(e){return(0,b.createStyles)({paper:{backgroundColor:e.palette.primary.light,padding:2*e.spacing.unit,display:"flex"},icon:{marginRight:e.spacing.unit}})},iu=(0,b.withStyles)(is)(function(e){var t=e.classes;return l.createElement(ia.default,{className:t.paper},l.createElement(io.Z,{className:t.icon}),l.createElement(x.default,null,"Multi-chain functionality is in Beta"))}),ic=function(e){return(0,b.createStyles)({cell:{paddingTop:2*e.spacing.unit,paddingBottom:2*e.spacing.unit},row:{transform:"scale(1)"},link:{"&::before":{content:"''",position:"absolute",top:0,left:0,width:"100%",height:"100%"}}})},il=n(19350),id=function(){return(0,b.createStyles)({link:{color:il.BA[900],textDecoration:"none"},linkContent:{display:"inline-block"}})},ih=function(e){var t=e.children,n=e.classes,r=e.className,i=e.href,a=e.variant,o=e.color,s=a||"body1",u=o||"inherit";return l.createElement(tz,{href:i,className:O()(n.link,r)},l.createElement(x.default,{variant:s,color:u,className:n.linkContent},t))};let ip=(0,b.withStyles)(id)(ih);var ib=(0,b.withStyles)(ic)(function(e){var t=e.chain,n=e.classes;return l.createElement(ii.Z,{className:n.row,hover:!0},l.createElement(ie.default,{className:n.cell,component:"th",scope:"row"},l.createElement(ip,{className:n.link,href:"/chains/".concat(t.id)},t.id)),l.createElement(ie.default,null,t.enabled.toString()))}),im=function(e){return{content:{padding:5*e.spacing.unit}}},ig=function(e){var t=e.children,n=e.classes;return l.createElement("div",{className:n.content},t)};let iv=(0,b.withStyles)(im)(ig);var iy=function(){return(0,b.createStyles)({root:{fontSize:30}})},iw=(0,b.withStyles)(iy)(function(e){var t=e.children,n=e.classes;return l.createElement(x.default,{variant:"h1",className:n.root},t)}),i_=n(60520),iE=function(e){return(0,b.createStyles)({textField:{marginBottom:2*e.spacing.unit},input:{padding:14,backgroundColor:"white",borderRadius:4}})},iS=(0,b.withStyles)(iE)(function(e){var t=e.classes,n=e.onChange,r=e.placeholder,i=e.value;return l.createElement(d.Z,{container:!0,spacing:16},l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(i_.Z,{className:t.textField,inputProps:{className:t.input},InputLabelProps:{shrink:!0},placeholder:r||"Search",value:i,name:"search",onChange:function(e){return n(e.target.value)},variant:"outlined",fullWidth:!0})))});function ik(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function ix(e){if(Array.isArray(e))return e}function iT(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function iM(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function iO(e,t){return ix(e)||iT(e,t)||iA(e,t)||iM()}function iA(e,t){if(e){if("string"==typeof e)return ik(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return ik(e,t)}}var iL=function(e){var t=e.toLowerCase();return function(e){return e.toLowerCase().includes(t)}},iC=function(e){return function(t){return""===e||iI(t,e)}};function iI(e,t){var n;return[e.id].some(iL(t))}var iD=function(e){var t=e.chains,n=e.page,r=e.pageSize,i=e.total,a=(0,h.k6)(),o=iO(l.useState(""),2),s=o[0],u=o[1],c=(0,l.useMemo)(function(){return t.filter(iC(s.trim()))},[s,t]);return l.createElement(iv,null,l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12},l.createElement(iu,null)),l.createElement(d.Z,{item:!0,xs:12},l.createElement(iw,null,"Chains")),l.createElement(d.Z,{item:!0,xs:12},l.createElement(iS,{value:s,onChange:u,placeholder:"Search chains"}),l.createElement(r9.Z,null,l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,"Chain ID"),l.createElement(ie.default,null,"Enabled"))),l.createElement(r7.Z,null,0===c.length&&l.createElement(ii.Z,null,l.createElement(ie.default,{component:"th",scope:"row",colSpan:3},"No chains found")),c.map(function(e){return l.createElement(ib,{key:e.id,chain:e})}))),l.createElement(ir.Z,{component:"div",count:i,rowsPerPage:r,rowsPerPageOptions:[r],page:n-1,onChangePage:function(e,t){a.push("/chains?page=".concat(t+1,"&per=").concat(r))},onChangeRowsPerPage:function(){},backIconButtonProps:{"aria-label":"prev-page"},nextIconButtonProps:{"aria-label":"next-page"}})))))},iN=function(e){var t=e.error,n=(0,h.k6)(),r=(0,A.I0)();return t?(t.graphQLErrors.forEach(function(e){var t;(null===(t=e.extensions)||void 0===t?void 0:t.code)=="UNAUTHORIZED"&&(r((0,ty.Jc)()),n.push("/signin"))}),l.createElement("div",null,"Error: ",t.message)):null},iP=n(30866),iR=function(e){return{root:{margin:2*e.spacing.unit},gridItem:{display:"flex",justifyContent:"center"}}},ij=(0,b.withStyles)(iR)(function(e){var t=e.classes;return l.createElement(d.Z,{container:!0,className:t.root},l.createElement(d.Z,{item:!0,xs:12,className:t.gridItem},l.createElement(iP.Z,{"data-testid":"loading-spinner"})))}),iF=function(){var e=(0,h.TH)().search;return l.useMemo(function(){return new URLSearchParams(e)},[e])};function iY(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function iB(){var e=iY(["\n  fragment ChainsPayload_ResultsFields on Chain {\n    id\n    enabled\n  }\n"]);return iB=function(){return e},e}function iU(){var e=iY(["\n  ","\n  query FetchChains($offset: Int, $limit: Int) {\n    chains(offset: $offset, limit: $limit) {\n      results {\n        ...ChainsPayload_ResultsFields\n      }\n      metadata {\n        total\n      }\n    }\n  }\n"]);return iU=function(){return e},e}var iH=n0(iB()),i$=n0(iU(),iH),iz=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return ry(i$,e)},iG=function(){var e=iF(),t=parseInt(e.get("page")||"1",10),n=parseInt(e.get("per")||"50",10),r=iz({variables:{offset:(t-1)*n,limit:n},fetchPolicy:"network-only"}),i=r.data,a=r.loading,o=r.error;return a?l.createElement(ij,null):o?l.createElement(iN,{error:o}):i?l.createElement(iD,{chains:i.chains.results,page:t,pageSize:n,total:i.chains.metadata.total}):null},iW=n(67932),iK=n(8126),iV="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};function iq(e){if(iZ())return Intl.DateTimeFormat.supportedLocalesOf(e)[0]}function iZ(){return("undefined"==typeof Intl?"undefined":iV(Intl))==="object"&&"function"==typeof Intl.DateTimeFormat}var iX="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},iJ=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}();function iQ(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}var i1=function(){function e(){iQ(this,e),this.cache={}}return iJ(e,[{key:"get",value:function(){for(var e=this.cache,t=arguments.length,n=Array(t),r=0;r<t;r++)n[r]=arguments[r];for(var i=n,a=Array.isArray(i),o=0,i=a?i:i[Symbol.iterator]();;){if(a){if(o>=i.length)break;s=i[o++]}else{if((o=i.next()).done)break;s=o.value}var s,u=s;if((void 0===e?"undefined":iX(e))!=="object")return;e=e[u]}return e}},{key:"put",value:function(){for(var e=arguments.length,t=Array(e),n=0;n<e;n++)t[n]=arguments[n];for(var r=t.pop(),i=t.pop(),a=this.cache,o=t,s=Array.isArray(o),u=0,o=s?o:o[Symbol.iterator]();;){if(s){if(u>=o.length)break;c=o[u++]}else{if((u=o.next()).done)break;c=u.value}var c,l=c;"object"!==iX(a[l])&&(a[l]={}),a=a[l]}return a[i]=r}}]),e}();let i0=i1;var i2=new i0;function i3(e,t){if(!iZ())return function(e){return e.toString()};var n=i5(e),r=JSON.stringify(t),i=i2.get(String(n),r)||i2.put(String(n),r,new Intl.DateTimeFormat(n,t));return function(e){return i.format(e)}}var i4={};function i5(e){var t=e.toString();return i4[t]?i4[t]:i4[t]=iq(e)}var i6="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};function i9(e){return i8(e)?e:new Date(e)}function i8(e){return e instanceof Date||i7(e)}function i7(e){return(void 0===e?"undefined":i6(e))==="object"&&"function"==typeof e.getTime}var ae=n(54087),at=n.n(ae);function an(e,t){if(0===e.length)return 0;for(var n=0,r=e.length-1,i=void 0;n<=r;){var a=t(e[i=Math.floor((r+n)/2)]);if(0===a)return i;if(a<0){if((n=i+1)>r)return n}else if((r=i-1)<n)return n}}var ar=function(){function e(e,t){var n=[],r=!0,i=!1,a=void 0;try{for(var o,s=e[Symbol.iterator]();!(r=(o=s.next()).done)&&(n.push(o.value),!t||n.length!==t);r=!0);}catch(u){i=!0,a=u}finally{try{!r&&s.return&&s.return()}finally{if(i)throw a}}return n}return function(t,n){if(Array.isArray(t))return t;if(Symbol.iterator in Object(t))return e(t,n);throw TypeError("Invalid attempt to destructure non-iterable instance")}}();let ai={instances:[],add:function(e){var t=this,n=0===this.instances.length;return as(this.instances,e),n&&this.start(),{stop:function(){au(t.instances,e),0===t.instances.length&&t.stop()},forceUpdate:function(){ao(e,t.instances)}}},tick:function(){for(var e=Date.now();;){var t=this.instances[0];if(e>=t.nextUpdateTime)ao(t,this.instances);else break}},scheduleNextTick:function(){var e=this;this.scheduledTick=at()(function(){e.tick(),e.scheduleNextTick()})},start:function(){this.scheduleNextTick()},stop:function(){at().cancel(this.scheduledTick)}};function aa(e){var t=ar(e.getNextValue(),2),n=t[0],r=t[1];e.setValue(n),e.nextUpdateTime=r}function ao(e,t){aa(e),au(t,e),as(t,e)}function as(e,t){var n=ac(e,t);e.splice(n,0,t)}function au(e,t){var n=e.indexOf(t);e.splice(n,1)}function ac(e,t){var n=t.nextUpdateTime;return an(e,function(e){return e.nextUpdateTime===n?0:e.nextUpdateTime>n?1:-1})}var al=(0,ec.oneOfType)([(0,ec.shape)({minTime:ec.number,formatAs:ec.string.isRequired}),(0,ec.shape)({test:ec.func,formatAs:ec.string.isRequired}),(0,ec.shape)({minTime:ec.number,format:ec.func.isRequired}),(0,ec.shape)({test:ec.func,format:ec.func.isRequired})]),af=(0,ec.oneOfType)([ec.string,(0,ec.shape)({steps:(0,ec.arrayOf)(al).isRequired,labels:(0,ec.oneOfType)([ec.string,(0,ec.arrayOf)(ec.string)]).isRequired,round:ec.string})]),ad=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},ah=function(){function e(e,t){var n=[],r=!0,i=!1,a=void 0;try{for(var o,s=e[Symbol.iterator]();!(r=(o=s.next()).done)&&(n.push(o.value),!t||n.length!==t);r=!0);}catch(u){i=!0,a=u}finally{try{!r&&s.return&&s.return()}finally{if(i)throw a}}return n}return function(t,n){if(Array.isArray(t))return t;if(Symbol.iterator in Object(t))return e(t,n);throw TypeError("Invalid attempt to destructure non-iterable instance")}}();function ap(e,t){var n={};for(var r in e)!(t.indexOf(r)>=0)&&Object.prototype.hasOwnProperty.call(e,r)&&(n[r]=e[r]);return n}function ab(e){var t=e.date,n=e.future,r=e.timeStyle,i=e.round,a=e.minTimeLeft,o=e.tooltip,s=e.component,u=e.container,c=e.wrapperComponent,f=e.wrapperProps,d=e.locale,h=e.locales,p=e.formatVerboseDate,b=e.verboseDateFormat,m=e.updateInterval,g=e.tick,v=ap(e,["date","future","timeStyle","round","minTimeLeft","tooltip","component","container","wrapperComponent","wrapperProps","locale","locales","formatVerboseDate","verboseDateFormat","updateInterval","tick"]),y=(0,l.useMemo)(function(){return d&&(h=[d]),h.concat(iK.Z.getDefaultLocale())},[d,h]),w=(0,l.useMemo)(function(){return new iK.Z(y)},[y]);t=(0,l.useMemo)(function(){return i9(t)},[t]);var _=(0,l.useCallback)(function(){var e=Date.now(),o=void 0;if(n&&e>=t.getTime()&&(e=t.getTime(),o=!0),void 0!==a){var s=t.getTime()-1e3*a;e>s&&(e=s,o=!0)}var u=w.format(t,r,{getTimeToNextUpdate:!0,now:e,future:n,round:i}),c=ah(u,2),l=c[0],f=c[1];return f=o?av:m||f||6e4,[l,e+f]},[t,n,r,m,i,a,w]),E=(0,l.useRef)();E.current=_;var S=(0,l.useMemo)(_,[]),k=ah(S,2),x=k[0],T=k[1],M=(0,l.useState)(x),O=ah(M,2),A=O[0],L=O[1],C=ah((0,l.useState)(),2),I=C[0],D=C[1],N=(0,l.useRef)();(0,l.useEffect)(function(){if(g)return N.current=ai.add({getNextValue:function(){return E.current()},setValue:L,nextUpdateTime:T}),function(){return N.current.stop()}},[g]),(0,l.useEffect)(function(){if(N.current)N.current.forceUpdate();else{var e=_(),t=ah(e,1)[0];L(t)}},[_]),(0,l.useEffect)(function(){D(!0)},[]);var P=(0,l.useMemo)(function(){if("undefined"!=typeof window)return i3(y,b)},[y,b]),R=(0,l.useMemo)(function(){if("undefined"!=typeof window)return p?p(t):P(t)},[t,p,P]),j=l.createElement(s,ad({date:t,verboseDate:I?R:void 0,tooltip:o},v),A),F=c||u;return F?l.createElement(F,ad({},f,{verboseDate:I?R:void 0}),j):j}ab.propTypes={date:el().oneOfType([el().instanceOf(Date),el().number]).isRequired,locale:el().string,locales:el().arrayOf(el().string),future:el().bool,timeStyle:af,round:el().string,minTimeLeft:el().number,component:el().elementType.isRequired,tooltip:el().bool.isRequired,formatVerboseDate:el().func,verboseDateFormat:el().object,updateInterval:el().oneOfType([el().number,el().arrayOf(el().shape({threshold:el().number,interval:el().number.isRequired}))]),tick:el().bool,wrapperComponent:el().func,wrapperProps:el().object},ab.defaultProps={locales:[],component:ay,tooltip:!0,verboseDateFormat:{weekday:"long",day:"numeric",month:"long",year:"numeric",hour:"numeric",minute:"2-digit",second:"2-digit"},tick:!0},ab=l.memo(ab);let am=ab;var ag,av=31536e9;function ay(e){var t=e.date,n=e.verboseDate,r=e.tooltip,i=e.children,a=ap(e,["date","verboseDate","tooltip","children"]),o=(0,l.useMemo)(function(){return t.toISOString()},[t]);return l.createElement("time",ad({},a,{dateTime:o,title:r?n:void 0}),i)}ay.propTypes={date:el().instanceOf(Date).isRequired,verboseDate:el().string,tooltip:el().bool.isRequired,children:el().string.isRequired};var aw=n(30381),a_=n.n(aw),aE=n(31657);function aS(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function ak(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){aS(e,t,n[t])})}return e}var ax=function(e){var t=e.palette,n=e.shadows,r=e.typography;return(0,b.createStyles)({lightTooltip:ak({background:t.primary.contrastText,color:t.text.primary,boxShadow:n[24]},r.h6)})},aT=function(e){var t=e.title,n=e.children,r=e.classes;return l.createElement(aE.Z,{title:t,classes:{tooltip:r.lightTooltip}},n)},aM=(0,b.withStyles)(ax)(aT),aO=function(e){return e&&a_()(e).format()},aA=function(e){var t=e.children,n=e.tooltip,r=void 0!==n&&n,i=Date.parse(t),a=l.createElement(am,{tooltip:!1,date:i});return r?l.createElement(aM,{title:aO(t)},l.createElement("span",null,a)):a},aL=n(1398);function aC(){return(aC=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}var aI=function(e){return l.createElement("svg",aC({style:{cursor:"pointer"},width:"46",height:"46",viewBox:"0 0 46 46",fill:"none",xmlns:"http://www.w3.org/2000/svg"},e),l.createElement("circle",{r:"22",transform:"matrix(1 0 0 -1 23 23)",stroke:"#364864"}),l.createElement("rect",{width:"1.4605",height:"18.6214",transform:"matrix(0.707107 0.707107 0.707107 -0.707107 16.1333 28.834)",fill:"#686F84"}),l.createElement("rect",{x:"30.3333",y:"28.834",width:"1.4605",height:"18.6214",transform:"rotate(135 30.3333 28.834)",fill:"#686F84"}))};let aD=aI;var aN=n(8330);function aP(e){return e.msg}function aR(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function aj(e){if(Array.isArray(e))return e}function aF(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function aY(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function aB(e,t){return aj(e)||aF(e,t)||aU(e,t)||aY()}function aU(e,t){if(e){if("string"==typeof e)return aR(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return aR(e,t)}}var aH=function(e){return(0,b.createStyles)({container:{backgroundColor:e.palette.common.white,padding:5*e.spacing.unit,paddingBottom:0},mainRow:{marginBottom:2*e.spacing.unit},actions:{textAlign:"right"},regionalNavButton:{marginLeft:e.spacing.unit,marginRight:e.spacing.unit},horizontalNav:{paddingBottom:0},horizontalNavItem:{display:"inline",paddingLeft:0,paddingRight:0},horizontalNavLink:{padding:"".concat(4*e.spacing.unit,"px ").concat(4*e.spacing.unit,"px"),textDecoration:"none",display:"inline-block",borderBottom:"solid 1px",borderBottomColor:e.palette.common.white,"&:hover":{borderBottomColor:e.palette.primary.main}},activeNavLink:{color:e.palette.primary.main,borderBottomColor:e.palette.primary.main},chainId:{overflow:"hidden",textOverflow:"ellipsis"},badgePadding:{paddingLeft:2*e.spacing.unit,paddingRight:2*e.spacing.unit,marginLeft:-2*e.spacing.unit,marginRight:-2*e.spacing.unit,lineHeight:"1rem"},dialogPaper:{minHeight:"260px",maxHeight:"260px",minWidth:"670px",maxWidth:"670px",overflow:"hidden",borderRadius:3*e.spacing.unit},warningText:{fontWeight:500,marginLeft:3*e.spacing.unit,marginTop:3*e.spacing.unit,marginBottom:e.spacing.unit},closeButton:{marginRight:3*e.spacing.unit,marginTop:3*e.spacing.unit},infoText:{fontSize:2*e.spacing.unit,fontWeight:450,marginLeft:6*e.spacing.unit},modalTextarea:{marginLeft:2*e.spacing.unit},modalContent:{width:"inherit"},deleteButton:{marginTop:4*e.spacing.unit},runJobButton:{marginBottom:3*e.spacing.unit},runJobModalContent:{overflow:"hidden"}})},a$=function(e){var t=e.id;return l.createElement(l.Fragment,null,"Successfully deleted chain ",t)},az=function(e){var t=e.classes,n=e.chainId,r=e.chain,i=e.deleteChain,a=aB((0,l.useState)(!1),2),o=a[0],s=a[1],u=aB((0,l.useState)(!1),2),c=u[0],f=u[1],p=(0,h.TH)(),b=p.pathname.endsWith("/config-overrides"),m=p.pathname.endsWith("/edit"),g=!b&&!m,v=function(e){i(e,function(){return a$({id:e})},aP),f(!0)};return l.createElement(l.Fragment,null,l.createElement(aN.Z,{open:o,classes:{paper:t.dialogPaper},onClose:function(){return s(!1)}},l.createElement(d.Z,{container:!0,spacing:0},l.createElement(d.Z,{item:!0,className:t.modalContent},l.createElement(d.Z,{container:!0,alignItems:"baseline",justify:"space-between"},l.createElement(d.Z,{item:!0},l.createElement(x.default,{variant:"h5",color:"secondary",className:t.warningText},"Warning: This Action Cannot Be Undone")),l.createElement(d.Z,{item:!0},l.createElement(aD,{className:t.closeButton,onClick:function(){return s(!1)}}))),l.createElement(d.Z,{container:!0,direction:"column"},l.createElement(d.Z,{item:!0},l.createElement(d.Z,{item:!0},l.createElement(x.default,{className:t.infoText,variant:"h5",color:"secondary"},"- Disabling the chain may be a safer option"),l.createElement(x.default,{className:t.infoText,variant:"h5",color:"secondary"},"- All associated RPC Nodes will be permanently deleted"),l.createElement(x.default,{className:t.infoText,variant:"h5",color:"secondary"},"- Access to this page will be lost"))),l.createElement(d.Z,{container:!0,spacing:0,alignItems:"center",justify:"center"},l.createElement(d.Z,{item:!0,className:t.deleteButton},l.createElement(aL.Z,{variant:"danger",onClick:function(){return v(n)}},"Delete ",n,c&&l.createElement(h.l_,{to:"/"})))))))),l.createElement(r9.Z,{className:t.container},l.createElement(d.Z,{container:!0,spacing:0},l.createElement(d.Z,{item:!0,xs:12},l.createElement(d.Z,{container:!0,spacing:0,alignItems:"center",className:t.mainRow},l.createElement(d.Z,{item:!0,xs:12},r&&l.createElement(x.default,{variant:"h5",color:"secondary",className:t.chainId},"Chain ",r.id||n)))),l.createElement(d.Z,{item:!0,xs:12},(null==r?void 0:r.attributes.createdAt)&&l.createElement(x.default,{variant:"subtitle2",color:"textSecondary"},"Created"," ",l.createElement(aA,{tooltip:!1},r.attributes.createdAt)," ","(",aO(r.attributes.createdAt),")")),l.createElement(d.Z,{item:!0,xs:12},l.createElement(w.default,{className:t.horizontalNav},l.createElement(_.default,{className:t.horizontalNavItem},l.createElement(ip,{href:"/chains/".concat(n),className:O()(t.horizontalNavLink,g&&t.activeNavLink)},"Nodes")))))))},aG=(0,A.$j)(null,{deleteChain:ty.KL})(az);let aW=(0,b.withStyles)(aH)(aG);var aK=n(30060),aV=n(7554),aq=function(e){var t=e.children,n=e.divider,r=void 0!==n&&n;return l.createElement(l.Fragment,null,l.createElement(aK.Z,null,l.createElement(x.default,{variant:"h5",color:"secondary"},t)),r&&l.createElement(aV.Z,null))},aZ=(0,b.withStyles)(ic)(function(e){var t=e.node,n=e.classes;return l.createElement(ii.Z,{className:n.row,hover:!0},l.createElement(ie.default,{className:n.cell,component:"th",scope:"row"},l.createElement(ip,{className:n.link,href:"/nodes/".concat(t.attributes.name)},t.attributes.name)),l.createElement(ie.default,null,t.attributes.chainID),l.createElement(ie.default,null,t.attributes.state))}),aX=function(e){var t=e.nodes,n=e.nodeFilter,r=t.filter(n);return l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,l.createElement(x.default,{variant:"body1",color:"textSecondary"},"Name")),l.createElement(ie.default,null,l.createElement(x.default,{variant:"body1",color:"textSecondary"},"EVM Chain ID")),l.createElement(ie.default,null,l.createElement(x.default,{variant:"body1",color:"textSecondary"},"State")))),l.createElement(r7.Z,null,!r.length&&l.createElement(ii.Z,null,l.createElement(ie.default,{component:"th",scope:"row",colSpan:3},"No nodes found.")),r.map(function(e){return l.createElement(aZ,{key:e.id,node:e})})))};let aJ=aX;var aQ=function(e){var t=e.nodes,n=e.chain,r=function(e){return e.attributes.chainID===n.id};return l.createElement(iv,null,n&&l.createElement(d.Z,{container:!0,spacing:40},l.createElement(d.Z,{item:!0,xs:12},l.createElement(r9.Z,null,l.createElement(aq,{divider:!0},"Nodes"),l.createElement(aJ,{nodes:t,nodeFilter:r})))))};function a1(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function a0(e){if(Array.isArray(e))return e}function a2(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function a3(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){a2(a,r,i,o,s,"next",e)}function s(e){a2(a,r,i,o,s,"throw",e)}o(void 0)})}}function a4(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function a5(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function a6(e,t){return a0(e)||a4(e,t)||a9(e,t)||a5()}function a9(e,t){if(e){if("string"==typeof e)return a1(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return a1(e,t)}}var a8=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}},a7=function(){var e,t=(0,h.UO)().chainId,n=(0,h.$B)().path,r=a6(l.useState(),2),i=r[0],a=r[1],o=a6(l.useState([]),2),s=o[0],u=o[1],c=(e=a3(function(){var e;return a8(this,function(t){switch(t.label){case 0:return[4,iW.v2.nodes.getNodes()];case 1:return u((e=t.sent()).data),[2]}})}),function(){return e.apply(this,arguments)});return l.useEffect(function(){c()},[]),l.useEffect(function(){Promise.all([iW.v2.chains.getChains()]).then(function(e){return a6(e,1)[0].data.find(function(e){return e.id===t})}).then(a)},[t]),l.createElement(l.Fragment,null,l.createElement(aW,{chainId:t,chain:i}),l.createElement(h.rs,null,l.createElement(h.AW,{path:"".concat(n)},i&&l.createElement(aQ,{nodes:s,chain:i}))))};let oe=a7;function ot(){return(ot=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}var on=function(e){return l.createElement("svg",ot({id:"Layer_1","data-name":"Layer 1",width:"813px",height:"526.5px",viewBox:"0 0 780.98 512.82"},e),l.createElement("defs",null),l.createElement("path",{d:"M222.2 330.36l-76-43.9v-87.8l76-43.9 76 43.9v87.8zm-72-46.21l72 41.59 72-41.59V201l-72-41.6-72 41.6v83.18zm213.31-76.91l-40.07-23.14v-46.26l40.07-23.13 40.07 23.13v46.26zm-36.07-25.44l36.07 20.83 36.07-20.83v-41.66l-36.07-20.83-36.07 20.83v41.66zM222.2 125.66l-40.07-23.13V56.26l40.07-23.14 40.07 23.13v46.27zm-36.07-25.44L222.2 121l36.07-20.83V58.56L222.2 37.74l-36.07 20.82v41.65zM80.89 207.24L40.82 184.1v-46.26l40.07-23.14L121 137.84v46.26zM44.82 181.8l36.07 20.83L117 181.8v-41.66l-36.11-20.82-36.07 20.82v41.66zm36.07 188.61l-40.07-23.14V301l40.07-23.14L121 301v46.27zM44.82 345l36.07 20.83L117 345v-41.69l-36.11-20.82-36.07 20.82V345zM222.2 453.14L182.13 430v-46.26l40.07-23.14 40.07 23.14V430zm-36.07-25.44l36.07 20.82 36.07-20.82V386l-36.07-20.78L186.13 386v41.7z",fill:"#3c40c6",transform:"translate(-40.82 -33.12)"}),l.createElement("path",{d:"M216.86 182.36a8.31 8.31 0 0 1-4.75 1.26 9.88 9.88 0 0 1-5.08-1.53q-2.41-1.49-2.29-3.42t2.64-3.49l2.62-1.61a11.12 11.12 0 0 1 5.63-1.63 9.71 9.71 0 0 1 5.5 1.39q2.44 1.51 2.56 3.17t-2.08 3h-.08l-2.22-1.37a2.41 2.41 0 0 0 1.41-1.8 2.37 2.37 0 0 0-1.44-1.85 5.29 5.29 0 0 0-3.35-.7 8.23 8.23 0 0 0-3.62 1.21l-2.64 1.62a3.87 3.87 0 0 0-2 2.26 1.94 1.94 0 0 0 1.17 2.1 5.39 5.39 0 0 0 2.93.87 5.55 5.55 0 0 0 2.9-.87zm8.3 10.79l-2.29-1.42 5.87-3.62-6.16-3.81-5.87 3.62-2.29-1.42 13.77-8.5 2.29 1.42-6.05 3.73 6.16 3.81 6.05-3.73 2.29 1.42zm13.76 4.55l-5.38-3.33-4.31 1.3-2.32-1.44 18.82-5.36 2.17 1.35-8.77 11.58-2.33-1.44zm-2.8-4.11l4.07 2.52 3.89-4.86H244zm7.07 10.72l-2.29-1.42 13.76-8.49 2.29 1.42zm13.6 8.42l-2.29-1.42 3.95-10h-.08l-10 6.18-2.29-1.42 13.76-8.49 2.29 1.42-3.94 10h.08l10-6.18 2.29 1.42zm-73.62-19.15l6.32 3.91-1.84 1.14-8.65-5.34 13.76-8.49 2.29 1.42zm8.66 7.64l-2.29-1.42 13.76-8.49 2.29 1.42zm13.6 8.42l-2.29-1.42 4-10h-.08l-10 6.18-2.37-1.4 13.76-8.49 2.29 1.42-3.94 10h.08l10-6.18 2.29 1.42zm12.63.46l-1.59-1-6 3.67-2.29-1.42 13.82-8.47 2.29 1.42-5.83 3.6 1.31.81 10.15-.92 2.72 1.68-11.57 1-1.8 7.77-2.8-1.74zM485 545.94L353.63 470.1V318.44L485 242.6l131.34 75.83V470.1zm-103.35-92L485 513.6l103.34-59.67V334.6L485 274.94 381.63 334.6v119.34z",fill:"#3c40c6",transform:"translate(-40.82 -33.12)"}),l.createElement("path",{d:"M465.82 326.56a7.46 7.46 0 0 1-2 5.36 7 7 0 0 1-5.27 2.13 6.72 6.72 0 0 1-5.16-2.13 7.56 7.56 0 0 1-2-5.36v-3.18a7.57 7.57 0 0 1 2-5.36 6.7 6.7 0 0 1 5.14-2.13 7 7 0 0 1 5.27 2.11 7.45 7.45 0 0 1 2 5.36v3.18zm-2.93-3.2a5.47 5.47 0 0 0-1.18-3.62 3.94 3.94 0 0 0-3.19-1.42 3.71 3.71 0 0 0-3.07 1.42 5.65 5.65 0 0 0-1.13 3.62v3.2a5.71 5.71 0 0 0 1.13 3.65 3.71 3.71 0 0 0 3.08 1.42 3.92 3.92 0 0 0 3.19-1.42 5.56 5.56 0 0 0 1.17-3.66v-3.2zm5.11 3.76a7.15 7.15 0 0 1 1.6-4.8 6.12 6.12 0 0 1 8.65-.17l.17.17a7.08 7.08 0 0 1 1.61 4.8v.25a7.11 7.11 0 0 1-1.61 4.82 6.16 6.16 0 0 1-8.71.11l-.11-.11a7.13 7.13 0 0 1-1.6-4.81v-.25zm3 .25a5.84 5.84 0 0 0 .75 3.12 2.84 2.84 0 0 0 4.63 0 5.7 5.7 0 0 0 .78-3.12v-.25a5.63 5.63 0 0 0-.78-3.09 2.8 2.8 0 0 0-4.63 0 5.81 5.81 0 0 0-.75 3.09v.25zm23 .31a7.39 7.39 0 0 1-1.35 4.62 4.45 4.45 0 0 1-3.75 1.76 4.64 4.64 0 0 1-2-.4 4.06 4.06 0 0 1-1.48-1.18v6.36h-3v-18.16H485l.29 1.65a4.36 4.36 0 0 1 1.52-1.41 4.25 4.25 0 0 1 2.07-.49 4.35 4.35 0 0 1 3.78 1.92 8.61 8.61 0 0 1 1.35 5.06v.27zm-2.93-.26a6.38 6.38 0 0 0-.76-3.29 2.47 2.47 0 0 0-2.26-1.28 2.94 2.94 0 0 0-1.56.39 2.89 2.89 0 0 0-1 1.1v5.92a2.73 2.73 0 0 0 1 1.06 3.13 3.13 0 0 0 1.59.37 2.53 2.53 0 0 0 2.25-1.11 5.12 5.12 0 0 0 .75-2.91v-.25zm12.69 2.82a1.37 1.37 0 0 0-.58-1.13 5.81 5.81 0 0 0-2.17-.79 9 9 0 0 1-3.56-1.41 3 3 0 0 1-1.21-2.49 3.54 3.54 0 0 1 1.39-2.81 5.55 5.55 0 0 1 3.67-1.16 5.75 5.75 0 0 1 3.81 1.18 3.5 3.5 0 0 1 1.35 2.93v.07h-2.82a1.85 1.85 0 0 0-.62-1.39 2.38 2.38 0 0 0-1.7-.58 2.43 2.43 0 0 0-1.62.48 1.48 1.48 0 0 0-.56 1.17 1.31 1.31 0 0 0 .53 1.1 5.66 5.66 0 0 0 2.14.72 9 9 0 0 1 3.67 1.44 3 3 0 0 1 1.19 2.53 3.44 3.44 0 0 1-1.47 2.9 6.22 6.22 0 0 1-3.85 1.1 5.87 5.87 0 0 1-4-1.31 3.7 3.7 0 0 1-1.41-3v-.07h2.74a2 2 0 0 0 .82 1.66 3.31 3.31 0 0 0 1.89.52 3 3 0 0 0 1.76-.44 1.37 1.37 0 0 0 .61-1.22zm8.69 3.56h-2.93V331h2.93v2.8zm6.55 0h-2.93V331H519v2.8zm6.56 0h-2.93V331h2.93v2.8zm-84.97 59.71h-24.72l-1.81-7.88 27.75-32.16h9.39v31h6.8v9h-6.79v10.91h-10.62v-10.87zm0-9v-15.79l-13.44 15.75h13.44zm21.56-5.38c0-14.67 9.11-26.16 22.55-26.16s22.4 11.35 22.4 26.16-9 26.16-22.55 26.16-22.4-11.35-22.4-26.16zm33.53 0c0-9.18-4.48-16.12-11.13-16.12s-11 6.72-11 16.12 4.41 16.12 11.13 16.12 11-6.8 11-16.12zm41.43 14.38h-24.72l-1.81-7.88 27.75-32.16h9.39v31h6.79v9h-6.79v10.91h-10.61v-10.87zm0-9v-15.79l-13.44 15.75h13.44zm-135.29 48.08v6.69h-3v-17.65h6.9a6.54 6.54 0 0 1 4.58 1.51 5.6 5.6 0 0 1 .08 7.92l-.08.08a6.57 6.57 0 0 1-4.58 1.5h-4zm0-2.36h4a3.23 3.23 0 0 0 2.46-.87 3.1 3.1 0 0 0 .82-2.22 3 3 0 0 0-3.28-3.14h-4v6.23zm20.18 9.05a9.19 9.19 0 0 1-.26-1 6.86 6.86 0 0 1-.14-1 5.21 5.21 0 0 1-1.59 1.54 4.05 4.05 0 0 1-2.21.63 4.36 4.36 0 0 1-3.15-1 3.83 3.83 0 0 1-1.1-2.9 3.42 3.42 0 0 1 1.5-3 7.26 7.26 0 0 1 4.23-1.06h2.29v-1.15a2.13 2.13 0 0 0-.61-1.61 2.41 2.41 0 0 0-1.73-.58 2.46 2.46 0 0 0-1.6.49 1.54 1.54 0 0 0-.59 1.25h-2.84v-.07a3.25 3.25 0 0 1 1.39-2.75 5.88 5.88 0 0 1 3.84-1.2 5.61 5.61 0 0 1 3.7 1.16 4.1 4.1 0 0 1 1.41 3.35v5.83a10.8 10.8 0 0 0 .11 1.56 8.19 8.19 0 0 0 .35 1.46h-3zm-3.61-2.11a3.7 3.7 0 0 0 2-.56 2.8 2.8 0 0 0 1.18-1.27v-1.94h-2.34a3 3 0 0 0-2 .64 1.93 1.93 0 0 0-.73 1.5 1.53 1.53 0 0 0 .49 1.19 2 2 0 0 0 1.42.44zm8.61-4.27a8.54 8.54 0 0 1 1.37-5 4.41 4.41 0 0 1 3.81-1.93 4.14 4.14 0 0 1 2.07.5 4.37 4.37 0 0 1 1.51 1.45l.29-1.71h2.45v13.11a5 5 0 0 1-1.56 3.92 6.49 6.49 0 0 1-4.44 1.38 8.69 8.69 0 0 1-2.07-.27 9.65 9.65 0 0 1-2-.72l.63-2.31a7.13 7.13 0 0 0 1.61.59 7.68 7.68 0 0 0 1.81.21 3.36 3.36 0 0 0 2.34-.69 2.74 2.74 0 0 0 .74-2.1v-1.35a4.12 4.12 0 0 1-1.46 1.19 4.4 4.4 0 0 1-1.93.41 4.53 4.53 0 0 1-3.78-1.76 7.3 7.3 0 0 1-1.37-4.62v-.3zm3 .25a5.15 5.15 0 0 0 .72 2.89 2.5 2.5 0 0 0 2.24 1.08 3 3 0 0 0 1.59-.39 2.91 2.91 0 0 0 1-1.13v-5.75a3.16 3.16 0 0 0-1.06-1.12 2.88 2.88 0 0 0-1.56-.41 2.42 2.42 0 0 0-2.25 1.27 6.55 6.55 0 0 0-.73 3.3v.25h.05zm17.08 6.38a5.7 5.7 0 0 1-4.44-1.82A6.7 6.7 0 0 1 441 433v-.49a7 7 0 0 1 1.64-4.75 5.2 5.2 0 0 1 4.12-1.87 5.13 5.13 0 0 1 4.07 1.61 6.29 6.29 0 0 1 1.41 4.31v1.73H444v.06a4.1 4.1 0 0 0 .92 2.55 2.9 2.9 0 0 0 2.33 1 6.29 6.29 0 0 0 2-.29 6.67 6.67 0 0 0 1.64-.84l1 1.93a6.08 6.08 0 0 1-2 1.11 8.18 8.18 0 0 1-2.81.47zm-.34-11.25a2.21 2.21 0 0 0-1.79.87 4.26 4.26 0 0 0-.87 2.2v.06h5.2v-.3a3.14 3.14 0 0 0-.64-2 2.32 2.32 0 0 0-1.9-.83zm16.7-2.12l.17 1.89a4.68 4.68 0 0 1 1.62-1.57 4.32 4.32 0 0 1 2.2-.56 4.13 4.13 0 0 1 3.19 1.24 5.57 5.57 0 0 1 1.15 3.87v8.24h-3V431a2.94 2.94 0 0 0-.61-2.1 2.5 2.5 0 0 0-1.86-.62 3.09 3.09 0 0 0-1.54.38 3.18 3.18 0 0 0-1.12 1v9.51h-3v-13.01h2.7zm10.74 6.44a7.15 7.15 0 0 1 1.6-4.8 6.12 6.12 0 0 1 8.65-.17l.17.17a7.08 7.08 0 0 1 1.61 4.8v.25a7.11 7.11 0 0 1-1.61 4.82 6.16 6.16 0 0 1-8.71.11l-.11-.11a7.13 7.13 0 0 1-1.6-4.81v-.26zm3 .25a5.84 5.84 0 0 0 .75 3.12 2.84 2.84 0 0 0 4.63 0 5.7 5.7 0 0 0 .78-3.12v-.25a5.63 5.63 0 0 0-.78-3.09 2.8 2.8 0 0 0-4.63 0 5.81 5.81 0 0 0-.75 3.09v.25zM492.2 423v3.19h2.35v2.18h-2.35v7.25a1.58 1.58 0 0 0 .35 1.16 1.27 1.27 0 0 0 .93.35 2.53 2.53 0 0 0 .47 0 2.86 2.86 0 0 0 .44-.11l.31 2.16a3.38 3.38 0 0 1-.9.32 5 5 0 0 1-1.08.12 3.37 3.37 0 0 1-2.54-1 4.16 4.16 0 0 1-.92-3v-7.25h-2v-2.18h2V423h2.94zm12.1 16.28v-10.94h-2v-2.18h2v-1.53a4.1 4.1 0 0 1 4.5-4.52 5.76 5.76 0 0 1 .86.07l1 .19-.3 2.28-.54-.08a5.42 5.42 0 0 0-.64 0 1.81 1.81 0 0 0-1.44.55 2.3 2.3 0 0 0-.48 1.56v1.53h2.67v2.18h-2.67v10.93h-3zm6.81-6.68a7.15 7.15 0 0 1 1.6-4.8 6.12 6.12 0 0 1 8.65-.17l.17.17a7.08 7.08 0 0 1 1.61 4.8v.25a7.11 7.11 0 0 1-1.61 4.82 6.16 6.16 0 0 1-8.71.11l-.11-.11a7.13 7.13 0 0 1-1.6-4.81v-.26zm3 .25a5.84 5.84 0 0 0 .75 3.12 2.84 2.84 0 0 0 4.63 0 5.7 5.7 0 0 0 .78-3.12v-.25a5.63 5.63 0 0 0-.78-3.09 2.8 2.8 0 0 0-4.63 0 5.81 5.81 0 0 0-.75 3.09v.25zm19.67 4.51a4.49 4.49 0 0 1-1.56 1.61 4.63 4.63 0 0 1-5.48-.78 6.2 6.2 0 0 1-1.19-4.18v-7.84h2.93V434a3.93 3.93 0 0 0 .56 2.41 2 2 0 0 0 1.68.69 3.78 3.78 0 0 0 1.79-.38 2.78 2.78 0 0 0 1.13-1.11v-9.48h3v13.11H534zm8.53-11.2l.17 1.89a4.68 4.68 0 0 1 1.62-1.57 4.32 4.32 0 0 1 2.2-.56 4.13 4.13 0 0 1 3.19 1.24 5.57 5.57 0 0 1 1.15 3.87v8.24h-2.94V431a2.94 2.94 0 0 0-.61-2.1 2.5 2.5 0 0 0-1.86-.62 3.09 3.09 0 0 0-1.54.38 3.18 3.18 0 0 0-1.12 1v9.51h-3v-13.01h2.69zm10.82 6.74a8.64 8.64 0 0 1 1.35-5.06 4.35 4.35 0 0 1 3.78-1.92 4.13 4.13 0 0 1 1.91.43 4.33 4.33 0 0 1 1.46 1.23v-7.21h3v18.91h-2.53l-.29-1.62a4.32 4.32 0 0 1-1.52 1.4 4.26 4.26 0 0 1-2.06.48 4.46 4.46 0 0 1-3.76-1.76 7.39 7.39 0 0 1-1.35-4.62v-.26zm3 .25a5.28 5.28 0 0 0 .7 2.9 2.44 2.44 0 0 0 2.21 1.08 3 3 0 0 0 1.58-.4 3.05 3.05 0 0 0 1.06-1.14v-5.72a3.1 3.1 0 0 0-1.07-1.13 2.88 2.88 0 0 0-1.55-.41 2.38 2.38 0 0 0-2.22 1.27 6.69 6.69 0 0 0-.71 3.3v.25zm14.73 6.13h-2.93v-2.82h2.93v2.82z",fill:"#3c40c6",transform:"translate(-40.82 -33.12)"}),l.createElement("path",{d:"M596.13 301.41h92.43v4h-92.43z",fill:"#3c40c6",transform:"rotate(-29.99 560.23 363.065)"}),l.createElement("path",{d:"M329.93 264.69h4v82.44h-4z",fill:"#3c40c6",transform:"rotate(-60 282.825 324.693)"}),l.createElement("path",{d:"M168.58 153.15h4v119.21h-4z",fill:"#3c40c6",transform:"rotate(-60 121.498 231.54)"}),l.createElement("path",{d:"M179.38 90.23h4v33.71h-4z",fill:"#3c40c6"}),l.createElement("path",{d:"M214.22 210.75h119.21v4H214.22z",fill:"#3c40c6",transform:"rotate(-30 191.62 272.364)"}),l.createElement("path",{d:"M179.38 209.43h4v119.21h-4z",fill:"#3c40c6"}),l.createElement("path",{d:"M116.7 291.73h33.72v4H116.7z",fill:"#3c40c6",transform:"rotate(-29.99 51.364 353.4)"}),l.createElement("path",{d:"M85.48 156.18h10.91v2H85.48z",fill:"#3c40c6",transform:"rotate(-55.92 39.324 179.074)"}),l.createElement("path",{d:"M80.81 158.24h2v5.46h-2z",fill:"#3c40c6",transform:"rotate(-57.85 31.436 181.345)"}),l.createElement("path",{d:"M66.96 163.67h10.92v2H66.96z",fill:"#3c40c6",transform:"rotate(-53.86 19.414 188.284)"}),l.createElement("path",{d:"M67.63 174.87a3.65 3.65 0 1 1 3.65-3.65 3.65 3.65 0 0 1-3.65 3.65zm0-5.3a1.65 1.65 0 1 0 1.65 1.65 1.65 1.65 0 0 0-1.65-1.65zm9.61-7.77a3.65 3.65 0 1 1 3.65-3.65 3.65 3.65 0 0 1-3.65 3.65zm0-5.3a1.65 1.65 0 1 0 1.65 1.65 1.65 1.65 0 0 0-1.65-1.65zm9.11 11.01a3.65 3.65 0 1 1 3.65-3.65 3.65 3.65 0 0 1-3.65 3.65zm0-5.3a1.65 1.65 0 1 0 1.65 1.65 1.65 1.65 0 0 0-1.65-1.65zm9.13-8.09a3.65 3.65 0 1 1 3.65-3.65 3.65 3.65 0 0 1-3.65 3.65zm0-5.3a1.65 1.65 0 1 0 1.65 1.65 1.65 1.65 0 0 0-1.65-1.65z",fill:"#3c40c6",transform:"translate(-40.82 -33.12)"}),l.createElement("path",{d:"M60.63 147.44H19.25v-40.6h2v38.6h39.38v2z",fill:"#3c40c6"}),l.createElement("path",{d:"M380.57 172h-31.18a9.38 9.38 0 0 1-.45-18.74 12.86 12.86 0 0 1 23.89-4.81 8 8 0 0 1 8.7 7.23v.4a8 8 0 0 1-.96 15.92zm-31.18-16.7a7.38 7.38 0 0 0-.54 14.75h31.71a6 6 0 0 0 0-12h-1.09l.06-1.08v-.52a6 6 0 0 0-7.1-5.89l-.74.14-.34-.67a10.86 10.86 0 0 0-20.53 4.33v1l-1.15-.07h-.23z",fill:"#3c40c6",transform:"translate(-40.82 -33.12)"}),l.createElement("path",{d:"M362 165.22h-1.86l-.74-1.92H356l-.7 1.92h-1.81l3.3-8.47h1.81zm-3.15-3.35l-1.17-3.14-1.14 3.14h2.31zm4.07 3.35v-8.47h2.75a9.94 9.94 0 0 1 2 .13 2.22 2.22 0 0 1 1.22.83 2.63 2.63 0 0 1 .49 1.65 2.76 2.76 0 0 1-.28 1.31 2.32 2.32 0 0 1-.72.83 2.46 2.46 0 0 1-.89.4 9.76 9.76 0 0 1-1.77.12h-1.12v3.2h-1.68zm1.71-7v2.4h.94a4.41 4.41 0 0 0 1.35-.13 1.11 1.11 0 0 0 .54-.42 1.14 1.14 0 0 0 .19-.66 1.1 1.1 0 0 0-.27-.76 1.18 1.18 0 0 0-.69-.37 8.13 8.13 0 0 0-1.23-.06h-.83zm5.96 7v-8.47h1.71v8.47h-1.71zM222.2 430.56a8.89 8.89 0 0 1-6.2-15.28v-25.9a6.18 6.18 0 1 1 12.37 0v25.9a8.89 8.89 0 0 1-6.17 15.28zm0-45.37a4.19 4.19 0 0 0-4.18 4.19v26.8l-.34.3a6.9 6.9 0 1 0 9.05 0l-.34-.3v-26.8a4.19 4.19 0 0 0-4.19-4.19z",fill:"#3c40c6",transform:"translate(-40.82 -33.12)"}),l.createElement("path",{d:"M223.08 418.11v-16.3a.89.89 0 1 0-1.77 0v16.31a3.95 3.95 0 1 0 1.77-.01z",fill:"#3c40c6",transform:"translate(-40.82 -33.12)"}),l.createElement("path",{d:"M222.2 426.9a4.95 4.95 0 0 1-1.88-9.52v-15.57a1.89 1.89 0 1 1 3.77 0v15.58a5 5 0 0 1-1.89 9.51zm0-8l-.66.15a2.95 2.95 0 1 0 1.32 0zm4.13-320.98A22.57 22.57 0 0 1 210.65 91c-8.07-8-9.21-20-2.53-26.71l1.41 1.41c-5.9 5.9-4.76 16.63 2.53 23.92s18 8.43 23.92 2.53l1.41 1.41a15.39 15.39 0 0 1-11.06 4.36z",fill:"#3c40c6",transform:"translate(-40.82 -33.12)"}),l.createElement("path",{d:"M234.78 94.52c-4.3 0-11.41-4.83-17.1-10.51a49.49 49.49 0 0 1-8.75-11.37c-2.05-3.93-2.33-6.82-.81-8.34 2.81-2.81 9.63.93 15.08 5.37a1 1 0 0 1-1.26 1.55c-6.18-5-11.16-6.75-12.41-5.5-.62.62-.64 2.53 1.17 6a47.49 47.49 0 0 0 8.39 10.89c8.19 8.19 15.36 11.09 16.89 9.56 1.24-1.24-.48-6.22-5.5-12.41a1 1 0 1 1 1.52-1.27c4.43 5.45 8.17 12.27 5.37 15.08a3.55 3.55 0 0 1-2.59.95z",fill:"#3c40c6",transform:"translate(-40.82 -33.12)"}),l.createElement("path",{d:"M225.09 80.2a3.6 3.6 0 1 1 2.55-1.05 3.6 3.6 0 0 1-2.55 1.05zm0-5.2a1.6 1.6 0 1 0 1.13.47 1.6 1.6 0 0 0-1.13-.47z",fill:"#3c40c6",transform:"translate(-40.82 -33.12)"}),l.createElement("path",{d:"M225.53 83.51a1 1 0 0 1-1-1v-3.17a1 1 0 1 1 2 0v3.17a1 1 0 0 1-1 1zm-3-6.35h-3.34a1 1 0 0 1 0-2h3.34a1 1 0 0 1 0 2zm10.19-1.3a1 1 0 0 1-1-1 4.9 4.9 0 0 0-4.89-4.86 1 1 0 0 1 0-2 6.9 6.9 0 0 1 6.89 6.89 1 1 0 0 1-1 .97z",fill:"#3c40c6",transform:"translate(-40.82 -33.12)"}),l.createElement("path",{d:"M237.82 75.86a1 1 0 0 1-1-1 10 10 0 0 0-10-10 1 1 0 1 1 0-2 12 12 0 0 1 12 12 1 1 0 0 1-1 1zM80.89 342a17.84 17.84 0 1 1 17.84-17.84A17.86 17.86 0 0 1 80.89 342zm0-33.69a15.84 15.84 0 1 0 15.84 15.84 15.86 15.86 0 0 0-15.84-15.86z",fill:"#3c40c6",transform:"translate(-40.82 -33.12)"}),l.createElement("path",{d:"M80.89 342c-7.45 0-13.51-8-13.51-17.84s6.06-17.84 13.51-17.84 13.51 8 13.51 17.84S88.34 342 80.89 342zm0-33.69c-6.35 0-11.51 7.11-11.51 15.84S74.55 340 80.89 340s11.51-7.11 11.51-15.84-5.16-15.87-11.51-15.87z",fill:"#3c40c6",transform:"translate(-40.82 -33.12)"}),l.createElement("path",{d:"M80.89 342c-4.77 0-7.34-9.19-7.34-17.84s2.57-17.84 7.34-17.84 7.34 9.19 7.34 17.84S85.66 342 80.89 342zm0-33.69c-2.52 0-5.34 6.51-5.34 15.84S78.37 340 80.89 340s5.34-6.51 5.34-15.84-2.81-15.87-5.34-15.87z",fill:"#3c40c6",transform:"translate(-40.82 -33.12)"}),l.createElement("path",{d:"M80.89 342a1 1 0 0 1-1-1v-33.71a1 1 0 0 1 2 0V341a1 1 0 0 1-1 1z",fill:"#3c40c6",transform:"translate(-40.82 -33.12)"}),l.createElement("path",{d:"M97 325.14H64.25a1 1 0 0 1 0-2H97a1 1 0 0 1 0 2zm-2.54-9.98H67.32a1 1 0 0 1 0-2h27.14a1 1 0 0 1 0 2zm-.75 19.96h-25.9a1 1 0 0 1 0-2h25.9a1 1 0 0 1 0 2zm142.56-43.54v-29l23-28.4 22.3 1.69v30.62l-22.3 27.19zm22.81-10.7l12.7-15.48V248l-12.7-1L246 263.18v16.5zm-56.19-22.98a2 2 0 0 1-1-.27l-40.33-23.28a2 2 0 1 1 2-3.46l40.33 23.28a2 2 0 0 1-1 3.73zm-9.97 3.56a2 2 0 0 1-1-.27l-30.36-17.53a2 2 0 1 1 2-3.46l30.36 17.53a2 2 0 0 1-1 3.73zm9.97 15.07a2 2 0 0 1-1-.27L161.56 253a2 2 0 1 1 2-3.46l40.33 23.28a2 2 0 0 1-1 3.71zm-8.95 4.15a2 2 0 0 1-1-.27l-31.38-18.12a2 2 0 1 1 2-3.46l31.38 18.12a2 2 0 0 1-1 3.73zm-14.39 1a2 2 0 0 1-1-.27l-17-9.8a2 2 0 1 1 2-3.46l17 9.8a2 2 0 0 1-1 3.73z",fill:"#3c40c6",transform:"translate(-40.82 -33.12)"}),l.createElement(tz,{href:"/"},l.createElement("path",{d:"M706.94 294.93l-74.05-42.75v-85.49l74.05-42.75 74.04 42.75v85.49l-74.04 42.75z",fill:"#3c40c6"})),l.createElement("path",{d:"M706.67 222.71v-17.65h5.87a7.63 7.63 0 0 1 4.58 1.21 4.18 4.18 0 0 1 1.65 3.61 3.55 3.55 0 0 1-.69 2.15 4.09 4.09 0 0 1-1.92 1.41 3.94 3.94 0 0 1 2.42 1.51 4.47 4.47 0 0 1 .85 2.7 4.54 4.54 0 0 1-1.62 3.78 7 7 0 0 1-4.49 1.29h-6.65zm3-10.22h3.25a3.32 3.32 0 0 0 2.16-.65 2.24 2.24 0 0 0 .79-1.84 2.29 2.29 0 0 0-.87-2 4 4 0 0 0-2.45-.64h-2.92v5.07zm0 2.19v5.66h3.71a3.55 3.55 0 0 0 2.35-.7 2.49 2.49 0 0 0 .82-2 3.16 3.16 0 0 0-.69-2.18 2.75 2.75 0 0 0-2.16-.77h-4zm20.33 8.03a9.21 9.21 0 0 1-.26-1 6.86 6.86 0 0 1-.14-.95 5.21 5.21 0 0 1-1.6 1.54 4 4 0 0 1-2.21.63 4.36 4.36 0 0 1-3.15-1.05 3.83 3.83 0 0 1-1.1-2.9 3.42 3.42 0 0 1 1.5-3 7.26 7.26 0 0 1 4.23-1.06h2.29v-1.15a2.13 2.13 0 0 0-.61-1.61 2.41 2.41 0 0 0-1.73-.58 2.46 2.46 0 0 0-1.6.49 1.54 1.54 0 0 0-.59 1.25h-2.83a3.25 3.25 0 0 1 1.39-2.75 5.88 5.88 0 0 1 3.84-1.2 5.61 5.61 0 0 1 3.7 1.16 4.1 4.1 0 0 1 1.41 3.35v5.83a10.79 10.79 0 0 0 .11 1.56 8.19 8.19 0 0 0 .35 1.46h-3zm-3.61-2.11a3.7 3.7 0 0 0 2-.56 2.8 2.8 0 0 0 1.18-1.27v-1.94h-2.34a3 3 0 0 0-2 .64 1.93 1.93 0 0 0-.73 1.5 1.53 1.53 0 0 0 .49 1.19 2 2 0 0 0 1.39.44zm14.46 0a2.69 2.69 0 0 0 1.82-.63 2 2 0 0 0 .74-1.58h2.67v.07a3.87 3.87 0 0 1-1.5 3.17 5.57 5.57 0 0 1-3.75 1.33 5.44 5.44 0 0 1-4.44-1.87 7.16 7.16 0 0 1-1.55-4.73v-.42a7.17 7.17 0 0 1 1.55-4.72 6.13 6.13 0 0 1 8.28-.5 4.43 4.43 0 0 1 1.42 3.5v.07h-2.68a2.57 2.57 0 0 0-.71-1.83 2.42 2.42 0 0 0-1.85-.75 2.49 2.49 0 0 0-2.35 1.2 6 6 0 0 0-.69 3v.42a6 6 0 0 0 .69 3 2.49 2.49 0 0 0 2.35 1.27zm11.9-3.6h-1.32v5.73h-2.93V203.8h2.93v10.81h1.22l3.31-5h3.47l-4.33 6 5 7.15h-3.42zm18.57-10.6v3.19h2.35v2.18h-2.35V219a1.58 1.58 0 0 0 .35 1.16 1.27 1.27 0 0 0 .93.35 2.53 2.53 0 0 0 .47 0 2.86 2.86 0 0 0 .44-.11l.31 2.16a3.38 3.38 0 0 1-.9.32 5 5 0 0 1-1.08.12 3.37 3.37 0 0 1-2.54-1 4.16 4.16 0 0 1-.92-3v-7.25h-2v-2.18h2v-3.17h2.94zm3.79 9.6a7.15 7.15 0 0 1 1.6-4.8 6.12 6.12 0 0 1 8.65-.17l.17.17a7.08 7.08 0 0 1 1.61 4.8v.25a7.11 7.11 0 0 1-1.61 4.82 6.16 6.16 0 0 1-8.71.11l-.11-.11a7.13 7.13 0 0 1-1.6-4.81V216zm3 .25a5.84 5.84 0 0 0 .75 3.12 2.84 2.84 0 0 0 4.63 0 5.7 5.7 0 0 0 .78-3.12V216a5.63 5.63 0 0 0-.78-3.09 2.8 2.8 0 0 0-4.63 0 5.81 5.81 0 0 0-.75 3.09v.25zm-68.2 30.39v.07a5.56 5.56 0 0 1-1.74 4.36 6.79 6.79 0 0 1-4.84 1.68 6.55 6.55 0 0 1-5-2.08 7.49 7.49 0 0 1-1.93-5.31V242a7.58 7.58 0 0 1 1.91-5.32 6.41 6.41 0 0 1 5-2.09 7 7 0 0 1 4.93 1.64 5.55 5.55 0 0 1 1.75 4.42v.07h-2.85a3.42 3.42 0 0 0-3.81-3.77 3.38 3.38 0 0 0-2.87 1.43 5.85 5.85 0 0 0-1.06 3.62v3.38a5.8 5.8 0 0 0 1.08 3.61 3.48 3.48 0 0 0 2.93 1.43 3.69 3.69 0 0 0 2.78-1 3.82 3.82 0 0 0 1-2.77H710zm5.39-5.56a4.67 4.67 0 0 1 1.59-1.43 4.28 4.28 0 0 1 2.08-.51 4.13 4.13 0 0 1 3.25 1.32 6 6 0 0 1 1.17 4.05v8h-3v-8a3.32 3.32 0 0 0-.62-2.24 2.36 2.36 0 0 0-1.85-.69 3.29 3.29 0 0 0-1.54.36 3.19 3.19 0 0 0-1.13 1v9.6h-3v-19h3v7.49zm18.89 11.41a9.19 9.19 0 0 1-.26-1 6.86 6.86 0 0 1-.14-.95 5.21 5.21 0 0 1-1.59 1.54 4 4 0 0 1-2.21.63 4.36 4.36 0 0 1-3.15-1.05 3.83 3.83 0 0 1-1.1-2.9 3.42 3.42 0 0 1 1.5-3 7.26 7.26 0 0 1 4.23-1.06h2.29v-1.15a2.13 2.13 0 0 0-.61-1.61 2.41 2.41 0 0 0-1.73-.58 2.46 2.46 0 0 0-1.6.49 1.54 1.54 0 0 0-.59 1.25h-2.84v-.1a3.25 3.25 0 0 1 1.39-2.75 5.88 5.88 0 0 1 3.84-1.2 5.61 5.61 0 0 1 3.7 1.16 4.1 4.1 0 0 1 1.41 3.35v5.83a10.79 10.79 0 0 0 .11 1.56 8.19 8.19 0 0 0 .35 1.46h-3zm-3.61-2.11a3.7 3.7 0 0 0 2-.56 2.8 2.8 0 0 0 1.18-1.27v-1.94h-2.34a3 3 0 0 0-2 .64 1.93 1.93 0 0 0-.73 1.5 1.53 1.53 0 0 0 .49 1.19 2 2 0 0 0 1.39.44zm12.19-14.21h-3v-2.58h3v2.58zm0 16.33h-3v-13.12h3v13.11zm5.83-13.12l.17 1.89a4.68 4.68 0 0 1 1.62-1.57 4.32 4.32 0 0 1 2.2-.56 4.13 4.13 0 0 1 3.19 1.24 5.57 5.57 0 0 1 1.15 3.87v8.24H754v-8.22a2.94 2.94 0 0 0-.61-2.1 2.5 2.5 0 0 0-1.86-.62 3.09 3.09 0 0 0-1.54.38 3.18 3.18 0 0 0-1.12 1v9.51h-3v-13.06h2.68zm14.4 13.11h-3v-18.9h3v18.91zm6.18-16.32h-3v-2.58h3v2.58zm0 16.33h-3v-13.12h3v13.11zm5.82-13.12l.17 1.89a4.68 4.68 0 0 1 1.62-1.57 4.32 4.32 0 0 1 2.2-.56 4.13 4.13 0 0 1 3.19 1.24 5.57 5.57 0 0 1 1.15 3.87v8.24h-3v-8.22a2.94 2.94 0 0 0-.61-2.1 2.5 2.5 0 0 0-1.86-.62 3.09 3.09 0 0 0-1.54.38 3.18 3.18 0 0 0-1.12 1v9.51h-3v-13.06h2.8zm15.63 7.38h-1.33v5.73h-2.93v-18.9h2.93v10.81h1.22l3.31-5h3.47l-4.33 6 5 7.15h-3.42zm-25.15 32.07H736.6l5.66-6.11a2 2 0 0 0-2.84-2.81l-.09.09-8.67 9.35a2 2 0 0 0 0 2.72l8.88 9.58a2 2 0 0 0 3-2.63l-.09-.09-5.66-6.11h28.67a2 2 0 0 0 .02-3.99z",transform:"translate(-40.82 -33.12)",fill:"#fff"}))};let or=on;var oi=function(){return{logo:{top:"30%",left:"50%",transform:"translate(-50%, -30%)",position:"absolute"}}},oa=function(e){var t=e.classes;return l.createElement("div",{className:t.logo,"data-testid":"not-found-page"},l.createElement(or,null))};let oo=(0,b.withStyles)(oi)(oa);function os(e,t){var n=rp(null==t?void 0:t.client);rh(e,r.Mutation);var i=(0,l.useState)({called:!1,loading:!1,client:n}),a=i[0],o=i[1],s=(0,l.useRef)({result:a,mutationId:0,isMounted:!0,client:n,mutation:e,options:t});Object.assign(s.current,{client:n,options:t,mutation:e});var u=(0,l.useCallback)(function(e){void 0===e&&(e={});var t=s.current,n=t.options,r=t.mutation,i=(0,n8.pi)((0,n8.pi)({},n),{mutation:r}),a=e.client||s.current.client;s.current.result.loading||i.ignoreResults||!s.current.isMounted||o(s.current.result={loading:!0,error:void 0,data:void 0,called:!0,client:a});var u=++s.current.mutationId,c=(0,ro.J)(i,e);return a.mutate(c).then(function(t){var n,r=t.data,i=t.errors,l=i&&i.length>0?new ru.cA({graphQLErrors:i}):void 0;if(u===s.current.mutationId&&!c.ignoreResults){var f={called:!0,loading:!1,data:r,error:l,client:a};s.current.isMounted&&!(0,ra.D)(s.current.result,f)&&o(s.current.result=f)}var d=e.onCompleted||(null===(n=s.current.options)||void 0===n?void 0:n.onCompleted);return null==d||d(t.data,c),t}).catch(function(t){if(u===s.current.mutationId&&s.current.isMounted){var n,r={loading:!1,error:t,data:void 0,called:!0,client:a};(0,ra.D)(s.current.result,r)||o(s.current.result=r)}var i=e.onError||(null===(n=s.current.options)||void 0===n?void 0:n.onError);if(i)return i(t,c),{data:void 0,errors:t};throw t})},[]),c=(0,l.useCallback)(function(){s.current.isMounted&&o({called:!1,loading:!1,client:n})},[]);return(0,l.useEffect)(function(){return s.current.isMounted=!0,function(){s.current.isMounted=!1}},[]),[u,(0,n8.pi)({reset:c},a)]}var ou=n(59067),oc=n(28428),ol=n(11186),of=n(78513);function od(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var oh=function(e){return(0,b.createStyles)({paper:{display:"flex",margin:"".concat(2.5*e.spacing.unit,"px 0"),padding:"".concat(3*e.spacing.unit,"px  ").concat(3.5*e.spacing.unit,"px")},content:{flex:1,width:"100%"},actions:od({marginTop:-(1.5*e.spacing.unit),marginLeft:-(4*e.spacing.unit)},e.breakpoints.up("sm"),{marginLeft:0,marginRight:-(1.5*e.spacing.unit)}),itemBlock:{border:"1px solid rgba(224, 224, 224, 1)",borderRadius:e.shape.borderRadius,padding:2*e.spacing.unit,marginTop:e.spacing.unit},itemBlockText:{overflowWrap:"anywhere"}})},op=(0,b.withStyles)(oh)(function(e){var t=e.actions,n=e.children,r=e.classes;return l.createElement(ia.default,{className:r.paper},l.createElement("div",{className:r.content},n),t&&l.createElement("div",{className:r.actions},t))}),ob=function(e){var t=e.title;return l.createElement(x.default,{variant:"subtitle2",gutterBottom:!0},t)},om=function(e){var t=e.children,n=e.value;return l.createElement(x.default,{variant:"body1",noWrap:!0},t||n)},og=(0,b.withStyles)(oh)(function(e){var t=e.children,n=e.classes,r=e.value;return l.createElement("div",{className:n.itemBlock},l.createElement(x.default,{variant:"body1",className:n.itemBlockText},t||r))});function ov(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function oy(e){if(Array.isArray(e))return e}function ow(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function o_(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function oE(e,t){return oy(e)||ow(e,t)||oS(e,t)||o_()}function oS(e,t){if(e){if("string"==typeof e)return ov(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return ov(e,t)}}var ok=function(e){var t=e.bridge,n=e.onDelete,r=oE(l.useState(null),2),i=r[0],a=r[1],o=function(e){a(e.currentTarget)},s=function(){a(null)},u=function(){n(),a(null)};return l.createElement(op,{actions:l.createElement("div",null,l.createElement(y.default,{onClick:o,"aria-label":"open-menu"},l.createElement(of.Z,null)),l.createElement(t_.Z,{anchorEl:i,open:Boolean(i),onClose:s},l.createElement(tN,{to:"/bridges/".concat(t.id,"/edit")},l.createElement(ol.Z,null,l.createElement(ou.Z,null)),l.createElement(E.Z,null,"Edit")),l.createElement(tE.default,{onClick:u},l.createElement(ol.Z,null,l.createElement(oc.Z,null)),l.createElement(E.Z,null,"Delete"))))},l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12,sm:4,md:4},l.createElement(ob,{title:"Name"}),l.createElement(om,{value:t.name})),l.createElement(d.Z,{item:!0,xs:12,sm:4,md:8},l.createElement(ob,{title:"URL"}),l.createElement(om,{value:t.url})),l.createElement(d.Z,{item:!0,xs:12,sm:4,md:4},l.createElement(ob,{title:"Outgoing Token"}),l.createElement(om,{value:t.outgoingToken})),l.createElement(d.Z,{item:!0,xs:12,sm:4,md:3},l.createElement(ob,{title:"Confirmations"}),l.createElement(om,{value:t.confirmations})),l.createElement(d.Z,{item:!0,xs:12,sm:4,md:3},l.createElement(ob,{title:"Min. Contract Payment"}),l.createElement(om,{value:t.minimumContractPayment}))))},ox=n(83638),oT=n(33084),oM=n(22693),oO=n(58742),oA=n(9887),oL=(0,b.withStyles)(function(e){return{root:{paddingTop:3*e.spacing.unit,paddingBottom:3*e.spacing.unit}}})(oA.Z),oC=(0,b.withStyles)(function(e){return{root:{paddingLeft:2*e.spacing.unit,paddingRight:2*e.spacing.unit,paddingBottom:2*e.spacing.unit,display:"flex",flexDirection:"row",alignItems:"center"}}})(oT.Z),oI=function(e){var t=e.body,n=e.cancelButtonText,r=e.confirmButtonText,i=e.confirmButtonEnabled,a=e.maxWidth,o=e.onClose,s=e.onCancel,u=e.onConfirm,c=e.open,f=e.title;return l.createElement(aN.Z,{open:c,onClose:o,maxWidth:a},l.createElement(oL,{disableTypography:!0},l.createElement(x.default,{variant:"h5"}," ",f)),l.createElement(oM.Z,null,"string"==typeof t?l.createElement(oO.Z,{color:"textPrimary"},t):t),l.createElement(oC,null,n&&s&&l.createElement(ox.default,{onClick:s,variant:"text"},n),l.createElement(ox.default,{onClick:u,variant:"contained",color:"primary",disabled:!!i},r||"Confirm")))};function oD(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function oN(e){if(Array.isArray(e))return e}function oP(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function oR(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function oj(e,t){return oN(e)||oP(e,t)||oY(e,t)||oR()}function oF(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function oY(e,t){if(e){if("string"==typeof e)return oD(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return oD(e,t)}}function oB(){var e=oF(["\n  fragment BridgePayload_Fields on Bridge {\n    id\n    name\n    url\n    confirmations\n    outgoingToken\n    minimumContractPayment\n  }\n"]);return oB=function(){return e},e}var oU=n0(oB()),oH=function(e){var t=e.bridge,n=e.onDelete,r=oj(l.useState(!1),2),i=r[0],a=r[1];return l.createElement(l.Fragment,null,l.createElement(iv,null,l.createElement(d.Z,{container:!0,spacing:16},l.createElement(d.Z,{item:!0,xs:12},l.createElement(iw,null,t.name)),l.createElement(d.Z,{item:!0,xs:12},l.createElement(ok,{bridge:t,onDelete:function(){return a(!0)}})))),l.createElement(oI,{open:i,title:"Delete Bridge",body:"Are you sure you want to delete this bridge?",confirmButtonText:"Confirm",onConfirm:n,cancelButtonText:"Cancel",onCancel:function(){return a(!1)}}))};function o$(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function oz(e){if(Array.isArray(e))return e}function oG(e,t){return null!=t&&"undefined"!=typeof Symbol&&t[Symbol.hasInstance]?!!t[Symbol.hasInstance](e):e instanceof t}function oW(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function oK(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function oV(e,t){return oz(e)||oW(e,t)||oq(e,t)||oK()}function oq(e,t){if(e){if("string"==typeof e)return o$(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return o$(e,t)}}var oZ=function(){var e=oV(l.useState(),2),t=e[0],n=e[1],r=(0,h.k6)(),i=(0,A.I0)();return l.useEffect(function(){null!=t&&(oG(t,ru.cA)?(t.graphQLErrors.forEach(function(e){var t;if((null===(t=e.extensions)||void 0===t?void 0:t.code)=="UNAUTHORIZED"){i((0,ty.Jc)()),r.push("/signin");return}}),i((0,ty.LO)(t.message))):oG(t,Error)?i((0,ty.LO)(t.message)):i((0,ty.LO)("An error occured")))},[i,t,r]),{handleMutationError:n}};function oX(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function oJ(e){if(Array.isArray(e))return e}function oQ(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function o1(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){oQ(a,r,i,o,s,"next",e)}function s(e){oQ(a,r,i,o,s,"throw",e)}o(void 0)})}}function o0(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function o2(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function o3(e,t){return oJ(e)||o0(e,t)||o5(e,t)||o2()}function o4(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function o5(e,t){if(e){if("string"==typeof e)return oX(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return oX(e,t)}}var o6=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}};function o9(){var e=o4(["\n  ","\n  query FetchBridge($id: ID!) {\n    bridge(id: $id) {\n      __typename\n      ... on Bridge {\n        ...BridgePayload_Fields\n      }\n      ... on NotFoundError {\n        message\n      }\n    }\n  }\n"]);return o9=function(){return e},e}function o8(){var e=o4(["\n  mutation DeleteBridge($id: ID!) {\n    deleteBridge(id: $id) {\n      ... on DeleteBridgeSuccess {\n        bridge {\n          id\n        }\n      }\n      ... on NotFoundError {\n        message\n      }\n      ... on DeleteBridgeInvalidNameError {\n        message\n      }\n      ... on DeleteBridgeConflictError {\n        message\n      }\n    }\n  }\n"]);return o8=function(){return e},e}var o7=n0(o9(),oU),se=n0(o8()),st=function(){var e=(0,h.UO)().id,t=(0,h.k6)(),n=(0,A.I0)(),r=oZ().handleMutationError,i=ry(o7,{variables:{id:e}}),a=i.data,o=i.loading,s=i.error,u=o3(os(se),1)[0];if(o)return l.createElement(ij,null);if(s)return l.createElement(iN,{error:s});var c,f=(c=o1(function(){var i,a,o,s,c;return o6(this,function(l){switch(l.label){case 0:return l.trys.push([0,2,,3]),[4,u(((o={}).variables={id:e},o))];case 1:switch(null==(s=null===(i=(a=l.sent()).data)||void 0===i?void 0:i.deleteBridge)?void 0:s.__typename){case"DeleteBridgeSuccess":t.push("/bridges"),n((0,ty.qt)("Bridge Deleted"));break;case"NotFoundError":case"DeleteBridgeInvalidNameError":case"DeleteBridgeConflictError":n((0,ty.LO)(s.message))}return[3,3];case 2:return r(c=l.sent()),[3,3];case 3:return[2]}})}),function(){return c.apply(this,arguments)}),d=null==a?void 0:a.bridge;switch(null==d?void 0:d.__typename){case"Bridge":return l.createElement(oH,{bridge:d,onDelete:f});case"NotFoundError":return l.createElement(oo,null);default:return null}},sn=(0,b.withStyles)(ic)(function(e){var t=e.bridge,n=e.classes;return l.createElement(ii.Z,{className:n.row,key:t.name,hover:!0},l.createElement(ie.default,{scope:"row",component:"th"},l.createElement(ip,{className:n.link,href:"/bridges/".concat(t.name)},t.name)),l.createElement(ie.default,null,l.createElement(x.default,{variant:"body1"},t.url)),l.createElement(ie.default,null,l.createElement(x.default,{variant:"body1"},t.confirmations)),l.createElement(ie.default,null,l.createElement(x.default,{variant:"body1"},t.minimumContractPayment)))});function sr(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function si(){var e=sr(["\n  fragment BridgesPayload_ResultsFields on Bridge {\n    id\n    name\n    url\n    confirmations\n    minimumContractPayment\n  }\n"]);return si=function(){return e},e}var sa=n0(si()),so=function(e){var t=e.bridges,n=e.page,r=e.pageSize,i=e.total,a=(0,h.k6)();return l.createElement(iv,null,l.createElement(d.Z,{container:!0,spacing:32},l.createElement(d.Z,{item:!0,xs:9},l.createElement(iw,null,"Bridges")),l.createElement(d.Z,{item:!0,xs:3},l.createElement(d.Z,{container:!0,justify:"flex-end"},l.createElement(d.Z,{item:!0},l.createElement(aL.Z,{variant:"secondary",component:tz,href:"/bridges/new"},"New Bridge")))),l.createElement(d.Z,{item:!0,xs:12},l.createElement(r9.Z,null,l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,"Name"),l.createElement(ie.default,null,"URL"),l.createElement(ie.default,null,"Default Confirmations"),l.createElement(ie.default,null,"Minimum Contract Payment"))),l.createElement(r7.Z,null,t.map(function(e){return l.createElement(sn,{bridge:e,key:e.name})}))),l.createElement(ir.Z,{component:"div",count:i,rowsPerPage:r,rowsPerPageOptions:[r],page:n-1,onChangePage:function(e,t){a.push("/bridges?page=".concat(t+1,"&per=").concat(r))},onChangeRowsPerPage:function(){},backIconButtonProps:{"aria-label":"prev-page"},nextIconButtonProps:{"aria-label":"next-page"}})))))};function ss(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function su(){var e=ss(["\n  ","\n  query FetchBridges($offset: Int, $limit: Int) {\n    bridges(offset: $offset, limit: $limit) {\n      results {\n        ...BridgesPayload_ResultsFields\n      }\n      metadata {\n        total\n      }\n    }\n  }\n"]);return su=function(){return e},e}var sc=n0(su(),sa),sl=function(){var e=iF(),t=parseInt(e.get("page")||"1",10),n=parseInt(e.get("per")||"10",10),r=ry(sc,{variables:{offset:(t-1)*n,limit:n},fetchPolicy:"network-only"}),i=r.data,a=r.loading,o=r.error;return a?l.createElement(ij,null):o?l.createElement(iN,{error:o}):i?l.createElement(so,{bridges:i.bridges.results,page:t,pageSize:n,total:i.bridges.metadata.total}):null},sf=n(52658),sd=n(69590),sh=n.n(sd),sp=function(e){return sb(e)&&!sm(e)};function sb(e){return!!e&&"object"==typeof e}function sm(e){var t=Object.prototype.toString.call(e);return"[object RegExp]"===t||"[object Date]"===t||sv(e)}var sg="function"==typeof Symbol&&Symbol.for?Symbol.for("react.element"):60103;function sv(e){return e.$$typeof===sg}function sy(e){return Array.isArray(e)?[]:{}}function sw(e,t){return!1!==t.clone&&t.isMergeableObject(e)?sS(sy(e),e,t):e}function s_(e,t,n){return e.concat(t).map(function(e){return sw(e,n)})}function sE(e,t,n){var r={};return n.isMergeableObject(e)&&Object.keys(e).forEach(function(t){r[t]=sw(e[t],n)}),Object.keys(t).forEach(function(i){n.isMergeableObject(t[i])&&e[i]?r[i]=sS(e[i],t[i],n):r[i]=sw(t[i],n)}),r}function sS(e,t,n){(n=n||{}).arrayMerge=n.arrayMerge||s_,n.isMergeableObject=n.isMergeableObject||sp;var r=Array.isArray(t);return r!==Array.isArray(e)?sw(t,n):r?n.arrayMerge(e,t,n):sE(e,t,n)}sS.all=function(e,t){if(!Array.isArray(e))throw Error("first argument should be an array");return e.reduce(function(e,n){return sS(e,n,t)},{})};var sk=sS;let sx=sk;function sT(e,t){return function(n){return e(t(n))}}let sM=sT;var sO=sM(Object.getPrototypeOf,Object);let sA=sO;var sL="[object Object]",sC=Function.prototype,sI=Object.prototype,sD=sC.toString,sN=sI.hasOwnProperty,sP=sD.call(Object);function sR(e){if(!eD(e)||eC(e)!=sL)return!1;var t=sA(e);if(null===t)return!0;var n=sN.call(t,"constructor")&&t.constructor;return"function"==typeof n&&n instanceof n&&sD.call(n)==sP}let sj=sR;function sF(){this.__data__=[],this.size=0}let sY=sF;function sB(e,t){return e===t||e!=e&&t!=t}let sU=sB;function sH(e,t){for(var n=e.length;n--;)if(sU(e[n][0],t))return n;return -1}let s$=sH;var sz=Array.prototype.splice;function sG(e){var t=this.__data__,n=s$(t,e);return!(n<0)&&(n==t.length-1?t.pop():sz.call(t,n,1),--this.size,!0)}let sW=sG;function sK(e){var t=this.__data__,n=s$(t,e);return n<0?void 0:t[n][1]}let sV=sK;function sq(e){return s$(this.__data__,e)>-1}let sZ=sq;function sX(e,t){var n=this.__data__,r=s$(n,e);return r<0?(++this.size,n.push([e,t])):n[r][1]=t,this}let sJ=sX;function sQ(e){var t=-1,n=null==e?0:e.length;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}sQ.prototype.clear=sY,sQ.prototype.delete=sW,sQ.prototype.get=sV,sQ.prototype.has=sZ,sQ.prototype.set=sJ;let s1=sQ;function s0(){this.__data__=new s1,this.size=0}let s2=s0;function s3(e){var t=this.__data__,n=t.delete(e);return this.size=t.size,n}let s4=s3;function s5(e){return this.__data__.get(e)}let s6=s5;function s9(e){return this.__data__.has(e)}let s8=s9;var s7="[object AsyncFunction]",ue="[object Function]",ut="[object GeneratorFunction]",un="[object Proxy]";function ur(e){if(!ed(e))return!1;var t=eC(e);return t==ue||t==ut||t==s7||t==un}let ui=ur;var ua=eh.Z["__core-js_shared__"];let uo=ua;var us,uu=(us=/[^.]+$/.exec(uo&&uo.keys&&uo.keys.IE_PROTO||""))?"Symbol(src)_1."+us:"";function uc(e){return!!uu&&uu in e}let ul=uc;var uf=Function.prototype.toString;function ud(e){if(null!=e){try{return uf.call(e)}catch(t){}try{return e+""}catch(n){}}return""}let uh=ud;var up=/[\\^$.*+?()[\]{}|]/g,ub=/^\[object .+?Constructor\]$/,um=Function.prototype,ug=Object.prototype,uv=um.toString,uy=ug.hasOwnProperty,uw=RegExp("^"+uv.call(uy).replace(up,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$");function u_(e){return!(!ed(e)||ul(e))&&(ui(e)?uw:ub).test(uh(e))}let uE=u_;function uS(e,t){return null==e?void 0:e[t]}let uk=uS;function ux(e,t){var n=uk(e,t);return uE(n)?n:void 0}let uT=ux;var uM=uT(eh.Z,"Map");let uO=uM;var uA=uT(Object,"create");let uL=uA;function uC(){this.__data__=uL?uL(null):{},this.size=0}let uI=uC;function uD(e){var t=this.has(e)&&delete this.__data__[e];return this.size-=t?1:0,t}let uN=uD;var uP="__lodash_hash_undefined__",uR=Object.prototype.hasOwnProperty;function uj(e){var t=this.__data__;if(uL){var n=t[e];return n===uP?void 0:n}return uR.call(t,e)?t[e]:void 0}let uF=uj;var uY=Object.prototype.hasOwnProperty;function uB(e){var t=this.__data__;return uL?void 0!==t[e]:uY.call(t,e)}let uU=uB;var uH="__lodash_hash_undefined__";function u$(e,t){var n=this.__data__;return this.size+=this.has(e)?0:1,n[e]=uL&&void 0===t?uH:t,this}let uz=u$;function uG(e){var t=-1,n=null==e?0:e.length;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}uG.prototype.clear=uI,uG.prototype.delete=uN,uG.prototype.get=uF,uG.prototype.has=uU,uG.prototype.set=uz;let uW=uG;function uK(){this.size=0,this.__data__={hash:new uW,map:new(uO||s1),string:new uW}}let uV=uK;function uq(e){var t=typeof e;return"string"==t||"number"==t||"symbol"==t||"boolean"==t?"__proto__"!==e:null===e}let uZ=uq;function uX(e,t){var n=e.__data__;return uZ(t)?n["string"==typeof t?"string":"hash"]:n.map}let uJ=uX;function uQ(e){var t=uJ(this,e).delete(e);return this.size-=t?1:0,t}let u1=uQ;function u0(e){return uJ(this,e).get(e)}let u2=u0;function u3(e){return uJ(this,e).has(e)}let u4=u3;function u5(e,t){var n=uJ(this,e),r=n.size;return n.set(e,t),this.size+=n.size==r?0:1,this}let u6=u5;function u9(e){var t=-1,n=null==e?0:e.length;for(this.clear();++t<n;){var r=e[t];this.set(r[0],r[1])}}u9.prototype.clear=uV,u9.prototype.delete=u1,u9.prototype.get=u2,u9.prototype.has=u4,u9.prototype.set=u6;let u8=u9;var u7=200;function ce(e,t){var n=this.__data__;if(n instanceof s1){var r=n.__data__;if(!uO||r.length<u7-1)return r.push([e,t]),this.size=++n.size,this;n=this.__data__=new u8(r)}return n.set(e,t),this.size=n.size,this}let ct=ce;function cn(e){var t=this.__data__=new s1(e);this.size=t.size}cn.prototype.clear=s2,cn.prototype.delete=s4,cn.prototype.get=s6,cn.prototype.has=s8,cn.prototype.set=ct;let cr=cn;function ci(e,t){for(var n=-1,r=null==e?0:e.length;++n<r&&!1!==t(e[n],n,e););return e}let ca=ci;var co=function(){try{var e=uT(Object,"defineProperty");return e({},"",{}),e}catch(t){}}();let cs=co;function cu(e,t,n){"__proto__"==t&&cs?cs(e,t,{configurable:!0,enumerable:!0,value:n,writable:!0}):e[t]=n}let cc=cu;var cl=Object.prototype.hasOwnProperty;function cf(e,t,n){var r=e[t];cl.call(e,t)&&sU(r,n)&&(void 0!==n||t in e)||cc(e,t,n)}let cd=cf;function ch(e,t,n,r){var i=!n;n||(n={});for(var a=-1,o=t.length;++a<o;){var s=t[a],u=r?r(n[s],e[s],s,n,e):void 0;void 0===u&&(u=e[s]),i?cc(n,s,u):cd(n,s,u)}return n}let cp=ch;function cb(e,t){for(var n=-1,r=Array(e);++n<e;)r[n]=t(n);return r}let cm=cb;var cg="[object Arguments]";function cv(e){return eD(e)&&eC(e)==cg}let cy=cv;var cw=Object.prototype,c_=cw.hasOwnProperty,cE=cw.propertyIsEnumerable,cS=cy(function(){return arguments}())?cy:function(e){return eD(e)&&c_.call(e,"callee")&&!cE.call(e,"callee")};let ck=cS;var cx=Array.isArray;let cT=cx;var cM=n(29710),cO=9007199254740991,cA=/^(?:0|[1-9]\d*)$/;function cL(e,t){var n=typeof e;return!!(t=null==t?cO:t)&&("number"==n||"symbol"!=n&&cA.test(e))&&e>-1&&e%1==0&&e<t}let cC=cL;var cI=9007199254740991;function cD(e){return"number"==typeof e&&e>-1&&e%1==0&&e<=cI}let cN=cD;var cP="[object Arguments]",cR="[object Array]",cj="[object Boolean]",cF="[object Date]",cY="[object Error]",cB="[object Function]",cU="[object Map]",cH="[object Number]",c$="[object Object]",cz="[object RegExp]",cG="[object Set]",cW="[object String]",cK="[object WeakMap]",cV="[object ArrayBuffer]",cq="[object DataView]",cZ="[object Float64Array]",cX="[object Int8Array]",cJ="[object Int16Array]",cQ="[object Int32Array]",c1="[object Uint8Array]",c0="[object Uint8ClampedArray]",c2="[object Uint16Array]",c3="[object Uint32Array]",c4={};function c5(e){return eD(e)&&cN(e.length)&&!!c4[eC(e)]}c4["[object Float32Array]"]=c4[cZ]=c4[cX]=c4[cJ]=c4[cQ]=c4[c1]=c4[c0]=c4[c2]=c4[c3]=!0,c4[cP]=c4[cR]=c4[cV]=c4[cj]=c4[cq]=c4[cF]=c4[cY]=c4[cB]=c4[cU]=c4[cH]=c4[c$]=c4[cz]=c4[cG]=c4[cW]=c4[cK]=!1;let c6=c5;function c9(e){return function(t){return e(t)}}let c8=c9;var c7=n(79730),le=c7.Z&&c7.Z.isTypedArray,lt=le?c8(le):c6;let ln=lt;var lr=Object.prototype.hasOwnProperty;function li(e,t){var n=cT(e),r=!n&&ck(e),i=!n&&!r&&(0,cM.Z)(e),a=!n&&!r&&!i&&ln(e),o=n||r||i||a,s=o?cm(e.length,String):[],u=s.length;for(var c in e)(t||lr.call(e,c))&&!(o&&("length"==c||i&&("offset"==c||"parent"==c)||a&&("buffer"==c||"byteLength"==c||"byteOffset"==c)||cC(c,u)))&&s.push(c);return s}let la=li;var lo=Object.prototype;function ls(e){var t=e&&e.constructor;return e===("function"==typeof t&&t.prototype||lo)}let lu=ls;var lc=sM(Object.keys,Object);let ll=lc;var lf=Object.prototype.hasOwnProperty;function ld(e){if(!lu(e))return ll(e);var t=[];for(var n in Object(e))lf.call(e,n)&&"constructor"!=n&&t.push(n);return t}let lh=ld;function lp(e){return null!=e&&cN(e.length)&&!ui(e)}let lb=lp;function lm(e){return lb(e)?la(e):lh(e)}let lg=lm;function lv(e,t){return e&&cp(t,lg(t),e)}let ly=lv;function lw(e){var t=[];if(null!=e)for(var n in Object(e))t.push(n);return t}let l_=lw;var lE=Object.prototype.hasOwnProperty;function lS(e){if(!ed(e))return l_(e);var t=lu(e),n=[];for(var r in e)"constructor"==r&&(t||!lE.call(e,r))||n.push(r);return n}let lk=lS;function lx(e){return lb(e)?la(e,!0):lk(e)}let lT=lx;function lM(e,t){return e&&cp(t,lT(t),e)}let lO=lM;var lA=n(42896);function lL(e,t){var n=-1,r=e.length;for(t||(t=Array(r));++n<r;)t[n]=e[n];return t}let lC=lL;function lI(e,t){for(var n=-1,r=null==e?0:e.length,i=0,a=[];++n<r;){var o=e[n];t(o,n,e)&&(a[i++]=o)}return a}let lD=lI;function lN(){return[]}let lP=lN;var lR=Object.prototype.propertyIsEnumerable,lj=Object.getOwnPropertySymbols,lF=lj?function(e){return null==e?[]:lD(lj(e=Object(e)),function(t){return lR.call(e,t)})}:lP;let lY=lF;function lB(e,t){return cp(e,lY(e),t)}let lU=lB;function lH(e,t){for(var n=-1,r=t.length,i=e.length;++n<r;)e[i+n]=t[n];return e}let l$=lH;var lz=Object.getOwnPropertySymbols?function(e){for(var t=[];e;)l$(t,lY(e)),e=sA(e);return t}:lP;let lG=lz;function lW(e,t){return cp(e,lG(e),t)}let lK=lW;function lV(e,t,n){var r=t(e);return cT(e)?r:l$(r,n(e))}let lq=lV;function lZ(e){return lq(e,lg,lY)}let lX=lZ;function lJ(e){return lq(e,lT,lG)}let lQ=lJ;var l1=uT(eh.Z,"DataView");let l0=l1;var l2=uT(eh.Z,"Promise");let l3=l2;var l4=uT(eh.Z,"Set");let l5=l4;var l6=uT(eh.Z,"WeakMap");let l9=l6;var l8="[object Map]",l7="[object Object]",fe="[object Promise]",ft="[object Set]",fn="[object WeakMap]",fr="[object DataView]",fi=uh(l0),fa=uh(uO),fo=uh(l3),fs=uh(l5),fu=uh(l9),fc=eC;(l0&&fc(new l0(new ArrayBuffer(1)))!=fr||uO&&fc(new uO)!=l8||l3&&fc(l3.resolve())!=fe||l5&&fc(new l5)!=ft||l9&&fc(new l9)!=fn)&&(fc=function(e){var t=eC(e),n=t==l7?e.constructor:void 0,r=n?uh(n):"";if(r)switch(r){case fi:return fr;case fa:return l8;case fo:return fe;case fs:return ft;case fu:return fn}return t});let fl=fc;var ff=Object.prototype.hasOwnProperty;function fd(e){var t=e.length,n=new e.constructor(t);return t&&"string"==typeof e[0]&&ff.call(e,"index")&&(n.index=e.index,n.input=e.input),n}let fh=fd;var fp=eh.Z.Uint8Array;let fb=fp;function fm(e){var t=new e.constructor(e.byteLength);return new fb(t).set(new fb(e)),t}let fg=fm;function fv(e,t){var n=t?fg(e.buffer):e.buffer;return new e.constructor(n,e.byteOffset,e.byteLength)}let fy=fv;var fw=/\w*$/;function f_(e){var t=new e.constructor(e.source,fw.exec(e));return t.lastIndex=e.lastIndex,t}let fE=f_;var fS=eg?eg.prototype:void 0,fk=fS?fS.valueOf:void 0;function fx(e){return fk?Object(fk.call(e)):{}}let fT=fx;function fM(e,t){var n=t?fg(e.buffer):e.buffer;return new e.constructor(n,e.byteOffset,e.length)}let fO=fM;var fA="[object Boolean]",fL="[object Date]",fC="[object Map]",fI="[object Number]",fD="[object RegExp]",fN="[object Set]",fP="[object String]",fR="[object Symbol]",fj="[object ArrayBuffer]",fF="[object DataView]",fY="[object Float32Array]",fB="[object Float64Array]",fU="[object Int8Array]",fH="[object Int16Array]",f$="[object Int32Array]",fz="[object Uint8Array]",fG="[object Uint8ClampedArray]",fW="[object Uint16Array]",fK="[object Uint32Array]";function fV(e,t,n){var r=e.constructor;switch(t){case fj:return fg(e);case fA:case fL:return new r(+e);case fF:return fy(e,n);case fY:case fB:case fU:case fH:case f$:case fz:case fG:case fW:case fK:return fO(e,n);case fC:return new r;case fI:case fP:return new r(e);case fD:return fE(e);case fN:return new r;case fR:return fT(e)}}let fq=fV;var fZ=Object.create,fX=function(){function e(){}return function(t){if(!ed(t))return{};if(fZ)return fZ(t);e.prototype=t;var n=new e;return e.prototype=void 0,n}}();let fJ=fX;function fQ(e){return"function"!=typeof e.constructor||lu(e)?{}:fJ(sA(e))}let f1=fQ;var f0="[object Map]";function f2(e){return eD(e)&&fl(e)==f0}let f3=f2;var f4=c7.Z&&c7.Z.isMap,f5=f4?c8(f4):f3;let f6=f5;var f9="[object Set]";function f8(e){return eD(e)&&fl(e)==f9}let f7=f8;var de=c7.Z&&c7.Z.isSet,dt=de?c8(de):f7;let dn=dt;var dr=1,di=2,da=4,ds="[object Arguments]",du="[object Array]",dc="[object Boolean]",dl="[object Date]",df="[object Error]",dd="[object Function]",dh="[object GeneratorFunction]",dp="[object Map]",db="[object Number]",dm="[object Object]",dg="[object RegExp]",dv="[object Set]",dy="[object String]",dw="[object Symbol]",d_="[object WeakMap]",dE="[object ArrayBuffer]",dS="[object DataView]",dk="[object Float32Array]",dx="[object Float64Array]",dT="[object Int8Array]",dM="[object Int16Array]",dO="[object Int32Array]",dA="[object Uint8Array]",dL="[object Uint8ClampedArray]",dC="[object Uint16Array]",dI="[object Uint32Array]",dD={};function dN(e,t,n,r,i,a){var o,s=t&dr,u=t&di,c=t&da;if(n&&(o=i?n(e,r,i,a):n(e)),void 0!==o)return o;if(!ed(e))return e;var l=cT(e);if(l){if(o=fh(e),!s)return lC(e,o)}else{var f=fl(e),d=f==dd||f==dh;if((0,cM.Z)(e))return(0,lA.Z)(e,s);if(f==dm||f==ds||d&&!i){if(o=u||d?{}:f1(e),!s)return u?lK(e,lO(o,e)):lU(e,ly(o,e))}else{if(!dD[f])return i?e:{};o=fq(e,f,s)}}a||(a=new cr);var h=a.get(e);if(h)return h;a.set(e,o),dn(e)?e.forEach(function(r){o.add(dN(r,t,n,r,e,a))}):f6(e)&&e.forEach(function(r,i){o.set(i,dN(r,t,n,i,e,a))});var p=c?u?lQ:lX:u?keysIn:lg,b=l?void 0:p(e);return ca(b||e,function(r,i){b&&(r=e[i=r]),cd(o,i,dN(r,t,n,i,e,a))}),o}dD[ds]=dD[du]=dD[dE]=dD[dS]=dD[dc]=dD[dl]=dD[dk]=dD[dx]=dD[dT]=dD[dM]=dD[dO]=dD[dp]=dD[db]=dD[dm]=dD[dg]=dD[dv]=dD[dy]=dD[dw]=dD[dA]=dD[dL]=dD[dC]=dD[dI]=!0,dD[df]=dD[dd]=dD[d_]=!1;let dP=dN;var dR=4;function dj(e){return dP(e,dR)}let dF=dj;function dY(e,t){for(var n=-1,r=null==e?0:e.length,i=Array(r);++n<r;)i[n]=t(e[n],n,e);return i}let dB=dY;var dU="Expected a function";function dH(e,t){if("function"!=typeof e||null!=t&&"function"!=typeof t)throw TypeError(dU);var n=function(){var r=arguments,i=t?t.apply(this,r):r[0],a=n.cache;if(a.has(i))return a.get(i);var o=e.apply(this,r);return n.cache=a.set(i,o)||a,o};return n.cache=new(dH.Cache||u8),n}dH.Cache=u8;let d$=dH;var dz=500;function dG(e){var t=d$(e,function(e){return n.size===dz&&n.clear(),e}),n=t.cache;return t}let dW=dG;var dK=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g,dV=/\\(\\)?/g,dq=dW(function(e){var t=[];return 46===e.charCodeAt(0)&&t.push(""),e.replace(dK,function(e,n,r,i){t.push(r?i.replace(dV,"$1"):n||e)}),t});let dZ=dq;var dX=1/0;function dJ(e){if("string"==typeof e||eR(e))return e;var t=e+"";return"0"==t&&1/e==-dX?"-0":t}let dQ=dJ;var d1=1/0,d0=eg?eg.prototype:void 0,d2=d0?d0.toString:void 0;function d3(e){if("string"==typeof e)return e;if(cT(e))return dB(e,d3)+"";if(eR(e))return d2?d2.call(e):"";var t=e+"";return"0"==t&&1/e==-d1?"-0":t}let d4=d3;function d5(e){return null==e?"":d4(e)}let d6=d5;function d9(e){return cT(e)?dB(e,dQ):eR(e)?[e]:lC(dZ(d6(e)))}let d8=d9;var d7=!0;function he(e,t){if(!d7&&!e){var n="Warning: "+t;"undefined"!=typeof console&&console.warn(n);try{throw Error(n)}catch(r){}}}let ht=he;n(8679);var hn=1,hr=4;function hi(e){return dP(e,hn|hr)}let ha=hi;function ho(){return(ho=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}function hs(e,t){e.prototype=Object.create(t.prototype),e.prototype.constructor=e,e.__proto__=t}function hu(e,t){if(null==e)return{};var n,r,i={},a=Object.keys(e);for(r=0;r<a.length;r++)n=a[r],t.indexOf(n)>=0||(i[n]=e[n]);return i}function hc(e){if(void 0===e)throw ReferenceError("this hasn't been initialised - super() hasn't been called");return e}var hl=function(e){return Array.isArray(e)&&0===e.length},hf=function(e){return"function"==typeof e},hd=function(e){return null!==e&&"object"==typeof e},hh=function(e){return String(Math.floor(Number(e)))===e},hp=function(e){return"[object String]"===Object.prototype.toString.call(e)},hb=function(e){return 0===l.Children.count(e)},hm=function(e){return hd(e)&&hf(e.then)};function hg(e,t,n,r){void 0===r&&(r=0);for(var i=d8(t);e&&r<i.length;)e=e[i[r++]];return void 0===e?n:e}function hv(e,t,n){for(var r=dF(e),i=r,a=0,o=d8(t);a<o.length-1;a++){var s=o[a],u=hg(e,o.slice(0,a+1));if(u&&(hd(u)||Array.isArray(u)))i=i[s]=dF(u);else{var c=o[a+1];i=i[s]=hh(c)&&Number(c)>=0?[]:{}}}return(0===a?e:i)[o[a]]===n?e:(void 0===n?delete i[o[a]]:i[o[a]]=n,0===a&&void 0===n&&delete r[o[a]],r)}function hy(e,t,n,r){void 0===n&&(n=new WeakMap),void 0===r&&(r={});for(var i=0,a=Object.keys(e);i<a.length;i++){var o=a[i],s=e[o];hd(s)?n.get(s)||(n.set(s,!0),r[o]=Array.isArray(s)?[]:{},hy(s,t,n,r[o])):r[o]=t}return r}var hw=(0,l.createContext)(void 0),h_=hw.Provider;function hE(){var e=(0,l.useContext)(hw);return e||ht(!1),e}function hS(e,t){switch(t.type){case"SET_VALUES":return ho({},e,{values:t.payload});case"SET_TOUCHED":return ho({},e,{touched:t.payload});case"SET_ERRORS":if(sh()(e.errors,t.payload))return e;return ho({},e,{errors:t.payload});case"SET_STATUS":return ho({},e,{status:t.payload});case"SET_ISSUBMITTING":return ho({},e,{isSubmitting:t.payload});case"SET_ISVALIDATING":return ho({},e,{isValidating:t.payload});case"SET_FIELD_VALUE":return ho({},e,{values:hv(e.values,t.payload.field,t.payload.value)});case"SET_FIELD_TOUCHED":return ho({},e,{touched:hv(e.touched,t.payload.field,t.payload.value)});case"SET_FIELD_ERROR":return ho({},e,{errors:hv(e.errors,t.payload.field,t.payload.value)});case"RESET_FORM":return ho({},e,t.payload);case"SET_FORMIK_STATE":return t.payload(e);case"SUBMIT_ATTEMPT":return ho({},e,{touched:hy(e.values,!0),isSubmitting:!0,submitCount:e.submitCount+1});case"SUBMIT_FAILURE":case"SUBMIT_SUCCESS":return ho({},e,{isSubmitting:!1});default:return e}}hw.Consumer;var hk={},hx={};function hT(e){var t=e.validateOnChange,n=void 0===t||t,r=e.validateOnBlur,i=void 0===r||r,a=e.validateOnMount,o=void 0!==a&&a,s=e.isInitialValid,u=e.enableReinitialize,c=void 0!==u&&u,f=e.onSubmit,d=hu(e,["validateOnChange","validateOnBlur","validateOnMount","isInitialValid","enableReinitialize","onSubmit"]),h=ho({validateOnChange:n,validateOnBlur:i,validateOnMount:o,onSubmit:f},d),p=(0,l.useRef)(h.initialValues),b=(0,l.useRef)(h.initialErrors||hk),m=(0,l.useRef)(h.initialTouched||hx),g=(0,l.useRef)(h.initialStatus),v=(0,l.useRef)(!1),y=(0,l.useRef)({});(0,l.useEffect)(function(){return v.current=!0,function(){v.current=!1}},[]);var w=(0,l.useReducer)(hS,{values:h.initialValues,errors:h.initialErrors||hk,touched:h.initialTouched||hx,status:h.initialStatus,isSubmitting:!1,isValidating:!1,submitCount:0}),_=w[0],E=w[1],S=(0,l.useCallback)(function(e,t){return new Promise(function(n,r){var i=h.validate(e,t);null==i?n(hk):hm(i)?i.then(function(e){n(e||hk)},function(e){r(e)}):n(i)})},[h.validate]),k=(0,l.useCallback)(function(e,t){var n=h.validationSchema,r=hf(n)?n(t):n,i=t&&r.validateAt?r.validateAt(t,e):hA(e,r);return new Promise(function(e,t){i.then(function(){e(hk)},function(n){"ValidationError"===n.name?e(hO(n)):t(n)})})},[h.validationSchema]),x=(0,l.useCallback)(function(e,t){return new Promise(function(n){return n(y.current[e].validate(t))})},[]),T=(0,l.useCallback)(function(e){var t=Object.keys(y.current).filter(function(e){return hf(y.current[e].validate)});return Promise.all(t.length>0?t.map(function(t){return x(t,hg(e,t))}):[Promise.resolve("DO_NOT_DELETE_YOU_WILL_BE_FIRED")]).then(function(e){return e.reduce(function(e,n,r){return"DO_NOT_DELETE_YOU_WILL_BE_FIRED"===n||n&&(e=hv(e,t[r],n)),e},{})})},[x]),M=(0,l.useCallback)(function(e){return Promise.all([T(e),h.validationSchema?k(e):{},h.validate?S(e):{}]).then(function(e){var t=e[0],n=e[1],r=e[2];return sx.all([t,n,r],{arrayMerge:hC})})},[h.validate,h.validationSchema,T,S,k]),O=hP(function(e){return void 0===e&&(e=_.values),E({type:"SET_ISVALIDATING",payload:!0}),M(e).then(function(e){return v.current&&(E({type:"SET_ISVALIDATING",payload:!1}),sh()(_.errors,e)||E({type:"SET_ERRORS",payload:e})),e})});(0,l.useEffect)(function(){o&&!0===v.current&&sh()(p.current,h.initialValues)&&O(p.current)},[o,O]);var A=(0,l.useCallback)(function(e){var t=e&&e.values?e.values:p.current,n=e&&e.errors?e.errors:b.current?b.current:h.initialErrors||{},r=e&&e.touched?e.touched:m.current?m.current:h.initialTouched||{},i=e&&e.status?e.status:g.current?g.current:h.initialStatus;p.current=t,b.current=n,m.current=r,g.current=i;var a=function(){E({type:"RESET_FORM",payload:{isSubmitting:!!e&&!!e.isSubmitting,errors:n,touched:r,status:i,values:t,isValidating:!!e&&!!e.isValidating,submitCount:e&&e.submitCount&&"number"==typeof e.submitCount?e.submitCount:0}})};if(h.onReset){var o=h.onReset(_.values,V);hm(o)?o.then(a):a()}else a()},[h.initialErrors,h.initialStatus,h.initialTouched]);(0,l.useEffect)(function(){!0===v.current&&!sh()(p.current,h.initialValues)&&(c&&(p.current=h.initialValues,A()),o&&O(p.current))},[c,h.initialValues,A,o,O]),(0,l.useEffect)(function(){c&&!0===v.current&&!sh()(b.current,h.initialErrors)&&(b.current=h.initialErrors||hk,E({type:"SET_ERRORS",payload:h.initialErrors||hk}))},[c,h.initialErrors]),(0,l.useEffect)(function(){c&&!0===v.current&&!sh()(m.current,h.initialTouched)&&(m.current=h.initialTouched||hx,E({type:"SET_TOUCHED",payload:h.initialTouched||hx}))},[c,h.initialTouched]),(0,l.useEffect)(function(){c&&!0===v.current&&!sh()(g.current,h.initialStatus)&&(g.current=h.initialStatus,E({type:"SET_STATUS",payload:h.initialStatus}))},[c,h.initialStatus,h.initialTouched]);var L=hP(function(e){if(y.current[e]&&hf(y.current[e].validate)){var t=hg(_.values,e),n=y.current[e].validate(t);return hm(n)?(E({type:"SET_ISVALIDATING",payload:!0}),n.then(function(e){return e}).then(function(t){E({type:"SET_FIELD_ERROR",payload:{field:e,value:t}}),E({type:"SET_ISVALIDATING",payload:!1})})):(E({type:"SET_FIELD_ERROR",payload:{field:e,value:n}}),Promise.resolve(n))}return h.validationSchema?(E({type:"SET_ISVALIDATING",payload:!0}),k(_.values,e).then(function(e){return e}).then(function(t){E({type:"SET_FIELD_ERROR",payload:{field:e,value:t[e]}}),E({type:"SET_ISVALIDATING",payload:!1})})):Promise.resolve()}),C=(0,l.useCallback)(function(e,t){var n=t.validate;y.current[e]={validate:n}},[]),I=(0,l.useCallback)(function(e){delete y.current[e]},[]),D=hP(function(e,t){return E({type:"SET_TOUCHED",payload:e}),(void 0===t?i:t)?O(_.values):Promise.resolve()}),N=(0,l.useCallback)(function(e){E({type:"SET_ERRORS",payload:e})},[]),P=hP(function(e,t){var r=hf(e)?e(_.values):e;return E({type:"SET_VALUES",payload:r}),(void 0===t?n:t)?O(r):Promise.resolve()}),R=(0,l.useCallback)(function(e,t){E({type:"SET_FIELD_ERROR",payload:{field:e,value:t}})},[]),j=hP(function(e,t,r){return E({type:"SET_FIELD_VALUE",payload:{field:e,value:t}}),(void 0===r?n:r)?O(hv(_.values,e,t)):Promise.resolve()}),F=(0,l.useCallback)(function(e,t){var n,r=t,i=e;if(!hp(e)){e.persist&&e.persist();var a=e.target?e.target:e.currentTarget,o=a.type,s=a.name,u=a.id,c=a.value,l=a.checked,f=(a.outerHTML,a.options),d=a.multiple;r=t||s||u,i=/number|range/.test(o)?(n=parseFloat(c),isNaN(n)?"":n):/checkbox/.test(o)?hD(hg(_.values,r),l,c):d?hI(f):c}r&&j(r,i)},[j,_.values]),Y=hP(function(e){if(hp(e))return function(t){return F(t,e)};F(e)}),B=hP(function(e,t,n){return void 0===t&&(t=!0),E({type:"SET_FIELD_TOUCHED",payload:{field:e,value:t}}),(void 0===n?i:n)?O(_.values):Promise.resolve()}),U=(0,l.useCallback)(function(e,t){e.persist&&e.persist();var n,r=e.target,i=r.name,a=r.id;r.outerHTML,B(t||i||a,!0)},[B]),H=hP(function(e){if(hp(e))return function(t){return U(t,e)};U(e)}),$=(0,l.useCallback)(function(e){hf(e)?E({type:"SET_FORMIK_STATE",payload:e}):E({type:"SET_FORMIK_STATE",payload:function(){return e}})},[]),z=(0,l.useCallback)(function(e){E({type:"SET_STATUS",payload:e})},[]),G=(0,l.useCallback)(function(e){E({type:"SET_ISSUBMITTING",payload:e})},[]),W=hP(function(){return E({type:"SUBMIT_ATTEMPT"}),O().then(function(e){var t,n=e instanceof Error;if(!n&&0===Object.keys(e).length){try{if(void 0===(t=q()))return}catch(r){throw r}return Promise.resolve(t).then(function(e){return v.current&&E({type:"SUBMIT_SUCCESS"}),e}).catch(function(e){if(v.current)throw E({type:"SUBMIT_FAILURE"}),e})}if(v.current&&(E({type:"SUBMIT_FAILURE"}),n))throw e})}),K=hP(function(e){e&&e.preventDefault&&hf(e.preventDefault)&&e.preventDefault(),e&&e.stopPropagation&&hf(e.stopPropagation)&&e.stopPropagation(),W().catch(function(e){console.warn("Warning: An unhandled error was caught from submitForm()",e)})}),V={resetForm:A,validateForm:O,validateField:L,setErrors:N,setFieldError:R,setFieldTouched:B,setFieldValue:j,setStatus:z,setSubmitting:G,setTouched:D,setValues:P,setFormikState:$,submitForm:W},q=hP(function(){return f(_.values,V)}),Z=hP(function(e){e&&e.preventDefault&&hf(e.preventDefault)&&e.preventDefault(),e&&e.stopPropagation&&hf(e.stopPropagation)&&e.stopPropagation(),A()}),X=(0,l.useCallback)(function(e){return{value:hg(_.values,e),error:hg(_.errors,e),touched:!!hg(_.touched,e),initialValue:hg(p.current,e),initialTouched:!!hg(m.current,e),initialError:hg(b.current,e)}},[_.errors,_.touched,_.values]),J=(0,l.useCallback)(function(e){return{setValue:function(t,n){return j(e,t,n)},setTouched:function(t,n){return B(e,t,n)},setError:function(t){return R(e,t)}}},[j,B,R]),Q=(0,l.useCallback)(function(e){var t=hd(e),n=t?e.name:e,r=hg(_.values,n),i={name:n,value:r,onChange:Y,onBlur:H};if(t){var a=e.type,o=e.value,s=e.as,u=e.multiple;"checkbox"===a?void 0===o?i.checked=!!r:(i.checked=!!(Array.isArray(r)&&~r.indexOf(o)),i.value=o):"radio"===a?(i.checked=r===o,i.value=o):"select"===s&&u&&(i.value=i.value||[],i.multiple=!0)}return i},[H,Y,_.values]),ee=(0,l.useMemo)(function(){return!sh()(p.current,_.values)},[p.current,_.values]),et=(0,l.useMemo)(function(){return void 0!==s?ee?_.errors&&0===Object.keys(_.errors).length:!1!==s&&hf(s)?s(h):s:_.errors&&0===Object.keys(_.errors).length},[s,ee,_.errors,h]);return ho({},_,{initialValues:p.current,initialErrors:b.current,initialTouched:m.current,initialStatus:g.current,handleBlur:H,handleChange:Y,handleReset:Z,handleSubmit:K,resetForm:A,setErrors:N,setFormikState:$,setFieldTouched:B,setFieldValue:j,setFieldError:R,setStatus:z,setSubmitting:G,setTouched:D,setValues:P,submitForm:W,validateForm:O,validateField:L,isValid:et,dirty:ee,unregisterField:I,registerField:C,getFieldProps:Q,getFieldMeta:X,getFieldHelpers:J,validateOnBlur:i,validateOnChange:n,validateOnMount:o})}function hM(e){var t=hT(e),n=e.component,r=e.children,i=e.render,a=e.innerRef;return(0,l.useImperativeHandle)(a,function(){return t}),(0,l.createElement)(h_,{value:t},n?(0,l.createElement)(n,t):i?i(t):r?hf(r)?r(t):hb(r)?null:l.Children.only(r):null)}function hO(e){var t={};if(e.inner){if(0===e.inner.length)return hv(t,e.path,e.message);for(var n=e.inner,r=Array.isArray(n),i=0,n=r?n:n[Symbol.iterator]();;){if(r){if(i>=n.length)break;a=n[i++]}else{if((i=n.next()).done)break;a=i.value}var a,o=a;hg(t,o.path)||(t=hv(t,o.path,o.message))}}return t}function hA(e,t,n,r){void 0===n&&(n=!1),void 0===r&&(r={});var i=hL(e);return t[n?"validateSync":"validate"](i,{abortEarly:!1,context:r})}function hL(e){var t=Array.isArray(e)?[]:{};for(var n in e)if(Object.prototype.hasOwnProperty.call(e,n)){var r=String(n);!0===Array.isArray(e[r])?t[r]=e[r].map(function(e){return!0===Array.isArray(e)||sj(e)?hL(e):""!==e?e:void 0}):sj(e[r])?t[r]=hL(e[r]):t[r]=""!==e[r]?e[r]:void 0}return t}function hC(e,t,n){var r=e.slice();return t.forEach(function(t,i){if(void 0===r[i]){var a=!1!==n.clone&&n.isMergeableObject(t);r[i]=a?sx(Array.isArray(t)?[]:{},t,n):t}else n.isMergeableObject(t)?r[i]=sx(e[i],t,n):-1===e.indexOf(t)&&r.push(t)}),r}function hI(e){return Array.from(e).filter(function(e){return e.selected}).map(function(e){return e.value})}function hD(e,t,n){if("boolean"==typeof e)return Boolean(t);var r=[],i=!1,a=-1;if(Array.isArray(e))r=e,i=(a=e.indexOf(n))>=0;else if(!n||"true"==n||"false"==n)return Boolean(t);return t&&n&&!i?r.concat(n):i?r.slice(0,a).concat(r.slice(a+1)):r}var hN="undefined"!=typeof window&&void 0!==window.document&&void 0!==window.document.createElement?l.useLayoutEffect:l.useEffect;function hP(e){var t=(0,l.useRef)(e);return hN(function(){t.current=e}),(0,l.useCallback)(function(){for(var e=arguments.length,n=Array(e),r=0;r<e;r++)n[r]=arguments[r];return t.current.apply(void 0,n)},[])}function hR(e){var t=e.validate,n=e.name,r=e.render,i=e.children,a=e.as,o=e.component,s=hu(e,["validate","name","render","children","as","component"]),u=hE(),c=hu(u,["validate","validationSchema"]),f=c.registerField,d=c.unregisterField;(0,l.useEffect)(function(){return f(n,{validate:t}),function(){d(n)}},[f,d,n,t]);var h=c.getFieldProps(ho({name:n},s)),p=c.getFieldMeta(n),b={field:h,form:c};if(r)return r(ho({},b,{meta:p}));if(hf(i))return i(ho({},b,{meta:p}));if(o){if("string"==typeof o){var m=s.innerRef,g=hu(s,["innerRef"]);return(0,l.createElement)(o,ho({ref:m},h,g),i)}return(0,l.createElement)(o,ho({field:h,form:c},s),i)}var v=a||"input";if("string"==typeof v){var y=s.innerRef,w=hu(s,["innerRef"]);return(0,l.createElement)(v,ho({ref:y},h,w),i)}return(0,l.createElement)(v,ho({},h,s),i)}var hj=(0,l.forwardRef)(function(e,t){var n=e.action,r=hu(e,["action"]),i=n||"#",a=hE(),o=a.handleReset,s=a.handleSubmit;return(0,l.createElement)("form",Object.assign({onSubmit:s,ref:t,onReset:o,action:i},r))});hj.displayName="Form";var hF=function(e,t,n){var r=hH(e),i=r[t];return r.splice(t,1),r.splice(n,0,i),r},hY=function(e,t,n){var r=hH(e),i=r[t];return r[t]=r[n],r[n]=i,r},hB=function(e,t,n){var r=hH(e);return r.splice(t,0,n),r},hU=function(e,t,n){var r=hH(e);return r[t]=n,r},hH=function(e){if(!e)return[];if(Array.isArray(e))return[].concat(e);var t=Object.keys(e).map(function(e){return parseInt(e)}).reduce(function(e,t){return t>e?t:e},0);return Array.from(ho({},e,{length:t+1}))};(function(e){function t(t){var n;return(n=e.call(this,t)||this).updateArrayField=function(e,t,r){var i=n.props,a=i.name;(0,i.formik.setFormikState)(function(n){var i="function"==typeof r?r:e,o="function"==typeof t?t:e,s=hv(n.values,a,e(hg(n.values,a))),u=r?i(hg(n.errors,a)):void 0,c=t?o(hg(n.touched,a)):void 0;return hl(u)&&(u=void 0),hl(c)&&(c=void 0),ho({},n,{values:s,errors:r?hv(n.errors,a,u):n.errors,touched:t?hv(n.touched,a,c):n.touched})})},n.push=function(e){return n.updateArrayField(function(t){return[].concat(hH(t),[ha(e)])},!1,!1)},n.handlePush=function(e){return function(){return n.push(e)}},n.swap=function(e,t){return n.updateArrayField(function(n){return hY(n,e,t)},!0,!0)},n.handleSwap=function(e,t){return function(){return n.swap(e,t)}},n.move=function(e,t){return n.updateArrayField(function(n){return hF(n,e,t)},!0,!0)},n.handleMove=function(e,t){return function(){return n.move(e,t)}},n.insert=function(e,t){return n.updateArrayField(function(n){return hB(n,e,t)},function(t){return hB(t,e,null)},function(t){return hB(t,e,null)})},n.handleInsert=function(e,t){return function(){return n.insert(e,t)}},n.replace=function(e,t){return n.updateArrayField(function(n){return hU(n,e,t)},!1,!1)},n.handleReplace=function(e,t){return function(){return n.replace(e,t)}},n.unshift=function(e){var t=-1;return n.updateArrayField(function(n){var r=n?[e].concat(n):[e];return t<0&&(t=r.length),r},function(e){var n=e?[null].concat(e):[null];return t<0&&(t=n.length),n},function(e){var n=e?[null].concat(e):[null];return t<0&&(t=n.length),n}),t},n.handleUnshift=function(e){return function(){return n.unshift(e)}},n.handleRemove=function(e){return function(){return n.remove(e)}},n.handlePop=function(){return function(){return n.pop()}},n.remove=n.remove.bind(hc(n)),n.pop=n.pop.bind(hc(n)),n}hs(t,e);var n=t.prototype;return n.componentDidUpdate=function(e){this.props.validateOnChange&&this.props.formik.validateOnChange&&!sh()(hg(e.formik.values,e.name),hg(this.props.formik.values,this.props.name))&&this.props.formik.validateForm(this.props.formik.values)},n.remove=function(e){var t;return this.updateArrayField(function(n){var r=n?hH(n):[];return t||(t=r[e]),hf(r.splice)&&r.splice(e,1),r},!0,!0),t},n.pop=function(){var e;return this.updateArrayField(function(t){var n=t;return e||(e=n&&n.pop&&n.pop()),n},!0,!0),e},n.render=function(){var e={push:this.push,pop:this.pop,swap:this.swap,move:this.move,insert:this.insert,replace:this.replace,unshift:this.unshift,remove:this.remove,handlePush:this.handlePush,handlePop:this.handlePop,handleSwap:this.handleSwap,handleMove:this.handleMove,handleInsert:this.handleInsert,handleReplace:this.handleReplace,handleUnshift:this.handleUnshift,handleRemove:this.handleRemove},t=this.props,n=t.component,r=t.render,i=t.children,a=t.name,o=hu(t.formik,["validate","validationSchema"]),s=ho({},e,{form:o,name:a});return n?(0,l.createElement)(n,s):r?r(s):i?"function"==typeof i?i(s):hb(i)?null:l.Children.only(i):null},t})(l.Component).defaultProps={validateOnChange:!0},l.Component,l.Component;var h$=n(24802),hz=n(71209),hG=n(91750),hW=n(11970),hK=n(4689),hV=n(67598),hq=function(){return(hq=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var i in t=arguments[n])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)};function hZ(e,t){var n={};for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&0>t.indexOf(r)&&(n[r]=e[r]);if(null!=e&&"function"==typeof Object.getOwnPropertySymbols)for(var i=0,r=Object.getOwnPropertySymbols(e);i<r.length;i++)0>t.indexOf(r[i])&&(n[r[i]]=e[r[i]]);return n}function hX(e){var t=e.disabled,n=e.field,r=n.onBlur,i=hZ(n,["onBlur"]),a=e.form,o=a.isSubmitting,s=a.touched,u=a.errors,c=e.onBlur,l=e.helperText,f=hZ(e,["disabled","field","form","onBlur","helperText"]),d=hg(u,i.name),h=hg(s,i.name)&&!!d;return hq(hq({variant:f.variant,error:h,helperText:h?d:l,disabled:null!=t?t:o,onBlur:null!=c?c:function(e){r(null!=e?e:i.name)}},i),f)}function hJ(e){var t=e.children,n=hZ(e,["children"]);return(0,l.createElement)(i_.Z,hq({},hX(n)),t)}function hQ(e){var t=e.disabled,n=e.field,r=n.onBlur,i=hZ(n,["onBlur"]),a=e.form.isSubmitting,o=(e.type,e.onBlur),s=hZ(e,["disabled","field","form","type","onBlur"]);return hq(hq({disabled:null!=t?t:a,onBlur:null!=o?o:function(e){r(null!=e?e:i.name)}},i),s)}function h1(e){return(0,l.createElement)(h$.Z,hq({},hQ(e)))}function h0(e){var t,n=e.disabled,r=e.field,i=r.onBlur,a=hZ(r,["onBlur"]),o=e.form.isSubmitting,s=(e.type,e.onBlur),u=hZ(e,["disabled","field","form","type","onBlur"]);return hq(hq({disabled:null!=n?n:o,indeterminate:!Array.isArray(a.value)&&null==a.value,onBlur:null!=s?s:function(e){i(null!=e?e:a.name)}},a),u)}function h2(e){return(0,l.createElement)(hz.Z,hq({},h0(e)))}function h3(e){var t=e.Label,n=hZ(e,["Label"]);return(0,l.createElement)(hG.Z,hq({control:(0,l.createElement)(hz.Z,hq({},h0(n)))},t))}function h4(e){var t=e.disabled,n=e.field,r=n.onBlur,i=hZ(n,["onBlur"]),a=e.form.isSubmitting,o=e.onBlur,s=hZ(e,["disabled","field","form","onBlur"]);return hq(hq({disabled:null!=t?t:a,onBlur:null!=o?o:function(e){r(null!=e?e:i.name)}},i),s)}function h5(e){return(0,l.createElement)(hW.default,hq({},h4(e)))}function h6(e){var t=e.field,n=t.onBlur,r=hZ(t,["onBlur"]),i=(e.form,e.onBlur),a=hZ(e,["field","form","onBlur"]);return hq(hq({onBlur:null!=i?i:function(e){n(null!=e?e:r.name)}},r),a)}function h9(e){return(0,l.createElement)(hK.Z,hq({},h6(e)))}function h8(e){var t=e.disabled,n=e.field,r=n.onBlur,i=hZ(n,["onBlur"]),a=e.form.isSubmitting,o=e.onBlur,s=hZ(e,["disabled","field","form","onBlur"]);return hq(hq({disabled:null!=t?t:a,onBlur:null!=o?o:function(e){r(null!=e?e:i.name)}},i),s)}function h7(e){return(0,l.createElement)(hV.default,hq({},h8(e)))}hJ.displayName="FormikMaterialUITextField",h1.displayName="FormikMaterialUISwitch",h2.displayName="FormikMaterialUICheckbox",h3.displayName="FormikMaterialUICheckboxWithLabel",h5.displayName="FormikMaterialUISelect",h9.displayName="FormikMaterialUIRadioGroup",h7.displayName="FormikMaterialUIInputBase";try{a=Map}catch(pe){}try{o=Set}catch(pt){}function pn(e,t,n){if(!e||"object"!=typeof e||"function"==typeof e)return e;if(e.nodeType&&"cloneNode"in e)return e.cloneNode(!0);if(e instanceof Date)return new Date(e.getTime());if(e instanceof RegExp)return RegExp(e);if(Array.isArray(e))return e.map(pr);if(a&&e instanceof a)return new Map(Array.from(e.entries()));if(o&&e instanceof o)return new Set(Array.from(e.values()));if(e instanceof Object){t.push(e);var r=Object.create(e);for(var i in n.push(r),e){var s=t.findIndex(function(t){return t===e[i]});r[i]=s>-1?n[s]:pn(e[i],t,n)}return r}return e}function pr(e){return pn(e,[],[])}let pi=Object.prototype.toString,pa=Error.prototype.toString,po=RegExp.prototype.toString,ps="undefined"!=typeof Symbol?Symbol.prototype.toString:()=>"",pu=/^Symbol\((.*)\)(.*)$/;function pc(e){if(e!=+e)return"NaN";let t=0===e&&1/e<0;return t?"-0":""+e}function pl(e,t=!1){if(null==e||!0===e||!1===e)return""+e;let n=typeof e;if("number"===n)return pc(e);if("string"===n)return t?`"${e}"`:e;if("function"===n)return"[Function "+(e.name||"anonymous")+"]";if("symbol"===n)return ps.call(e).replace(pu,"Symbol($1)");let r=pi.call(e).slice(8,-1);return"Date"===r?isNaN(e.getTime())?""+e:e.toISOString(e):"Error"===r||e instanceof Error?"["+pa.call(e)+"]":"RegExp"===r?po.call(e):null}function pf(e,t){let n=pl(e,t);return null!==n?n:JSON.stringify(e,function(e,n){let r=pl(this[e],t);return null!==r?r:n},2)}let pd={default:"${path} is invalid",required:"${path} is a required field",oneOf:"${path} must be one of the following values: ${values}",notOneOf:"${path} must not be one of the following values: ${values}",notType({path:e,type:t,value:n,originalValue:r}){let i=null!=r&&r!==n,a=`${e} must be a \`${t}\` type, but the final value was: \`${pf(n,!0)}\``+(i?` (cast from the value \`${pf(r,!0)}\`).`:".");return null===n&&(a+='\n If "null" is intended as an empty value be sure to mark the schema as `.nullable()`'),a},defined:"${path} must be defined"},ph={length:"${path} must be exactly ${length} characters",min:"${path} must be at least ${min} characters",max:"${path} must be at most ${max} characters",matches:'${path} must match the following: "${regex}"',email:"${path} must be a valid email",url:"${path} must be a valid URL",uuid:"${path} must be a valid UUID",trim:"${path} must be a trimmed string",lowercase:"${path} must be a lowercase string",uppercase:"${path} must be a upper case string"},pp={min:"${path} must be greater than or equal to ${min}",max:"${path} must be less than or equal to ${max}",lessThan:"${path} must be less than ${less}",moreThan:"${path} must be greater than ${more}",positive:"${path} must be a positive number",negative:"${path} must be a negative number",integer:"${path} must be an integer"},pb={min:"${path} field must be later than ${min}",max:"${path} field must be at earlier than ${max}"},pm={isValue:"${path} field must be ${value}"},pg={noUnknown:"${path} field has unspecified keys: ${unknown}"},pv={min:"${path} field must have at least ${min} items",max:"${path} field must have less than or equal to ${max} items",length:"${path} must be have ${length} items"};Object.assign(Object.create(null),{mixed:pd,string:ph,number:pp,date:pb,object:pg,array:pv,boolean:pm});var py=n(18721),pw=n.n(py);let p_=e=>e&&e.__isYupSchema__;class pE{constructor(e,t){if(this.refs=e,this.refs=e,"function"==typeof t){this.fn=t;return}if(!pw()(t,"is"))throw TypeError("`is:` is required for `when()` conditions");if(!t.then&&!t.otherwise)throw TypeError("either `then:` or `otherwise:` is required for `when()` conditions");let{is:n,then:r,otherwise:i}=t,a="function"==typeof n?n:(...e)=>e.every(e=>e===n);this.fn=function(...e){let t=e.pop(),n=e.pop(),o=a(...e)?r:i;if(o)return"function"==typeof o?o(n):n.concat(o.resolve(t))}}resolve(e,t){let n=this.refs.map(e=>e.getValue(null==t?void 0:t.value,null==t?void 0:t.parent,null==t?void 0:t.context)),r=this.fn.apply(e,n.concat(e,t));if(void 0===r||r===e)return e;if(!p_(r))throw TypeError("conditions must return a schema object");return r.resolve(t)}}let pS=pE;function pk(e){return null==e?[]:[].concat(e)}function px(){return(px=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}let pT=/\$\{\s*(\w+)\s*\}/g;class pM extends Error{static formatError(e,t){let n=t.label||t.path||"this";return(n!==t.path&&(t=px({},t,{path:n})),"string"==typeof e)?e.replace(pT,(e,n)=>pf(t[n])):"function"==typeof e?e(t):e}static isError(e){return e&&"ValidationError"===e.name}constructor(e,t,n,r){super(),this.name="ValidationError",this.value=t,this.path=n,this.type=r,this.errors=[],this.inner=[],pk(e).forEach(e=>{pM.isError(e)?(this.errors.push(...e.errors),this.inner=this.inner.concat(e.inner.length?e.inner:e)):this.errors.push(e)}),this.message=this.errors.length>1?`${this.errors.length} errors occurred`:this.errors[0],Error.captureStackTrace&&Error.captureStackTrace(this,pM)}}let pO=e=>{let t=!1;return(...n)=>{t||(t=!0,e(...n))}};function pA(e,t){let{endEarly:n,tests:r,args:i,value:a,errors:o,sort:s,path:u}=e,c=pO(t),l=r.length,f=[];if(o=o||[],!l)return o.length?c(new pM(o,a,u)):c(null,a);for(let d=0;d<r.length;d++){let h=r[d];h(i,function(e){if(e){if(!pM.isError(e))return c(e,a);if(n)return e.value=a,c(e,a);f.push(e)}if(--l<=0){if(f.length&&(s&&f.sort(s),o.length&&f.push(...o),o=f),o.length){c(new pM(o,a,u),a);return}c(null,a)}})}}var pL=n(66604),pC=n.n(pL),pI=n(55760);let pD={context:"$",value:"."};class pN{constructor(e,t={}){if("string"!=typeof e)throw TypeError("ref must be a string, got: "+e);if(this.key=e.trim(),""===e)throw TypeError("ref must be a non-empty string");this.isContext=this.key[0]===pD.context,this.isValue=this.key[0]===pD.value,this.isSibling=!this.isContext&&!this.isValue;let n=this.isContext?pD.context:this.isValue?pD.value:"";this.path=this.key.slice(n.length),this.getter=this.path&&(0,pI.getter)(this.path,!0),this.map=t.map}getValue(e,t,n){let r=this.isContext?n:this.isValue?e:t;return this.getter&&(r=this.getter(r||{})),this.map&&(r=this.map(r)),r}cast(e,t){return this.getValue(e,null==t?void 0:t.parent,null==t?void 0:t.context)}resolve(){return this}describe(){return{type:"ref",key:this.key}}toString(){return`Ref(${this.key})`}static isRef(e){return e&&e.__isYupRef}}function pP(){return(pP=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}function pR(e,t){if(null==e)return{};var n,r,i={},a=Object.keys(e);for(r=0;r<a.length;r++)n=a[r],t.indexOf(n)>=0||(i[n]=e[n]);return i}function pj(e){function t(t,n){let{value:r,path:i="",label:a,options:o,originalValue:s,sync:u}=t,c=pR(t,["value","path","label","options","originalValue","sync"]),{name:l,test:f,params:d,message:h}=e,{parent:p,context:b}=o;function m(e){return pN.isRef(e)?e.getValue(r,p,b):e}function g(e={}){let t=pC()(pP({value:r,originalValue:s,label:a,path:e.path||i},d,e.params),m),n=new pM(pM.formatError(e.message||h,t),r,t.path,e.type||l);return n.params=t,n}let v=pP({path:i,parent:p,type:l,createError:g,resolve:m,options:o,originalValue:s},c);if(!u){try{Promise.resolve(f.call(v,r,v)).then(e=>{pM.isError(e)?n(e):e?n(null,e):n(g())})}catch(y){n(y)}return}let w;try{var _;if(w=f.call(v,r,v),"function"==typeof(null==(_=w)?void 0:_.then))throw Error(`Validation test of type: "${v.type}" returned a Promise during a synchronous validate. This test will finish after the validate call has returned`)}catch(E){n(E);return}pM.isError(w)?n(w):w?n(null,w):n(g())}return t.OPTIONS=e,t}pN.prototype.__isYupRef=!0;let pF=e=>e.substr(0,e.length-1).substr(1);function pY(e,t,n,r=n){let i,a,o;return t?((0,pI.forEach)(t,(s,u,c)=>{let l=u?pF(s):s;if((e=e.resolve({context:r,parent:i,value:n})).innerType){let f=c?parseInt(l,10):0;if(n&&f>=n.length)throw Error(`Yup.reach cannot resolve an array item at index: ${s}, in the path: ${t}. because there is no value at that index. `);i=n,n=n&&n[f],e=e.innerType}if(!c){if(!e.fields||!e.fields[l])throw Error(`The schema does not contain the path: ${t}. (failed at: ${o} which is a type: "${e._type}")`);i=n,n=n&&n[l],e=e.fields[l]}a=l,o=u?"["+s+"]":"."+s}),{schema:e,parent:i,parentPath:a}):{parent:i,parentPath:t,schema:e}}class pB{constructor(){this.list=new Set,this.refs=new Map}get size(){return this.list.size+this.refs.size}describe(){let e=[];for(let t of this.list)e.push(t);for(let[,n]of this.refs)e.push(n.describe());return e}toArray(){return Array.from(this.list).concat(Array.from(this.refs.values()))}add(e){pN.isRef(e)?this.refs.set(e.key,e):this.list.add(e)}delete(e){pN.isRef(e)?this.refs.delete(e.key):this.list.delete(e)}has(e,t){if(this.list.has(e))return!0;let n,r=this.refs.values();for(;!(n=r.next()).done;)if(t(n.value)===e)return!0;return!1}clone(){let e=new pB;return e.list=new Set(this.list),e.refs=new Map(this.refs),e}merge(e,t){let n=this.clone();return e.list.forEach(e=>n.add(e)),e.refs.forEach(e=>n.add(e)),t.list.forEach(e=>n.delete(e)),t.refs.forEach(e=>n.delete(e)),n}}function pU(){return(pU=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}class pH{constructor(e){this.deps=[],this.conditions=[],this._whitelist=new pB,this._blacklist=new pB,this.exclusiveTests=Object.create(null),this.tests=[],this.transforms=[],this.withMutation(()=>{this.typeError(pd.notType)}),this.type=(null==e?void 0:e.type)||"mixed",this.spec=pU({strip:!1,strict:!1,abortEarly:!0,recursive:!0,nullable:!1,presence:"optional"},null==e?void 0:e.spec)}get _type(){return this.type}_typeCheck(e){return!0}clone(e){if(this._mutate)return e&&Object.assign(this.spec,e),this;let t=Object.create(Object.getPrototypeOf(this));return t.type=this.type,t._typeError=this._typeError,t._whitelistError=this._whitelistError,t._blacklistError=this._blacklistError,t._whitelist=this._whitelist.clone(),t._blacklist=this._blacklist.clone(),t.exclusiveTests=pU({},this.exclusiveTests),t.deps=[...this.deps],t.conditions=[...this.conditions],t.tests=[...this.tests],t.transforms=[...this.transforms],t.spec=pr(pU({},this.spec,e)),t}label(e){var t=this.clone();return t.spec.label=e,t}meta(...e){if(0===e.length)return this.spec.meta;let t=this.clone();return t.spec.meta=Object.assign(t.spec.meta||{},e[0]),t}withMutation(e){let t=this._mutate;this._mutate=!0;let n=e(this);return this._mutate=t,n}concat(e){if(!e||e===this)return this;if(e.type!==this.type&&"mixed"!==this.type)throw TypeError(`You cannot \`concat()\` schema's of different types: ${this.type} and ${e.type}`);let t=this,n=e.clone(),r=pU({},t.spec,n.spec);return n.spec=r,n._typeError||(n._typeError=t._typeError),n._whitelistError||(n._whitelistError=t._whitelistError),n._blacklistError||(n._blacklistError=t._blacklistError),n._whitelist=t._whitelist.merge(e._whitelist,e._blacklist),n._blacklist=t._blacklist.merge(e._blacklist,e._whitelist),n.tests=t.tests,n.exclusiveTests=t.exclusiveTests,n.withMutation(t=>{e.tests.forEach(e=>{t.test(e.OPTIONS)})}),n}isType(e){return!!this.spec.nullable&&null===e||this._typeCheck(e)}resolve(e){let t=this;if(t.conditions.length){let n=t.conditions;(t=t.clone()).conditions=[],t=(t=n.reduce((t,n)=>n.resolve(t,e),t)).resolve(e)}return t}cast(e,t={}){let n=this.resolve(pU({value:e},t)),r=n._cast(e,t);if(void 0!==e&&!1!==t.assert&&!0!==n.isType(r)){let i=pf(e),a=pf(r);throw TypeError(`The value of ${t.path||"field"} could not be cast to a value that satisfies the schema type: "${n._type}". 
 
 attempted value: ${i} 
-`+(a!==i?`result of cast: ${a}`:""))}return r}_cast(e,t){let n=void 0===e?e:this.transforms.reduce((t,n)=>n.call(this,t,e,this),e);return void 0===n&&(n=this.getDefault()),n}_validate(e,t={},n){let{sync:r,path:i,from:a=[],originalValue:o=e,strict:s=this.spec.strict,abortEarly:u=this.spec.abortEarly}=t,c=e;s||(c=this._cast(c,pU({assert:!1},t)));let l={value:c,path:i,options:t,originalValue:o,schema:this,label:this.spec.label,sync:r,from:a},f=[];this._typeError&&f.push(this._typeError),this._whitelistError&&f.push(this._whitelistError),this._blacklistError&&f.push(this._blacklistError),pA({args:l,value:c,path:i,sync:r,tests:f,endEarly:u},e=>{if(e)return void n(e,c);pA({tests:this.tests,args:l,path:i,sync:r,value:c,endEarly:u},n)})}validate(e,t,n){let r=this.resolve(pU({},t,{value:e}));return"function"==typeof n?r._validate(e,t,n):new Promise((n,i)=>r._validate(e,t,(e,t)=>{e?i(e):n(t)}))}validateSync(e,t){let n;return this.resolve(pU({},t,{value:e}))._validate(e,pU({},t,{sync:!0}),(e,t)=>{if(e)throw e;n=t}),n}isValid(e,t){return this.validate(e,t).then(()=>!0,e=>{if(pM.isError(e))return!1;throw e})}isValidSync(e,t){try{return this.validateSync(e,t),!0}catch(n){if(pM.isError(n))return!1;throw n}}_getDefault(){let e=this.spec.default;return null==e?e:"function"==typeof e?e.call(this):pr(e)}getDefault(e){return this.resolve(e||{})._getDefault()}default(e){return 0===arguments.length?this._getDefault():this.clone({default:e})}strict(e=!0){var t=this.clone();return t.spec.strict=e,t}_isPresent(e){return null!=e}defined(e=pd.defined){return this.test({message:e,name:"defined",exclusive:!0,test:e=>void 0!==e})}required(e=pd.required){return this.clone({presence:"required"}).withMutation(t=>t.test({message:e,name:"required",exclusive:!0,test(e){return this.schema._isPresent(e)}}))}notRequired(){var e=this.clone({presence:"optional"});return e.tests=e.tests.filter(e=>"required"!==e.OPTIONS.name),e}nullable(e=!0){return this.clone({nullable:!1!==e})}transform(e){var t=this.clone();return t.transforms.push(e),t}test(...e){let t;if(void 0===(t=1===e.length?"function"==typeof e[0]?{test:e[0]}:e[0]:2===e.length?{name:e[0],test:e[1]}:{name:e[0],message:e[1],test:e[2]}).message&&(t.message=pd.default),"function"!=typeof t.test)throw TypeError("`test` is a required parameters");let n=this.clone(),r=pj(t),i=t.exclusive||t.name&&!0===n.exclusiveTests[t.name];if(t.exclusive&&!t.name)throw TypeError("Exclusive tests must provide a unique `name` identifying the test");return t.name&&(n.exclusiveTests[t.name]=!!t.exclusive),n.tests=n.tests.filter(e=>e.OPTIONS.name!==t.name||!i&&e.OPTIONS.test!==r.OPTIONS.test),n.tests.push(r),n}when(e,t){Array.isArray(e)||"string"==typeof e||(t=e,e=".");let n=this.clone(),r=pk(e).map(e=>new pN(e));return r.forEach(e=>{e.isSibling&&n.deps.push(e.key)}),n.conditions.push(new pS(r,t)),n}typeError(e){var t=this.clone();return t._typeError=pj({message:e,name:"typeError",test(e){return!!(void 0===e||this.schema.isType(e))||this.createError({params:{type:this.schema._type}})}}),t}oneOf(e,t=pd.oneOf){var n=this.clone();return e.forEach(e=>{n._whitelist.add(e),n._blacklist.delete(e)}),n._whitelistError=pj({message:t,name:"oneOf",test(e){if(void 0===e)return!0;let t=this.schema._whitelist;return!!t.has(e,this.resolve)||this.createError({params:{values:t.toArray().join(", ")}})}}),n}notOneOf(e,t=pd.notOneOf){var n=this.clone();return e.forEach(e=>{n._blacklist.add(e),n._whitelist.delete(e)}),n._blacklistError=pj({message:t,name:"notOneOf",test(e){let t=this.schema._blacklist;return!t.has(e,this.resolve)||this.createError({params:{values:t.toArray().join(", ")}})}}),n}strip(e=!0){let t=this.clone();return t.spec.strip=e,t}describe(){let e=this.clone(),{label:t,meta:n}=e.spec,r={meta:n,label:t,type:e.type,oneOf:e._whitelist.describe(),notOneOf:e._blacklist.describe(),tests:e.tests.map(e=>({name:e.OPTIONS.name,params:e.OPTIONS.params})).filter((e,t,n)=>n.findIndex(t=>t.name===e.name)===t)};return r}}for(let p$ of(pH.prototype.__isYupSchema__=!0,["validate","validateSync"]))pH.prototype[`${p$}At`]=function(e,t,n={}){let{parent:r,parentPath:i,schema:a}=pY(this,e,t,n.context);return a[p$](r&&r[i],pU({},n,{parent:r,path:e}))};for(let pz of["equals","is"])pH.prototype[pz]=pH.prototype.oneOf;for(let pG of["not","nope"])pH.prototype[pG]=pH.prototype.notOneOf;pH.prototype.optional=pH.prototype.notRequired;let pW=pH;function pK(){return new pW}pK.prototype=pW.prototype;let pV=e=>null==e;function pq(){return new pZ}class pZ extends pH{constructor(){super({type:"boolean"}),this.withMutation(()=>{this.transform(function(e){if(!this.isType(e)){if(/^(true|1)$/i.test(String(e)))return!0;if(/^(false|0)$/i.test(String(e)))return!1}return e})})}_typeCheck(e){return e instanceof Boolean&&(e=e.valueOf()),"boolean"==typeof e}isTrue(e=pm.isValue){return this.test({message:e,name:"is-value",exclusive:!0,params:{value:"true"},test:e=>pV(e)||!0===e})}isFalse(e=pm.isValue){return this.test({message:e,name:"is-value",exclusive:!0,params:{value:"false"},test:e=>pV(e)||!1===e})}}pq.prototype=pZ.prototype;let pX=/^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))$/i,pJ=/^((https?|ftp):)?\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i,pQ=/^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$/i,p1=e=>pV(e)||e===e.trim(),p0=({}).toString();function p2(){return new p3}class p3 extends pH{constructor(){super({type:"string"}),this.withMutation(()=>{this.transform(function(e){if(this.isType(e)||Array.isArray(e))return e;let t=null!=e&&e.toString?e.toString():e;return t===p0?e:t})})}_typeCheck(e){return e instanceof String&&(e=e.valueOf()),"string"==typeof e}_isPresent(e){return super._isPresent(e)&&!!e.length}length(e,t=ph.length){return this.test({message:t,name:"length",exclusive:!0,params:{length:e},test(t){return pV(t)||t.length===this.resolve(e)}})}min(e,t=ph.min){return this.test({message:t,name:"min",exclusive:!0,params:{min:e},test(t){return pV(t)||t.length>=this.resolve(e)}})}max(e,t=ph.max){return this.test({name:"max",exclusive:!0,message:t,params:{max:e},test(t){return pV(t)||t.length<=this.resolve(e)}})}matches(e,t){let n=!1,r,i;return t&&("object"==typeof t?{excludeEmptyString:n=!1,message:r,name:i}=t:r=t),this.test({name:i||"matches",message:r||ph.matches,params:{regex:e},test:t=>pV(t)||""===t&&n||-1!==t.search(e)})}email(e=ph.email){return this.matches(pX,{name:"email",message:e,excludeEmptyString:!0})}url(e=ph.url){return this.matches(pJ,{name:"url",message:e,excludeEmptyString:!0})}uuid(e=ph.uuid){return this.matches(pQ,{name:"uuid",message:e,excludeEmptyString:!1})}ensure(){return this.default("").transform(e=>null===e?"":e)}trim(e=ph.trim){return this.transform(e=>null!=e?e.trim():e).test({message:e,name:"trim",test:p1})}lowercase(e=ph.lowercase){return this.transform(e=>pV(e)?e:e.toLowerCase()).test({message:e,name:"string_case",exclusive:!0,test:e=>pV(e)||e===e.toLowerCase()})}uppercase(e=ph.uppercase){return this.transform(e=>pV(e)?e:e.toUpperCase()).test({message:e,name:"string_case",exclusive:!0,test:e=>pV(e)||e===e.toUpperCase()})}}p2.prototype=p3.prototype;let p4=e=>e!=+e;function p5(){return new p6}class p6 extends pH{constructor(){super({type:"number"}),this.withMutation(()=>{this.transform(function(e){let t=e;if("string"==typeof t){if(""===(t=t.replace(/\s/g,"")))return NaN;t=+t}return this.isType(t)?t:parseFloat(t)})})}_typeCheck(e){return e instanceof Number&&(e=e.valueOf()),"number"==typeof e&&!p4(e)}min(e,t=pp.min){return this.test({message:t,name:"min",exclusive:!0,params:{min:e},test(t){return pV(t)||t>=this.resolve(e)}})}max(e,t=pp.max){return this.test({message:t,name:"max",exclusive:!0,params:{max:e},test(t){return pV(t)||t<=this.resolve(e)}})}lessThan(e,t=pp.lessThan){return this.test({message:t,name:"max",exclusive:!0,params:{less:e},test(t){return pV(t)||t<this.resolve(e)}})}moreThan(e,t=pp.moreThan){return this.test({message:t,name:"min",exclusive:!0,params:{more:e},test(t){return pV(t)||t>this.resolve(e)}})}positive(e=pp.positive){return this.moreThan(0,e)}negative(e=pp.negative){return this.lessThan(0,e)}integer(e=pp.integer){return this.test({name:"integer",message:e,test:e=>pV(e)||Number.isInteger(e)})}truncate(){return this.transform(e=>pV(e)?e:0|e)}round(e){var t,n=["ceil","floor","round","trunc"];if("trunc"===(e=(null==(t=e)?void 0:t.toLowerCase())||"round"))return this.truncate();if(-1===n.indexOf(e.toLowerCase()))throw TypeError("Only valid options for round() are: "+n.join(", "));return this.transform(t=>pV(t)?t:Math[e](t))}}p5.prototype=p6.prototype;var p9=/^(\d{4}|[+\-]\d{6})(?:-?(\d{2})(?:-?(\d{2}))?)?(?:[ T]?(\d{2}):?(\d{2})(?::?(\d{2})(?:[,\.](\d{1,}))?)?(?:(Z)|([+\-])(\d{2})(?::?(\d{2}))?)?)?$/;function p8(e){var t,n,r=[1,4,5,6,7,10,11],i=0;if(n=p9.exec(e)){for(var a,o=0;a=r[o];++o)n[a]=+n[a]||0;n[2]=(+n[2]||1)-1,n[3]=+n[3]||1,n[7]=n[7]?String(n[7]).substr(0,3):0,(void 0===n[8]||""===n[8])&&(void 0===n[9]||""===n[9])?t=+new Date(n[1],n[2],n[3],n[4],n[5],n[6],n[7]):("Z"!==n[8]&&void 0!==n[9]&&(i=60*n[10]+n[11],"+"===n[9]&&(i=0-i)),t=Date.UTC(n[1],n[2],n[3],n[4],n[5]+i,n[6],n[7]))}else t=Date.parse?Date.parse(e):NaN;return t}let p7=new Date(""),be=e=>"[object Date]"===Object.prototype.toString.call(e);function bt(){return new bn}class bn extends pH{constructor(){super({type:"date"}),this.withMutation(()=>{this.transform(function(e){return this.isType(e)?e:(e=p8(e),isNaN(e)?p7:new Date(e))})})}_typeCheck(e){return be(e)&&!isNaN(e.getTime())}prepareParam(e,t){let n;if(pN.isRef(e))n=e;else{let r=this.cast(e);if(!this._typeCheck(r))throw TypeError(`\`${t}\` must be a Date or a value that can be \`cast()\` to a Date`);n=r}return n}min(e,t=pb.min){let n=this.prepareParam(e,"min");return this.test({message:t,name:"min",exclusive:!0,params:{min:e},test(e){return pV(e)||e>=this.resolve(n)}})}max(e,t=pb.max){var n=this.prepareParam(e,"max");return this.test({message:t,name:"max",exclusive:!0,params:{max:e},test(e){return pV(e)||e<=this.resolve(n)}})}}bn.INVALID_DATE=p7,bt.prototype=bn.prototype,bt.INVALID_DATE=p7;var br=n(11865),bi=n.n(br),ba=n(68929),bo=n.n(ba),bs=n(67523),bu=n.n(bs),bc=n(94633),bl=n.n(bc);function bf(e,t=[]){let n=[],r=[];function i(e,i){var a=(0,pI.split)(e)[0];~r.indexOf(a)||r.push(a),~t.indexOf(`${i}-${a}`)||n.push([i,a])}for(let a in e)if(pw()(e,a)){let o=e[a];~r.indexOf(a)||r.push(a),pN.isRef(o)&&o.isSibling?i(o.path,a):p_(o)&&"deps"in o&&o.deps.forEach(e=>i(e,a))}return bl().array(r,n).reverse()}function bd(e,t){let n=1/0;return e.some((e,r)=>{var i;if((null==(i=t.path)?void 0:i.indexOf(e))!==-1)return n=r,!0}),n}function bh(e){return(t,n)=>bd(e,t)-bd(e,n)}function bp(){return(bp=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}let bb=e=>"[object Object]"===Object.prototype.toString.call(e);function bm(e,t){let n=Object.keys(e.fields);return Object.keys(t).filter(e=>-1===n.indexOf(e))}let bg=bh([]);class bv extends pH{constructor(e){super({type:"object"}),this.fields=Object.create(null),this._sortErrors=bg,this._nodes=[],this._excludedEdges=[],this.withMutation(()=>{this.transform(function(e){if("string"==typeof e)try{e=JSON.parse(e)}catch(t){e=null}return this.isType(e)?e:null}),e&&this.shape(e)})}_typeCheck(e){return bb(e)||"function"==typeof e}_cast(e,t={}){var n;let r=super._cast(e,t);if(void 0===r)return this.getDefault();if(!this._typeCheck(r))return r;let i=this.fields,a=null!=(n=t.stripUnknown)?n:this.spec.noUnknown,o=this._nodes.concat(Object.keys(r).filter(e=>-1===this._nodes.indexOf(e))),s={},u=bp({},t,{parent:s,__validating:t.__validating||!1}),c=!1;for(let l of o){let f=i[l],d=pw()(r,l);if(f){let h,p=r[l];u.path=(t.path?`${t.path}.`:"")+l;let b="spec"in(f=f.resolve({value:p,context:t.context,parent:s}))?f.spec:void 0,m=null==b?void 0:b.strict;if(null==b?void 0:b.strip){c=c||l in r;continue}void 0!==(h=t.__validating&&m?r[l]:f.cast(r[l],u))&&(s[l]=h)}else d&&!a&&(s[l]=r[l]);s[l]!==r[l]&&(c=!0)}return c?s:r}_validate(e,t={},n){let r=[],{sync:i,from:a=[],originalValue:o=e,abortEarly:s=this.spec.abortEarly,recursive:u=this.spec.recursive}=t;a=[{schema:this,value:o},...a],t.__validating=!0,t.originalValue=o,t.from=a,super._validate(e,t,(e,c)=>{if(e){if(!pM.isError(e)||s)return void n(e,c);r.push(e)}if(!u||!bb(c)){n(r[0]||null,c);return}o=o||c;let l=this._nodes.map(e=>(n,r)=>{let i=-1===e.indexOf(".")?(t.path?`${t.path}.`:"")+e:`${t.path||""}["${e}"]`,s=this.fields[e];if(s&&"validate"in s){s.validate(c[e],bp({},t,{path:i,from:a,strict:!0,parent:c,originalValue:o[e]}),r);return}r(null)});pA({sync:i,tests:l,value:c,errors:r,endEarly:s,sort:this._sortErrors,path:t.path},n)})}clone(e){let t=super.clone(e);return t.fields=bp({},this.fields),t._nodes=this._nodes,t._excludedEdges=this._excludedEdges,t._sortErrors=this._sortErrors,t}concat(e){let t=super.concat(e),n=t.fields;for(let[r,i]of Object.entries(this.fields)){let a=n[r];void 0===a?n[r]=i:a instanceof pH&&i instanceof pH&&(n[r]=i.concat(a))}return t.withMutation(()=>t.shape(n))}getDefaultFromShape(){let e={};return this._nodes.forEach(t=>{let n=this.fields[t];e[t]="default"in n?n.getDefault():void 0}),e}_getDefault(){return"default"in this.spec?super._getDefault():this._nodes.length?this.getDefaultFromShape():void 0}shape(e,t=[]){let n=this.clone(),r=Object.assign(n.fields,e);if(n.fields=r,n._sortErrors=bh(Object.keys(r)),t.length){Array.isArray(t[0])||(t=[t]);let i=t.map(([e,t])=>`${e}-${t}`);n._excludedEdges=n._excludedEdges.concat(i)}return n._nodes=bf(r,n._excludedEdges),n}pick(e){let t={};for(let n of e)this.fields[n]&&(t[n]=this.fields[n]);return this.clone().withMutation(e=>(e.fields={},e.shape(t)))}omit(e){let t=this.clone(),n=t.fields;for(let r of(t.fields={},e))delete n[r];return t.withMutation(()=>t.shape(n))}from(e,t,n){let r=(0,pI.getter)(e,!0);return this.transform(i=>{if(null==i)return i;let a=i;return pw()(i,e)&&(a=bp({},i),n||delete a[e],a[t]=r(i)),a})}noUnknown(e=!0,t=pg.noUnknown){"string"==typeof e&&(t=e,e=!0);let n=this.test({name:"noUnknown",exclusive:!0,message:t,test(t){if(null==t)return!0;let n=bm(this.schema,t);return!e||0===n.length||this.createError({params:{unknown:n.join(", ")}})}});return n.spec.noUnknown=e,n}unknown(e=!0,t=pg.noUnknown){return this.noUnknown(!e,t)}transformKeys(e){return this.transform(t=>t&&bu()(t,(t,n)=>e(n)))}camelCase(){return this.transformKeys(bo())}snakeCase(){return this.transformKeys(bi())}constantCase(){return this.transformKeys(e=>bi()(e).toUpperCase())}describe(){let e=super.describe();return e.fields=pC()(this.fields,e=>e.describe()),e}}function by(e){return new bv(e)}function bw(){return(bw=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}function b_(e){return new bE(e)}by.prototype=bv.prototype;class bE extends pH{constructor(e){super({type:"array"}),this.innerType=e,this.withMutation(()=>{this.transform(function(e){if("string"==typeof e)try{e=JSON.parse(e)}catch(t){e=null}return this.isType(e)?e:null})})}_typeCheck(e){return Array.isArray(e)}get _subType(){return this.innerType}_cast(e,t){let n=super._cast(e,t);if(!this._typeCheck(n)||!this.innerType)return n;let r=!1,i=n.map((e,n)=>{let i=this.innerType.cast(e,bw({},t,{path:`${t.path||""}[${n}]`}));return i!==e&&(r=!0),i});return r?i:n}_validate(e,t={},n){var r,i;let a=[],o=t.sync,s=t.path,u=this.innerType,c=null!=(r=t.abortEarly)?r:this.spec.abortEarly,l=null!=(i=t.recursive)?i:this.spec.recursive,f=null!=t.originalValue?t.originalValue:e;super._validate(e,t,(e,r)=>{if(e){if(!pM.isError(e)||c)return void n(e,r);a.push(e)}if(!l||!u||!this._typeCheck(r)){n(a[0]||null,r);return}f=f||r;let i=Array(r.length);for(let d=0;d<r.length;d++){let h=r[d],p=`${t.path||""}[${d}]`,b=bw({},t,{path:p,strict:!0,parent:r,index:d,originalValue:f[d]});i[d]=(e,t)=>u.validate(h,b,t)}pA({sync:o,path:s,value:r,errors:a,endEarly:c,tests:i},n)})}clone(e){let t=super.clone(e);return t.innerType=this.innerType,t}concat(e){let t=super.concat(e);return t.innerType=this.innerType,e.innerType&&(t.innerType=t.innerType?t.innerType.concat(e.innerType):e.innerType),t}of(e){let t=this.clone();if(!p_(e))throw TypeError("`array.of()` sub-schema must be a valid yup schema not: "+pf(e));return t.innerType=e,t}length(e,t=pv.length){return this.test({message:t,name:"length",exclusive:!0,params:{length:e},test(t){return pV(t)||t.length===this.resolve(e)}})}min(e,t){return t=t||pv.min,this.test({message:t,name:"min",exclusive:!0,params:{min:e},test(t){return pV(t)||t.length>=this.resolve(e)}})}max(e,t){return t=t||pv.max,this.test({message:t,name:"max",exclusive:!0,params:{max:e},test(t){return pV(t)||t.length<=this.resolve(e)}})}ensure(){return this.default(()=>[]).transform((e,t)=>this._typeCheck(e)?e:null==t?[]:[].concat(t))}compact(e){let t=e?(t,n,r)=>!e(t,n,r):e=>!!e;return this.transform(e=>null!=e?e.filter(t):e)}describe(){let e=super.describe();return this.innerType&&(e.innerType=this.innerType.describe()),e}nullable(e=!0){return super.nullable(e)}defined(){return super.defined()}required(e){return super.required(e)}}b_.prototype=bE.prototype;var bS=by().shape({name:p2().required("Required"),url:p2().required("Required")}),bk=function(e){var t=e.initialValues,n=e.onSubmit,r=e.submitButtonText,i=e.nameDisabled,a=void 0!==i&&i;return l.createElement(hM,{initialValues:t,validationSchema:bS,onSubmit:n},function(e){var t=e.isSubmitting;return l.createElement(l.Fragment,null,l.createElement(hj,{"data-testid":"bridge-form",noValidate:!0},l.createElement(d.Z,{container:!0,spacing:16},l.createElement(d.Z,{item:!0,xs:12,md:7},l.createElement(hR,{component:hJ,id:"name",name:"name",label:"Name",disabled:a,required:!0,fullWidth:!0,FormHelperTextProps:{"data-testid":"name-helper-text"}})),l.createElement(d.Z,{item:!0,xs:12,md:7},l.createElement(hR,{component:hJ,id:"url",name:"url",label:"Bridge URL",placeholder:"https://",required:!0,fullWidth:!0,FormHelperTextProps:{"data-testid":"url-helper-text"}})),l.createElement(d.Z,{item:!0,xs:12,md:7},l.createElement(d.Z,{container:!0,spacing:16},l.createElement(d.Z,{item:!0,xs:7},l.createElement(hR,{component:hJ,id:"minimumContractPayment",name:"minimumContractPayment",label:"Minimum Contract Payment",placeholder:"0",fullWidth:!0,inputProps:{min:0},FormHelperTextProps:{"data-testid":"minimumContractPayment-helper-text"}})),l.createElement(d.Z,{item:!0,xs:7},l.createElement(hR,{component:hJ,id:"confirmations",name:"confirmations",label:"Confirmations",placeholder:"0",type:"number",fullWidth:!0,inputProps:{min:0},FormHelperTextProps:{"data-testid":"confirmations-helper-text"}})))),l.createElement(d.Z,{item:!0,xs:12,md:7},l.createElement(ox.default,{variant:"contained",color:"primary",type:"submit",disabled:t,size:"large"},r)))))})},bx=function(e){var t=e.bridge,n=e.onSubmit,r={name:t.name,url:t.url,minimumContractPayment:t.minimumContractPayment,confirmations:t.confirmations};return l.createElement(iv,null,l.createElement(d.Z,{container:!0,spacing:40},l.createElement(d.Z,{item:!0,xs:12,md:11,lg:9},l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"Edit Bridge",action:l.createElement(aL.Z,{component:tz,href:"/bridges/".concat(t.id)},"Cancel")}),l.createElement(aK.Z,null,l.createElement(bk,{nameDisabled:!0,initialValues:r,onSubmit:n,submitButtonText:"Save Bridge"}))))))};function bT(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function bM(e){if(Array.isArray(e))return e}function bO(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function bA(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){bO(a,r,i,o,s,"next",e)}function s(e){bO(a,r,i,o,s,"throw",e)}o(void 0)})}}function bL(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function bC(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function bI(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function bD(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){bL(e,t,n[t])})}return e}function bN(e,t){return bM(e)||bC(e,t)||bR(e,t)||bI()}function bP(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function bR(e,t){if(e){if("string"==typeof e)return bT(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return bT(e,t)}}var bj=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}};function bF(){var e=bP(["\n  mutation UpdateBridge($id: ID!, $input: UpdateBridgeInput!) {\n    updateBridge(id: $id, input: $input) {\n      ... on UpdateBridgeSuccess {\n        bridge {\n          id\n        }\n      }\n      ... on NotFoundError {\n        message\n      }\n    }\n  }\n"]);return bF=function(){return e},e}var bY=n0(bF()),bB=function(e){var t=e.id;return l.createElement(l.Fragment,null,l.createElement("span",null,"Successfully updated"),l.createElement(tz,{href:"/bridges/".concat(t)},t))},bU=function(){var e=(0,h.UO)().id,t=(0,A.I0)(),n=oZ().handleMutationError,r=ry(o7,{variables:{id:e}}),i=r.data,a=r.loading,o=r.error,s=bN(os(bY,{refetchQueries:[{query:o7,variables:{id:e}}]}),1)[0];if(a)return l.createElement(ij,null);if(o)return l.createElement(iN,{error:o});var u,c=(u=bA(function(r){var i,a,o,u,c,f;return bj(this,function(d){switch(d.label){case 0:return d.trys.push([0,2,,3]),[4,s(((o={}).variables={id:e,input:bD({},r)},o))];case 1:switch(u=null===(i=(a=d.sent()).data)||void 0===i?void 0:i.updateBridge,c={},null==u?void 0:u.__typename){case"UpdateBridgeSuccess":t((0,ty.t5)(function(){return l.createElement(bB,{id:u.bridge.id})},c));break;case"NotFoundError":t((0,ty.LO)(u.message))}return[3,3];case 2:return n(f=d.sent()),[3,3];case 3:return[2]}})}),function(e){return u.apply(this,arguments)}),f=null==i?void 0:i.bridge;switch(null==f?void 0:f.__typename){case"Bridge":return l.createElement(bx,{onSubmit:c,bridge:f});case"NotFoundError":return l.createElement(oo,null);default:return null}},bH={name:"",url:"",minimumContractPayment:"0",confirmations:0},b$=function(e){var t=e.onSubmit;return l.createElement(iv,null,l.createElement(d.Z,{container:!0,spacing:40},l.createElement(d.Z,{item:!0,xs:12,md:11,lg:9},l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"New Bridge"}),l.createElement(aK.Z,null,l.createElement(bk,{initialValues:bH,onSubmit:t,submitButtonText:"Create Bridge"}))))))};function bz(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function bG(e){if(Array.isArray(e))return e}function bW(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function bK(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){bW(a,r,i,o,s,"next",e)}function s(e){bW(a,r,i,o,s,"throw",e)}o(void 0)})}}function bV(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function bq(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function bZ(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function bX(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){bV(e,t,n[t])})}return e}function bJ(e,t){return bG(e)||bq(e,t)||b1(e,t)||bZ()}function bQ(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function b1(e,t){if(e){if("string"==typeof e)return bz(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return bz(e,t)}}var b0=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}};function b2(){var e=bQ(["\n  mutation CreateBridge($input: CreateBridgeInput!) {\n    createBridge(input: $input) {\n      ... on CreateBridgeSuccess {\n        bridge {\n          id\n        }\n        incomingToken\n      }\n    }\n  }\n"]);return b2=function(){return e},e}var b3=n0(b2()),b4=function(e){var t=e.id,n=e.incomingToken;return l.createElement(l.Fragment,null,l.createElement("span",null,"Successfully created bridge\xa0"),l.createElement(tz,{href:"/bridges/".concat(t)},t),l.createElement("span",null,"\xa0with incoming access token: ",n))},b5=function(){var e,t=(0,A.I0)(),n=oZ().handleMutationError,r=bJ(os(b3),1)[0],i=(e=bK(function(e){var i,a,o,s,u,c;return b0(this,function(f){switch(f.label){case 0:return f.trys.push([0,2,,3]),[4,r(((o={}).variables={input:bX({},e)},o))];case 1:return s=null===(i=(a=f.sent()).data)||void 0===i?void 0:i.createBridge,u={},(null==s?void 0:s.__typename)==="CreateBridgeSuccess"&&t((0,ty.t5)(function(){return l.createElement(b4,{id:s.bridge.id,incomingToken:s.incomingToken})},u)),[3,3];case 2:return n(c=f.sent()),[3,3];case 3:return[2]}})}),function(t){return e.apply(this,arguments)});return l.createElement(b$,{onSubmit:i})},b6=function(){var e=(0,h.$B)().path;return l.createElement(h.rs,null,l.createElement(h.AW,{exact:!0,path:"".concat(e,"/new")},l.createElement(b5,null)),l.createElement(h.AW,{path:"".concat(e,"/:id/edit")},l.createElement(bU,null)),l.createElement(h.AW,{path:"".concat(e,"/:id")},l.createElement(st,null)),l.createElement(h.AW,{exact:!0,path:e},l.createElement(sl,null)))},b9=n(48403),b8=n.n(b9),b7=n(24815),me=n(66289);function mt(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function mn(e){if(Array.isArray(e))return e}function mr(e,t){return null!=t&&"undefined"!=typeof Symbol&&t[Symbol.hasInstance]?!!t[Symbol.hasInstance](e):e instanceof t}function mi(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function ma(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function mo(e,t){return mn(e)||mi(e,t)||ms(e,t)||ma()}function ms(e,t){if(e){if("string"==typeof e)return mt(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return mt(e,t)}}var mu=function(){var e=mo(l.useState(),2),t=e[0],n=e[1],r=(0,h.k6)(),i=(0,A.I0)();l.useEffect(function(){mr(t,me._7)&&(i((0,ty.Jc)()),r.push("/signin"))},[i,t,r]);var a=t?function(){return l.createElement("div",null,"Error:"," ",mr(t,Error)?t.message:JSON.stringify(t))}:function(){return null};return{error:t,ErrorComponent:a,setError:n}},mc=function(){var e=arguments.length>0&&void 0!==arguments[0]&&arguments[0],t=e?function(){return l.createElement(x.default,{variant:"body1"},"Loading...")}:function(){return null};return{isLoading:e,LoadingPlaceholder:t}},ml=n(76023);function mf(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function md(e){if(Array.isArray(e))return e}function mh(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function mp(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){mh(a,r,i,o,s,"next",e)}function s(e){mh(a,r,i,o,s,"throw",e)}o(void 0)})}}function mb(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function mm(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function mg(e,t){return md(e)||mb(e,t)||mv(e,t)||mm()}function mv(e,t){if(e){if("string"==typeof e)return mf(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return mf(e,t)}}var my=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}},mw=["debug","info","warn","error"],m_=function(e){return(0,b.createStyles)({actions:{display:"flex",justifyContent:"flex-end",marginTop:.5*e.spacing.unit},logLevelHelperText:{marginTop:-8}})},mE=(0,b.withStyles)(m_)(function(e){var t,n=e.classes,r=e.initialValues,i=(0,A.I0)(),a=hT({initialValues:r,onSubmit:(t=mp(function(e){var t,n,r,a;return my(this,function(o){switch(o.label){case 0:return o.trys.push([0,2,,3]),t=((n={}).level=e.level,n.sqlEnabled=e.sqlEnabled,n),[4,iW.v2.logConfig.updateLogConfig(t)];case 1:return o.sent(),r={},i((0,ty.t5)(function(){return l.createElement(l.Fragment,null,"Logging Configuration Updated")},r)),[3,3];case 2:return a=o.sent(),i((0,ty.cB)(aP,a)),[3,3];case 3:return[2]}})}),function(e){return t.apply(this,arguments)})});return l.createElement("form",{onSubmit:a.handleSubmit,"data-testid":"logging-form"},l.createElement(i_.Z,{id:"select-level",name:"level",fullWidth:!0,select:!0,label:"Log Level",value:a.values.level,defaultValue:r.defaultLogLevel,onChange:a.handleChange,error:a.touched.level&&Boolean(a.errors.level),helperText:"Override the LOG_LEVEL environment variable (until restart)"},mw.map(function(e){return l.createElement(tE.default,{key:e,value:e},b8()(e).concat(e===r.defaultLogLevel?" (default)":""))})),l.createElement(b7.default,null,l.createElement(hG.Z,{name:"sqlEnabled",control:l.createElement(l.Fragment,null,l.createElement(hz.Z,{id:"sqlEnabled",name:"sqlEnabled",disabled:"debug"!==a.values.level,checked:a.values.sqlEnabled&&"debug"===a.values.level,onChange:a.handleChange})),label:"Log SQL Statements (debug only)"}),l.createElement(ml.default,{className:n.logLevelHelperText},"Override the LOG_SQL environment variable (until restart)")),l.createElement("br",null),l.createElement("div",{className:n.actions},l.createElement(aL.Z,{variant:"primary",type:"submit",disabled:a.isSubmitting},"Update")))}),mS=function(){var e=mg((0,l.useState)(null),2),t=e[0],n=e[1],r=mu(),i=r.error,a=r.ErrorComponent,o=r.setError,s=mc(!i&&!t).LoadingPlaceholder;return(0,l.useEffect)(function(){function e(){return t.apply(this,arguments)}function t(){return(t=mp(function(){var e,t,r,i,a,s,u,c,l;return my(this,function(f){switch(f.label){case 0:return f.trys.push([0,2,,3]),[4,iW.v2.logConfig.getLogConfig()];case 1:return t=(e=f.sent()).data.attributes.serviceName.findIndex(function(e){return"Global"==e}),r=e.data.attributes.logLevel[t],i=e.data.attributes.defaultLogLevel,a=e.data.attributes.serviceName.findIndex(function(e){return"IsSqlEnabled"==e}),s="true"==e.data.attributes.logLevel[a],n(u=((c={}).defaultLogLevel=i,c.level=r,c.sqlEnabled=s,c)),[3,3];case 2:return o(l=f.sent()),[3,3];case 3:return[2]}})})).apply(this,arguments)}e()},[o]),l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"Logging"}),l.createElement(aK.Z,null,l.createElement(s,null),l.createElement(a,null),t&&l.createElement(mE,{initialValues:t})))};function mk(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function mx(e){if(Array.isArray(e))return e}function mT(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function mM(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){mT(a,r,i,o,s,"next",e)}function s(e){mT(a,r,i,o,s,"throw",e)}o(void 0)})}}function mO(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function mA(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function mL(e,t){return mx(e)||mO(e,t)||mC(e,t)||mA()}function mC(e,t){if(e){if("string"==typeof e)return mk(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return mk(e,t)}}var mI=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}},mD=function(e){return(0,b.createStyles)({confirmDialog:{width:400},deleteCell:{"&:last-child":{paddingRight:1.5*e.spacing.unit}},deleteIcon:{fontSize:20}})},mN=6048e5,mP=(0,b.withStyles)(mD)(function(e){var t,n=e.classes,r=(0,A.I0)(),i=new Date(Date.now()-mN).toISOString(),a=mL((0,l.useState)(!1),2),o=a[0],s=a[1],u=(t=mM(function(){var e,t;return mI(this,function(n){switch(n.label){case 0:return n.trys.push([0,2,,3]),[4,r((0,ty.Iw)(i))];case 1:return n.sent(),e={},r((0,ty.t5)(function(){return l.createElement(l.Fragment,null,"Deleted completed job runs")},e)),s(!1),[3,3];case 2:return t=n.sent(),r((0,ty.LO)("Something went wrong")),[3,3];case 3:return[2]}})}),function(){return t.apply(this,arguments)});return l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"Job Runs",subheader:"Reduce the database size by deleting old job runs"}),l.createElement(r8.Z,null,l.createElement(r7.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,l.createElement(x.default,null,"Errored Runs"),l.createElement(x.default,{variant:"subtitle2",color:"textSecondary"},"Keeps runs from the last week")),l.createElement(ie.default,{align:"right",className:n.deleteCell},l.createElement(y.default,{onClick:function(){return s(!0)},"data-cy":"delete-errored-job-runs"},l.createElement(oc.Z,{className:n.deleteIcon,color:"error"})))))),l.createElement(oI,{open:o,title:"Delete errored jobs runs",body:"Are you sure you want to delete all errored job runs up to\n                ".concat(a_()(i).format("dddd, MMMM Do YYYY, h:mm:ss a"),"?"),confirmButtonText:"Confirm",onConfirm:u,cancelButtonText:"Cancel",onCancel:function(){return s(!1)}}))}),mR=n(16939),mj=n(80366),mF=n(37254);function mY(e,t){if(null==e)return{};var n,r,i={},a=Object.keys(e);for(r=0;r<a.length;r++)n=a[r],t.indexOf(n)>=0||(i[n]=e[n]);return i}function mB(e,t){if(null==e)return{};var n,r,i=mY(e,t);if(Object.getOwnPropertySymbols){var a=Object.getOwnPropertySymbols(e);for(r=0;r<a.length;r++)n=a[r],!(t.indexOf(n)>=0)&&Object.prototype.propertyIsEnumerable.call(e,n)&&(i[n]=e[n])}return i}function mU(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function mH(e){if(Array.isArray(e))return mU(e)}function m$(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function mz(e,t){if(e){if("string"==typeof e)return mU(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return mU(e,t)}}function mG(){throw TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function mW(e){return mH(e)||m$(e)||mz(e)||mG()}function mK(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function mV(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?Object(arguments[t]):{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){mK(e,t,n[t])})}return e}function mq(){return(mq=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}function mZ(e){var t=e.length;return 0===t||1===t?e:2===t?[e[0],e[1],"".concat(e[0],".").concat(e[1]),"".concat(e[1],".").concat(e[0])]:3===t?[e[0],e[1],e[2],"".concat(e[0],".").concat(e[1]),"".concat(e[0],".").concat(e[2]),"".concat(e[1],".").concat(e[0]),"".concat(e[1],".").concat(e[2]),"".concat(e[2],".").concat(e[0]),"".concat(e[2],".").concat(e[1]),"".concat(e[0],".").concat(e[1],".").concat(e[2]),"".concat(e[0],".").concat(e[2],".").concat(e[1]),"".concat(e[1],".").concat(e[0],".").concat(e[2]),"".concat(e[1],".").concat(e[2],".").concat(e[0]),"".concat(e[2],".").concat(e[0],".").concat(e[1]),"".concat(e[2],".").concat(e[1],".").concat(e[0])]:t>=4?[e[0],e[1],e[2],e[3],"".concat(e[0],".").concat(e[1]),"".concat(e[0],".").concat(e[2]),"".concat(e[0],".").concat(e[3]),"".concat(e[1],".").concat(e[0]),"".concat(e[1],".").concat(e[2]),"".concat(e[1],".").concat(e[3]),"".concat(e[2],".").concat(e[0]),"".concat(e[2],".").concat(e[1]),"".concat(e[2],".").concat(e[3]),"".concat(e[3],".").concat(e[0]),"".concat(e[3],".").concat(e[1]),"".concat(e[3],".").concat(e[2]),"".concat(e[0],".").concat(e[1],".").concat(e[2]),"".concat(e[0],".").concat(e[1],".").concat(e[3]),"".concat(e[0],".").concat(e[2],".").concat(e[1]),"".concat(e[0],".").concat(e[2],".").concat(e[3]),"".concat(e[0],".").concat(e[3],".").concat(e[1]),"".concat(e[0],".").concat(e[3],".").concat(e[2]),"".concat(e[1],".").concat(e[0],".").concat(e[2]),"".concat(e[1],".").concat(e[0],".").concat(e[3]),"".concat(e[1],".").concat(e[2],".").concat(e[0]),"".concat(e[1],".").concat(e[2],".").concat(e[3]),"".concat(e[1],".").concat(e[3],".").concat(e[0]),"".concat(e[1],".").concat(e[3],".").concat(e[2]),"".concat(e[2],".").concat(e[0],".").concat(e[1]),"".concat(e[2],".").concat(e[0],".").concat(e[3]),"".concat(e[2],".").concat(e[1],".").concat(e[0]),"".concat(e[2],".").concat(e[1],".").concat(e[3]),"".concat(e[2],".").concat(e[3],".").concat(e[0]),"".concat(e[2],".").concat(e[3],".").concat(e[1]),"".concat(e[3],".").concat(e[0],".").concat(e[1]),"".concat(e[3],".").concat(e[0],".").concat(e[2]),"".concat(e[3],".").concat(e[1],".").concat(e[0]),"".concat(e[3],".").concat(e[1],".").concat(e[2]),"".concat(e[3],".").concat(e[2],".").concat(e[0]),"".concat(e[3],".").concat(e[2],".").concat(e[1]),"".concat(e[0],".").concat(e[1],".").concat(e[2],".").concat(e[3]),"".concat(e[0],".").concat(e[1],".").concat(e[3],".").concat(e[2]),"".concat(e[0],".").concat(e[2],".").concat(e[1],".").concat(e[3]),"".concat(e[0],".").concat(e[2],".").concat(e[3],".").concat(e[1]),"".concat(e[0],".").concat(e[3],".").concat(e[1],".").concat(e[2]),"".concat(e[0],".").concat(e[3],".").concat(e[2],".").concat(e[1]),"".concat(e[1],".").concat(e[0],".").concat(e[2],".").concat(e[3]),"".concat(e[1],".").concat(e[0],".").concat(e[3],".").concat(e[2]),"".concat(e[1],".").concat(e[2],".").concat(e[0],".").concat(e[3]),"".concat(e[1],".").concat(e[2],".").concat(e[3],".").concat(e[0]),"".concat(e[1],".").concat(e[3],".").concat(e[0],".").concat(e[2]),"".concat(e[1],".").concat(e[3],".").concat(e[2],".").concat(e[0]),"".concat(e[2],".").concat(e[0],".").concat(e[1],".").concat(e[3]),"".concat(e[2],".").concat(e[0],".").concat(e[3],".").concat(e[1]),"".concat(e[2],".").concat(e[1],".").concat(e[0],".").concat(e[3]),"".concat(e[2],".").concat(e[1],".").concat(e[3],".").concat(e[0]),"".concat(e[2],".").concat(e[3],".").concat(e[0],".").concat(e[1]),"".concat(e[2],".").concat(e[3],".").concat(e[1],".").concat(e[0]),"".concat(e[3],".").concat(e[0],".").concat(e[1],".").concat(e[2]),"".concat(e[3],".").concat(e[0],".").concat(e[2],".").concat(e[1]),"".concat(e[3],".").concat(e[1],".").concat(e[0],".").concat(e[2]),"".concat(e[3],".").concat(e[1],".").concat(e[2],".").concat(e[0]),"".concat(e[3],".").concat(e[2],".").concat(e[0],".").concat(e[1]),"".concat(e[3],".").concat(e[2],".").concat(e[1],".").concat(e[0])]:void 0}var mX={};function mJ(e){if(0===e.length||1===e.length)return e;var t=e.join(".");return mX[t]||(mX[t]=mZ(e)),mX[t]}function mQ(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=arguments.length>2?arguments[2]:void 0;return mJ(e.filter(function(e){return"token"!==e})).reduce(function(e,t){return mV({},e,n[t])},t)}function m1(e){return e.join(" ")}function m0(e,t){var n=0;return function(r){return n+=1,r.map(function(r,i){return m2({node:r,stylesheet:e,useInlineStyles:t,key:"code-segment-".concat(n,"-").concat(i)})})}}function m2(e){var t=e.node,n=e.stylesheet,r=e.style,i=void 0===r?{}:r,a=e.useInlineStyles,o=e.key,s=t.properties,u=t.type,c=t.tagName,f=t.value;if("text"===u)return f;if(c){var d,h=m0(n,a);if(a){var p=Object.keys(n).reduce(function(e,t){return t.split(".").forEach(function(t){e.includes(t)||e.push(t)}),e},[]),b=s.className&&s.className.includes("token")?["token"]:[],m=s.className&&b.concat(s.className.filter(function(e){return!p.includes(e)}));d=mV({},s,{className:m1(m)||void 0,style:mQ(s.className,Object.assign({},s.style,i),n)})}else d=mV({},s,{className:m1(s.className)});var g=h(t.children);return l.createElement(c,mq({key:o},d),g)}}let m3=function(e,t){return -1!==e.listLanguages().indexOf(t)};var m4=/\n/g;function m5(e){return e.match(m4)}function m6(e){var t=e.lines,n=e.startingLineNumber,r=e.style;return t.map(function(e,t){var i=t+n;return l.createElement("span",{key:"line-".concat(t),className:"react-syntax-highlighter-line-number",style:"function"==typeof r?r(i):r},"".concat(i,"\n"))})}function m9(e){var t=e.codeString,n=e.codeStyle,r=e.containerStyle,i=void 0===r?{float:"left",paddingRight:"10px"}:r,a=e.numberStyle,o=void 0===a?{}:a,s=e.startingLineNumber;return l.createElement("code",{style:Object.assign({},n,i)},m6({lines:t.replace(/\n$/,"").split("\n"),style:o,startingLineNumber:s}))}function m8(e){return"".concat(e.toString().length,".25em")}function m7(e,t){return{type:"element",tagName:"span",properties:{key:"line-number--".concat(e),className:["comment","linenumber","react-syntax-highlighter-line-number"],style:t},children:[{type:"text",value:e}]}}function ge(e,t,n){var r,i={display:"inline-block",minWidth:m8(n),paddingRight:"1em",textAlign:"right",userSelect:"none"};return mV({},i,"function"==typeof e?e(t):e)}function gt(e){var t=e.children,n=e.lineNumber,r=e.lineNumberStyle,i=e.largestLineNumber,a=e.showInlineLineNumbers,o=e.lineProps,s=void 0===o?{}:o,u=e.className,c=void 0===u?[]:u,l=e.showLineNumbers,f=e.wrapLongLines,d="function"==typeof s?s(n):s;if(d.className=c,n&&a){var h=ge(r,n,i);t.unshift(m7(n,h))}return f&l&&(d.style=mV({},d.style,{display:"flex"})),{type:"element",tagName:"span",properties:d,children:t}}function gn(e){for(var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:[],n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[],r=0;r<e.length;r++){var i=e[r];if("text"===i.type)n.push(gt({children:[i],className:mW(new Set(t))}));else if(i.children){var a=t.concat(i.properties.className);n=n.concat(gn(i.children,a))}}return n}function gr(e,t,n,r,i,a,o,s,u){var c,l=gn(e.value),f=[],d=-1,h=0;function p(e,t){var a=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[];return gt({children:e,lineNumber:t,lineNumberStyle:s,largestLineNumber:o,showInlineLineNumbers:i,lineProps:n,className:a,showLineNumbers:r,wrapLongLines:u})}function b(e,t){if(r&&t&&i){var n=ge(s,t,o);e.unshift(m7(t,n))}return e}function m(e,n){var r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[];return t||r.length>0?p(e,n,r):b(e,n)}for(var g=function(){var e=l[h],t=e.children[0].value;if(m5(t)){var n=t.split("\n");n.forEach(function(t,i){var o=r&&f.length+a,s={type:"text",value:"".concat(t,"\n")};if(0===i){var u=l.slice(d+1,h).concat(gt({children:[s],className:e.properties.className})),c=m(u,o);f.push(c)}else if(i===n.length-1){if(l[h+1]&&l[h+1].children&&l[h+1].children[0]){var p={type:"text",value:"".concat(t)},b=gt({children:[p],className:e.properties.className});l.splice(h+1,0,b)}else{var g=[s],v=m(g,o,e.properties.className);f.push(v)}}else{var y=[s],w=m(y,o,e.properties.className);f.push(w)}}),d=h}h++};h<l.length;)g();if(d!==l.length-1){var v=l.slice(d+1,l.length);if(v&&v.length){var y=r&&f.length+a,w=m(v,y);f.push(w)}}return t?f:(c=[]).concat.apply(c,f)}function gi(e){var t=e.rows,n=e.stylesheet,r=e.useInlineStyles;return t.map(function(e,t){return m2({node:e,stylesheet:n,useInlineStyles:r,key:"code-segement".concat(t)})})}function ga(e){return e&&void 0!==e.highlightAuto}function go(e){var t=e.astGenerator,n=e.language,r=e.code,i=e.defaultCodeValue;if(ga(t)){var a=m3(t,n);return"text"===n?{value:i,language:"text"}:a?t.highlight(n,r):t.highlightAuto(r)}try{return n&&"text"!==n?{value:t.highlight(r,n)}:{value:i}}catch(o){return{value:i}}}function gs(e,t){return function(n){var r=n.language,i=n.children,a=n.style,o=void 0===a?t:a,s=n.customStyle,u=void 0===s?{}:s,c=n.codeTagProps,f=void 0===c?{className:r?"language-".concat(r):void 0,style:mV({},o['code[class*="language-"]'],o['code[class*="language-'.concat(r,'"]')])}:c,d=n.useInlineStyles,h=void 0===d||d,p=n.showLineNumbers,b=void 0!==p&&p,m=n.showInlineLineNumbers,g=void 0===m||m,v=n.startingLineNumber,y=void 0===v?1:v,w=n.lineNumberContainerStyle,_=n.lineNumberStyle,E=void 0===_?{}:_,S=n.wrapLines,k=n.wrapLongLines,x=void 0!==k&&k,T=n.lineProps,M=void 0===T?{}:T,O=n.renderer,A=n.PreTag,L=void 0===A?"pre":A,C=n.CodeTag,I=void 0===C?"code":C,D=n.code,N=void 0===D?Array.isArray(i)?i[0]:i:D,P=n.astGenerator,R=mB(n,["language","children","style","customStyle","codeTagProps","useInlineStyles","showLineNumbers","showInlineLineNumbers","startingLineNumber","lineNumberContainerStyle","lineNumberStyle","wrapLines","wrapLongLines","lineProps","renderer","PreTag","CodeTag","code","astGenerator"]);P=P||e;var j=b?l.createElement(m9,{containerStyle:w,codeStyle:f.style||{},numberStyle:E,startingLineNumber:y,codeString:N}):null,F=o.hljs||o['pre[class*="language-"]']||{backgroundColor:"#fff"},Y=ga(P)?"hljs":"prismjs",B=h?Object.assign({},R,{style:Object.assign({},F,u)}):Object.assign({},R,{className:R.className?"".concat(Y," ").concat(R.className):Y,style:Object.assign({},u)});if(!P)return l.createElement(L,B,j,l.createElement(I,f,N));(void 0===S&&O||x)&&(S=!0),O=O||gi;var U=[{type:"text",value:N}],H=go({astGenerator:P,language:r,code:N,defaultCodeValue:U});null===H.language&&(H.value=U);var $=H.value.length+y,z=gr(H,S,M,b,g,y,$,E,x);return x?f.style=mV({},f.style,{whiteSpace:"pre-wrap"}):f.style=mV({},f.style,{whiteSpace:"pre"}),l.createElement(L,B,l.createElement(I,f,!g&&j,O({rows:z,stylesheet:o,useInlineStyles:h})))}}let gu={'code[class*="language-"]':{color:"black",background:"none",textShadow:"0 1px white",fontFamily:"Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace",fontSize:"1em",textAlign:"left",whiteSpace:"pre",wordSpacing:"normal",wordBreak:"normal",wordWrap:"normal",lineHeight:"1.5",MozTabSize:"4",OTabSize:"4",tabSize:"4",WebkitHyphens:"none",MozHyphens:"none",msHyphens:"none",hyphens:"none"},'pre[class*="language-"]':{color:"black",background:"#f5f2f0",textShadow:"0 1px white",fontFamily:"Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace",fontSize:"1em",textAlign:"left",whiteSpace:"pre",wordSpacing:"normal",wordBreak:"normal",wordWrap:"normal",lineHeight:"1.5",MozTabSize:"4",OTabSize:"4",tabSize:"4",WebkitHyphens:"none",MozHyphens:"none",msHyphens:"none",hyphens:"none",padding:"1em",margin:".5em 0",overflow:"auto"},'pre[class*="language-"]::-moz-selection':{textShadow:"none",background:"#b3d4fc"},'pre[class*="language-"] ::-moz-selection':{textShadow:"none",background:"#b3d4fc"},'code[class*="language-"]::-moz-selection':{textShadow:"none",background:"#b3d4fc"},'code[class*="language-"] ::-moz-selection':{textShadow:"none",background:"#b3d4fc"},'pre[class*="language-"]::selection':{textShadow:"none",background:"#b3d4fc"},'pre[class*="language-"] ::selection':{textShadow:"none",background:"#b3d4fc"},'code[class*="language-"]::selection':{textShadow:"none",background:"#b3d4fc"},'code[class*="language-"] ::selection':{textShadow:"none",background:"#b3d4fc"},':not(pre) > code[class*="language-"]':{background:"#f5f2f0",padding:".1em",borderRadius:".3em",whiteSpace:"normal"},comment:{color:"slategray"},prolog:{color:"slategray"},doctype:{color:"slategray"},cdata:{color:"slategray"},punctuation:{color:"#999"},namespace:{Opacity:".7"},property:{color:"#905"},tag:{color:"#905"},boolean:{color:"#905"},number:{color:"#905"},constant:{color:"#905"},symbol:{color:"#905"},deleted:{color:"#905"},selector:{color:"#690"},"attr-name":{color:"#690"},string:{color:"#690"},char:{color:"#690"},builtin:{color:"#690"},inserted:{color:"#690"},operator:{color:"#9a6e3a",background:"hsla(0, 0%, 100%, .5)"},entity:{color:"#9a6e3a",background:"hsla(0, 0%, 100%, .5)",cursor:"help"},url:{color:"#9a6e3a",background:"hsla(0, 0%, 100%, .5)"},".language-css .token.string":{color:"#9a6e3a",background:"hsla(0, 0%, 100%, .5)"},".style .token.string":{color:"#9a6e3a",background:"hsla(0, 0%, 100%, .5)"},atrule:{color:"#07a"},"attr-value":{color:"#07a"},keyword:{color:"#07a"},function:{color:"#DD4A68"},"class-name":{color:"#DD4A68"},regex:{color:"#e90"},important:{color:"#e90",fontWeight:"bold"},variable:{color:"#e90"},bold:{fontWeight:"bold"},italic:{fontStyle:"italic"}};var gc=n(98695),gl=n.n(gc);let gf=["abap","abnf","actionscript","ada","agda","al","antlr4","apacheconf","apl","applescript","aql","arduino","arff","asciidoc","asm6502","aspnet","autohotkey","autoit","bash","basic","batch","bbcode","birb","bison","bnf","brainfuck","brightscript","bro","bsl","c","cil","clike","clojure","cmake","coffeescript","concurnas","cpp","crystal","csharp","csp","css-extras","css","cypher","d","dart","dax","dhall","diff","django","dns-zone-file","docker","ebnf","editorconfig","eiffel","ejs","elixir","elm","erb","erlang","etlua","excel-formula","factor","firestore-security-rules","flow","fortran","fsharp","ftl","gcode","gdscript","gedcom","gherkin","git","glsl","gml","go","graphql","groovy","haml","handlebars","haskell","haxe","hcl","hlsl","hpkp","hsts","http","ichigojam","icon","iecst","ignore","inform7","ini","io","j","java","javadoc","javadoclike","javascript","javastacktrace","jolie","jq","js-extras","js-templates","jsdoc","json","json5","jsonp","jsstacktrace","jsx","julia","keyman","kotlin","latex","latte","less","lilypond","liquid","lisp","livescript","llvm","lolcode","lua","makefile","markdown","markup-templating","markup","matlab","mel","mizar","mongodb","monkey","moonscript","n1ql","n4js","nand2tetris-hdl","naniscript","nasm","neon","nginx","nim","nix","nsis","objectivec","ocaml","opencl","oz","parigp","parser","pascal","pascaligo","pcaxis","peoplecode","perl","php-extras","php","phpdoc","plsql","powerquery","powershell","processing","prolog","properties","protobuf","pug","puppet","pure","purebasic","purescript","python","q","qml","qore","r","racket","reason","regex","renpy","rest","rip","roboconf","robotframework","ruby","rust","sas","sass","scala","scheme","scss","shell-session","smali","smalltalk","smarty","sml","solidity","solution-file","soy","sparql","splunk-spl","sqf","sql","stan","stylus","swift","t4-cs","t4-templating","t4-vb","tap","tcl","textile","toml","tsx","tt2","turtle","twig","typescript","typoscript","unrealscript","vala","vbnet","velocity","verilog","vhdl","vim","visual-basic","warpscript","wasm","wiki","xeora","xml-doc","xojo","xquery","yaml","yang","zig"];var gd=gs(gl(),gu);gd.supportedLanguages=gf;let gh=gd;var gp=n(64566),gb=n(68239);function gm(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function gg(){var e=gm(["\n  query FetchConfigV2 {\n    configv2 {\n      user\n      effective\n    }\n  }\n"]);return gg=function(){return e},e}var gv=function(){var e="[[TelemetryIngress.Endpoints]] \nNetwork = '...' # e.g. EVM. Solana, Starknet, Cosmos \nChainID = '...' # e.g. 1, 5, devnet, mainnet-beta URL\nURL = '...'\nServerPubKey = '...'";return l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"Deprecation warning"}),l.createElement(aK.Z,null,l.createElement(x.default,{variant:"h5",gutterBottom:!0},"Starting in ",l.createElement("code",null,"v2.9.0"),":"),l.createElement(w.default,{dense:!0},l.createElement(_.default,null,l.createElement(ol.Z,null,l.createElement(gb.Z,null)),l.createElement(x.default,{variant:"subtitle2",gutterBottom:!0},l.createElement("code",null,"TelemetryIngress.URL")," and"," ",l.createElement("code",null,"TelemetryIngress.ServerPubKey")," will no longer be allowed. Please switch to ",l.createElement("code",null,"TelemetryIngress.Endpoints"),":",l.createElement(gh,{language:"toml",style:gu},e))),l.createElement(_.default,null,l.createElement(ol.Z,null,l.createElement(gb.Z,null)),l.createElement(x.default,{variant:"subtitle2",gutterBottom:!0},l.createElement("code",null,"P2P.V1")," will no longer be supported and must not be set in TOML configuration in order to boot. Use"," ",l.createElement("code",null,"P2P.V2")," instead. If you are using both,"," ",l.createElement("code",null,"V1")," can simply be removed.")))))},gy=n0(gg()),gw=function(e){var t=e.children;return l.createElement(ii.Z,null,l.createElement(ie.default,{component:"th",scope:"row",colSpan:3},t))},g_=function(){return l.createElement(gw,null,"...")},gE=function(e){var t=e.children;return l.createElement(gw,null,t)},gS=function(e){var t=e.loading,n=e.toml,r=e.error,i=void 0===r?"":r,a=e.title,o=e.expanded;if(i)return l.createElement(gE,null,i);if(t)return l.createElement(g_,null);a||(a="TOML");var s={display:"block"};return l.createElement(x.default,null,l.createElement(mR.Z,{defaultExpanded:o},l.createElement(mj.Z,{expandIcon:l.createElement(gp.Z,null)},a),l.createElement(mF.Z,{style:s},l.createElement(gh,{language:"toml",style:gu},n))))},gk=function(){var e=ry(gy,{fetchPolicy:"cache-and-network"}),t=e.data,n=e.loading,r=e.error;return(null==t?void 0:t.configv2.effective)=="N/A"?l.createElement(l.Fragment,null,l.createElement(d.Z,{item:!0,xs:12},l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"TOML Configuration"}),l.createElement(gS,{title:"V2 config dump:",error:null==r?void 0:r.message,loading:n,toml:null==t?void 0:t.configv2.user,showHead:!0})))):l.createElement(l.Fragment,null,l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12},l.createElement(gv,null)),l.createElement(d.Z,{item:!0,xs:12},l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"TOML Configuration"}),l.createElement(gS,{title:"User specified:",error:null==r?void 0:r.message,loading:n,toml:null==t?void 0:t.configv2.user,showHead:!0,expanded:!0}),l.createElement(gS,{title:"Effective (with defaults):",error:null==r?void 0:r.message,loading:n,toml:null==t?void 0:t.configv2.effective,showHead:!0})))))},gx=n(34823),gT=function(e){return(0,b.createStyles)({cell:{paddingTop:1.5*e.spacing.unit,paddingBottom:1.5*e.spacing.unit}})},gM=(0,b.withStyles)(gT)(function(e){var t=e.classes,n=(0,A.I0)();(0,l.useEffect)(function(){n((0,ty.DQ)())});var r=(0,A.v9)(gx.N,A.wU);return l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"Node"}),l.createElement(r8.Z,null,l.createElement(r7.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,{className:t.cell},l.createElement(x.default,null,"Version"),l.createElement(x.default,{variant:"subtitle1",color:"textSecondary"},r.version))),l.createElement(ii.Z,null,l.createElement(ie.default,{className:t.cell},l.createElement(x.default,null,"SHA"),l.createElement(x.default,{variant:"subtitle1",color:"textSecondary"},r.commitSHA))))))}),gO=function(){return l.createElement(iv,null,l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,sm:12,md:8},l.createElement(d.Z,{container:!0},l.createElement(gk,null))),l.createElement(d.Z,{item:!0,sm:12,md:4},l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12},l.createElement(gM,null)),l.createElement(d.Z,{item:!0,xs:12},l.createElement(mP,null)),l.createElement(d.Z,{item:!0,xs:12},l.createElement(mS,null))))))},gA=function(){return l.createElement(gO,null)},gL=function(){return l.createElement(gA,null)},gC=n(44431),gI=1e18,gD=function(e){return new gC.BigNumber(e).dividedBy(gI).toFixed(8)},gN=function(e){var t=e.keys,n=e.chainID,r=e.hideHeaderTitle;return l.createElement(l.Fragment,null,l.createElement(sf.Z,{title:!r&&"Account Balances",subheader:"Chain ID "+n}),l.createElement(aK.Z,null,l.createElement(w.default,{dense:!1,disablePadding:!0},t&&t.map(function(e,r){return l.createElement(l.Fragment,null,l.createElement(_.default,{disableGutters:!0,key:["acc-balance",n.toString(),r.toString()].join("-")},l.createElement(E.Z,{primary:l.createElement(l.Fragment,null,l.createElement(d.Z,{container:!0,spacing:16},l.createElement(d.Z,{item:!0,xs:12},l.createElement(ob,{title:"Address"}),l.createElement(om,{value:e.address})),l.createElement(d.Z,{item:!0,xs:6},l.createElement(ob,{title:"Native Token Balance"}),l.createElement(om,{value:e.ethBalance||"--"})),l.createElement(d.Z,{item:!0,xs:6},l.createElement(ob,{title:"LINK Balance"}),l.createElement(om,{value:e.linkBalance?gD(e.linkBalance):"--"}))))})),r+1<t.length&&l.createElement(aV.Z,null))}))))};function gP(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function gR(){var e=gP(["\n  fragment AccountBalancesPayload_ResultsFields on EthKey {\n    address\n    chain {\n      id\n    }\n    ethBalance\n    isDisabled\n    linkBalance\n  }\n"]);return gR=function(){return e},e}var gj=n0(gR()),gF=function(e){var t=e.data,n=e.errorMsg,r=e.loading,i=null==t?void 0:t.ethKeys.results,a={};return null==i||i.forEach(function(e){void 0===a[e.chain.id]&&(a[e.chain.id]=[]),a[e.chain.id].push(e)}),l.createElement(r9.Z,null,n&&l.createElement(l.Fragment,null,l.createElement(sf.Z,{title:"Account Balances"}),l.createElement(d.Z,{item:!0,xs:12},l.createElement(om,{value:n}))),r&&l.createElement(d.Z,{item:!0,xs:12,style:{display:"flex",justifyContent:"center"}},l.createElement(iP.Z,{"data-testid":"loading-spinner",size:24})),!(null==i?void 0:i.length)&&!r&&!n&&l.createElement(l.Fragment,null,l.createElement(sf.Z,{title:"Account Balances"}),l.createElement(d.Z,{item:!0,xs:12},l.createElement(om,{value:"No account available"}))),i&&Object.keys(a).map(function(e,t){return l.createElement(gN,{key:e,keys:a[e],chainID:e,hideHeaderTitle:!!t})}))};function gY(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function gB(){var e=gY(["\n  ","\n  query FetchAccountBalances {\n    ethKeys {\n      results {\n        ...AccountBalancesPayload_ResultsFields\n      }\n    }\n  }\n"]);return gB=function(){return e},e}var gU=n0(gB(),gj),gH=function(){var e=ry(gU,{fetchPolicy:"cache-and-network"}),t=e.data,n=e.loading,r=e.error;return l.createElement(gF,{data:t,errorMsg:null==r?void 0:r.message,loading:n})},g$=n(21700),gz=function(e){var t=e.msg;return t?l.createElement(ii.Z,null,l.createElement(ie.default,{component:"th",scope:"row"},t)):null},gG=function(e){return(0,b.createStyles)({cell:{padding:2*e.spacing.unit}})},gW=(0,b.withStyles)(gG)(function(e){var t=e.classes;return e.visible?l.createElement(ii.Z,null,l.createElement(ie.default,{colSpan:100,align:"center",className:t.cell},l.createElement(iP.Z,{"data-testid":"loading-spinner",size:24}))):null}),gK=function(e){var t=e.children;return e.visible?l.createElement(ii.Z,null,l.createElement(ie.default,{component:"th",scope:"row"},t||"No entries to show")):null};function gV(){return(gV=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}var gq=function(e){return l.createElement("svg",gV({viewBox:"0 0 48 48"},e),l.createElement("path",{d:"M24 48C10.8 48 0 37.2 0 24S10.8 0 24 0s24 10.8 24 24-10.8 24-24 24zm0-44C13 4 4 13 4 24s9 20 20 20 20-9 20-20S35 4 24 4z",fill:"transparent"}),l.createElement("circle",{cx:24,cy:24,r:20,fill:"#ffecf0"}),l.createElement("path",{d:"M16.8 30.9H31c.5 0 1-.3 1.2-.8.3-.6.3-1.2.1-1.8l-6.5-11c-.4-.8-1.1-1.3-1.9-1.4-.8.1-1.6.6-1.9 1.3l-6.4 11c-.3.6-.3 1.3.1 1.8.1.5.6.8 1.1.9zm7.1-5.5c-.4 0-.7-.4-.7-.8l-.4-3.4c0-.6.5-1.1 1.1-1.1s1.1.5 1.1 1.1l-.4 3.4c0 .4-.3.8-.7.8zm0 1.1c.6 0 1.1.5 1.1 1.1v.1c0 .6-.5 1.1-1.1 1.1s-1.1-.5-1.1-1.1c0-.6.5-1.1 1.1-1.2zm-7.1 5.8c-1 0-2-.6-2.5-1.5-.6-1-.6-2.3-.1-3.3l6.5-11.2c.6-1.2 1.8-2 3.1-2.1 1.3.1 2.5.9 3.1 2l6.5 11.1c.5 1.1.5 2.3-.1 3.4-.5.9-1.4 1.4-2.4 1.5l-14.1.1z",fillRule:"evenodd",clipRule:"evenodd",fill:"#ff4169"}))};let gZ=gq;function gX(){return(gX=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}var gJ=function(e){return l.createElement("svg",gX({fill:"none",viewBox:"0 0 48 48"},e),l.createElement("path",{d:"M24 46C36.1503 46 46 36.1503 46 24C46 11.8497 36.1503 2 24 2C11.8497 2 2 11.8497 2 24C2 36.1503 11.8497 46 24 46Z",stroke:"white",strokeWidth:"4"}),l.createElement("path",{d:"M24 44C35.0457 44 44 35.0457 44 24C44 12.9543 35.0457 4 24 4C12.9543 4 4 12.9543 4 24C4 35.0457 12.9543 44 24 44Z",fill:"#E8ECEF"}),l.createElement("path",{d:"M24.07 11.72C21.7307 11.722 19.4445 12.4175 17.5003 13.7186C15.5562 15.0197 14.0415 16.868 13.1476 19.0298C12.2538 21.1916 12.0209 23.5699 12.4785 25.864C12.9361 28.1582 14.0636 30.2651 15.7185 31.9186C17.3733 33.5721 19.4812 34.6978 21.7758 35.1534C24.0703 35.6091 26.4484 35.3742 28.6095 34.4785C30.7705 33.5829 32.6175 32.0666 33.917 30.1214C35.2164 28.1761 35.91 25.8893 35.91 23.55C35.9113 21.9952 35.6059 20.4555 35.0112 19.019C34.4166 17.5825 33.5443 16.2774 32.4445 15.1784C31.3446 14.0795 30.0388 13.2084 28.6018 12.6149C27.1647 12.0215 25.6248 11.7174 24.07 11.72V11.72ZM24.07 33.01C22.199 33.01 20.37 32.4552 18.8143 31.4157C17.2586 30.3762 16.0461 28.8988 15.3301 27.1702C14.6141 25.4416 14.4268 23.5395 14.7918 21.7044C15.1568 19.8694 16.0578 18.1838 17.3808 16.8608C18.7038 15.5378 20.3894 14.6368 22.2245 14.2718C24.0595 13.9068 25.9616 14.0941 27.6902 14.8101C29.4188 15.5261 30.8962 16.7386 31.9357 18.2943C32.9752 19.85 33.53 21.679 33.53 23.55C33.5274 26.0538 32.5323 28.4543 30.7628 30.2257C28.9933 31.9971 26.5938 32.9947 24.09 33L24.07 33.01Z",fill:"#5A6169",fillOpacity:"0.75"}),l.createElement("path",{d:"M24.68 17.64H22.9V24.73L29.11 28.45L30 27L24.68 23.84V17.64Z",fill:"#5A6169",fillOpacity:"0.75"}))};let gQ=gJ;function g1(){return(g1=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}var g0=function(e){return l.createElement("svg",g1({id:"prefix__Layer_1","data-name":"Layer 1",viewBox:"0 0 48 48"},e),l.createElement("defs",null,l.createElement("style",null,".prefix__cls-3{fill:#b0b0b0}")),l.createElement("g",{id:"prefix__Time-Icon"},l.createElement("circle",{id:"prefix__path-1",cx:24,cy:24,r:20,fill:"#f0f0f0",className:"pending-icon"})),l.createElement("g",{id:"prefix__Time-Icon-2","data-name":"Time-Icon"},l.createElement("g",{id:"prefix__Shape"},l.createElement("path",{className:"prefix__cls-3",d:"M23.94 11.64a11.83 11.83 0 1 0 11.84 11.83 11.82 11.82 0 0 0-11.84-11.83zm0 21.29a9.46 9.46 0 1 1 9.46-9.46 9.46 9.46 0 0 1-9.4 9.46z"}),l.createElement("path",{fill:"none",d:"M9.77 9.28h28.38v28.38H9.77V9.28z"}),l.createElement("path",{className:"prefix__cls-3",d:"M24.55 17.56h-1.78v7.09l6.21 3.73.89-1.46-5.32-3.16v-6.2z"}))))};let g2=g0;function g3(){return(g3=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}var g4=function(e){return l.createElement("svg",g3({"data-name":"Layer 1",viewBox:"0 0 48 48"},e),l.createElement("defs",null,l.createElement("mask",{id:"prefix__a",x:13.75,y:16,width:21,height:15,maskUnits:"userSpaceOnUse"},l.createElement("path",{fillRule:"evenodd",fill:"#fff",d:"M13.75 16h21v15h-21V16z"}))),l.createElement("circle",{"data-name":"path-1",cx:24,cy:24,r:20,fill:"#e8faf1"}),l.createElement("g",null,l.createElement("g",{mask:"url(#prefix__a)"},l.createElement("path",{d:"M30.81 17a1.89 1.89 0 0 0-1.29.56c-2.94 2.9-5.2 5.33-7.89 8.05l-2.74-2.28a1.9 1.9 0 0 0-2.66.14 1.84 1.84 0 0 0 .14 2.62l.09.07 4.08 3.4a1.9 1.9 0 0 0 2.55-.11c3.38-3.34 5.79-6 9.09-9.27a1.82 1.82 0 0 0 0-2.62 1.92 1.92 0 0 0-1.4-.56",fill:"#17c671",fillRule:"evenodd"}))))};let g5=g4;var g6=function(e){var t=e.status,n=e.width,r=e.height;switch(t){case"COMPLETED":return l.createElement(g5,{width:n,height:r,"data-testid":"completed"});case"ERRORED":return l.createElement(gZ,{width:n,height:r,"data-testid":"errored"});case"RUNNING":return l.createElement(g2,{width:n,height:r,"data-testid":"running"});case"SUSPENDED":return l.createElement(gQ,{width:n,height:r,"data-testid":"suspended"});default:return null}},g9=function(e){var t=e.palette,n=e.spacing;return(0,b.createStyles)({cell:{padding:0},content:{position:"relative",paddingLeft:50},status:{position:"absolute",top:0,left:0,paddingTop:18,paddingLeft:30,borderRight:"solid 1px",borderRightColor:t.divider,width:50,height:"100%"},runDetails:{paddingTop:3*n.unit,paddingBottom:3*n.unit,paddingLeft:4*n.unit,paddingRight:4*n.unit}})},g8=(0,b.withStyles)(g9)(function(e){var t=e.classes,n=e.run;return l.createElement(ii.Z,null,l.createElement(ie.default,{scope:"row",className:t.cell},l.createElement("div",{className:t.content},l.createElement("div",{className:t.status},l.createElement(g6,{width:38,status:n.status})),l.createElement("div",{className:t.runDetails},l.createElement(d.Z,{container:!0,spacing:0},l.createElement(d.Z,{item:!0,xs:12},l.createElement(ip,{href:"/jobs/".concat(n.job.id)},l.createElement(x.default,{variant:"h5",color:"primary",component:"span"},"Job: ",n.job.id))),l.createElement(d.Z,{item:!0,xs:12},l.createElement(ip,{href:"/runs/".concat(n.id)},l.createElement(x.default,{variant:"subtitle1",color:"textSecondary",component:"span"},"Run: ",n.id))))))),l.createElement(ie.default,{align:"right"},l.createElement(x.default,{variant:"body1",color:"textSecondary"},l.createElement(aA,{tooltip:!0},n.createdAt))))});function g7(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function ve(){var e=g7(["\n  fragment RecentJobRunsPayload_ResultsFields on JobRun {\n    id\n    allErrors\n    createdAt\n    finishedAt\n    status\n    job {\n      id\n    }\n  }\n"]);return ve=function(){return e},e}var vt=n0(ve()),vn=function(e){var t=e.palette,n=e.spacing;return(0,b.createStyles)({footer:{borderColor:t.divider,borderTop:"1px solid",paddingTop:2*n.unit,paddingBottom:2*n.unit}})},vr=(0,b.withStyles)(vn)(function(e){var t,n,r=e.classes,i=e.data,a=e.loading,o=e.errorMsg,s=e.maxRunsSize;return l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"Activity",action:l.createElement(aL.Z,{href:"/jobs/new",component:tz},"New Job")}),l.createElement(r8.Z,null,l.createElement(r7.Z,null,l.createElement(gW,{visible:a}),l.createElement(gK,{visible:(null===(t=null==i?void 0:i.jobRuns.results)||void 0===t?void 0:t.length)===0},"No recent activity"),l.createElement(gz,{msg:o}),null===(n=null==i?void 0:i.jobRuns.results)||void 0===n?void 0:n.map(function(e,t){return l.createElement(g8,{run:e,key:t})})),i&&i.jobRuns.metadata.total>s&&l.createElement(g$.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,{className:r.footer},l.createElement(aL.Z,{href:"/runs",component:tz},"View More"))))))});function vi(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function va(){var e=vi(["\n  ","\n  query FetchRecentJobRuns($offset: Int, $limit: Int) {\n    jobRuns(offset: $offset, limit: $limit) {\n      results {\n        ...RecentJobRunsPayload_ResultsFields\n      }\n      metadata {\n        total\n      }\n    }\n  }\n"]);return va=function(){return e},e}var vo=5,vs=n0(va(),vt),vu=function(){var e=ry(vs,{variables:{offset:0,limit:vo},fetchPolicy:"cache-and-network"}),t=e.data,n=e.loading,r=e.error;return l.createElement(vr,{data:t,errorMsg:null==r?void 0:r.message,loading:n,maxRunsSize:vo})},vc=function(e){return(0,b.createStyles)({style:{textAlign:"center",padding:2.5*e.spacing.unit,position:"fixed",left:"0",bottom:"0",width:"100%",borderRadius:0},bareAnchor:{color:e.palette.common.black,textDecoration:"none"}})},vl=(0,b.withStyles)(vc)(function(e){var t=e.classes,n=(0,A.v9)(gx.N,A.wU),r=(0,A.I0)();return(0,l.useEffect)(function(){r((0,ty.DQ)())}),l.createElement(ia.default,{className:t.style},l.createElement(x.default,null,"Chainlink Node ",n.version," at commit"," ",l.createElement("a",{target:"_blank",rel:"noopener noreferrer",href:"https://github.com/smartcontractkit/chainlink/commit/".concat(n.commitSHA),className:t.bareAnchor},n.commitSHA)))}),vf=function(e){return(0,b.createStyles)({cell:{borderColor:e.palette.divider,borderTop:"1px solid",borderBottom:"none",paddingTop:2*e.spacing.unit,paddingBottom:2*e.spacing.unit,paddingLeft:2*e.spacing.unit},block:{display:"block"},overflowEllipsis:{textOverflow:"ellipsis",overflow:"hidden"}})},vd=(0,b.withStyles)(vf)(function(e){var t=e.classes,n=e.job;return l.createElement(ii.Z,null,l.createElement(ie.default,{scope:"row",className:t.cell},l.createElement(d.Z,{container:!0,spacing:0},l.createElement(d.Z,{item:!0,xs:12},l.createElement(ip,{href:"/jobs/".concat(n.id),classes:{linkContent:t.block}},l.createElement(x.default,{className:t.overflowEllipsis,variant:"body1",component:"span",color:"primary"},n.name||n.id))),l.createElement(d.Z,{item:!0,xs:12},l.createElement(x.default,{variant:"body1",color:"textSecondary"},"Created ",l.createElement(aA,{tooltip:!0},n.createdAt))))))});function vh(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function vp(){var e=vh(["\n  fragment RecentJobsPayload_ResultsFields on Job {\n    id\n    name\n    createdAt\n  }\n"]);return vp=function(){return e},e}var vb=n0(vp()),vm=function(){return(0,b.createStyles)({cardHeader:{borderBottom:0},table:{tableLayout:"fixed"}})},vg=(0,b.withStyles)(vm)(function(e){var t,n,r=e.classes,i=e.data,a=e.errorMsg,o=e.loading;return l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"Recent Jobs",className:r.cardHeader}),l.createElement(r8.Z,{className:r.table},l.createElement(r7.Z,null,l.createElement(gW,{visible:o}),l.createElement(gK,{visible:(null===(t=null==i?void 0:i.jobs.results)||void 0===t?void 0:t.length)===0},"No recently created jobs"),l.createElement(gz,{msg:a}),null===(n=null==i?void 0:i.jobs.results)||void 0===n?void 0:n.map(function(e,t){return l.createElement(vd,{job:e,key:t})}))))});function vv(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function vy(){var e=vv(["\n  ","\n  query FetchRecentJobs($offset: Int, $limit: Int) {\n    jobs(offset: $offset, limit: $limit) {\n      results {\n        ...RecentJobsPayload_ResultsFields\n      }\n    }\n  }\n"]);return vy=function(){return e},e}var vw=5,v_=n0(vy(),vb),vE=function(){var e=ry(v_,{variables:{offset:0,limit:vw},fetchPolicy:"cache-and-network"}),t=e.data,n=e.loading,r=e.error;return l.createElement(vg,{data:t,errorMsg:null==r?void 0:r.message,loading:n})},vS=function(){return l.createElement(iv,null,l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:8},l.createElement(vu,null)),l.createElement(d.Z,{item:!0,xs:4},l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12},l.createElement(gH,null)),l.createElement(d.Z,{item:!0,xs:12},l.createElement(vE,null))))),l.createElement(vl,null))},vk=function(){return l.createElement(vS,null)},vx=function(){return l.createElement(vk,null)},vT=n(87239),vM=function(e){switch(e){case"DirectRequestSpec":return"Direct Request";case"FluxMonitorSpec":return"Flux Monitor";default:return e.replace(/Spec$/,"")}},vO=n(5022),vA=n(78718),vL=n.n(vA);function vC(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function vI(e){if(Array.isArray(e))return vC(e)}function vD(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function vN(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function vP(){throw TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function vR(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){vD(e,t,n[t])})}return e}function vj(e){return vI(e)||vN(e)||vF(e)||vP()}function vF(e,t){if(e){if("string"==typeof e)return vC(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return vC(e,t)}}var vY=function(e){for(var t=arguments.length,n=Array(t>1?t-1:0),r=1;r<t;r++)n[r-1]=arguments[r];return vL().apply(void 0,[e,"type","schemaVersion","name","externalJobID","gasLimit","forwardingAllowed",].concat(vj(n)))},vB=function(e){var t=e.observationSource;return{observationSource:""===t?null:t}},vU=function(e){for(var t=arguments.length,n=Array(t>1?t-1:0),r=1;r<t;r++)n[r-1]=arguments[r];return vL().apply(void 0,[e].concat(vj(n)))},vH=function(e){try{return vO.stringify(e)}catch(t){return console.error("Failed to stringify job spec with the following error: ".concat(t)),""}},v$=function(e){var t={};switch(e.spec.__typename){case"CronSpec":t=vR({},vY(e,"maxTaskDuration"),vU(e.spec,"schedule"),vB(e));break;case"DirectRequestSpec":t=vR({},vY(e,"maxTaskDuration"),vU(e.spec,"contractAddress","evmChainID","minIncomingConfirmations","minContractPaymentLinkJuels","requesters"),vB(e));break;case"FluxMonitorSpec":t=vR({},vY(e,"maxTaskDuration"),vU(e.spec,"absoluteThreshold","contractAddress","drumbeatEnabled","drumbeatSchedule","drumbeatRandomDelay","evmChainID","idleTimerPeriod","idleTimerDisabled","minPayment","pollTimerPeriod","pollTimerDisabled","threshold"),vB(e));break;case"KeeperSpec":t=vR({},vY(e),vU(e.spec,"contractAddress","evmChainID","fromAddress"),vB(e));break;case"OCRSpec":t=vR({},vY(e,"maxTaskDuration"),vU(e.spec,"blockchainTimeout","contractAddress","contractConfigConfirmations","contractConfigTrackerPollInterval","contractConfigTrackerSubscribeInterval","evmChainID","isBootstrapPeer","keyBundleID","observationTimeout","p2pBootstrapPeers","p2pv2Bootstrappers","transmitterAddress"),vB(e));break;case"OCR2Spec":t=vR({},vY(e,"maxTaskDuration"),vU(e.spec,"blockchainTimeout","contractID","contractConfigConfirmations","contractConfigTrackerPollInterval","ocrKeyBundleID","monitoringEndpoint","p2pv2Bootstrappers","relay","relayConfig","pluginType","pluginConfig","feedID"),vU(e.spec,"transmitterID"),vB(e));break;case"VRFSpec":t=vR({},vY(e),vU(e.spec,"coordinatorAddress","evmChainID","fromAddresses","minIncomingConfirmations","pollPeriod","publicKey","requestedConfsDelay","requestTimeout","batchCoordinatorAddress","batchFulfillmentEnabled","batchFulfillmentGasMultiplier","chunkSize","backoffInitialDelay","backoffMaxDelay","gasLanePrice","vrfOwnerAddress"),vB(e));break;case"BlockhashStoreSpec":t=vR({},vY(e),vU(e.spec,"coordinatorV1Address","coordinatorV2Address","coordinatorV2PlusAddress","waitBlocks","lookbackBlocks","blockhashStoreAddress","trustedBlockhashStoreAddress","trustedBlockhashStoreBatchSize","pollPeriod","runTimeout","evmChainID","fromAddresses"),vB(e));break;case"BlockHeaderFeederSpec":t=vR({},vY(e),vU(e.spec,"coordinatorV1Address","coordinatorV2Address","coordinatorV2PlusAddress","waitBlocks","lookbackBlocks","blockhashStoreAddress","batchBlockhashStoreAddress","pollPeriod","runTimeout","evmChainID","fromAddresses","getBlockhashesBatchSize","storeBlockhashesBatchSize"),vB(e));break;case"BootstrapSpec":t=vR({},vY(e),vU(e.spec,"contractID","relay","relayConfig","monitoringEndpoint","blockchainTimeout","contractConfigTrackerPollInterval","contractConfigConfirmations"));break;case"GatewaySpec":t=vR({},vY(e),vU(e.spec,"gatewayConfig"));break;default:return{definition:""};case"WebhookSpec":t=vR({},vY(e),vB(e))}return{definition:vH(t)}};function vz(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function vG(e){if(Array.isArray(e))return e}function vW(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function vK(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function vV(e,t){return vG(e)||vW(e,t)||vq(e,t)||vK()}function vq(e,t){if(e){if("string"==typeof e)return vz(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return vz(e,t)}}var vZ=function(e){var t=e.job,n=e.onDelete,r=vV(l.useState(null),2),i=r[0],a=r[1],o=vV(l.useState(!1),2),s=o[0],u=o[1],c=function(e){a(e.currentTarget)},f=function(){a(null)},h=v$(t).definition;return l.createElement(l.Fragment,null,l.createElement(op,{actions:l.createElement("div",null,l.createElement(y.default,{onClick:c,"aria-label":"open-menu"},l.createElement(of.Z,null)),l.createElement(t_.Z,{anchorEl:i,open:Boolean(i),onClose:f,disableAutoFocusItem:!0},l.createElement(tN,{to:"/jobs/new?definition=".concat(encodeURIComponent(h))},l.createElement(ol.Z,null,l.createElement(vT.Z,null)),l.createElement(E.Z,null,"Duplicate")),l.createElement(tE.default,{onClick:function(){return u(!0)}},l.createElement(ol.Z,null,l.createElement(oc.Z,null)),l.createElement(E.Z,null,"Delete"))))},l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12,sm:6,md:1},l.createElement(ob,{title:"ID"}),l.createElement(om,{value:t.id})),l.createElement(d.Z,{item:!0,xs:12,sm:6,md:2},l.createElement(ob,{title:"Type"}),l.createElement(om,{value:vM(t.spec.__typename)})),l.createElement(d.Z,{item:!0,xs:12,sm:6,md:5},l.createElement(ob,{title:"External Job ID"}),l.createElement(om,{value:vM(t.externalJobID)})),l.createElement(d.Z,{item:!0,xs:12,sm:6,md:4},l.createElement(ob,{title:"Created"}),l.createElement(om,null,l.createElement(aA,{tooltip:!0},t.createdAt))))),l.createElement(oI,{open:s,title:"Delete Job?",body:"Warning: This action cannot be undone!",confirmButtonText:"Confirm",onConfirm:function(){n(),u(!1)},cancelButtonText:"Cancel",onCancel:function(){return u(!1)}}))},vX=n(70398),vJ=n(12794),vQ=n(75759);function v1(){return(v1=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}var v0=function(e){return l.createElement(vQ.Z,v1({},e,{component:tI.rU}),e.children)};function v2(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var v3,v4=function(e){return(0,b.createStyles)({tabs:{marginTop:4*e.spacing.unit,marginBottom:2.5*e.spacing.unit,borderBottom:"1px solid ".concat(e.palette.grey["300"])},badge:{padding:"0 ".concat(2*e.spacing.unit,"px")}})};(v3=s||(s={}))[v3.Overview=0]="Overview",v3[v3.Definition=1]="Definition",v3[v3.Errors=2]="Errors",v3[v3.Runs=3]="Runs";var v5=(0,b.withStyles)(v4)(function(e){var t=e.classes,n=e.id,r=e.errorsCount,i=e.refetchRecentRuns,a=e.runsCount,o=(0,h.TH)().pathname,u=l.useMemo(function(){var e;return v2(e={},s.Overview,"/jobs/".concat(n)),v2(e,s.Definition,"/jobs/".concat(n,"/definition")),v2(e,s.Errors,"/jobs/".concat(n,"/errors")),v2(e,s.Runs,"/jobs/".concat(n,"/runs")),e},[n]);return l.createElement(vJ.Z,{value:o,className:t.tabs,indicatorColor:"primary",onChange:function(e,t){t===u[s.Overview]&&i()}},l.createElement(v0,{label:"Overview",to:u[s.Overview],value:u[s.Overview]}),l.createElement(v0,{label:"Definition",to:u[s.Definition],value:u[s.Definition]}),l.createElement(v0,{label:l.createElement(vX.Z,{badgeContent:r,color:"error",className:t.badge},"Errors"),to:u[s.Errors],value:u[s.Errors]}),l.createElement(v0,{label:l.createElement(vX.Z,{badgeContent:a,color:"primary",className:t.badge,max:99999},"Runs"),to:u[s.Runs],value:u[s.Runs]}))}),v6=n(12740);function v9(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function v8(e){if(Array.isArray(e))return e}function v7(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function ye(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function yt(e,t){return v8(e)||v7(e,t)||yn(e,t)||ye()}function yn(e,t){if(e){if("string"==typeof e)return v9(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return v9(e,t)}}var yr=function(e){return(0,b.createStyles)({dialogContent:{paddingTop:1*e.spacing.unit},textarea:{width:400},closeButton:{position:"absolute",right:e.spacing.unit,top:e.spacing.unit,color:e.palette.grey[500]}})},yi=(0,b.withStyles)(yr)(function(e){var t=e.open,n=e.onClose,r=e.onRun,i=e.classes,a=yt(l.useState(""),2),o=a[0],s=a[1],u=l.useCallback(function(){r(o),n()},[r,n,o]);return l.createElement(aN.Z,{onClose:n,open:t},l.createElement(oA.Z,{disableTypography:!0},l.createElement(x.default,{variant:"h5"},"Pipeline Input"),l.createElement(y.default,{"aria-label":"Close",className:i.closeButton,onClick:n},l.createElement(v6.Z,null))),l.createElement(oM.Z,{className:i.dialogContent},l.createElement(i_.Z,{className:i.textarea,multiline:!0,rows:6,variant:"outlined",onChange:function(e){return s(e.target.value)}})),l.createElement(oT.Z,null,l.createElement(aL.Z,{variant:"primary",onClick:u},"Run Job")))}),ya=n(74855);function yo(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function ys(e){if(Array.isArray(e))return e}function yu(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function yc(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function yl(e,t){return ys(e)||yu(e,t)||yf(e,t)||yc()}function yf(e,t){if(e){if("string"==typeof e)return yo(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return yo(e,t)}}var yd=function(e){var t=e.data,n=e.title,r=yl(l.useState(!1),2),i=r[0],a=r[1];return l.createElement(ya.CopyToClipboard,{text:t,onCopy:function(){return a(!0)}},l.createElement(aE.Z,{title:"Copied!",open:i,onClose:function(){return a(!1)}},l.createElement(aL.Z,{variant:"secondary",onMouseLeave:function(){return a(!1)}},n)))},yh=function(e){var t=v$(e.job).definition;return l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"Definition",action:l.createElement(yd,{title:"Copy",data:t})}),l.createElement(aK.Z,null,l.createElement(x.default,{style:{margin:0},variant:"body1",component:"pre"},l.createElement(gh,{language:"toml",style:gu,"data-testid":"definition"},t))))},yp=function(e){var t=e.job,n=["Occurrences","Created","Last Seen","Message"];return l.createElement(r9.Z,null,l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,n.map(function(e){return l.createElement(ie.default,{key:e},e)}))),l.createElement(r7.Z,null,0===t.errors.length&&l.createElement(ii.Z,null,l.createElement(ie.default,{component:"th",scope:"row",colSpan:5},"No errors")),t.errors.map(function(e,t){return l.createElement(ii.Z,{key:t},l.createElement(ie.default,null,e.occurrences),l.createElement(ie.default,null,l.createElement(aA,{tooltip:!0},e.createdAt)),l.createElement(ie.default,null,l.createElement(aA,{tooltip:!0},e.updatedAt)),l.createElement(ie.default,null,e.description))}))))},yb=function(e){return(0,b.createStyles)({jobRunsCard:{overflow:"auto"},idCell:{width:"40%"},stampCell:{width:"30%"},statusCell:{textAlign:"end",width:"30%"},runDetails:{paddingTop:2*e.spacing.unit,paddingBottom:2*e.spacing.unit,paddingLeft:2*e.spacing.unit},stamp:{paddingLeft:e.spacing.unit},status:{paddingLeft:1.5*e.spacing.unit,paddingRight:1.5*e.spacing.unit,paddingTop:e.spacing.unit/2,paddingBottom:e.spacing.unit/2,borderRadius:2*e.spacing.unit,marginRight:e.spacing.unit,width:"fit-content",display:"inline-block",textTransform:"capitalize"},errored:{backgroundColor:e.palette.error.light,color:e.palette.error.main},running:{backgroundColor:e.palette.listPendingStatus.background,color:e.palette.listPendingStatus.color},completed:{backgroundColor:e.palette.listCompletedStatus.background,color:e.palette.listCompletedStatus.color},noRuns:{padding:2*e.spacing.unit}})},ym=function(e,t){switch(t){case"COMPLETED":case"ERRORED":case"RUNNING":return e[t.toLowerCase()];default:return null}},yg=(0,b.withStyles)(yb)(function(e){var t=e.classes,n=e.runs,r=(0,h.k6)();return l.createElement(r8.Z,{padding:"none"},l.createElement(r7.Z,null,0===n.length&&l.createElement(ii.Z,null,l.createElement(ie.default,{colSpan:5},l.createElement(x.default,{variant:"body1",color:"textSecondary",className:t.noRuns},"No jobs have been run yet"))),n.length>0&&n.map(function(e){return l.createElement(ii.Z,{key:e.id,style:{cursor:"pointer"},onClick:function(){return r.push("/runs/".concat(e.id))}},l.createElement(ie.default,{className:t.idCell,scope:"row"},l.createElement("div",{className:t.runDetails},l.createElement(x.default,{variant:"h5",color:"primary",component:"span"},e.id))),l.createElement(ie.default,{className:t.stampCell},l.createElement(x.default,{variant:"body1",color:"textSecondary",className:t.stamp},"Created ",l.createElement(aA,{tooltip:!0},e.createdAt))),l.createElement(ie.default,{className:t.statusCell,scope:"row"},l.createElement(x.default,{variant:"body1",className:O()(t.status,ym(t,e.status))},e.status.toLowerCase())))})))}),yv=n(16839),yy=n.n(yv);function yw(e){var t=e.replace(/\w+\s*=\s*<([^>]|[\r\n])*>/g,""),n=yy().read(t),r=n.edges();return n.nodes().map(function(e){var t={id:e,parentIds:r.filter(function(t){return t.w===e}).map(function(e){return e.v})};return Object.keys(n.node(e)).length>0&&(t.attributes=n.node(e)),t})}var y_=n(94164),yE=function(e){var t=e.data,n=[];return(null==t?void 0:t.attributes)&&Object.keys(t.attributes).forEach(function(e){var r;n.push(l.createElement("div",{key:e},l.createElement(x.default,{variant:"body1",color:"textSecondary",component:"div"},l.createElement("b",null,e,":")," ",null===(r=t.attributes)||void 0===r?void 0:r[e])))}),l.createElement("div",null,t&&l.createElement(x.default,{variant:"body1",color:"textPrimary"},l.createElement("b",null,t.id)),n)},yS=n(73343),yk=n(3379),yx=n.n(yk);function yT(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function yM(e){if(Array.isArray(e))return e}function yO(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function yA(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function yL(e,t){return yM(e)||yO(e,t)||yC(e,t)||yA()}function yC(e,t){if(e){if("string"==typeof e)return yT(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return yT(e,t)}}var yI=function(e){var t,n=e.nodesData,r=yL(l.useState({}),2),i=r[0],a=r[1];l.useEffect(function(){var e=function(e){var t=!0,r=!1,i=void 0;try{for(var a,o=n[Symbol.iterator]();!(t=(a=o.next()).done);t=!0){var s=a.value;if(e===s.id)return s}}catch(u){r=!0,i=u}finally{try{t||null==o.return||o.return()}finally{if(r)throw i}}};if(n){var t={nodes:[],links:[]},r=[],i=[];n.map(function(e){t.nodes.push({id:e.id}),e.parentIds.map(function(n){t.links.push({source:n,target:e.id})}),r.push({id:e.id,width:90,height:40}),e.parentIds.map(function(t){i.push({id:"e".concat(e.id),sources:[e.id],targets:[t]})})});var o=function(t){var n,r=e(t.id);switch(null==r?void 0:null===(n=r.attributes)||void 0===n?void 0:n.status){case"COMPLETE":return l.createElement(g5,{className:"task-run-icon-success task-run-icon",id:"success-run-icon-".concat(t.id)});case"ERROR":return l.createElement(gZ,{className:"task-run-icon-error task-run-icon",id:"error-run-icon-".concat(t.id)});default:return l.createElement(g2,{className:"task-run-icon-pending task-run-icon",id:"pending-run-icon-".concat(t.id)})}};new(yx())().layout({id:"task-list-graph-d3",children:r,edges:i},{layoutOptions:{"elk.algorithm":"org.eclipse.elk.layered","elk.direction":"LEFT","elk.layered.nodePlacement.strategy":"SIMPLE","elk.layered.wrapping.strategy":"SINGLE_EDGE","elk.aspectRatio":"1.0f","org.eclipse.elk.padding":"[top=50, left=50, bottom=50, right=5]","elk.layered.spacing.edgeNodeBetweenLayers":"1","elk.zoomToFit":"TRUE","elk.layered.considerModelOrder.strategy":"PREFER_EDGES","elk.layered.unnecessaryBendpoints":"TRUE"}}).then(function(e){var n;t.nodes=[],null===(n=e.children)||void 0===n||n.map(function(e){e.x&&e.y&&t.nodes.push({id:e.id,x:"".concat(e.x),y:"".concat(e.y),viewGenerator:o,size:400})}),a(t)})}},[n]);var o=0;null===(t=i.nodes)||void 0===t||t.map(function(e){e.y&&o<parseInt(e.y,10)&&(o=parseInt(e.y,10))});var s={automaticRearrangeAfterDropNode:!1,collapsible:!1,directed:!0,disableLinkForce:!0,focusAnimationDuration:.75,focusZoom:1,height:o+50,highlightDegree:0,highlightOpacity:1,link:{color:"#d3d3d3",fontColor:"black",fontSize:12,fontWeight:"normal",highlightColor:"blue",highlightFontSize:8,highlightFontWeight:"bold",mouseCursor:"pointer",opacity:1,renderLabel:!1,strokeWidth:3,markerHeight:3,markerWidth:3},linkHighlightBehavior:!0,maxZoom:3,minZoom:.3,node:{color:"#d3d3d3",fontColor:"black",fontSize:14,fontWeight:"normal",highlightColor:"red",highlightFontSize:16,highlightFontWeight:"bold",highlightStrokeColor:"blue",labelProperty:"name",mouseCursor:"pointer",opacity:1,renderLabel:!0,strokeColor:"none",strokeWidth:2,labelPosition:"top"},nodeHighlightBehavior:!0,panAndZoom:!0,staticGraph:!0,width:"100%"},u=0,c=0,f=function(e){c=e.clientY,u=e.clientX};(0,l.useEffect)(function(){return window.addEventListener("mousemove",f),function(){window.removeEventListener("mousemove",f)}});var d=function(e){var t,n,r=document.getElementById("tooltip-d3-chart-".concat(e));if(r){var i=50,a=10;t=u+r.getBoundingClientRect().width+i>window.innerWidth?u-r.getBoundingClientRect().width-a:u+a,n=c+r.getBoundingClientRect().height+i>window.innerHeight?c-r.getBoundingClientRect().height-a:c+a,r.style.opacity=String(1),r.style.top="".concat(n,"px"),r.style.left="".concat(t,"px"),r.style.zIndex=String(1)}},h=function(e){var t=document.getElementById("tooltip-d3-chart-".concat(e));t&&(t.style.opacity=String(0),t.style.zIndex=String(-1))};return l.createElement("div",{style:{fontFamily:"sans-serif",fontWeight:"normal"}},l.createElement(y_.kJ,{id:"task-list-graph-d3",data:i,config:s,onMouseOverNode:d,onMouseOutNode:h},"D3 chart"),n.map(function(e){return l.createElement("div",{key:"d3-tooltip-key-".concat(e.id),id:"tooltip-d3-chart-".concat(e.id),style:{position:"absolute",opacity:"0",border:"1px solid rgba(0, 0, 0, 0.1)",padding:yS.r.spacing.unit,background:"white",borderRadius:5,zIndex:-1,inlineSize:"min-content"}},l.createElement(yE,{data:e}))}))};function yD(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function yN(e){if(Array.isArray(e))return e}function yP(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function yR(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function yj(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function yF(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){yP(e,t,n[t])})}return e}function yY(e,t){return yN(e)||yR(e,t)||yB(e,t)||yj()}function yB(e,t){if(e){if("string"==typeof e)return yD(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return yD(e,t)}}var yU=function(e){var t=e.attributes,n=e.observationSource,r=yY(l.useState(),2),i=r[0],a=r[1];return l.useEffect(function(){if(n&&""!==n)try{var e=yw("digraph {".concat(n,"}"));if(t)for(var r=0;r<e.length;r++){var i=e[r];t[i.id]&&(e[r].attributes=yF({},i.attributes,t[i.id]))}a({graph:e})}catch(o){a({errorMsg:"Failed to parse task graph"})}else a({errorMsg:"No Task Graph Found"})},[t,n,a]),l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"Task List",id:"graph-max-width"}),l.createElement(aK.Z,null,i&&i.errorMsg&&l.createElement(x.default,{align:"center",variant:"subtitle1"},i.errorMsg),i&&i.graph&&l.createElement(yI,{nodesData:i.graph})))},yH=5,y$=function(e){var t=e.spacing;return(0,b.createStyles)({runDetails:{paddingTop:2*t.unit,paddingBottom:2*t.unit,paddingLeft:2*t.unit}})},yz=(0,b.withStyles)(y$)(function(e){var t=e.classes,n=e.job,r=l.useMemo(function(){return n.runs.results.map(function(e){var t,n=e.allErrors,r=e.id,i=e.createdAt;return{id:r,createdAt:i,errors:n,finishedAt:e.finishedAt,status:e.status}})},[n.runs]);return l.createElement(d.Z,{container:!0,spacing:32},l.createElement(d.Z,{item:!0,xs:12,sm:6},l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"Recent job runs"}),l.createElement(yg,{runs:r}),n.runs.metadata.total>yH&&l.createElement("div",{className:t.runDetails},l.createElement(aL.Z,{href:"/jobs/".concat(n.id,"/runs"),component:tz},"View more")))),l.createElement(d.Z,{item:!0,xs:12,sm:6},l.createElement(yU,{observationSource:n.observationSource})))});function yG(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function yW(e){if(Array.isArray(e))return e}function yK(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function yV(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function yq(e,t){return yW(e)||yK(e,t)||yZ(e,t)||yV()}function yZ(e,t){if(e){if("string"==typeof e)return yG(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return yG(e,t)}}var yX=function(e){var t=e.fetchMore,n=e.job,r=(0,h.k6)(),i=(0,h.TH)(),a=new URLSearchParams(i.search),o=yq(l.useState({page:parseInt(a.get("page")||"1",10),pageSize:parseInt(a.get("size")||"10",10)}),2),s=o[0],u=s.page,c=s.pageSize,f=o[1];l.useEffect(function(){t(u,c)},[t,u,c]),l.useEffect(function(){r.replace({search:"?page=".concat(u,"&size=").concat(c)})},[r,u,c]);var d=l.useMemo(function(){return n.runs.results.map(function(e){var t,n=e.allErrors,r=e.id,i=e.createdAt;return{id:r,createdAt:i,errors:n,finishedAt:e.finishedAt,status:e.status}})},[n.runs]);return l.createElement(l.Fragment,null,l.createElement(r9.Z,null,l.createElement(yg,{runs:d}),l.createElement(ir.Z,{component:"div",count:n.runs.metadata.total,rowsPerPage:c,rowsPerPageOptions:[10,25,50,100],page:u-1,onChangePage:function(e,t){f({page:t+1,pageSize:c})},onChangeRowsPerPage:function(e){f({page:1,pageSize:parseInt(e.target.value,10)})},backIconButtonProps:{"aria-label":"prev-page"},nextIconButtonProps:{"aria-label":"next-page"}})))};function yJ(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function yQ(e){if(Array.isArray(e))return e}function y1(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function y0(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function y2(e,t){return yQ(e)||y1(e,t)||y4(e,t)||y0()}function y3(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function y4(e,t){if(e){if("string"==typeof e)return yJ(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return yJ(e,t)}}function y5(){var e=y3(["\n  fragment JobPayload_Spec on JobSpec {\n    ... on CronSpec {\n      schedule\n    }\n    ... on DirectRequestSpec {\n      contractAddress\n      evmChainID\n      minIncomingConfirmations\n      minContractPaymentLinkJuels\n      requesters\n    }\n    ... on FluxMonitorSpec {\n      absoluteThreshold\n      contractAddress\n      drumbeatEnabled\n      drumbeatRandomDelay\n      drumbeatSchedule\n      evmChainID\n      idleTimerDisabled\n      idleTimerPeriod\n      minPayment\n      pollTimerDisabled\n      pollTimerPeriod\n      threshold\n    }\n    ... on KeeperSpec {\n      contractAddress\n      evmChainID\n      fromAddress\n    }\n    ... on OCRSpec {\n      blockchainTimeout\n      contractAddress\n      contractConfigConfirmations\n      contractConfigTrackerPollInterval\n      contractConfigTrackerSubscribeInterval\n      evmChainID\n      isBootstrapPeer\n      keyBundleID\n      observationTimeout\n      p2pBootstrapPeers\n      p2pv2Bootstrappers\n      transmitterAddress\n    }\n    ... on OCR2Spec {\n      blockchainTimeout\n      contractID\n      contractConfigConfirmations\n      contractConfigTrackerPollInterval\n      ocrKeyBundleID\n      monitoringEndpoint\n      p2pv2Bootstrappers\n      relay\n      relayConfig\n      transmitterID\n      pluginType\n      pluginConfig\n      feedID\n    }\n    ... on VRFSpec {\n      evmChainID\n      gasLanePrice\n      coordinatorAddress\n      fromAddresses\n      minIncomingConfirmations\n      pollPeriod\n      publicKey\n      requestedConfsDelay\n      batchCoordinatorAddress\n      batchFulfillmentEnabled\n      batchFulfillmentGasMultiplier\n      chunkSize\n      requestTimeout\n      backoffInitialDelay\n      backoffMaxDelay\n      vrfOwnerAddress\n    }\n    ... on BlockhashStoreSpec {\n      coordinatorV1Address\n      coordinatorV2Address\n      waitBlocks\n      lookbackBlocks\n      blockhashStoreAddress\n      pollPeriod\n      runTimeout\n      evmChainID\n      fromAddresses\n      coordinatorV2PlusAddress\n      trustedBlockhashStoreAddress\n      trustedBlockhashStoreBatchSize\n    }\n    ... on BlockHeaderFeederSpec {\n      coordinatorV1Address\n      coordinatorV2Address\n      waitBlocks\n      lookbackBlocks\n      blockhashStoreAddress\n      batchBlockhashStoreAddress\n      pollPeriod\n      runTimeout\n      evmChainID\n      fromAddresses\n      getBlockhashesBatchSize\n      storeBlockhashesBatchSize\n      coordinatorV2PlusAddress\n    }\n    ... on BootstrapSpec {\n      contractID\n      relay\n      monitoringEndpoint\n      relayConfig\n      blockchainTimeout\n      contractConfigTrackerPollInterval\n      contractConfigConfirmations\n      createdAt\n    }\n    ... on GatewaySpec {\n      gatewayConfig\n      createdAt\n    }\n  }\n"]);return y5=function(){return e},e}function y6(){var e=y3(["\n  fragment JobPayload_RunsFields on JobRun {\n    id\n    allErrors\n    status\n    createdAt\n    finishedAt\n  }\n"]);return y6=function(){return e},e}function y9(){var e=y3(["\n  fragment JobPayload_ErrorsFields on JobError {\n    description\n    occurrences\n    createdAt\n    updatedAt\n  }\n"]);return y9=function(){return e},e}function y8(){var e=y3(["\n  ","\n  ","\n  ","\n  fragment JobPayload_Fields on Job {\n    id\n    name\n    externalJobID\n    observationSource\n    createdAt\n    schemaVersion\n    type\n    maxTaskDuration\n    gasLimit\n    forwardingAllowed\n    spec {\n      __typename\n      ...JobPayload_Spec\n    }\n    runs(offset: $offset, limit: $limit) {\n      results {\n        ...JobPayload_RunsFields\n      }\n      metadata {\n        total\n      }\n    }\n    errors {\n      ...JobPayload_ErrorsFields\n    }\n  }\n"]);return y8=function(){return e},e}var y7=n0(y5()),we=n0(y6()),wt=n0(y9()),wn=n0(y8(),y7,we,wt),wr=function(e){var t=e.job,n=e.runsCount,r=e.onDelete,i=e.onRun,a=e.refetch,o=e.refetchRecentRuns,s=(0,h.$B)().path,u=y2(l.useState(!1),2),c=u[0],f=u[1];return l.createElement(l.Fragment,null,l.createElement(iv,null,l.createElement(d.Z,{container:!0,spacing:32},l.createElement(d.Z,{item:!0,xs:9},l.createElement(iw,null,t.name||"--")),l.createElement(d.Z,{item:!0,xs:3,style:{textAlign:"right"}},"WebhookSpec"===t.spec.__typename&&l.createElement(aL.Z,{variant:"primary",onClick:function(){return f(!0)}},"Run"))),l.createElement(vZ,{job:t,onDelete:r}),l.createElement(v5,{id:t.id,errorsCount:t.errors.length,runsCount:n,refetchRecentRuns:o}),l.createElement(h.rs,null,l.createElement(h.AW,{path:"".concat(s,"/definition")},l.createElement(yh,{job:t})),l.createElement(h.AW,{exact:!0,path:"".concat(s,"/errors")},l.createElement(yp,{job:t})),l.createElement(h.AW,{exact:!0,path:"".concat(s,"/runs")},l.createElement(yX,{job:t,fetchMore:a})),l.createElement(h.AW,{exact:!0,path:s},l.createElement(yz,{job:t})))),l.createElement(yi,{open:c,onClose:function(){return f(!1)},onRun:i}))};function wi(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function wa(e){if(Array.isArray(e))return e}function wo(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function ws(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){wo(a,r,i,o,s,"next",e)}function s(e){wo(a,r,i,o,s,"throw",e)}o(void 0)})}}function wu(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function wc(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function wl(e,t){return wa(e)||wu(e,t)||wd(e,t)||wc()}function wf(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function wd(e,t){if(e){if("string"==typeof e)return wi(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return wi(e,t)}}var wh=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}};function wp(){var e=wf(["\n  ","\n  query FetchJob($id: ID!, $offset: Int, $limit: Int) {\n    job(id: $id) {\n      __typename\n      ... on Job {\n        ...JobPayload_Fields\n      }\n      ... on NotFoundError {\n        message\n      }\n    }\n  }\n"]);return wp=function(){return e},e}function wb(){var e=wf(["\n  mutation DeleteJob($id: ID!) {\n    deleteJob(id: $id) {\n      ... on DeleteJobSuccess {\n        job {\n          id\n        }\n      }\n      ... on NotFoundError {\n        message\n      }\n    }\n  }\n"]);return wb=function(){return e},e}var wm=5,wg=n0(wp(),wn),wv=n0(wb()),wy=function(e){var t=e.data;return l.createElement(l.Fragment,null,"Successfully created job run"," ",l.createElement(tz,{href:"/runs/".concat(t.id)},t.id))},ww=function(){var e=(0,h.UO)().id,t=(0,A.I0)(),n=(0,h.k6)(),r=(0,h.TH)().search,i=oZ().handleMutationError,a=l.useMemo(function(){return new URLSearchParams(r)},[]),o=parseInt(a.get("page")||"1",10),s=parseInt(a.get("per")||wm.toString(),10),u=ry(wg,{variables:{id:e,offset:(o-1)*s,limit:s},fetchPolicy:"network-only"}),c=u.data,f=u.loading,d=u.error,p=u.refetch,b=wl(os(wv),1)[0];if(f)return l.createElement(ij,null);if(d)return l.createElement(iN,{error:d});var m,g,v=(m=ws(function(){var r,a,o,s,u;return wh(this,function(c){switch(c.label){case 0:return c.trys.push([0,2,,3]),[4,b(((o={}).variables={id:e},o))];case 1:switch(null==(s=null===(r=(a=c.sent()).data)||void 0===r?void 0:r.deleteJob)?void 0:s.__typename){case"DeleteJobSuccess":n.push("/jobs"),setTimeout(function(){return t((0,ty.qt)("Successfully deleted job ".concat(e)))},200);break;case"NotFoundError":t((0,ty.LO)(s.message))}return[3,3];case 2:return i(u=c.sent()),[3,3];case 3:return[2]}})}),function(){return m.apply(this,arguments)}),y=(g=ws(function(n){return wh(this,function(r){switch(r.label){case 0:return[4,t((0,ty.tA)(e,n,wy,aP))];case 1:return r.sent(),p(),[2]}})}),function(e){return g.apply(this,arguments)}),w=function(e,t){p({offset:(e-1)*s,limit:t})},_=function(){p({offset:0,limit:wm})},E=null==c?void 0:c.job;switch(null==E?void 0:E.__typename){case"Job":return l.createElement(wr,{job:E,runsCount:E.runs.metadata.total,onDelete:v,onRun:y,refetch:w,refetchRecentRuns:_});case"NotFoundError":return l.createElement(oo,null);default:return null}},w_=(0,b.withStyles)(ic)(function(e){var t=e.job,n=e.classes;return l.createElement(ii.Z,{className:n.row,hover:!0},l.createElement(ie.default,{className:n.cell,component:"th",scope:"row"},l.createElement(ip,{className:n.link,href:"/jobs/".concat(t.id)},t.id)),l.createElement(ie.default,null,""!=t.name?t.name:"--"),l.createElement(ie.default,null,vM(t.spec.__typename)),l.createElement(ie.default,null,t.externalJobID),l.createElement(ie.default,null,l.createElement(aA,{tooltip:!0},t.createdAt)))});function wE(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function wS(e){if(Array.isArray(e))return e}function wk(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function wx(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function wT(e,t){return wS(e)||wk(e,t)||wO(e,t)||wx()}function wM(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function wO(e,t){if(e){if("string"==typeof e)return wE(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return wE(e,t)}}function wA(){var e=wM(["\n  fragment JobsPayload_ResultsFields on Job {\n    id\n    name\n    externalJobID\n    createdAt\n    spec {\n      __typename\n      ... on OCRSpec {\n        contractAddress\n        keyBundleID\n        transmitterAddress\n      }\n    }\n  }\n"]);return wA=function(){return e},e}var wL=n0(wA()),wC=function(e){var t=e.toLowerCase();return function(e){return e.toLowerCase().includes(t)}},wI=function(e){return function(t){return""===e||wD(t,e)}};function wD(e,t){var n=wC(t),r=[e.id,e.name||"",e.spec.__typename,e.externalJobID,],i=e.spec;return"OCRSpec"==i.__typename&&["contractAddress","keyBundleID","transmitterAddress",].forEach(function(e){r.push(String(i[e]))}),r.some(n)}var wN=function(e){var t=e.jobs,n=e.page,r=e.pageSize,i=e.total,a=(0,h.k6)(),o=wT(l.useState(""),2),s=o[0],u=o[1],c=l.useMemo(function(){return wI(s.trim())},[s]);return l.createElement(iv,null,l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:9},l.createElement(iw,null,"Jobs")),l.createElement(d.Z,{item:!0,xs:3},l.createElement(d.Z,{container:!0,justify:"flex-end"},l.createElement(d.Z,{item:!0},l.createElement(aL.Z,{variant:"secondary",component:tz,href:"/jobs/new"},"New Job")))),l.createElement(d.Z,{item:!0,xs:12},l.createElement(iS,{value:s,onChange:u,placeholder:"Search jobs"}),l.createElement(r9.Z,null,l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,"ID"),l.createElement(ie.default,null,"Name"),l.createElement(ie.default,null,"Type"),l.createElement(ie.default,null,"External Job ID"),l.createElement(ie.default,null,"Created"))),l.createElement(r7.Z,null,0===t.length&&l.createElement(ii.Z,null,l.createElement(ie.default,{component:"th",scope:"row",colSpan:3},"You haven’t created any jobs yet. Create a new job"," ",l.createElement(ip,{href:"/jobs/new"},"here"))),t.filter(c).map(function(e){return l.createElement(w_,{key:e.id,job:e})}))),l.createElement(ir.Z,{component:"div",count:i,rowsPerPage:r,rowsPerPageOptions:[r],page:n-1,onChangePage:function(e,t){a.push("/jobs?page=".concat(t+1,"&per=").concat(r))},onChangeRowsPerPage:function(){},backIconButtonProps:{"aria-label":"prev-page"},nextIconButtonProps:{"aria-label":"next-page"}})))))};function wP(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function wR(){var e=wP(["\n  ","\n  query FetchJobs($offset: Int, $limit: Int) {\n    jobs(offset: $offset, limit: $limit) {\n      results {\n        ...JobsPayload_ResultsFields\n      }\n      metadata {\n        total\n      }\n    }\n  }\n"]);return wR=function(){return e},e}var wj=n0(wR(),wL),wF=function(){var e=iF(),t=parseInt(e.get("page")||"1",10),n=parseInt(e.get("per")||"1000",10),r=ry(wj,{variables:{offset:(t-1)*n,limit:n},fetchPolicy:"network-only"}),i=r.data,a=r.loading,o=r.error;return a?l.createElement(ij,null):o?l.createElement(iN,{error:o}):i?l.createElement(wN,{jobs:i.jobs.results,page:t,pageSize:n,total:i.jobs.metadata.total}):null},wY=["refetch","reobserve","fetchMore","updateQuery","startPolling","subscribeToMore",];function wB(e,t){var n,r=(0,l.useRef)(),i=(0,l.useRef)(),a=(0,l.useRef)(),o=r.current?(0,ro.J)(t,r.current):t,s=null!==(n=null==o?void 0:o.query)&&void 0!==n?n:e;i.current=o,a.current=s;var u=rw(rp(t&&t.client),s),c=u.useQuery((0,n8.pi)((0,n8.pi)({},o),{skip:!r.current})),f=c.observable.options.initialFetchPolicy||u.getDefaultFetchPolicy(),d=Object.assign(c,{called:!!r.current}),h=(0,l.useMemo)(function(){for(var e={},t=function(t){var n=d[t];e[t]=function(){return r.current||(r.current=Object.create(null),u.forceUpdate()),n.apply(this,arguments)}},n=0,i=wY;n<i.length;n++)t(i[n]);return e},[]);return Object.assign(d,h),[(0,l.useCallback)(function(e){r.current=e?(0,n8.pi)((0,n8.pi)({},e),{fetchPolicy:e.fetchPolicy||f}):{fetchPolicy:f};var t=(0,ro.J)(i.current,(0,n8.pi)({query:a.current},r.current)),n=u.executeQuery((0,n8.pi)((0,n8.pi)({},t),{skip:!1})).then(function(e){return Object.assign(e,h)});return n.catch(function(){}),n},[]),d]}function wU(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function wH(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){wU(e,t,n[t])})}return e}function w$(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),n.push.apply(n,r)}return n}function wz(e,t){return t=null!=t?t:{},Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):w$(Object(t)).forEach(function(n){Object.defineProperty(e,n,Object.getOwnPropertyDescriptor(t,n))}),e}var wG=function(e){return e.errors.reduce(function(e,t){var n=t.path.replace(/^input\//,"");return wz(wH({},e),wU({},n,t.message))},{})},wW=n(23279),wK=n.n(wW),wV=by().shape({toml:p2().required("Required").test("toml","Invalid TOML",function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";try{return vO.parse(e),!0}catch(t){return!1}})}),wq=function(e){var t=e.initialValues,n=e.onSubmit,r=e.onTOMLChange;return l.createElement(hM,{initialValues:t,validationSchema:wV,onSubmit:n},function(e){var t=e.isSubmitting,n=e.values;return r&&r(n.toml),l.createElement(hj,{"data-testid":"job-form",noValidate:!0},l.createElement(d.Z,{container:!0,spacing:16},l.createElement(d.Z,{item:!0,xs:12},l.createElement(hR,{component:hJ,id:"toml",name:"toml",label:"Job Spec (TOML)",required:!0,fullWidth:!0,multiline:!0,rows:10,rowsMax:25,variant:"outlined",autoComplete:"off",FormHelperTextProps:{"data-testid":"toml-helper-text"}})),l.createElement(d.Z,{item:!0,xs:12,md:7},l.createElement(ox.default,{variant:"contained",color:"primary",type:"submit",disabled:t,size:"large"},"Create Job"))))})},wZ=n(50109),wX="persistSpec";function wJ(e){var t=e.query,n=new URLSearchParams(t).get("definition");return n?(wZ.t8(wX,n),{toml:n}):{toml:wZ.U2(wX)||""}}var wQ=function(e){var t=e.onSubmit,n=e.onTOMLChange,r=wJ({query:(0,h.TH)().search}),i=function(e){var t=e.replace(/[\u200B-\u200D\uFEFF]/g,"");wZ.t8("".concat(wX),t),n&&n(t)};return l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"New Job"}),l.createElement(aK.Z,null,l.createElement(wq,{initialValues:r,onSubmit:t,onTOMLChange:i})))};function w1(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function w0(e){if(Array.isArray(e))return e}function w2(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function w3(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function w4(e,t){return w0(e)||w2(e,t)||w5(e,t)||w3()}function w5(e,t){if(e){if("string"==typeof e)return w1(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return w1(e,t)}}var w6=function(e){var t=e.toml,n=w4(l.useState(""),2),r=n[0],i=n[1];return l.useEffect(function(){try{var e=vO.parse(t);e.observationSource?i(e.observationSource.trim()):i("")}catch(n){i("")}},[t]),l.createElement(yU,{observationSource:r})};function w9(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function w8(e){if(Array.isArray(e))return e}function w7(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function _e(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _t(e,t){return w8(e)||w7(e,t)||_n(e,t)||_e()}function _n(e,t){if(e){if("string"==typeof e)return w9(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return w9(e,t)}}var _r=function(e){var t=e.onSubmit,n=_t(l.useState(""),2),r=n[0],i=n[1],a=l.useCallback(function(e){return wK()(function(){return i(e)},500)()},[i]);return l.createElement(iv,null,l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12,md:8},l.createElement(wQ,{onSubmit:t,onTOMLChange:a})),l.createElement(d.Z,{item:!0,xs:12,md:4},l.createElement(w6,{toml:r}))))};function _i(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function _a(e){if(Array.isArray(e))return e}function _o(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function _s(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){_o(a,r,i,o,s,"next",e)}function s(e){_o(a,r,i,o,s,"throw",e)}o(void 0)})}}function _u(e,t){return null!=t&&"undefined"!=typeof Symbol&&t[Symbol.hasInstance]?!!t[Symbol.hasInstance](e):e instanceof t}function _c(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function _l(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _f(e,t){return _a(e)||_c(e,t)||_h(e,t)||_l()}function _d(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function _h(e,t){if(e){if("string"==typeof e)return _i(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return _i(e,t)}}var _p=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}};function _b(){var e=_d(["\n  mutation CreateJob($input: CreateJobInput!) {\n    createJob(input: $input) {\n      ... on CreateJobSuccess {\n        job {\n          id\n        }\n      }\n      ... on InputErrors {\n        errors {\n          path\n          message\n          code\n        }\n      }\n    }\n  }\n"]);return _b=function(){return e},e}var _m=n0(_b()),_g=function(e){var t=e.id;return l.createElement(l.Fragment,null,"Successfully created job"," ",l.createElement(tz,{id:"created-job",href:"/jobs/".concat(t)},t))},_v=function(){var e,t=(0,A.I0)(),n=oZ().handleMutationError,r=_f(os(_m),1)[0],i=_f(wB(wj,{variables:{offset:0,limit:1e3},fetchPolicy:"network-only"}),1)[0],a=(e=_s(function(e,a){var o,s,u,c,l,f,d,h,p,b,m,g,v,y,w;return _p(this,function(_){switch(_.label){case 0:return o=a.setErrors,[4,i()];case 1:s=_.sent(),_.label=2;case 2:return _.trys.push([2,4,,6]),[4,r(((l={}).variables={input:{TOML:e.toml}},l))];case 3:switch(f=null===(u=(c=_.sent()).data)||void 0===u?void 0:u.createJob,d={},null==f?void 0:f.__typename){case"CreateJobSuccess":t((0,ty.t5)(_g,(d.id=f.job.id,d)));break;case"InputErrors":t((0,ty.LO)("Invalid Input")),o(wG(f))}return[3,6];case 4:return h=_.sent(),[4,i()];case 5:return v=_.sent(),y=null===(p=s.data)||void 0===p?void 0:null===(b=p.jobs)||void 0===b?void 0:b.results,w=null===(m=v.data)||void 0===m?void 0:null===(g=m.jobs)||void 0===g?void 0:g.results,y&&w&&y.length<w.length&&_u(h,ru.cA)?t((0,ty.LO)("Job successfully created but could not start service: "+h.message)):n(h),[3,6];case 6:return[2]}})}),function(t,n){return e.apply(this,arguments)});return l.createElement(_r,{onSubmit:a})},_y=function(){var e=(0,h.$B)().path;return l.createElement(h.rs,null,l.createElement(h.AW,{path:"".concat(e,"/new")},l.createElement(_v,null)),l.createElement(h.AW,{path:"".concat(e,"/:id")},l.createElement(ww,null)),l.createElement(h.AW,{exact:!0,path:e},l.createElement(wF,null)))},_w=n(83173);function __(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function _E(e){if(Array.isArray(e))return e}function _S(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function _k(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _x(e,t){return _E(e)||_S(e,t)||_T(e,t)||_k()}function _T(e,t){if(e){if("string"==typeof e)return __(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return __(e,t)}}var _M=function(e){return(0,b.createStyles)({button:{width:27,height:27,minHeight:27,marginLeft:e.spacing.unit,marginRight:e.spacing.unit},icon:{fontSize:18}})},_O=(0,b.withStyles)(_M)(function(e){var t=e.classes,n=e.data,r=_x(l.useState(!1),2),i=r[0],a=r[1];return l.createElement(ya.CopyToClipboard,{text:n,onCopy:function(){return a(!0)}},l.createElement(aE.Z,{title:"Copied!",open:i,onClose:function(){return a(!1)}},l.createElement(y.default,{className:t.button},l.createElement(_w.Z,{className:t.icon}))))});function _A(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=t.start,r=void 0===n?6:n,i=t.end,a=void 0===i?4:i;return e.substring(0,r)+"..."+e.substring(e.length-a)}function _L(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function _C(e){if(Array.isArray(e))return e}function _I(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function _D(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){_I(a,r,i,o,s,"next",e)}function s(e){_I(a,r,i,o,s,"throw",e)}o(void 0)})}}function _N(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function _P(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _R(e,t){return _C(e)||_N(e,t)||_j(e,t)||_P()}function _j(e,t){if(e){if("string"==typeof e)return _L(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return _L(e,t)}}var _F=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}},_Y=function(e){return(0,b.createStyles)({container:{backgroundColor:e.palette.common.white,padding:5*e.spacing.unit,paddingBottom:0},chainId:{overflow:"hidden",textOverflow:"ellipsis"},badgePadding:{paddingLeft:2*e.spacing.unit,paddingRight:2*e.spacing.unit,marginLeft:-2*e.spacing.unit,marginRight:-2*e.spacing.unit,lineHeight:"1rem"},dialogPaper:{minHeight:"360px",maxHeight:"360px",minWidth:"670px",maxWidth:"670px",overflow:"hidden",borderRadius:3*e.spacing.unit},warningText:{fontWeight:500,marginLeft:3*e.spacing.unit,marginTop:3*e.spacing.unit,marginBottom:e.spacing.unit},closeButton:{marginRight:3*e.spacing.unit,marginTop:3*e.spacing.unit},infoText:{fontSize:2*e.spacing.unit,fontWeight:450,marginLeft:6*e.spacing.unit},modalContent:{width:"inherit"},deleteButton:{marginTop:4*e.spacing.unit},runJobButton:{marginBottom:3*e.spacing.unit},runJobModalContent:{overflow:"hidden"}})};function _B(e){var t,n=e.evmChainID,r=e.address,i=e.nextNonce,a={evmChainID:n,address:r,nextNonce:i,abandon:e.abandon,enabled:e.enabled};return iW.v2.evmKeys.chain(a)}var _U=function(){return l.createElement(l.Fragment,null,"Successfully updated EVM key")},_H=function(e){var t=e.classes,n=e.ethKey,r=e.refetch,i=(0,A.I0)(),a=_R((0,l.useState)(!1),2),o=a[0],s=a[1],u=_R((0,l.useState)(!n.isDisabled),2),c=u[0],f=u[1],h=_R((0,l.useState)(null),2),p=h[0],b=h[1],m=_R((0,l.useState)(!1),2),g=m[0],v=m[1],y=function(e){e.preventDefault(),k(p,g,c)},w=function(){f(!c)},_=function(e){b(e.target.value)},E=function(){v(!g)},S=function(){s(!1),v(!1),b(null),f(!n.isDisabled)};function k(e,t,n){return T.apply(this,arguments)}function T(){return(T=_D(function(e,t,a){var o;return _F(this,function(s){return _B(((o={}).evmChainID=n.chain.id,o.address=n.address,o.nextNonce=e,o.abandon=t,o.enabled=a,o)).then(function(e){var t=e.data;r&&r(),S(),i((0,ty.t5)(_U,t))}).catch(function(e){r&&r(),S(),i((0,ty.cB)(aP,e))}),[2]})})).apply(this,arguments)}return l.createElement(l.Fragment,null,l.createElement(aN.Z,{open:o,classes:{paper:t.dialogPaper},onClose:S,"aria-labelledby":"modal-modal-title","aria-describedby":"modal-modal-description"},l.createElement("form",{onSubmit:y},l.createElement(d.Z,{container:!0,spacing:0},l.createElement(d.Z,{item:!0,className:t.modalContent},l.createElement(d.Z,{container:!0,alignItems:"baseline",justify:"space-between"},l.createElement(d.Z,{item:!0},l.createElement(x.default,{variant:"h5",color:"secondary",className:t.warningText},"Key Admin Override"),l.createElement(x.default,{variant:"h6",color:"secondary",className:t.warningText},"Modifying key ",n.address," for chain ",n.chain.id)),l.createElement(d.Z,{item:!0},l.createElement(aD,{className:t.closeButton,onClick:S}))),l.createElement(d.Z,{container:!0,direction:"column"},l.createElement(b7.default,null,l.createElement(hG.Z,{className:t.infoText,color:"secondary",control:l.createElement(hz.Z,{name:"enabledCheckbox",checked:c,onChange:w}),label:"Enabled"})),l.createElement(b7.default,null,l.createElement(hG.Z,{className:t.infoText,color:"secondary",control:l.createElement(i_.Z,{name:"nextNonceField",type:"number",onChange:_}),label:"Next nonce manual override (optional)"})),l.createElement(b7.default,null,l.createElement(hG.Z,{className:t.infoText,color:"secondary",control:l.createElement(hz.Z,{name:"abandonCheckbox",checked:g,onChange:E}),label:"Abandon all current transactions (use with caution!)"})),l.createElement(d.Z,{container:!0,spacing:0,alignItems:"center",justify:"center"},l.createElement(d.Z,{item:!0,className:t.deleteButton},l.createElement(aL.Z,{variant:"danger",type:"submit"},"Update")))))))),l.createElement(ii.Z,{hover:!0},l.createElement(ie.default,null,l.createElement(x.default,{variant:"body1"},_A(n.address,{start:6,end:6})," ",l.createElement(_O,{data:n.address}))),l.createElement(ie.default,null,l.createElement(x.default,{variant:"body1"},n.chain.id)),l.createElement(ie.default,null,l.createElement(x.default,{variant:"body1"},n.isDisabled?"Disabled":"Enabled")),l.createElement(ie.default,null,l.createElement(x.default,{variant:"body1"},n.linkBalance&&gD(n.linkBalance))),l.createElement(ie.default,null,l.createElement(x.default,{variant:"body1"},n.ethBalance)),l.createElement(ie.default,null,l.createElement(x.default,{variant:"body1"},l.createElement(aA,{tooltip:!0},n.createdAt))),l.createElement(ie.default,null,l.createElement(x.default,{variant:"body1"},l.createElement(aL.Z,{onClick:function(){return s(!0)}},"Admin")))))},_$=(0,b.withStyles)(_Y)(_H),_z=function(e){var t,n,r=e.data,i=e.errorMsg,a=e.loading,o=e.refetch;return l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"EVM Chain Accounts"}),l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,"Address"),l.createElement(ie.default,null,"Chain ID"),l.createElement(ie.default,null,"Enabled"),l.createElement(ie.default,null,"LINK Balance"),l.createElement(ie.default,null,"Native Token Balance"),l.createElement(ie.default,null,"Created"),l.createElement(ie.default,null,"Actions"))),l.createElement(r7.Z,null,l.createElement(gW,{visible:a}),l.createElement(gK,{visible:(null===(t=null==r?void 0:r.ethKeys.results)||void 0===t?void 0:t.length)===0}),l.createElement(gz,{msg:i}),null===(n=null==r?void 0:r.ethKeys.results)||void 0===n?void 0:n.map(function(e,t){return l.createElement(_$,{ethKey:e,key:t,refetch:o})}))))};function _G(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function _W(){var e=_G(["\n  fragment ETHKeysPayload_ResultsFields on EthKey {\n    address\n    chain {\n      id\n    }\n    createdAt\n    ethBalance\n    isDisabled\n    linkBalance\n  }\n"]);return _W=function(){return e},e}function _K(){var e=_G(["\n  ","\n  query FetchETHKeys {\n    ethKeys {\n      results {\n        ...ETHKeysPayload_ResultsFields\n      }\n    }\n  }\n"]);return _K=function(){return e},e}var _V=n0(_W()),_q=n0(_K(),_V),_Z=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return ry(_q,e)},_X=function(){var e=_Z({fetchPolicy:"cache-and-network"}),t=e.data,n=e.loading,r=e.error,i=e.refetch;return l.createElement(_z,{loading:n,data:t,errorMsg:null==r?void 0:r.message,refetch:i})},_J=function(e){var t=e.csaKey;return l.createElement(ii.Z,{hover:!0},l.createElement(ie.default,null,l.createElement(x.default,{variant:"body1"},t.publicKey," ",l.createElement(_O,{data:t.publicKey}))))};function _Q(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function _1(){var e=_Q(["\n  fragment CSAKeysPayload_ResultsFields on CSAKey {\n    id\n    publicKey\n  }\n"]);return _1=function(){return e},e}var _0=n0(_1()),_2=function(e){var t,n,r,i=e.data,a=e.errorMsg,o=e.loading,s=e.onCreate;return l.createElement(r9.Z,null,l.createElement(sf.Z,{action:(null===(t=null==i?void 0:i.csaKeys.results)||void 0===t?void 0:t.length)===0&&l.createElement(ox.default,{variant:"outlined",color:"primary",onClick:s},"New CSA Key"),title:"CSA Key",subheader:"Manage your CSA Key"}),l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,"Public Key"))),l.createElement(r7.Z,null,l.createElement(gW,{visible:o}),l.createElement(gK,{visible:(null===(n=null==i?void 0:i.csaKeys.results)||void 0===n?void 0:n.length)===0}),l.createElement(gz,{msg:a}),null===(r=null==i?void 0:i.csaKeys.results)||void 0===r?void 0:r.map(function(e,t){return l.createElement(_J,{csaKey:e,key:t})}))))};function _3(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function _4(e){if(Array.isArray(e))return e}function _5(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function _6(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){_5(a,r,i,o,s,"next",e)}function s(e){_5(a,r,i,o,s,"throw",e)}o(void 0)})}}function _9(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function _8(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _7(e,t){return _4(e)||_9(e,t)||Et(e,t)||_8()}function Ee(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function Et(e,t){if(e){if("string"==typeof e)return _3(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return _3(e,t)}}var En=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}};function Er(){var e=Ee(["\n  ","\n  query FetchCSAKeys {\n    csaKeys {\n      results {\n        ...CSAKeysPayload_ResultsFields\n      }\n    }\n  }\n"]);return Er=function(){return e},e}function Ei(){var e=Ee(["\n  mutation CreateCSAKey {\n    createCSAKey {\n      ... on CreateCSAKeySuccess {\n        csaKey {\n          id\n        }\n      }\n      ... on CSAKeyExistsError {\n        message\n      }\n    }\n  }\n"]);return Ei=function(){return e},e}var Ea=n0(Er(),_0),Eo=n0(Ei()),Es=function(){var e,t=(0,A.I0)(),n=oZ().handleMutationError,r=ry(Ea,{fetchPolicy:"network-only"}),i=r.data,a=r.loading,o=r.error,s=r.refetch,u=_7(os(Eo),1)[0],c=(e=_6(function(){var e,r,i,a;return En(this,function(o){switch(o.label){case 0:return o.trys.push([0,2,,3]),[4,u()];case 1:return(null==(i=null===(e=(r=o.sent()).data)||void 0===e?void 0:e.createCSAKey)?void 0:i.__typename)==="CreateCSAKeySuccess"&&(t((0,ty.qt)("CSA Key created")),s()),[3,3];case 2:return n(a=o.sent()),[3,3];case 3:return[2]}})}),function(){return e.apply(this,arguments)});return l.createElement(_2,{loading:a,data:i,errorMsg:null==o?void 0:o.message,onCreate:c})},Eu=function(e){var t=e.keyType,n=e.keyValue;return(0,ty.qt)("Successfully created ".concat(t,": ").concat(n))},Ec=function(e){var t=e.keyType;return(0,ty.qt)("Successfully deleted ".concat(t," Key"))},El=n(10632),Ef=n(90338),Ed=n(34064),Eh=function(e){return(0,b.createStyles)({listItemPrimary:{marginBottom:e.spacing.unit},listItemSecondary:{color:e.palette.grey[600]},avatar:{backgroundColor:e.palette.primary.main}})},Ep=(0,b.withStyles)(Eh)(function(e){var t=e.classes,n=e.primary,r=e.secondary;return l.createElement(w.default,{dense:!0},l.createElement(_.default,null,l.createElement(ol.Z,null,l.createElement(Ef.Z,{className:t.avatar},l.createElement(Ed.Z,null))),l.createElement(E.Z,{primary:l.createElement(x.default,{className:t.listItemPrimary,variant:"body1",component:"span"},n),secondary:r.map(function(e,n){return l.createElement(x.default,{key:n,className:t.listItemSecondary,variant:"subtitle2",component:"span"},e)})})))}),Eb=function(e){var t=e.bundle,n=e.onDelete;return l.createElement(ii.Z,{hover:!0},l.createElement(ie.default,null,l.createElement(Ep,{primary:l.createElement("b",null,"Key ID: ",t.id," ",l.createElement(_O,{data:t.id})),secondary:[l.createElement(l.Fragment,null,"Config Public Key: ",t.configPublicKey),l.createElement(l.Fragment,null,"Signing Address: ",t.onChainSigningAddress),l.createElement(l.Fragment,null,"Off-Chain Public Key: ",t.offChainPublicKey),]})),l.createElement(ie.default,{align:"right"},l.createElement(aL.Z,{onClick:n,variant:"danger",size:"medium"},"Delete")))};function Em(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function Eg(e){if(Array.isArray(e))return e}function Ev(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function Ey(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){Ev(a,r,i,o,s,"next",e)}function s(e){Ev(a,r,i,o,s,"throw",e)}o(void 0)})}}function Ew(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function E_(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function EE(e,t){return Eg(e)||Ew(e,t)||ES(e,t)||E_()}function ES(e,t){if(e){if("string"==typeof e)return Em(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return Em(e,t)}}var Ek=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}},Ex=function(e){var t,n,r=e.data,i=e.errorMsg,a=e.loading,o=e.onCreate,s=e.onDelete,u=EE(l.useState(null),2),c=u[0],f=u[1];return l.createElement(l.Fragment,null,l.createElement(r9.Z,null,l.createElement(sf.Z,{action:l.createElement(ox.default,{variant:"outlined",color:"primary",onClick:o},"New OCR Key"),title:"Off-Chain Reporting Keys",subheader:"Manage your Off-Chain Reporting Key Bundles"}),l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,"Key Bundle"),l.createElement(ie.default,{align:"right"}))),l.createElement(r7.Z,null,l.createElement(gW,{visible:a}),l.createElement(gK,{visible:(null===(t=null==r?void 0:r.ocrKeyBundles.results)||void 0===t?void 0:t.length)===0}),l.createElement(gz,{msg:i}),null===(n=null==r?void 0:r.ocrKeyBundles.results)||void 0===n?void 0:n.map(function(e,t){return l.createElement(Eb,{bundle:e,key:t,onDelete:function(){return f(e.id)}})})))),l.createElement(oI,{open:!!c,maxWidth:!1,title:"Delete OCR Key Bundle",body:l.createElement(El.Z,{label:c}),confirmButtonText:"Confirm",onConfirm:Ey(function(){return Ek(this,function(e){switch(e.label){case 0:if(!c)return[3,2];return[4,s(c)];case 1:e.sent(),f(null),e.label=2;case 2:return[2]}})}),cancelButtonText:"Cancel",onCancel:function(){return f(null)}}))};function ET(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function EM(){var e=ET(["\n  fragment OCRKeyBundlesPayload_ResultsFields on OCRKeyBundle {\n    id\n    configPublicKey\n    offChainPublicKey\n    onChainSigningAddress\n  }\n"]);return EM=function(){return e},e}function EO(){var e=ET(["\n  ","\n  query FetchOCRKeyBundles {\n    ocrKeyBundles {\n      results {\n        ...OCRKeyBundlesPayload_ResultsFields\n      }\n    }\n  }\n"]);return EO=function(){return e},e}var EA=n0(EM()),EL=n0(EO(),EA),EC=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return ry(EL,e)};function EI(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function ED(e){if(Array.isArray(e))return e}function EN(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function EP(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){EN(a,r,i,o,s,"next",e)}function s(e){EN(a,r,i,o,s,"throw",e)}o(void 0)})}}function ER(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function Ej(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function EF(e,t){return ED(e)||ER(e,t)||EB(e,t)||Ej()}function EY(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function EB(e,t){if(e){if("string"==typeof e)return EI(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return EI(e,t)}}var EU=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}};function EH(){var e=EY(["\n  mutation CreateOCRKeyBundle {\n    createOCRKeyBundle {\n      ... on CreateOCRKeyBundleSuccess {\n        bundle {\n          id\n        }\n      }\n    }\n  }\n"]);return EH=function(){return e},e}function E$(){var e=EY(["\n  mutation DeleteOCRKeyBundle($id: ID!) {\n    deleteOCRKeyBundle(id: $id) {\n      ... on DeleteOCRKeyBundleSuccess {\n        bundle {\n          id\n        }\n      }\n    }\n  }\n"]);return E$=function(){return e},e}var Ez=n0(EH()),EG=n0(E$()),EW=function(){var e,t,n=(0,A.I0)(),r=oZ().handleMutationError,i=EC({fetchPolicy:"network-only"}),a=i.data,o=i.loading,s=i.error,u=i.refetch,c=EF(os(Ez),1)[0],f=EF(os(EG),1)[0],d=(e=EP(function(){var e,t,i,a,o;return EU(this,function(s){switch(s.label){case 0:return s.trys.push([0,2,,3]),[4,c()];case 1:return i=null===(e=(t=s.sent()).data)||void 0===e?void 0:e.createOCRKeyBundle,a={},(null==i?void 0:i.__typename)==="CreateOCRKeyBundleSuccess"&&(n(Eu((a.keyType="Off-ChainReporting Key Bundle",a.keyValue=i.bundle.id,a))),u()),[3,3];case 2:return r(o=s.sent()),[3,3];case 3:return[2]}})}),function(){return e.apply(this,arguments)}),h=(t=EP(function(e){var t,i,a,o,s,c;return EU(this,function(l){switch(l.label){case 0:return l.trys.push([0,2,,3]),[4,f(((a={}).variables={id:e},a))];case 1:return o=null===(t=(i=l.sent()).data)||void 0===t?void 0:t.deleteOCRKeyBundle,s={},(null==o?void 0:o.__typename)==="DeleteOCRKeyBundleSuccess"&&(n(Ec((s.keyType="Off-ChainReporting Key Bundle",s))),u()),[3,3];case 2:return r(c=l.sent()),[3,3];case 3:return[2]}})}),function(e){return t.apply(this,arguments)});return l.createElement(Ex,{loading:o,data:a,errorMsg:null==s?void 0:s.message,onCreate:d,onDelete:h})},EK=function(e){var t=e.bundle,n=e.onDelete;return l.createElement(ii.Z,{hover:!0},l.createElement(ie.default,null,l.createElement(Ep,{primary:l.createElement("b",null,"Key ID: ",t.id," ",l.createElement(_O,{data:t.id})),secondary:[l.createElement(l.Fragment,null,"Chain Type: ",t.chainType),l.createElement(l.Fragment,null,"Config Public Key: ",t.configPublicKey),l.createElement(l.Fragment,null,"On-Chain Public Key: ",t.onChainPublicKey),l.createElement(l.Fragment,null,"Off-Chain Public Key: ",t.offChainPublicKey),]})),l.createElement(ie.default,{align:"right"},l.createElement(aL.Z,{onClick:n,variant:"danger",size:"medium"},"Delete")))};function EV(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function Eq(){var e=EV(["\n  fragment OCR2KeyBundlesPayload_ResultsFields on OCR2KeyBundle {\n    id\n    chainType\n    configPublicKey\n    onChainPublicKey\n    offChainPublicKey\n  }\n"]);return Eq=function(){return e},e}function EZ(){var e=EV(["\n  ","\n  query FetchOCR2KeyBundles {\n    ocr2KeyBundles {\n      results {\n        ...OCR2KeyBundlesPayload_ResultsFields\n      }\n    }\n  }\n"]);return EZ=function(){return e},e}function EX(){var e=EV(["\n  mutation DeleteOCR2KeyBundle($id: ID!) {\n    deleteOCR2KeyBundle(id: $id) {\n      ... on DeleteOCR2KeyBundleSuccess {\n        bundle {\n          id\n        }\n      }\n    }\n  }\n"]);return EX=function(){return e},e}function EJ(){var e=EV(["\n  mutation createOCR2KeyBundle($chainType: OCR2ChainType!) {\n    createOCR2KeyBundle(chainType: $chainType) {\n      ... on CreateOCR2KeyBundleSuccess {\n        bundle {\n          chainType\n          configPublicKey\n          id\n          offChainPublicKey\n          onChainPublicKey\n        }\n      }\n    }\n  }\n"]);return EJ=function(){return e},e}function EQ(){var e=EV(['\n  query GetChainFamily {\n    __type(name: "OCR2ChainType") {\n      enumValues {\n        name\n      }\n    }\n  }\n']);return EQ=function(){return e},e}var E1=n0(Eq()),E0=n0(EZ(),E1),E2=n0(EX()),E3=n0(EJ()),E4=n0(EQ()),E5=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return ry(E0,e)},E6=function(){return os(E2)},E9=function(){return os(E3)},E8=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return ry(E4,e)};function E7(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function Se(e){if(Array.isArray(e))return e}function St(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function Sn(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function Sr(e,t){return Se(e)||St(e,t)||Si(e,t)||Sn()}function Si(e,t){if(e){if("string"==typeof e)return E7(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return E7(e,t)}}var Sa=function(e){var t=e.showCreateKeyDialog,n=e.setToggleCreateKeyDialog,r=e.onCreate,i=Sr(l.useState(void 0),2),a=i[0],o=i[1],s=E8(),u=s.loading,c=s.error,f=s.data;if(u||c)return l.createElement("div",null);var d=function(e){o(e.target.value)},h=function(){n(!1),void 0!=a&&r(a)},p=null==f?void 0:f.__type.enumValues.map(function(e){return e.name});return a||o(p[0]),l.createElement(oI,{open:t,maxWidth:!1,title:"Create OCR2 Key Bundle",body:l.createElement(i_.Z,{id:"ocr2-create-key",name:"ocr2 create key",fullWidth:!0,select:!0,label:"Chain type",value:a,onChange:d,helperText:"Create OCR2 Key bundle"},null==p?void 0:p.map(function(e){return l.createElement(tE.default,{key:e,value:e,name:e},e)})),confirmButtonText:"Create",confirmButtonEnabled:!a,onConfirm:h,cancelButtonText:"Cancel",onCancel:function(){return n(!1)}})};function So(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function Ss(e){if(Array.isArray(e))return e}function Su(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function Sc(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){Su(a,r,i,o,s,"next",e)}function s(e){Su(a,r,i,o,s,"throw",e)}o(void 0)})}}function Sl(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function Sf(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function Sd(e,t){return Ss(e)||Sl(e,t)||Sh(e,t)||Sf()}function Sh(e,t){if(e){if("string"==typeof e)return So(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return So(e,t)}}var Sp=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}},Sb=function(e){var t,n,r=e.data,i=e.loading,a=e.onDelete,o=e.onCreate,s=Sd(l.useState(null),2),u=s[0],c=s[1],f=Sd(l.useState(!1),2),d=f[0],h=f[1];return l.createElement(l.Fragment,null,l.createElement(r9.Z,null,l.createElement(sf.Z,{action:l.createElement(ox.default,{variant:"outlined",color:"primary",onClick:function(){return h(!0)}},"New OCR2 Key"),title:"Off-Chain Reporting 2 Keys",subheader:"Manage your Off-Chain Reporting 2 Key Bundles"}),l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,"Key Bundle"),l.createElement(ie.default,{align:"right"}))),l.createElement(r7.Z,null,l.createElement(gW,{visible:i}),l.createElement(gK,{visible:(null===(t=null==r?void 0:r.ocr2KeyBundles.results)||void 0===t?void 0:t.length)===0}),null===(n=null==r?void 0:r.ocr2KeyBundles.results)||void 0===n?void 0:n.map(function(e,t){return l.createElement(EK,{bundle:e,key:t,onDelete:function(){return c(e.id)}})})))),l.createElement(oI,{open:!!u,maxWidth:!1,title:"Delete OCR2 Key Bundle",body:l.createElement(El.Z,{label:u}),confirmButtonText:"Confirm",onConfirm:Sc(function(){return Sp(this,function(e){switch(e.label){case 0:if(!u)return[3,2];return[4,a(u)];case 1:e.sent(),c(null),e.label=2;case 2:return[2]}})}),cancelButtonText:"Cancel",onCancel:function(){return c(null)}}),l.createElement(Sa,{onCreate:o,showCreateKeyDialog:d,setToggleCreateKeyDialog:h}))};function Sm(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function Sg(e){if(Array.isArray(e))return e}function Sv(e,t){return null!=t&&"undefined"!=typeof Symbol&&t[Symbol.hasInstance]?!!t[Symbol.hasInstance](e):e instanceof t}function Sy(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function Sw(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function S_(e,t){return Sg(e)||Sy(e,t)||SE(e,t)||Sw()}function SE(e,t){if(e){if("string"==typeof e)return Sm(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return Sm(e,t)}}var SS=function(){var e=S_(l.useState(),2),t=e[0],n=e[1],r=(0,h.k6)(),i=(0,A.I0)();return l.useEffect(function(){if(t){if(Sv(t,ru.cA)){var e=!0,n=!1,a=void 0;try{for(var o,s=t.graphQLErrors[Symbol.iterator]();!(e=(o=s.next()).done);e=!0){var u,c=o.value;if((null===(u=c.extensions)||void 0===u?void 0:u.code)=="UNAUTHORIZED"){i((0,ty.LO)("Unauthorized, please log in with proper credentials")),i((0,ty.Jc)()),r.push("/signin");return}}}catch(l){n=!0,a=l}finally{try{e||null==s.return||s.return()}finally{if(n)throw a}}}i((0,ty.LO)(t.message||"An error occurred"))}},[i,t,r]),{handleQueryError:n}};function Sk(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function Sx(e){if(Array.isArray(e))return e}function ST(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function SM(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){ST(a,r,i,o,s,"next",e)}function s(e){ST(a,r,i,o,s,"throw",e)}o(void 0)})}}function SO(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function SA(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function SL(e,t){return Sx(e)||SO(e,t)||SC(e,t)||SA()}function SC(e,t){if(e){if("string"==typeof e)return Sk(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return Sk(e,t)}}var SI=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}},SD=function(){var e,t,n=(0,A.I0)(),r=SS().handleQueryError,i=E5({fetchPolicy:"network-only",onError:r}),a=i.data,o=i.loading,s=i.refetch,u=SL(E6(),1)[0],c=SL(E9(),1)[0],f=(e=SM(function(e){var t,i,a,o,c,l;return SI(this,function(f){switch(f.label){case 0:return f.trys.push([0,2,,3]),[4,u(((a={}).variables={id:e},a))];case 1:return o=null===(t=(i=f.sent()).data)||void 0===t?void 0:t.deleteOCR2KeyBundle,c={},(null==o?void 0:o.__typename)==="DeleteOCR2KeyBundleSuccess"&&(n(Ec((c.keyType="Off-ChainReporting Key Bundle",c))),s()),[3,3];case 2:return r(l=f.sent()),[3,3];case 3:return[2]}})}),function(t){return e.apply(this,arguments)}),d=(t=SM(function(e){var t,i,a,o,u;return SI(this,function(l){switch(l.label){case 0:return l.trys.push([0,2,,3]),[4,c(((a={}).variables={chainType:e},a))];case 1:return(null==(o=null===(t=(i=l.sent()).data)||void 0===t?void 0:t.createOCR2KeyBundle)?void 0:o.__typename)==="CreateOCR2KeyBundleSuccess"&&(n((0,ty.qt)(e+" OCR2 key bundle created")),s()),[3,3];case 2:return r(u=l.sent()),[3,3];case 3:return[2]}})}),function(e){return t.apply(this,arguments)});return l.createElement(Sb,{loading:o,data:a,onDelete:f,onCreate:d})},SN=function(e){return(0,b.createStyles)({cardContent:{padding:0,"&:last-child":{padding:0}},avatar:{backgroundColor:e.palette.grey[800]}})},SP=(0,b.withStyles)(SN)(function(e){var t=e.classes,n=e.p2pKey,r=e.onDelete;return l.createElement(ii.Z,{hover:!0},l.createElement(ie.default,null,l.createElement(Ep,{classes:{avatar:t.avatar},primary:l.createElement("b",null,"Peer ID: ",n.peerID," ",l.createElement(_O,{data:n.peerID})),secondary:[l.createElement(l.Fragment,null,"Public Key: ",n.publicKey)]})),l.createElement(ie.default,{align:"right"},l.createElement(aL.Z,{onClick:r,variant:"danger",size:"medium"},"Delete")))});function SR(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function Sj(e){if(Array.isArray(e))return e}function SF(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function SY(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){SF(a,r,i,o,s,"next",e)}function s(e){SF(a,r,i,o,s,"throw",e)}o(void 0)})}}function SB(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function SU(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function SH(e,t){return Sj(e)||SB(e,t)||S$(e,t)||SU()}function S$(e,t){if(e){if("string"==typeof e)return SR(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return SR(e,t)}}var Sz=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}},SG=function(e){var t,n,r=e.data,i=e.errorMsg,a=e.loading,o=e.onCreate,s=e.onDelete,u=SH(l.useState(null),2),c=u[0],f=u[1];return l.createElement(l.Fragment,null,l.createElement(r9.Z,null,l.createElement(sf.Z,{action:l.createElement(ox.default,{variant:"outlined",color:"primary",onClick:o},"New P2P Key"),title:"P2P Keys",subheader:"Manage your P2P Key Bundles"}),l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,"Key Bundle"),l.createElement(ie.default,{align:"right"}))),l.createElement(r7.Z,null,l.createElement(gW,{visible:a}),l.createElement(gK,{visible:(null===(t=null==r?void 0:r.p2pKeys.results)||void 0===t?void 0:t.length)===0}),l.createElement(gz,{msg:i}),null===(n=null==r?void 0:r.p2pKeys.results)||void 0===n?void 0:n.map(function(e,t){return l.createElement(SP,{p2pKey:e,key:t,onDelete:function(){return f(e.id)}})})))),l.createElement(oI,{open:!!c,maxWidth:!1,title:"Delete OCR Key Bundle",body:l.createElement(El.Z,{label:c}),confirmButtonText:"Confirm",onConfirm:SY(function(){return Sz(this,function(e){switch(e.label){case 0:if(!c)return[3,2];return[4,s(c)];case 1:e.sent(),f(null),e.label=2;case 2:return[2]}})}),cancelButtonText:"Cancel",onCancel:function(){return f(null)}}))};function SW(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function SK(){var e=SW(["\n  fragment P2PKeysPayload_ResultsFields on P2PKey {\n    id\n    peerID\n    publicKey\n  }\n"]);return SK=function(){return e},e}function SV(){var e=SW(["\n  ","\n  query FetchP2PKeys {\n    p2pKeys {\n      results {\n        ...P2PKeysPayload_ResultsFields\n      }\n    }\n  }\n"]);return SV=function(){return e},e}var Sq=n0(SK()),SZ=n0(SV(),Sq),SX=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return ry(SZ,e)};function SJ(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function SQ(e){if(Array.isArray(e))return e}function S1(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function S0(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){S1(a,r,i,o,s,"next",e)}function s(e){S1(a,r,i,o,s,"throw",e)}o(void 0)})}}function S2(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function S3(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function S4(e,t){return SQ(e)||S2(e,t)||S6(e,t)||S3()}function S5(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function S6(e,t){if(e){if("string"==typeof e)return SJ(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return SJ(e,t)}}var S9=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}};function S8(){var e=S5(["\n  ","\n  mutation CreateP2PKey {\n    createP2PKey {\n      ... on CreateP2PKeySuccess {\n        p2pKey {\n          ...P2PKeysPayload_ResultsFields\n        }\n      }\n    }\n  }\n"]);return S8=function(){return e},e}function S7(){var e=S5(["\n  ","\n  mutation DeleteP2PKey($id: ID!) {\n    deleteP2PKey(id: $id) {\n      ... on DeleteP2PKeySuccess {\n        p2pKey {\n          ...P2PKeysPayload_ResultsFields\n        }\n      }\n    }\n  }\n"]);return S7=function(){return e},e}var ke=n0(S8(),Sq),kt=n0(S7(),Sq),kn=function(){var e,t,n=(0,A.I0)(),r=oZ().handleMutationError,i=SX(),a=i.data,o=i.loading,s=i.error,u=i.refetch,c=S4(os(ke),1)[0],f=S4(os(kt),1)[0],d=(e=S0(function(){var e,t,i,a,o;return S9(this,function(s){switch(s.label){case 0:return s.trys.push([0,2,,3]),[4,c()];case 1:return i=null===(e=(t=s.sent()).data)||void 0===e?void 0:e.createP2PKey,a={},(null==i?void 0:i.__typename)==="CreateP2PKeySuccess"&&(n(Eu((a.keyType="P2P Key",a.keyValue=i.p2pKey.id,a))),u()),[3,3];case 2:return r(o=s.sent()),[3,3];case 3:return[2]}})}),function(){return e.apply(this,arguments)}),h=(t=S0(function(e){var t,i,a,o,s,c;return S9(this,function(l){switch(l.label){case 0:return l.trys.push([0,2,,3]),[4,f(((a={}).variables={id:e},a))];case 1:return o=null===(t=(i=l.sent()).data)||void 0===t?void 0:t.deleteP2PKey,s={},(null==o?void 0:o.__typename)==="DeleteP2PKeySuccess"&&(n(Ec((s.keyType="P2P",s))),u()),[3,3];case 2:return r(c=l.sent()),[3,3];case 3:return[2]}})}),function(e){return t.apply(this,arguments)});return l.createElement(SG,{loading:o,data:a,errorMsg:null==s?void 0:s.message,onCreate:d,onDelete:h})},kr=function(e){var t=e.isCSAKeysFeatureEnabled;return l.createElement(iv,null,l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12},l.createElement(EW,null)),l.createElement(d.Z,{item:!0,xs:12},l.createElement(SD,null)),l.createElement(d.Z,{item:!0,xs:12},l.createElement(kn,null)),l.createElement(d.Z,{item:!0,xs:12},l.createElement(_X,null)),l.createElement(d.Z,{item:!0,xs:12},t&&l.createElement(Es,null))))},ki=function(){var e=rC(i.CSA);return l.createElement(kr,{isCSAKeysFeatureEnabled:e})},ka=function(){return l.createElement(ki,null)},ko=function(e){var t=e.errors;return l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"Errors"}),l.createElement("ul",null,t.map(function(e,t){return l.createElement("li",{key:e+t},l.createElement(x.default,{variant:"body1"},e))})))},ks=function(e){var t=e.run;return l.createElement(op,null,l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12,sm:4,md:2},l.createElement(ob,{title:"ID"}),l.createElement(om,{value:t.id})),l.createElement(d.Z,{item:!0,xs:12,sm:4,md:6},l.createElement(ob,{title:"Job"}),l.createElement(ip,{href:"/jobs/".concat(t.job.id),color:"primary"},t.job.name)),l.createElement(d.Z,{item:!0,xs:12,sm:6,md:2},l.createElement(ob,{title:"Started"}),l.createElement(om,null,l.createElement(aA,{tooltip:!0},t.createdAt))),l.createElement(d.Z,{item:!0,xs:12,sm:6,md:2},l.createElement(ob,{title:"Finished"}),l.createElement(om,null,t.finishedAt?l.createElement(aA,{tooltip:!0},t.finishedAt):"--"))))};function ku(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var kc,kl=function(e){return(0,b.createStyles)({tabs:{marginTop:4*e.spacing.unit,marginBottom:2.5*e.spacing.unit,borderBottom:"1px solid ".concat(e.palette.grey["300"])},badge:{padding:"0 ".concat(2*e.spacing.unit,"px")}})};(kc=u||(u={}))[kc.Overview=0]="Overview",kc[kc.JSON=1]="JSON";var kf=(0,b.withStyles)(kl)(function(e){var t=e.classes,n=e.id,r=(0,h.TH)().pathname,i=l.useMemo(function(){var e;return ku(e={},u.Overview,"/runs/".concat(n)),ku(e,u.JSON,"/runs/".concat(n,"/json")),e},[n]);return l.createElement(vJ.Z,{value:r,className:t.tabs,indicatorColor:"primary"},l.createElement(v0,{label:"Overview",to:i[u.Overview],value:i[u.Overview]}),l.createElement(v0,{label:"JSON",to:i[u.JSON],value:i[u.JSON]}))}),kd=1e3,kh=60,kp=3600;function kb(e,t){if(""===e&&""===t)return"";var n=km(new Date(e),new Date(t));return kg(Math.floor(n/kp),Math.floor(n%kp/kh),Math.ceil(n%kp%kh))}function km(e,t){return t.getTime()/kd-e.getTime()/kd}function kg(e,t,n){return"".concat(e?"".concat(e,"h"):"").concat(t?"".concat(t,"m"):"").concat(n,"s")}var kv=function(e){var t=e.start,n=e.end,r=e.className;return l.createElement(x.default,{variant:"h6",className:r},kb(t,n))};function ky(e){return"string"!=typeof e?e:e.toLowerCase().replace(/_/g," ").replace(/(?:^|\s|-)\S/g,function(e){return e.toUpperCase()})}var kw,k_=function(e){return(0,b.createStyles)({cardContent:{display:"flex","&:last-child":{paddingBottom:2*e.spacing.unit}},completed:{backgroundColor:e.palette.success.light},errored:{backgroundColor:e.palette.error.light},running:{backgroundColor:e.palette.warning.light},body:{marginLeft:2*e.spacing.unit},statusText:{display:"inline-block",textTransform:"capitalize",color:e.palette.secondary.main},elapsedText:{color:e.typography.display1.color}})},kE=(0,b.withStyles)(k_)(function(e){var t=e.classes,n=e.status,r=e.startedAt,i=e.finishedAt,a=l.useMemo(function(){switch(n){case"COMPLETED":case"ERRORED":return i;case"RUNNING":return Date.now();default:return null}},[n,i]),o=t[n.toLowerCase()]||t.running;return l.createElement(r9.Z,null,l.createElement(aK.Z,{className:O()(t.cardContent,o)},l.createElement(g6,{width:64,status:n}),l.createElement("div",{className:t.body},l.createElement(x.default,{className:t.statusText,variant:"h5"},ky(n)),a&&l.createElement(kv,{start:r,end:a,className:t.elapsedText}))))});(kw=c||(c={})).UNKNOWN="UNKNOWN",kw.PENDING="PENDING",kw.ERROR="ERROR",kw.COMPLETE="COMPLETE";var kS=function(e){var t=e.status,n=e.width,r=e.height;switch(t){case c.COMPLETE:return l.createElement(g5,{width:n,height:r,"data-testid":"complete-run-icon"});case c.ERROR:return l.createElement(gZ,{width:n,height:r,"data-testid":"error-run-icon"});case c.PENDING:return l.createElement(g2,{width:n,height:r,"data-testid":"pending-run-icon"});default:return l.createElement(gQ,{width:n,height:r,"data-testid":"default-run-icon"})}};function kk(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function kx(e){if(Array.isArray(e))return e}function kT(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function kM(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function kO(e,t){return kx(e)||kT(e,t)||kA(e,t)||kM()}function kA(e,t){if(e){if("string"==typeof e)return kk(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return kk(e,t)}}var kL=function(e){return(0,b.createStyles)({root:{display:"flex",borderBottom:"1px solid rgba(0, 0, 0, 0.12);",padding:2*e.spacing.unit,"&:last-child":{borderBottom:"none"}},content:{flex:1,overflow:"auto",paddingLeft:2*e.spacing.unit},heading:{lineHeight:"".concat(5*e.spacing.unit,"px")},subheading:{color:e.palette.grey[500]},text:{marginBottom:e.spacing.unit,marginTop:e.spacing.unit},attributeKey:{fontWeight:e.typography.fontWeightLight}})},kC=(0,b.withStyles)(kL)(function(e){var t,n=e.attrs,r=e.classes,i=e.dotID,a=e.output,o=e.error,s=e.type;return t=o?c.ERROR:"null"==a?c.PENDING:c.COMPLETE,l.createElement("div",{className:r.root},l.createElement("div",null,l.createElement(kS,{status:t,width:40,height:40})),l.createElement("div",{className:r.content},l.createElement(x.default,{className:r.heading,variant:"h5"},i," ",l.createElement("small",{className:r.subheading},s)),[c.COMPLETE,c.ERROR].includes(t)&&l.createElement(x.default,{className:r.text,variant:"body1"},t===c.COMPLETE?a:o),n&&Object.entries(n).map(function(e){var t=kO(e,2),n=t[0],i=t[1];return"type"===n?null:l.createElement(x.default,{key:n,variant:"body1"},l.createElement("span",{className:r.attributeKey},n),": ",i)})))});function kI(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function kD(){return(kD=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}function kN(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){kI(e,t,n[t])})}return e}function kP(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),n.push.apply(n,r)}return n}function kR(e,t){return t=null!=t?t:{},Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):kP(Object(t)).forEach(function(n){Object.defineProperty(e,n,Object.getOwnPropertyDescriptor(t,n))}),e}var kj=function(e){var t=e.taskRuns,n=e.observationSource,r=l.useMemo(function(){return yw("digraph {".concat(n,"}")).map(function(e){var n=t.find(function(t){return t.dotID===e.id});if(n)return kR(kN({},n),{attrs:e.attributes})})},[n,t]);return l.createElement(r9.Z,null,r.map(function(e,t){return e?l.createElement(kC,kD({},e,{key:t})):null}))},kF=n(63731),kY=n.n(kF),kB=n(93379),kU=n.n(kB),kH=n(97362),k$=n.n(kH),kz={};kz.insert="head",kz.singleton=!1,kU()(k$(),kz),k$().locals;var kG=function(e){var t=e.object;return l.createElement("div",{dangerouslySetInnerHTML:{__html:kY()(t)},"data-testid":"pretty-json"})};function kW(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function kK(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){kW(e,t,n[t])})}return e}function kV(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),n.push.apply(n,r)}return n}function kq(e,t){return t=null!=t?t:{},Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):kV(Object(t)).forEach(function(n){Object.defineProperty(e,n,Object.getOwnPropertyDescriptor(t,n))}),e}function kZ(e,t){if(null==e)return{};var n,r,i=kX(e,t);if(Object.getOwnPropertySymbols){var a=Object.getOwnPropertySymbols(e);for(r=0;r<a.length;r++)n=a[r],!(t.indexOf(n)>=0)&&Object.prototype.propertyIsEnumerable.call(e,n)&&(i[n]=e[n])}return i}function kX(e,t){if(null==e)return{};var n,r,i={},a=Object.keys(e);for(r=0;r<a.length;r++)n=a[r],t.indexOf(n)>=0||(i[n]=e[n]);return i}var kJ=function(e){var t=e.run,n=l.useMemo(function(){var e=t.inputs,n=t.outputs,r=t.taskRuns,i=kZ(t,["inputs","outputs","taskRuns"]),a={};try{a=JSON.parse(e)}catch(o){a={}}return kq(kK({},i),{inputs:a,outputs:n,taskRuns:r})},[t]);return l.createElement(r9.Z,null,l.createElement(aK.Z,null,l.createElement(kG,{object:n})))};function kQ(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function k1(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){kQ(e,t,n[t])})}return e}function k0(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),n.push.apply(n,r)}return n}function k2(e,t){return t=null!=t?t:{},Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):k0(Object(t)).forEach(function(n){Object.defineProperty(e,n,Object.getOwnPropertyDescriptor(t,n))}),e}function k3(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function k4(){var e=k3(["\n  fragment JobRunPayload_TaskRunsFields on TaskRun {\n    id\n    createdAt\n    dotID\n    error\n    finishedAt\n    output\n    type\n  }\n"]);return k4=function(){return e},e}function k5(){var e=k3(["\n  ","\n  fragment JobRunPayload_Fields on JobRun {\n    id\n    allErrors\n    createdAt\n    fatalErrors\n    finishedAt\n    inputs\n    job {\n      id\n      name\n      observationSource\n    }\n    outputs\n    status\n    taskRuns {\n      ...JobRunPayload_TaskRunsFields\n    }\n  }\n"]);return k5=function(){return e},e}var k6=n0(k4()),k9=n0(k5(),k6),k8=function(e){var t=e.run,n=(0,h.$B)().path,r=t.taskRuns.reduce(function(e,t){var n;return n=t.error?c.ERROR:"null"==t.output?c.PENDING:c.COMPLETE,k2(k1({},e),kQ({},t.dotID,{status:n}))},{});return 0==t.allErrors.length&&yw("digraph {".concat(t.job.observationSource,"}")).forEach(function(e){r[e.id]=k2(k1({},e.attributes),{status:c.COMPLETE})}),l.createElement(iv,null,l.createElement(d.Z,{container:!0,spacing:16},l.createElement(d.Z,{item:!0,xs:12},l.createElement(iw,null,"Job Run #",t.id))),l.createElement(ks,{run:t}),l.createElement(kf,{id:t.id}),l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:4},l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12},l.createElement(kE,{status:t.status,startedAt:t.createdAt,finishedAt:t.finishedAt})),l.createElement(d.Z,{item:!0,xs:12},l.createElement(yU,{observationSource:t.job.observationSource,attributes:r})))),l.createElement(d.Z,{item:!0,xs:8},l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12},t.allErrors.length>0&&l.createElement(ko,{errors:t.allErrors})),l.createElement(d.Z,{item:!0,xs:12},l.createElement(h.rs,null,l.createElement(h.AW,{path:"".concat(n,"/json")},l.createElement(kJ,{run:t})),l.createElement(h.AW,{path:n},t.taskRuns.length>0&&l.createElement(kj,{taskRuns:t.taskRuns,observationSource:t.job.observationSource}))))))))};function k7(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function xe(){var e=k7(["\n  ","\n  query FetchJobRun($id: ID!) {\n    jobRun(id: $id) {\n      __typename\n      ... on JobRun {\n        ...JobRunPayload_Fields\n      }\n      ... on NotFoundError {\n        message\n      }\n    }\n  }\n"]);return xe=function(){return e},e}var xt=n0(xe(),k9),xn=function(){var e=ry(xt,{variables:{id:(0,h.UO)().id}}),t=e.data,n=e.loading,r=e.error;if(n)return l.createElement(ij,null);if(r)return l.createElement(iN,{error:r});var i=null==t?void 0:t.jobRun;switch(null==i?void 0:i.__typename){case"JobRun":return l.createElement(k8,{run:i});case"NotFoundError":return l.createElement(oo,null);default:return null}};function xr(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function xi(){var e=xr(["\n  fragment JobRunsPayload_ResultsFields on JobRun {\n    id\n    allErrors\n    createdAt\n    finishedAt\n    status\n    job {\n      id\n    }\n  }\n"]);return xi=function(){return e},e}var xa=n0(xi()),xo=function(e){var t=e.loading,n=e.data,r=e.page,i=e.pageSize,a=(0,h.k6)(),o=l.useMemo(function(){return null==n?void 0:n.jobRuns.results.map(function(e){var t,n=e.allErrors,r=e.id,i=e.createdAt;return{id:r,createdAt:i,errors:n,finishedAt:e.finishedAt,status:e.status}})},[n]);return l.createElement(iv,null,l.createElement(d.Z,{container:!0,spacing:32},l.createElement(d.Z,{item:!0,xs:12},l.createElement(iw,null,"Job Runs")),t&&l.createElement(ij,null),n&&o&&l.createElement(d.Z,{item:!0,xs:12},l.createElement(r9.Z,null,l.createElement(yg,{runs:o}),l.createElement(ir.Z,{component:"div",count:n.jobRuns.metadata.total,rowsPerPage:i,rowsPerPageOptions:[i],page:r-1,onChangePage:function(e,t){a.push("/runs?page=".concat(t+1,"&per=").concat(i))},onChangeRowsPerPage:function(){},backIconButtonProps:{"aria-label":"prev-page"},nextIconButtonProps:{"aria-label":"next-page"}})))))};function xs(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function xu(){var e=xs(["\n  ","\n  query FetchJobRuns($offset: Int, $limit: Int) {\n    jobRuns(offset: $offset, limit: $limit) {\n      results {\n        ...JobRunsPayload_ResultsFields\n      }\n      metadata {\n        total\n      }\n    }\n  }\n"]);return xu=function(){return e},e}var xc=n0(xu(),xa),xl=function(){var e=iF(),t=parseInt(e.get("page")||"1",10),n=parseInt(e.get("per")||"25",10),r=ry(xc,{variables:{offset:(t-1)*n,limit:n},fetchPolicy:"cache-and-network"}),i=r.data,a=r.loading,o=r.error;return o?l.createElement(iN,{error:o}):l.createElement(xo,{loading:a,data:i,page:t,pageSize:n})},xf=function(){var e=(0,h.$B)().path;return l.createElement(h.rs,null,l.createElement(h.AW,{exact:!0,path:e},l.createElement(xl,null)),l.createElement(h.AW,{path:"".concat(e,"/:id")},l.createElement(xn,null)))},xd=by().shape({name:p2().required("Required"),uri:p2().required("Required"),publicKey:p2().required("Required")}),xh=function(e){var t=e.initialValues,n=e.onSubmit;return l.createElement(hM,{initialValues:t,validationSchema:xd,onSubmit:n},function(e){var t=e.isSubmitting,n=e.submitForm;return l.createElement(hj,{"data-testid":"feeds-manager-form"},l.createElement(d.Z,{container:!0,spacing:16},l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(hR,{component:hJ,id:"name",name:"name",label:"Name",required:!0,fullWidth:!0,FormHelperTextProps:{"data-testid":"name-helper-text"}})),l.createElement(d.Z,{item:!0,xs:!1,md:6}),l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(hR,{component:hJ,id:"uri",name:"uri",label:"URI",required:!0,fullWidth:!0,helperText:"Provided by the Feeds Manager operator",FormHelperTextProps:{"data-testid":"uri-helper-text"}})),l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(hR,{component:hJ,id:"publicKey",name:"publicKey",label:"Public Key",required:!0,fullWidth:!0,helperText:"Provided by the Feeds Manager operator",FormHelperTextProps:{"data-testid":"publicKey-helper-text"}})),l.createElement(d.Z,{item:!0,xs:12},l.createElement(ox.default,{variant:"contained",color:"primary",disabled:t,onClick:n},"Submit"))))})},xp=function(e){var t=e.data,n=e.onSubmit,r={name:t.name,uri:t.uri,publicKey:t.publicKey};return l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12,md:11,lg:9},l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"Edit Feeds Manager"}),l.createElement(aK.Z,null,l.createElement(xh,{initialValues:r,onSubmit:n})))))};function xb(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function xm(){var e=xb(["\n  query FetchFeedsManagers {\n    feedsManagers {\n      results {\n        __typename\n        id\n        name\n        uri\n        publicKey\n        isConnectionActive\n        createdAt\n      }\n    }\n  }\n"]);return xm=function(){return e},e}var xg=n0(xm()),xv=function(){return ry(xg)};function xy(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function xw(e){if(Array.isArray(e))return e}function x_(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function xE(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){x_(a,r,i,o,s,"next",e)}function s(e){x_(a,r,i,o,s,"throw",e)}o(void 0)})}}function xS(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function xk(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function xx(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function xT(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){xS(e,t,n[t])})}return e}function xM(e,t){return xw(e)||xk(e,t)||xA(e,t)||xx()}function xO(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function xA(e,t){if(e){if("string"==typeof e)return xy(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return xy(e,t)}}var xL=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}};function xC(){var e=xO(["\n  mutation UpdateFeedsManager($id: ID!, $input: UpdateFeedsManagerInput!) {\n    updateFeedsManager(id: $id, input: $input) {\n      ... on UpdateFeedsManagerSuccess {\n        feedsManager {\n          id\n          name\n          uri\n          publicKey\n          isConnectionActive\n          createdAt\n        }\n      }\n      ... on NotFoundError {\n        message\n        code\n      }\n      ... on InputErrors {\n        errors {\n          path\n          message\n          code\n        }\n      }\n    }\n  }\n"]);return xC=function(){return e},e}var xI=n0(xC()),xD=function(){var e=(0,h.k6)(),t=(0,h.TH)(),n=(0,A.I0)(),r=oZ().handleMutationError,i=xv(),a=i.data,o=i.loading,s=i.error,u=xM(os(xI,{refetchQueries:[xg]}),1)[0];if(o)return l.createElement(ij,null);if(s)return l.createElement(iN,{error:s});var c=void 0!=a&&a.feedsManagers.results[0]?a.feedsManagers.results[0]:void 0;if(!c)return l.createElement(h.l_,{to:{pathname:"/feeds_manager/new",state:{from:t}}});var f,d=(f=xE(function(t,i){var a,o,s,l,f,d;return xL(this,function(h){switch(h.label){case 0:a=i.setErrors,h.label=1;case 1:return h.trys.push([1,3,,4]),[4,u(((l={}).variables={id:c.id,input:xT({},t)},l))];case 2:switch(null==(f=null===(o=(s=h.sent()).data)||void 0===o?void 0:o.updateFeedsManager)?void 0:f.__typename){case"UpdateFeedsManagerSuccess":e.push("/feeds_manager"),n((0,ty.qt)("Feeds Manager Updated"));break;case"NotFoundError":n((0,ty.LO)(f.message));break;case"InputErrors":n((0,ty.LO)("Invalid Input")),a(wG(f))}return[3,4];case 3:return r(d=h.sent()),[3,4];case 4:return[2]}})}),function(e,t){return f.apply(this,arguments)});return l.createElement(xp,{data:c,onSubmit:d})},xN=n(57234);function xP(){return(xP=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}var xR=by().shape({chainID:p2().required("Required"),chainType:p2().required("Required"),accountAddr:p2().required("Required"),adminAddr:p2().required("Required"),ocr1Multiaddr:p2().when(["ocr1Enabled","ocr1IsBootstrap"],{is:function(e,t){return e&&t},then:p2().required("Required").nullable()}).nullable(),ocr1P2PPeerID:p2().when(["ocr1Enabled","ocr1IsBootstrap"],{is:function(e,t){return e&&!t},then:p2().required("Required").nullable()}).nullable(),ocr1KeyBundleID:p2().when(["ocr1Enabled","ocr1IsBootstrap"],{is:function(e,t){return e&&!t},then:p2().required("Required").nullable()}).nullable(),ocr2Multiaddr:p2().when(["ocr2Enabled","ocr2IsBootstrap"],{is:function(e,t){return e&&t},then:p2().required("Required").nullable()}).nullable(),ocr2P2PPeerID:p2().when(["ocr2Enabled","ocr2IsBootstrap"],{is:function(e,t){return e&&!t},then:p2().required("Required").nullable()}).nullable(),ocr2KeyBundleID:p2().when(["ocr2Enabled","ocr2IsBootstrap"],{is:function(e,t){return e&&!t},then:p2().required("Required").nullable()}).nullable(),ocr2CommitPluginEnabled:pq().required("Required"),ocr2ExecutePluginEnabled:pq().required("Required"),ocr2MedianPluginEnabled:pq().required("Required"),ocr2MercuryPluginEnabled:pq().required("Required"),ocr2ForwarderAddress:p2().nullable()}),xj=function(e){return(0,b.createStyles)({supportedJobOptionsPaper:{padding:2*e.spacing.unit}})},xF=function(e){var t=hE(),n=t.values,r=n.chainID,i=n.accountAddr,a=t.setFieldValue,o=l.useRef();return l.useEffect(function(){o.current=r},[r]),l.useEffect(function(){r!==o.current&&a(e.name,"")},[r,a,i,e.name]),l.createElement(hR,xP({},e))},xY=(0,b.withStyles)(xj)(function(e){var t=e.classes,n=e.editing,r=void 0!==n&&n,i=e.innerRef,a=e.initialValues,o=e.onSubmit,s=e.chainIDs,u=void 0===s?[]:s,c=e.accounts,f=void 0===c?[]:c,h=e.p2pKeys,p=void 0===h?[]:h,b=e.ocrKeys,m=void 0===b?[]:b,g=e.ocr2Keys,v=void 0===g?[]:g,y=e.showSubmit,w=void 0!==y&&y;return l.createElement(hM,{innerRef:i,initialValues:a,validationSchema:xR,onSubmit:o},function(e){var n=e.values,i=f.filter(function(e){return e.chain.id==n.chainID&&!e.isDisabled});return l.createElement(hj,{"data-testid":"feeds-manager-form",id:"chain-configuration-form",noValidate:!0},l.createElement(d.Z,{container:!0,spacing:16},l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(hR,{component:hJ,id:"chainType",name:"chainType",label:"Chain Type",select:!0,required:!0,fullWidth:!0,disabled:!0,helperText:"Only EVM is currently supported"},l.createElement(tE.default,{key:"EVM",value:"EVM"},"EVM"))),l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(hR,{component:hJ,id:"chainID",name:"chainID",label:"Chain ID",required:!0,fullWidth:!0,select:!0,disabled:r,inputProps:{"data-testid":"chainID-input"},FormHelperTextProps:{"data-testid":"chainID-helper-text"}},u.map(function(e){return l.createElement(tE.default,{key:e,value:e},e)}))),l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(xF,{component:hJ,id:"accountAddr",name:"accountAddr",label:"Account Address",inputProps:{"data-testid":"accountAddr-input"},required:!0,fullWidth:!0,select:!0,helperText:"The account address used for this chain",FormHelperTextProps:{"data-testid":"accountAddr-helper-text"}},i.map(function(e){return l.createElement(tE.default,{key:e.address,value:e.address},e.address)}))),l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(hR,{component:hJ,id:"adminAddr",name:"adminAddr",label:"Admin Address",required:!0,fullWidth:!0,helperText:"The address used for LINK payments",FormHelperTextProps:{"data-testid":"adminAddr-helper-text"}})),l.createElement(d.Z,{item:!0,xs:12},l.createElement(x.default,null,"Supported Job Types")),l.createElement(d.Z,{item:!0,xs:12},l.createElement(hR,{component:h3,name:"fluxMonitorEnabled",type:"checkbox",Label:{label:"Flux Monitor"}})),l.createElement(d.Z,{item:!0,xs:12},l.createElement(hR,{component:h3,name:"ocr1Enabled",type:"checkbox",Label:{label:"OCR"}}),n.ocr1Enabled&&l.createElement(ia.default,{className:t.supportedJobOptionsPaper},l.createElement(d.Z,{container:!0,spacing:8},l.createElement(l.Fragment,null,l.createElement(d.Z,{item:!0,xs:12},l.createElement(hR,{component:h3,name:"ocr1IsBootstrap",type:"checkbox",Label:{label:"Is this node running as a bootstrap peer?"}})),n.ocr1IsBootstrap?l.createElement(d.Z,{item:!0,xs:12},l.createElement(hR,{component:hJ,id:"ocr1Multiaddr",name:"ocr1Multiaddr",label:"Multiaddr",required:!0,fullWidth:!0,helperText:"The OCR Multiaddr which oracles use to query for network information",FormHelperTextProps:{"data-testid":"ocr1Multiaddr-helper-text"}})):l.createElement(l.Fragment,null,l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(hR,{component:hJ,id:"ocr1P2PPeerID",name:"ocr1P2PPeerID",label:"Peer ID",select:!0,required:!0,fullWidth:!0,helperText:"The Peer ID used for this chain",FormHelperTextProps:{"data-testid":"ocr1P2PPeerID-helper-text"}},p.map(function(e){return l.createElement(tE.default,{key:e.peerID,value:e.peerID},e.peerID)}))),l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(hR,{component:hJ,id:"ocr1KeyBundleID",name:"ocr1KeyBundleID",label:"Key Bundle ID",select:!0,required:!0,fullWidth:!0,helperText:"The OCR Key Bundle ID used for this chain",FormHelperTextProps:{"data-testid":"ocr1KeyBundleID-helper-text"}},m.map(function(e){return l.createElement(tE.default,{key:e.id,value:e.id},e.id)})))))))),l.createElement(d.Z,{item:!0,xs:12},l.createElement(hR,{component:h3,name:"ocr2Enabled",type:"checkbox",Label:{label:"OCR2"}}),n.ocr2Enabled&&l.createElement(ia.default,{className:t.supportedJobOptionsPaper},l.createElement(d.Z,{container:!0,spacing:8},l.createElement(l.Fragment,null,l.createElement(d.Z,{item:!0,xs:12},l.createElement(hR,{component:h3,name:"ocr2IsBootstrap",type:"checkbox",Label:{label:"Is this node running as a bootstrap peer?"}})),n.ocr2IsBootstrap?l.createElement(d.Z,{item:!0,xs:12},l.createElement(hR,{component:hJ,id:"ocr2Multiaddr",name:"ocr2Multiaddr",label:"Multiaddr",required:!0,fullWidth:!0,helperText:"The OCR2 Multiaddr which oracles use to query for network information",FormHelperTextProps:{"data-testid":"ocr2Multiaddr-helper-text"}})):l.createElement(l.Fragment,null,l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(hR,{component:hJ,id:"ocr2P2PPeerID",name:"ocr2P2PPeerID",label:"Peer ID",select:!0,required:!0,fullWidth:!0,helperText:"The Peer ID used for this chain",FormHelperTextProps:{"data-testid":"ocr2P2PPeerID-helper-text"}},p.map(function(e){return l.createElement(tE.default,{key:e.peerID,value:e.peerID},e.peerID)}))),l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(hR,{component:hJ,id:"ocr2KeyBundleID",name:"ocr2KeyBundleID",label:"Key Bundle ID",select:!0,required:!0,fullWidth:!0,helperText:"The OCR2 Key Bundle ID used for this chain",FormHelperTextProps:{"data-testid":"ocr2KeyBundleID-helper-text"}},v.filter(function(e){return n.chainType===e.chainType}).map(function(e){return l.createElement(tE.default,{key:e.id,value:e.id},e.id)}))),l.createElement(d.Z,{item:!0,xs:12},l.createElement(x.default,null,"Supported Plugins")),l.createElement(d.Z,{item:!0,xs:6},l.createElement(hR,{component:h3,name:"ocr2CommitPluginEnabled",type:"checkbox",Label:{label:"Commit"}})),l.createElement(d.Z,{item:!0,xs:6},l.createElement(hR,{component:h3,name:"ocr2ExecutePluginEnabled",type:"checkbox",Label:{label:"Execute"}})),l.createElement(d.Z,{item:!0,xs:6},l.createElement(hR,{component:h3,name:"ocr2MedianPluginEnabled",type:"checkbox",Label:{label:"Median"}})),l.createElement(d.Z,{item:!0,xs:6},l.createElement(hR,{component:h3,name:"ocr2MercuryPluginEnabled",type:"checkbox",Label:{label:"Mercury"}})),l.createElement(d.Z,{item:!0,xs:12,md:12},l.createElement(hR,{component:hJ,id:"ocr2ForwarderAddress",name:"ocr2ForwarderAddress",label:"Forwarder Address (optional)",fullWidth:!0,helperText:"The forwarder address from the Operator Forwarder Contract",FormHelperTextProps:{"data-testid":"ocr2ForwarderAddress-helper-text"}}))))))),w&&l.createElement(d.Z,{item:!0,xs:12,md:7},l.createElement(ox.default,{variant:"contained",color:"primary",type:"submit",size:"large"},"Submit"))))})}),xB=function(e){var t=e.onClose,n=e.open,r=e.onSubmit,i=l.useRef(),a=iz({fetchPolicy:"network-only"}).data,o=_Z({fetchPolicy:"cache-and-network"}).data,s=SX({fetchPolicy:"cache-and-network"}).data,u=EC({fetchPolicy:"cache-and-network"}).data,c=E5({fetchPolicy:"cache-and-network"}).data,f={chainID:"",chainType:"EVM",accountAddr:"",adminAddr:"",fluxMonitorEnabled:!1,ocr1Enabled:!1,ocr1IsBootstrap:!1,ocr1Multiaddr:"",ocr1P2PPeerID:"",ocr1KeyBundleID:"",ocr2Enabled:!1,ocr2IsBootstrap:!1,ocr2Multiaddr:"",ocr2P2PPeerID:"",ocr2KeyBundleID:"",ocr2CommitPluginEnabled:!1,ocr2ExecutePluginEnabled:!1,ocr2MedianPluginEnabled:!1,ocr2MercuryPluginEnabled:!1,ocr2ForwarderAddress:""},d=a?a.chains.results.map(function(e){return e.id}):[],h=o?o.ethKeys.results:[],p=s?s.p2pKeys.results:[],b=u?u.ocrKeyBundles.results:[],m=c?c.ocr2KeyBundles.results:[];return l.createElement(aN.Z,{onClose:t,open:n,disableBackdropClick:!0},l.createElement(oA.Z,{disableTypography:!0},l.createElement(x.default,{variant:"body2"},"New Supported Chain")),l.createElement(oM.Z,null,l.createElement(xY,{innerRef:i,initialValues:f,onSubmit:r,chainIDs:d,accounts:h,p2pKeys:p,ocrKeys:b,ocr2Keys:m})),l.createElement(oT.Z,null,l.createElement(ox.default,{onClick:t},"Cancel"),l.createElement(ox.default,{color:"primary",type:"submit",form:"chain-configuration-form",variant:"contained"},"Submit")))},xU=function(e){var t=e.cfg,n=e.onClose,r=e.open,i=e.onSubmit,a=l.useRef(),o=iz({fetchPolicy:"network-only"}).data,s=_Z({fetchPolicy:"cache-and-network"}).data,u=SX({fetchPolicy:"cache-and-network"}).data,c=EC({fetchPolicy:"cache-and-network"}).data,f=E5({fetchPolicy:"cache-and-network"}).data;if(!t)return null;var d={chainID:t.chainID,chainType:"EVM",accountAddr:t.accountAddr,adminAddr:t.adminAddr,fluxMonitorEnabled:t.fluxMonitorJobConfig.enabled,ocr1Enabled:t.ocr1JobConfig.enabled,ocr1IsBootstrap:t.ocr1JobConfig.isBootstrap,ocr1Multiaddr:t.ocr1JobConfig.multiaddr,ocr1P2PPeerID:t.ocr1JobConfig.p2pPeerID,ocr1KeyBundleID:t.ocr1JobConfig.keyBundleID,ocr2Enabled:t.ocr2JobConfig.enabled,ocr2IsBootstrap:t.ocr2JobConfig.isBootstrap,ocr2Multiaddr:t.ocr2JobConfig.multiaddr,ocr2P2PPeerID:t.ocr2JobConfig.p2pPeerID,ocr2KeyBundleID:t.ocr2JobConfig.keyBundleID,ocr2CommitPluginEnabled:t.ocr2JobConfig.plugins.commit,ocr2ExecutePluginEnabled:t.ocr2JobConfig.plugins.execute,ocr2MedianPluginEnabled:t.ocr2JobConfig.plugins.median,ocr2MercuryPluginEnabled:t.ocr2JobConfig.plugins.mercury,ocr2ForwarderAddress:t.ocr2JobConfig.forwarderAddress},h=o?o.chains.results.map(function(e){return e.id}):[],p=s?s.ethKeys.results:[],b=u?u.p2pKeys.results:[],m=c?c.ocrKeyBundles.results:[],g=f?f.ocr2KeyBundles.results:[];return l.createElement(aN.Z,{onClose:n,open:r,disableBackdropClick:!0},l.createElement(oA.Z,{disableTypography:!0},l.createElement(x.default,{variant:"body2"},"Edit Supported Chain")),l.createElement(oM.Z,null,l.createElement(xY,{innerRef:a,initialValues:d,onSubmit:i,chainIDs:h,accounts:p,p2pKeys:b,ocrKeys:m,ocr2Keys:g,editing:!0})),l.createElement(oT.Z,null,l.createElement(ox.default,{onClick:n},"Cancel"),l.createElement(ox.default,{color:"primary",type:"submit",form:"chain-configuration-form",variant:"contained"},"Submit")))};function xH(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function x$(){var e=xH(["\n  fragment FeedsManager_ChainConfigFields on FeedsManagerChainConfig {\n    id\n    chainID\n    chainType\n    accountAddr\n    adminAddr\n    fluxMonitorJobConfig {\n      enabled\n    }\n    ocr1JobConfig {\n      enabled\n      isBootstrap\n      multiaddr\n      p2pPeerID\n      keyBundleID\n    }\n    ocr2JobConfig {\n      enabled\n      isBootstrap\n      multiaddr\n      forwarderAddress\n      p2pPeerID\n      keyBundleID\n      plugins {\n        commit\n        execute\n        median\n        mercury\n      }\n    }\n  }\n"]);return x$=function(){return e},e}function xz(){var e=xH(["\n  ","\n  fragment FeedsManagerFields on FeedsManager {\n    id\n    name\n    uri\n    publicKey\n    isConnectionActive\n    chainConfigs {\n      ...FeedsManager_ChainConfigFields\n    }\n  }\n"]);return xz=function(){return e},e}function xG(){var e=xH(["\n  fragment FeedsManager_JobProposalsFields on JobProposal {\n    id\n    name\n    externalJobID\n    remoteUUID\n    status\n    pendingUpdate\n    latestSpec {\n      createdAt\n      version\n    }\n  }\n"]);return xG=function(){return e},e}function xW(){var e=xH(["\n  ","\n  ","\n  fragment FeedsManagerPayload_ResultsFields on FeedsManager {\n    ...FeedsManagerFields\n    jobProposals {\n      ...FeedsManager_JobProposalsFields\n    }\n  }\n"]);return xW=function(){return e},e}function xK(){var e=xH(["\n  ","\n  query FetchFeedManagersWithProposals {\n    feedsManagers {\n      results {\n        ...FeedsManagerPayload_ResultsFields\n      }\n    }\n  }\n"]);return xK=function(){return e},e}var xV=n0(x$()),xq=n0(xz(),xV),xZ=n0(xG()),xX=n0(xW(),xq,xZ),xJ=n0(xK(),xX),xQ=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return ry(xJ,e)};function x1(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function x0(e){if(Array.isArray(e))return e}function x2(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function x3(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){x2(a,r,i,o,s,"next",e)}function s(e){x2(a,r,i,o,s,"throw",e)}o(void 0)})}}function x4(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function x5(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function x6(e,t){return x0(e)||x4(e,t)||x8(e,t)||x5()}function x9(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function x8(e,t){if(e){if("string"==typeof e)return x1(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return x1(e,t)}}var x7=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}};function Te(){var e=x9(["\n  mutation CreateFeedsManagerChainConfig(\n    $input: CreateFeedsManagerChainConfigInput!\n  ) {\n    createFeedsManagerChainConfig(input: $input) {\n      ... on CreateFeedsManagerChainConfigSuccess {\n        chainConfig {\n          id\n        }\n      }\n      ... on NotFoundError {\n        message\n        code\n      }\n      ... on InputErrors {\n        errors {\n          path\n          message\n          code\n        }\n      }\n    }\n  }\n"]);return Te=function(){return e},e}function Tt(){var e=x9(["\n  mutation DeleteFeedsManagerChainConfig($id: ID!) {\n    deleteFeedsManagerChainConfig(id: $id) {\n      ... on DeleteFeedsManagerChainConfigSuccess {\n        chainConfig {\n          id\n        }\n      }\n      ... on NotFoundError {\n        message\n        code\n      }\n    }\n  }\n"]);return Tt=function(){return e},e}function Tn(){var e=x9(["\n  mutation UpdateFeedsManagerChainConfig(\n    $id: ID!\n    $input: UpdateFeedsManagerChainConfigInput!\n  ) {\n    updateFeedsManagerChainConfig(id: $id, input: $input) {\n      __typename\n      ... on UpdateFeedsManagerChainConfigSuccess {\n        chainConfig {\n          id\n        }\n      }\n      ... on NotFoundError {\n        message\n        code\n      }\n      ... on InputErrors {\n        errors {\n          path\n          message\n          code\n        }\n      }\n    }\n  }\n"]);return Tn=function(){return e},e}var Tr=n0(Te()),Ti=n0(Tt()),Ta=n0(Tn()),To=function(e){return(0,b.createStyles)({card:{marginBottom:2*e.spacing.unit},panel:{borderBottom:"1px solid ".concat(e.palette.divider)},panelExpanded:{margin:0},chip:{marginRight:2*e.spacing.unit},title:{fontSize:e.typography.body2.fontSize,fontWeight:e.typography.body2.fontWeight,color:e.typography.body2.color},panelDetails:{display:"block"},jobTypeContainer:{borderLeft:"2px solid ".concat(e.palette.primary.main),marginLeft:-8,paddingLeft:8},panelDetailsActions:{display:"flex",justifyContent:"flex-end",gap:"".concat(2*e.spacing.unit,"px")}})},Ts=function(e){return l.createElement(d.Z,{item:!0,xs:12,sm:1,md:5},l.createElement(ob,{title:"Multiaddr"}),l.createElement(om,{value:e.multiaddr}))},Tu=function(e){return l.createElement(l.Fragment,null,l.createElement(d.Z,{item:!0,xs:12,sm:1,md:5},l.createElement(ob,{title:"P2P Peer ID"}),l.createElement(om,{value:e.p2pPeerID})),l.createElement(d.Z,{item:!0,xs:12,sm:1,md:5},l.createElement(ob,{title:"OCR Key ID"}),l.createElement(om,{value:e.keyBundleID})))},Tc=(0,b.withStyles)(To)(function(e){var t=e.cfg,n=e.classes;return t.enabled?l.createElement(d.Z,{item:!0,xs:12,sm:1,md:12},l.createElement("div",{className:n.jobTypeContainer},l.createElement(ob,{title:"Job Type"}),l.createElement(om,{value:"Flux Monitor"}))):null}),Tl=(0,b.withStyles)(To)(function(e){var t=e.cfg,n=e.classes;return t.enabled?l.createElement(l.Fragment,null,l.createElement(d.Z,{item:!0,xs:12,sm:1,md:2},l.createElement("div",{className:n.jobTypeContainer},l.createElement(ob,{title:"Job Type"}),l.createElement(om,{value:"OCR ".concat(t.isBootstrap?"(Bootstrap)":"")}))),t.isBootstrap?Ts(t):Tu(t)):null}),Tf=(0,b.withStyles)(To)(function(e){var t=e.cfg,n=e.classes;return t.enabled?l.createElement(l.Fragment,null,l.createElement(d.Z,{item:!0,xs:12,sm:1,md:2},l.createElement("div",{className:n.jobTypeContainer},l.createElement(ob,{title:"Job Type"}),l.createElement(om,{value:"OCR2 ".concat(t.isBootstrap?"(Bootstrap)":"")}))),t.isBootstrap?Ts(t):Tu(t)):null}),Td=(0,b.withStyles)(To)(function(e){var t,n,r,i=e.classes,a=e.cfgs,o=e.mgrID,s=(0,A.I0)(),u=oZ().handleMutationError,c=x6(l.useState(!1),2),f=c[0],h=c[1],p=x6(l.useState(null),2),b=p[0],m=p[1],g=x6(l.useState(null),2),v=g[0],w=g[1],_=function(e){w(e.currentTarget)},S=function(){w(null)},k=function(e){m(e)},T=function(){m(null)},M=function(){return null!==b},O=x6(os(Tr,{refetchQueries:[xJ]}),1)[0],L=x6(os(Ti,{refetchQueries:[xJ]}),1)[0],C=x6(os(Ta,{refetchQueries:[xJ]}),1)[0],I=(t=x3(function(e){var t,n,r,i,a;return x7(this,function(c){switch(c.label){case 0:return c.trys.push([0,2,,3]),[4,O(((r={}).variables={input:{feedsManagerID:o,chainID:e.chainID,chainType:e.chainType,accountAddr:e.accountAddr,adminAddr:e.adminAddr,fluxMonitorEnabled:e.fluxMonitorEnabled,ocr1Enabled:e.ocr1Enabled,ocr1IsBootstrap:e.ocr1IsBootstrap,ocr1Multiaddr:""!==e.ocr1Multiaddr?e.ocr1Multiaddr:null,ocr1P2PPeerID:""!==e.ocr1P2PPeerID?e.ocr1P2PPeerID:null,ocr1KeyBundleID:""!=e.ocr1KeyBundleID?e.ocr1KeyBundleID:null,ocr2Enabled:e.ocr2Enabled,ocr2IsBootstrap:e.ocr2IsBootstrap,ocr2Multiaddr:""!==e.ocr2Multiaddr?e.ocr2Multiaddr:null,ocr2P2PPeerID:""!==e.ocr2P2PPeerID?e.ocr2P2PPeerID:null,ocr2KeyBundleID:""!=e.ocr2KeyBundleID?e.ocr2KeyBundleID:null,ocr2Plugins:'{"commit":'.concat(e.ocr2CommitPluginEnabled,',"execute":').concat(e.ocr2ExecutePluginEnabled,',"median":').concat(e.ocr2MedianPluginEnabled,',"mercury":').concat(e.ocr2MercuryPluginEnabled,"}"),ocr2ForwarderAddress:""!==e.ocr2ForwarderAddress?e.ocr2ForwarderAddress:null}},r))];case 1:switch(null==(i=null===(t=(n=c.sent()).data)||void 0===t?void 0:t.createFeedsManagerChainConfig)?void 0:i.__typename){case"CreateFeedsManagerChainConfigSuccess":s((0,ty.qt)("Added new supported chain"));break;case"NotFoundError":s((0,ty.LO)(i.message))}return[3,3];case 2:return u(a=c.sent()),[3,3];case 3:return[2]}})}),function(e){return t.apply(this,arguments)}),D=(n=x3(function(e){var t,n,r,i,a;return x7(this,function(o){switch(o.label){case 0:return o.trys.push([0,2,,3]),[4,L(((r={}).variables={id:e},r))];case 1:switch(null==(i=null===(t=(n=o.sent()).data)||void 0===t?void 0:t.deleteFeedsManagerChainConfig)?void 0:i.__typename){case"DeleteFeedsManagerChainConfigSuccess":s((0,ty.qt)("Deleted supported chain"));break;case"NotFoundError":s((0,ty.LO)(i.message))}return[3,3];case 2:return u(a=o.sent()),[3,3];case 3:return[2]}})}),function(e){return n.apply(this,arguments)}),N=(r=x3(function(e){var t,n,r,i,a;return x7(this,function(o){switch(o.label){case 0:if(!b)return[2];o.label=1;case 1:return o.trys.push([1,3,,4]),[4,C(((r={}).variables={id:b.id,input:{accountAddr:e.accountAddr,adminAddr:e.adminAddr,fluxMonitorEnabled:e.fluxMonitorEnabled,ocr1Enabled:e.ocr1Enabled,ocr1IsBootstrap:e.ocr1IsBootstrap,ocr1Multiaddr:""!==e.ocr1Multiaddr?e.ocr1Multiaddr:null,ocr1P2PPeerID:""!==e.ocr1P2PPeerID?e.ocr1P2PPeerID:null,ocr1KeyBundleID:""!=e.ocr1KeyBundleID?e.ocr1KeyBundleID:null,ocr2Enabled:e.ocr2Enabled,ocr2IsBootstrap:e.ocr2IsBootstrap,ocr2Multiaddr:""!==e.ocr2Multiaddr?e.ocr2Multiaddr:null,ocr2P2PPeerID:""!==e.ocr2P2PPeerID?e.ocr2P2PPeerID:null,ocr2KeyBundleID:""!=e.ocr2KeyBundleID?e.ocr2KeyBundleID:null,ocr2Plugins:'{"commit":'.concat(e.ocr2CommitPluginEnabled,',"execute":').concat(e.ocr2ExecutePluginEnabled,',"median":').concat(e.ocr2MedianPluginEnabled,',"mercury":').concat(e.ocr2MercuryPluginEnabled,"}"),ocr2ForwarderAddress:""!==e.ocr2ForwarderAddress?e.ocr2ForwarderAddress:null}},r))];case 2:switch(null==(i=null===(t=(n=o.sent()).data)||void 0===t?void 0:t.updateFeedsManagerChainConfig)?void 0:i.__typename){case"UpdateFeedsManagerChainConfigSuccess":S(),s((0,ty.qt)("Updated supported chain"));break;case"NotFoundError":s((0,ty.LO)(i.message))}return[3,4];case 3:return u(a=o.sent()),[3,4];case 4:return[2]}})}),function(e){return r.apply(this,arguments)});return l.createElement(r9.Z,{className:i.card},l.createElement(sf.Z,{title:"Supported Chains",classes:{title:i.title},action:l.createElement(l.Fragment,null,l.createElement(y.default,{onClick:_,"aria-label":"open-menu"},l.createElement(of.Z,null)),l.createElement(t_.Z,{anchorEl:v,open:Boolean(v),onClose:S},l.createElement(tE.default,{onClick:function(){h(!0),S()}},l.createElement(ol.Z,null,l.createElement(xN.Z,null)),l.createElement(E.Z,null,"New"))))}),a.map(function(e){return l.createElement(mR.Z,{key:e.id,defaultExpanded:!1,classes:{root:i.panel,expanded:i.panelExpanded}},l.createElement(mj.Z,{expandIcon:l.createElement(gp.Z,null)},l.createElement(El.Z,{label:e.chainType,color:"primary",className:i.chip}),l.createElement(x.default,{style:{lineHeight:"30px"}},"Chain ID: ",e.chainID)),l.createElement(mF.Z,{className:i.panelDetails},l.createElement(d.Z,{container:!0,spacing:40},l.createElement(d.Z,{item:!0,xs:12},l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12,sm:6},l.createElement(ob,{title:"Account Address"}),l.createElement(om,{value:e.accountAddr})),l.createElement(d.Z,{item:!0,xs:12,sm:6},l.createElement(ob,{title:"Admin Address"}),l.createElement(om,{value:e.adminAddr})),l.createElement(Tc,{cfg:e.fluxMonitorJobConfig}),l.createElement(Tl,{cfg:e.ocr1JobConfig}),l.createElement(Tf,{cfg:e.ocr2JobConfig}))),l.createElement(d.Z,{item:!0,xs:12},l.createElement("div",{className:i.panelDetailsActions},l.createElement(aL.Z,{onClick:function(){return k(e)}},"Edit"),l.createElement(aL.Z,{onClick:function(){return D(e.id)},variant:"danger"},"Delete"))))))}),l.createElement(xB,{open:f,onClose:function(){return h(!1)},onSubmit:I}),l.createElement(xU,{cfg:b,open:M(),onClose:T,onSubmit:N}))}),Th=n(47298),Tp=n(81395),Tb=n(47559),Tm=n(83165);function Tg(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function Tv(e){if(Array.isArray(e))return e}function Ty(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function Tw(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function T_(e,t){return Tv(e)||Ty(e,t)||TE(e,t)||Tw()}function TE(e,t){if(e){if("string"==typeof e)return Tg(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return Tg(e,t)}}var TS=function(){return(0,b.createStyles)({root:{display:"flex"},connectedIcon:{color:Tb.default[500]},disconnectedIcon:{color:Tm.default[500]},text:{marginLeft:4}})},Tk=(0,b.withStyles)(TS)(function(e){var t=e.isConnected,n=e.classes;return l.createElement("div",{className:n.root},t?l.createElement(Tp.Z,{fontSize:"small",className:n.connectedIcon}):l.createElement(Th.Z,{fontSize:"small",className:n.disconnectedIcon}),l.createElement(x.default,{variant:"body1",inline:!0,className:n.text},t?"Connected":"Disconnected"))}),Tx=function(e){var t=e.manager,n=T_(l.useState(null),2),r=n[0],i=n[1],a=function(e){i(e.currentTarget)},o=function(){i(null)};return l.createElement(op,{actions:l.createElement("div",null,l.createElement(y.default,{onClick:a,"aria-label":"open-menu"},l.createElement(of.Z,null)),l.createElement(t_.Z,{anchorEl:r,open:Boolean(r),onClose:o},l.createElement(tN,{to:"/feeds_manager/edit"},l.createElement(ol.Z,null,l.createElement(ou.Z,null)),l.createElement(E.Z,null,"Edit"))))},l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12,sm:6,md:3},l.createElement(ob,{title:"Status"}),l.createElement(Tk,{isConnected:t.isConnectionActive})),l.createElement(d.Z,{item:!0,xs:12,sm:6,md:3},l.createElement(ob,{title:"Name"}),l.createElement(om,{value:t.name})),l.createElement(d.Z,{item:!0,xs:12,sm:6,md:3},l.createElement(ob,{title:"CSA Public Key"}),l.createElement(om,null,_A(t.publicKey,{start:6,end:6}),l.createElement(_O,{data:t.publicKey}))),l.createElement(d.Z,{item:!0,xs:12,sm:6,md:3},l.createElement(ob,{title:"RPC URL"}),l.createElement(om,{value:t.uri}))))},TT=(0,b.withStyles)(ic)(function(e){var t=e.classes,n=e.proposals;return l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,"ID"),l.createElement(ie.default,null,"Name"),l.createElement(ie.default,null,"External Job ID"),l.createElement(ie.default,null,"Latest Version"),l.createElement(ie.default,null,"Last Proposed"),l.createElement(ie.default,null))),l.createElement(r7.Z,null,null==n?void 0:n.map(function(e){return l.createElement(ii.Z,{key:e.id,className:t.row,hover:!0},l.createElement(ie.default,{className:t.cell,component:"th",scope:"row"},l.createElement(ip,{className:t.link,href:"/job_proposals/".concat(e.id)},e.id)),l.createElement(ie.default,null,e.name||"--"),l.createElement(ie.default,null,e.externalJobID||"--"),l.createElement(ie.default,null,e.latestSpec.version),l.createElement(ie.default,null,l.createElement(aA,{tooltip:!0},e.latestSpec.createdAt)),l.createElement(ie.default,{align:"right"},e.pendingUpdate&&l.createElement(El.Z,{color:"primary"},"Update Available")))})))}),TM=(0,b.withStyles)(ic)(function(e){var t=e.classes,n=e.proposals;return l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,"ID"),l.createElement(ie.default,null,"Name"),l.createElement(ie.default,null,"Latest Version"),l.createElement(ie.default,null,"Last Proposed"),l.createElement(ie.default,null))),l.createElement(r7.Z,null,null==n?void 0:n.map(function(e){return l.createElement(ii.Z,{key:e.id,className:t.row,hover:!0},l.createElement(ie.default,{className:t.cell,component:"th",scope:"row"},l.createElement(ip,{className:t.link,href:"/job_proposals/".concat(e.id)},e.id)),l.createElement(ie.default,null,e.name||"--"),l.createElement(ie.default,null,e.latestSpec.version),l.createElement(ie.default,null,l.createElement(aA,{tooltip:!0},e.latestSpec.createdAt)),l.createElement(ie.default,{align:"right"},e.pendingUpdate&&l.createElement(El.Z,{label:"Update Available",color:"primary"})))})))}),TO=(0,b.withStyles)(ic)(function(e){var t=e.classes,n=e.proposals;return l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,"ID"),l.createElement(ie.default,null,"Name"),l.createElement(ie.default,null,"Last Proposed"))),l.createElement(r7.Z,null,null==n?void 0:n.map(function(e){return l.createElement(ii.Z,{key:e.id,className:t.row,hover:!0},l.createElement(ie.default,{className:t.cell,component:"th",scope:"row"},l.createElement(ip,{className:t.link,href:"/job_proposals/".concat(e.id)},e.id)),l.createElement(ie.default,null,e.name||"--"),l.createElement(ie.default,null,l.createElement(aA,{tooltip:!0},e.latestSpec.createdAt)))})))}),TA=(0,b.withStyles)(ic)(function(e){var t=e.classes,n=e.proposals;return l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,"ID"),l.createElement(ie.default,null,"Name"),l.createElement(ie.default,null,"External Job ID"),l.createElement(ie.default,null,"Latest Version"),l.createElement(ie.default,null,"Last Proposed"))),l.createElement(r7.Z,null,null==n?void 0:n.map(function(e){return l.createElement(ii.Z,{key:e.id,className:t.row,hover:!0},l.createElement(ie.default,{className:t.cell,component:"th",scope:"row"},l.createElement(ip,{className:t.link,href:"/job_proposals/".concat(e.id)},e.id)),l.createElement(ie.default,null,e.name||"--"),l.createElement(ie.default,null,e.externalJobID||"--"),l.createElement(ie.default,null,e.latestSpec.version),l.createElement(ie.default,null,l.createElement(aA,{tooltip:!0},e.latestSpec.createdAt)))})))});function TL(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function TC(e){if(Array.isArray(e))return e}function TI(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function TD(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function TN(e,t){return TC(e)||TI(e,t)||TP(e,t)||TD()}function TP(e,t){if(e){if("string"==typeof e)return TL(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return TL(e,t)}}var TR={0:"PENDING",1:"UPDATES",2:"APPROVED",3:"REJECTED",4:"CANCELLED",5:"DELETED",6:"REVOKED"},Tj=function(e){return(0,b.createStyles)({tabsRoot:{borderBottom:"1px solid #e8e8e8"},badge:{padding:"0 ".concat(2*e.spacing.unit,"px")}})},TF=function(e){var t=e.toLowerCase();return function(e){return e.toLowerCase().includes(t)}},TY=function(e){return function(t){return""===e||TB(t,e)}};function TB(e,t){var n,r=TF(t),i=[e.id,e.remoteUUID,null!==(n=e.name)&&void 0!==n?n:"",];return e.externalJobID&&i.push(e.externalJobID),i.some(r)}var TU=(0,b.withStyles)(Tj)(function(e){var t=e.classes,n=e.proposals,r=TN(l.useState(0),2),i=r[0],a=r[1],o=TN(l.useState(""),2),s=o[0],u=o[1],c=l.useMemo(function(){var e={PENDING:0,UPDATES:0,APPROVED:0,REJECTED:0,CANCELLED:0,DELETED:0,REVOKED:0};return n.forEach(function(t){if(t.pendingUpdate)switch(e.UPDATES++,t.status){case"APPROVED":e.APPROVED++;break;case"CANCELLED":e.CANCELLED++;break;case"REJECTED":e.REJECTED++;break;case"DELETED":e.DELETED++;break;case"REVOKED":e.REVOKED++}"PENDING"===t.status&&e.PENDING++}),e},[n]),f=l.useMemo(function(){return n?"UPDATES"===TR[i]?n.filter(function(e){return e.pendingUpdate&&TY(s)(e)}).sort(function(e,t){return t.latestSpec.createdAt-e.latestSpec.createdAt}):n.filter(function(e){return e.status===TR[i]&&TY(s)(e)}).sort(function(e,t){return t.latestSpec.createdAt-e.latestSpec.createdAt}):[]},[i,n,s]),d=function(e){switch(TR[i]){case"PENDING":return l.createElement(TO,{proposals:e});case"UPDATES":return l.createElement(TA,{proposals:e});case"REJECTED":case"CANCELLED":case"DELETED":case"REVOKED":return l.createElement(TM,{proposals:e});case"APPROVED":return l.createElement(TT,{proposals:e});default:return null}};return l.createElement(l.Fragment,null,l.createElement(iS,{value:s,onChange:u,placeholder:"Search job proposals"}),l.createElement(r9.Z,null,l.createElement(vJ.Z,{value:i,className:t.tabsRoot,indicatorColor:"primary",onChange:function(e,t){a(t)}},l.createElement(vQ.Z,{label:l.createElement(vX.Z,{color:"primary",badgeContent:c.PENDING,className:t.badge,"data-testid":"pending-badge"},"New")}),l.createElement(vQ.Z,{label:l.createElement(vX.Z,{color:"primary",badgeContent:c.UPDATES,className:t.badge,"data-testid":"updates-badge"},"Updates")}),l.createElement(vQ.Z,{label:l.createElement(vX.Z,{color:"primary",badgeContent:c.APPROVED,className:t.badge,"data-testid":"approved-badge"},"Approved")}),l.createElement(vQ.Z,{label:l.createElement(vX.Z,{color:"primary",badgeContent:c.REJECTED,className:t.badge,"data-testid":"rejected-badge"},"Rejected")}),l.createElement(vQ.Z,{label:l.createElement(vX.Z,{color:"primary",badgeContent:c.CANCELLED,className:t.badge,"data-testid":"cancelled-badge"},"Cancelled")}),l.createElement(vQ.Z,{label:l.createElement(vX.Z,{color:"primary",badgeContent:c.DELETED,className:t.badge,"data-testid":"deleted-badge"},"Deleted")}),l.createElement(vQ.Z,{label:l.createElement(vX.Z,{color:"primary",badgeContent:c.REVOKED,className:t.badge,"data-testid":"revoked-badge"},"Revoked")})),d(f)))}),TH=function(){return(0,b.createStyles)({root:{fontSize:24}})},T$=(0,b.withStyles)(TH)(function(e){var t=e.children,n=e.classes;return l.createElement(x.default,{variant:"h2",className:n.root},t)}),Tz=function(e){var t=e.manager;return l.createElement(d.Z,{container:!0,spacing:16},l.createElement(d.Z,{item:!0,xs:12},l.createElement(iw,null,"Feeds Manager")),l.createElement(d.Z,{item:!0,xs:12},l.createElement(Tx,{manager:t})),l.createElement(d.Z,{item:!0,xs:12},l.createElement(Td,{cfgs:t.chainConfigs,mgrID:t.id})),l.createElement(d.Z,{item:!0,xs:12},l.createElement(T$,null,"Job Proposals")),l.createElement(d.Z,{item:!0,xs:12},l.createElement(TU,{proposals:t.jobProposals})))},TG=function(){var e=(0,h.TH)(),t=xQ({fetchPolicy:"cache-and-network"}),n=t.data,r=t.loading,i=t.error;if(r)return l.createElement(ij,null);if(i)return l.createElement(iN,{error:i});var a=void 0!=n&&n.feedsManagers.results.length>0?n.feedsManagers.results[0]:void 0;return n&&a?l.createElement(Tz,{manager:a}):l.createElement(h.l_,{to:{pathname:"/feeds_manager/new",state:{from:e}}})},TW={name:"Chainlink Feeds Manager",uri:"",publicKey:""},TK=function(e){var t=e.onSubmit;return l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12,md:11,lg:9},l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"Register Feeds Manager"}),l.createElement(aK.Z,null,l.createElement(xh,{initialValues:TW,onSubmit:t})))))};function TV(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function Tq(e){if(Array.isArray(e))return e}function TZ(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function TX(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){TZ(a,r,i,o,s,"next",e)}function s(e){TZ(a,r,i,o,s,"throw",e)}o(void 0)})}}function TJ(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function TQ(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function T1(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function T0(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){TJ(e,t,n[t])})}return e}function T2(e,t){return Tq(e)||TQ(e,t)||T4(e,t)||T1()}function T3(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function T4(e,t){if(e){if("string"==typeof e)return TV(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return TV(e,t)}}var T5=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}};function T6(){var e=T3(["\n  mutation CreateFeedsManager($input: CreateFeedsManagerInput!) {\n    createFeedsManager(input: $input) {\n      ... on CreateFeedsManagerSuccess {\n        feedsManager {\n          id\n          name\n          uri\n          publicKey\n          isConnectionActive\n          createdAt\n        }\n      }\n      ... on SingleFeedsManagerError {\n        message\n        code\n      }\n      ... on NotFoundError {\n        message\n        code\n      }\n      ... on InputErrors {\n        errors {\n          path\n          message\n          code\n        }\n      }\n    }\n  }\n"]);return T6=function(){return e},e}var T9=n0(T6()),T8=function(){var e=(0,h.k6)(),t=(0,h.TH)(),n=(0,A.I0)(),r=oZ().handleMutationError,i=xv(),a=i.data,o=i.loading,s=i.error,u=T2(os(T9,{refetchQueries:[xg]}),1)[0];if(o)return l.createElement(ij,null);if(s)return l.createElement(iN,{error:s});var c,f=void 0!=a&&a.feedsManagers.results[0]?a.feedsManagers.results[0]:void 0,d=(c=TX(function(t,i){var a,o,s,c,l,f;return T5(this,function(d){switch(d.label){case 0:a=i.setErrors,d.label=1;case 1:return d.trys.push([1,3,,4]),[4,u(((c={}).variables={input:T0({},t)},c))];case 2:switch(null==(l=null===(o=(s=d.sent()).data)||void 0===o?void 0:o.createFeedsManager)?void 0:l.__typename){case"CreateFeedsManagerSuccess":e.push("/feeds_manager"),n((0,ty.qt)("Feeds Manager Created"));break;case"SingleFeedsManagerError":case"NotFoundError":n((0,ty.LO)(l.message));break;case"InputErrors":n((0,ty.LO)("Invalid Input")),a(wG(l))}return[3,4];case 3:return r(f=d.sent()),[3,4];case 4:return[2]}})}),function(e,t){return c.apply(this,arguments)});return f?l.createElement(h.l_,{to:{pathname:"/feeds_manager",state:{from:t}}}):l.createElement(TK,{onSubmit:d})},T7=function(){var e=(0,h.$B)().path;return l.createElement(iv,null,l.createElement(h.AW,{exact:!0,path:"".concat(e,"/new")},l.createElement(T8,null)),l.createElement(h.AW,{exact:!0,path:e},l.createElement(TG,null)),l.createElement(h.AW,{exact:!0,path:"".concat(e,"/edit")},l.createElement(xD,null)))},Me=function(e){var t=e.proposal,n=t.specs.find(function(e){return"APPROVED"===e.status});return l.createElement(op,null,l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12,sm:4,md:2},l.createElement(ob,{title:"Status"}),l.createElement(om,{value:ky(t.status)})),l.createElement(d.Z,{item:!0,xs:12,sm:4,md:4},l.createElement(ob,{title:"FMS UUID"}),l.createElement(om,{value:t.remoteUUID})),l.createElement(d.Z,{item:!0,xs:12,sm:4,md:4},l.createElement(ob,{title:"External Job ID"}),t.jobID&&t.externalJobID?l.createElement(om,null,l.createElement(ip,{color:"primary",href:"/jobs/".concat(t.jobID)},t.externalJobID)):l.createElement(om,{value:t.externalJobID||"--"})),l.createElement(d.Z,{item:!0,xs:12,sm:4,md:2},l.createElement(ob,{title:"Approved Version"}),l.createElement(om,{value:n?n.version:"--"}))))};function Mt(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function Mn(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){Mt(a,r,i,o,s,"next",e)}function s(e){Mt(a,r,i,o,s,"throw",e)}o(void 0)})}}var Mr=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}},Mi=function(){return(0,b.createStyles)({paperRoot:{width:700}})},Ma=by().shape({definition:p2().required("Required")}),Mo=(0,b.withStyles)(Mi)(function(e){var t,n=e.classes,r=e.initialValues,i=e.onClose,a=e.onSubmit,o=e.open;return l.createElement(hM,{initialValues:r,validationSchema:Ma,onSubmit:(t=Mn(function(e,t){return Mr(this,function(n){switch(n.label){case 0:return[4,a(e,t)];case 1:return n.sent(),i(),[2]}})}),function(e,n){return t.apply(this,arguments)})},function(e){var t=e.isSubmitting,r=e.submitForm;return l.createElement(hj,null,l.createElement(aN.Z,{open:o,onClose:i,classes:{paper:n.paperRoot}},l.createElement(oA.Z,{disableTypography:!0},l.createElement(x.default,{variant:"h5"},"Edit Job Spec")),l.createElement(oM.Z,null,l.createElement(hR,{component:hJ,id:"definition",name:"definition",label:"Job Spec",variant:"outlined",multiline:!0,rows:10,rowsMax:25,required:!0,autoComplete:"off",margin:"normal",fullWidth:!0,spellCheck:"false"})),l.createElement(oT.Z,null,l.createElement(ox.default,{onClick:i,variant:"text"},"Cancel"),l.createElement(ox.default,{variant:"contained",color:"primary",disabled:t,onClick:r},"Submit"))))})});function Ms(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function Mu(e){if(Array.isArray(e))return e}function Mc(e){if(Array.isArray(e))return Ms(e)}function Ml(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function Mf(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function Md(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function Mh(){throw TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function Mp(e,t){return Mu(e)||Mf(e,t)||Mg(e,t)||Md()}function Mb(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function Mm(e){return Mc(e)||Ml(e)||Mg(e)||Mh()}function Mg(e,t){if(e){if("string"==typeof e)return Ms(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return Ms(e,t)}}function Mv(){var e=Mb(["\n  fragment JobProposal_SpecsFields on JobProposalSpec {\n    id\n    definition\n    status\n    version\n    createdAt\n  }\n"]);return Mv=function(){return e},e}var My=n0(Mv()),Mw=function(e){return(0,b.createStyles)({versionText:{marginRight:2*e.spacing.unit},proposedAtContainer:{flex:1,textAlign:"right"},expansionPanelDetails:{display:"block"},actions:{display:"flex",marginBottom:2*e.spacing.unit},editContainer:{flex:1},actionsContainer:{flex:1,textAlign:"right"}})},M_={approve:{title:"Approve Job Proposal",body:"Approving this job proposal will start running a new job. WARNING: If a job using the same contract address already exists, it will be deleted before running the new one."},cancel:{title:"Cancel Job Proposal",body:"Cancelling this job proposal will delete the running job. Are you sure you want to cancel this job proposal?"},reject:{title:"Reject Job Proposal",body:"Are you sure you want to reject this job proposal?"}},ME=(0,b.withStyles)(Mw)(function(e){var t=e.classes,n=e.onApprove,r=e.onCancel,i=e.onReject,a=e.onUpdateSpec,o=e.specs,s=e.proposal,u=Mp(l.useState(null),2),c=u[0],f=u[1],d=Mp(l.useState(!1),2),h=d[0],p=d[1],b=function(e,t){f({action:e,id:t})},m=l.useMemo(function(){return o.reduce(function(e,t){return e.version>t.version?e:t})},[o]),g=l.useMemo(function(){return Mm(o).sort(function(e,t){return t.version-e.version})},[o]),v=function(e,t,n){switch(e){case"PENDING":return l.createElement(l.Fragment,null,l.createElement(ox.default,{variant:"text",color:"secondary",onClick:function(){return b("reject",t)}},"Reject"),m.id===t&&"DELETED"!==n.status&&"REVOKED"!==n.status&&l.createElement(ox.default,{variant:"contained",color:"primary",onClick:function(){return b("approve",t)}},"Approve"),m.id===t&&"DELETED"===n.status&&n.pendingUpdate&&l.createElement(l.Fragment,null,l.createElement(ox.default,{variant:"contained",color:"primary",onClick:function(){return b("cancel",t)}},"Cancel"),l.createElement(x.default,{color:"error"},"This proposal was deleted. Cancel the spec to delete any running jobs")));case"APPROVED":return l.createElement(l.Fragment,null,l.createElement(ox.default,{variant:"contained",onClick:function(){return b("cancel",t)}},"Cancel"),"DELETED"===n.status&&n.pendingUpdate&&l.createElement(x.default,{color:"error"},"This proposal was deleted. Cancel the spec to delete any running jobs"));case"CANCELLED":if(m.id===t&&"DELETED"!==n.status&&"REVOKED"!==n.status)return l.createElement(ox.default,{variant:"contained",color:"primary",onClick:function(){return b("approve",t)}},"Approve");return null;default:return null}};return l.createElement("div",null,g.map(function(e,n){return l.createElement(mR.Z,{defaultExpanded:0===n,key:n},l.createElement(mj.Z,{expandIcon:l.createElement(gp.Z,null)},l.createElement(x.default,{className:t.versionText},"Version ",e.version),l.createElement(El.Z,{label:e.status,color:"APPROVED"===e.status?"primary":"default",variant:"REJECTED"===e.status||"CANCELLED"===e.status?"outlined":"default"}),l.createElement("div",{className:t.proposedAtContainer},l.createElement(x.default,null,"Proposed ",l.createElement(aA,{tooltip:!0},e.createdAt)))),l.createElement(mF.Z,{className:t.expansionPanelDetails},l.createElement("div",{className:t.actions},l.createElement("div",{className:t.editContainer},0===n&&("PENDING"===e.status||"CANCELLED"===e.status)&&"DELETED"!==s.status&&"REVOKED"!==s.status&&l.createElement(ox.default,{variant:"contained",onClick:function(){return p(!0)}},"Edit")),l.createElement("div",{className:t.actionsContainer},v(e.status,e.id,s))),l.createElement(gh,{language:"toml",style:gu,"data-testid":"codeblock"},e.definition)))}),l.createElement(oI,{open:null!=c,title:c?M_[c.action].title:"",body:c?M_[c.action].body:"",onConfirm:function(){if(c){switch(c.action){case"approve":n(c.id);break;case"cancel":r(c.id);break;case"reject":i(c.id)}f(null)}},cancelButtonText:"Cancel",onCancel:function(){return f(null)}}),l.createElement(Mo,{open:h,onClose:function(){return p(!1)},initialValues:{definition:m.definition,id:m.id},onSubmit:a}))});function MS(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function Mk(){var e=MS(["\n  ","\n  fragment JobProposalPayloadFields on JobProposal {\n    id\n    externalJobID\n    remoteUUID\n    jobID\n    specs {\n      ...JobProposal_SpecsFields\n    }\n    status\n    pendingUpdate\n  }\n"]);return Mk=function(){return e},e}var Mx=n0(Mk(),My),MT=function(e){var t=e.onApprove,n=e.onCancel,r=e.onReject,i=e.onUpdateSpec,a=e.proposal;return l.createElement(iv,null,l.createElement(d.Z,{container:!0,spacing:32},l.createElement(d.Z,{item:!0,xs:9},l.createElement(iw,null,"Job Proposal #",a.id))),l.createElement(Me,{proposal:a}),l.createElement(d.Z,{container:!0,spacing:32},l.createElement(d.Z,{item:!0,xs:9},l.createElement(T$,null,"Specs"))),l.createElement(d.Z,{container:!0,spacing:32},l.createElement(d.Z,{item:!0,xs:12},l.createElement(ME,{proposal:a,specs:a.specs,onReject:r,onApprove:t,onCancel:n,onUpdateSpec:i}))))};function MM(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function MO(e){if(Array.isArray(e))return e}function MA(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function ML(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){MA(a,r,i,o,s,"next",e)}function s(e){MA(a,r,i,o,s,"throw",e)}o(void 0)})}}function MC(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function MI(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function MD(e,t){return MO(e)||MC(e,t)||MP(e,t)||MI()}function MN(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function MP(e,t){if(e){if("string"==typeof e)return MM(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return MM(e,t)}}var MR=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}};function Mj(){var e=MN(["\n  ","\n  query FetchJobProposal($id: ID!) {\n    jobProposal(id: $id) {\n      __typename\n      ... on JobProposal {\n        ...JobProposalPayloadFields\n      }\n      ... on NotFoundError {\n        message\n      }\n    }\n  }\n"]);return Mj=function(){return e},e}function MF(){var e=MN(["\n  mutation UpdateJobProposalSpecDefinition(\n    $id: ID!\n    $input: UpdateJobProposalSpecDefinitionInput!\n  ) {\n    updateJobProposalSpecDefinition(id: $id, input: $input) {\n      ... on UpdateJobProposalSpecDefinitionSuccess {\n        __typename\n      }\n      ... on NotFoundError {\n        message\n      }\n    }\n  }\n"]);return MF=function(){return e},e}function MY(){var e=MN(["\n  mutation RejectJobProposalSpec($id: ID!) {\n    rejectJobProposalSpec(id: $id) {\n      ... on RejectJobProposalSpecSuccess {\n        spec {\n          id\n        }\n      }\n      ... on NotFoundError {\n        message\n      }\n    }\n  }\n"]);return MY=function(){return e},e}function MB(){var e=MN(["\n  mutation ApproveJobProposalSpec($id: ID!, $force: Boolean) {\n    approveJobProposalSpec(id: $id, force: $force) {\n      ... on ApproveJobProposalSpecSuccess {\n        spec {\n          id\n        }\n      }\n      ... on NotFoundError {\n        message\n      }\n    }\n  }\n"]);return MB=function(){return e},e}function MU(){var e=MN(["\n  mutation CancelJobProposalSpec($id: ID!) {\n    cancelJobProposalSpec(id: $id) {\n      ... on CancelJobProposalSpecSuccess {\n        spec {\n          id\n        }\n      }\n      ... on NotFoundError {\n        message\n      }\n    }\n  }\n"]);return MU=function(){return e},e}var MH=n0(Mj(),Mx),M$=n0(MF()),Mz=n0(MY()),MG=n0(MB()),MW=n0(MU()),MK=function(){var e=(0,h.UO)().id,t=(0,A.I0)(),n=(0,h.k6)(),r=oZ().handleMutationError,i=ry(MH,{variables:{id:e}}),a=i.data,o=i.loading,s=i.error,u=MD(os(M$,{refetchQueries:[MH]}),1)[0],c=MD(os(Mz,{refetchQueries:[MH]}),1)[0],f=MD(os(MG,{refetchQueries:[MH]}),1)[0],d=MD(os(MW,{refetchQueries:[MH]}),1)[0];if(o)return l.createElement(ij,null);if(s)return l.createElement(iN,{error:s});var p,b,m,g,v=(p=ML(function(e){var n,i,a,o,s;return MR(this,function(c){switch(c.label){case 0:return c.trys.push([0,2,,3]),[4,u(((a={}).variables={id:e.id,input:{definition:e.definition}},a))];case 1:switch(null==(o=null===(n=(i=c.sent()).data)||void 0===n?void 0:n.updateJobProposalSpecDefinition)?void 0:o.__typename){case"UpdateJobProposalSpecDefinitionSuccess":t((0,ty.qt)("Spec updated"));break;case"NotFoundError":t((0,ty.LO)(o.message))}return[3,3];case 2:return r(s=c.sent()),[3,3];case 3:return[2]}})}),function(e){return p.apply(this,arguments)}),y=(b=ML(function(e){var n,i,a,o,s;return MR(this,function(u){switch(u.label){case 0:return u.trys.push([0,2,,3]),[4,c(((a={}).variables={id:e},a))];case 1:switch(null==(o=null===(n=(i=u.sent()).data)||void 0===n?void 0:n.rejectJobProposalSpec)?void 0:o.__typename){case"RejectJobProposalSpecSuccess":t((0,ty.qt)("Spec rejected"));break;case"NotFoundError":t((0,ty.LO)(o.message))}return[3,3];case 2:return r(s=u.sent()),[3,3];case 3:return[2]}})}),function(e){return b.apply(this,arguments)}),w=(m=ML(function(e){var n,i,a,o,s;return MR(this,function(u){switch(u.label){case 0:return u.trys.push([0,2,,3]),[4,d(((a={}).variables={id:e},a))];case 1:switch(null==(o=null===(n=(i=u.sent()).data)||void 0===n?void 0:n.cancelJobProposalSpec)?void 0:o.__typename){case"CancelJobProposalSpecSuccess":t((0,ty.qt)("Spec cancelled"));break;case"NotFoundError":t((0,ty.LO)(o.message))}return[3,3];case 2:return r(s=u.sent()),[3,3];case 3:return[2]}})}),function(e){return m.apply(this,arguments)}),_=(g=ML(function(e){var i,a,o,s,u;return MR(this,function(c){switch(c.label){case 0:return c.trys.push([0,2,,3]),[4,f(((o={}).variables={id:e,force:!0},o))];case 1:switch(null==(s=null===(i=(a=c.sent()).data)||void 0===i?void 0:i.approveJobProposalSpec)?void 0:s.__typename){case"ApproveJobProposalSpecSuccess":n.push("/feeds_manager"),setTimeout(function(){return t((0,ty.qt)("Spec approved"))},200);break;case"NotFoundError":t((0,ty.LO)(s.message))}return[3,3];case 2:return r(u=c.sent()),[3,3];case 3:return[2]}})}),function(e){return g.apply(this,arguments)}),E=null==a?void 0:a.jobProposal;switch(null==E?void 0:E.__typename){case"JobProposal":return l.createElement(MT,{proposal:E,onApprove:_,onCancel:w,onReject:y,onUpdateSpec:v});case"NotFoundError":return l.createElement(oo,null);default:return null}},MV=function(){var e=(0,h.$B)().path;return l.createElement(l.Fragment,null,l.createElement(h.AW,{exact:!0,path:"".concat(e,"/:id")},l.createElement(MK,null)))},Mq=function(e){var t=e.node;return l.createElement(op,null,l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12,sm:4,md:3},l.createElement(ob,{title:"EVM Chain ID"}),l.createElement(om,{value:t.chain.id})),l.createElement(d.Z,{item:!0,xs:!1,sm:!1,md:4}),l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(ob,{title:"HTTP URL"}),l.createElement(om,{value:""!==t.httpURL?t.httpURL:"--"})),l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(ob,{title:"WS URL"}),l.createElement(om,{value:""!==t.wsURL?t.wsURL:"--"}))))};function MZ(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function MX(){var e=MZ(["\n  fragment NodePayload_Fields on Node {\n    id\n    name\n    chain {\n      id\n    }\n    httpURL\n    wsURL\n    state\n    sendOnly\n    order\n  }\n"]);return MX=function(){return e},e}var MJ=n0(MX()),MQ=function(e){var t=e.node;return l.createElement(l.Fragment,null,l.createElement(iv,null,l.createElement(d.Z,{container:!0,spacing:16},l.createElement(d.Z,{item:!0,xs:12},l.createElement(iw,null,t.name)),l.createElement(d.Z,{item:!0,xs:12},l.createElement(Mq,{node:t})))))};function M1(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function M0(){var e=M1(["\n  ","\n  query FetchNode($id: ID!) {\n    node(id: $id) {\n      __typename\n      ... on Node {\n        ...NodePayload_Fields\n      }\n      ... on NotFoundError {\n        message\n      }\n    }\n  }\n"]);return M0=function(){return e},e}var M2=n0(M0(),MJ),M3=function(){var e=ry(M2,{variables:{id:(0,h.UO)().id}}),t=e.data,n=e.loading,r=e.error;if(n)return l.createElement(ij,null);if(r)return l.createElement(iN,{error:r});var i=null==t?void 0:t.node;switch(null==i?void 0:i.__typename){case"Node":return l.createElement(MQ,{node:i});case"NotFoundError":return l.createElement(oo,null);default:return null}},M4=(0,b.withStyles)(ic)(function(e){var t=e.node,n=e.classes;return l.createElement(ii.Z,{className:n.row,hover:!0},l.createElement(ie.default,{className:n.cell,component:"th",scope:"row"},l.createElement(ip,{className:n.link,href:"/nodes/".concat(t.name)},t.name)),l.createElement(ie.default,null,t.chain.id),l.createElement(ie.default,null,t.state),l.createElement(ie.default,null,t.sendOnly?"SendOnly":"Primary"),l.createElement(ie.default,null,t.order?t.order:"NA"))});function M5(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function M6(e){if(Array.isArray(e))return e}function M9(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function M8(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function M7(e,t){return M6(e)||M9(e,t)||Ot(e,t)||M8()}function Oe(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function Ot(e,t){if(e){if("string"==typeof e)return M5(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return M5(e,t)}}function On(){var e=Oe(["\n  fragment NodesPayload_ResultsFields on Node {\n    id\n    chain {\n      id\n    }\n    name\n    state\n    sendOnly\n    order\n  }\n"]);return On=function(){return e},e}var Or=n0(On()),Oi=function(e){var t=e.toLowerCase();return function(e){return e.toLowerCase().includes(t)}},Oa=function(e){return function(t){return""===e||Oo(t,e)}};function Oo(e,t){var n;return[e.id,e.name,e.chain.id].some(Oi(t))}var Os=function(e){var t=e.nodes,n=e.page,r=e.pageSize,i=e.total,a=(0,h.k6)(),o=M7(l.useState(""),2),s=o[0],u=o[1],c=l.useMemo(function(){return t.filter(Oa(s.trim()))},[s,t]);return l.createElement(iv,null,l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:9},l.createElement(iw,null,"Nodes")),l.createElement(d.Z,{item:!0,xs:12},l.createElement(iS,{value:s,onChange:u,placeholder:"Search nodes"}),l.createElement(r9.Z,null,l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,"Name"),l.createElement(ie.default,null,"EVM Chain ID"),l.createElement(ie.default,null,"State"),l.createElement(ie.default,null,"Type"),l.createElement(ie.default,null,"Order"))),l.createElement(r7.Z,null,0===c.length&&l.createElement(ii.Z,null,l.createElement(ie.default,{component:"th",scope:"row",colSpan:4},"No nodes found")),c.map(function(e){return l.createElement(M4,{key:e.id,node:e})}))),l.createElement(ir.Z,{component:"div",count:i,rowsPerPage:r,rowsPerPageOptions:[r],page:n-1,onChangePage:function(e,t){a.push("/nodes?page=".concat(t+1,"&per=").concat(r))},onChangeRowsPerPage:function(){},backIconButtonProps:{"aria-label":"prev-page"},nextIconButtonProps:{"aria-label":"next-page"}})))))};function Ou(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function Oc(){var e=Ou(["\n  ","\n  query FetchNodes($offset: Int, $limit: Int) {\n    nodes(offset: $offset, limit: $limit) {\n      results {\n        ...NodesPayload_ResultsFields\n      }\n      metadata {\n        total\n      }\n    }\n  }\n"]);return Oc=function(){return e},e}var Ol=n0(Oc(),Or),Of=function(){var e=iF(),t=parseInt(e.get("page")||"1",10),n=parseInt(e.get("per")||"100",10),r=ry(Ol,{variables:{offset:(t-1)*n,limit:n},fetchPolicy:"network-only"}),i=r.data,a=r.loading,o=r.error;return a?l.createElement(ij,null):o?l.createElement(iN,{error:o}):i?l.createElement(Os,{nodes:i.nodes.results,page:t,pageSize:n,total:i.nodes.metadata.total}):null},Od=function(){var e=(0,h.$B)().path;return l.createElement(h.rs,null,l.createElement(h.AW,{path:"".concat(e,"/:id")},l.createElement(M3,null)),l.createElement(h.AW,{exact:!0,path:e},l.createElement(Of,null)))},Oh=function(e){var t=e.tx;return l.createElement(op,null,l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12},l.createElement(ob,{title:"Txn Hash"}),l.createElement(om,{value:t.hash})),l.createElement(d.Z,{item:!0,xs:12,md:3},l.createElement(ob,{title:"Chain ID"}),l.createElement(om,{value:t.chain.id})),l.createElement(d.Z,{item:!0,xs:12,md:3},l.createElement(ob,{title:"Status"}),l.createElement(om,{value:ky(t.state)})),l.createElement(d.Z,{item:!0,xs:12,md:3},l.createElement(ob,{title:"Nonce"}),l.createElement(om,{value:t.nonce})),l.createElement(d.Z,{item:!0,xs:12,md:3},l.createElement(ob,{title:"Sent At (Block)"}),l.createElement(om,{value:t.sentAt})),l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(ob,{title:"From"}),l.createElement(om,{value:t.from})),l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(ob,{title:"To"}),l.createElement(om,{value:t.to})),l.createElement(d.Z,{item:!0,xs:12,md:3},l.createElement(ob,{title:"Value"}),l.createElement(om,{value:t.value})),l.createElement(d.Z,{item:!0,xs:!1,md:3}),l.createElement(d.Z,{item:!0,xs:12,md:3},l.createElement(ob,{title:"Gas Price"}),l.createElement(om,{value:t.gasPrice})),l.createElement(d.Z,{item:!0,xs:12,md:3},l.createElement(ob,{title:"Gas Limit"}),l.createElement(om,{value:t.gasLimit})),l.createElement(d.Z,{item:!0,xs:12},l.createElement(ob,{title:"Raw Hex"}),l.createElement(og,null,t.hex)),l.createElement(d.Z,{item:!0,xs:12},l.createElement(ob,{title:"Data"}),l.createElement(og,null,t.data))))};function Op(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function Ob(){var e=Op(["\n  fragment EthTransactionPayloadFields on EthTransaction {\n    chain {\n      id\n    }\n    data\n    from\n    gasLimit\n    gasPrice\n    hash\n    hex\n    nonce\n    sentAt\n    state\n    to\n    value\n  }\n"]);return Ob=function(){return e},e}var Om=n0(Ob()),Og=function(e){var t=e.tx;return l.createElement(iv,null,l.createElement(d.Z,{container:!0,spacing:16},l.createElement(d.Z,{item:!0,xs:12},l.createElement(iw,null,"Transaction Details")),l.createElement(d.Z,{item:!0,xs:12},l.createElement(Oh,{tx:t}))))};function Ov(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function Oy(){var e=Ov(["\n  ","\n  query FetchEthTransaction($hash: ID!) {\n    ethTransaction(hash: $hash) {\n      __typename\n      ... on EthTransaction {\n        ...EthTransactionPayloadFields\n      }\n      ... on NotFoundError {\n        message\n      }\n    }\n  }\n"]);return Oy=function(){return e},e}var Ow=n0(Oy(),Om),O_=function(){var e=ry(Ow,{variables:{hash:(0,h.UO)().id}}),t=e.data,n=e.loading,r=e.error;if(n)return l.createElement(ij,null);if(r)return l.createElement(iN,{error:r});var i=null==t?void 0:t.ethTransaction;switch(null==i?void 0:i.__typename){case"EthTransaction":return l.createElement(Og,{tx:i});case"NotFoundError":return l.createElement(oo,null);default:return null}},OE=(0,b.withStyles)(ic)(function(e){var t=e.tx,n=e.classes;return l.createElement(ii.Z,{className:n.row,hover:!0},l.createElement(ie.default,{className:n.cell,component:"th",scope:"row"},l.createElement(ip,{className:n.link,href:"/transactions/".concat(t.hash)},_A(t.hash,{start:8,end:8}))),l.createElement(ie.default,null,t.chain.id),l.createElement(ie.default,null,_A(t.from,{start:8,end:8})),l.createElement(ie.default,null,_A(t.to,{start:8,end:8})),l.createElement(ie.default,null,t.nonce),l.createElement(ie.default,null,t.sentAt||"--"))});function OS(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function Ok(){var e=OS(["\n  fragment EthTransactionsPayload_ResultsFields on EthTransaction {\n    chain {\n      id\n    }\n    from\n    hash\n    to\n    nonce\n    sentAt\n  }\n"]);return Ok=function(){return e},e}var Ox=n0(Ok()),OT=function(e){var t=e.data,n=e.loading,r=e.page,i=e.pageSize,a=(0,h.k6)();return l.createElement(iv,null,l.createElement(d.Z,{container:!0,spacing:32},l.createElement(d.Z,{item:!0,xs:12},l.createElement(iw,null,"Transactions")),n&&l.createElement(ij,null),t&&l.createElement(d.Z,{item:!0,xs:12},l.createElement(r9.Z,null,l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,"Txn Hash"),l.createElement(ie.default,null,"Chain ID"),l.createElement(ie.default,null,"From"),l.createElement(ie.default,null,"To"),l.createElement(ie.default,null,"Nonce"),l.createElement(ie.default,null,"Block"))),l.createElement(r7.Z,null,(null==t?void 0:t.ethTransactions.results.length)===0&&l.createElement(ii.Z,null,l.createElement(ie.default,{component:"th",scope:"row",colSpan:6},"You haven’t created any transactions yet")),null==t?void 0:t.ethTransactions.results.map(function(e,t){return l.createElement(OE,{tx:e,key:t})}))),l.createElement(ir.Z,{component:"div",count:t.ethTransactions.metadata.total,rowsPerPage:i,rowsPerPageOptions:[10,25,50,100],page:r-1,onChangePage:function(e,t){a.push("/transactions?page=".concat(t+1,"&per=").concat(i))},onChangeRowsPerPage:function(e){a.push("/transactions?page=".concat(r,"&per=").concat(parseInt(e.target.value,10)))},backIconButtonProps:{"aria-label":"prev-page"},nextIconButtonProps:{"aria-label":"next-page"}})))))};function OM(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function OO(){var e=OM(["\n  ","\n  query FetchEthTransactions($offset: Int, $limit: Int) {\n    ethTransactions(offset: $offset, limit: $limit) {\n      results {\n        ...EthTransactionsPayload_ResultsFields\n      }\n      metadata {\n        total\n      }\n    }\n  }\n"]);return OO=function(){return e},e}var OA=n0(OO(),Ox),OL=function(){var e=iF(),t=parseInt(e.get("page")||"1",10),n=parseInt(e.get("per")||"25",10),r=ry(OA,{variables:{offset:(t-1)*n,limit:n},fetchPolicy:"cache-and-network"}),i=r.data,a=r.loading,o=r.error;return o?l.createElement(iN,{error:o}):l.createElement(OT,{data:i,loading:a,page:t,pageSize:n})},OC=function(){var e=(0,h.$B)().path;return l.createElement(h.rs,null,l.createElement(h.AW,{path:"".concat(e,"/:id")},l.createElement(O_,null)),l.createElement(h.AW,{exact:!0,path:e},l.createElement(OL,null)))};function OI(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function OD(e){if(Array.isArray(e))return e}function ON(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function OP(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function OR(e,t){return OD(e)||ON(e,t)||Oj(e,t)||OP()}function Oj(e,t){if(e){if("string"==typeof e)return OI(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return OI(e,t)}}e=n.hmd(e);var OF=function(e){return{content:{marginTop:0,marginBottom:5*e.spacing.unit}}},OY=function(e){var t=e.classes,n=OR(l.useState(0),2),r=n[0],i=n[1],a=null;return l.createElement(d.Z,{container:!0,spacing:0},l.createElement(d.Z,{item:!0,xs:12},l.createElement(r1,{onResize:function(e,t){return i(t)},drawerContainer:a}),l.createElement("main",{ref:function(e){a=e},style:{paddingTop:r}},l.createElement(r0.ZP,null),l.createElement("div",{className:t.content},l.createElement(h.rs,null,l.createElement(r6,{exact:!0,path:"/"},l.createElement(vx,null)),l.createElement(r6,{exact:!0,path:"/chains"},l.createElement(iG,null)),l.createElement(r6,{path:"/chains/:chainId"},l.createElement(oe,null)),l.createElement(r6,{path:"/bridges"},l.createElement(b6,null)),l.createElement(r6,{path:"/config"},l.createElement(gL,null)),l.createElement(r6,{path:"/feeds_manager"},l.createElement(T7,null)),l.createElement(r6,{path:"/job_proposals"},l.createElement(MV,null)),l.createElement(r6,{path:"/jobs"},l.createElement(_y,null)),l.createElement(r6,{path:"/runs"},l.createElement(xf,null)),l.createElement(r6,{path:"/keys"},l.createElement(ka,null)),l.createElement(r6,{path:"/nodes"},l.createElement(Od,null)),l.createElement(r6,{path:"/transactions"},l.createElement(OC,null)),l.createElement(r6,{component:oo}))))))};let OB=(0,p.wU)(e)((0,b.withStyles)(OF)(OY))},26842(e,t,n){"use strict";n.d(t,{iw:()=>U,tA:()=>$,KL:()=>H,Iw:()=>V,DQ:()=>W,cB:()=>T,LO:()=>M,t5:()=>k,qt:()=>x,Jc:()=>C,L7:()=>Y,EO:()=>B});var r,i,a=n(66289),o=n(41800),s=n.n(o),u=n(67932);(i=r||(r={})).IN_PROGRESS="in_progress",i.PENDING_INCOMING_CONFIRMATIONS="pending_incoming_confirmations",i.PENDING_CONNECTION="pending_connection",i.PENDING_BRIDGE="pending_bridge",i.PENDING_SLEEP="pending_sleep",i.ERRORED="errored",i.COMPLETED="completed";var c=n(87013),l=n(19084),f=n(34823);function d(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function h(e){if(Array.isArray(e))return d(e)}function p(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function b(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){p(a,r,i,o,s,"next",e)}function s(e){p(a,r,i,o,s,"throw",e)}o(void 0)})}}function m(e,t){return null!=t&&"undefined"!=typeof Symbol&&t[Symbol.hasInstance]?!!t[Symbol.hasInstance](e):e instanceof t}function g(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function v(){throw TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function y(e){return h(e)||g(e)||w(e)||v()}function w(e,t){if(e){if("string"==typeof e)return d(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return d(e,t)}}var _=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}},E=function(e,t){return{type:t,error:e.stack,errors:[]}},S=function(e,t){return function(n){m(n,a._7)?I(e):e(E(n,t))}},k=function(e,t){return{type:l.Ih.NOTIFY_SUCCESS,component:e,props:t}},x=function(e){return{type:l.Ih.NOTIFY_SUCCESS_MSG,msg:e}},T=function(e,t){return{type:l.Ih.NOTIFY_ERROR,component:e,error:t}},M=function(e){return{type:l.Ih.NOTIFY_ERROR_MSG,msg:e}},O=function(e){return{type:l.Mk.RECEIVE_SIGNIN_SUCCESS,authenticated:e.data.attributes.authenticated}},A=function(){return{type:l.Mk.RECEIVE_SIGNIN_FAIL}};function L(e){return function(t){return t({type:l.Mk.REQUEST_SIGNIN}),u.i.createSession(e).then(function(e){return t(O(e))}).catch(function(n){if(m(n,a._7))try{if(0==n.errors.length||null===n.errors[0].detail){t(A());return}n.errors[0].detail.json().then(function(n){if(!n){t(A());return}try{var r=JSON.parse(n.errors[0].detail);if(r.publicKey.challenge=D(r.publicKey.challenge),r.publicKey.allowCredentials.forEach(function(e){e.id=D(e.id)}),void 0===navigator.credentials){alert("Could not access credential subsystem in the browser. Must be using HTTPS or localhost."),t(A());return}navigator.credentials.get({publicKey:r.publicKey}).then(function(n){if(null===n){t(A());return}var r=n,i=r.response,a=i.authenticatorData,o=i.clientDataJSON,s=r.rawId,c=i.signature,l=i.userHandle,f=JSON.stringify({id:n.id,rawId:N(s),type:n.type,response:{authenticatorData:N(a),clientDataJSON:N(o),signature:N(c),userHandle:N(l)}});return e.webauthndata=f,u.i.createSession(e).then(function(e){return t(O(e))}).catch(function(e){t(A())})})}catch(i){t(A())}}).catch(function(e){t(A())})}catch(r){t(A())}else t(E(n,l.Mk.RECEIVE_SIGNIN_ERROR))})}}var C=function(){return{type:l.Mk.RECEIVE_SIGNOUT_SUCCESS,authenticated:!1}};function I(e){return u.i.destroySession().then(function(){return e(C())}).catch(function(t){if(m(t,a._7)){e(C());return}e(E(t,l.Mk.RECEIVE_SIGNIN_ERROR))})}function D(e){return Uint8Array.from(atob(e),function(e){return e.charCodeAt(0)})}function N(e){if(null===e)return"";var t=new Uint8Array(e),n=String.fromCharCode.apply(null,Array.from(t));return btoa(n).replace(/\+/g,"-").replace(/\//g,"_").replace(/=/g,"")}function P(e){var t=e.data.attributes.settings;return t.publicKey.challenge=D(t.publicKey.challenge),t.publicKey.user.id=D(t.publicKey.user.id),t.publicKey.excludeCredentials&&t.publicKey.excludeCredentials.forEach(function(e){e.id=D(e.id)}),navigator.credentials.create({publicKey:t.publicKey})}function R(){if(void 0===navigator.credentials){alert("Could not access credential subsystem in the browser. Must be using HTTPS or localhost.");return}return u.v2.webauthn.beginKeyRegistration({}).then(function(e){return P(e).then(function(e){if(null===e){alert("Error, could not generate credential. User declined to enroll?");return}var t=e,n=t.response,r={id:e.id,rawId:N(t.rawId),type:e.type,response:{attestationObject:N(n.attestationObject),clientDataJSON:N(n.clientDataJSON)}};return u.v2.webauthn.finishKeyRegistration(r)})}).catch(function(e){alert("Key registration error, ensure MFA_RPID and MFA_RPORIGIN environment variables are set.\n"+e)})}var j={type:l.jp.RECEIVE_CREATE_SUCCESS},F=function(e){return{type:l.jp.RECEIVE_DELETE_SUCCESS,id:e}},Y=function(e){return L(e)},B=function(){return I},U=function(){return R()},H=function(e,t,n){return function(r){return r({type:l.jp.REQUEST_DELETE}),u.v2.chains.destroyChain(e).then(function(n){r(F(e)),r(k(t,n))}).catch(function(e){S(r,l.jp.RECEIVE_DELETE_ERROR)(e),r(T(n,e))})}},$=function(e,t,n,r){return function(i){return i({type:l.jp.REQUEST_CREATE}),u.v2.jobs.createJobRunV2(e,t).then(function(e){i(j),i(k(n,e))}).catch(function(e){S(i,l.jp.RECEIVE_CREATE_ERROR)(e),i(T(r,e))})}},z=function(e){return function(t){m(t,a._7)?e(C()):e(T(function(e){return e.msg},t))}};function G(e,t,n,r){var i="UPSERT"===t?"REQUEST_".concat(e):"REQUEST_".concat(t,"_").concat(e),a="UPSERT"===t?"RESPONSE_".concat(e):"RESPONSE_".concat(t,"_").concat(e),o="".concat(t,"_").concat(e);return function(){for(var e=arguments.length,t=Array(e),s=0;s<e;s++)t[s]=arguments[s];return function(e){return e({type:i}),n.apply(void 0,y(t)).then(function(t){e({type:o,data:r(t)})}).catch(z(e)).finally(function(){return e({type:a})})}}}function W(){var e;return e=b(function(e,t){var n,r,i,a,o,s,d,h,p,b,m;return _(this,function(g){switch(g.label){case 0:if(e(n=((r={}).type=l.Y0.FETCH_BUILD_INFO_REQUESTED,r)),i=(0,f.N)(t()),o={},i.commitSHA!==c.Y.commitSHA&&i.version!==c.Y.version)return e(a=(o.type=l.Y0.FETCH_BUILD_INFO_SUCCEEDED,o.buildInfo=i,o)),[2];g.label=1;case 1:return g.trys.push([1,3,,4]),[4,u.v2.buildInfo.show()];case 2:return s=g.sent(),e(d=((h={}).type=l.Y0.FETCH_BUILD_INFO_SUCCEEDED,h.buildInfo=s,h)),[3,4];case 3:return p=g.sent(),e(b=((m={}).type=l.Y0.FETCH_BUILD_INFO_FAILED,m.error=p,m)),z(e)(p),[3,4];case 4:return[2]}})}),function(t,n){return e.apply(this,arguments)}}function K(e,t,n){return G(e,"DELETE",t,n)}var V=function(e){return K("ERRORED_JOB_RUNS",u.v2.bulkDeleteRuns.bulkDeleteJobRuns,s())({status:[r.ERRORED],updatedBefore:e})}},67932(e,t,n){"use strict";n.d(t,{i:()=>j,v2:()=>F});var r=n(66289);function i(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}var a="/sessions",o="/sessions",s=function e(t){var n=this;i(this,e),this.api=t,this.createSession=function(e){return n.create(e)},this.destroySession=function(){return n.destroy()},this.create=this.api.createResource(a),this.destroy=this.api.deleteResource(o)};function u(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}var c="/v2/bulk_delete_runs",l=function e(t){var n=this;u(this,e),this.api=t,this.bulkDeleteJobRuns=function(e){return n.destroy(e)},this.destroy=this.api.deleteResource(c)};function f(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}var d="/v2/chains/evm",h="".concat(d,"/:id"),p=function e(t){var n=this;f(this,e),this.api=t,this.getChains=function(){return n.index()},this.createChain=function(e){return n.create(e)},this.destroyChain=function(e){return n.destroy(void 0,{id:e})},this.updateChain=function(e,t){return n.update(t,{id:e})},this.index=this.api.fetchResource(d),this.create=this.api.createResource(d),this.destroy=this.api.deleteResource(h),this.update=this.api.updateResource(h)};function b(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}var m="/v2/keys/evm/chain",g=function e(t){var n=this;b(this,e),this.api=t,this.chain=function(e){var t=new URLSearchParams;t.append("address",e.address),t.append("evmChainID",e.evmChainID),null!==e.nextNonce&&t.append("nextNonce",e.nextNonce),null!==e.abandon&&t.append("abandon",String(e.abandon)),null!==e.enabled&&t.append("enabled",String(e.enabled));var r=m+"?"+t.toString();return n.api.createResource(r)()}};function v(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}var y="/v2/jobs",w="".concat(y,"/:specId/runs"),_=function e(t){var n=this;v(this,e),this.api=t,this.createJobRunV2=function(e,t){return n.post(t,{specId:e})},this.post=this.api.createResource(w,!0)};function E(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}var S="/v2/log",k=function e(t){var n=this;E(this,e),this.api=t,this.getLogConfig=function(){return n.show()},this.updateLogConfig=function(e){return n.update(e)},this.show=this.api.fetchResource(S),this.update=this.api.updateResource(S)};function x(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}var T="/v2/nodes",M=function e(t){var n=this;x(this,e),this.api=t,this.getNodes=function(){return n.index()},this.createNode=function(e){return n.create(e)},this.index=this.api.fetchResource(T),this.create=this.api.createResource(T)};function O(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}var A="/v2/enroll_webauthn",L=function e(t){var n=this;O(this,e),this.api=t,this.beginKeyRegistration=function(e){return n.create(e)},this.finishKeyRegistration=function(e){return n.put(e)},this.create=this.api.fetchResource(A),this.put=this.api.createResource(A)};function C(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}var I="/v2/build_info",D=function e(t){var n=this;C(this,e),this.api=t,this.show=function(){return n.api.GET(I)()}};function N(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}var P=function e(t){N(this,e),this.api=t,this.buildInfo=new D(this.api),this.bulkDeleteRuns=new l(this.api),this.chains=new p(this.api),this.logConfig=new k(this.api),this.nodes=new M(this.api),this.jobs=new _(this.api),this.webauthn=new L(this.api),this.evmKeys=new g(this.api)},R=new r.V0({base:void 0}),j=new s(R),F=new P(R)},1398(e,t,n){"use strict";n.d(t,{Z:()=>d});var r=n(67294),i=n(32316),a=n(83638),o=n(94184),s=n.n(o);function u(){return(u=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}var c=function(e){var t=e.palette;return(0,i.createStyles)({default:{borderColor:"#BECAD6","&:hover":{backgroundColor:t.common.white,borderColor:"#BECAD6",boxShadow:"0 2px 4px 0 rgba(0,123,255,0.06), 0 2px 2px 0 rgba(0,0,0,0.06)"}},primary:{boxShadow:"0 0",backgroundColor:t.primary.main,color:t.common.white,"&:hover":{backgroundColor:t.primary.main,boxShadow:"0 2px 4px 0 rgba(0,123,255,0.19), 0 2px 2px 0 rgba(0,0,0,0.15)"}},secondary:{"&:hover":{backgroundColor:t.common.white}},danger:{borderColor:t.error.main,color:t.error.main,"&:hover":{backgroundColor:t.common.white,borderColor:t.error.main,boxShadow:"0 2px 4px 0 rgba(0,123,255,0.06), 0 2px 2px 0 rgba(0,0,0,0.06)"}},defaultRipple:{color:t.text.secondary}})},l=function(e,t){switch(e){case"primary":return{variant:"contained"};case"secondary":case"danger":return{variant:"outlined",color:"primary"};default:return{variant:"outlined",color:"secondary",TouchRippleProps:{classes:{root:t.defaultRipple}}}}},f=function(e){var t=e.variant,n=void 0===t?"default":t,i=e.disabled,o=e.type,c=e.component,f=e.href,d=e.classes,h=e.className,p=e.children,b=e.onClick,m=e.onMouseLeave,g=Object.assign({component:c,disabled:i,href:f,onClick:b,type:o,size:e.size,onMouseLeave:m},l(n,d)),v=s()(d[n],h);return r.createElement(a.default,u({},g,{className:v}),p)};let d=(0,i.withStyles)(c)(f)},5536(e,t,n){"use strict";n.d(t,{T:()=>c});var r=n(67294),i=n(32316);function a(){return(a=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}var o=(0,i.createStyles)({animate:{animation:"spin 4s linear infinite"},"@keyframes spin":{"100%":{transform:"rotate(360deg)"}}}),s=function(e){var t=e.src,n=e.width,i=e.height,a=e.alt,o=e.classes,s=e.spin,u=void 0!==s&&s;return r.createElement("img",{src:t,className:u?o.animate:"",alt:a,width:n,height:i})},u=(0,i.withStyles)(o)(s),c=function(e){return r.createElement(u,a({},e))}},3950(e,t,n){"use strict";n.d(t,{ZP:()=>x,jK:()=>v});var r=n(67294),i=n(55977),a=n(45697),o=n.n(a),s=n(82204),u=n(71426),c=n(94184),l=n.n(c),f=n(32316),d=function(e){var t=e.palette.success||{},n=e.palette.warning||{};return{base:{paddingLeft:5*e.spacing.unit,paddingRight:5*e.spacing.unit},success:{backgroundColor:t.main,color:t.contrastText},error:{backgroundColor:e.palette.error.dark,color:e.palette.error.contrastText},warning:{backgroundColor:n.contrastText,color:n.main}}},h=function(e){var t,n=e.success,r=e.error,i=e.warning,a=e.classes,o=e.className;return n?t=a.success:r?t=a.error:i&&(t=a.warning),l()(a.base,o,t)},p=function(e){return r.createElement(s.Z,{className:h(e),square:!0},r.createElement(u.default,{variant:"body2",color:"inherit",component:"div"},e.children))};p.defaultProps={success:!1,error:!1,warning:!1},p.propTypes={success:o().bool,error:o().bool,warning:o().bool};let b=(0,f.withStyles)(d)(p);var m=function(){return r.createElement(r.Fragment,null,"Unhandled error. Please help us by opening a"," ",r.createElement("a",{href:"https://github.com/smartcontractkit/chainlink/issues/new"},"bug report"))};let g=m;function v(e){return"string"==typeof e?e:e.component?e.component(e.props):r.createElement(g,null)}function y(e,t){var n;return n="string"==typeof e?e:e.component?e.component(e.props):r.createElement(g,null),r.createElement("p",{key:t},n)}var w=function(e){var t=e.notifications;return r.createElement(b,{error:!0},t.map(y))},_=function(e){var t=e.notifications;return r.createElement(b,{success:!0},t.map(y))},E=function(e){var t=e.errors,n=e.successes;return r.createElement("div",null,(null==t?void 0:t.length)>0&&r.createElement(w,{notifications:t}),n.length>0&&r.createElement(_,{notifications:n}))},S=function(e){return{errors:e.notifications.errors,successes:e.notifications.successes}},k=(0,i.$j)(S)(E);let x=k},9409(e,t,n){"use strict";n.d(t,{ZP:()=>j});var r=n(67294),i=n(55977),a=n(47886),o=n(32316),s=n(1398),u=n(82204),c=n(30060),l=n(71426),f=n(60520),d=n(97779),h=n(57209),p=n(26842),b=n(3950),m=n(5536),g=n(45697),v=n.n(g);let y=n.p+"9f6d832ef97e8493764e.svg";function w(){return(w=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}var _=function(e){return r.createElement(m.T,w({src:y,alt:"Chainlink Operator"},e))};_.propTypes={width:v().number,height:v().number};let E=_;var S=n(15857),k=function(e){return function(t){return(0,S.DE)(e,t)}};let x=k;var T=n(9541);function M(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function O(e){if(Array.isArray(e))return e}function A(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function L(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function C(e,t){return O(e)||A(e,t)||I(e,t)||L()}function I(e,t){if(e){if("string"==typeof e)return M(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return M(e,t)}}e=n.hmd(e);var D=function(e){return{container:{height:"100%"},cardContent:{paddingTop:6*e.spacing.unit,paddingLeft:4*e.spacing.unit,paddingRight:4*e.spacing.unit,"&:last-child":{paddingBottom:6*e.spacing.unit}},headerRow:{textAlign:"center"},error:{backgroundColor:e.palette.error.light,marginTop:2*e.spacing.unit},errorText:{color:e.palette.error.main}}},N=function(e){var t=C((0,r.useState)(""),2),n=t[0],i=t[1],o=C((0,r.useState)(""),2),h=o[0],p=o[1],m=function(e){return function(t){"email"===e&&i(t.target.value),"password"===e&&p(t.target.value)}},g=function(t){t.preventDefault(),e.submitSignIn({email:n,password:h})},v=e.classes,y=e.fetching,w=e.authenticated,_=e.errors;return w?r.createElement(a.l_,{to:(0,T.Tp)()||"/"}):r.createElement(d.Z,{container:!0,justify:"center",alignItems:"center",className:v.container,spacing:0},r.createElement(d.Z,{item:!0,xs:10,sm:6,md:4,lg:3,xl:2},r.createElement(u.Z,null,r.createElement(c.Z,{className:v.cardContent},r.createElement("form",{noValidate:!0,onSubmit:g},r.createElement(d.Z,{container:!0,spacing:8},r.createElement(d.Z,{item:!0,xs:12},r.createElement(d.Z,{container:!0,spacing:0},r.createElement(d.Z,{item:!0,xs:12,className:v.headerRow},r.createElement(E,{width:50})),r.createElement(d.Z,{item:!0,xs:12,className:v.headerRow},r.createElement(l.default,{variant:"h5"},"Operator")))),_.length>0&&_.map(function(e,t){return r.createElement(d.Z,{item:!0,xs:12,key:t},r.createElement(u.Z,{raised:!1,className:v.error},r.createElement(c.Z,null,r.createElement(l.default,{variant:"body1",className:v.errorText},(0,b.jK)(e)))))}),r.createElement(d.Z,{item:!0,xs:12},r.createElement(f.Z,{id:"email",label:"Email",margin:"normal",value:n,onChange:m("email"),error:_.length>0,variant:"outlined",fullWidth:!0})),r.createElement(d.Z,{item:!0,xs:12},r.createElement(f.Z,{id:"password",label:"Password",type:"password",autoComplete:"password",margin:"normal",value:h,onChange:m("password"),error:_.length>0,variant:"outlined",fullWidth:!0})),r.createElement(d.Z,{item:!0,xs:12},r.createElement(d.Z,{container:!0,spacing:0,justify:"center"},r.createElement(d.Z,{item:!0},r.createElement(s.Z,{type:"submit",variant:"primary"},"Access Account")))),y&&r.createElement(l.default,{variant:"body1",color:"textSecondary"},"Signing in...")))))))},P=function(e){return{fetching:e.authentication.fetching,authenticated:e.authentication.allowed,errors:e.notifications.errors}},R=(0,i.$j)(P,x({submitSignIn:p.L7}))(N);let j=(0,h.wU)(e)((0,o.withStyles)(D)(R))},16353(e,t,n){"use strict";n.d(t,{ZP:()=>H,rH:()=>U});var r,i=n(55977),a=n(15857),o=n(9541),s=n(19084);function u(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function c(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){u(e,t,n[t])})}return e}function l(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),n.push.apply(n,r)}return n}function f(e,t){return t=null!=t?t:{},Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):l(Object(t)).forEach(function(n){Object.defineProperty(e,n,Object.getOwnPropertyDescriptor(t,n))}),e}var d,h=c({},{allowed:!1,errors:[]},o.pm()),p=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:h,t=arguments.length>1?arguments[1]:void 0;switch(t.type){case s.Mk.RECEIVE_SIGNOUT_SUCCESS:case s.Mk.RECEIVE_SIGNIN_SUCCESS:var n={allowed:t.authenticated};return o.Ks(n),f(c({},e,n),{errors:[]});case s.Mk.RECEIVE_SIGNIN_FAIL:var r={allowed:!1};return o.Ks(r),f(c({},e,r),{errors:[]});case s.Mk.RECEIVE_SIGNIN_ERROR:case s.Mk.RECEIVE_SIGNOUT_ERROR:var i={allowed:!1};return o.Ks(i),f(c({},e,i),{errors:t.errors||[]});default:return e}};let b=p;function m(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function g(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){m(e,t,n[t])})}return e}function v(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),n.push.apply(n,r)}return n}function y(e,t){return t=null!=t?t:{},Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):v(Object(t)).forEach(function(n){Object.defineProperty(e,n,Object.getOwnPropertyDescriptor(t,n))}),e}var w,_={count:0};(w=r||(r={})).REQUEST="REQUEST_",w.RECEIVE="RECEIVE_",w.RESPONSE="RESPONSE_";var E=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:_,t=arguments.length>1?arguments[1]:void 0;return t.type?t.type.startsWith(r.REQUEST)?y(g({},e),{count:e.count+1}):t.type.startsWith(r.RECEIVE)?y(g({},e),{count:Math.max(e.count-1,0)}):t.type.startsWith(r.RESPONSE)?y(g({},e),{count:Math.max(e.count-1,0)}):t.type===s.di.REDIRECT?y(g({},e),{count:0}):e:e};let S=E;function k(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function x(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){k(e,t,n[t])})}return e}function T(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),n.push.apply(n,r)}return n}function M(e,t){return t=null!=t?t:{},Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):T(Object(t)).forEach(function(n){Object.defineProperty(e,n,Object.getOwnPropertyDescriptor(t,n))}),e}var O={errors:[],successes:[],currentUrl:void 0},A=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:O,t=arguments.length>1?arguments[1]:void 0;switch(t.type){case s.di.MATCH_ROUTE:return M(x({},O),{currentUrl:t.pathname});case s.Ih.NOTIFY_SUCCESS:var n={component:t.component,props:t.props};return M(x({},e),{successes:[n],errors:[]});case s.Ih.NOTIFY_SUCCESS_MSG:return M(x({},e),{successes:[t.msg],errors:[]});case s.Ih.NOTIFY_ERROR:var r=t.error.errors,i=null==r?void 0:r.map(function(e){return L(t,e)});return M(x({},e),{successes:[],errors:i});case s.Ih.NOTIFY_ERROR_MSG:return M(x({},e),{successes:[],errors:[t.msg]});case s.Mk.RECEIVE_SIGNIN_FAIL:return M(x({},e),{successes:[],errors:["Your email or password is incorrect. Please try again"]});default:return e}};function L(e,t){return{component:e.component,props:{msg:t.detail}}}let C=A;function I(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function D(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){I(e,t,n[t])})}return e}function N(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),n.push.apply(n,r)}return n}function P(e,t){return t=null!=t?t:{},Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):N(Object(t)).forEach(function(n){Object.defineProperty(e,n,Object.getOwnPropertyDescriptor(t,n))}),e}var R={to:void 0},j=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:R,t=arguments.length>1?arguments[1]:void 0;switch(t.type){case s.di.REDIRECT:return P(D({},e),{to:t.to});case s.di.MATCH_ROUTE:return P(D({},e),{to:void 0});default:return e}};let F=j;var Y=n(87013),B=(0,a.UY)({authentication:b,fetching:S,notifications:C,redirect:F,buildInfo:Y.Z});B(void 0,{type:"INITIAL_STATE"});var U=i.v9;let H=B},19084(e,t,n){"use strict";var r,i,a,o,s,u,c,l,f,d;n.d(t,{Ih:()=>i,Mk:()=>a,Y0:()=>s,di:()=>r,jp:()=>o}),n(67294),(u=r||(r={})).REDIRECT="REDIRECT",u.MATCH_ROUTE="MATCH_ROUTE",(c=i||(i={})).NOTIFY_SUCCESS="NOTIFY_SUCCESS",c.NOTIFY_SUCCESS_MSG="NOTIFY_SUCCESS_MSG",c.NOTIFY_ERROR="NOTIFY_ERROR",c.NOTIFY_ERROR_MSG="NOTIFY_ERROR_MSG",(l=a||(a={})).REQUEST_SIGNIN="REQUEST_SIGNIN",l.RECEIVE_SIGNIN_SUCCESS="RECEIVE_SIGNIN_SUCCESS",l.RECEIVE_SIGNIN_FAIL="RECEIVE_SIGNIN_FAIL",l.RECEIVE_SIGNIN_ERROR="RECEIVE_SIGNIN_ERROR",l.RECEIVE_SIGNOUT_SUCCESS="RECEIVE_SIGNOUT_SUCCESS",l.RECEIVE_SIGNOUT_ERROR="RECEIVE_SIGNOUT_ERROR",(f=o||(o={})).RECEIVE_CREATE_ERROR="RECEIVE_CREATE_ERROR",f.RECEIVE_CREATE_SUCCESS="RECEIVE_CREATE_SUCCESS",f.RECEIVE_DELETE_ERROR="RECEIVE_DELETE_ERROR",f.RECEIVE_DELETE_SUCCESS="RECEIVE_DELETE_SUCCESS",f.RECEIVE_UPDATE_ERROR="RECEIVE_UPDATE_ERROR",f.RECEIVE_UPDATE_SUCCESS="RECEIVE_UPDATE_SUCCESS",f.REQUEST_CREATE="REQUEST_CREATE",f.REQUEST_DELETE="REQUEST_DELETE",f.REQUEST_UPDATE="REQUEST_UPDATE",f.UPSERT_CONFIGURATION="UPSERT_CONFIGURATION",f.UPSERT_JOB_RUN="UPSERT_JOB_RUN",f.UPSERT_JOB_RUNS="UPSERT_JOB_RUNS",f.UPSERT_TRANSACTION="UPSERT_TRANSACTION",f.UPSERT_TRANSACTIONS="UPSERT_TRANSACTIONS",f.UPSERT_BUILD_INFO="UPSERT_BUILD_INFO",(d=s||(s={})).FETCH_BUILD_INFO_REQUESTED="FETCH_BUILD_INFO_REQUESTED",d.FETCH_BUILD_INFO_SUCCEEDED="FETCH_BUILD_INFO_SUCCEEDED",d.FETCH_BUILD_INFO_FAILED="FETCH_BUILD_INFO_FAILED"},87013(e,t,n){"use strict";n.d(t,{Y:()=>o,Z:()=>u});var r=n(19084);function i(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function a(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){i(e,t,n[t])})}return e}var o={commitSHA:"unknown",version:"unknown"},s=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:o,t=arguments.length>1?arguments[1]:void 0;return t.type===r.Y0.FETCH_BUILD_INFO_SUCCEEDED?a({},t.buildInfo):e};let u=s},34823(e,t,n){"use strict";n.d(t,{N:()=>r});var r=function(e){return e.buildInfo}},73343(e,t,n){"use strict";n.d(t,{r:()=>u});var r=n(19350),i=n(32316),a=n(59114),o=n(5324),s={props:{MuiGrid:{spacing:3*o.default.unit},MuiCardHeader:{titleTypographyProps:{color:"secondary"}}},palette:{action:{hoverOpacity:.3},primary:{light:"#E5F1FF",main:"#3c40c6",contrastText:"#fff"},secondary:{main:"#3d5170"},success:{light:"#e8faf1",main:r.ek.A700,dark:r.ek[700],contrastText:r.y0.white},warning:{light:"#FFFBF1",main:"#fff6b6",contrastText:"#fad27a"},error:{light:"#ffdada",main:"#f44336",dark:"#d32f2f",contrastText:"#fff"},background:{default:"#f5f6f8",appBar:"#3c40c6"},text:{primary:(0,a.darken)(r.BA.A700,.7),secondary:"#818ea3"},listPendingStatus:{background:"#fef7e5",color:"#fecb4c"},listCompletedStatus:{background:"#e9faf2",color:"#4ed495"}},shape:{borderRadius:o.default.unit},overrides:{MuiButton:{root:{borderRadius:o.default.unit/2,textTransform:"none"},sizeLarge:{padding:void 0,fontSize:void 0,paddingTop:o.default.unit,paddingBottom:o.default.unit,paddingLeft:5*o.default.unit,paddingRight:5*o.default.unit}},MuiTableCell:{body:{fontSize:"1rem"},head:{fontSize:"1rem",fontWeight:400}},MuiCardHeader:{root:{borderBottom:"1px solid rgba(0, 0, 0, 0.12)"},action:{marginTop:-2,marginRight:0,"& >*":{marginLeft:2*o.default.unit}},subheader:{marginTop:.5*o.default.unit}}},typography:{useNextVariants:!0,fontFamily:"-apple-system,BlinkMacSystemFont,Roboto,Helvetica,Arial,sans-serif",button:{textTransform:"none",fontSize:"1.2em"},body1:{fontSize:"1.0rem",fontWeight:400,lineHeight:"1.46429em",color:"rgba(0, 0, 0, 0.87)",letterSpacing:-.4},body2:{fontSize:"1.0rem",fontWeight:500,lineHeight:"1.71429em",color:"rgba(0, 0, 0, 0.87)",letterSpacing:-.4},body1Next:{color:"rgb(29, 29, 29)",fontWeight:400,fontSize:"1rem",lineHeight:1.5,letterSpacing:-.4},body2Next:{color:"rgb(29, 29, 29)",fontWeight:400,fontSize:"0.875rem",lineHeight:1.5,letterSpacing:-.4},display1:{color:"#818ea3",fontSize:"2.125rem",fontWeight:400,lineHeight:"1.20588em",letterSpacing:-.4},display2:{color:"#818ea3",fontSize:"2.8125rem",fontWeight:400,lineHeight:"1.13333em",marginLeft:"-.02em",letterSpacing:-.4},display3:{color:"#818ea3",fontSize:"3.5rem",fontWeight:400,lineHeight:"1.30357em",marginLeft:"-.02em",letterSpacing:-.4},display4:{fontSize:14,fontWeightLight:300,fontWeightMedium:500,fontWeightRegular:400,letterSpacing:-.4},h1:{color:"rgb(29, 29, 29)",fontSize:"6rem",fontWeight:300,lineHeight:1},h2:{color:"rgb(29, 29, 29)",fontSize:"3.75rem",fontWeight:300,lineHeight:1},h3:{color:"rgb(29, 29, 29)",fontSize:"3rem",fontWeight:400,lineHeight:1.04},h4:{color:"rgb(29, 29, 29)",fontSize:"2.125rem",fontWeight:400,lineHeight:1.17},h5:{color:"rgb(29, 29, 29)",fontSize:"1.5rem",fontWeight:400,lineHeight:1.33,letterSpacing:-.4},h6:{fontSize:"0.8rem",fontWeight:450,lineHeight:"1.71429em",color:"rgba(0, 0, 0, 0.87)",letterSpacing:-.4},subheading:{color:"rgb(29, 29, 29)",fontSize:"1rem",fontWeight:400,lineHeight:"1.5em",letterSpacing:-.4},subtitle1:{color:"rgb(29, 29, 29)",fontSize:"1rem",fontWeight:400,lineHeight:1.75,letterSpacing:-.4},subtitle2:{color:"rgb(29, 29, 29)",fontSize:"0.875rem",fontWeight:500,lineHeight:1.57,letterSpacing:-.4}},shadows:["none","0px 1px 3px 0px rgba(0, 0, 0, 0.1),0px 1px 1px 0px rgba(0, 0, 0, 0.04),0px 2px 1px -1px rgba(0, 0, 0, 0.02)","0px 1px 5px 0px rgba(0, 0, 0, 0.1),0px 2px 2px 0px rgba(0, 0, 0, 0.04),0px 3px 1px -2px rgba(0, 0, 0, 0.02)","0px 1px 8px 0px rgba(0, 0, 0, 0.1),0px 3px 4px 0px rgba(0, 0, 0, 0.04),0px 3px 3px -2px rgba(0, 0, 0, 0.02)","0px 2px 4px -1px rgba(0, 0, 0, 0.1),0px 4px 5px 0px rgba(0, 0, 0, 0.04),0px 1px 10px 0px rgba(0, 0, 0, 0.02)","0px 3px 5px -1px rgba(0, 0, 0, 0.1),0px 5px 8px 0px rgba(0, 0, 0, 0.04),0px 1px 14px 0px rgba(0, 0, 0, 0.02)","0px 3px 5px -1px rgba(0, 0, 0, 0.1),0px 6px 10px 0px rgba(0, 0, 0, 0.04),0px 1px 18px 0px rgba(0, 0, 0, 0.02)","0px 4px 5px -2px rgba(0, 0, 0, 0.1),0px 7px 10px 1px rgba(0, 0, 0, 0.04),0px 2px 16px 1px rgba(0, 0, 0, 0.02)","0px 5px 5px -3px rgba(0, 0, 0, 0.1),0px 8px 10px 1px rgba(0, 0, 0, 0.04),0px 3px 14px 2px rgba(0, 0, 0, 0.02)","0px 5px 6px -3px rgba(0, 0, 0, 0.1),0px 9px 12px 1px rgba(0, 0, 0, 0.04),0px 3px 16px 2px rgba(0, 0, 0, 0.02)","0px 6px 6px -3px rgba(0, 0, 0, 0.1),0px 10px 14px 1px rgba(0, 0, 0, 0.04),0px 4px 18px 3px rgba(0, 0, 0, 0.02)","0px 6px 7px -4px rgba(0, 0, 0, 0.1),0px 11px 15px 1px rgba(0, 0, 0, 0.04),0px 4px 20px 3px rgba(0, 0, 0, 0.02)","0px 7px 8px -4px rgba(0, 0, 0, 0.1),0px 12px 17px 2px rgba(0, 0, 0, 0.04),0px 5px 22px 4px rgba(0, 0, 0, 0.02)","0px 7px 8px -4px rgba(0, 0, 0, 0.1),0px 13px 19px 2px rgba(0, 0, 0, 0.04),0px 5px 24px 4px rgba(0, 0, 0, 0.02)","0px 7px 9px -4px rgba(0, 0, 0, 0.1),0px 14px 21px 2px rgba(0, 0, 0, 0.04),0px 5px 26px 4px rgba(0, 0, 0, 0.02)","0px 8px 9px -5px rgba(0, 0, 0, 0.1),0px 15px 22px 2px rgba(0, 0, 0, 0.04),0px 6px 28px 5px rgba(0, 0, 0, 0.02)","0px 8px 10px -5px rgba(0, 0, 0, 0.1),0px 16px 24px 2px rgba(0, 0, 0, 0.04),0px 6px 30px 5px rgba(0, 0, 0, 0.02)","0px 8px 11px -5px rgba(0, 0, 0, 0.1),0px 17px 26px 2px rgba(0, 0, 0, 0.04),0px 6px 32px 5px rgba(0, 0, 0, 0.02)","0px 9px 11px -5px rgba(0, 0, 0, 0.1),0px 18px 28px 2px rgba(0, 0, 0, 0.04),0px 7px 34px 6px rgba(0, 0, 0, 0.02)","0px 9px 12px -6px rgba(0, 0, 0, 0.1),0px 19px 29px 2px rgba(0, 0, 0, 0.04),0px 7px 36px 6px rgba(0, 0, 0, 0.02)","0px 10px 13px -6px rgba(0, 0, 0, 0.1),0px 20px 31px 3px rgba(0, 0, 0, 0.04),0px 8px 38px 7px rgba(0, 0, 0, 0.02)","0px 10px 13px -6px rgba(0, 0, 0, 0.1),0px 21px 33px 3px rgba(0, 0, 0, 0.04),0px 8px 40px 7px rgba(0, 0, 0, 0.02)","0px 10px 14px -6px rgba(0, 0, 0, 0.1),0px 22px 35px 3px rgba(0, 0, 0, 0.04),0px 8px 42px 7px rgba(0, 0, 0, 0.02)","0px 11px 14px -7px rgba(0, 0, 0, 0.1),0px 23px 36px 3px rgba(0, 0, 0, 0.04),0px 9px 44px 8px rgba(0, 0, 0, 0.02)","0px 11px 15px -7px rgba(0, 0, 0, 0.1),0px 24px 38px 3px rgba(0, 0, 0, 0.04),0px 9px 46px 8px rgba(0, 0, 0, 0.02)",]},u=(0,i.createMuiTheme)(s)},66289(e,t,n){"use strict";function r(e){if(void 0===e)throw ReferenceError("this hasn't been initialised - super() hasn't been called");return e}function i(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}function a(){if("undefined"==typeof Reflect||!Reflect.construct||Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],function(){})),!0}catch(e){return!1}}function o(e,t,n){return(o=a()?Reflect.construct:function(e,t,n){var r=[null];r.push.apply(r,t);var i=new(Function.bind.apply(e,r));return n&&f(i,n.prototype),i}).apply(null,arguments)}function s(e){return(s=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function u(e,t){if("function"!=typeof t&&null!==t)throw TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&f(e,t)}function c(e){return -1!==Function.toString.call(e).indexOf("[native code]")}function l(e,t){return t&&("object"===p(t)||"function"==typeof t)?t:r(e)}function f(e,t){return(f=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}n.d(t,{V0:()=>B,_7:()=>v});var d,h,p=function(e){return e&&"undefined"!=typeof Symbol&&e.constructor===Symbol?"symbol":typeof e};function b(e){var t="function"==typeof Map?new Map:void 0;return(b=function(e){if(null===e||!c(e))return e;if("function"!=typeof e)throw TypeError("Super expression must either be null or a function");if(void 0!==t){if(t.has(e))return t.get(e);t.set(e,n)}function n(){return o(e,arguments,s(this).constructor)}return n.prototype=Object.create(e.prototype,{constructor:{value:n,enumerable:!1,writable:!0,configurable:!0}}),f(n,e)})(e)}function m(){if("undefined"==typeof Reflect||!Reflect.construct||Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){})),!0}catch(e){return!1}}function g(e){var t=m();return function(){var n,r=s(e);if(t){var i=s(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return l(this,n)}}var v=function(e){u(n,e);var t=g(n);function n(e){var r;return i(this,n),(r=t.call(this,"AuthenticationError(".concat(e.statusText,")"))).errors=[{status:e.status,detail:e},],r}return n}(b(Error)),y=function(e){u(n,e);var t=g(n);function n(e){var r,a=e.errors;return i(this,n),(r=t.call(this,"BadRequestError")).errors=a,r}return n}(b(Error)),w=function(e){u(n,e);var t=g(n);function n(e){var r;return i(this,n),(r=t.call(this,"UnprocessableEntityError")).errors=e,r}return n}(b(Error)),_=function(e){u(n,e);var t=g(n);function n(e){var r;return i(this,n),(r=t.call(this,"ServerError")).errors=e,r}return n}(b(Error)),E=function(e){u(n,e);var t=g(n);function n(e){var r,a=e.errors;return i(this,n),(r=t.call(this,"ConflictError")).errors=a,r}return n}(b(Error)),S=function(e){u(n,e);var t=g(n);function n(e){var r;return i(this,n),(r=t.call(this,"UnknownResponseError(".concat(e.statusText,")"))).errors=[{status:e.status,detail:e.statusText},],r}return n}(b(Error));function k(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:2e4;return Promise.race([fetch(e,t),new Promise(function(e,t){return setTimeout(function(){return t(Error("timeout"))},n)}),])}function x(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function T(e){if(Array.isArray(e))return e}function M(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function O(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function A(e,t){return T(e)||M(e,t)||L(e,t)||O()}function L(e,t){if(e){if("string"==typeof e)return x(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return x(e,t)}}function C(e,t){return e===h.GET?function(){return{method:"GET",credentials:"include"}}:I(e,t)}function I(e,t){return function(n){return{method:e,body:t?n:JSON.stringify(n),credentials:"include",headers:{Accept:"application/json","Content-Type":"application/json"}}}}function D(e,t,n){var r;try{r=new URL(t,e)}catch(i){var a=i.message;throw Error("Error when creating url with path=".concat(t,", base=").concat(e,": ").concat(a))}return n&&Object.entries(n).forEach(function(e){var t=A(e,2),n=t[0],i=t[1];return"string"==typeof i?r.searchParams.append(n,i):void 0!=i?r.searchParams.append(n,i.toString()):void 0}),r}n(80204),(d=h||(h={})).GET="GET",d.POST="POST",d.PATCH="PATCH",d.DELETE="DELETE";var N=n(14779),P=n.n(N);function R(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function j(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){R(a,r,i,o,s,"next",e)}function s(e){R(a,r,i,o,s,"throw",e)}o(void 0)})}}function F(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}var Y=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}},B=function(){function e(t){F(this,e),this.options=t,this.fetchResource=this.methodFactory(h.GET),this.GET=this.methodFactory(h.GET),this.createResource=this.methodFactory(h.POST),this.POST=this.methodFactory(h.POST),this.updateResource=this.methodFactory(h.PATCH),this.PATCH=this.methodFactory(h.PATCH),this.deleteResource=this.methodFactory(h.DELETE),this.DELETE=this.methodFactory(h.DELETE)}return e.prototype.methodFactory=function(e){var t=this;return function(n,r){var i=P().compile(n);return function(a,o){var s,u=o?i(o):n,c=e===h.GET?a:{},l=D(null!==(s=t.options.base)&&void 0!==s?s:location.origin,u,c),f=C(e,r);return k(l.toString(),f(a)).then(function(e){return U(e)})}}},e}();function U(e){return H.apply(this,arguments)}function H(){return(H=j(function(e){var t,n,r;return Y(this,function(i){switch(i.label){case 0:if(204!==e.status)return[3,1];return[2,t={}];case 1:if(!(e.status>=200&&e.status<300))return[3,2];return[2,e.json()];case 2:if(400!==e.status)return[3,3];return[2,e.json().then(function(e){throw new y(e)})];case 3:if(401!==e.status)return[3,4];throw new v(e);case 4:if(422!==e.status)return[3,6];return[4,$(e)];case 5:throw n=i.sent(),new w(n);case 6:if(409!==e.status)return[3,7];return[2,e.json().then(function(e){throw new E(e)})];case 7:if(!(e.status>=500))return[3,9];return[4,$(e)];case 8:throw r=i.sent(),new _(r);case 9:throw new S(e);case 10:return[2]}})})).apply(this,arguments)}function $(e){return z.apply(this,arguments)}function z(){return(z=j(function(e){return Y(this,function(t){return[2,e.json().then(function(t){return t.errors?t.errors.map(function(t){return{status:e.status,detail:t.detail}}):G(e)}).catch(function(){return G(e)})]})})).apply(this,arguments)}function G(e){return[{status:e.status,detail:e.statusText},]}},50109(e,t,n){"use strict";n.d(t,{LK:()=>o,U2:()=>i,eT:()=>s,t8:()=>a});var r=n(12795);function i(e){return r.ZP.getItem("chainlink.".concat(e))}function a(e,t){r.ZP.setItem("chainlink.".concat(e),t)}function o(e){var t=i(e),n={};if(t)try{return JSON.parse(t)}catch(r){}return n}function s(e,t){a(e,JSON.stringify(t))}},9541(e,t,n){"use strict";n.d(t,{Ks:()=>u,Tp:()=>a,iR:()=>o,pm:()=>s});var r=n(50109),i="persistURL";function a(){return r.U2(i)||""}function o(e){r.t8(i,e)}function s(){return r.LK("authentication")}function u(e){r.eT("authentication",e)}},67121(e,t,n){"use strict";function r(e){var t,n=e.Symbol;return"function"==typeof n?n.observable?t=n.observable:(t=n("observable"),n.observable=t):t="@@observable",t}n.r(t),n.d(t,{default:()=>o}),e=n.hmd(e),i="undefined"!=typeof self?self:"undefined"!=typeof window?window:void 0!==n.g?n.g:e;var i,a=r(i);let o=a},2177(e,t,n){"use strict";n.d(t,{Z:()=>o});var r=!0,i="Invariant failed";function a(e,t){if(!e){if(r)throw Error(i);throw Error(i+": "+(t||""))}}let o=a},11742(e){e.exports=function(){var e=document.getSelection();if(!e.rangeCount)return function(){};for(var t=document.activeElement,n=[],r=0;r<e.rangeCount;r++)n.push(e.getRangeAt(r));switch(t.tagName.toUpperCase()){case"INPUT":case"TEXTAREA":t.blur();break;default:t=null}return e.removeAllRanges(),function(){"Caret"===e.type&&e.removeAllRanges(),e.rangeCount||n.forEach(function(t){e.addRange(t)}),t&&t.focus()}}},94633(e){function t(e,t){var n=e.length,a=Array(n),o={},s=n,u=r(t),c=i(e);for(t.forEach(function(e){if(!c.has(e[0])||!c.has(e[1]))throw Error("Unknown node. There is an unknown node in the supplied edges.")});s--;)o[s]||l(e[s],s,new Set);return a;function l(e,t,r){if(r.has(e)){var i;try{i=", node was:"+JSON.stringify(e)}catch(s){i=""}throw Error("Cyclic dependency"+i)}if(!c.has(e))throw Error("Found unknown node. Make sure to provided all involved nodes. Unknown node: "+JSON.stringify(e));if(!o[t]){o[t]=!0;var f=u.get(e)||new Set;if(t=(f=Array.from(f)).length){r.add(e);do{var d=f[--t];l(d,c.get(d),r)}while(t)r.delete(e)}a[--n]=e}}}function n(e){for(var t=new Set,n=0,r=e.length;n<r;n++){var i=e[n];t.add(i[0]),t.add(i[1])}return Array.from(t)}function r(e){for(var t=new Map,n=0,r=e.length;n<r;n++){var i=e[n];t.has(i[0])||t.set(i[0],new Set),t.has(i[1])||t.set(i[1],new Set),t.get(i[0]).add(i[1])}return t}function i(e){for(var t=new Map,n=0,r=e.length;n<r;n++)t.set(e[n],n);return t}e.exports=function(e){return t(n(e),e)},e.exports.array=t},70655(e,t,n){"use strict";n.d(t,{ZT:()=>i,pi:()=>a});var r=function(e,t){return(r=Object.setPrototypeOf||({__proto__:[]})instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n])})(e,t)};function i(e,t){if("function"!=typeof t&&null!==t)throw TypeError("Class extends value "+String(t)+" is not a constructor or null");function n(){this.constructor=e}r(e,t),e.prototype=null===t?Object.create(t):(n.prototype=t.prototype,new n)}var a=function(){return(a=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var i in t=arguments[n])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)}},25869(e,t,n){"use strict";function r(e,t){return t=t||{},new Promise(function(n,r){var i=new XMLHttpRequest,a=[],o=[],s={},u=function(){return{ok:2==(i.status/100|0),statusText:i.statusText,status:i.status,url:i.responseURL,text:function(){return Promise.resolve(i.responseText)},json:function(){return Promise.resolve(i.responseText).then(JSON.parse)},blob:function(){return Promise.resolve(new Blob([i.response]))},clone:u,headers:{keys:function(){return a},entries:function(){return o},get:function(e){return s[e.toLowerCase()]},has:function(e){return e.toLowerCase() in s}}}};for(var c in i.open(t.method||"get",e,!0),i.onload=function(){i.getAllResponseHeaders().replace(/^(.*?):[^\S\n]*([\s\S]*?)$/gm,function(e,t,n){a.push(t=t.toLowerCase()),o.push([t,n]),s[t]=s[t]?s[t]+","+n:n}),n(u())},i.onerror=r,i.withCredentials="include"==t.credentials,t.headers)i.setRequestHeader(c,t.headers[c]);i.send(t.body||null)})}n.r(t),n.d(t,{default:()=>r})},94927(e,t,n){function r(e,t){if(i("noDeprecation"))return e;var n=!1;function r(){if(!n){if(i("throwDeprecation"))throw Error(t);i("traceDeprecation")?console.trace(t):console.warn(t),n=!0}return e.apply(this,arguments)}return r}function i(e){try{if(!n.g.localStorage)return!1}catch(t){return!1}var r=n.g.localStorage[e];return null!=r&&"true"===String(r).toLowerCase()}e.exports=r},42473(e){"use strict";var t=function(){};e.exports=t},84763(e){e.exports=Worker},47529(e){e.exports=n;var t=Object.prototype.hasOwnProperty;function n(){for(var e={},n=0;n<arguments.length;n++){var r=arguments[n];for(var i in r)t.call(r,i)&&(e[i]=r[i])}return e}},52361(){},94616(){},90853(e,t,n){var r=n(34660);function i(e,t){e.prototype=Object.create(t.prototype),e.prototype.constructor=e,r(e,t)}e.exports=i,e.exports.__esModule=!0,e.exports.default=e.exports},66569(e){function t(e){return e&&e.__esModule?e:{default:e}}e.exports=t,e.exports.__esModule=!0,e.exports.default=e.exports},34660(e){function t(n,r){return e.exports=t=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(e,t){return e.__proto__=t,e},e.exports.__esModule=!0,e.exports.default=e.exports,t(n,r)}e.exports=t,e.exports.__esModule=!0,e.exports.default=e.exports},1644(e,t,n){"use strict";var r,i;function a(e){return!!e&&e<7}n.d(t,{I:()=>r,O:()=>a}),(i=r||(r={}))[i.loading=1]="loading",i[i.setVariables=2]="setVariables",i[i.fetchMore=3]="fetchMore",i[i.refetch=4]="refetch",i[i.poll=6]="poll",i[i.ready=7]="ready",i[i.error=8]="error"},30990(e,t,n){"use strict";n.d(t,{MS:()=>s,YG:()=>a,cA:()=>c,ls:()=>o});var r=n(23564);n(83952);var i=n(13154),a=Symbol();function o(e){return!!e.extensions&&Array.isArray(e.extensions[a])}function s(e){return e.hasOwnProperty("graphQLErrors")}var u=function(e){var t=(0,r.ev)((0,r.ev)((0,r.ev)([],e.graphQLErrors,!0),e.clientErrors,!0),e.protocolErrors,!0);return e.networkError&&t.push(e.networkError),t.map(function(e){return(0,i.s)(e)&&e.message||"Error message not found."}).join("\n")},c=function(e){function t(n){var r=n.graphQLErrors,i=n.protocolErrors,a=n.clientErrors,o=n.networkError,s=n.errorMessage,c=n.extraInfo,l=e.call(this,s)||this;return l.name="ApolloError",l.graphQLErrors=r||[],l.protocolErrors=i||[],l.clientErrors=a||[],l.networkError=o||null,l.message=s||u(l),l.extraInfo=c,l.__proto__=t.prototype,l}return(0,r.ZT)(t,e),t}(Error)},85317(e,t,n){"use strict";n.d(t,{K:()=>a});var r=n(67294),i=n(30320).aS?Symbol.for("__APOLLO_CONTEXT__"):"__APOLLO_CONTEXT__";function a(){var e=r.createContext[i];return e||(Object.defineProperty(r.createContext,i,{value:e=r.createContext({}),enumerable:!1,writable:!1,configurable:!0}),e.displayName="ApolloContext"),e}},21436(e,t,n){"use strict";n.d(t,{O:()=>i,k:()=>r});var r=Array.isArray;function i(e){return Array.isArray(e)&&e.length>0}},30320(e,t,n){"use strict";n.d(t,{DN:()=>s,JC:()=>l,aS:()=>o,mr:()=>i,sy:()=>a});var r=n(83952),i="function"==typeof WeakMap&&"ReactNative"!==(0,r.wY)(function(){return navigator.product}),a="function"==typeof WeakSet,o="function"==typeof Symbol&&"function"==typeof Symbol.for,s=o&&Symbol.asyncIterator,u="function"==typeof(0,r.wY)(function(){return window.document.createElement}),c=(0,r.wY)(function(){return navigator.userAgent.indexOf("jsdom")>=0})||!1,l=u&&!c},53712(e,t,n){"use strict";function r(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=Object.create(null);return e.forEach(function(e){e&&Object.keys(e).forEach(function(t){var r=e[t];void 0!==r&&(n[t]=r)})}),n}n.d(t,{o:()=>r})},10542(e,t,n){"use strict";n.d(t,{J:()=>o}),n(83952);var r=n(13154);function i(e){var t=new Set([e]);return t.forEach(function(e){(0,r.s)(e)&&a(e)===e&&Object.getOwnPropertyNames(e).forEach(function(n){(0,r.s)(e[n])&&t.add(e[n])})}),e}function a(e){if(__DEV__&&!Object.isFrozen(e))try{Object.freeze(e)}catch(t){if(t instanceof TypeError)return null;throw t}return e}function o(e){return __DEV__&&i(e),e}},14012(e,t,n){"use strict";n.d(t,{J:()=>a});var r=n(23564),i=n(53712);function a(e,t){return(0,i.o)(e,t,t.variables&&{variables:(0,r.pi)((0,r.pi)({},e&&e.variables),t.variables)})}},13154(e,t,n){"use strict";function r(e){return null!==e&&"object"==typeof e}n.d(t,{s:()=>r})},83952(e,t,n){"use strict";n.d(t,{ej:()=>u,kG:()=>c,wY:()=>h});var r,i=n(70655),a="Invariant Violation",o=Object.setPrototypeOf,s=void 0===o?function(e,t){return e.__proto__=t,e}:o,u=function(e){function t(n){void 0===n&&(n=a);var r=e.call(this,"number"==typeof n?a+": "+n+" (see https://github.com/apollographql/invariant-packages)":n)||this;return r.framesToPop=1,r.name=a,s(r,t.prototype),r}return(0,i.ZT)(t,e),t}(Error);function c(e,t){if(!e)throw new u(t)}var l=["debug","log","warn","error","silent"],f=l.indexOf("log");function d(e){return function(){if(l.indexOf(e)>=f)return(console[e]||console.log).apply(console,arguments)}}function h(e){try{return e()}catch(t){}}(r=c||(c={})).debug=d("debug"),r.log=d("log"),r.warn=d("warn"),r.error=d("error");let p=h(function(){return globalThis})||h(function(){return window})||h(function(){return self})||h(function(){return global})||h(function(){return h.constructor("return this")()});var b="__",m=[b,b].join("DEV");function g(){try{return Boolean(__DEV__)}catch(e){return Object.defineProperty(p,m,{value:"production"!==h(function(){return"production"}),enumerable:!1,configurable:!0,writable:!0}),p[m]}}let v=g();function y(e){try{return e()}catch(t){}}var w=y(function(){return globalThis})||y(function(){return window})||y(function(){return self})||y(function(){return global})||y(function(){return y.constructor("return this")()}),_=!1;function E(){!w||y(function(){return"production"})||y(function(){return process})||(Object.defineProperty(w,"process",{value:{env:{NODE_ENV:"production"}},configurable:!0,enumerable:!1,writable:!0}),_=!0)}function S(){_&&(delete w.process,_=!1)}E();var k=n(10143);function x(){return k.H,S()}function T(){__DEV__?c("boolean"==typeof v,v):c("boolean"==typeof v,39)}x(),T()},87462(e,t,n){"use strict";function r(){return(r=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}n.d(t,{Z:()=>r})},25821(e,t,n){"use strict";n.d(t,{Z:()=>s});var r=n(45695);function i(e){return(i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}var a=10,o=2;function s(e){return u(e,[])}function u(e,t){switch(i(e)){case"string":return JSON.stringify(e);case"function":return e.name?"[function ".concat(e.name,"]"):"[function]";case"object":if(null===e)return"null";return c(e,t);default:return String(e)}}function c(e,t){if(-1!==t.indexOf(e))return"[Circular]";var n=[].concat(t,[e]),r=d(e);if(void 0!==r){var i=r.call(e);if(i!==e)return"string"==typeof i?i:u(i,n)}else if(Array.isArray(e))return f(e,n);return l(e,n)}function l(e,t){var n=Object.keys(e);return 0===n.length?"{}":t.length>o?"["+h(e)+"]":"{ "+n.map(function(n){var r=u(e[n],t);return n+": "+r}).join(", ")+" }"}function f(e,t){if(0===e.length)return"[]";if(t.length>o)return"[Array]";for(var n=Math.min(a,e.length),r=e.length-n,i=[],s=0;s<n;++s)i.push(u(e[s],t));return 1===r?i.push("... 1 more item"):r>1&&i.push("... ".concat(r," more items")),"["+i.join(", ")+"]"}function d(e){var t=e[String(r.Z)];return"function"==typeof t?t:"function"==typeof e.inspect?e.inspect:void 0}function h(e){var t=Object.prototype.toString.call(e).replace(/^\[object /,"").replace(/]$/,"");if("Object"===t&&"function"==typeof e.constructor){var n=e.constructor.name;if("string"==typeof n&&""!==n)return n}return t}},45695(e,t,n){"use strict";n.d(t,{Z:()=>i});var r="function"==typeof Symbol&&"function"==typeof Symbol.for?Symbol.for("nodejs.util.inspect.custom"):void 0;let i=r},25217(e,t,n){"use strict";function r(e,t){if(!Boolean(e))throw Error(null!=t?t:"Unexpected invariant triggered.")}n.d(t,{Ye:()=>o,WU:()=>s,UG:()=>u});var i=n(45695);function a(e){var t=e.prototype.toJSON;"function"==typeof t||r(0),e.prototype.inspect=t,i.Z&&(e.prototype[i.Z]=t)}var o=function(){function e(e,t,n){this.start=e.start,this.end=t.end,this.startToken=e,this.endToken=t,this.source=n}return e.prototype.toJSON=function(){return{start:this.start,end:this.end}},e}();a(o);var s=function(){function e(e,t,n,r,i,a,o){this.kind=e,this.start=t,this.end=n,this.line=r,this.column=i,this.value=o,this.prev=a,this.next=null}return e.prototype.toJSON=function(){return{kind:this.kind,value:this.value,line:this.line,column:this.column}},e}();function u(e){return null!=e&&"string"==typeof e.kind}a(s)},87392(e,t,n){"use strict";function r(e){var t=e.split(/\r\n|[\n\r]/g),n=a(e);if(0!==n)for(var r=1;r<t.length;r++)t[r]=t[r].slice(n);for(var o=0;o<t.length&&i(t[o]);)++o;for(var s=t.length;s>o&&i(t[s-1]);)--s;return t.slice(o,s).join("\n")}function i(e){for(var t=0;t<e.length;++t)if(" "!==e[t]&&"	"!==e[t])return!1;return!0}function a(e){for(var t,n=!0,r=!0,i=0,a=null,o=0;o<e.length;++o)switch(e.charCodeAt(o)){case 13:10===e.charCodeAt(o+1)&&++o;case 10:n=!1,r=!0,i=0;break;case 9:case 32:++i;break;default:r&&!n&&(null===a||i<a)&&(a=i),r=!1}return null!==(t=a)&&void 0!==t?t:0}function o(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",n=arguments.length>2&&void 0!==arguments[2]&&arguments[2],r=-1===e.indexOf("\n"),i=" "===e[0]||"	"===e[0],a='"'===e[e.length-1],o="\\"===e[e.length-1],s=!r||a||o||n,u="";return s&&!(r&&i)&&(u+="\n"+t),u+=t?e.replace(/\n/g,"\n"+t):e,s&&(u+="\n"),'"""'+u.replace(/"""/g,'\\"""')+'"""'}n.d(t,{LZ:()=>o,W7:()=>r})},97359(e,t,n){"use strict";n.d(t,{h:()=>r});var r=Object.freeze({NAME:"Name",DOCUMENT:"Document",OPERATION_DEFINITION:"OperationDefinition",VARIABLE_DEFINITION:"VariableDefinition",SELECTION_SET:"SelectionSet",FIELD:"Field",ARGUMENT:"Argument",FRAGMENT_SPREAD:"FragmentSpread",INLINE_FRAGMENT:"InlineFragment",FRAGMENT_DEFINITION:"FragmentDefinition",VARIABLE:"Variable",INT:"IntValue",FLOAT:"FloatValue",STRING:"StringValue",BOOLEAN:"BooleanValue",NULL:"NullValue",ENUM:"EnumValue",LIST:"ListValue",OBJECT:"ObjectValue",OBJECT_FIELD:"ObjectField",DIRECTIVE:"Directive",NAMED_TYPE:"NamedType",LIST_TYPE:"ListType",NON_NULL_TYPE:"NonNullType",SCHEMA_DEFINITION:"SchemaDefinition",OPERATION_TYPE_DEFINITION:"OperationTypeDefinition",SCALAR_TYPE_DEFINITION:"ScalarTypeDefinition",OBJECT_TYPE_DEFINITION:"ObjectTypeDefinition",FIELD_DEFINITION:"FieldDefinition",INPUT_VALUE_DEFINITION:"InputValueDefinition",INTERFACE_TYPE_DEFINITION:"InterfaceTypeDefinition",UNION_TYPE_DEFINITION:"UnionTypeDefinition",ENUM_TYPE_DEFINITION:"EnumTypeDefinition",ENUM_VALUE_DEFINITION:"EnumValueDefinition",INPUT_OBJECT_TYPE_DEFINITION:"InputObjectTypeDefinition",DIRECTIVE_DEFINITION:"DirectiveDefinition",SCHEMA_EXTENSION:"SchemaExtension",SCALAR_TYPE_EXTENSION:"ScalarTypeExtension",OBJECT_TYPE_EXTENSION:"ObjectTypeExtension",INTERFACE_TYPE_EXTENSION:"InterfaceTypeExtension",UNION_TYPE_EXTENSION:"UnionTypeExtension",ENUM_TYPE_EXTENSION:"EnumTypeExtension",INPUT_OBJECT_TYPE_EXTENSION:"InputObjectTypeExtension"})},10143(e,t,n){"use strict";n.d(t,{H:()=>c,T:()=>l});var r=n(99763),i=n(25821);function a(e,t){if(!Boolean(e))throw Error(t)}let o=function(e,t){return e instanceof t};function s(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function u(e,t,n){return t&&s(e.prototype,t),n&&s(e,n),e}var c=function(){function e(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"GraphQL request",n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{line:1,column:1};"string"==typeof e||a(0,"Body must be a string. Received: ".concat((0,i.Z)(e),".")),this.body=e,this.name=t,this.locationOffset=n,this.locationOffset.line>0||a(0,"line in locationOffset is 1-indexed and must be positive."),this.locationOffset.column>0||a(0,"column in locationOffset is 1-indexed and must be positive.")}return u(e,[{key:r.YF,get:function(){return"Source"}}]),e}();function l(e){return o(e,c)}},99763(e,t,n){"use strict";n.d(t,{YF:()=>r});var r="function"==typeof Symbol&&null!=Symbol.toStringTag?Symbol.toStringTag:"@@toStringTag"},37452(e){"use strict";e.exports=JSON.parse('{"AElig":"\xc6","AMP":"&","Aacute":"\xc1","Acirc":"\xc2","Agrave":"\xc0","Aring":"\xc5","Atilde":"\xc3","Auml":"\xc4","COPY":"\xa9","Ccedil":"\xc7","ETH":"\xd0","Eacute":"\xc9","Ecirc":"\xca","Egrave":"\xc8","Euml":"\xcb","GT":">","Iacute":"\xcd","Icirc":"\xce","Igrave":"\xcc","Iuml":"\xcf","LT":"<","Ntilde":"\xd1","Oacute":"\xd3","Ocirc":"\xd4","Ograve":"\xd2","Oslash":"\xd8","Otilde":"\xd5","Ouml":"\xd6","QUOT":"\\"","REG":"\xae","THORN":"\xde","Uacute":"\xda","Ucirc":"\xdb","Ugrave":"\xd9","Uuml":"\xdc","Yacute":"\xdd","aacute":"\xe1","acirc":"\xe2","acute":"\xb4","aelig":"\xe6","agrave":"\xe0","amp":"&","aring":"\xe5","atilde":"\xe3","auml":"\xe4","brvbar":"\xa6","ccedil":"\xe7","cedil":"\xb8","cent":"\xa2","copy":"\xa9","curren":"\xa4","deg":"\xb0","divide":"\xf7","eacute":"\xe9","ecirc":"\xea","egrave":"\xe8","eth":"\xf0","euml":"\xeb","frac12":"\xbd","frac14":"\xbc","frac34":"\xbe","gt":">","iacute":"\xed","icirc":"\xee","iexcl":"\xa1","igrave":"\xec","iquest":"\xbf","iuml":"\xef","laquo":"\xab","lt":"<","macr":"\xaf","micro":"\xb5","middot":"\xb7","nbsp":"\xa0","not":"\xac","ntilde":"\xf1","oacute":"\xf3","ocirc":"\xf4","ograve":"\xf2","ordf":"\xaa","ordm":"\xba","oslash":"\xf8","otilde":"\xf5","ouml":"\xf6","para":"\xb6","plusmn":"\xb1","pound":"\xa3","quot":"\\"","raquo":"\xbb","reg":"\xae","sect":"\xa7","shy":"\xad","sup1":"\xb9","sup2":"\xb2","sup3":"\xb3","szlig":"\xdf","thorn":"\xfe","times":"\xd7","uacute":"\xfa","ucirc":"\xfb","ugrave":"\xf9","uml":"\xa8","uuml":"\xfc","yacute":"\xfd","yen":"\xa5","yuml":"\xff"}')},93580(e){"use strict";e.exports=JSON.parse('{"0":"�","128":"€","130":"‚","131":"ƒ","132":"„","133":"…","134":"†","135":"‡","136":"ˆ","137":"‰","138":"Š","139":"‹","140":"Œ","142":"Ž","145":"‘","146":"’","147":"“","148":"”","149":"•","150":"–","151":"—","152":"˜","153":"™","154":"š","155":"›","156":"œ","158":"ž","159":"Ÿ"}')},67946(e){"use strict";e.exports=JSON.parse('{"locale":"en","long":{"year":{"previous":"last year","current":"this year","next":"next year","past":{"one":"{0} year ago","other":"{0} years ago"},"future":{"one":"in {0} year","other":"in {0} years"}},"quarter":{"previous":"last quarter","current":"this quarter","next":"next quarter","past":{"one":"{0} quarter ago","other":"{0} quarters ago"},"future":{"one":"in {0} quarter","other":"in {0} quarters"}},"month":{"previous":"last month","current":"this month","next":"next month","past":{"one":"{0} month ago","other":"{0} months ago"},"future":{"one":"in {0} month","other":"in {0} months"}},"week":{"previous":"last week","current":"this week","next":"next week","past":{"one":"{0} week ago","other":"{0} weeks ago"},"future":{"one":"in {0} week","other":"in {0} weeks"}},"day":{"previous":"yesterday","current":"today","next":"tomorrow","past":{"one":"{0} day ago","other":"{0} days ago"},"future":{"one":"in {0} day","other":"in {0} days"}},"hour":{"current":"this hour","past":{"one":"{0} hour ago","other":"{0} hours ago"},"future":{"one":"in {0} hour","other":"in {0} hours"}},"minute":{"current":"this minute","past":{"one":"{0} minute ago","other":"{0} minutes ago"},"future":{"one":"in {0} minute","other":"in {0} minutes"}},"second":{"current":"now","past":{"one":"{0} second ago","other":"{0} seconds ago"},"future":{"one":"in {0} second","other":"in {0} seconds"}}},"short":{"year":{"previous":"last yr.","current":"this yr.","next":"next yr.","past":"{0} yr. ago","future":"in {0} yr."},"quarter":{"previous":"last qtr.","current":"this qtr.","next":"next qtr.","past":{"one":"{0} qtr. ago","other":"{0} qtrs. ago"},"future":{"one":"in {0} qtr.","other":"in {0} qtrs."}},"month":{"previous":"last mo.","current":"this mo.","next":"next mo.","past":"{0} mo. ago","future":"in {0} mo."},"week":{"previous":"last wk.","current":"this wk.","next":"next wk.","past":"{0} wk. ago","future":"in {0} wk."},"day":{"previous":"yesterday","current":"today","next":"tomorrow","past":{"one":"{0} day ago","other":"{0} days ago"},"future":{"one":"in {0} day","other":"in {0} days"}},"hour":{"current":"this hour","past":"{0} hr. ago","future":"in {0} hr."},"minute":{"current":"this minute","past":"{0} min. ago","future":"in {0} min."},"second":{"current":"now","past":"{0} sec. ago","future":"in {0} sec."}},"narrow":{"year":{"previous":"last yr.","current":"this yr.","next":"next yr.","past":"{0} yr. ago","future":"in {0} yr."},"quarter":{"previous":"last qtr.","current":"this qtr.","next":"next qtr.","past":{"one":"{0} qtr. ago","other":"{0} qtrs. ago"},"future":{"one":"in {0} qtr.","other":"in {0} qtrs."}},"month":{"previous":"last mo.","current":"this mo.","next":"next mo.","past":"{0} mo. ago","future":"in {0} mo."},"week":{"previous":"last wk.","current":"this wk.","next":"next wk.","past":"{0} wk. ago","future":"in {0} wk."},"day":{"previous":"yesterday","current":"today","next":"tomorrow","past":{"one":"{0} day ago","other":"{0} days ago"},"future":{"one":"in {0} day","other":"in {0} days"}},"hour":{"current":"this hour","past":"{0} hr. ago","future":"in {0} hr."},"minute":{"current":"this minute","past":"{0} min. ago","future":"in {0} min."},"second":{"current":"now","past":"{0} sec. ago","future":"in {0} sec."}},"now":{"now":{"current":"now","future":"in a moment","past":"just now"}},"mini":{"year":"{0}yr","month":"{0}mo","week":"{0}wk","day":"{0}d","hour":"{0}h","minute":"{0}m","second":"{0}s","now":"now"},"short-time":{"year":"{0} yr.","month":"{0} mo.","week":"{0} wk.","day":{"one":"{0} day","other":"{0} days"},"hour":"{0} hr.","minute":"{0} min.","second":"{0} sec."},"long-time":{"year":{"one":"{0} year","other":"{0} years"},"month":{"one":"{0} month","other":"{0} months"},"week":{"one":"{0} week","other":"{0} weeks"},"day":{"one":"{0} day","other":"{0} days"},"hour":{"one":"{0} hour","other":"{0} hours"},"minute":{"one":"{0} minute","other":"{0} minutes"},"second":{"one":"{0} second","other":"{0} seconds"}}}')}},__webpack_module_cache__={};function __webpack_require__(e){var t=__webpack_module_cache__[e];if(void 0!==t)return t.exports;var n=__webpack_module_cache__[e]={id:e,loaded:!1,exports:{}};return __webpack_modules__[e].call(n.exports,n,n.exports,__webpack_require__),n.loaded=!0,n.exports}__webpack_require__.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return __webpack_require__.d(t,{a:t}),t},(()=>{var e,t=Object.getPrototypeOf?e=>Object.getPrototypeOf(e):e=>e.__proto__;__webpack_require__.t=function(n,r){if(1&r&&(n=this(n)),8&r||"object"==typeof n&&n&&(4&r&&n.__esModule||16&r&&"function"==typeof n.then))return n;var i=Object.create(null);__webpack_require__.r(i);var a={};e=e||[null,t({}),t([]),t(t)];for(var o=2&r&&n;"object"==typeof o&&!~e.indexOf(o);o=t(o))Object.getOwnPropertyNames(o).forEach(e=>a[e]=()=>n[e]);return a.default=()=>n,__webpack_require__.d(i,a),i}})(),__webpack_require__.d=(e,t)=>{for(var n in t)__webpack_require__.o(t,n)&&!__webpack_require__.o(e,n)&&Object.defineProperty(e,n,{enumerable:!0,get:t[n]})},__webpack_require__.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||Function("return this")()}catch(e){if("object"==typeof window)return window}}(),__webpack_require__.hmd=e=>((e=Object.create(e)).children||(e.children=[]),Object.defineProperty(e,"exports",{enumerable:!0,set(){throw Error("ES Modules may not assign module.exports or exports.*, Use ESM export syntax, instead: "+e.id)}}),e),__webpack_require__.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),__webpack_require__.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},__webpack_require__.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),__webpack_require__.p="/assets/",__webpack_require__.nc=void 0;var __webpack_exports__={};(()=>{"use strict";var e,t,n,r,i=__webpack_require__(32316),a=__webpack_require__(8126),o=__webpack_require__(5690),s=__webpack_require__(30381),u=__webpack_require__.n(s),c=__webpack_require__(67294),l=__webpack_require__(73935),f=__webpack_require__.n(l),d=__webpack_require__(57209),h=__webpack_require__(55977),p=__webpack_require__(15857),b=__webpack_require__(28500);function m(e){return function(t){var n=t.dispatch,r=t.getState;return function(t){return function(i){return"function"==typeof i?i(n,r,e):t(i)}}}}var g=m();g.withExtraArgument=m;let v=g;var y=__webpack_require__(76489);function w(e){return function(t){return function(n){return function(r){n(r);var i=e||document&&document.cookie||"",a=t.getState();if("MATCH_ROUTE"===r.type&&"/signin"!==a.notifications.currentUrl){var o=(0,y.Q)(i);if(o.explorer)try{var s=JSON.parse(o.explorer);if("error"===s.status){var u=_(s.url);n({type:"NOTIFY_ERROR_MSG",msg:u})}}catch(c){n({type:"NOTIFY_ERROR_MSG",msg:"Invalid explorer status"})}}}}}}function _(e){var t="Can't connect to explorer: ".concat(e);return e.match(/^wss?:.+/)?t:"".concat(t,". You must use a websocket.")}var E=__webpack_require__(16353);function S(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function k(e){if(Array.isArray(e))return S(e)}function x(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function T(){throw TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function M(e){return k(e)||x(e)||O(e)||T()}function O(e,t){if(e){if("string"==typeof e)return S(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return S(e,t)}}var A=[v,w(),],L=(0,b.Uo)({});function C(e,t){return(0,p.MT)(e,L(p.md.apply(void 0,M(M(t)))))}var I=function(){return C(E.ZP,A)};let D=I;var N=__webpack_require__(93379),P=__webpack_require__.n(N),R=__webpack_require__(51424),j=__webpack_require__.n(R),F={};F.insert="head",F.singleton=!1;var Y=P()(j(),F);j().locals;var B=__webpack_require__(76),U=__webpack_require__(47886),H=__webpack_require__(63099),$=__webpack_require__(47545),z=__webpack_require__(9409),G=function(){var e=(0,E.rH)(function(e){return e.redirect.to});return c.createElement(B.VK,null,c.createElement(H.Z,null),c.createElement(U.rs,null,c.createElement(U.AW,{exact:!0,path:"/signin"},c.createElement(z.ZP,null)),e&&c.createElement(U.l_,{to:e}),c.createElement(U.AW,{component:$.Z})))};let W=G;var K=__webpack_require__(9541),V="/signin",q=D();q.subscribe(function(){var e=q.getState().notifications.currentUrl;e&&e!==V&&(0,K.iR)(e)});var Z=function(){return c.createElement(h.zt,{store:q},c.createElement(W,null))};let X=Z;var J=__webpack_require__(73343),Q=__webpack_require__(83952),ee=__webpack_require__(85317),et=function(e){var t=e.client,n=e.children,r=(0,ee.K)();return c.createElement(r.Consumer,null,function(e){return void 0===e&&(e={}),t&&e.client!==t&&(e=Object.assign({},e,{client:t})),__DEV__?(0,Q.kG)(e.client,'ApolloProvider was not passed a client instance. Make sure you pass in your client via the "client" prop.'):(0,Q.kG)(e.client,29),c.createElement(r.Provider,{value:e},n)})},en=__webpack_require__(23564);function er(e,t){var n="undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(n)return(n=n.call(e)).next.bind(n);if(Array.isArray(e)||(n=ei(e))||t&&e&&"number"==typeof e.length){n&&(e=n);var r=0;return function(){return r>=e.length?{done:!0}:{done:!1,value:e[r++]}}}throw TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function ei(e,t){if(e){if("string"==typeof e)return ea(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return ea(e,t)}}function ea(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function eo(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function es(e,t,n){return t&&eo(e.prototype,t),n&&eo(e,n),Object.defineProperty(e,"prototype",{writable:!1}),e}var eu=function(){return"function"==typeof Symbol},ec=function(e){return eu()&&Boolean(Symbol[e])},el=function(e){return ec(e)?Symbol[e]:"@@"+e};eu()&&!ec("observable")&&(Symbol.observable=Symbol("observable"));var ef=el("iterator"),ed=el("observable"),eh=el("species");function ep(e,t){var n=e[t];if(null!=n){if("function"!=typeof n)throw TypeError(n+" is not a function");return n}}function eb(e){var t=e.constructor;return void 0!==t&&null===(t=t[eh])&&(t=void 0),void 0!==t?t:eT}function em(e){return e instanceof eT}function eg(e){eg.log?eg.log(e):setTimeout(function(){throw e})}function ev(e){Promise.resolve().then(function(){try{e()}catch(t){eg(t)}})}function ey(e){var t=e._cleanup;if(void 0!==t){if(e._cleanup=void 0,!t)return;try{if("function"==typeof t)t();else{var n=ep(t,"unsubscribe");n&&n.call(t)}}catch(r){eg(r)}}}function ew(e){e._observer=void 0,e._queue=void 0,e._state="closed"}function e_(e){var t=e._queue;if(t){e._queue=void 0,e._state="ready";for(var n=0;n<t.length&&(eE(e,t[n].type,t[n].value),"closed"!==e._state);++n);}}function eE(e,t,n){e._state="running";var r=e._observer;try{var i=ep(r,t);switch(t){case"next":i&&i.call(r,n);break;case"error":if(ew(e),i)i.call(r,n);else throw n;break;case"complete":ew(e),i&&i.call(r)}}catch(a){eg(a)}"closed"===e._state?ey(e):"running"===e._state&&(e._state="ready")}function eS(e,t,n){if("closed"!==e._state){if("buffering"===e._state){e._queue.push({type:t,value:n});return}if("ready"!==e._state){e._state="buffering",e._queue=[{type:t,value:n}],ev(function(){return e_(e)});return}eE(e,t,n)}}var ek=function(){function e(e,t){this._cleanup=void 0,this._observer=e,this._queue=void 0,this._state="initializing";var n=new ex(this);try{this._cleanup=t.call(void 0,n)}catch(r){n.error(r)}"initializing"===this._state&&(this._state="ready")}return e.prototype.unsubscribe=function(){"closed"!==this._state&&(ew(this),ey(this))},es(e,[{key:"closed",get:function(){return"closed"===this._state}}]),e}(),ex=function(){function e(e){this._subscription=e}var t=e.prototype;return t.next=function(e){eS(this._subscription,"next",e)},t.error=function(e){eS(this._subscription,"error",e)},t.complete=function(){eS(this._subscription,"complete")},es(e,[{key:"closed",get:function(){return"closed"===this._subscription._state}}]),e}(),eT=function(){function e(t){if(!(this instanceof e))throw TypeError("Observable cannot be called as a function");if("function"!=typeof t)throw TypeError("Observable initializer must be a function");this._subscriber=t}var t=e.prototype;return t.subscribe=function(e){return("object"!=typeof e||null===e)&&(e={next:e,error:arguments[1],complete:arguments[2]}),new ek(e,this._subscriber)},t.forEach=function(e){var t=this;return new Promise(function(n,r){if("function"!=typeof e){r(TypeError(e+" is not a function"));return}function i(){a.unsubscribe(),n()}var a=t.subscribe({next:function(t){try{e(t,i)}catch(n){r(n),a.unsubscribe()}},error:r,complete:n})})},t.map=function(e){var t=this;if("function"!=typeof e)throw TypeError(e+" is not a function");return new(eb(this))(function(n){return t.subscribe({next:function(t){try{t=e(t)}catch(r){return n.error(r)}n.next(t)},error:function(e){n.error(e)},complete:function(){n.complete()}})})},t.filter=function(e){var t=this;if("function"!=typeof e)throw TypeError(e+" is not a function");return new(eb(this))(function(n){return t.subscribe({next:function(t){try{if(!e(t))return}catch(r){return n.error(r)}n.next(t)},error:function(e){n.error(e)},complete:function(){n.complete()}})})},t.reduce=function(e){var t=this;if("function"!=typeof e)throw TypeError(e+" is not a function");var n=eb(this),r=arguments.length>1,i=!1,a=arguments[1],o=a;return new n(function(n){return t.subscribe({next:function(t){var a=!i;if(i=!0,!a||r)try{o=e(o,t)}catch(s){return n.error(s)}else o=t},error:function(e){n.error(e)},complete:function(){if(!i&&!r)return n.error(TypeError("Cannot reduce an empty sequence"));n.next(o),n.complete()}})})},t.concat=function(){for(var e=this,t=arguments.length,n=Array(t),r=0;r<t;r++)n[r]=arguments[r];var i=eb(this);return new i(function(t){var r,a=0;function o(e){r=e.subscribe({next:function(e){t.next(e)},error:function(e){t.error(e)},complete:function(){a===n.length?(r=void 0,t.complete()):o(i.from(n[a++]))}})}return o(e),function(){r&&(r.unsubscribe(),r=void 0)}})},t.flatMap=function(e){var t=this;if("function"!=typeof e)throw TypeError(e+" is not a function");var n=eb(this);return new n(function(r){var i=[],a=t.subscribe({next:function(t){if(e)try{t=e(t)}catch(a){return r.error(a)}var s=n.from(t).subscribe({next:function(e){r.next(e)},error:function(e){r.error(e)},complete:function(){var e=i.indexOf(s);e>=0&&i.splice(e,1),o()}});i.push(s)},error:function(e){r.error(e)},complete:function(){o()}});function o(){a.closed&&0===i.length&&r.complete()}return function(){i.forEach(function(e){return e.unsubscribe()}),a.unsubscribe()}})},t[ed]=function(){return this},e.from=function(t){var n="function"==typeof this?this:e;if(null==t)throw TypeError(t+" is not an object");var r=ep(t,ed);if(r){var i=r.call(t);if(Object(i)!==i)throw TypeError(i+" is not an object");return em(i)&&i.constructor===n?i:new n(function(e){return i.subscribe(e)})}if(ec("iterator")&&(r=ep(t,ef)))return new n(function(e){ev(function(){if(!e.closed){for(var n,i=er(r.call(t));!(n=i()).done;){var a=n.value;if(e.next(a),e.closed)return}e.complete()}})});if(Array.isArray(t))return new n(function(e){ev(function(){if(!e.closed){for(var n=0;n<t.length;++n)if(e.next(t[n]),e.closed)return;e.complete()}})});throw TypeError(t+" is not observable")},e.of=function(){for(var t=arguments.length,n=Array(t),r=0;r<t;r++)n[r]=arguments[r];return new("function"==typeof this?this:e)(function(e){ev(function(){if(!e.closed){for(var t=0;t<n.length;++t)if(e.next(n[t]),e.closed)return;e.complete()}})})},es(e,null,[{key:eh,get:function(){return this}}]),e}();function eM(e,t){var n=(0,en.pi)({},e),r=function(){return(0,en.pi)({},n)};return Object.defineProperty(t,"setContext",{enumerable:!1,value:function(e){n="function"==typeof e?(0,en.pi)((0,en.pi)({},n),e(n)):(0,en.pi)((0,en.pi)({},n),e)}}),Object.defineProperty(t,"getContext",{enumerable:!1,value:r}),t}eu()&&Object.defineProperty(eT,Symbol("extensions"),{value:{symbol:ed,hostReportError:eg},configurable:!0});var eO=__webpack_require__(13154);function eA(e,t){var n=t,r=[];return e.definitions.forEach(function(e){if("OperationDefinition"===e.kind)throw __DEV__?new Q.ej("Found a ".concat(e.operation," operation").concat(e.name?" named '".concat(e.name.value,"'"):"",". ")+"No operations are allowed when using a fragment as a query. Only fragments are allowed."):new Q.ej(44);"FragmentDefinition"===e.kind&&r.push(e)}),void 0===n&&(__DEV__?(0,Q.kG)(1===r.length,"Found ".concat(r.length," fragments. `fragmentName` must be provided when there is not exactly 1 fragment.")):(0,Q.kG)(1===r.length,45),n=r[0].name.value),(0,en.pi)((0,en.pi)({},e),{definitions:(0,en.ev)([{kind:"OperationDefinition",operation:"query",selectionSet:{kind:"SelectionSet",selections:[{kind:"FragmentSpread",name:{kind:"Name",value:n}},]}}],e.definitions,!0)})}function eL(e){void 0===e&&(e=[]);var t={};return e.forEach(function(e){t[e.name.value]=e}),t}function eC(e,t){switch(e.kind){case"InlineFragment":return e;case"FragmentSpread":var n=e.name.value;if("function"==typeof t)return t(n);var r=t&&t[n];return __DEV__?(0,Q.kG)(r,"No fragment named ".concat(n)):(0,Q.kG)(r,46),r||null;default:return null}}function eI(e){return{__ref:String(e)}}function eD(e){return Boolean(e&&"object"==typeof e&&"string"==typeof e.__ref)}function eN(e){return(0,eO.s)(e)&&"Document"===e.kind&&Array.isArray(e.definitions)}function eP(e){return"StringValue"===e.kind}function eR(e){return"BooleanValue"===e.kind}function ej(e){return"IntValue"===e.kind}function eF(e){return"FloatValue"===e.kind}function eY(e){return"Variable"===e.kind}function eB(e){return"ObjectValue"===e.kind}function eU(e){return"ListValue"===e.kind}function eH(e){return"EnumValue"===e.kind}function e$(e){return"NullValue"===e.kind}function ez(e,t,n,r){if(ej(n)||eF(n))e[t.value]=Number(n.value);else if(eR(n)||eP(n))e[t.value]=n.value;else if(eB(n)){var i={};n.fields.map(function(e){return ez(i,e.name,e.value,r)}),e[t.value]=i}else if(eY(n)){var a=(r||{})[n.name.value];e[t.value]=a}else if(eU(n))e[t.value]=n.values.map(function(e){var n={};return ez(n,t,e,r),n[t.value]});else if(eH(n))e[t.value]=n.value;else if(e$(n))e[t.value]=null;else throw __DEV__?new Q.ej('The inline argument "'.concat(t.value,'" of kind "').concat(n.kind,'"')+"is not supported. Use variables instead of inline arguments to overcome this limitation."):new Q.ej(55)}function eG(e,t){var n=null;e.directives&&(n={},e.directives.forEach(function(e){n[e.name.value]={},e.arguments&&e.arguments.forEach(function(r){var i=r.name,a=r.value;return ez(n[e.name.value],i,a,t)})}));var r=null;return e.arguments&&e.arguments.length&&(r={},e.arguments.forEach(function(e){var n;return ez(r,e.name,e.value,t)})),eK(e.name.value,r,n)}var eW=["connection","include","skip","client","rest","export",],eK=Object.assign(function(e,t,n){if(t&&n&&n.connection&&n.connection.key){if(!n.connection.filter||!(n.connection.filter.length>0))return n.connection.key;var r=n.connection.filter?n.connection.filter:[];r.sort();var i={};return r.forEach(function(e){i[e]=t[e]}),"".concat(n.connection.key,"(").concat(eV(i),")")}var a=e;if(t){var o=eV(t);a+="(".concat(o,")")}return n&&Object.keys(n).forEach(function(e){-1===eW.indexOf(e)&&(n[e]&&Object.keys(n[e]).length?a+="@".concat(e,"(").concat(eV(n[e]),")"):a+="@".concat(e))}),a},{setStringify:function(e){var t=eV;return eV=e,t}}),eV=function(e){return JSON.stringify(e,eq)};function eq(e,t){return(0,eO.s)(t)&&!Array.isArray(t)&&(t=Object.keys(t).sort().reduce(function(e,n){return e[n]=t[n],e},{})),t}function eZ(e,t){if(e.arguments&&e.arguments.length){var n={};return e.arguments.forEach(function(e){var r;return ez(n,e.name,e.value,t)}),n}return null}function eX(e){return e.alias?e.alias.value:e.name.value}function eJ(e,t,n){for(var r,i=0,a=t.selections;i<a.length;i++){var o=a[i];if(eQ(o)){if("__typename"===o.name.value)return e[eX(o)]}else r?r.push(o):r=[o]}if("string"==typeof e.__typename)return e.__typename;if(r)for(var s=0,u=r;s<u.length;s++){var o=u[s],c=eJ(e,eC(o,n).selectionSet,n);if("string"==typeof c)return c}}function eQ(e){return"Field"===e.kind}function e1(e){return"InlineFragment"===e.kind}function e0(e){__DEV__?(0,Q.kG)(e&&"Document"===e.kind,'Expecting a parsed GraphQL document. Perhaps you need to wrap the query string in a "gql" tag? http://docs.apollostack.com/apollo-client/core.html#gql'):(0,Q.kG)(e&&"Document"===e.kind,47);var t=e.definitions.filter(function(e){return"FragmentDefinition"!==e.kind}).map(function(e){if("OperationDefinition"!==e.kind)throw __DEV__?new Q.ej('Schema type definitions not allowed in queries. Found: "'.concat(e.kind,'"')):new Q.ej(48);return e});return __DEV__?(0,Q.kG)(t.length<=1,"Ambiguous GraphQL document: contains ".concat(t.length," operations")):(0,Q.kG)(t.length<=1,49),e}function e2(e){return e0(e),e.definitions.filter(function(e){return"OperationDefinition"===e.kind})[0]}function e3(e){return e.definitions.filter(function(e){return"OperationDefinition"===e.kind&&!!e.name}).map(function(e){return e.name.value})[0]||null}function e4(e){return e.definitions.filter(function(e){return"FragmentDefinition"===e.kind})}function e5(e){var t=e2(e);return __DEV__?(0,Q.kG)(t&&"query"===t.operation,"Must contain a query definition."):(0,Q.kG)(t&&"query"===t.operation,50),t}function e6(e){__DEV__?(0,Q.kG)("Document"===e.kind,'Expecting a parsed GraphQL document. Perhaps you need to wrap the query string in a "gql" tag? http://docs.apollostack.com/apollo-client/core.html#gql'):(0,Q.kG)("Document"===e.kind,51),__DEV__?(0,Q.kG)(e.definitions.length<=1,"Fragment must have exactly one definition."):(0,Q.kG)(e.definitions.length<=1,52);var t=e.definitions[0];return __DEV__?(0,Q.kG)("FragmentDefinition"===t.kind,"Must be a fragment definition."):(0,Q.kG)("FragmentDefinition"===t.kind,53),t}function e9(e){e0(e);for(var t,n=0,r=e.definitions;n<r.length;n++){var i=r[n];if("OperationDefinition"===i.kind){var a=i.operation;if("query"===a||"mutation"===a||"subscription"===a)return i}"FragmentDefinition"!==i.kind||t||(t=i)}if(t)return t;throw __DEV__?new Q.ej("Expected a parsed GraphQL query with a query, mutation, subscription, or a fragment."):new Q.ej(54)}function e8(e){var t=Object.create(null),n=e&&e.variableDefinitions;return n&&n.length&&n.forEach(function(e){e.defaultValue&&ez(t,e.variable.name,e.defaultValue)}),t}function e7(e){var t={variables:e.variables||{},extensions:e.extensions||{},operationName:e.operationName,query:e.query};return t.operationName||(t.operationName="string"!=typeof t.query?e3(t.query)||void 0:""),t}function te(e){for(var t=["query","operationName","variables","extensions","context",],n=0,r=Object.keys(e);n<r.length;n++){var i=r[n];if(0>t.indexOf(i))throw __DEV__?new Q.ej("illegal argument: ".concat(i)):new Q.ej(27)}return e}function tt(e,t){return t?t(e):eT.of()}function tn(e){return"function"==typeof e?new ta(e):e}function tr(e){return e.request.length<=1}var ti=function(e){function t(t,n){var r=e.call(this,t)||this;return r.link=n,r}return(0,en.ZT)(t,e),t}(Error),ta=function(){function e(e){e&&(this.request=e)}return e.empty=function(){return new e(function(){return eT.of()})},e.from=function(t){return 0===t.length?e.empty():t.map(tn).reduce(function(e,t){return e.concat(t)})},e.split=function(t,n,r){var i=tn(n),a=tn(r||new e(tt));return new e(tr(i)&&tr(a)?function(e){return t(e)?i.request(e)||eT.of():a.request(e)||eT.of()}:function(e,n){return t(e)?i.request(e,n)||eT.of():a.request(e,n)||eT.of()})},e.execute=function(e,t){return e.request(eM(t.context,e7(te(t))))||eT.of()},e.concat=function(t,n){var r=tn(t);if(tr(r))return __DEV__&&Q.kG.warn(new ti("You are calling concat on a terminating link, which will have no effect",r)),r;var i=tn(n);return new e(tr(i)?function(e){return r.request(e,function(e){return i.request(e)||eT.of()})||eT.of()}:function(e,t){return r.request(e,function(e){return i.request(e,t)||eT.of()})||eT.of()})},e.prototype.split=function(t,n,r){return this.concat(e.split(t,n,r||new e(tt)))},e.prototype.concat=function(t){return e.concat(this,t)},e.prototype.request=function(e,t){throw __DEV__?new Q.ej("request is not implemented"):new Q.ej(22)},e.prototype.onError=function(e,t){if(t&&t.error)return t.error(e),!1;throw e},e.prototype.setOnError=function(e){return this.onError=e,this},e}(),to=__webpack_require__(25821),ts=__webpack_require__(25217),tu={Name:[],Document:["definitions"],OperationDefinition:["name","variableDefinitions","directives","selectionSet"],VariableDefinition:["variable","type","defaultValue","directives"],Variable:["name"],SelectionSet:["selections"],Field:["alias","name","arguments","directives","selectionSet"],Argument:["name","value"],FragmentSpread:["name","directives"],InlineFragment:["typeCondition","directives","selectionSet"],FragmentDefinition:["name","variableDefinitions","typeCondition","directives","selectionSet"],IntValue:[],FloatValue:[],StringValue:[],BooleanValue:[],NullValue:[],EnumValue:[],ListValue:["values"],ObjectValue:["fields"],ObjectField:["name","value"],Directive:["name","arguments"],NamedType:["name"],ListType:["type"],NonNullType:["type"],SchemaDefinition:["description","directives","operationTypes"],OperationTypeDefinition:["type"],ScalarTypeDefinition:["description","name","directives"],ObjectTypeDefinition:["description","name","interfaces","directives","fields"],FieldDefinition:["description","name","arguments","type","directives"],InputValueDefinition:["description","name","type","defaultValue","directives"],InterfaceTypeDefinition:["description","name","interfaces","directives","fields"],UnionTypeDefinition:["description","name","directives","types"],EnumTypeDefinition:["description","name","directives","values"],EnumValueDefinition:["description","name","directives"],InputObjectTypeDefinition:["description","name","directives","fields"],DirectiveDefinition:["description","name","arguments","locations"],SchemaExtension:["directives","operationTypes"],ScalarTypeExtension:["name","directives"],ObjectTypeExtension:["name","interfaces","directives","fields"],InterfaceTypeExtension:["name","interfaces","directives","fields"],UnionTypeExtension:["name","directives","types"],EnumTypeExtension:["name","directives","values"],InputObjectTypeExtension:["name","directives","fields"]},tc=Object.freeze({});function tl(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:tu,r=void 0,i=Array.isArray(e),a=[e],o=-1,s=[],u=void 0,c=void 0,l=void 0,f=[],d=[],h=e;do{var p,b=++o===a.length,m=b&&0!==s.length;if(b){if(c=0===d.length?void 0:f[f.length-1],u=l,l=d.pop(),m){if(i)u=u.slice();else{for(var g={},v=0,y=Object.keys(u);v<y.length;v++){var w=y[v];g[w]=u[w]}u=g}for(var _=0,E=0;E<s.length;E++){var S=s[E][0],k=s[E][1];i&&(S-=_),i&&null===k?(u.splice(S,1),_++):u[S]=k}}o=r.index,a=r.keys,s=r.edits,i=r.inArray,r=r.prev}else{if(c=l?i?o:a[o]:void 0,null===(u=l?l[c]:h)||void 0===u)continue;l&&f.push(c)}var x=void 0;if(!Array.isArray(u)){if(!(0,ts.UG)(u))throw Error("Invalid AST Node: ".concat((0,to.Z)(u),"."));var T=tf(t,u.kind,b);if(T){if((x=T.call(t,u,c,l,f,d))===tc)break;if(!1===x){if(!b){f.pop();continue}}else if(void 0!==x&&(s.push([c,x]),!b)){if((0,ts.UG)(x))u=x;else{f.pop();continue}}}}void 0===x&&m&&s.push([c,u]),b?f.pop():(r={inArray:i,index:o,keys:a,edits:s,prev:r},a=(i=Array.isArray(u))?u:null!==(p=n[u.kind])&&void 0!==p?p:[],o=-1,s=[],l&&d.push(l),l=u)}while(void 0!==r)return 0!==s.length&&(h=s[s.length-1][1]),h}function tf(e,t,n){var r=e[t];if(r){if(!n&&"function"==typeof r)return r;var i=n?r.leave:r.enter;if("function"==typeof i)return i}else{var a=n?e.leave:e.enter;if(a){if("function"==typeof a)return a;var o=a[t];if("function"==typeof o)return o}}}function td(e,t){var n=e.directives;return!n||!n.length||tv(n).every(function(e){var n=e.directive,r=e.ifArgument,i=!1;return"Variable"===r.value.kind?(i=t&&t[r.value.name.value],__DEV__?(0,Q.kG)(void 0!==i,"Invalid variable referenced in @".concat(n.name.value," directive.")):(0,Q.kG)(void 0!==i,40)):i=r.value.value,"skip"===n.name.value?!i:i})}var th=function(e,t){return tb(e,t,!1)},tp=function(e,t){return tb(e,t,!0)};function tb(e,t,n){var r=new Set(e),i=r.size;return tl(t,{Directive:function(e){if(r.delete(e.name.value)&&(!n||!r.size))return tc}}),n?!r.size:r.size<i}function tm(e){return e&&tb(["client","export"],e,!0)}function tg(e){var t=e.name.value;return"skip"===t||"include"===t}function tv(e){var t=[];return e&&e.length&&e.forEach(function(e){if(tg(e)){var n=e.arguments,r=e.name.value;__DEV__?(0,Q.kG)(n&&1===n.length,"Incorrect number of arguments for the @".concat(r," directive.")):(0,Q.kG)(n&&1===n.length,41);var i=n[0];__DEV__?(0,Q.kG)(i.name&&"if"===i.name.value,"Invalid argument for the @".concat(r," directive.")):(0,Q.kG)(i.name&&"if"===i.name.value,42);var a=i.value;__DEV__?(0,Q.kG)(a&&("Variable"===a.kind||"BooleanValue"===a.kind),"Argument for the @".concat(r," directive must be a variable or a boolean value.")):(0,Q.kG)(a&&("Variable"===a.kind||"BooleanValue"===a.kind),43),t.push({directive:e,ifArgument:i})}}),t}var ty=function(e,t){var n;try{n=JSON.stringify(e)}catch(r){var i=__DEV__?new Q.ej("Network request failed. ".concat(t," is not serializable: ").concat(r.message)):new Q.ej(24);throw i.parseError=r,i}return n},tw=function(e,t){var n=e.getContext().uri;return n||("function"==typeof t?t(e):t||"/graphql")},t_=__webpack_require__(30320);function tE(e){return!!e.body}function tS(e){return!!e.getReader}function tk(e){return!!(t_.DN&&e[Symbol.asyncIterator])}function tx(e){return!!e.stream}function tT(e){return!!e.arrayBuffer}function tM(e){return!!e.pipe}function tO(e){var t,n=e[Symbol.asyncIterator]();return(t={next:function(){return n.next()}})[Symbol.asyncIterator]=function(){return this},t}function tA(e){var t=null,n=null,r=!1,i=[],a=[];function o(e){if(!n){if(a.length){var t=a.shift();if(Array.isArray(t)&&t[0])return t[0]({value:e,done:!1})}i.push(e)}}function s(e){n=e,a.slice().forEach(function(t){t[1](e)}),t&&t()}function u(){r=!0,a.slice().forEach(function(e){e[0]({value:void 0,done:!0})}),t&&t()}function c(){return new Promise(function(e,t){return n?t(n):i.length?e({value:i.shift(),done:!1}):r?e({value:void 0,done:!0}):void a.push([e,t])})}t=function(){t=null,e.removeListener("data",o),e.removeListener("error",s),e.removeListener("end",u),e.removeListener("finish",u),e.removeListener("close",u)},e.on("data",o),e.on("error",s),e.on("end",u),e.on("finish",u),e.on("close",u);var l={next:function(){return c()}};return t_.DN&&(l[Symbol.asyncIterator]=function(){return this}),l}function tL(e){var t=!1,n={next:function(){return t?Promise.resolve({value:void 0,done:!0}):(t=!0,new Promise(function(t,n){e.then(function(e){t({value:e,done:!1})}).catch(n)}))}};return t_.DN&&(n[Symbol.asyncIterator]=function(){return this}),n}function tC(e){var t={next:function(){return e.read()}};return t_.DN&&(t[Symbol.asyncIterator]=function(){return this}),t}function tI(e){var t=e;if(tE(e)&&(t=e.body),tk(t))return tO(t);if(tS(t))return tC(t.getReader());if(tx(t))return tC(t.stream().getReader());if(tT(t))return tL(t.arrayBuffer());if(tM(t))return tA(t);throw Error("Unknown body type for responseIterator. Please pass a streamable response.")}var tD=function(e,t,n){var r=Error(n);throw r.name="ServerError",r.response=e,r.statusCode=e.status,r.result=t,r},tN=__webpack_require__(30990),tP=__webpack_require__(21436),tR=Object.prototype.hasOwnProperty;function tj(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return tF(e)}function tF(e){var t=e[0]||{},n=e.length;if(n>1)for(var r=new tB,i=1;i<n;++i)t=r.merge(t,e[i]);return t}var tY=function(e,t,n){return this.merge(e[n],t[n])},tB=function(){function e(e){void 0===e&&(e=tY),this.reconciler=e,this.isObject=eO.s,this.pastCopies=new Set}return e.prototype.merge=function(e,t){for(var n=this,r=[],i=2;i<arguments.length;i++)r[i-2]=arguments[i];return(0,eO.s)(t)&&(0,eO.s)(e)?(Object.keys(t).forEach(function(i){if(tR.call(e,i)){var a=e[i];if(t[i]!==a){var o=n.reconciler.apply(n,(0,en.ev)([e,t,i],r,!1));o!==a&&((e=n.shallowCopyForMerge(e))[i]=o)}}else(e=n.shallowCopyForMerge(e))[i]=t[i]}),e):t},e.prototype.shallowCopyForMerge=function(e){return(0,eO.s)(e)&&!this.pastCopies.has(e)&&(e=Array.isArray(e)?e.slice(0):(0,en.pi)({__proto__:Object.getPrototypeOf(e)},e),this.pastCopies.add(e)),e},e}();function tU(e){return"incremental"in e}function tH(e){return"hasNext"in e&&"data"in e}function t$(e){return tU(e)||tH(e)}function tz(e){return(0,eO.s)(e)&&"payload"in e}function tG(e,t){var n=e,r=new tB;return tU(t)&&(0,tP.O)(t.incremental)&&t.incremental.forEach(function(e){for(var t=e.data,i=e.path,a=i.length-1;a>=0;--a){var o=i[a],s=isNaN(+o)?{}:[];s[o]=t,t=s}n=r.merge(n,t)}),n}var tW=Object.prototype.hasOwnProperty;function tK(e,t){var n,r,i,a,o;return(0,en.mG)(this,void 0,void 0,function(){var s,u,c,l,f,d,h,p,b,m,g,v,y,w,_,E,S,k,x,T,M,O,A;return(0,en.Jh)(this,function(L){switch(L.label){case 0:if(void 0===TextDecoder)throw Error("TextDecoder must be defined in the environment: please import a polyfill.");s=new TextDecoder("utf-8"),u=null===(n=e.headers)||void 0===n?void 0:n.get("content-type"),c="boundary=",l=(null==u?void 0:u.includes(c))?null==u?void 0:u.substring((null==u?void 0:u.indexOf(c))+c.length).replace(/['"]/g,"").replace(/\;(.*)/gm,"").trim():"-",f="\r\n--".concat(l),d="",h=tI(e),p=!0,L.label=1;case 1:if(!p)return[3,3];return[4,h.next()];case 2:for(m=(b=L.sent()).value,g=b.done,v="string"==typeof m?m:s.decode(m),y=d.length-f.length+1,p=!g,d+=v,w=d.indexOf(f,y);w>-1;){if(_=void 0,_=(O=[d.slice(0,w),d.slice(w+f.length),])[0],d=O[1],E=_.indexOf("\r\n\r\n"),(k=(S=tV(_.slice(0,E)))["content-type"])&&-1===k.toLowerCase().indexOf("application/json"))throw Error("Unsupported patch content type: application/json is required.");if(x=_.slice(E))try{T=tq(e,x),Object.keys(T).length>1||"data"in T||"incremental"in T||"errors"in T||"payload"in T?tz(T)?(M={},"payload"in T&&(M=(0,en.pi)({},T.payload)),"errors"in T&&(M=(0,en.pi)((0,en.pi)({},M),{extensions:(0,en.pi)((0,en.pi)({},"extensions"in M?M.extensions:null),((A={})[tN.YG]=T.errors,A))})),null===(r=t.next)||void 0===r||r.call(t,M)):null===(i=t.next)||void 0===i||i.call(t,T):1===Object.keys(T).length&&"hasNext"in T&&!T.hasNext&&(null===(a=t.complete)||void 0===a||a.call(t))}catch(C){tZ(C,t)}w=d.indexOf(f)}return[3,1];case 3:return null===(o=t.complete)||void 0===o||o.call(t),[2]}})})}function tV(e){var t={};return e.split("\n").forEach(function(e){var n=e.indexOf(":");if(n>-1){var r=e.slice(0,n).trim().toLowerCase(),i=e.slice(n+1).trim();t[r]=i}}),t}function tq(e,t){e.status>=300&&tD(e,function(){try{return JSON.parse(t)}catch(e){return t}}(),"Response not successful: Received status code ".concat(e.status));try{return JSON.parse(t)}catch(n){var r=n;throw r.name="ServerParseError",r.response=e,r.statusCode=e.status,r.bodyText=t,r}}function tZ(e,t){var n,r;"AbortError"!==e.name&&(e.result&&e.result.errors&&e.result.data&&(null===(n=t.next)||void 0===n||n.call(t,e.result)),null===(r=t.error)||void 0===r||r.call(t,e))}function tX(e,t,n){tJ(t)(e).then(function(e){var t,r;null===(t=n.next)||void 0===t||t.call(n,e),null===(r=n.complete)||void 0===r||r.call(n)}).catch(function(e){return tZ(e,n)})}function tJ(e){return function(t){return t.text().then(function(e){return tq(t,e)}).then(function(n){return t.status>=300&&tD(t,n,"Response not successful: Received status code ".concat(t.status)),Array.isArray(n)||tW.call(n,"data")||tW.call(n,"errors")||tD(t,n,"Server response was missing for query '".concat(Array.isArray(e)?e.map(function(e){return e.operationName}):e.operationName,"'.")),n})}}var tQ=function(e){if(!e&&"undefined"==typeof fetch)throw __DEV__?new Q.ej("\n\"fetch\" has not been found globally and no fetcher has been configured. To fix this, install a fetch package (like https://www.npmjs.com/package/cross-fetch), instantiate the fetcher, and pass it into your HttpLink constructor. For example:\n\nimport fetch from 'cross-fetch';\nimport { ApolloClient, HttpLink } from '@apollo/client';\nconst client = new ApolloClient({\n  link: new HttpLink({ uri: '/graphql', fetch })\n});\n    "):new Q.ej(23)},t1=__webpack_require__(87392);function t0(e){return tl(e,{leave:t3})}var t2=80,t3={Name:function(e){return e.value},Variable:function(e){return"$"+e.name},Document:function(e){return t5(e.definitions,"\n\n")+"\n"},OperationDefinition:function(e){var t=e.operation,n=e.name,r=t9("(",t5(e.variableDefinitions,", "),")"),i=t5(e.directives," "),a=e.selectionSet;return n||i||r||"query"!==t?t5([t,t5([n,r]),i,a]," "):a},VariableDefinition:function(e){var t=e.variable,n=e.type,r=e.defaultValue,i=e.directives;return t+": "+n+t9(" = ",r)+t9(" ",t5(i," "))},SelectionSet:function(e){return t6(e.selections)},Field:function(e){var t=e.alias,n=e.name,r=e.arguments,i=e.directives,a=e.selectionSet,o=t9("",t,": ")+n,s=o+t9("(",t5(r,", "),")");return s.length>t2&&(s=o+t9("(\n",t8(t5(r,"\n")),"\n)")),t5([s,t5(i," "),a]," ")},Argument:function(e){var t;return e.name+": "+e.value},FragmentSpread:function(e){var t;return"..."+e.name+t9(" ",t5(e.directives," "))},InlineFragment:function(e){var t=e.typeCondition,n=e.directives,r=e.selectionSet;return t5(["...",t9("on ",t),t5(n," "),r]," ")},FragmentDefinition:function(e){var t=e.name,n=e.typeCondition,r=e.variableDefinitions,i=e.directives,a=e.selectionSet;return"fragment ".concat(t).concat(t9("(",t5(r,", "),")")," ")+"on ".concat(n," ").concat(t9("",t5(i," ")," "))+a},IntValue:function(e){return e.value},FloatValue:function(e){return e.value},StringValue:function(e,t){var n=e.value;return e.block?(0,t1.LZ)(n,"description"===t?"":"  "):JSON.stringify(n)},BooleanValue:function(e){return e.value?"true":"false"},NullValue:function(){return"null"},EnumValue:function(e){return e.value},ListValue:function(e){return"["+t5(e.values,", ")+"]"},ObjectValue:function(e){return"{"+t5(e.fields,", ")+"}"},ObjectField:function(e){var t;return e.name+": "+e.value},Directive:function(e){var t;return"@"+e.name+t9("(",t5(e.arguments,", "),")")},NamedType:function(e){return e.name},ListType:function(e){return"["+e.type+"]"},NonNullType:function(e){return e.type+"!"},SchemaDefinition:t4(function(e){var t=e.directives,n=e.operationTypes;return t5(["schema",t5(t," "),t6(n)]," ")}),OperationTypeDefinition:function(e){var t;return e.operation+": "+e.type},ScalarTypeDefinition:t4(function(e){var t;return t5(["scalar",e.name,t5(e.directives," ")]," ")}),ObjectTypeDefinition:t4(function(e){var t=e.name,n=e.interfaces,r=e.directives,i=e.fields;return t5(["type",t,t9("implements ",t5(n," & ")),t5(r," "),t6(i)]," ")}),FieldDefinition:t4(function(e){var t=e.name,n=e.arguments,r=e.type,i=e.directives;return t+(ne(n)?t9("(\n",t8(t5(n,"\n")),"\n)"):t9("(",t5(n,", "),")"))+": "+r+t9(" ",t5(i," "))}),InputValueDefinition:t4(function(e){var t=e.name,n=e.type,r=e.defaultValue,i=e.directives;return t5([t+": "+n,t9("= ",r),t5(i," ")]," ")}),InterfaceTypeDefinition:t4(function(e){var t=e.name,n=e.interfaces,r=e.directives,i=e.fields;return t5(["interface",t,t9("implements ",t5(n," & ")),t5(r," "),t6(i)]," ")}),UnionTypeDefinition:t4(function(e){var t=e.name,n=e.directives,r=e.types;return t5(["union",t,t5(n," "),r&&0!==r.length?"= "+t5(r," | "):""]," ")}),EnumTypeDefinition:t4(function(e){var t=e.name,n=e.directives,r=e.values;return t5(["enum",t,t5(n," "),t6(r)]," ")}),EnumValueDefinition:t4(function(e){var t;return t5([e.name,t5(e.directives," ")]," ")}),InputObjectTypeDefinition:t4(function(e){var t=e.name,n=e.directives,r=e.fields;return t5(["input",t,t5(n," "),t6(r)]," ")}),DirectiveDefinition:t4(function(e){var t=e.name,n=e.arguments,r=e.repeatable,i=e.locations;return"directive @"+t+(ne(n)?t9("(\n",t8(t5(n,"\n")),"\n)"):t9("(",t5(n,", "),")"))+(r?" repeatable":"")+" on "+t5(i," | ")}),SchemaExtension:function(e){var t=e.directives,n=e.operationTypes;return t5(["extend schema",t5(t," "),t6(n)]," ")},ScalarTypeExtension:function(e){var t;return t5(["extend scalar",e.name,t5(e.directives," ")]," ")},ObjectTypeExtension:function(e){var t=e.name,n=e.interfaces,r=e.directives,i=e.fields;return t5(["extend type",t,t9("implements ",t5(n," & ")),t5(r," "),t6(i)]," ")},InterfaceTypeExtension:function(e){var t=e.name,n=e.interfaces,r=e.directives,i=e.fields;return t5(["extend interface",t,t9("implements ",t5(n," & ")),t5(r," "),t6(i)]," ")},UnionTypeExtension:function(e){var t=e.name,n=e.directives,r=e.types;return t5(["extend union",t,t5(n," "),r&&0!==r.length?"= "+t5(r," | "):""]," ")},EnumTypeExtension:function(e){var t=e.name,n=e.directives,r=e.values;return t5(["extend enum",t,t5(n," "),t6(r)]," ")},InputObjectTypeExtension:function(e){var t=e.name,n=e.directives,r=e.fields;return t5(["extend input",t,t5(n," "),t6(r)]," ")}};function t4(e){return function(t){return t5([t.description,e(t)],"\n")}}function t5(e){var t,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";return null!==(t=null==e?void 0:e.filter(function(e){return e}).join(n))&&void 0!==t?t:""}function t6(e){return t9("{\n",t8(t5(e,"\n")),"\n}")}function t9(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"";return null!=t&&""!==t?e+t+n:""}function t8(e){return t9("  ",e.replace(/\n/g,"\n  "))}function t7(e){return -1!==e.indexOf("\n")}function ne(e){return null!=e&&e.some(t7)}var nt,nn,nr,ni={http:{includeQuery:!0,includeExtensions:!1,preserveHeaderCase:!1},headers:{accept:"*/*","content-type":"application/json"},options:{method:"POST"}},na=function(e,t){return t(e)};function no(e,t){for(var n=[],r=2;r<arguments.length;r++)n[r-2]=arguments[r];var i={},a={};n.forEach(function(e){i=(0,en.pi)((0,en.pi)((0,en.pi)({},i),e.options),{headers:(0,en.pi)((0,en.pi)({},i.headers),e.headers)}),e.credentials&&(i.credentials=e.credentials),a=(0,en.pi)((0,en.pi)({},a),e.http)}),i.headers&&(i.headers=ns(i.headers,a.preserveHeaderCase));var o=e.operationName,s=e.extensions,u=e.variables,c=e.query,l={operationName:o,variables:u};return a.includeExtensions&&(l.extensions=s),a.includeQuery&&(l.query=t(c,t0)),{options:i,body:l}}function ns(e,t){if(!t){var n=Object.create(null);return Object.keys(Object(e)).forEach(function(t){n[t.toLowerCase()]=e[t]}),n}var r=Object.create(null);Object.keys(Object(e)).forEach(function(t){r[t.toLowerCase()]={originalName:t,value:e[t]}});var i=Object.create(null);return Object.keys(r).forEach(function(e){i[r[e].originalName]=r[e].value}),i}var nu=function(){if("undefined"==typeof AbortController)return{controller:!1,signal:!1};var e=new AbortController,t=e.signal;return{controller:e,signal:t}};function nc(e,t){var n=[],r=function(e,t){n.push("".concat(e,"=").concat(encodeURIComponent(t)))};if("query"in t&&r("query",t.query),t.operationName&&r("operationName",t.operationName),t.variables){var i=void 0;try{i=ty(t.variables,"Variables map")}catch(a){return{parseError:a}}r("variables",i)}if(t.extensions){var o=void 0;try{o=ty(t.extensions,"Extensions map")}catch(s){return{parseError:s}}r("extensions",o)}var u="",c=e,l=e.indexOf("#");-1!==l&&(u=e.substr(l),c=e.substr(0,l));var f=-1===c.indexOf("?")?"?":"&";return{newURI:c+f+n.join("&")+u}}function nl(e){return new eT(function(t){t.error(e)})}var nf=(0,Q.wY)(function(){return fetch}),nd=function(e){void 0===e&&(e={});var t=e.uri,n=void 0===t?"/graphql":t,r=e.fetch,i=e.print,a=void 0===i?na:i,o=e.includeExtensions,s=e.preserveHeaderCase,u=e.useGETForQueries,c=e.includeUnusedVariables,l=void 0!==c&&c,f=(0,en._T)(e,["uri","fetch","print","includeExtensions","preserveHeaderCase","useGETForQueries","includeUnusedVariables"]);__DEV__&&tQ(r||nf);var d={http:{includeExtensions:o,preserveHeaderCase:s},options:f.fetchOptions,credentials:f.credentials,headers:f.headers};return new ta(function(e){var t,i=tw(e,n),o=e.getContext(),s={};if(o.clientAwareness){var c=o.clientAwareness,f=c.name,h=c.version;f&&(s["apollographql-client-name"]=f),h&&(s["apollographql-client-version"]=h)}var p=(0,en.pi)((0,en.pi)({},s),o.headers),b={http:o.http,options:o.fetchOptions,credentials:o.credentials,headers:p},m=no(e,a,ni,d,b),g=m.options,v=m.body;if(v.variables&&!l){var y=new Set(Object.keys(v.variables));tl(e.query,{Variable:function(e,t,n){n&&"VariableDefinition"!==n.kind&&y.delete(e.name.value)}}),y.size&&(v.variables=(0,en.pi)({},v.variables),y.forEach(function(e){delete v.variables[e]}))}if(!g.signal){var w=nu(),_=w.controller,E=w.signal;(t=_)&&(g.signal=E)}var S,k=function(e){return"OperationDefinition"===e.kind&&"mutation"===e.operation},x=(S=e9(e.query),"OperationDefinition"===S.kind&&"subscription"===S.operation),T=tb(["defer"],e.query);if(u&&!e.query.definitions.some(k)&&(g.method="GET"),T||x){g.headers=g.headers||{};var M="multipart/mixed;";x&&T&&__DEV__&&Q.kG.warn("Multipart-subscriptions do not support @defer"),x?M+="boundary=graphql;subscriptionSpec=1.0,application/json":T&&(M+="deferSpec=20220824,application/json"),g.headers.accept=M}if("GET"===g.method){var O=nc(i,v),A=O.newURI,L=O.parseError;if(L)return nl(L);i=A}else try{g.body=ty(v,"Payload")}catch(C){return nl(C)}return new eT(function(n){return(r||(0,Q.wY)(function(){return fetch})||nf)(i,g).then(function(t){e.setContext({response:t});var r,i=null===(r=t.headers)||void 0===r?void 0:r.get("content-type");return null!==i&&/^multipart\/mixed/i.test(i)?tK(t,n):tX(t,e,n)}).catch(function(e){return tZ(e,n)}),function(){t&&t.abort()}})})},nh=function(e){function t(t){void 0===t&&(t={});var n=e.call(this,nd(t).request)||this;return n.options=t,n}return(0,en.ZT)(t,e),t}(ta),np=ta.execute,nb="3.7.17",nm=__webpack_require__(82152);let ng=()=>Object.create(null),{forEach:nv,slice:ny}=Array.prototype,{hasOwnProperty:nw}=Object.prototype;class n_{constructor(e=!0,t=ng){this.weakness=e,this.makeData=t}lookup(...e){return this.lookupArray(e)}lookupArray(e){let t=this;return nv.call(e,e=>t=t.getChildTrie(e)),nw.call(t,"data")?t.data:t.data=this.makeData(ny.call(e))}peek(...e){return this.peekArray(e)}peekArray(e){let t=this;for(let n=0,r=e.length;t&&n<r;++n){let i=this.weakness&&nE(e[n])?t.weak:t.strong;t=i&&i.get(e[n])}return t&&t.data}getChildTrie(e){let t=this.weakness&&nE(e)?this.weak||(this.weak=new WeakMap):this.strong||(this.strong=new Map),n=t.get(e);return n||t.set(e,n=new n_(this.weakness,this.makeData)),n}}function nE(e){switch(typeof e){case"object":if(null===e)break;case"function":return!0}return!1}function nS(e){return(0,eO.s)(e)?(0,tP.k)(e)?e.slice(0):(0,en.pi)({__proto__:Object.getPrototypeOf(e)},e):e}var nk=function(){function e(){this.known=new(t_.sy?WeakSet:Set),this.pool=new n_(t_.mr),this.passes=new WeakMap,this.keysByJSON=new Map,this.empty=this.admit({})}return e.prototype.isKnown=function(e){return(0,eO.s)(e)&&this.known.has(e)},e.prototype.pass=function(e){if((0,eO.s)(e)){var t=nS(e);return this.passes.set(t,e),t}return e},e.prototype.admit=function(e){var t=this;if((0,eO.s)(e)){var n=this.passes.get(e);if(n)return n;var r=Object.getPrototypeOf(e);switch(r){case Array.prototype:if(this.known.has(e))break;var i=e.map(this.admit,this),a=this.pool.lookupArray(i);return!a.array&&(this.known.add(a.array=i),__DEV__&&Object.freeze(i)),a.array;case null:case Object.prototype:if(this.known.has(e))break;var o=Object.getPrototypeOf(e),s=[o],u=this.sortedKeys(e);s.push(u.json);var c=s.length;u.sorted.forEach(function(n){s.push(t.admit(e[n]))});var a=this.pool.lookupArray(s);if(!a.object){var l=a.object=Object.create(o);this.known.add(l),u.sorted.forEach(function(e,t){l[e]=s[c+t]}),__DEV__&&Object.freeze(l)}return a.object}}return e},e.prototype.sortedKeys=function(e){var t=Object.keys(e),n=this.pool.lookupArray(t);if(!n.keys){t.sort();var r=JSON.stringify(t);(n.keys=this.keysByJSON.get(r))||this.keysByJSON.set(r,n.keys={sorted:t,json:r})}return n.keys},e}(),nx=Object.assign(function(n){if((0,eO.s)(n)){void 0===e&&nT();var r=e.admit(n),i=t.get(r);return void 0===i&&t.set(r,i=JSON.stringify(r)),i}return JSON.stringify(n)},{reset:nT});function nT(){e=new nk,t=new(t_.mr?WeakMap:Map)}function nM(e,t,n){return new eT(function(r){var i=r.next,a=r.error,o=r.complete,s=0,u=!1,c={then:function(e){return new Promise(function(t){return t(e())})}};function l(e,t){return e?function(t){++s;var n=function(){return e(t)};c=c.then(n,n).then(function(e){--s,i&&i.call(r,e),u&&f.complete()},function(e){throw--s,e}).catch(function(e){a&&a.call(r,e)})}:function(e){return t&&t.call(r,e)}}var f={next:l(t,i),error:l(n,a),complete:function(){u=!0,!s&&o&&o.call(r)}},d=e.subscribe(f);return function(){return d.unsubscribe()}})}function nO(e){var t=nA(e);return(0,tP.O)(t)}function nA(e){var t=(0,tP.O)(e.errors)?e.errors.slice(0):[];return tU(e)&&(0,tP.O)(e.incremental)&&e.incremental.forEach(function(e){e.errors&&t.push.apply(t,e.errors)}),t}var nL=__webpack_require__(97359),nC={kind:nL.h.FIELD,name:{kind:nL.h.NAME,value:"__typename"}};function nI(e,t){return!e||e.selectionSet.selections.every(function(e){return e.kind===nL.h.FRAGMENT_SPREAD&&nI(t[e.name.value],t)})}function nD(e){return nI(e2(e)||e6(e),eL(e4(e)))?null:e}function nN(e){var t=new Set,n=[];return e.forEach(function(e){e.name?t.add(e.name):e.test&&n.push(e.test)}),function(e){return t.has(e.name.value)||n.some(function(t){return t(e)})}}function nP(e){var t=new Map;return function(n){void 0===n&&(n=e);var r=t.get(n);return r||t.set(n,r={variables:new Set,fragmentSpreads:new Set}),r}}function nR(e,t){for(var n=nP(""),r=nP(""),i=function(e){for(var t=0,i=void 0;t<e.length&&(i=e[t]);++t)if(!(0,tP.k)(i)){if(i.kind===nL.h.OPERATION_DEFINITION)return n(i.name&&i.name.value);if(i.kind===nL.h.FRAGMENT_DEFINITION)return r(i.name.value)}return __DEV__&&Q.kG.error("Could not find operation or fragment"),null},a=0,o=t.definitions.length-1;o>=0;--o)t.definitions[o].kind===nL.h.OPERATION_DEFINITION&&++a;var s=nN(e),u=e.some(function(e){return e.remove}),c=function(e){return u&&e&&e.some(s)},l=new Map,f=!1,d={enter:function(e){if(c(e.directives))return f=!0,null}},h=tl(t,{Field:d,InlineFragment:d,VariableDefinition:{enter:function(){return!1}},Variable:{enter:function(e,t,n,r,a){var o=i(a);o&&o.variables.add(e.name.value)}},FragmentSpread:{enter:function(e,t,n,r,a){if(c(e.directives))return f=!0,null;var o=i(a);o&&o.fragmentSpreads.add(e.name.value)}},FragmentDefinition:{enter:function(e,t,n,r){l.set(JSON.stringify(r),e)},leave:function(e,t,n,i){return e===l.get(JSON.stringify(i))?e:a>0&&e.selectionSet.selections.every(function(e){return e.kind===nL.h.FIELD&&"__typename"===e.name.value})?(r(e.name.value).removed=!0,f=!0,null):void 0}},Directive:{leave:function(e){if(s(e))return f=!0,null}}});if(!f)return t;var p=function(e){return e.transitiveVars||(e.transitiveVars=new Set(e.variables),e.removed||e.fragmentSpreads.forEach(function(t){p(r(t)).transitiveVars.forEach(function(t){e.transitiveVars.add(t)})})),e},b=new Set;h.definitions.forEach(function(e){e.kind===nL.h.OPERATION_DEFINITION?p(n(e.name&&e.name.value)).fragmentSpreads.forEach(function(e){b.add(e)}):e.kind!==nL.h.FRAGMENT_DEFINITION||0!==a||r(e.name.value).removed||b.add(e.name.value)}),b.forEach(function(e){p(r(e)).fragmentSpreads.forEach(function(e){b.add(e)})});var m=function(e){return!!(!b.has(e)||r(e).removed)},g={enter:function(e){if(m(e.name.value))return null}};return nD(tl(h,{FragmentSpread:g,FragmentDefinition:g,OperationDefinition:{leave:function(e){if(e.variableDefinitions){var t=p(n(e.name&&e.name.value)).transitiveVars;if(t.size<e.variableDefinitions.length)return(0,en.pi)((0,en.pi)({},e),{variableDefinitions:e.variableDefinitions.filter(function(e){return t.has(e.variable.name.value)})})}}}}))}var nj=Object.assign(function(e){return tl(e,{SelectionSet:{enter:function(e,t,n){if(!n||n.kind!==nL.h.OPERATION_DEFINITION){var r=e.selections;if(!(!r||r.some(function(e){return eQ(e)&&("__typename"===e.name.value||0===e.name.value.lastIndexOf("__",0))}))){var i=n;if(!(eQ(i)&&i.directives&&i.directives.some(function(e){return"export"===e.name.value})))return(0,en.pi)((0,en.pi)({},e),{selections:(0,en.ev)((0,en.ev)([],r,!0),[nC],!1)})}}}}})},{added:function(e){return e===nC}}),nF={test:function(e){var t="connection"===e.name.value;return t&&(!e.arguments||!e.arguments.some(function(e){return"key"===e.name.value}))&&__DEV__&&Q.kG.warn("Removing an @connection directive even though it does not have a key. You may want to use the key parameter to specify a store key."),t}};function nY(e){return nR([nF],e0(e))}function nB(e,t,n){return void 0===n&&(n=!0),!!t&&t.selections&&t.selections.some(function(t){return nU(e,t,n)})}function nU(e,t,n){return void 0===n&&(n=!0),!isField(t)||!!t.directives&&(t.directives.some(nN(e))||n&&nB(e,t.selectionSet,n))}function nH(e){return"query"===e9(e).operation?e:tl(e,{OperationDefinition:{enter:function(e){return(0,en.pi)((0,en.pi)({},e),{operation:"query"})}}})}function n$(e){return e0(e),nR([{test:function(e){return"client"===e.name.value},remove:!0},],e)}var nz=new Map;function nG(e){var t=nz.get(e)||1;return nz.set(e,t+1),"".concat(e,":").concat(t,":").concat(Math.random().toString(36).slice(2))}function nW(e,t,n){var r=[];e.forEach(function(e){return e[t]&&r.push(e)}),r.forEach(function(e){return e[t](n)})}function nK(e){function t(t){Object.defineProperty(e,t,{value:eT})}return t_.aS&&Symbol.species&&t(Symbol.species),t("@@species"),e}function nV(e){return e&&"function"==typeof e.then}var nq=function(e){function t(t){var n=e.call(this,function(e){return n.addObserver(e),function(){return n.removeObserver(e)}})||this;return n.observers=new Set,n.promise=new Promise(function(e,t){n.resolve=e,n.reject=t}),n.handlers={next:function(e){null!==n.sub&&(n.latest=["next",e],n.notify("next",e),nW(n.observers,"next",e))},error:function(e){var t=n.sub;null!==t&&(t&&setTimeout(function(){return t.unsubscribe()}),n.sub=null,n.latest=["error",e],n.reject(e),n.notify("error",e),nW(n.observers,"error",e))},complete:function(){var e=n,t=e.sub,r=e.sources,i=void 0===r?[]:r;if(null!==t){var a=i.shift();a?nV(a)?a.then(function(e){return n.sub=e.subscribe(n.handlers)}):n.sub=a.subscribe(n.handlers):(t&&setTimeout(function(){return t.unsubscribe()}),n.sub=null,n.latest&&"next"===n.latest[0]?n.resolve(n.latest[1]):n.resolve(),n.notify("complete"),nW(n.observers,"complete"))}}},n.nextResultListeners=new Set,n.cancel=function(e){n.reject(e),n.sources=[],n.handlers.complete()},n.promise.catch(function(e){}),"function"==typeof t&&(t=[new eT(t)]),nV(t)?t.then(function(e){return n.start(e)},n.handlers.error):n.start(t),n}return(0,en.ZT)(t,e),t.prototype.start=function(e){void 0===this.sub&&(this.sources=Array.from(e),this.handlers.complete())},t.prototype.deliverLastMessage=function(e){if(this.latest){var t=this.latest[0],n=e[t];n&&n.call(e,this.latest[1]),null===this.sub&&"next"===t&&e.complete&&e.complete()}},t.prototype.addObserver=function(e){this.observers.has(e)||(this.deliverLastMessage(e),this.observers.add(e))},t.prototype.removeObserver=function(e){this.observers.delete(e)&&this.observers.size<1&&this.handlers.complete()},t.prototype.notify=function(e,t){var n=this.nextResultListeners;n.size&&(this.nextResultListeners=new Set,n.forEach(function(n){return n(e,t)}))},t.prototype.beforeNext=function(e){var t=!1;this.nextResultListeners.add(function(n,r){t||(t=!0,e(n,r))})},t}(eT);nK(nq);var nZ=__webpack_require__(1644),nX=Object.prototype.toString;function nJ(e){return nQ(e)}function nQ(e,t){switch(nX.call(e)){case"[object Array]":if((t=t||new Map).has(e))return t.get(e);var n=e.slice(0);return t.set(e,n),n.forEach(function(e,r){n[r]=nQ(e,t)}),n;case"[object Object]":if((t=t||new Map).has(e))return t.get(e);var r=Object.create(Object.getPrototypeOf(e));return t.set(e,r),Object.keys(e).forEach(function(n){r[n]=nQ(e[n],t)}),r;default:return e}}var n1=__webpack_require__(53712),n0=Object.assign,n2=Object.hasOwnProperty,n3=function(e){function t(t){var n=t.queryManager,r=t.queryInfo,i=t.options,a=e.call(this,function(e){try{var t=e._subscription._observer;t&&!t.error&&(t.error=n5)}catch(n){}var r=!a.observers.size;a.observers.add(e);var i=a.last;return i&&i.error?e.error&&e.error(i.error):i&&i.result&&e.next&&e.next(i.result),r&&a.reobserve().catch(function(){}),function(){a.observers.delete(e)&&!a.observers.size&&a.tearDownQuery()}})||this;a.observers=new Set,a.subscriptions=new Set,a.queryInfo=r,a.queryManager=n,a.waitForOwnResult=n9(i.fetchPolicy),a.isTornDown=!1;var o=n.defaultOptions.watchQuery,s=(void 0===o?{}:o).fetchPolicy,u=void 0===s?"cache-first":s,c=i.fetchPolicy,l=void 0===c?u:c,f=i.initialFetchPolicy,d=void 0===f?"standby"===l?u:l:f;a.options=(0,en.pi)((0,en.pi)({},i),{initialFetchPolicy:d,fetchPolicy:l}),a.queryId=r.queryId||n.generateQueryId();var h=e2(a.query);return a.queryName=h&&h.name&&h.name.value,a}return(0,en.ZT)(t,e),Object.defineProperty(t.prototype,"query",{get:function(){return this.queryManager.transform(this.options.query).document},enumerable:!1,configurable:!0}),Object.defineProperty(t.prototype,"variables",{get:function(){return this.options.variables},enumerable:!1,configurable:!0}),t.prototype.result=function(){var e=this;return new Promise(function(t,n){var r={next:function(n){t(n),e.observers.delete(r),e.observers.size||e.queryManager.removeQuery(e.queryId),setTimeout(function(){i.unsubscribe()},0)},error:n},i=e.subscribe(r)})},t.prototype.getCurrentResult=function(e){void 0===e&&(e=!0);var t=this.getLastResult(!0),n=this.queryInfo.networkStatus||t&&t.networkStatus||nZ.I.ready,r=(0,en.pi)((0,en.pi)({},t),{loading:(0,nZ.O)(n),networkStatus:n}),i=this.options.fetchPolicy,a=void 0===i?"cache-first":i;if(n9(a)||this.queryManager.transform(this.options.query).hasForcedResolvers);else if(this.waitForOwnResult)this.queryInfo.updateWatch();else{var o=this.queryInfo.getDiff();(o.complete||this.options.returnPartialData)&&(r.data=o.result),(0,nm.D)(r.data,{})&&(r.data=void 0),o.complete?(delete r.partial,o.complete&&r.networkStatus===nZ.I.loading&&("cache-first"===a||"cache-only"===a)&&(r.networkStatus=nZ.I.ready,r.loading=!1)):r.partial=!0,!__DEV__||o.complete||this.options.partialRefetch||r.loading||r.data||r.error||n6(o.missing)}return e&&this.updateLastResult(r),r},t.prototype.isDifferentFromLastResult=function(e,t){return!this.last||!(0,nm.D)(this.last.result,e)||t&&!(0,nm.D)(this.last.variables,t)},t.prototype.getLast=function(e,t){var n=this.last;if(n&&n[e]&&(!t||(0,nm.D)(n.variables,this.variables)))return n[e]},t.prototype.getLastResult=function(e){return this.getLast("result",e)},t.prototype.getLastError=function(e){return this.getLast("error",e)},t.prototype.resetLastResults=function(){delete this.last,this.isTornDown=!1},t.prototype.resetQueryStoreErrors=function(){this.queryManager.resetErrors(this.queryId)},t.prototype.refetch=function(e){var t,n={pollInterval:0},r=this.options.fetchPolicy;if("cache-and-network"===r?n.fetchPolicy=r:"no-cache"===r?n.fetchPolicy="no-cache":n.fetchPolicy="network-only",__DEV__&&e&&n2.call(e,"variables")){var i=e5(this.query),a=i.variableDefinitions;(!a||!a.some(function(e){return"variables"===e.variable.name.value}))&&__DEV__&&Q.kG.warn("Called refetch(".concat(JSON.stringify(e),") for query ").concat((null===(t=i.name)||void 0===t?void 0:t.value)||JSON.stringify(i),", which does not declare a $variables variable.\nDid you mean to call refetch(variables) instead of refetch({ variables })?"))}return e&&!(0,nm.D)(this.options.variables,e)&&(n.variables=this.options.variables=(0,en.pi)((0,en.pi)({},this.options.variables),e)),this.queryInfo.resetLastWrite(),this.reobserve(n,nZ.I.refetch)},t.prototype.fetchMore=function(e){var t=this,n=(0,en.pi)((0,en.pi)({},e.query?e:(0,en.pi)((0,en.pi)((0,en.pi)((0,en.pi)({},this.options),{query:this.query}),e),{variables:(0,en.pi)((0,en.pi)({},this.options.variables),e.variables)})),{fetchPolicy:"no-cache"}),r=this.queryManager.generateQueryId(),i=this.queryInfo,a=i.networkStatus;i.networkStatus=nZ.I.fetchMore,n.notifyOnNetworkStatusChange&&this.observe();var o=new Set;return this.queryManager.fetchQuery(r,n,nZ.I.fetchMore).then(function(s){return t.queryManager.removeQuery(r),i.networkStatus===nZ.I.fetchMore&&(i.networkStatus=a),t.queryManager.cache.batch({update:function(r){var i=e.updateQuery;i?r.updateQuery({query:t.query,variables:t.variables,returnPartialData:!0,optimistic:!1},function(e){return i(e,{fetchMoreResult:s.data,variables:n.variables})}):r.writeQuery({query:n.query,variables:n.variables,data:s.data})},onWatchUpdated:function(e){o.add(e.query)}}),s}).finally(function(){o.has(t.query)||n4(t)})},t.prototype.subscribeToMore=function(e){var t=this,n=this.queryManager.startGraphQLSubscription({query:e.document,variables:e.variables,context:e.context}).subscribe({next:function(n){var r=e.updateQuery;r&&t.updateQuery(function(e,t){return r(e,{subscriptionData:n,variables:t.variables})})},error:function(t){if(e.onError){e.onError(t);return}__DEV__&&Q.kG.error("Unhandled GraphQL subscription error",t)}});return this.subscriptions.add(n),function(){t.subscriptions.delete(n)&&n.unsubscribe()}},t.prototype.setOptions=function(e){return this.reobserve(e)},t.prototype.setVariables=function(e){return(0,nm.D)(this.variables,e)?this.observers.size?this.result():Promise.resolve():(this.options.variables=e,this.observers.size)?this.reobserve({fetchPolicy:this.options.initialFetchPolicy,variables:e},nZ.I.setVariables):Promise.resolve()},t.prototype.updateQuery=function(e){var t=this.queryManager,n=e(t.cache.diff({query:this.options.query,variables:this.variables,returnPartialData:!0,optimistic:!1}).result,{variables:this.variables});n&&(t.cache.writeQuery({query:this.options.query,data:n,variables:this.variables}),t.broadcastQueries())},t.prototype.startPolling=function(e){this.options.pollInterval=e,this.updatePolling()},t.prototype.stopPolling=function(){this.options.pollInterval=0,this.updatePolling()},t.prototype.applyNextFetchPolicy=function(e,t){if(t.nextFetchPolicy){var n=t.fetchPolicy,r=void 0===n?"cache-first":n,i=t.initialFetchPolicy,a=void 0===i?r:i;"standby"===r||("function"==typeof t.nextFetchPolicy?t.fetchPolicy=t.nextFetchPolicy(r,{reason:e,options:t,observable:this,initialFetchPolicy:a}):"variables-changed"===e?t.fetchPolicy=a:t.fetchPolicy=t.nextFetchPolicy)}return t.fetchPolicy},t.prototype.fetch=function(e,t){return this.queryManager.setObservableQuery(this),this.queryManager.fetchConcastWithInfo(this.queryId,e,t)},t.prototype.updatePolling=function(){var e=this;if(!this.queryManager.ssrMode){var t=this,n=t.pollingInfo,r=t.options.pollInterval;if(!r){n&&(clearTimeout(n.timeout),delete this.pollingInfo);return}if(!n||n.interval!==r){__DEV__?(0,Q.kG)(r,"Attempted to start a polling query without a polling interval."):(0,Q.kG)(r,13),(n||(this.pollingInfo={})).interval=r;var i=function(){e.pollingInfo&&((0,nZ.O)(e.queryInfo.networkStatus)?a():e.reobserve({fetchPolicy:"no-cache"===e.options.initialFetchPolicy?"no-cache":"network-only"},nZ.I.poll).then(a,a))},a=function(){var t=e.pollingInfo;t&&(clearTimeout(t.timeout),t.timeout=setTimeout(i,t.interval))};a()}}},t.prototype.updateLastResult=function(e,t){return void 0===t&&(t=this.variables),this.last=(0,en.pi)((0,en.pi)({},this.last),{result:this.queryManager.assumeImmutableResults?e:nJ(e),variables:t}),(0,tP.O)(e.errors)||delete this.last.error,this.last},t.prototype.reobserveAsConcast=function(e,t){var n=this;this.isTornDown=!1;var r=t===nZ.I.refetch||t===nZ.I.fetchMore||t===nZ.I.poll,i=this.options.variables,a=this.options.fetchPolicy,o=(0,n1.o)(this.options,e||{}),s=r?o:n0(this.options,o);!r&&(this.updatePolling(),e&&e.variables&&!(0,nm.D)(e.variables,i)&&"standby"!==s.fetchPolicy&&s.fetchPolicy===a&&(this.applyNextFetchPolicy("variables-changed",s),void 0===t&&(t=nZ.I.setVariables))),this.waitForOwnResult&&(this.waitForOwnResult=n9(s.fetchPolicy));var u=function(){n.concast===f&&(n.waitForOwnResult=!1)},c=s.variables&&(0,en.pi)({},s.variables),l=this.fetch(s,t),f=l.concast,d=l.fromLink,h={next:function(e){u(),n.reportResult(e,c)},error:function(e){u(),n.reportError(e,c)}};return!r&&d&&(this.concast&&this.observer&&this.concast.removeObserver(this.observer),this.concast=f,this.observer=h),f.addObserver(h),f},t.prototype.reobserve=function(e,t){return this.reobserveAsConcast(e,t).promise},t.prototype.observe=function(){this.reportResult(this.getCurrentResult(!1),this.variables)},t.prototype.reportResult=function(e,t){var n=this.getLastError();(n||this.isDifferentFromLastResult(e,t))&&((n||!e.partial||this.options.returnPartialData)&&this.updateLastResult(e,t),nW(this.observers,"next",e))},t.prototype.reportError=function(e,t){var n=(0,en.pi)((0,en.pi)({},this.getLastResult()),{error:e,errors:e.graphQLErrors,networkStatus:nZ.I.error,loading:!1});this.updateLastResult(n,t),nW(this.observers,"error",this.last.error=e)},t.prototype.hasObservers=function(){return this.observers.size>0},t.prototype.tearDownQuery=function(){this.isTornDown||(this.concast&&this.observer&&(this.concast.removeObserver(this.observer),delete this.concast,delete this.observer),this.stopPolling(),this.subscriptions.forEach(function(e){return e.unsubscribe()}),this.subscriptions.clear(),this.queryManager.stopQuery(this.queryId),this.observers.clear(),this.isTornDown=!0)},t}(eT);function n4(e){var t=e.options,n=t.fetchPolicy,r=t.nextFetchPolicy;return"cache-and-network"===n||"network-only"===n?e.reobserve({fetchPolicy:"cache-first",nextFetchPolicy:function(){return(this.nextFetchPolicy=r,"function"==typeof r)?r.apply(this,arguments):n}}):e.reobserve()}function n5(e){__DEV__&&Q.kG.error("Unhandled error",e.message,e.stack)}function n6(e){__DEV__&&e&&__DEV__&&Q.kG.debug("Missing cache result fields: ".concat(JSON.stringify(e)),e)}function n9(e){return"network-only"===e||"no-cache"===e||"standby"===e}nK(n3);function n8(e){return e.kind===nL.h.FIELD||e.kind===nL.h.FRAGMENT_SPREAD||e.kind===nL.h.INLINE_FRAGMENT}function n7(e){return e.kind===Kind.SCALAR_TYPE_DEFINITION||e.kind===Kind.OBJECT_TYPE_DEFINITION||e.kind===Kind.INTERFACE_TYPE_DEFINITION||e.kind===Kind.UNION_TYPE_DEFINITION||e.kind===Kind.ENUM_TYPE_DEFINITION||e.kind===Kind.INPUT_OBJECT_TYPE_DEFINITION}function re(e){return e.kind===Kind.SCALAR_TYPE_EXTENSION||e.kind===Kind.OBJECT_TYPE_EXTENSION||e.kind===Kind.INTERFACE_TYPE_EXTENSION||e.kind===Kind.UNION_TYPE_EXTENSION||e.kind===Kind.ENUM_TYPE_EXTENSION||e.kind===Kind.INPUT_OBJECT_TYPE_EXTENSION}var rt=function(){return Object.create(null)},rn=Array.prototype,rr=rn.forEach,ri=rn.slice,ra=function(){function e(e,t){void 0===e&&(e=!0),void 0===t&&(t=rt),this.weakness=e,this.makeData=t}return e.prototype.lookup=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return this.lookupArray(e)},e.prototype.lookupArray=function(e){var t=this;return rr.call(e,function(e){return t=t.getChildTrie(e)}),t.data||(t.data=this.makeData(ri.call(e)))},e.prototype.getChildTrie=function(t){var n=this.weakness&&ro(t)?this.weak||(this.weak=new WeakMap):this.strong||(this.strong=new Map),r=n.get(t);return r||n.set(t,r=new e(this.weakness,this.makeData)),r},e}();function ro(e){switch(typeof e){case"object":if(null===e)break;case"function":return!0}return!1}let rs=null,ru={},rc=1,rl=()=>class{constructor(){this.id=["slot",rc++,Date.now(),Math.random().toString(36).slice(2),].join(":")}hasValue(){for(let e=rs;e;e=e.parent)if(this.id in e.slots){let t=e.slots[this.id];if(t===ru)break;return e!==rs&&(rs.slots[this.id]=t),!0}return rs&&(rs.slots[this.id]=ru),!1}getValue(){if(this.hasValue())return rs.slots[this.id]}withValue(e,t,n,r){let i={__proto__:null,[this.id]:e},a=rs;rs={parent:a,slots:i};try{return t.apply(r,n)}finally{rs=a}}static bind(e){let t=rs;return function(){let n=rs;try{return rs=t,e.apply(this,arguments)}finally{rs=n}}}static noContext(e,t,n){if(!rs)return e.apply(n,t);{let r=rs;try{return rs=null,e.apply(n,t)}finally{rs=r}}}};function rf(e){try{return e()}catch(t){}}let rd="@wry/context:Slot",rh=rf(()=>globalThis)||rf(()=>global)||Object.create(null),rp=rh,rb=rp[rd]||Array[rd]||function(e){try{Object.defineProperty(rp,rd,{value:e,enumerable:!1,writable:!1,configurable:!0})}finally{return e}}(rl()),{bind:rm,noContext:rg}=rb;function rv(){}var ry=function(){function e(e,t){void 0===e&&(e=1/0),void 0===t&&(t=rv),this.max=e,this.dispose=t,this.map=new Map,this.newest=null,this.oldest=null}return e.prototype.has=function(e){return this.map.has(e)},e.prototype.get=function(e){var t=this.getNode(e);return t&&t.value},e.prototype.getNode=function(e){var t=this.map.get(e);if(t&&t!==this.newest){var n=t.older,r=t.newer;r&&(r.older=n),n&&(n.newer=r),t.older=this.newest,t.older.newer=t,t.newer=null,this.newest=t,t===this.oldest&&(this.oldest=r)}return t},e.prototype.set=function(e,t){var n=this.getNode(e);return n?n.value=t:(n={key:e,value:t,newer:null,older:this.newest},this.newest&&(this.newest.newer=n),this.newest=n,this.oldest=this.oldest||n,this.map.set(e,n),n.value)},e.prototype.clean=function(){for(;this.oldest&&this.map.size>this.max;)this.delete(this.oldest.key)},e.prototype.delete=function(e){var t=this.map.get(e);return!!t&&(t===this.newest&&(this.newest=t.older),t===this.oldest&&(this.oldest=t.newer),t.newer&&(t.newer.older=t.older),t.older&&(t.older.newer=t.newer),this.map.delete(e),this.dispose(t.value,e),!0)},e}(),rw=new rb,r_=Object.prototype.hasOwnProperty,rE=void 0===(n=Array.from)?function(e){var t=[];return e.forEach(function(e){return t.push(e)}),t}:n;function rS(e){var t=e.unsubscribe;"function"==typeof t&&(e.unsubscribe=void 0,t())}var rk=[],rx=100;function rT(e,t){if(!e)throw Error(t||"assertion failure")}function rM(e,t){var n=e.length;return n>0&&n===t.length&&e[n-1]===t[n-1]}function rO(e){switch(e.length){case 0:throw Error("unknown value");case 1:return e[0];case 2:throw e[1]}}function rA(e){return e.slice(0)}var rL=function(){function e(t){this.fn=t,this.parents=new Set,this.childValues=new Map,this.dirtyChildren=null,this.dirty=!0,this.recomputing=!1,this.value=[],this.deps=null,++e.count}return e.prototype.peek=function(){if(1===this.value.length&&!rN(this))return rC(this),this.value[0]},e.prototype.recompute=function(e){return rT(!this.recomputing,"already recomputing"),rC(this),rN(this)?rI(this,e):rO(this.value)},e.prototype.setDirty=function(){this.dirty||(this.dirty=!0,this.value.length=0,rR(this),rS(this))},e.prototype.dispose=function(){var e=this;this.setDirty(),rH(this),rF(this,function(t,n){t.setDirty(),r$(t,e)})},e.prototype.forget=function(){this.dispose()},e.prototype.dependOn=function(e){e.add(this),this.deps||(this.deps=rk.pop()||new Set),this.deps.add(e)},e.prototype.forgetDeps=function(){var e=this;this.deps&&(rE(this.deps).forEach(function(t){return t.delete(e)}),this.deps.clear(),rk.push(this.deps),this.deps=null)},e.count=0,e}();function rC(e){var t=rw.getValue();if(t)return e.parents.add(t),t.childValues.has(e)||t.childValues.set(e,[]),rN(e)?rY(t,e):rB(t,e),t}function rI(e,t){return rH(e),rw.withValue(e,rD,[e,t]),rz(e,t)&&rP(e),rO(e.value)}function rD(e,t){e.recomputing=!0,e.value.length=0;try{e.value[0]=e.fn.apply(null,t)}catch(n){e.value[1]=n}e.recomputing=!1}function rN(e){return e.dirty||!!(e.dirtyChildren&&e.dirtyChildren.size)}function rP(e){e.dirty=!1,!rN(e)&&rj(e)}function rR(e){rF(e,rY)}function rj(e){rF(e,rB)}function rF(e,t){var n=e.parents.size;if(n)for(var r=rE(e.parents),i=0;i<n;++i)t(r[i],e)}function rY(e,t){rT(e.childValues.has(t)),rT(rN(t));var n=!rN(e);if(e.dirtyChildren){if(e.dirtyChildren.has(t))return}else e.dirtyChildren=rk.pop()||new Set;e.dirtyChildren.add(t),n&&rR(e)}function rB(e,t){rT(e.childValues.has(t)),rT(!rN(t));var n=e.childValues.get(t);0===n.length?e.childValues.set(t,rA(t.value)):rM(n,t.value)||e.setDirty(),rU(e,t),!rN(e)&&rj(e)}function rU(e,t){var n=e.dirtyChildren;n&&(n.delete(t),0===n.size&&(rk.length<rx&&rk.push(n),e.dirtyChildren=null))}function rH(e){e.childValues.size>0&&e.childValues.forEach(function(t,n){r$(e,n)}),e.forgetDeps(),rT(null===e.dirtyChildren)}function r$(e,t){t.parents.delete(e),e.childValues.delete(t),rU(e,t)}function rz(e,t){if("function"==typeof e.subscribe)try{rS(e),e.unsubscribe=e.subscribe.apply(null,t)}catch(n){return e.setDirty(),!1}return!0}var rG={setDirty:!0,dispose:!0,forget:!0};function rW(e){var t=new Map,n=e&&e.subscribe;function r(e){var r=rw.getValue();if(r){var i=t.get(e);i||t.set(e,i=new Set),r.dependOn(i),"function"==typeof n&&(rS(i),i.unsubscribe=n(e))}}return r.dirty=function(e,n){var r=t.get(e);if(r){var i=n&&r_.call(rG,n)?n:"setDirty";rE(r).forEach(function(e){return e[i]()}),t.delete(e),rS(r)}},r}function rK(){var e=new ra("function"==typeof WeakMap);return function(){return e.lookupArray(arguments)}}var rV=rK(),rq=new Set;function rZ(e,t){void 0===t&&(t=Object.create(null));var n=new ry(t.max||65536,function(e){return e.dispose()}),r=t.keyArgs,i=t.makeCacheKey||rK(),a=function(){var a=i.apply(null,r?r.apply(null,arguments):arguments);if(void 0===a)return e.apply(null,arguments);var o=n.get(a);o||(n.set(a,o=new rL(e)),o.subscribe=t.subscribe,o.forget=function(){return n.delete(a)});var s=o.recompute(Array.prototype.slice.call(arguments));return n.set(a,o),rq.add(n),rw.hasValue()||(rq.forEach(function(e){return e.clean()}),rq.clear()),s};function o(e){var t=n.get(e);t&&t.setDirty()}function s(e){var t=n.get(e);if(t)return t.peek()}function u(e){return n.delete(e)}return Object.defineProperty(a,"size",{get:function(){return n.map.size},configurable:!1,enumerable:!1}),a.dirtyKey=o,a.dirty=function(){o(i.apply(null,arguments))},a.peekKey=s,a.peek=function(){return s(i.apply(null,arguments))},a.forgetKey=u,a.forget=function(){return u(i.apply(null,arguments))},a.makeCacheKey=i,a.getKey=r?function(){return i.apply(null,r.apply(null,arguments))}:i,Object.freeze(a)}var rX=new rb,rJ=new WeakMap;function rQ(e){var t=rJ.get(e);return t||rJ.set(e,t={vars:new Set,dep:rW()}),t}function r1(e){rQ(e).vars.forEach(function(t){return t.forgetCache(e)})}function r0(e){rQ(e).vars.forEach(function(t){return t.attachCache(e)})}function r2(e){var t=new Set,n=new Set,r=function(a){if(arguments.length>0){if(e!==a){e=a,t.forEach(function(e){rQ(e).dep.dirty(r),r3(e)});var o=Array.from(n);n.clear(),o.forEach(function(t){return t(e)})}}else{var s=rX.getValue();s&&(i(s),rQ(s).dep(r))}return e};r.onNextChange=function(e){return n.add(e),function(){n.delete(e)}};var i=r.attachCache=function(e){return t.add(e),rQ(e).vars.add(r),r};return r.forgetCache=function(e){return t.delete(e)},r}function r3(e){e.broadcastWatches&&e.broadcastWatches()}var r4=function(){function e(e){var t=e.cache,n=e.client,r=e.resolvers,i=e.fragmentMatcher;this.selectionsToResolveCache=new WeakMap,this.cache=t,n&&(this.client=n),r&&this.addResolvers(r),i&&this.setFragmentMatcher(i)}return e.prototype.addResolvers=function(e){var t=this;this.resolvers=this.resolvers||{},Array.isArray(e)?e.forEach(function(e){t.resolvers=tj(t.resolvers,e)}):this.resolvers=tj(this.resolvers,e)},e.prototype.setResolvers=function(e){this.resolvers={},this.addResolvers(e)},e.prototype.getResolvers=function(){return this.resolvers||{}},e.prototype.runResolvers=function(e){var t=e.document,n=e.remoteResult,r=e.context,i=e.variables,a=e.onlyRunForcedResolvers,o=void 0!==a&&a;return(0,en.mG)(this,void 0,void 0,function(){return(0,en.Jh)(this,function(e){return t?[2,this.resolveDocument(t,n.data,r,i,this.fragmentMatcher,o).then(function(e){return(0,en.pi)((0,en.pi)({},n),{data:e.result})})]:[2,n]})})},e.prototype.setFragmentMatcher=function(e){this.fragmentMatcher=e},e.prototype.getFragmentMatcher=function(){return this.fragmentMatcher},e.prototype.clientQuery=function(e){return tb(["client"],e)&&this.resolvers?e:null},e.prototype.serverQuery=function(e){return n$(e)},e.prototype.prepareContext=function(e){var t=this.cache;return(0,en.pi)((0,en.pi)({},e),{cache:t,getCacheKey:function(e){return t.identify(e)}})},e.prototype.addExportedVariables=function(e,t,n){return void 0===t&&(t={}),void 0===n&&(n={}),(0,en.mG)(this,void 0,void 0,function(){return(0,en.Jh)(this,function(r){return e?[2,this.resolveDocument(e,this.buildRootValueFromCache(e,t)||{},this.prepareContext(n),t).then(function(e){return(0,en.pi)((0,en.pi)({},t),e.exportedVariables)})]:[2,(0,en.pi)({},t)]})})},e.prototype.shouldForceResolvers=function(e){var t=!1;return tl(e,{Directive:{enter:function(e){if("client"===e.name.value&&e.arguments&&(t=e.arguments.some(function(e){return"always"===e.name.value&&"BooleanValue"===e.value.kind&&!0===e.value.value})))return tc}}}),t},e.prototype.buildRootValueFromCache=function(e,t){return this.cache.diff({query:nH(e),variables:t,returnPartialData:!0,optimistic:!1}).result},e.prototype.resolveDocument=function(e,t,n,r,i,a){return void 0===n&&(n={}),void 0===r&&(r={}),void 0===i&&(i=function(){return!0}),void 0===a&&(a=!1),(0,en.mG)(this,void 0,void 0,function(){var o,s,u,c,l,f,d,h,p,b,m;return(0,en.Jh)(this,function(g){return o=e9(e),s=e4(e),u=eL(s),c=this.collectSelectionsToResolve(o,u),f=(l=o.operation)?l.charAt(0).toUpperCase()+l.slice(1):"Query",d=this,h=d.cache,p=d.client,b={fragmentMap:u,context:(0,en.pi)((0,en.pi)({},n),{cache:h,client:p}),variables:r,fragmentMatcher:i,defaultOperationType:f,exportedVariables:{},selectionsToResolve:c,onlyRunForcedResolvers:a},m=!1,[2,this.resolveSelectionSet(o.selectionSet,m,t,b).then(function(e){return{result:e,exportedVariables:b.exportedVariables}})]})})},e.prototype.resolveSelectionSet=function(e,t,n,r){return(0,en.mG)(this,void 0,void 0,function(){var i,a,o,s,u,c=this;return(0,en.Jh)(this,function(l){return i=r.fragmentMap,a=r.context,o=r.variables,s=[n],u=function(e){return(0,en.mG)(c,void 0,void 0,function(){var u,c;return(0,en.Jh)(this,function(l){return(t||r.selectionsToResolve.has(e))&&td(e,o)?eQ(e)?[2,this.resolveField(e,t,n,r).then(function(t){var n;void 0!==t&&s.push(((n={})[eX(e)]=t,n))})]:(e1(e)?u=e:(u=i[e.name.value],__DEV__?(0,Q.kG)(u,"No fragment named ".concat(e.name.value)):(0,Q.kG)(u,11)),u&&u.typeCondition&&(c=u.typeCondition.name.value,r.fragmentMatcher(n,c,a)))?[2,this.resolveSelectionSet(u.selectionSet,t,n,r).then(function(e){s.push(e)})]:[2]:[2]})})},[2,Promise.all(e.selections.map(u)).then(function(){return tF(s)})]})})},e.prototype.resolveField=function(e,t,n,r){return(0,en.mG)(this,void 0,void 0,function(){var i,a,o,s,u,c,l,f,d,h=this;return(0,en.Jh)(this,function(p){return n?(i=r.variables,a=e.name.value,o=eX(e),s=a!==o,c=Promise.resolve(u=n[o]||n[a]),(!r.onlyRunForcedResolvers||this.shouldForceResolvers(e))&&(l=n.__typename||r.defaultOperationType,(f=this.resolvers&&this.resolvers[l])&&(d=f[s?a:o])&&(c=Promise.resolve(rX.withValue(this.cache,d,[n,eZ(e,i),r.context,{field:e,fragmentMap:r.fragmentMap},])))),[2,c.then(function(n){if(void 0===n&&(n=u),e.directives&&e.directives.forEach(function(e){"export"===e.name.value&&e.arguments&&e.arguments.forEach(function(e){"as"===e.name.value&&"StringValue"===e.value.kind&&(r.exportedVariables[e.value.value]=n)})}),!e.selectionSet||null==n)return n;var i,a,o=null!==(a=null===(i=e.directives)||void 0===i?void 0:i.some(function(e){return"client"===e.name.value}))&&void 0!==a&&a;return Array.isArray(n)?h.resolveSubSelectedArray(e,t||o,n,r):e.selectionSet?h.resolveSelectionSet(e.selectionSet,t||o,n,r):void 0})]):[2,null]})})},e.prototype.resolveSubSelectedArray=function(e,t,n,r){var i=this;return Promise.all(n.map(function(n){return null===n?null:Array.isArray(n)?i.resolveSubSelectedArray(e,t,n,r):e.selectionSet?i.resolveSelectionSet(e.selectionSet,t,n,r):void 0}))},e.prototype.collectSelectionsToResolve=function(e,t){var n=function(e){return!Array.isArray(e)},r=this.selectionsToResolveCache;function i(e){if(!r.has(e)){var a=new Set;r.set(e,a),tl(e,{Directive:function(e,t,r,i,o){"client"===e.name.value&&o.forEach(function(e){n(e)&&n8(e)&&a.add(e)})},FragmentSpread:function(e,r,o,s,u){var c=t[e.name.value];__DEV__?(0,Q.kG)(c,"No fragment named ".concat(e.name.value)):(0,Q.kG)(c,12);var l=i(c);l.size>0&&(u.forEach(function(e){n(e)&&n8(e)&&a.add(e)}),a.add(e),l.forEach(function(e){a.add(e)}))}})}return r.get(e)}return i(e)},e}(),r5=new(t_.mr?WeakMap:Map);function r6(e,t){var n=e[t];"function"==typeof n&&(e[t]=function(){return r5.set(e,(r5.get(e)+1)%1e15),n.apply(this,arguments)})}function r9(e){e.notifyTimeout&&(clearTimeout(e.notifyTimeout),e.notifyTimeout=void 0)}var r8=function(){function e(e,t){void 0===t&&(t=e.generateQueryId()),this.queryId=t,this.listeners=new Set,this.document=null,this.lastRequestId=1,this.subscriptions=new Set,this.stopped=!1,this.dirty=!1,this.observableQuery=null;var n=this.cache=e.cache;r5.has(n)||(r5.set(n,0),r6(n,"evict"),r6(n,"modify"),r6(n,"reset"))}return e.prototype.init=function(e){var t=e.networkStatus||nZ.I.loading;return this.variables&&this.networkStatus!==nZ.I.loading&&!(0,nm.D)(this.variables,e.variables)&&(t=nZ.I.setVariables),(0,nm.D)(e.variables,this.variables)||(this.lastDiff=void 0),Object.assign(this,{document:e.document,variables:e.variables,networkError:null,graphQLErrors:this.graphQLErrors||[],networkStatus:t}),e.observableQuery&&this.setObservableQuery(e.observableQuery),e.lastRequestId&&(this.lastRequestId=e.lastRequestId),this},e.prototype.reset=function(){r9(this),this.dirty=!1},e.prototype.getDiff=function(e){void 0===e&&(e=this.variables);var t=this.getDiffOptions(e);if(this.lastDiff&&(0,nm.D)(t,this.lastDiff.options))return this.lastDiff.diff;this.updateWatch(this.variables=e);var n=this.observableQuery;if(n&&"no-cache"===n.options.fetchPolicy)return{complete:!1};var r=this.cache.diff(t);return this.updateLastDiff(r,t),r},e.prototype.updateLastDiff=function(e,t){this.lastDiff=e?{diff:e,options:t||this.getDiffOptions()}:void 0},e.prototype.getDiffOptions=function(e){var t;return void 0===e&&(e=this.variables),{query:this.document,variables:e,returnPartialData:!0,optimistic:!0,canonizeResults:null===(t=this.observableQuery)||void 0===t?void 0:t.options.canonizeResults}},e.prototype.setDiff=function(e){var t=this,n=this.lastDiff&&this.lastDiff.diff;this.updateLastDiff(e),this.dirty||(0,nm.D)(n&&n.result,e&&e.result)||(this.dirty=!0,this.notifyTimeout||(this.notifyTimeout=setTimeout(function(){return t.notify()},0)))},e.prototype.setObservableQuery=function(e){var t=this;e!==this.observableQuery&&(this.oqListener&&this.listeners.delete(this.oqListener),this.observableQuery=e,e?(e.queryInfo=this,this.listeners.add(this.oqListener=function(){t.getDiff().fromOptimisticTransaction?e.observe():n4(e)})):delete this.oqListener)},e.prototype.notify=function(){var e=this;r9(this),this.shouldNotify()&&this.listeners.forEach(function(t){return t(e)}),this.dirty=!1},e.prototype.shouldNotify=function(){if(!this.dirty||!this.listeners.size)return!1;if((0,nZ.O)(this.networkStatus)&&this.observableQuery){var e=this.observableQuery.options.fetchPolicy;if("cache-only"!==e&&"cache-and-network"!==e)return!1}return!0},e.prototype.stop=function(){if(!this.stopped){this.stopped=!0,this.reset(),this.cancel(),this.cancel=e.prototype.cancel,this.subscriptions.forEach(function(e){return e.unsubscribe()});var t=this.observableQuery;t&&t.stopPolling()}},e.prototype.cancel=function(){},e.prototype.updateWatch=function(e){var t=this;void 0===e&&(e=this.variables);var n=this.observableQuery;if(!n||"no-cache"!==n.options.fetchPolicy){var r=(0,en.pi)((0,en.pi)({},this.getDiffOptions(e)),{watcher:this,callback:function(e){return t.setDiff(e)}});this.lastWatch&&(0,nm.D)(r,this.lastWatch)||(this.cancel(),this.cancel=this.cache.watch(this.lastWatch=r))}},e.prototype.resetLastWrite=function(){this.lastWrite=void 0},e.prototype.shouldWrite=function(e,t){var n=this.lastWrite;return!(n&&n.dmCount===r5.get(this.cache)&&(0,nm.D)(t,n.variables)&&(0,nm.D)(e.data,n.result.data))},e.prototype.markResult=function(e,t,n,r){var i=this,a=new tB,o=(0,tP.O)(e.errors)?e.errors.slice(0):[];if(this.reset(),"incremental"in e&&(0,tP.O)(e.incremental)){var s=tG(this.getDiff().result,e);e.data=s}else if("hasNext"in e&&e.hasNext){var u=this.getDiff();e.data=a.merge(u.result,e.data)}this.graphQLErrors=o,"no-cache"===n.fetchPolicy?this.updateLastDiff({result:e.data,complete:!0},this.getDiffOptions(n.variables)):0!==r&&(r7(e,n.errorPolicy)?this.cache.performTransaction(function(a){if(i.shouldWrite(e,n.variables))a.writeQuery({query:t,data:e.data,variables:n.variables,overwrite:1===r}),i.lastWrite={result:e,variables:n.variables,dmCount:r5.get(i.cache)};else if(i.lastDiff&&i.lastDiff.diff.complete){e.data=i.lastDiff.diff.result;return}var o=i.getDiffOptions(n.variables),s=a.diff(o);i.stopped||i.updateWatch(n.variables),i.updateLastDiff(s,o),s.complete&&(e.data=s.result)}):this.lastWrite=void 0)},e.prototype.markReady=function(){return this.networkError=null,this.networkStatus=nZ.I.ready},e.prototype.markError=function(e){return this.networkStatus=nZ.I.error,this.lastWrite=void 0,this.reset(),e.graphQLErrors&&(this.graphQLErrors=e.graphQLErrors),e.networkError&&(this.networkError=e.networkError),e},e}();function r7(e,t){void 0===t&&(t="none");var n="ignore"===t||"all"===t,r=!nO(e);return!r&&n&&e.data&&(r=!0),r}var ie=Object.prototype.hasOwnProperty,it=function(){function e(e){var t=e.cache,n=e.link,r=e.defaultOptions,i=e.queryDeduplication,a=void 0!==i&&i,o=e.onBroadcast,s=e.ssrMode,u=void 0!==s&&s,c=e.clientAwareness,l=void 0===c?{}:c,f=e.localState,d=e.assumeImmutableResults;this.clientAwareness={},this.queries=new Map,this.fetchCancelFns=new Map,this.transformCache=new(t_.mr?WeakMap:Map),this.queryIdCounter=1,this.requestIdCounter=1,this.mutationIdCounter=1,this.inFlightLinkObservables=new Map,this.cache=t,this.link=n,this.defaultOptions=r||Object.create(null),this.queryDeduplication=a,this.clientAwareness=l,this.localState=f||new r4({cache:t}),this.ssrMode=u,this.assumeImmutableResults=!!d,(this.onBroadcast=o)&&(this.mutationStore=Object.create(null))}return e.prototype.stop=function(){var e=this;this.queries.forEach(function(t,n){e.stopQueryNoBroadcast(n)}),this.cancelPendingFetches(__DEV__?new Q.ej("QueryManager stopped while query was in flight"):new Q.ej(14))},e.prototype.cancelPendingFetches=function(e){this.fetchCancelFns.forEach(function(t){return t(e)}),this.fetchCancelFns.clear()},e.prototype.mutate=function(e){var t,n,r=e.mutation,i=e.variables,a=e.optimisticResponse,o=e.updateQueries,s=e.refetchQueries,u=void 0===s?[]:s,c=e.awaitRefetchQueries,l=void 0!==c&&c,f=e.update,d=e.onQueryUpdated,h=e.fetchPolicy,p=void 0===h?(null===(t=this.defaultOptions.mutate)||void 0===t?void 0:t.fetchPolicy)||"network-only":h,b=e.errorPolicy,m=void 0===b?(null===(n=this.defaultOptions.mutate)||void 0===n?void 0:n.errorPolicy)||"none":b,g=e.keepRootFields,v=e.context;return(0,en.mG)(this,void 0,void 0,function(){var e,t,n,s,c,h;return(0,en.Jh)(this,function(b){switch(b.label){case 0:if(__DEV__?(0,Q.kG)(r,"mutation option is required. You must specify your GraphQL document in the mutation option."):(0,Q.kG)(r,15),__DEV__?(0,Q.kG)("network-only"===p||"no-cache"===p,"Mutations support only 'network-only' or 'no-cache' fetchPolicy strings. The default `network-only` behavior automatically writes mutation results to the cache. Passing `no-cache` skips the cache write."):(0,Q.kG)("network-only"===p||"no-cache"===p,16),e=this.generateMutationId(),n=(t=this.transform(r)).document,s=t.hasClientExports,r=this.cache.transformForLink(n),i=this.getVariables(r,i),!s)return[3,2];return[4,this.localState.addExportedVariables(r,i,v)];case 1:i=b.sent(),b.label=2;case 2:return c=this.mutationStore&&(this.mutationStore[e]={mutation:r,variables:i,loading:!0,error:null}),a&&this.markMutationOptimistic(a,{mutationId:e,document:r,variables:i,fetchPolicy:p,errorPolicy:m,context:v,updateQueries:o,update:f,keepRootFields:g}),this.broadcastQueries(),h=this,[2,new Promise(function(t,n){return nM(h.getObservableFromLink(r,(0,en.pi)((0,en.pi)({},v),{optimisticResponse:a}),i,!1),function(t){if(nO(t)&&"none"===m)throw new tN.cA({graphQLErrors:nA(t)});c&&(c.loading=!1,c.error=null);var n=(0,en.pi)({},t);return"function"==typeof u&&(u=u(n)),"ignore"===m&&nO(n)&&delete n.errors,h.markMutationResult({mutationId:e,result:n,document:r,variables:i,fetchPolicy:p,errorPolicy:m,context:v,update:f,updateQueries:o,awaitRefetchQueries:l,refetchQueries:u,removeOptimistic:a?e:void 0,onQueryUpdated:d,keepRootFields:g})}).subscribe({next:function(e){h.broadcastQueries(),"hasNext"in e&&!1!==e.hasNext||t(e)},error:function(t){c&&(c.loading=!1,c.error=t),a&&h.cache.removeOptimistic(e),h.broadcastQueries(),n(t instanceof tN.cA?t:new tN.cA({networkError:t}))}})})]}})})},e.prototype.markMutationResult=function(e,t){var n=this;void 0===t&&(t=this.cache);var r=e.result,i=[],a="no-cache"===e.fetchPolicy;if(!a&&r7(r,e.errorPolicy)){if(tU(r)||i.push({result:r.data,dataId:"ROOT_MUTATION",query:e.document,variables:e.variables}),tU(r)&&(0,tP.O)(r.incremental)){var o=t.diff({id:"ROOT_MUTATION",query:this.transform(e.document).asQuery,variables:e.variables,optimistic:!1,returnPartialData:!0}),s=void 0;o.result&&(s=tG(o.result,r)),void 0!==s&&(r.data=s,i.push({result:s,dataId:"ROOT_MUTATION",query:e.document,variables:e.variables}))}var u=e.updateQueries;u&&this.queries.forEach(function(e,a){var o=e.observableQuery,s=o&&o.queryName;if(s&&ie.call(u,s)){var c,l=u[s],f=n.queries.get(a),d=f.document,h=f.variables,p=t.diff({query:d,variables:h,returnPartialData:!0,optimistic:!1}),b=p.result;if(p.complete&&b){var m=l(b,{mutationResult:r,queryName:d&&e3(d)||void 0,queryVariables:h});m&&i.push({result:m,dataId:"ROOT_QUERY",query:d,variables:h})}}})}if(i.length>0||e.refetchQueries||e.update||e.onQueryUpdated||e.removeOptimistic){var c=[];if(this.refetchQueries({updateCache:function(t){a||i.forEach(function(e){return t.write(e)});var o=e.update,s=!t$(r)||tU(r)&&!r.hasNext;if(o){if(!a){var u=t.diff({id:"ROOT_MUTATION",query:n.transform(e.document).asQuery,variables:e.variables,optimistic:!1,returnPartialData:!0});u.complete&&("incremental"in(r=(0,en.pi)((0,en.pi)({},r),{data:u.result}))&&delete r.incremental,"hasNext"in r&&delete r.hasNext)}s&&o(t,r,{context:e.context,variables:e.variables})}a||e.keepRootFields||!s||t.modify({id:"ROOT_MUTATION",fields:function(e,t){var n=t.fieldName,r=t.DELETE;return"__typename"===n?e:r}})},include:e.refetchQueries,optimistic:!1,removeOptimistic:e.removeOptimistic,onQueryUpdated:e.onQueryUpdated||null}).forEach(function(e){return c.push(e)}),e.awaitRefetchQueries||e.onQueryUpdated)return Promise.all(c).then(function(){return r})}return Promise.resolve(r)},e.prototype.markMutationOptimistic=function(e,t){var n=this,r="function"==typeof e?e(t.variables):e;return this.cache.recordOptimisticTransaction(function(e){try{n.markMutationResult((0,en.pi)((0,en.pi)({},t),{result:{data:r}}),e)}catch(i){__DEV__&&Q.kG.error(i)}},t.mutationId)},e.prototype.fetchQuery=function(e,t,n){return this.fetchQueryObservable(e,t,n).promise},e.prototype.getQueryStore=function(){var e=Object.create(null);return this.queries.forEach(function(t,n){e[n]={variables:t.variables,networkStatus:t.networkStatus,networkError:t.networkError,graphQLErrors:t.graphQLErrors}}),e},e.prototype.resetErrors=function(e){var t=this.queries.get(e);t&&(t.networkError=void 0,t.graphQLErrors=[])},e.prototype.transform=function(e){var t=this.transformCache;if(!t.has(e)){var n=this.cache.transformDocument(e),r=nY(n),i=this.localState.clientQuery(n),a=r&&this.localState.serverQuery(r),o={document:n,hasClientExports:tm(n),hasForcedResolvers:this.localState.shouldForceResolvers(n),clientQuery:i,serverQuery:a,defaultVars:e8(e2(n)),asQuery:(0,en.pi)((0,en.pi)({},n),{definitions:n.definitions.map(function(e){return"OperationDefinition"===e.kind&&"query"!==e.operation?(0,en.pi)((0,en.pi)({},e),{operation:"query"}):e})})},s=function(e){e&&!t.has(e)&&t.set(e,o)};s(e),s(n),s(i),s(a)}return t.get(e)},e.prototype.getVariables=function(e,t){return(0,en.pi)((0,en.pi)({},this.transform(e).defaultVars),t)},e.prototype.watchQuery=function(e){void 0===(e=(0,en.pi)((0,en.pi)({},e),{variables:this.getVariables(e.query,e.variables)})).notifyOnNetworkStatusChange&&(e.notifyOnNetworkStatusChange=!1);var t=new r8(this),n=new n3({queryManager:this,queryInfo:t,options:e});return this.queries.set(n.queryId,t),t.init({document:n.query,observableQuery:n,variables:n.variables}),n},e.prototype.query=function(e,t){var n=this;return void 0===t&&(t=this.generateQueryId()),__DEV__?(0,Q.kG)(e.query,"query option is required. You must specify your GraphQL document in the query option."):(0,Q.kG)(e.query,17),__DEV__?(0,Q.kG)("Document"===e.query.kind,'You must wrap the query string in a "gql" tag.'):(0,Q.kG)("Document"===e.query.kind,18),__DEV__?(0,Q.kG)(!e.returnPartialData,"returnPartialData option only supported on watchQuery."):(0,Q.kG)(!e.returnPartialData,19),__DEV__?(0,Q.kG)(!e.pollInterval,"pollInterval option only supported on watchQuery."):(0,Q.kG)(!e.pollInterval,20),this.fetchQuery(t,e).finally(function(){return n.stopQuery(t)})},e.prototype.generateQueryId=function(){return String(this.queryIdCounter++)},e.prototype.generateRequestId=function(){return this.requestIdCounter++},e.prototype.generateMutationId=function(){return String(this.mutationIdCounter++)},e.prototype.stopQueryInStore=function(e){this.stopQueryInStoreNoBroadcast(e),this.broadcastQueries()},e.prototype.stopQueryInStoreNoBroadcast=function(e){var t=this.queries.get(e);t&&t.stop()},e.prototype.clearStore=function(e){return void 0===e&&(e={discardWatches:!0}),this.cancelPendingFetches(__DEV__?new Q.ej("Store reset while query was in flight (not completed in link chain)"):new Q.ej(21)),this.queries.forEach(function(e){e.observableQuery?e.networkStatus=nZ.I.loading:e.stop()}),this.mutationStore&&(this.mutationStore=Object.create(null)),this.cache.reset(e)},e.prototype.getObservableQueries=function(e){var t=this;void 0===e&&(e="active");var n=new Map,r=new Map,i=new Set;return Array.isArray(e)&&e.forEach(function(e){"string"==typeof e?r.set(e,!1):eN(e)?r.set(t.transform(e).document,!1):(0,eO.s)(e)&&e.query&&i.add(e)}),this.queries.forEach(function(t,i){var a=t.observableQuery,o=t.document;if(a){if("all"===e){n.set(i,a);return}var s=a.queryName;if("standby"===a.options.fetchPolicy||"active"===e&&!a.hasObservers())return;("active"===e||s&&r.has(s)||o&&r.has(o))&&(n.set(i,a),s&&r.set(s,!0),o&&r.set(o,!0))}}),i.size&&i.forEach(function(e){var r=nG("legacyOneTimeQuery"),i=t.getQuery(r).init({document:e.query,variables:e.variables}),a=new n3({queryManager:t,queryInfo:i,options:(0,en.pi)((0,en.pi)({},e),{fetchPolicy:"network-only"})});(0,Q.kG)(a.queryId===r),i.setObservableQuery(a),n.set(r,a)}),__DEV__&&r.size&&r.forEach(function(e,t){!e&&__DEV__&&Q.kG.warn("Unknown query ".concat("string"==typeof t?"named ":"").concat(JSON.stringify(t,null,2)," requested in refetchQueries options.include array"))}),n},e.prototype.reFetchObservableQueries=function(e){var t=this;void 0===e&&(e=!1);var n=[];return this.getObservableQueries(e?"all":"active").forEach(function(r,i){var a=r.options.fetchPolicy;r.resetLastResults(),(e||"standby"!==a&&"cache-only"!==a)&&n.push(r.refetch()),t.getQuery(i).setDiff(null)}),this.broadcastQueries(),Promise.all(n)},e.prototype.setObservableQuery=function(e){this.getQuery(e.queryId).setObservableQuery(e)},e.prototype.startGraphQLSubscription=function(e){var t=this,n=e.query,r=e.fetchPolicy,i=e.errorPolicy,a=e.variables,o=e.context,s=void 0===o?{}:o;n=this.transform(n).document,a=this.getVariables(n,a);var u=function(e){return t.getObservableFromLink(n,s,e).map(function(a){"no-cache"!==r&&(r7(a,i)&&t.cache.write({query:n,result:a.data,dataId:"ROOT_SUBSCRIPTION",variables:e}),t.broadcastQueries());var o=nO(a),s=(0,tN.ls)(a);if(o||s){var u={};throw o&&(u.graphQLErrors=a.errors),s&&(u.protocolErrors=a.extensions[tN.YG]),new tN.cA(u)}return a})};if(this.transform(n).hasClientExports){var c=this.localState.addExportedVariables(n,a,s).then(u);return new eT(function(e){var t=null;return c.then(function(n){return t=n.subscribe(e)},e.error),function(){return t&&t.unsubscribe()}})}return u(a)},e.prototype.stopQuery=function(e){this.stopQueryNoBroadcast(e),this.broadcastQueries()},e.prototype.stopQueryNoBroadcast=function(e){this.stopQueryInStoreNoBroadcast(e),this.removeQuery(e)},e.prototype.removeQuery=function(e){this.fetchCancelFns.delete(e),this.queries.has(e)&&(this.getQuery(e).stop(),this.queries.delete(e))},e.prototype.broadcastQueries=function(){this.onBroadcast&&this.onBroadcast(),this.queries.forEach(function(e){return e.notify()})},e.prototype.getLocalState=function(){return this.localState},e.prototype.getObservableFromLink=function(e,t,n,r){var i,a,o=this;void 0===r&&(r=null!==(i=null==t?void 0:t.queryDeduplication)&&void 0!==i?i:this.queryDeduplication);var s=this.transform(e).serverQuery;if(s){var u=this,c=u.inFlightLinkObservables,l=u.link,f={query:s,variables:n,operationName:e3(s)||void 0,context:this.prepareContext((0,en.pi)((0,en.pi)({},t),{forceFetch:!r}))};if(t=f.context,r){var d=c.get(s)||new Map;c.set(s,d);var h=nx(n);if(!(a=d.get(h))){var p=new nq([np(l,f)]);d.set(h,a=p),p.beforeNext(function(){d.delete(h)&&d.size<1&&c.delete(s)})}}else a=new nq([np(l,f)])}else a=new nq([eT.of({data:{}})]),t=this.prepareContext(t);var b=this.transform(e).clientQuery;return b&&(a=nM(a,function(e){return o.localState.runResolvers({document:b,remoteResult:e,context:t,variables:n})})),a},e.prototype.getResultsFromLink=function(e,t,n){var r=e.lastRequestId=this.generateRequestId(),i=this.cache.transformForLink(this.transform(e.document).document);return nM(this.getObservableFromLink(i,n.context,n.variables),function(a){var o=nA(a),s=o.length>0;if(r>=e.lastRequestId){if(s&&"none"===n.errorPolicy)throw e.markError(new tN.cA({graphQLErrors:o}));e.markResult(a,i,n,t),e.markReady()}var u={data:a.data,loading:!1,networkStatus:nZ.I.ready};return s&&"ignore"!==n.errorPolicy&&(u.errors=o,u.networkStatus=nZ.I.error),u},function(t){var n=(0,tN.MS)(t)?t:new tN.cA({networkError:t});throw r>=e.lastRequestId&&e.markError(n),n})},e.prototype.fetchQueryObservable=function(e,t,n){return this.fetchConcastWithInfo(e,t,n).concast},e.prototype.fetchConcastWithInfo=function(e,t,n){var r,i,a=this;void 0===n&&(n=nZ.I.loading);var o=this.transform(t.query).document,s=this.getVariables(o,t.variables),u=this.getQuery(e),c=this.defaultOptions.watchQuery,l=t.fetchPolicy,f=void 0===l?c&&c.fetchPolicy||"cache-first":l,d=t.errorPolicy,h=void 0===d?c&&c.errorPolicy||"none":d,p=t.returnPartialData,b=void 0!==p&&p,m=t.notifyOnNetworkStatusChange,g=void 0!==m&&m,v=t.context,y=void 0===v?{}:v,w=Object.assign({},t,{query:o,variables:s,fetchPolicy:f,errorPolicy:h,returnPartialData:b,notifyOnNetworkStatusChange:g,context:y}),_=function(e){w.variables=e;var r=a.fetchQueryByPolicy(u,w,n);return"standby"!==w.fetchPolicy&&r.sources.length>0&&u.observableQuery&&u.observableQuery.applyNextFetchPolicy("after-fetch",t),r},E=function(){return a.fetchCancelFns.delete(e)};if(this.fetchCancelFns.set(e,function(e){E(),setTimeout(function(){return r.cancel(e)})}),this.transform(w.query).hasClientExports)r=new nq(this.localState.addExportedVariables(w.query,w.variables,w.context).then(_).then(function(e){return e.sources})),i=!0;else{var S=_(w.variables);i=S.fromLink,r=new nq(S.sources)}return r.promise.then(E,E),{concast:r,fromLink:i}},e.prototype.refetchQueries=function(e){var t=this,n=e.updateCache,r=e.include,i=e.optimistic,a=void 0!==i&&i,o=e.removeOptimistic,s=void 0===o?a?nG("refetchQueries"):void 0:o,u=e.onQueryUpdated,c=new Map;r&&this.getObservableQueries(r).forEach(function(e,n){c.set(n,{oq:e,lastDiff:t.getQuery(n).getDiff()})});var l=new Map;return n&&this.cache.batch({update:n,optimistic:a&&s||!1,removeOptimistic:s,onWatchUpdated:function(e,t,n){var r=e.watcher instanceof r8&&e.watcher.observableQuery;if(r){if(u){c.delete(r.queryId);var i=u(r,t,n);return!0===i&&(i=r.refetch()),!1!==i&&l.set(r,i),i}null!==u&&c.set(r.queryId,{oq:r,lastDiff:n,diff:t})}}}),c.size&&c.forEach(function(e,n){var r,i=e.oq,a=e.lastDiff,o=e.diff;if(u){if(!o){var s=i.queryInfo;s.reset(),o=s.getDiff()}r=u(i,o,a)}u&&!0!==r||(r=i.refetch()),!1!==r&&l.set(i,r),n.indexOf("legacyOneTimeQuery")>=0&&t.stopQueryNoBroadcast(n)}),s&&this.cache.removeOptimistic(s),l},e.prototype.fetchQueryByPolicy=function(e,t,n){var r=this,i=t.query,a=t.variables,o=t.fetchPolicy,s=t.refetchWritePolicy,u=t.errorPolicy,c=t.returnPartialData,l=t.context,f=t.notifyOnNetworkStatusChange,d=e.networkStatus;e.init({document:this.transform(i).document,variables:a,networkStatus:n});var h=function(){return e.getDiff(a)},p=function(t,n){void 0===n&&(n=e.networkStatus||nZ.I.loading);var o=t.result;!__DEV__||c||(0,nm.D)(o,{})||n6(t.missing);var s=function(e){return eT.of((0,en.pi)({data:e,loading:(0,nZ.O)(n),networkStatus:n},t.complete?null:{partial:!0}))};return o&&r.transform(i).hasForcedResolvers?r.localState.runResolvers({document:i,remoteResult:{data:o},context:l,variables:a,onlyRunForcedResolvers:!0}).then(function(e){return s(e.data||void 0)}):"none"===u&&n===nZ.I.refetch&&Array.isArray(t.missing)?s(void 0):s(o)},b="no-cache"===o?0:n===nZ.I.refetch&&"merge"!==s?1:2,m=function(){return r.getResultsFromLink(e,b,{variables:a,context:l,fetchPolicy:o,errorPolicy:u})},g=f&&"number"==typeof d&&d!==n&&(0,nZ.O)(n);switch(o){default:case"cache-first":var v=h();if(v.complete)return{fromLink:!1,sources:[p(v,e.markReady())]};if(c||g)return{fromLink:!0,sources:[p(v),m()]};return{fromLink:!0,sources:[m()]};case"cache-and-network":var v=h();if(v.complete||c||g)return{fromLink:!0,sources:[p(v),m()]};return{fromLink:!0,sources:[m()]};case"cache-only":return{fromLink:!1,sources:[p(h(),e.markReady())]};case"network-only":if(g)return{fromLink:!0,sources:[p(h()),m()]};return{fromLink:!0,sources:[m()]};case"no-cache":if(g)return{fromLink:!0,sources:[p(e.getDiff()),m(),]};return{fromLink:!0,sources:[m()]};case"standby":return{fromLink:!1,sources:[]}}},e.prototype.getQuery=function(e){return e&&!this.queries.has(e)&&this.queries.set(e,new r8(this,e)),this.queries.get(e)},e.prototype.prepareContext=function(e){void 0===e&&(e={});var t=this.localState.prepareContext(e);return(0,en.pi)((0,en.pi)({},t),{clientAwareness:this.clientAwareness})},e}(),ir=__webpack_require__(14012),ii=!1,ia=function(){function e(e){var t=this;this.resetStoreCallbacks=[],this.clearStoreCallbacks=[];var n=e.uri,r=e.credentials,i=e.headers,a=e.cache,o=e.ssrMode,s=void 0!==o&&o,u=e.ssrForceFetchDelay,c=void 0===u?0:u,l=e.connectToDevTools,f=void 0===l?"object"==typeof window&&!window.__APOLLO_CLIENT__&&__DEV__:l,d=e.queryDeduplication,h=void 0===d||d,p=e.defaultOptions,b=e.assumeImmutableResults,m=void 0!==b&&b,g=e.resolvers,v=e.typeDefs,y=e.fragmentMatcher,w=e.name,_=e.version,E=e.link;if(E||(E=n?new nh({uri:n,credentials:r,headers:i}):ta.empty()),!a)throw __DEV__?new Q.ej("To initialize Apollo Client, you must specify a 'cache' property in the options object. \nFor more information, please visit: https://go.apollo.dev/c/docs"):new Q.ej(9);if(this.link=E,this.cache=a,this.disableNetworkFetches=s||c>0,this.queryDeduplication=h,this.defaultOptions=p||Object.create(null),this.typeDefs=v,c&&setTimeout(function(){return t.disableNetworkFetches=!1},c),this.watchQuery=this.watchQuery.bind(this),this.query=this.query.bind(this),this.mutate=this.mutate.bind(this),this.resetStore=this.resetStore.bind(this),this.reFetchObservableQueries=this.reFetchObservableQueries.bind(this),f&&"object"==typeof window&&(window.__APOLLO_CLIENT__=this),!ii&&f&&__DEV__&&(ii=!0,"undefined"!=typeof window&&window.document&&window.top===window.self&&!window.__APOLLO_DEVTOOLS_GLOBAL_HOOK__)){var S=window.navigator,k=S&&S.userAgent,x=void 0;"string"==typeof k&&(k.indexOf("Chrome/")>-1?x="https://chrome.google.com/webstore/detail/apollo-client-developer-t/jdkknkkbebbapilgoeccciglkfbmbnfm":k.indexOf("Firefox/")>-1&&(x="https://addons.mozilla.org/en-US/firefox/addon/apollo-developer-tools/")),x&&__DEV__&&Q.kG.log("Download the Apollo DevTools for a better development experience: "+x)}this.version=nb,this.localState=new r4({cache:a,client:this,resolvers:g,fragmentMatcher:y}),this.queryManager=new it({cache:this.cache,link:this.link,defaultOptions:this.defaultOptions,queryDeduplication:h,ssrMode:s,clientAwareness:{name:w,version:_},localState:this.localState,assumeImmutableResults:m,onBroadcast:f?function(){t.devToolsHookCb&&t.devToolsHookCb({action:{},state:{queries:t.queryManager.getQueryStore(),mutations:t.queryManager.mutationStore||{}},dataWithOptimisticResults:t.cache.extract(!0)})}:void 0})}return e.prototype.stop=function(){this.queryManager.stop()},e.prototype.watchQuery=function(e){return this.defaultOptions.watchQuery&&(e=(0,ir.J)(this.defaultOptions.watchQuery,e)),this.disableNetworkFetches&&("network-only"===e.fetchPolicy||"cache-and-network"===e.fetchPolicy)&&(e=(0,en.pi)((0,en.pi)({},e),{fetchPolicy:"cache-first"})),this.queryManager.watchQuery(e)},e.prototype.query=function(e){return this.defaultOptions.query&&(e=(0,ir.J)(this.defaultOptions.query,e)),__DEV__?(0,Q.kG)("cache-and-network"!==e.fetchPolicy,"The cache-and-network fetchPolicy does not work with client.query, because client.query can only return a single result. Please use client.watchQuery to receive multiple results from the cache and the network, or consider using a different fetchPolicy, such as cache-first or network-only."):(0,Q.kG)("cache-and-network"!==e.fetchPolicy,10),this.disableNetworkFetches&&"network-only"===e.fetchPolicy&&(e=(0,en.pi)((0,en.pi)({},e),{fetchPolicy:"cache-first"})),this.queryManager.query(e)},e.prototype.mutate=function(e){return this.defaultOptions.mutate&&(e=(0,ir.J)(this.defaultOptions.mutate,e)),this.queryManager.mutate(e)},e.prototype.subscribe=function(e){return this.queryManager.startGraphQLSubscription(e)},e.prototype.readQuery=function(e,t){return void 0===t&&(t=!1),this.cache.readQuery(e,t)},e.prototype.readFragment=function(e,t){return void 0===t&&(t=!1),this.cache.readFragment(e,t)},e.prototype.writeQuery=function(e){var t=this.cache.writeQuery(e);return!1!==e.broadcast&&this.queryManager.broadcastQueries(),t},e.prototype.writeFragment=function(e){var t=this.cache.writeFragment(e);return!1!==e.broadcast&&this.queryManager.broadcastQueries(),t},e.prototype.__actionHookForDevTools=function(e){this.devToolsHookCb=e},e.prototype.__requestRaw=function(e){return np(this.link,e)},e.prototype.resetStore=function(){var e=this;return Promise.resolve().then(function(){return e.queryManager.clearStore({discardWatches:!1})}).then(function(){return Promise.all(e.resetStoreCallbacks.map(function(e){return e()}))}).then(function(){return e.reFetchObservableQueries()})},e.prototype.clearStore=function(){var e=this;return Promise.resolve().then(function(){return e.queryManager.clearStore({discardWatches:!0})}).then(function(){return Promise.all(e.clearStoreCallbacks.map(function(e){return e()}))})},e.prototype.onResetStore=function(e){var t=this;return this.resetStoreCallbacks.push(e),function(){t.resetStoreCallbacks=t.resetStoreCallbacks.filter(function(t){return t!==e})}},e.prototype.onClearStore=function(e){var t=this;return this.clearStoreCallbacks.push(e),function(){t.clearStoreCallbacks=t.clearStoreCallbacks.filter(function(t){return t!==e})}},e.prototype.reFetchObservableQueries=function(e){return this.queryManager.reFetchObservableQueries(e)},e.prototype.refetchQueries=function(e){var t=this.queryManager.refetchQueries(e),n=[],r=[];t.forEach(function(e,t){n.push(t),r.push(e)});var i=Promise.all(r);return i.queries=n,i.results=r,i.catch(function(e){__DEV__&&Q.kG.debug("In client.refetchQueries, Promise.all promise rejected with error ".concat(e))}),i},e.prototype.getObservableQueries=function(e){return void 0===e&&(e="active"),this.queryManager.getObservableQueries(e)},e.prototype.extract=function(e){return this.cache.extract(e)},e.prototype.restore=function(e){return this.cache.restore(e)},e.prototype.addResolvers=function(e){this.localState.addResolvers(e)},e.prototype.setResolvers=function(e){this.localState.setResolvers(e)},e.prototype.getResolvers=function(){return this.localState.getResolvers()},e.prototype.setLocalStateFragmentMatcher=function(e){this.localState.setFragmentMatcher(e)},e.prototype.setLink=function(e){this.link=this.queryManager.link=e},e}(),io=function(){function e(){this.getFragmentDoc=rZ(eA)}return e.prototype.batch=function(e){var t,n=this,r="string"==typeof e.optimistic?e.optimistic:!1===e.optimistic?null:void 0;return this.performTransaction(function(){return t=e.update(n)},r),t},e.prototype.recordOptimisticTransaction=function(e,t){this.performTransaction(e,t)},e.prototype.transformDocument=function(e){return e},e.prototype.transformForLink=function(e){return e},e.prototype.identify=function(e){},e.prototype.gc=function(){return[]},e.prototype.modify=function(e){return!1},e.prototype.readQuery=function(e,t){return void 0===t&&(t=!!e.optimistic),this.read((0,en.pi)((0,en.pi)({},e),{rootId:e.id||"ROOT_QUERY",optimistic:t}))},e.prototype.readFragment=function(e,t){return void 0===t&&(t=!!e.optimistic),this.read((0,en.pi)((0,en.pi)({},e),{query:this.getFragmentDoc(e.fragment,e.fragmentName),rootId:e.id,optimistic:t}))},e.prototype.writeQuery=function(e){var t=e.id,n=e.data,r=(0,en._T)(e,["id","data"]);return this.write(Object.assign(r,{dataId:t||"ROOT_QUERY",result:n}))},e.prototype.writeFragment=function(e){var t=e.id,n=e.data,r=e.fragment,i=e.fragmentName,a=(0,en._T)(e,["id","data","fragment","fragmentName"]);return this.write(Object.assign(a,{query:this.getFragmentDoc(r,i),dataId:t,result:n}))},e.prototype.updateQuery=function(e,t){return this.batch({update:function(n){var r=n.readQuery(e),i=t(r);return null==i?r:(n.writeQuery((0,en.pi)((0,en.pi)({},e),{data:i})),i)}})},e.prototype.updateFragment=function(e,t){return this.batch({update:function(n){var r=n.readFragment(e),i=t(r);return null==i?r:(n.writeFragment((0,en.pi)((0,en.pi)({},e),{data:i})),i)}})},e}(),is=function(e){function t(n,r,i,a){var o,s=e.call(this,n)||this;if(s.message=n,s.path=r,s.query=i,s.variables=a,Array.isArray(s.path)){s.missing=s.message;for(var u=s.path.length-1;u>=0;--u)s.missing=((o={})[s.path[u]]=s.missing,o)}else s.missing=s.path;return s.__proto__=t.prototype,s}return(0,en.ZT)(t,e),t}(Error),iu=__webpack_require__(10542),ic=Object.prototype.hasOwnProperty;function il(e){return null==e}function id(e,t){var n=e.__typename,r=e.id,i=e._id;if("string"==typeof n&&(t&&(t.keyObject=il(r)?il(i)?void 0:{_id:i}:{id:r}),il(r)&&!il(i)&&(r=i),!il(r)))return"".concat(n,":").concat("number"==typeof r||"string"==typeof r?r:JSON.stringify(r))}var ih={dataIdFromObject:id,addTypename:!0,resultCaching:!0,canonizeResults:!1};function ip(e){return(0,n1.o)(ih,e)}function ib(e){var t=e.canonizeResults;return void 0===t?ih.canonizeResults:t}function im(e,t){return eD(t)?e.get(t.__ref,"__typename"):t&&t.__typename}var ig=/^[_a-z][_0-9a-z]*/i;function iv(e){var t=e.match(ig);return t?t[0]:e}function iy(e,t,n){return!!(0,eO.s)(t)&&((0,tP.k)(t)?t.every(function(t){return iy(e,t,n)}):e.selections.every(function(e){if(eQ(e)&&td(e,n)){var r=eX(e);return ic.call(t,r)&&(!e.selectionSet||iy(e.selectionSet,t[r],n))}return!0}))}function iw(e){return(0,eO.s)(e)&&!eD(e)&&!(0,tP.k)(e)}function i_(){return new tB}function iE(e,t){var n=eL(e4(e));return{fragmentMap:n,lookupFragment:function(e){var r=n[e];return!r&&t&&(r=t.lookup(e)),r||null}}}var iS=Object.create(null),ik=function(){return iS},ix=Object.create(null),iT=function(){function e(e,t){var n=this;this.policies=e,this.group=t,this.data=Object.create(null),this.rootIds=Object.create(null),this.refs=Object.create(null),this.getFieldValue=function(e,t){return(0,iu.J)(eD(e)?n.get(e.__ref,t):e&&e[t])},this.canRead=function(e){return eD(e)?n.has(e.__ref):"object"==typeof e},this.toReference=function(e,t){if("string"==typeof e)return eI(e);if(eD(e))return e;var r=n.policies.identify(e)[0];if(r){var i=eI(r);return t&&n.merge(r,e),i}}}return e.prototype.toObject=function(){return(0,en.pi)({},this.data)},e.prototype.has=function(e){return void 0!==this.lookup(e,!0)},e.prototype.get=function(e,t){if(this.group.depend(e,t),ic.call(this.data,e)){var n=this.data[e];if(n&&ic.call(n,t))return n[t]}return"__typename"===t&&ic.call(this.policies.rootTypenamesById,e)?this.policies.rootTypenamesById[e]:this instanceof iL?this.parent.get(e,t):void 0},e.prototype.lookup=function(e,t){return(t&&this.group.depend(e,"__exists"),ic.call(this.data,e))?this.data[e]:this instanceof iL?this.parent.lookup(e,t):this.policies.rootTypenamesById[e]?Object.create(null):void 0},e.prototype.merge=function(e,t){var n,r=this;eD(e)&&(e=e.__ref),eD(t)&&(t=t.__ref);var i="string"==typeof e?this.lookup(n=e):e,a="string"==typeof t?this.lookup(n=t):t;if(a){__DEV__?(0,Q.kG)("string"==typeof n,"store.merge expects a string ID"):(0,Q.kG)("string"==typeof n,1);var o=new tB(iI).merge(i,a);if(this.data[n]=o,o!==i&&(delete this.refs[n],this.group.caching)){var s=Object.create(null);i||(s.__exists=1),Object.keys(a).forEach(function(e){if(!i||i[e]!==o[e]){s[e]=1;var t=iv(e);t===e||r.policies.hasKeyArgs(o.__typename,t)||(s[t]=1),void 0!==o[e]||r instanceof iL||delete o[e]}}),s.__typename&&!(i&&i.__typename)&&this.policies.rootTypenamesById[n]===o.__typename&&delete s.__typename,Object.keys(s).forEach(function(e){return r.group.dirty(n,e)})}}},e.prototype.modify=function(e,t){var n=this,r=this.lookup(e);if(r){var i=Object.create(null),a=!1,o=!0,s={DELETE:iS,INVALIDATE:ix,isReference:eD,toReference:this.toReference,canRead:this.canRead,readField:function(t,r){return n.policies.readField("string"==typeof t?{fieldName:t,from:r||eI(e)}:t,{store:n})}};if(Object.keys(r).forEach(function(u){var c=iv(u),l=r[u];if(void 0!==l){var f="function"==typeof t?t:t[u]||t[c];if(f){var d=f===ik?iS:f((0,iu.J)(l),(0,en.pi)((0,en.pi)({},s),{fieldName:c,storeFieldName:u,storage:n.getStorage(e,u)}));d===ix?n.group.dirty(e,u):(d===iS&&(d=void 0),d!==l&&(i[u]=d,a=!0,l=d))}void 0!==l&&(o=!1)}}),a)return this.merge(e,i),o&&(this instanceof iL?this.data[e]=void 0:delete this.data[e],this.group.dirty(e,"__exists")),!0}return!1},e.prototype.delete=function(e,t,n){var r,i=this.lookup(e);if(i){var a=this.getFieldValue(i,"__typename"),o=t&&n?this.policies.getStoreFieldName({typename:a,fieldName:t,args:n}):t;return this.modify(e,o?((r={})[o]=ik,r):ik)}return!1},e.prototype.evict=function(e,t){var n=!1;return e.id&&(ic.call(this.data,e.id)&&(n=this.delete(e.id,e.fieldName,e.args)),this instanceof iL&&this!==t&&(n=this.parent.evict(e,t)||n),(e.fieldName||n)&&this.group.dirty(e.id,e.fieldName||"__exists")),n},e.prototype.clear=function(){this.replace(null)},e.prototype.extract=function(){var e=this,t=this.toObject(),n=[];return this.getRootIdSet().forEach(function(t){ic.call(e.policies.rootTypenamesById,t)||n.push(t)}),n.length&&(t.__META={extraRootIds:n.sort()}),t},e.prototype.replace=function(e){var t=this;if(Object.keys(this.data).forEach(function(n){e&&ic.call(e,n)||t.delete(n)}),e){var n=e.__META,r=(0,en._T)(e,["__META"]);Object.keys(r).forEach(function(e){t.merge(e,r[e])}),n&&n.extraRootIds.forEach(this.retain,this)}},e.prototype.retain=function(e){return this.rootIds[e]=(this.rootIds[e]||0)+1},e.prototype.release=function(e){if(this.rootIds[e]>0){var t=--this.rootIds[e];return t||delete this.rootIds[e],t}return 0},e.prototype.getRootIdSet=function(e){return void 0===e&&(e=new Set),Object.keys(this.rootIds).forEach(e.add,e),this instanceof iL?this.parent.getRootIdSet(e):Object.keys(this.policies.rootTypenamesById).forEach(e.add,e),e},e.prototype.gc=function(){var e=this,t=this.getRootIdSet(),n=this.toObject();t.forEach(function(r){ic.call(n,r)&&(Object.keys(e.findChildRefIds(r)).forEach(t.add,t),delete n[r])});var r=Object.keys(n);if(r.length){for(var i=this;i instanceof iL;)i=i.parent;r.forEach(function(e){return i.delete(e)})}return r},e.prototype.findChildRefIds=function(e){if(!ic.call(this.refs,e)){var t=this.refs[e]=Object.create(null),n=this.data[e];if(!n)return t;var r=new Set([n]);r.forEach(function(e){eD(e)&&(t[e.__ref]=!0),(0,eO.s)(e)&&Object.keys(e).forEach(function(t){var n=e[t];(0,eO.s)(n)&&r.add(n)})})}return this.refs[e]},e.prototype.makeCacheKey=function(){return this.group.keyMaker.lookupArray(arguments)},e}(),iM=function(){function e(e,t){void 0===t&&(t=null),this.caching=e,this.parent=t,this.d=null,this.resetCaching()}return e.prototype.resetCaching=function(){this.d=this.caching?rW():null,this.keyMaker=new n_(t_.mr)},e.prototype.depend=function(e,t){if(this.d){this.d(iO(e,t));var n=iv(t);n!==t&&this.d(iO(e,n)),this.parent&&this.parent.depend(e,t)}},e.prototype.dirty=function(e,t){this.d&&this.d.dirty(iO(e,t),"__exists"===t?"forget":"setDirty")},e}();function iO(e,t){return t+"#"+e}function iA(e,t){iD(e)&&e.group.depend(t,"__exists")}!function(e){var t=function(e){function t(t){var n=t.policies,r=t.resultCaching,i=void 0===r||r,a=t.seed,o=e.call(this,n,new iM(i))||this;return o.stump=new iC(o),o.storageTrie=new n_(t_.mr),a&&o.replace(a),o}return(0,en.ZT)(t,e),t.prototype.addLayer=function(e,t){return this.stump.addLayer(e,t)},t.prototype.removeLayer=function(){return this},t.prototype.getStorage=function(){return this.storageTrie.lookupArray(arguments)},t}(e);e.Root=t}(iT||(iT={}));var iL=function(e){function t(t,n,r,i){var a=e.call(this,n.policies,i)||this;return a.id=t,a.parent=n,a.replay=r,a.group=i,r(a),a}return(0,en.ZT)(t,e),t.prototype.addLayer=function(e,n){return new t(e,this,n,this.group)},t.prototype.removeLayer=function(e){var t=this,n=this.parent.removeLayer(e);return e===this.id?(this.group.caching&&Object.keys(this.data).forEach(function(e){var r=t.data[e],i=n.lookup(e);i?r?r!==i&&Object.keys(r).forEach(function(n){(0,nm.D)(r[n],i[n])||t.group.dirty(e,n)}):(t.group.dirty(e,"__exists"),Object.keys(i).forEach(function(n){t.group.dirty(e,n)})):t.delete(e)}),n):n===this.parent?this:n.addLayer(this.id,this.replay)},t.prototype.toObject=function(){return(0,en.pi)((0,en.pi)({},this.parent.toObject()),this.data)},t.prototype.findChildRefIds=function(t){var n=this.parent.findChildRefIds(t);return ic.call(this.data,t)?(0,en.pi)((0,en.pi)({},n),e.prototype.findChildRefIds.call(this,t)):n},t.prototype.getStorage=function(){for(var e=this.parent;e.parent;)e=e.parent;return e.getStorage.apply(e,arguments)},t}(iT),iC=function(e){function t(t){return e.call(this,"EntityStore.Stump",t,function(){},new iM(t.group.caching,t.group))||this}return(0,en.ZT)(t,e),t.prototype.removeLayer=function(){return this},t.prototype.merge=function(){return this.parent.merge.apply(this.parent,arguments)},t}(iL);function iI(e,t,n){var r=e[n],i=t[n];return(0,nm.D)(r,i)?r:i}function iD(e){return!!(e instanceof iT&&e.group.caching)}function iN(e){return[e.selectionSet,e.objectOrReference,e.context,e.context.canonizeResults,]}var iP=function(){function e(e){var t=this;this.knownResults=new(t_.mr?WeakMap:Map),this.config=(0,n1.o)(e,{addTypename:!1!==e.addTypename,canonizeResults:ib(e)}),this.canon=e.canon||new nk,this.executeSelectionSet=rZ(function(e){var n,r=e.context.canonizeResults,i=iN(e);i[3]=!r;var a=(n=t.executeSelectionSet).peek.apply(n,i);return a?r?(0,en.pi)((0,en.pi)({},a),{result:t.canon.admit(a.result)}):a:(iA(e.context.store,e.enclosingRef.__ref),t.execSelectionSetImpl(e))},{max:this.config.resultCacheMaxSize,keyArgs:iN,makeCacheKey:function(e,t,n,r){if(iD(n.store))return n.store.makeCacheKey(e,eD(t)?t.__ref:t,n.varString,r)}}),this.executeSubSelectedArray=rZ(function(e){return iA(e.context.store,e.enclosingRef.__ref),t.execSubSelectedArrayImpl(e)},{max:this.config.resultCacheMaxSize,makeCacheKey:function(e){var t=e.field,n=e.array,r=e.context;if(iD(r.store))return r.store.makeCacheKey(t,n,r.varString)}})}return e.prototype.resetCanon=function(){this.canon=new nk},e.prototype.diffQueryAgainstStore=function(e){var t,n=e.store,r=e.query,i=e.rootId,a=void 0===i?"ROOT_QUERY":i,o=e.variables,s=e.returnPartialData,u=void 0===s||s,c=e.canonizeResults,l=void 0===c?this.config.canonizeResults:c,f=this.config.cache.policies;o=(0,en.pi)((0,en.pi)({},e8(e5(r))),o);var d=eI(a),h=this.executeSelectionSet({selectionSet:e9(r).selectionSet,objectOrReference:d,enclosingRef:d,context:(0,en.pi)({store:n,query:r,policies:f,variables:o,varString:nx(o),canonizeResults:l},iE(r,this.config.fragments))});if(h.missing&&(t=[new is(iR(h.missing),h.missing,r,o)],!u))throw t[0];return{result:h.result,complete:!t,missing:t}},e.prototype.isFresh=function(e,t,n,r){if(iD(r.store)&&this.knownResults.get(e)===n){var i=this.executeSelectionSet.peek(n,t,r,this.canon.isKnown(e));if(i&&e===i.result)return!0}return!1},e.prototype.execSelectionSetImpl=function(e){var t,n=this,r=e.selectionSet,i=e.objectOrReference,a=e.enclosingRef,o=e.context;if(eD(i)&&!o.policies.rootTypenamesById[i.__ref]&&!o.store.has(i.__ref))return{result:this.canon.empty,missing:"Dangling reference to missing ".concat(i.__ref," object")};var s=o.variables,u=o.policies,c=o.store.getFieldValue(i,"__typename"),l=[],f=new tB;function d(e,n){var r;return e.missing&&(t=f.merge(t,((r={})[n]=e.missing,r))),e.result}this.config.addTypename&&"string"==typeof c&&!u.rootIdsByTypename[c]&&l.push({__typename:c});var h=new Set(r.selections);h.forEach(function(e){var r,p;if(td(e,s)){if(eQ(e)){var b=u.readField({fieldName:e.name.value,field:e,variables:o.variables,from:i},o),m=eX(e);void 0===b?nj.added(e)||(t=f.merge(t,((r={})[m]="Can't find field '".concat(e.name.value,"' on ").concat(eD(i)?i.__ref+" object":"object "+JSON.stringify(i,null,2)),r))):(0,tP.k)(b)?b=d(n.executeSubSelectedArray({field:e,array:b,enclosingRef:a,context:o}),m):e.selectionSet?null!=b&&(b=d(n.executeSelectionSet({selectionSet:e.selectionSet,objectOrReference:b,enclosingRef:eD(b)?b:a,context:o}),m)):o.canonizeResults&&(b=n.canon.pass(b)),void 0!==b&&l.push(((p={})[m]=b,p))}else{var g=eC(e,o.lookupFragment);if(!g&&e.kind===nL.h.FRAGMENT_SPREAD)throw __DEV__?new Q.ej("No fragment named ".concat(e.name.value)):new Q.ej(5);g&&u.fragmentMatches(g,c)&&g.selectionSet.selections.forEach(h.add,h)}}});var p={result:tF(l),missing:t},b=o.canonizeResults?this.canon.admit(p):(0,iu.J)(p);return b.result&&this.knownResults.set(b.result,r),b},e.prototype.execSubSelectedArrayImpl=function(e){var t,n=this,r=e.field,i=e.array,a=e.enclosingRef,o=e.context,s=new tB;function u(e,n){var r;return e.missing&&(t=s.merge(t,((r={})[n]=e.missing,r))),e.result}return r.selectionSet&&(i=i.filter(o.store.canRead)),i=i.map(function(e,t){return null===e?null:(0,tP.k)(e)?u(n.executeSubSelectedArray({field:r,array:e,enclosingRef:a,context:o}),t):r.selectionSet?u(n.executeSelectionSet({selectionSet:r.selectionSet,objectOrReference:e,enclosingRef:eD(e)?e:a,context:o}),t):(__DEV__&&ij(o.store,r,e),e)}),{result:o.canonizeResults?this.canon.admit(i):i,missing:t}},e}();function iR(e){try{JSON.stringify(e,function(e,t){if("string"==typeof t)throw t;return t})}catch(t){return t}}function ij(e,t,n){if(!t.selectionSet){var r=new Set([n]);r.forEach(function(n){(0,eO.s)(n)&&(__DEV__?(0,Q.kG)(!eD(n),"Missing selection set for object of type ".concat(im(e,n)," returned for query field ").concat(t.name.value)):(0,Q.kG)(!eD(n),6),Object.values(n).forEach(r.add,r))})}}function iF(e){var t=nG("stringifyForDisplay");return JSON.stringify(e,function(e,n){return void 0===n?t:n}).split(JSON.stringify(t)).join("<undefined>")}var iY=Object.create(null);function iB(e){var t=JSON.stringify(e);return iY[t]||(iY[t]=Object.create(null))}function iU(e){var t=iB(e);return t.keyFieldsFn||(t.keyFieldsFn=function(t,n){var r=function(e,t){return n.readField(t,e)},i=n.keyObject=i$(e,function(e){var i=iW(n.storeObject,e,r);return void 0===i&&t!==n.storeObject&&ic.call(t,e[0])&&(i=iW(t,e,iG)),__DEV__?(0,Q.kG)(void 0!==i,"Missing field '".concat(e.join("."),"' while extracting keyFields from ").concat(JSON.stringify(t))):(0,Q.kG)(void 0!==i,2),i});return"".concat(n.typename,":").concat(JSON.stringify(i))})}function iH(e){var t=iB(e);return t.keyArgsFn||(t.keyArgsFn=function(t,n){var r=n.field,i=n.variables,a=n.fieldName,o=JSON.stringify(i$(e,function(e){var n=e[0],a=n.charAt(0);if("@"===a){if(r&&(0,tP.O)(r.directives)){var o=n.slice(1),s=r.directives.find(function(e){return e.name.value===o}),u=s&&eZ(s,i);return u&&iW(u,e.slice(1))}return}if("$"===a){var c=n.slice(1);if(i&&ic.call(i,c)){var l=e.slice(0);return l[0]=c,iW(i,l)}return}if(t)return iW(t,e)}));return(t||"{}"!==o)&&(a+=":"+o),a})}function i$(e,t){var n=new tB;return iz(e).reduce(function(e,r){var i,a=t(r);if(void 0!==a){for(var o=r.length-1;o>=0;--o)a=((i={})[r[o]]=a,i);e=n.merge(e,a)}return e},Object.create(null))}function iz(e){var t=iB(e);if(!t.paths){var n=t.paths=[],r=[];e.forEach(function(t,i){(0,tP.k)(t)?(iz(t).forEach(function(e){return n.push(r.concat(e))}),r.length=0):(r.push(t),(0,tP.k)(e[i+1])||(n.push(r.slice(0)),r.length=0))})}return t.paths}function iG(e,t){return e[t]}function iW(e,t,n){return n=n||iG,iK(t.reduce(function e(t,r){return(0,tP.k)(t)?t.map(function(t){return e(t,r)}):t&&n(t,r)},e))}function iK(e){return(0,eO.s)(e)?(0,tP.k)(e)?e.map(iK):i$(Object.keys(e).sort(),function(t){return iW(e,t)}):e}function iV(e){return void 0!==e.args?e.args:e.field?eZ(e.field,e.variables):null}eK.setStringify(nx);var iq=function(){},iZ=function(e,t){return t.fieldName},iX=function(e,t,n){return(0,n.mergeObjects)(e,t)},iJ=function(e,t){return t},iQ=function(){function e(e){this.config=e,this.typePolicies=Object.create(null),this.toBeAdded=Object.create(null),this.supertypeMap=new Map,this.fuzzySubtypes=new Map,this.rootIdsByTypename=Object.create(null),this.rootTypenamesById=Object.create(null),this.usingPossibleTypes=!1,this.config=(0,en.pi)({dataIdFromObject:id},e),this.cache=this.config.cache,this.setRootTypename("Query"),this.setRootTypename("Mutation"),this.setRootTypename("Subscription"),e.possibleTypes&&this.addPossibleTypes(e.possibleTypes),e.typePolicies&&this.addTypePolicies(e.typePolicies)}return e.prototype.identify=function(e,t){var n,r,i=this,a=t&&(t.typename||(null===(n=t.storeObject)||void 0===n?void 0:n.__typename))||e.__typename;if(a===this.rootTypenamesById.ROOT_QUERY)return["ROOT_QUERY"];for(var o=t&&t.storeObject||e,s=(0,en.pi)((0,en.pi)({},t),{typename:a,storeObject:o,readField:t&&t.readField||function(){var e=i0(arguments,o);return i.readField(e,{store:i.cache.data,variables:e.variables})}}),u=a&&this.getTypePolicy(a),c=u&&u.keyFn||this.config.dataIdFromObject;c;){var l=c((0,en.pi)((0,en.pi)({},e),o),s);if((0,tP.k)(l))c=iU(l);else{r=l;break}}return r=r?String(r):void 0,s.keyObject?[r,s.keyObject]:[r]},e.prototype.addTypePolicies=function(e){var t=this;Object.keys(e).forEach(function(n){var r=e[n],i=r.queryType,a=r.mutationType,o=r.subscriptionType,s=(0,en._T)(r,["queryType","mutationType","subscriptionType"]);i&&t.setRootTypename("Query",n),a&&t.setRootTypename("Mutation",n),o&&t.setRootTypename("Subscription",n),ic.call(t.toBeAdded,n)?t.toBeAdded[n].push(s):t.toBeAdded[n]=[s]})},e.prototype.updateTypePolicy=function(e,t){var n=this,r=this.getTypePolicy(e),i=t.keyFields,a=t.fields;function o(e,t){e.merge="function"==typeof t?t:!0===t?iX:!1===t?iJ:e.merge}o(r,t.merge),r.keyFn=!1===i?iq:(0,tP.k)(i)?iU(i):"function"==typeof i?i:r.keyFn,a&&Object.keys(a).forEach(function(t){var r=n.getFieldPolicy(e,t,!0),i=a[t];if("function"==typeof i)r.read=i;else{var s=i.keyArgs,u=i.read,c=i.merge;r.keyFn=!1===s?iZ:(0,tP.k)(s)?iH(s):"function"==typeof s?s:r.keyFn,"function"==typeof u&&(r.read=u),o(r,c)}r.read&&r.merge&&(r.keyFn=r.keyFn||iZ)})},e.prototype.setRootTypename=function(e,t){void 0===t&&(t=e);var n="ROOT_"+e.toUpperCase(),r=this.rootTypenamesById[n];t!==r&&(__DEV__?(0,Q.kG)(!r||r===e,"Cannot change root ".concat(e," __typename more than once")):(0,Q.kG)(!r||r===e,3),r&&delete this.rootIdsByTypename[r],this.rootIdsByTypename[t]=n,this.rootTypenamesById[n]=t)},e.prototype.addPossibleTypes=function(e){var t=this;this.usingPossibleTypes=!0,Object.keys(e).forEach(function(n){t.getSupertypeSet(n,!0),e[n].forEach(function(e){t.getSupertypeSet(e,!0).add(n);var r=e.match(ig);r&&r[0]===e||t.fuzzySubtypes.set(e,RegExp(e))})})},e.prototype.getTypePolicy=function(e){var t=this;if(!ic.call(this.typePolicies,e)){var n=this.typePolicies[e]=Object.create(null);n.fields=Object.create(null);var r=this.supertypeMap.get(e);r&&r.size&&r.forEach(function(e){var r=t.getTypePolicy(e),i=r.fields;Object.assign(n,(0,en._T)(r,["fields"])),Object.assign(n.fields,i)})}var i=this.toBeAdded[e];return i&&i.length&&i.splice(0).forEach(function(n){t.updateTypePolicy(e,n)}),this.typePolicies[e]},e.prototype.getFieldPolicy=function(e,t,n){if(e){var r=this.getTypePolicy(e).fields;return r[t]||n&&(r[t]=Object.create(null))}},e.prototype.getSupertypeSet=function(e,t){var n=this.supertypeMap.get(e);return!n&&t&&this.supertypeMap.set(e,n=new Set),n},e.prototype.fragmentMatches=function(e,t,n,r){var i=this;if(!e.typeCondition)return!0;if(!t)return!1;var a=e.typeCondition.name.value;if(t===a)return!0;if(this.usingPossibleTypes&&this.supertypeMap.has(a))for(var o=this.getSupertypeSet(t,!0),s=[o],u=function(e){var t=i.getSupertypeSet(e,!1);t&&t.size&&0>s.indexOf(t)&&s.push(t)},c=!!(n&&this.fuzzySubtypes.size),l=!1,f=0;f<s.length;++f){var d=s[f];if(d.has(a))return o.has(a)||(l&&__DEV__&&Q.kG.warn("Inferring subtype ".concat(t," of supertype ").concat(a)),o.add(a)),!0;d.forEach(u),c&&f===s.length-1&&iy(e.selectionSet,n,r)&&(c=!1,l=!0,this.fuzzySubtypes.forEach(function(e,n){var r=t.match(e);r&&r[0]===t&&u(n)}))}return!1},e.prototype.hasKeyArgs=function(e,t){var n=this.getFieldPolicy(e,t,!1);return!!(n&&n.keyFn)},e.prototype.getStoreFieldName=function(e){var t,n=e.typename,r=e.fieldName,i=this.getFieldPolicy(n,r,!1),a=i&&i.keyFn;if(a&&n)for(var o={typename:n,fieldName:r,field:e.field||null,variables:e.variables},s=iV(e);a;){var u=a(s,o);if((0,tP.k)(u))a=iH(u);else{t=u||r;break}}return(void 0===t&&(t=e.field?eG(e.field,e.variables):eK(r,iV(e))),!1===t)?r:r===iv(t)?t:r+":"+t},e.prototype.readField=function(e,t){var n=e.from;if(n&&(e.field||e.fieldName)){if(void 0===e.typename){var r=t.store.getFieldValue(n,"__typename");r&&(e.typename=r)}var i=this.getStoreFieldName(e),a=iv(i),o=t.store.getFieldValue(n,i),s=this.getFieldPolicy(e.typename,a,!1),u=s&&s.read;if(u){var c=i1(this,n,e,t,t.store.getStorage(eD(n)?n.__ref:n,i));return rX.withValue(this.cache,u,[o,c])}return o}},e.prototype.getReadFunction=function(e,t){var n=this.getFieldPolicy(e,t,!1);return n&&n.read},e.prototype.getMergeFunction=function(e,t,n){var r=this.getFieldPolicy(e,t,!1),i=r&&r.merge;return!i&&n&&(i=(r=this.getTypePolicy(n))&&r.merge),i},e.prototype.runMergeFunction=function(e,t,n,r,i){var a=n.field,o=n.typename,s=n.merge;return s===iX?i2(r.store)(e,t):s===iJ?t:(r.overwrite&&(e=void 0),s(e,t,i1(this,void 0,{typename:o,fieldName:a.name.value,field:a,variables:r.variables},r,i||Object.create(null))))},e}();function i1(e,t,n,r,i){var a=e.getStoreFieldName(n),o=iv(a),s=n.variables||r.variables,u=r.store,c=u.toReference,l=u.canRead;return{args:iV(n),field:n.field||null,fieldName:o,storeFieldName:a,variables:s,isReference:eD,toReference:c,storage:i,cache:e.cache,canRead:l,readField:function(){return e.readField(i0(arguments,t,s),r)},mergeObjects:i2(r.store)}}function i0(e,t,n){var r,i=e[0],a=e[1],o=e.length;return"string"==typeof i?r={fieldName:i,from:o>1?a:t}:(r=(0,en.pi)({},i),ic.call(r,"from")||(r.from=t)),__DEV__&&void 0===r.from&&__DEV__&&Q.kG.warn("Undefined 'from' passed to readField with arguments ".concat(iF(Array.from(e)))),void 0===r.variables&&(r.variables=n),r}function i2(e){return function(t,n){if((0,tP.k)(t)||(0,tP.k)(n))throw __DEV__?new Q.ej("Cannot automatically merge arrays"):new Q.ej(4);if((0,eO.s)(t)&&(0,eO.s)(n)){var r=e.getFieldValue(t,"__typename"),i=e.getFieldValue(n,"__typename");if(r&&i&&r!==i)return n;if(eD(t)&&iw(n))return e.merge(t.__ref,n),t;if(iw(t)&&eD(n))return e.merge(t,n.__ref),n;if(iw(t)&&iw(n))return(0,en.pi)((0,en.pi)({},t),n)}return n}}function i3(e,t,n){var r="".concat(t).concat(n),i=e.flavors.get(r);return i||e.flavors.set(r,i=e.clientOnly===t&&e.deferred===n?e:(0,en.pi)((0,en.pi)({},e),{clientOnly:t,deferred:n})),i}var i4=function(){function e(e,t,n){this.cache=e,this.reader=t,this.fragments=n}return e.prototype.writeToStore=function(e,t){var n=this,r=t.query,i=t.result,a=t.dataId,o=t.variables,s=t.overwrite,u=e2(r),c=i_();o=(0,en.pi)((0,en.pi)({},e8(u)),o);var l=(0,en.pi)((0,en.pi)({store:e,written:Object.create(null),merge:function(e,t){return c.merge(e,t)},variables:o,varString:nx(o)},iE(r,this.fragments)),{overwrite:!!s,incomingById:new Map,clientOnly:!1,deferred:!1,flavors:new Map}),f=this.processSelectionSet({result:i||Object.create(null),dataId:a,selectionSet:u.selectionSet,mergeTree:{map:new Map},context:l});if(!eD(f))throw __DEV__?new Q.ej("Could not identify object ".concat(JSON.stringify(i))):new Q.ej(7);return l.incomingById.forEach(function(t,r){var i=t.storeObject,a=t.mergeTree,o=t.fieldNodeSet,s=eI(r);if(a&&a.map.size){var u=n.applyMerges(a,s,i,l);if(eD(u))return;i=u}if(__DEV__&&!l.overwrite){var c=Object.create(null);o.forEach(function(e){e.selectionSet&&(c[e.name.value]=!0)});var f=function(e){return!0===c[iv(e)]},d=function(e){var t=a&&a.map.get(e);return Boolean(t&&t.info&&t.info.merge)};Object.keys(i).forEach(function(e){f(e)&&!d(e)&&at(s,i,e,l.store)})}e.merge(r,i)}),e.retain(f.__ref),f},e.prototype.processSelectionSet=function(e){var t=this,n=e.dataId,r=e.result,i=e.selectionSet,a=e.context,o=e.mergeTree,s=this.cache.policies,u=Object.create(null),c=n&&s.rootTypenamesById[n]||eJ(r,i,a.fragmentMap)||n&&a.store.get(n,"__typename");"string"==typeof c&&(u.__typename=c);var l=function(){var e=i0(arguments,u,a.variables);if(eD(e.from)){var t=a.incomingById.get(e.from.__ref);if(t){var n=s.readField((0,en.pi)((0,en.pi)({},e),{from:t.storeObject}),a);if(void 0!==n)return n}}return s.readField(e,a)},f=new Set;this.flattenFields(i,r,a,c).forEach(function(e,n){var i,a=r[eX(n)];if(f.add(n),void 0!==a){var d=s.getStoreFieldName({typename:c,fieldName:n.name.value,field:n,variables:e.variables}),h=i6(o,d),p=t.processFieldValue(a,n,n.selectionSet?i3(e,!1,!1):e,h),b=void 0;n.selectionSet&&(eD(p)||iw(p))&&(b=l("__typename",p));var m=s.getMergeFunction(c,n.name.value,b);m?h.info={field:n,typename:c,merge:m}:i7(o,d),u=e.merge(u,((i={})[d]=p,i))}else __DEV__&&!e.clientOnly&&!e.deferred&&!nj.added(n)&&!s.getReadFunction(c,n.name.value)&&__DEV__&&Q.kG.error("Missing field '".concat(eX(n),"' while writing result ").concat(JSON.stringify(r,null,2)).substring(0,1e3))});try{var d=s.identify(r,{typename:c,selectionSet:i,fragmentMap:a.fragmentMap,storeObject:u,readField:l}),h=d[0],p=d[1];n=n||h,p&&(u=a.merge(u,p))}catch(b){if(!n)throw b}if("string"==typeof n){var m=eI(n),g=a.written[n]||(a.written[n]=[]);if(g.indexOf(i)>=0||(g.push(i),this.reader&&this.reader.isFresh(r,m,i,a)))return m;var v=a.incomingById.get(n);return v?(v.storeObject=a.merge(v.storeObject,u),v.mergeTree=i9(v.mergeTree,o),f.forEach(function(e){return v.fieldNodeSet.add(e)})):a.incomingById.set(n,{storeObject:u,mergeTree:i8(o)?void 0:o,fieldNodeSet:f}),m}return u},e.prototype.processFieldValue=function(e,t,n,r){var i=this;return t.selectionSet&&null!==e?(0,tP.k)(e)?e.map(function(e,a){var o=i.processFieldValue(e,t,n,i6(r,a));return i7(r,a),o}):this.processSelectionSet({result:e,selectionSet:t.selectionSet,context:n,mergeTree:r}):__DEV__?nJ(e):e},e.prototype.flattenFields=function(e,t,n,r){void 0===r&&(r=eJ(t,e,n.fragmentMap));var i=new Map,a=this.cache.policies,o=new n_(!1);return function e(s,u){var c=o.lookup(s,u.clientOnly,u.deferred);c.visited||(c.visited=!0,s.selections.forEach(function(o){if(td(o,n.variables)){var s=u.clientOnly,c=u.deferred;if(!(s&&c)&&(0,tP.O)(o.directives)&&o.directives.forEach(function(e){var t=e.name.value;if("client"===t&&(s=!0),"defer"===t){var r=eZ(e,n.variables);r&&!1===r.if||(c=!0)}}),eQ(o)){var l=i.get(o);l&&(s=s&&l.clientOnly,c=c&&l.deferred),i.set(o,i3(n,s,c))}else{var f=eC(o,n.lookupFragment);if(!f&&o.kind===nL.h.FRAGMENT_SPREAD)throw __DEV__?new Q.ej("No fragment named ".concat(o.name.value)):new Q.ej(8);f&&a.fragmentMatches(f,r,t,n.variables)&&e(f.selectionSet,i3(n,s,c))}}}))}(e,n),i},e.prototype.applyMerges=function(e,t,n,r,i){var a=this;if(e.map.size&&!eD(n)){var o,s,u=!(0,tP.k)(n)&&(eD(t)||iw(t))?t:void 0,c=n;u&&!i&&(i=[eD(u)?u.__ref:u]);var l=function(e,t){return(0,tP.k)(e)?"number"==typeof t?e[t]:void 0:r.store.getFieldValue(e,String(t))};e.map.forEach(function(e,t){var n=l(u,t),o=l(c,t);if(void 0!==o){i&&i.push(t);var f=a.applyMerges(e,n,o,r,i);f!==o&&(s=s||new Map).set(t,f),i&&(0,Q.kG)(i.pop()===t)}}),s&&(n=(0,tP.k)(c)?c.slice(0):(0,en.pi)({},c),s.forEach(function(e,t){n[t]=e}))}return e.info?this.cache.policies.runMergeFunction(t,n,e.info,r,i&&(o=r.store).getStorage.apply(o,i)):n},e}(),i5=[];function i6(e,t){var n=e.map;return n.has(t)||n.set(t,i5.pop()||{map:new Map}),n.get(t)}function i9(e,t){if(e===t||!t||i8(t))return e;if(!e||i8(e))return t;var n=e.info&&t.info?(0,en.pi)((0,en.pi)({},e.info),t.info):e.info||t.info,r=e.map.size&&t.map.size,i=r?new Map:e.map.size?e.map:t.map,a={info:n,map:i};if(r){var o=new Set(t.map.keys());e.map.forEach(function(e,n){a.map.set(n,i9(e,t.map.get(n))),o.delete(n)}),o.forEach(function(n){a.map.set(n,i9(t.map.get(n),e.map.get(n)))})}return a}function i8(e){return!e||!(e.info||e.map.size)}function i7(e,t){var n=e.map,r=n.get(t);r&&i8(r)&&(i5.push(r),n.delete(t))}var ae=new Set;function at(e,t,n,r){var i=function(e){var t=r.getFieldValue(e,n);return"object"==typeof t&&t},a=i(e);if(a){var o=i(t);if(!(!o||eD(a)||(0,nm.D)(a,o)||Object.keys(a).every(function(e){return void 0!==r.getFieldValue(o,e)}))){var s=r.getFieldValue(e,"__typename")||r.getFieldValue(t,"__typename"),u=iv(n),c="".concat(s,".").concat(u);if(!ae.has(c)){ae.add(c);var l=[];(0,tP.k)(a)||(0,tP.k)(o)||[a,o].forEach(function(e){var t=r.getFieldValue(e,"__typename");"string"!=typeof t||l.includes(t)||l.push(t)}),__DEV__&&Q.kG.warn("Cache data may be lost when replacing the ".concat(u," field of a ").concat(s," object.\n\nThis could cause additional (usually avoidable) network requests to fetch data that were otherwise cached.\n\nTo address this problem (which is not a bug in Apollo Client), ").concat(l.length?"either ensure all objects of type "+l.join(" and ")+" have an ID or a custom merge function, or ":"","define a custom merge function for the ").concat(c," field, so InMemoryCache can safely merge these objects:\n\n  existing: ").concat(JSON.stringify(a).slice(0,1e3),"\n  incoming: ").concat(JSON.stringify(o).slice(0,1e3),"\n\nFor more information about these options, please refer to the documentation:\n\n  * Ensuring entity objects have IDs: https://go.apollo.dev/c/generating-unique-identifiers\n  * Defining custom merge functions: https://go.apollo.dev/c/merging-non-normalized-objects\n"))}}}}var an=function(e){function t(t){void 0===t&&(t={});var n=e.call(this)||this;return n.watches=new Set,n.typenameDocumentCache=new Map,n.makeVar=r2,n.txCount=0,n.config=ip(t),n.addTypename=!!n.config.addTypename,n.policies=new iQ({cache:n,dataIdFromObject:n.config.dataIdFromObject,possibleTypes:n.config.possibleTypes,typePolicies:n.config.typePolicies}),n.init(),n}return(0,en.ZT)(t,e),t.prototype.init=function(){var e=this.data=new iT.Root({policies:this.policies,resultCaching:this.config.resultCaching});this.optimisticData=e.stump,this.resetResultCache()},t.prototype.resetResultCache=function(e){var t=this,n=this.storeReader,r=this.config.fragments;this.storeWriter=new i4(this,this.storeReader=new iP({cache:this,addTypename:this.addTypename,resultCacheMaxSize:this.config.resultCacheMaxSize,canonizeResults:ib(this.config),canon:e?void 0:n&&n.canon,fragments:r}),r),this.maybeBroadcastWatch=rZ(function(e,n){return t.broadcastWatch(e,n)},{max:this.config.resultCacheMaxSize,makeCacheKey:function(e){var n=e.optimistic?t.optimisticData:t.data;if(iD(n)){var r=e.optimistic,i=e.id,a=e.variables;return n.makeCacheKey(e.query,e.callback,nx({optimistic:r,id:i,variables:a}))}}}),new Set([this.data.group,this.optimisticData.group,]).forEach(function(e){return e.resetCaching()})},t.prototype.restore=function(e){return this.init(),e&&this.data.replace(e),this},t.prototype.extract=function(e){return void 0===e&&(e=!1),(e?this.optimisticData:this.data).extract()},t.prototype.read=function(e){var t=e.returnPartialData,n=void 0!==t&&t;try{return this.storeReader.diffQueryAgainstStore((0,en.pi)((0,en.pi)({},e),{store:e.optimistic?this.optimisticData:this.data,config:this.config,returnPartialData:n})).result||null}catch(r){if(r instanceof is)return null;throw r}},t.prototype.write=function(e){try{return++this.txCount,this.storeWriter.writeToStore(this.data,e)}finally{--this.txCount||!1===e.broadcast||this.broadcastWatches()}},t.prototype.modify=function(e){if(ic.call(e,"id")&&!e.id)return!1;var t=e.optimistic?this.optimisticData:this.data;try{return++this.txCount,t.modify(e.id||"ROOT_QUERY",e.fields)}finally{--this.txCount||!1===e.broadcast||this.broadcastWatches()}},t.prototype.diff=function(e){return this.storeReader.diffQueryAgainstStore((0,en.pi)((0,en.pi)({},e),{store:e.optimistic?this.optimisticData:this.data,rootId:e.id||"ROOT_QUERY",config:this.config}))},t.prototype.watch=function(e){var t=this;return this.watches.size||r0(this),this.watches.add(e),e.immediate&&this.maybeBroadcastWatch(e),function(){t.watches.delete(e)&&!t.watches.size&&r1(t),t.maybeBroadcastWatch.forget(e)}},t.prototype.gc=function(e){nx.reset();var t=this.optimisticData.gc();return e&&!this.txCount&&(e.resetResultCache?this.resetResultCache(e.resetResultIdentities):e.resetResultIdentities&&this.storeReader.resetCanon()),t},t.prototype.retain=function(e,t){return(t?this.optimisticData:this.data).retain(e)},t.prototype.release=function(e,t){return(t?this.optimisticData:this.data).release(e)},t.prototype.identify=function(e){if(eD(e))return e.__ref;try{return this.policies.identify(e)[0]}catch(t){__DEV__&&Q.kG.warn(t)}},t.prototype.evict=function(e){if(!e.id){if(ic.call(e,"id"))return!1;e=(0,en.pi)((0,en.pi)({},e),{id:"ROOT_QUERY"})}try{return++this.txCount,this.optimisticData.evict(e,this.data)}finally{--this.txCount||!1===e.broadcast||this.broadcastWatches()}},t.prototype.reset=function(e){var t=this;return this.init(),nx.reset(),e&&e.discardWatches?(this.watches.forEach(function(e){return t.maybeBroadcastWatch.forget(e)}),this.watches.clear(),r1(this)):this.broadcastWatches(),Promise.resolve()},t.prototype.removeOptimistic=function(e){var t=this.optimisticData.removeLayer(e);t!==this.optimisticData&&(this.optimisticData=t,this.broadcastWatches())},t.prototype.batch=function(e){var t,n=this,r=e.update,i=e.optimistic,a=void 0===i||i,o=e.removeOptimistic,s=e.onWatchUpdated,u=function(e){var i=n,a=i.data,o=i.optimisticData;++n.txCount,e&&(n.data=n.optimisticData=e);try{return t=r(n)}finally{--n.txCount,n.data=a,n.optimisticData=o}},c=new Set;return s&&!this.txCount&&this.broadcastWatches((0,en.pi)((0,en.pi)({},e),{onWatchUpdated:function(e){return c.add(e),!1}})),"string"==typeof a?this.optimisticData=this.optimisticData.addLayer(a,u):!1===a?u(this.data):u(),"string"==typeof o&&(this.optimisticData=this.optimisticData.removeLayer(o)),s&&c.size?(this.broadcastWatches((0,en.pi)((0,en.pi)({},e),{onWatchUpdated:function(e,t){var n=s.call(this,e,t);return!1!==n&&c.delete(e),n}})),c.size&&c.forEach(function(e){return n.maybeBroadcastWatch.dirty(e)})):this.broadcastWatches(e),t},t.prototype.performTransaction=function(e,t){return this.batch({update:e,optimistic:t||null!==t})},t.prototype.transformDocument=function(e){if(this.addTypename){var t=this.typenameDocumentCache.get(e);return t||(t=nj(e),this.typenameDocumentCache.set(e,t),this.typenameDocumentCache.set(t,t)),t}return e},t.prototype.transformForLink=function(e){var t=this.config.fragments;return t?t.transform(e):e},t.prototype.broadcastWatches=function(e){var t=this;this.txCount||this.watches.forEach(function(n){return t.maybeBroadcastWatch(n,e)})},t.prototype.broadcastWatch=function(e,t){var n=e.lastDiff,r=this.diff(e);(!t||(e.optimistic&&"string"==typeof t.optimistic&&(r.fromOptimisticTransaction=!0),!t.onWatchUpdated||!1!==t.onWatchUpdated.call(this,e,r,n)))&&(n&&(0,nm.D)(n.result,r.result)||e.callback(e.lastDiff=r,n))},t}(io),ar={possibleTypes:{ApproveJobProposalSpecPayload:["ApproveJobProposalSpecSuccess","JobAlreadyExistsError","NotFoundError"],BridgePayload:["Bridge","NotFoundError"],CancelJobProposalSpecPayload:["CancelJobProposalSpecSuccess","NotFoundError"],ChainPayload:["Chain","NotFoundError"],CreateAPITokenPayload:["CreateAPITokenSuccess","InputErrors"],CreateBridgePayload:["CreateBridgeSuccess"],CreateCSAKeyPayload:["CSAKeyExistsError","CreateCSAKeySuccess"],CreateFeedsManagerChainConfigPayload:["CreateFeedsManagerChainConfigSuccess","InputErrors","NotFoundError"],CreateFeedsManagerPayload:["CreateFeedsManagerSuccess","InputErrors","NotFoundError","SingleFeedsManagerError"],CreateJobPayload:["CreateJobSuccess","InputErrors"],CreateOCR2KeyBundlePayload:["CreateOCR2KeyBundleSuccess"],CreateOCRKeyBundlePayload:["CreateOCRKeyBundleSuccess"],CreateP2PKeyPayload:["CreateP2PKeySuccess"],DeleteAPITokenPayload:["DeleteAPITokenSuccess","InputErrors"],DeleteBridgePayload:["DeleteBridgeConflictError","DeleteBridgeInvalidNameError","DeleteBridgeSuccess","NotFoundError"],DeleteCSAKeyPayload:["DeleteCSAKeySuccess","NotFoundError"],DeleteFeedsManagerChainConfigPayload:["DeleteFeedsManagerChainConfigSuccess","NotFoundError"],DeleteJobPayload:["DeleteJobSuccess","NotFoundError"],DeleteOCR2KeyBundlePayload:["DeleteOCR2KeyBundleSuccess","NotFoundError"],DeleteOCRKeyBundlePayload:["DeleteOCRKeyBundleSuccess","NotFoundError"],DeleteP2PKeyPayload:["DeleteP2PKeySuccess","NotFoundError"],DeleteVRFKeyPayload:["DeleteVRFKeySuccess","NotFoundError"],DismissJobErrorPayload:["DismissJobErrorSuccess","NotFoundError"],Error:["CSAKeyExistsError","DeleteBridgeConflictError","DeleteBridgeInvalidNameError","InputError","JobAlreadyExistsError","NotFoundError","RunJobCannotRunError","SingleFeedsManagerError"],EthTransactionPayload:["EthTransaction","NotFoundError"],FeaturesPayload:["Features"],FeedsManagerPayload:["FeedsManager","NotFoundError"],GetSQLLoggingPayload:["SQLLogging"],GlobalLogLevelPayload:["GlobalLogLevel"],JobPayload:["Job","NotFoundError"],JobProposalPayload:["JobProposal","NotFoundError"],JobRunPayload:["JobRun","NotFoundError"],JobSpec:["BlockHeaderFeederSpec","BlockhashStoreSpec","BootstrapSpec","CronSpec","DirectRequestSpec","FluxMonitorSpec","GatewaySpec","KeeperSpec","OCR2Spec","OCRSpec","VRFSpec","WebhookSpec"],NodePayload:["Node","NotFoundError"],PaginatedPayload:["BridgesPayload","ChainsPayload","EthTransactionAttemptsPayload","EthTransactionsPayload","JobRunsPayload","JobsPayload","NodesPayload"],RejectJobProposalSpecPayload:["NotFoundError","RejectJobProposalSpecSuccess"],RunJobPayload:["NotFoundError","RunJobCannotRunError","RunJobSuccess"],SetGlobalLogLevelPayload:["InputErrors","SetGlobalLogLevelSuccess"],SetSQLLoggingPayload:["SetSQLLoggingSuccess"],SetServicesLogLevelsPayload:["InputErrors","SetServicesLogLevelsSuccess"],UpdateBridgePayload:["NotFoundError","UpdateBridgeSuccess"],UpdateFeedsManagerChainConfigPayload:["InputErrors","NotFoundError","UpdateFeedsManagerChainConfigSuccess"],UpdateFeedsManagerPayload:["InputErrors","NotFoundError","UpdateFeedsManagerSuccess"],UpdateJobProposalSpecDefinitionPayload:["NotFoundError","UpdateJobProposalSpecDefinitionSuccess"],UpdatePasswordPayload:["InputErrors","UpdatePasswordSuccess"],VRFKeyPayload:["NotFoundError","VRFKeySuccess"]}};let ai=ar;var aa=(r=void 0,location.origin),ao=new nh({uri:"".concat(aa,"/query"),credentials:"include"}),as=new ia({cache:new an({possibleTypes:ai.possibleTypes}),link:ao});if(a.Z.locale(o),u().defaultFormat="YYYY-MM-DD h:mm:ss A","undefined"!=typeof document){var au,ac,al=f().hydrate;ac=X,al(c.createElement(et,{client:as},c.createElement(d.zj,null,c.createElement(i.MuiThemeProvider,{theme:J.r},c.createElement(ac,null)))),document.getElementById("root"))}})()})();
\ No newline at end of file
+`+(a!==i?`result of cast: ${a}`:""))}return r}_cast(e,t){let n=void 0===e?e:this.transforms.reduce((t,n)=>n.call(this,t,e,this),e);return void 0===n&&(n=this.getDefault()),n}_validate(e,t={},n){let{sync:r,path:i,from:a=[],originalValue:o=e,strict:s=this.spec.strict,abortEarly:u=this.spec.abortEarly}=t,c=e;s||(c=this._cast(c,pU({assert:!1},t)));let l={value:c,path:i,options:t,originalValue:o,schema:this,label:this.spec.label,sync:r,from:a},f=[];this._typeError&&f.push(this._typeError),this._whitelistError&&f.push(this._whitelistError),this._blacklistError&&f.push(this._blacklistError),pA({args:l,value:c,path:i,sync:r,tests:f,endEarly:u},e=>{if(e)return void n(e,c);pA({tests:this.tests,args:l,path:i,sync:r,value:c,endEarly:u},n)})}validate(e,t,n){let r=this.resolve(pU({},t,{value:e}));return"function"==typeof n?r._validate(e,t,n):new Promise((n,i)=>r._validate(e,t,(e,t)=>{e?i(e):n(t)}))}validateSync(e,t){let n;return this.resolve(pU({},t,{value:e}))._validate(e,pU({},t,{sync:!0}),(e,t)=>{if(e)throw e;n=t}),n}isValid(e,t){return this.validate(e,t).then(()=>!0,e=>{if(pM.isError(e))return!1;throw e})}isValidSync(e,t){try{return this.validateSync(e,t),!0}catch(n){if(pM.isError(n))return!1;throw n}}_getDefault(){let e=this.spec.default;return null==e?e:"function"==typeof e?e.call(this):pr(e)}getDefault(e){return this.resolve(e||{})._getDefault()}default(e){return 0===arguments.length?this._getDefault():this.clone({default:e})}strict(e=!0){var t=this.clone();return t.spec.strict=e,t}_isPresent(e){return null!=e}defined(e=pd.defined){return this.test({message:e,name:"defined",exclusive:!0,test:e=>void 0!==e})}required(e=pd.required){return this.clone({presence:"required"}).withMutation(t=>t.test({message:e,name:"required",exclusive:!0,test(e){return this.schema._isPresent(e)}}))}notRequired(){var e=this.clone({presence:"optional"});return e.tests=e.tests.filter(e=>"required"!==e.OPTIONS.name),e}nullable(e=!0){return this.clone({nullable:!1!==e})}transform(e){var t=this.clone();return t.transforms.push(e),t}test(...e){let t;if(void 0===(t=1===e.length?"function"==typeof e[0]?{test:e[0]}:e[0]:2===e.length?{name:e[0],test:e[1]}:{name:e[0],message:e[1],test:e[2]}).message&&(t.message=pd.default),"function"!=typeof t.test)throw TypeError("`test` is a required parameters");let n=this.clone(),r=pj(t),i=t.exclusive||t.name&&!0===n.exclusiveTests[t.name];if(t.exclusive&&!t.name)throw TypeError("Exclusive tests must provide a unique `name` identifying the test");return t.name&&(n.exclusiveTests[t.name]=!!t.exclusive),n.tests=n.tests.filter(e=>e.OPTIONS.name!==t.name||!i&&e.OPTIONS.test!==r.OPTIONS.test),n.tests.push(r),n}when(e,t){Array.isArray(e)||"string"==typeof e||(t=e,e=".");let n=this.clone(),r=pk(e).map(e=>new pN(e));return r.forEach(e=>{e.isSibling&&n.deps.push(e.key)}),n.conditions.push(new pS(r,t)),n}typeError(e){var t=this.clone();return t._typeError=pj({message:e,name:"typeError",test(e){return!!(void 0===e||this.schema.isType(e))||this.createError({params:{type:this.schema._type}})}}),t}oneOf(e,t=pd.oneOf){var n=this.clone();return e.forEach(e=>{n._whitelist.add(e),n._blacklist.delete(e)}),n._whitelistError=pj({message:t,name:"oneOf",test(e){if(void 0===e)return!0;let t=this.schema._whitelist;return!!t.has(e,this.resolve)||this.createError({params:{values:t.toArray().join(", ")}})}}),n}notOneOf(e,t=pd.notOneOf){var n=this.clone();return e.forEach(e=>{n._blacklist.add(e),n._whitelist.delete(e)}),n._blacklistError=pj({message:t,name:"notOneOf",test(e){let t=this.schema._blacklist;return!t.has(e,this.resolve)||this.createError({params:{values:t.toArray().join(", ")}})}}),n}strip(e=!0){let t=this.clone();return t.spec.strip=e,t}describe(){let e=this.clone(),{label:t,meta:n}=e.spec,r={meta:n,label:t,type:e.type,oneOf:e._whitelist.describe(),notOneOf:e._blacklist.describe(),tests:e.tests.map(e=>({name:e.OPTIONS.name,params:e.OPTIONS.params})).filter((e,t,n)=>n.findIndex(t=>t.name===e.name)===t)};return r}}for(let p$ of(pH.prototype.__isYupSchema__=!0,["validate","validateSync"]))pH.prototype[`${p$}At`]=function(e,t,n={}){let{parent:r,parentPath:i,schema:a}=pY(this,e,t,n.context);return a[p$](r&&r[i],pU({},n,{parent:r,path:e}))};for(let pz of["equals","is"])pH.prototype[pz]=pH.prototype.oneOf;for(let pG of["not","nope"])pH.prototype[pG]=pH.prototype.notOneOf;pH.prototype.optional=pH.prototype.notRequired;let pW=pH;function pK(){return new pW}pK.prototype=pW.prototype;let pV=e=>null==e;function pq(){return new pZ}class pZ extends pH{constructor(){super({type:"boolean"}),this.withMutation(()=>{this.transform(function(e){if(!this.isType(e)){if(/^(true|1)$/i.test(String(e)))return!0;if(/^(false|0)$/i.test(String(e)))return!1}return e})})}_typeCheck(e){return e instanceof Boolean&&(e=e.valueOf()),"boolean"==typeof e}isTrue(e=pm.isValue){return this.test({message:e,name:"is-value",exclusive:!0,params:{value:"true"},test:e=>pV(e)||!0===e})}isFalse(e=pm.isValue){return this.test({message:e,name:"is-value",exclusive:!0,params:{value:"false"},test:e=>pV(e)||!1===e})}}pq.prototype=pZ.prototype;let pX=/^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))$/i,pJ=/^((https?|ftp):)?\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i,pQ=/^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$/i,p1=e=>pV(e)||e===e.trim(),p0=({}).toString();function p2(){return new p3}class p3 extends pH{constructor(){super({type:"string"}),this.withMutation(()=>{this.transform(function(e){if(this.isType(e)||Array.isArray(e))return e;let t=null!=e&&e.toString?e.toString():e;return t===p0?e:t})})}_typeCheck(e){return e instanceof String&&(e=e.valueOf()),"string"==typeof e}_isPresent(e){return super._isPresent(e)&&!!e.length}length(e,t=ph.length){return this.test({message:t,name:"length",exclusive:!0,params:{length:e},test(t){return pV(t)||t.length===this.resolve(e)}})}min(e,t=ph.min){return this.test({message:t,name:"min",exclusive:!0,params:{min:e},test(t){return pV(t)||t.length>=this.resolve(e)}})}max(e,t=ph.max){return this.test({name:"max",exclusive:!0,message:t,params:{max:e},test(t){return pV(t)||t.length<=this.resolve(e)}})}matches(e,t){let n=!1,r,i;return t&&("object"==typeof t?{excludeEmptyString:n=!1,message:r,name:i}=t:r=t),this.test({name:i||"matches",message:r||ph.matches,params:{regex:e},test:t=>pV(t)||""===t&&n||-1!==t.search(e)})}email(e=ph.email){return this.matches(pX,{name:"email",message:e,excludeEmptyString:!0})}url(e=ph.url){return this.matches(pJ,{name:"url",message:e,excludeEmptyString:!0})}uuid(e=ph.uuid){return this.matches(pQ,{name:"uuid",message:e,excludeEmptyString:!1})}ensure(){return this.default("").transform(e=>null===e?"":e)}trim(e=ph.trim){return this.transform(e=>null!=e?e.trim():e).test({message:e,name:"trim",test:p1})}lowercase(e=ph.lowercase){return this.transform(e=>pV(e)?e:e.toLowerCase()).test({message:e,name:"string_case",exclusive:!0,test:e=>pV(e)||e===e.toLowerCase()})}uppercase(e=ph.uppercase){return this.transform(e=>pV(e)?e:e.toUpperCase()).test({message:e,name:"string_case",exclusive:!0,test:e=>pV(e)||e===e.toUpperCase()})}}p2.prototype=p3.prototype;let p4=e=>e!=+e;function p5(){return new p6}class p6 extends pH{constructor(){super({type:"number"}),this.withMutation(()=>{this.transform(function(e){let t=e;if("string"==typeof t){if(""===(t=t.replace(/\s/g,"")))return NaN;t=+t}return this.isType(t)?t:parseFloat(t)})})}_typeCheck(e){return e instanceof Number&&(e=e.valueOf()),"number"==typeof e&&!p4(e)}min(e,t=pp.min){return this.test({message:t,name:"min",exclusive:!0,params:{min:e},test(t){return pV(t)||t>=this.resolve(e)}})}max(e,t=pp.max){return this.test({message:t,name:"max",exclusive:!0,params:{max:e},test(t){return pV(t)||t<=this.resolve(e)}})}lessThan(e,t=pp.lessThan){return this.test({message:t,name:"max",exclusive:!0,params:{less:e},test(t){return pV(t)||t<this.resolve(e)}})}moreThan(e,t=pp.moreThan){return this.test({message:t,name:"min",exclusive:!0,params:{more:e},test(t){return pV(t)||t>this.resolve(e)}})}positive(e=pp.positive){return this.moreThan(0,e)}negative(e=pp.negative){return this.lessThan(0,e)}integer(e=pp.integer){return this.test({name:"integer",message:e,test:e=>pV(e)||Number.isInteger(e)})}truncate(){return this.transform(e=>pV(e)?e:0|e)}round(e){var t,n=["ceil","floor","round","trunc"];if("trunc"===(e=(null==(t=e)?void 0:t.toLowerCase())||"round"))return this.truncate();if(-1===n.indexOf(e.toLowerCase()))throw TypeError("Only valid options for round() are: "+n.join(", "));return this.transform(t=>pV(t)?t:Math[e](t))}}p5.prototype=p6.prototype;var p9=/^(\d{4}|[+\-]\d{6})(?:-?(\d{2})(?:-?(\d{2}))?)?(?:[ T]?(\d{2}):?(\d{2})(?::?(\d{2})(?:[,\.](\d{1,}))?)?(?:(Z)|([+\-])(\d{2})(?::?(\d{2}))?)?)?$/;function p8(e){var t,n,r=[1,4,5,6,7,10,11],i=0;if(n=p9.exec(e)){for(var a,o=0;a=r[o];++o)n[a]=+n[a]||0;n[2]=(+n[2]||1)-1,n[3]=+n[3]||1,n[7]=n[7]?String(n[7]).substr(0,3):0,(void 0===n[8]||""===n[8])&&(void 0===n[9]||""===n[9])?t=+new Date(n[1],n[2],n[3],n[4],n[5],n[6],n[7]):("Z"!==n[8]&&void 0!==n[9]&&(i=60*n[10]+n[11],"+"===n[9]&&(i=0-i)),t=Date.UTC(n[1],n[2],n[3],n[4],n[5]+i,n[6],n[7]))}else t=Date.parse?Date.parse(e):NaN;return t}let p7=new Date(""),be=e=>"[object Date]"===Object.prototype.toString.call(e);function bt(){return new bn}class bn extends pH{constructor(){super({type:"date"}),this.withMutation(()=>{this.transform(function(e){return this.isType(e)?e:(e=p8(e),isNaN(e)?p7:new Date(e))})})}_typeCheck(e){return be(e)&&!isNaN(e.getTime())}prepareParam(e,t){let n;if(pN.isRef(e))n=e;else{let r=this.cast(e);if(!this._typeCheck(r))throw TypeError(`\`${t}\` must be a Date or a value that can be \`cast()\` to a Date`);n=r}return n}min(e,t=pb.min){let n=this.prepareParam(e,"min");return this.test({message:t,name:"min",exclusive:!0,params:{min:e},test(e){return pV(e)||e>=this.resolve(n)}})}max(e,t=pb.max){var n=this.prepareParam(e,"max");return this.test({message:t,name:"max",exclusive:!0,params:{max:e},test(e){return pV(e)||e<=this.resolve(n)}})}}bn.INVALID_DATE=p7,bt.prototype=bn.prototype,bt.INVALID_DATE=p7;var br=n(11865),bi=n.n(br),ba=n(68929),bo=n.n(ba),bs=n(67523),bu=n.n(bs),bc=n(94633),bl=n.n(bc);function bf(e,t=[]){let n=[],r=[];function i(e,i){var a=(0,pI.split)(e)[0];~r.indexOf(a)||r.push(a),~t.indexOf(`${i}-${a}`)||n.push([i,a])}for(let a in e)if(pw()(e,a)){let o=e[a];~r.indexOf(a)||r.push(a),pN.isRef(o)&&o.isSibling?i(o.path,a):p_(o)&&"deps"in o&&o.deps.forEach(e=>i(e,a))}return bl().array(r,n).reverse()}function bd(e,t){let n=1/0;return e.some((e,r)=>{var i;if((null==(i=t.path)?void 0:i.indexOf(e))!==-1)return n=r,!0}),n}function bh(e){return(t,n)=>bd(e,t)-bd(e,n)}function bp(){return(bp=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}let bb=e=>"[object Object]"===Object.prototype.toString.call(e);function bm(e,t){let n=Object.keys(e.fields);return Object.keys(t).filter(e=>-1===n.indexOf(e))}let bg=bh([]);class bv extends pH{constructor(e){super({type:"object"}),this.fields=Object.create(null),this._sortErrors=bg,this._nodes=[],this._excludedEdges=[],this.withMutation(()=>{this.transform(function(e){if("string"==typeof e)try{e=JSON.parse(e)}catch(t){e=null}return this.isType(e)?e:null}),e&&this.shape(e)})}_typeCheck(e){return bb(e)||"function"==typeof e}_cast(e,t={}){var n;let r=super._cast(e,t);if(void 0===r)return this.getDefault();if(!this._typeCheck(r))return r;let i=this.fields,a=null!=(n=t.stripUnknown)?n:this.spec.noUnknown,o=this._nodes.concat(Object.keys(r).filter(e=>-1===this._nodes.indexOf(e))),s={},u=bp({},t,{parent:s,__validating:t.__validating||!1}),c=!1;for(let l of o){let f=i[l],d=pw()(r,l);if(f){let h,p=r[l];u.path=(t.path?`${t.path}.`:"")+l;let b="spec"in(f=f.resolve({value:p,context:t.context,parent:s}))?f.spec:void 0,m=null==b?void 0:b.strict;if(null==b?void 0:b.strip){c=c||l in r;continue}void 0!==(h=t.__validating&&m?r[l]:f.cast(r[l],u))&&(s[l]=h)}else d&&!a&&(s[l]=r[l]);s[l]!==r[l]&&(c=!0)}return c?s:r}_validate(e,t={},n){let r=[],{sync:i,from:a=[],originalValue:o=e,abortEarly:s=this.spec.abortEarly,recursive:u=this.spec.recursive}=t;a=[{schema:this,value:o},...a],t.__validating=!0,t.originalValue=o,t.from=a,super._validate(e,t,(e,c)=>{if(e){if(!pM.isError(e)||s)return void n(e,c);r.push(e)}if(!u||!bb(c)){n(r[0]||null,c);return}o=o||c;let l=this._nodes.map(e=>(n,r)=>{let i=-1===e.indexOf(".")?(t.path?`${t.path}.`:"")+e:`${t.path||""}["${e}"]`,s=this.fields[e];if(s&&"validate"in s){s.validate(c[e],bp({},t,{path:i,from:a,strict:!0,parent:c,originalValue:o[e]}),r);return}r(null)});pA({sync:i,tests:l,value:c,errors:r,endEarly:s,sort:this._sortErrors,path:t.path},n)})}clone(e){let t=super.clone(e);return t.fields=bp({},this.fields),t._nodes=this._nodes,t._excludedEdges=this._excludedEdges,t._sortErrors=this._sortErrors,t}concat(e){let t=super.concat(e),n=t.fields;for(let[r,i]of Object.entries(this.fields)){let a=n[r];void 0===a?n[r]=i:a instanceof pH&&i instanceof pH&&(n[r]=i.concat(a))}return t.withMutation(()=>t.shape(n))}getDefaultFromShape(){let e={};return this._nodes.forEach(t=>{let n=this.fields[t];e[t]="default"in n?n.getDefault():void 0}),e}_getDefault(){return"default"in this.spec?super._getDefault():this._nodes.length?this.getDefaultFromShape():void 0}shape(e,t=[]){let n=this.clone(),r=Object.assign(n.fields,e);if(n.fields=r,n._sortErrors=bh(Object.keys(r)),t.length){Array.isArray(t[0])||(t=[t]);let i=t.map(([e,t])=>`${e}-${t}`);n._excludedEdges=n._excludedEdges.concat(i)}return n._nodes=bf(r,n._excludedEdges),n}pick(e){let t={};for(let n of e)this.fields[n]&&(t[n]=this.fields[n]);return this.clone().withMutation(e=>(e.fields={},e.shape(t)))}omit(e){let t=this.clone(),n=t.fields;for(let r of(t.fields={},e))delete n[r];return t.withMutation(()=>t.shape(n))}from(e,t,n){let r=(0,pI.getter)(e,!0);return this.transform(i=>{if(null==i)return i;let a=i;return pw()(i,e)&&(a=bp({},i),n||delete a[e],a[t]=r(i)),a})}noUnknown(e=!0,t=pg.noUnknown){"string"==typeof e&&(t=e,e=!0);let n=this.test({name:"noUnknown",exclusive:!0,message:t,test(t){if(null==t)return!0;let n=bm(this.schema,t);return!e||0===n.length||this.createError({params:{unknown:n.join(", ")}})}});return n.spec.noUnknown=e,n}unknown(e=!0,t=pg.noUnknown){return this.noUnknown(!e,t)}transformKeys(e){return this.transform(t=>t&&bu()(t,(t,n)=>e(n)))}camelCase(){return this.transformKeys(bo())}snakeCase(){return this.transformKeys(bi())}constantCase(){return this.transformKeys(e=>bi()(e).toUpperCase())}describe(){let e=super.describe();return e.fields=pC()(this.fields,e=>e.describe()),e}}function by(e){return new bv(e)}function bw(){return(bw=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}function b_(e){return new bE(e)}by.prototype=bv.prototype;class bE extends pH{constructor(e){super({type:"array"}),this.innerType=e,this.withMutation(()=>{this.transform(function(e){if("string"==typeof e)try{e=JSON.parse(e)}catch(t){e=null}return this.isType(e)?e:null})})}_typeCheck(e){return Array.isArray(e)}get _subType(){return this.innerType}_cast(e,t){let n=super._cast(e,t);if(!this._typeCheck(n)||!this.innerType)return n;let r=!1,i=n.map((e,n)=>{let i=this.innerType.cast(e,bw({},t,{path:`${t.path||""}[${n}]`}));return i!==e&&(r=!0),i});return r?i:n}_validate(e,t={},n){var r,i;let a=[],o=t.sync,s=t.path,u=this.innerType,c=null!=(r=t.abortEarly)?r:this.spec.abortEarly,l=null!=(i=t.recursive)?i:this.spec.recursive,f=null!=t.originalValue?t.originalValue:e;super._validate(e,t,(e,r)=>{if(e){if(!pM.isError(e)||c)return void n(e,r);a.push(e)}if(!l||!u||!this._typeCheck(r)){n(a[0]||null,r);return}f=f||r;let i=Array(r.length);for(let d=0;d<r.length;d++){let h=r[d],p=`${t.path||""}[${d}]`,b=bw({},t,{path:p,strict:!0,parent:r,index:d,originalValue:f[d]});i[d]=(e,t)=>u.validate(h,b,t)}pA({sync:o,path:s,value:r,errors:a,endEarly:c,tests:i},n)})}clone(e){let t=super.clone(e);return t.innerType=this.innerType,t}concat(e){let t=super.concat(e);return t.innerType=this.innerType,e.innerType&&(t.innerType=t.innerType?t.innerType.concat(e.innerType):e.innerType),t}of(e){let t=this.clone();if(!p_(e))throw TypeError("`array.of()` sub-schema must be a valid yup schema not: "+pf(e));return t.innerType=e,t}length(e,t=pv.length){return this.test({message:t,name:"length",exclusive:!0,params:{length:e},test(t){return pV(t)||t.length===this.resolve(e)}})}min(e,t){return t=t||pv.min,this.test({message:t,name:"min",exclusive:!0,params:{min:e},test(t){return pV(t)||t.length>=this.resolve(e)}})}max(e,t){return t=t||pv.max,this.test({message:t,name:"max",exclusive:!0,params:{max:e},test(t){return pV(t)||t.length<=this.resolve(e)}})}ensure(){return this.default(()=>[]).transform((e,t)=>this._typeCheck(e)?e:null==t?[]:[].concat(t))}compact(e){let t=e?(t,n,r)=>!e(t,n,r):e=>!!e;return this.transform(e=>null!=e?e.filter(t):e)}describe(){let e=super.describe();return this.innerType&&(e.innerType=this.innerType.describe()),e}nullable(e=!0){return super.nullable(e)}defined(){return super.defined()}required(e){return super.required(e)}}b_.prototype=bE.prototype;var bS=by().shape({name:p2().required("Required"),url:p2().required("Required")}),bk=function(e){var t=e.initialValues,n=e.onSubmit,r=e.submitButtonText,i=e.nameDisabled,a=void 0!==i&&i;return l.createElement(hM,{initialValues:t,validationSchema:bS,onSubmit:n},function(e){var t=e.isSubmitting;return l.createElement(l.Fragment,null,l.createElement(hj,{"data-testid":"bridge-form",noValidate:!0},l.createElement(d.Z,{container:!0,spacing:16},l.createElement(d.Z,{item:!0,xs:12,md:7},l.createElement(hR,{component:hJ,id:"name",name:"name",label:"Name",disabled:a,required:!0,fullWidth:!0,FormHelperTextProps:{"data-testid":"name-helper-text"}})),l.createElement(d.Z,{item:!0,xs:12,md:7},l.createElement(hR,{component:hJ,id:"url",name:"url",label:"Bridge URL",placeholder:"https://",required:!0,fullWidth:!0,FormHelperTextProps:{"data-testid":"url-helper-text"}})),l.createElement(d.Z,{item:!0,xs:12,md:7},l.createElement(d.Z,{container:!0,spacing:16},l.createElement(d.Z,{item:!0,xs:7},l.createElement(hR,{component:hJ,id:"minimumContractPayment",name:"minimumContractPayment",label:"Minimum Contract Payment",placeholder:"0",fullWidth:!0,inputProps:{min:0},FormHelperTextProps:{"data-testid":"minimumContractPayment-helper-text"}})),l.createElement(d.Z,{item:!0,xs:7},l.createElement(hR,{component:hJ,id:"confirmations",name:"confirmations",label:"Confirmations",placeholder:"0",type:"number",fullWidth:!0,inputProps:{min:0},FormHelperTextProps:{"data-testid":"confirmations-helper-text"}})))),l.createElement(d.Z,{item:!0,xs:12,md:7},l.createElement(ox.default,{variant:"contained",color:"primary",type:"submit",disabled:t,size:"large"},r)))))})},bx=function(e){var t=e.bridge,n=e.onSubmit,r={name:t.name,url:t.url,minimumContractPayment:t.minimumContractPayment,confirmations:t.confirmations};return l.createElement(iv,null,l.createElement(d.Z,{container:!0,spacing:40},l.createElement(d.Z,{item:!0,xs:12,md:11,lg:9},l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"Edit Bridge",action:l.createElement(aL.Z,{component:tz,href:"/bridges/".concat(t.id)},"Cancel")}),l.createElement(aK.Z,null,l.createElement(bk,{nameDisabled:!0,initialValues:r,onSubmit:n,submitButtonText:"Save Bridge"}))))))};function bT(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function bM(e){if(Array.isArray(e))return e}function bO(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function bA(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){bO(a,r,i,o,s,"next",e)}function s(e){bO(a,r,i,o,s,"throw",e)}o(void 0)})}}function bL(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function bC(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function bI(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function bD(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){bL(e,t,n[t])})}return e}function bN(e,t){return bM(e)||bC(e,t)||bR(e,t)||bI()}function bP(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function bR(e,t){if(e){if("string"==typeof e)return bT(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return bT(e,t)}}var bj=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}};function bF(){var e=bP(["\n  mutation UpdateBridge($id: ID!, $input: UpdateBridgeInput!) {\n    updateBridge(id: $id, input: $input) {\n      ... on UpdateBridgeSuccess {\n        bridge {\n          id\n        }\n      }\n      ... on NotFoundError {\n        message\n      }\n    }\n  }\n"]);return bF=function(){return e},e}var bY=n0(bF()),bB=function(e){var t=e.id;return l.createElement(l.Fragment,null,l.createElement("span",null,"Successfully updated"),l.createElement(tz,{href:"/bridges/".concat(t)},t))},bU=function(){var e=(0,h.UO)().id,t=(0,A.I0)(),n=oZ().handleMutationError,r=ry(o7,{variables:{id:e}}),i=r.data,a=r.loading,o=r.error,s=bN(os(bY,{refetchQueries:[{query:o7,variables:{id:e}}]}),1)[0];if(a)return l.createElement(ij,null);if(o)return l.createElement(iN,{error:o});var u,c=(u=bA(function(r){var i,a,o,u,c,f;return bj(this,function(d){switch(d.label){case 0:return d.trys.push([0,2,,3]),[4,s(((o={}).variables={id:e,input:bD({},r)},o))];case 1:switch(u=null===(i=(a=d.sent()).data)||void 0===i?void 0:i.updateBridge,c={},null==u?void 0:u.__typename){case"UpdateBridgeSuccess":t((0,ty.t5)(function(){return l.createElement(bB,{id:u.bridge.id})},c));break;case"NotFoundError":t((0,ty.LO)(u.message))}return[3,3];case 2:return n(f=d.sent()),[3,3];case 3:return[2]}})}),function(e){return u.apply(this,arguments)}),f=null==i?void 0:i.bridge;switch(null==f?void 0:f.__typename){case"Bridge":return l.createElement(bx,{onSubmit:c,bridge:f});case"NotFoundError":return l.createElement(oo,null);default:return null}},bH={name:"",url:"",minimumContractPayment:"0",confirmations:0},b$=function(e){var t=e.onSubmit;return l.createElement(iv,null,l.createElement(d.Z,{container:!0,spacing:40},l.createElement(d.Z,{item:!0,xs:12,md:11,lg:9},l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"New Bridge"}),l.createElement(aK.Z,null,l.createElement(bk,{initialValues:bH,onSubmit:t,submitButtonText:"Create Bridge"}))))))};function bz(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function bG(e){if(Array.isArray(e))return e}function bW(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function bK(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){bW(a,r,i,o,s,"next",e)}function s(e){bW(a,r,i,o,s,"throw",e)}o(void 0)})}}function bV(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function bq(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function bZ(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function bX(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){bV(e,t,n[t])})}return e}function bJ(e,t){return bG(e)||bq(e,t)||b1(e,t)||bZ()}function bQ(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function b1(e,t){if(e){if("string"==typeof e)return bz(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return bz(e,t)}}var b0=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}};function b2(){var e=bQ(["\n  mutation CreateBridge($input: CreateBridgeInput!) {\n    createBridge(input: $input) {\n      ... on CreateBridgeSuccess {\n        bridge {\n          id\n        }\n        incomingToken\n      }\n    }\n  }\n"]);return b2=function(){return e},e}var b3=n0(b2()),b4=function(e){var t=e.id,n=e.incomingToken;return l.createElement(l.Fragment,null,l.createElement("span",null,"Successfully created bridge\xa0"),l.createElement(tz,{href:"/bridges/".concat(t)},t),l.createElement("span",null,"\xa0with incoming access token: ",n))},b5=function(){var e,t=(0,A.I0)(),n=oZ().handleMutationError,r=bJ(os(b3),1)[0],i=(e=bK(function(e){var i,a,o,s,u,c;return b0(this,function(f){switch(f.label){case 0:return f.trys.push([0,2,,3]),[4,r(((o={}).variables={input:bX({},e)},o))];case 1:return s=null===(i=(a=f.sent()).data)||void 0===i?void 0:i.createBridge,u={},(null==s?void 0:s.__typename)==="CreateBridgeSuccess"&&t((0,ty.t5)(function(){return l.createElement(b4,{id:s.bridge.id,incomingToken:s.incomingToken})},u)),[3,3];case 2:return n(c=f.sent()),[3,3];case 3:return[2]}})}),function(t){return e.apply(this,arguments)});return l.createElement(b$,{onSubmit:i})},b6=function(){var e=(0,h.$B)().path;return l.createElement(h.rs,null,l.createElement(h.AW,{exact:!0,path:"".concat(e,"/new")},l.createElement(b5,null)),l.createElement(h.AW,{path:"".concat(e,"/:id/edit")},l.createElement(bU,null)),l.createElement(h.AW,{path:"".concat(e,"/:id")},l.createElement(st,null)),l.createElement(h.AW,{exact:!0,path:e},l.createElement(sl,null)))},b9=n(48403),b8=n.n(b9),b7=n(24815),me=n(66289);function mt(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function mn(e){if(Array.isArray(e))return e}function mr(e,t){return null!=t&&"undefined"!=typeof Symbol&&t[Symbol.hasInstance]?!!t[Symbol.hasInstance](e):e instanceof t}function mi(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function ma(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function mo(e,t){return mn(e)||mi(e,t)||ms(e,t)||ma()}function ms(e,t){if(e){if("string"==typeof e)return mt(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return mt(e,t)}}var mu=function(){var e=mo(l.useState(),2),t=e[0],n=e[1],r=(0,h.k6)(),i=(0,A.I0)();l.useEffect(function(){mr(t,me._7)&&(i((0,ty.Jc)()),r.push("/signin"))},[i,t,r]);var a=t?function(){return l.createElement("div",null,"Error:"," ",mr(t,Error)?t.message:JSON.stringify(t))}:function(){return null};return{error:t,ErrorComponent:a,setError:n}},mc=function(){var e=arguments.length>0&&void 0!==arguments[0]&&arguments[0],t=e?function(){return l.createElement(x.default,{variant:"body1"},"Loading...")}:function(){return null};return{isLoading:e,LoadingPlaceholder:t}},ml=n(76023);function mf(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function md(e){if(Array.isArray(e))return e}function mh(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function mp(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){mh(a,r,i,o,s,"next",e)}function s(e){mh(a,r,i,o,s,"throw",e)}o(void 0)})}}function mb(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function mm(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function mg(e,t){return md(e)||mb(e,t)||mv(e,t)||mm()}function mv(e,t){if(e){if("string"==typeof e)return mf(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return mf(e,t)}}var my=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}},mw=["debug","info","warn","error"],m_=function(e){return(0,b.createStyles)({actions:{display:"flex",justifyContent:"flex-end",marginTop:.5*e.spacing.unit},logLevelHelperText:{marginTop:-8}})},mE=(0,b.withStyles)(m_)(function(e){var t,n=e.classes,r=e.initialValues,i=(0,A.I0)(),a=hT({initialValues:r,onSubmit:(t=mp(function(e){var t,n,r,a;return my(this,function(o){switch(o.label){case 0:return o.trys.push([0,2,,3]),t=((n={}).level=e.level,n.sqlEnabled=e.sqlEnabled,n),[4,iW.v2.logConfig.updateLogConfig(t)];case 1:return o.sent(),r={},i((0,ty.t5)(function(){return l.createElement(l.Fragment,null,"Logging Configuration Updated")},r)),[3,3];case 2:return a=o.sent(),i((0,ty.cB)(aP,a)),[3,3];case 3:return[2]}})}),function(e){return t.apply(this,arguments)})});return l.createElement("form",{onSubmit:a.handleSubmit,"data-testid":"logging-form"},l.createElement(i_.Z,{id:"select-level",name:"level",fullWidth:!0,select:!0,label:"Log Level",value:a.values.level,defaultValue:r.defaultLogLevel,onChange:a.handleChange,error:a.touched.level&&Boolean(a.errors.level),helperText:"Override the LOG_LEVEL environment variable (until restart)"},mw.map(function(e){return l.createElement(tE.default,{key:e,value:e},b8()(e).concat(e===r.defaultLogLevel?" (default)":""))})),l.createElement(b7.default,null,l.createElement(hG.Z,{name:"sqlEnabled",control:l.createElement(l.Fragment,null,l.createElement(hz.Z,{id:"sqlEnabled",name:"sqlEnabled",disabled:"debug"!==a.values.level,checked:a.values.sqlEnabled&&"debug"===a.values.level,onChange:a.handleChange})),label:"Log SQL Statements (debug only)"}),l.createElement(ml.default,{className:n.logLevelHelperText},"Override the LOG_SQL environment variable (until restart)")),l.createElement("br",null),l.createElement("div",{className:n.actions},l.createElement(aL.Z,{variant:"primary",type:"submit",disabled:a.isSubmitting},"Update")))}),mS=function(){var e=mg((0,l.useState)(null),2),t=e[0],n=e[1],r=mu(),i=r.error,a=r.ErrorComponent,o=r.setError,s=mc(!i&&!t).LoadingPlaceholder;return(0,l.useEffect)(function(){function e(){return t.apply(this,arguments)}function t(){return(t=mp(function(){var e,t,r,i,a,s,u,c,l;return my(this,function(f){switch(f.label){case 0:return f.trys.push([0,2,,3]),[4,iW.v2.logConfig.getLogConfig()];case 1:return t=(e=f.sent()).data.attributes.serviceName.findIndex(function(e){return"Global"==e}),r=e.data.attributes.logLevel[t],i=e.data.attributes.defaultLogLevel,a=e.data.attributes.serviceName.findIndex(function(e){return"IsSqlEnabled"==e}),s="true"==e.data.attributes.logLevel[a],n(u=((c={}).defaultLogLevel=i,c.level=r,c.sqlEnabled=s,c)),[3,3];case 2:return o(l=f.sent()),[3,3];case 3:return[2]}})})).apply(this,arguments)}e()},[o]),l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"Logging"}),l.createElement(aK.Z,null,l.createElement(s,null),l.createElement(a,null),t&&l.createElement(mE,{initialValues:t})))};function mk(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function mx(e){if(Array.isArray(e))return e}function mT(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function mM(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){mT(a,r,i,o,s,"next",e)}function s(e){mT(a,r,i,o,s,"throw",e)}o(void 0)})}}function mO(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function mA(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function mL(e,t){return mx(e)||mO(e,t)||mC(e,t)||mA()}function mC(e,t){if(e){if("string"==typeof e)return mk(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return mk(e,t)}}var mI=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}},mD=function(e){return(0,b.createStyles)({confirmDialog:{width:400},deleteCell:{"&:last-child":{paddingRight:1.5*e.spacing.unit}},deleteIcon:{fontSize:20}})},mN=6048e5,mP=(0,b.withStyles)(mD)(function(e){var t,n=e.classes,r=(0,A.I0)(),i=new Date(Date.now()-mN).toISOString(),a=mL((0,l.useState)(!1),2),o=a[0],s=a[1],u=(t=mM(function(){var e,t;return mI(this,function(n){switch(n.label){case 0:return n.trys.push([0,2,,3]),[4,r((0,ty.Iw)(i))];case 1:return n.sent(),e={},r((0,ty.t5)(function(){return l.createElement(l.Fragment,null,"Deleted completed job runs")},e)),s(!1),[3,3];case 2:return t=n.sent(),r((0,ty.LO)("Something went wrong")),[3,3];case 3:return[2]}})}),function(){return t.apply(this,arguments)});return l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"Job Runs",subheader:"Reduce the database size by deleting old job runs"}),l.createElement(r8.Z,null,l.createElement(r7.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,l.createElement(x.default,null,"Errored Runs"),l.createElement(x.default,{variant:"subtitle2",color:"textSecondary"},"Keeps runs from the last week")),l.createElement(ie.default,{align:"right",className:n.deleteCell},l.createElement(y.default,{onClick:function(){return s(!0)},"data-cy":"delete-errored-job-runs"},l.createElement(oc.Z,{className:n.deleteIcon,color:"error"})))))),l.createElement(oI,{open:o,title:"Delete errored jobs runs",body:"Are you sure you want to delete all errored job runs up to\n                ".concat(a_()(i).format("dddd, MMMM Do YYYY, h:mm:ss a"),"?"),confirmButtonText:"Confirm",onConfirm:u,cancelButtonText:"Cancel",onCancel:function(){return s(!1)}}))}),mR=n(16939),mj=n(80366),mF=n(37254);function mY(e,t){if(null==e)return{};var n,r,i={},a=Object.keys(e);for(r=0;r<a.length;r++)n=a[r],t.indexOf(n)>=0||(i[n]=e[n]);return i}function mB(e,t){if(null==e)return{};var n,r,i=mY(e,t);if(Object.getOwnPropertySymbols){var a=Object.getOwnPropertySymbols(e);for(r=0;r<a.length;r++)n=a[r],!(t.indexOf(n)>=0)&&Object.prototype.propertyIsEnumerable.call(e,n)&&(i[n]=e[n])}return i}function mU(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function mH(e){if(Array.isArray(e))return mU(e)}function m$(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function mz(e,t){if(e){if("string"==typeof e)return mU(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return mU(e,t)}}function mG(){throw TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function mW(e){return mH(e)||m$(e)||mz(e)||mG()}function mK(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function mV(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?Object(arguments[t]):{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){mK(e,t,n[t])})}return e}function mq(){return(mq=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}function mZ(e){var t=e.length;return 0===t||1===t?e:2===t?[e[0],e[1],"".concat(e[0],".").concat(e[1]),"".concat(e[1],".").concat(e[0])]:3===t?[e[0],e[1],e[2],"".concat(e[0],".").concat(e[1]),"".concat(e[0],".").concat(e[2]),"".concat(e[1],".").concat(e[0]),"".concat(e[1],".").concat(e[2]),"".concat(e[2],".").concat(e[0]),"".concat(e[2],".").concat(e[1]),"".concat(e[0],".").concat(e[1],".").concat(e[2]),"".concat(e[0],".").concat(e[2],".").concat(e[1]),"".concat(e[1],".").concat(e[0],".").concat(e[2]),"".concat(e[1],".").concat(e[2],".").concat(e[0]),"".concat(e[2],".").concat(e[0],".").concat(e[1]),"".concat(e[2],".").concat(e[1],".").concat(e[0])]:t>=4?[e[0],e[1],e[2],e[3],"".concat(e[0],".").concat(e[1]),"".concat(e[0],".").concat(e[2]),"".concat(e[0],".").concat(e[3]),"".concat(e[1],".").concat(e[0]),"".concat(e[1],".").concat(e[2]),"".concat(e[1],".").concat(e[3]),"".concat(e[2],".").concat(e[0]),"".concat(e[2],".").concat(e[1]),"".concat(e[2],".").concat(e[3]),"".concat(e[3],".").concat(e[0]),"".concat(e[3],".").concat(e[1]),"".concat(e[3],".").concat(e[2]),"".concat(e[0],".").concat(e[1],".").concat(e[2]),"".concat(e[0],".").concat(e[1],".").concat(e[3]),"".concat(e[0],".").concat(e[2],".").concat(e[1]),"".concat(e[0],".").concat(e[2],".").concat(e[3]),"".concat(e[0],".").concat(e[3],".").concat(e[1]),"".concat(e[0],".").concat(e[3],".").concat(e[2]),"".concat(e[1],".").concat(e[0],".").concat(e[2]),"".concat(e[1],".").concat(e[0],".").concat(e[3]),"".concat(e[1],".").concat(e[2],".").concat(e[0]),"".concat(e[1],".").concat(e[2],".").concat(e[3]),"".concat(e[1],".").concat(e[3],".").concat(e[0]),"".concat(e[1],".").concat(e[3],".").concat(e[2]),"".concat(e[2],".").concat(e[0],".").concat(e[1]),"".concat(e[2],".").concat(e[0],".").concat(e[3]),"".concat(e[2],".").concat(e[1],".").concat(e[0]),"".concat(e[2],".").concat(e[1],".").concat(e[3]),"".concat(e[2],".").concat(e[3],".").concat(e[0]),"".concat(e[2],".").concat(e[3],".").concat(e[1]),"".concat(e[3],".").concat(e[0],".").concat(e[1]),"".concat(e[3],".").concat(e[0],".").concat(e[2]),"".concat(e[3],".").concat(e[1],".").concat(e[0]),"".concat(e[3],".").concat(e[1],".").concat(e[2]),"".concat(e[3],".").concat(e[2],".").concat(e[0]),"".concat(e[3],".").concat(e[2],".").concat(e[1]),"".concat(e[0],".").concat(e[1],".").concat(e[2],".").concat(e[3]),"".concat(e[0],".").concat(e[1],".").concat(e[3],".").concat(e[2]),"".concat(e[0],".").concat(e[2],".").concat(e[1],".").concat(e[3]),"".concat(e[0],".").concat(e[2],".").concat(e[3],".").concat(e[1]),"".concat(e[0],".").concat(e[3],".").concat(e[1],".").concat(e[2]),"".concat(e[0],".").concat(e[3],".").concat(e[2],".").concat(e[1]),"".concat(e[1],".").concat(e[0],".").concat(e[2],".").concat(e[3]),"".concat(e[1],".").concat(e[0],".").concat(e[3],".").concat(e[2]),"".concat(e[1],".").concat(e[2],".").concat(e[0],".").concat(e[3]),"".concat(e[1],".").concat(e[2],".").concat(e[3],".").concat(e[0]),"".concat(e[1],".").concat(e[3],".").concat(e[0],".").concat(e[2]),"".concat(e[1],".").concat(e[3],".").concat(e[2],".").concat(e[0]),"".concat(e[2],".").concat(e[0],".").concat(e[1],".").concat(e[3]),"".concat(e[2],".").concat(e[0],".").concat(e[3],".").concat(e[1]),"".concat(e[2],".").concat(e[1],".").concat(e[0],".").concat(e[3]),"".concat(e[2],".").concat(e[1],".").concat(e[3],".").concat(e[0]),"".concat(e[2],".").concat(e[3],".").concat(e[0],".").concat(e[1]),"".concat(e[2],".").concat(e[3],".").concat(e[1],".").concat(e[0]),"".concat(e[3],".").concat(e[0],".").concat(e[1],".").concat(e[2]),"".concat(e[3],".").concat(e[0],".").concat(e[2],".").concat(e[1]),"".concat(e[3],".").concat(e[1],".").concat(e[0],".").concat(e[2]),"".concat(e[3],".").concat(e[1],".").concat(e[2],".").concat(e[0]),"".concat(e[3],".").concat(e[2],".").concat(e[0],".").concat(e[1]),"".concat(e[3],".").concat(e[2],".").concat(e[1],".").concat(e[0])]:void 0}var mX={};function mJ(e){if(0===e.length||1===e.length)return e;var t=e.join(".");return mX[t]||(mX[t]=mZ(e)),mX[t]}function mQ(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=arguments.length>2?arguments[2]:void 0;return mJ(e.filter(function(e){return"token"!==e})).reduce(function(e,t){return mV({},e,n[t])},t)}function m1(e){return e.join(" ")}function m0(e,t){var n=0;return function(r){return n+=1,r.map(function(r,i){return m2({node:r,stylesheet:e,useInlineStyles:t,key:"code-segment-".concat(n,"-").concat(i)})})}}function m2(e){var t=e.node,n=e.stylesheet,r=e.style,i=void 0===r?{}:r,a=e.useInlineStyles,o=e.key,s=t.properties,u=t.type,c=t.tagName,f=t.value;if("text"===u)return f;if(c){var d,h=m0(n,a);if(a){var p=Object.keys(n).reduce(function(e,t){return t.split(".").forEach(function(t){e.includes(t)||e.push(t)}),e},[]),b=s.className&&s.className.includes("token")?["token"]:[],m=s.className&&b.concat(s.className.filter(function(e){return!p.includes(e)}));d=mV({},s,{className:m1(m)||void 0,style:mQ(s.className,Object.assign({},s.style,i),n)})}else d=mV({},s,{className:m1(s.className)});var g=h(t.children);return l.createElement(c,mq({key:o},d),g)}}let m3=function(e,t){return -1!==e.listLanguages().indexOf(t)};var m4=/\n/g;function m5(e){return e.match(m4)}function m6(e){var t=e.lines,n=e.startingLineNumber,r=e.style;return t.map(function(e,t){var i=t+n;return l.createElement("span",{key:"line-".concat(t),className:"react-syntax-highlighter-line-number",style:"function"==typeof r?r(i):r},"".concat(i,"\n"))})}function m9(e){var t=e.codeString,n=e.codeStyle,r=e.containerStyle,i=void 0===r?{float:"left",paddingRight:"10px"}:r,a=e.numberStyle,o=void 0===a?{}:a,s=e.startingLineNumber;return l.createElement("code",{style:Object.assign({},n,i)},m6({lines:t.replace(/\n$/,"").split("\n"),style:o,startingLineNumber:s}))}function m8(e){return"".concat(e.toString().length,".25em")}function m7(e,t){return{type:"element",tagName:"span",properties:{key:"line-number--".concat(e),className:["comment","linenumber","react-syntax-highlighter-line-number"],style:t},children:[{type:"text",value:e}]}}function ge(e,t,n){var r,i={display:"inline-block",minWidth:m8(n),paddingRight:"1em",textAlign:"right",userSelect:"none"};return mV({},i,"function"==typeof e?e(t):e)}function gt(e){var t=e.children,n=e.lineNumber,r=e.lineNumberStyle,i=e.largestLineNumber,a=e.showInlineLineNumbers,o=e.lineProps,s=void 0===o?{}:o,u=e.className,c=void 0===u?[]:u,l=e.showLineNumbers,f=e.wrapLongLines,d="function"==typeof s?s(n):s;if(d.className=c,n&&a){var h=ge(r,n,i);t.unshift(m7(n,h))}return f&l&&(d.style=mV({},d.style,{display:"flex"})),{type:"element",tagName:"span",properties:d,children:t}}function gn(e){for(var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:[],n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[],r=0;r<e.length;r++){var i=e[r];if("text"===i.type)n.push(gt({children:[i],className:mW(new Set(t))}));else if(i.children){var a=t.concat(i.properties.className);n=n.concat(gn(i.children,a))}}return n}function gr(e,t,n,r,i,a,o,s,u){var c,l=gn(e.value),f=[],d=-1,h=0;function p(e,t){var a=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[];return gt({children:e,lineNumber:t,lineNumberStyle:s,largestLineNumber:o,showInlineLineNumbers:i,lineProps:n,className:a,showLineNumbers:r,wrapLongLines:u})}function b(e,t){if(r&&t&&i){var n=ge(s,t,o);e.unshift(m7(t,n))}return e}function m(e,n){var r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[];return t||r.length>0?p(e,n,r):b(e,n)}for(var g=function(){var e=l[h],t=e.children[0].value;if(m5(t)){var n=t.split("\n");n.forEach(function(t,i){var o=r&&f.length+a,s={type:"text",value:"".concat(t,"\n")};if(0===i){var u=l.slice(d+1,h).concat(gt({children:[s],className:e.properties.className})),c=m(u,o);f.push(c)}else if(i===n.length-1){if(l[h+1]&&l[h+1].children&&l[h+1].children[0]){var p={type:"text",value:"".concat(t)},b=gt({children:[p],className:e.properties.className});l.splice(h+1,0,b)}else{var g=[s],v=m(g,o,e.properties.className);f.push(v)}}else{var y=[s],w=m(y,o,e.properties.className);f.push(w)}}),d=h}h++};h<l.length;)g();if(d!==l.length-1){var v=l.slice(d+1,l.length);if(v&&v.length){var y=r&&f.length+a,w=m(v,y);f.push(w)}}return t?f:(c=[]).concat.apply(c,f)}function gi(e){var t=e.rows,n=e.stylesheet,r=e.useInlineStyles;return t.map(function(e,t){return m2({node:e,stylesheet:n,useInlineStyles:r,key:"code-segement".concat(t)})})}function ga(e){return e&&void 0!==e.highlightAuto}function go(e){var t=e.astGenerator,n=e.language,r=e.code,i=e.defaultCodeValue;if(ga(t)){var a=m3(t,n);return"text"===n?{value:i,language:"text"}:a?t.highlight(n,r):t.highlightAuto(r)}try{return n&&"text"!==n?{value:t.highlight(r,n)}:{value:i}}catch(o){return{value:i}}}function gs(e,t){return function(n){var r=n.language,i=n.children,a=n.style,o=void 0===a?t:a,s=n.customStyle,u=void 0===s?{}:s,c=n.codeTagProps,f=void 0===c?{className:r?"language-".concat(r):void 0,style:mV({},o['code[class*="language-"]'],o['code[class*="language-'.concat(r,'"]')])}:c,d=n.useInlineStyles,h=void 0===d||d,p=n.showLineNumbers,b=void 0!==p&&p,m=n.showInlineLineNumbers,g=void 0===m||m,v=n.startingLineNumber,y=void 0===v?1:v,w=n.lineNumberContainerStyle,_=n.lineNumberStyle,E=void 0===_?{}:_,S=n.wrapLines,k=n.wrapLongLines,x=void 0!==k&&k,T=n.lineProps,M=void 0===T?{}:T,O=n.renderer,A=n.PreTag,L=void 0===A?"pre":A,C=n.CodeTag,I=void 0===C?"code":C,D=n.code,N=void 0===D?Array.isArray(i)?i[0]:i:D,P=n.astGenerator,R=mB(n,["language","children","style","customStyle","codeTagProps","useInlineStyles","showLineNumbers","showInlineLineNumbers","startingLineNumber","lineNumberContainerStyle","lineNumberStyle","wrapLines","wrapLongLines","lineProps","renderer","PreTag","CodeTag","code","astGenerator"]);P=P||e;var j=b?l.createElement(m9,{containerStyle:w,codeStyle:f.style||{},numberStyle:E,startingLineNumber:y,codeString:N}):null,F=o.hljs||o['pre[class*="language-"]']||{backgroundColor:"#fff"},Y=ga(P)?"hljs":"prismjs",B=h?Object.assign({},R,{style:Object.assign({},F,u)}):Object.assign({},R,{className:R.className?"".concat(Y," ").concat(R.className):Y,style:Object.assign({},u)});if(!P)return l.createElement(L,B,j,l.createElement(I,f,N));(void 0===S&&O||x)&&(S=!0),O=O||gi;var U=[{type:"text",value:N}],H=go({astGenerator:P,language:r,code:N,defaultCodeValue:U});null===H.language&&(H.value=U);var $=H.value.length+y,z=gr(H,S,M,b,g,y,$,E,x);return x?f.style=mV({},f.style,{whiteSpace:"pre-wrap"}):f.style=mV({},f.style,{whiteSpace:"pre"}),l.createElement(L,B,l.createElement(I,f,!g&&j,O({rows:z,stylesheet:o,useInlineStyles:h})))}}let gu={'code[class*="language-"]':{color:"black",background:"none",textShadow:"0 1px white",fontFamily:"Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace",fontSize:"1em",textAlign:"left",whiteSpace:"pre",wordSpacing:"normal",wordBreak:"normal",wordWrap:"normal",lineHeight:"1.5",MozTabSize:"4",OTabSize:"4",tabSize:"4",WebkitHyphens:"none",MozHyphens:"none",msHyphens:"none",hyphens:"none"},'pre[class*="language-"]':{color:"black",background:"#f5f2f0",textShadow:"0 1px white",fontFamily:"Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace",fontSize:"1em",textAlign:"left",whiteSpace:"pre",wordSpacing:"normal",wordBreak:"normal",wordWrap:"normal",lineHeight:"1.5",MozTabSize:"4",OTabSize:"4",tabSize:"4",WebkitHyphens:"none",MozHyphens:"none",msHyphens:"none",hyphens:"none",padding:"1em",margin:".5em 0",overflow:"auto"},'pre[class*="language-"]::-moz-selection':{textShadow:"none",background:"#b3d4fc"},'pre[class*="language-"] ::-moz-selection':{textShadow:"none",background:"#b3d4fc"},'code[class*="language-"]::-moz-selection':{textShadow:"none",background:"#b3d4fc"},'code[class*="language-"] ::-moz-selection':{textShadow:"none",background:"#b3d4fc"},'pre[class*="language-"]::selection':{textShadow:"none",background:"#b3d4fc"},'pre[class*="language-"] ::selection':{textShadow:"none",background:"#b3d4fc"},'code[class*="language-"]::selection':{textShadow:"none",background:"#b3d4fc"},'code[class*="language-"] ::selection':{textShadow:"none",background:"#b3d4fc"},':not(pre) > code[class*="language-"]':{background:"#f5f2f0",padding:".1em",borderRadius:".3em",whiteSpace:"normal"},comment:{color:"slategray"},prolog:{color:"slategray"},doctype:{color:"slategray"},cdata:{color:"slategray"},punctuation:{color:"#999"},namespace:{Opacity:".7"},property:{color:"#905"},tag:{color:"#905"},boolean:{color:"#905"},number:{color:"#905"},constant:{color:"#905"},symbol:{color:"#905"},deleted:{color:"#905"},selector:{color:"#690"},"attr-name":{color:"#690"},string:{color:"#690"},char:{color:"#690"},builtin:{color:"#690"},inserted:{color:"#690"},operator:{color:"#9a6e3a",background:"hsla(0, 0%, 100%, .5)"},entity:{color:"#9a6e3a",background:"hsla(0, 0%, 100%, .5)",cursor:"help"},url:{color:"#9a6e3a",background:"hsla(0, 0%, 100%, .5)"},".language-css .token.string":{color:"#9a6e3a",background:"hsla(0, 0%, 100%, .5)"},".style .token.string":{color:"#9a6e3a",background:"hsla(0, 0%, 100%, .5)"},atrule:{color:"#07a"},"attr-value":{color:"#07a"},keyword:{color:"#07a"},function:{color:"#DD4A68"},"class-name":{color:"#DD4A68"},regex:{color:"#e90"},important:{color:"#e90",fontWeight:"bold"},variable:{color:"#e90"},bold:{fontWeight:"bold"},italic:{fontStyle:"italic"}};var gc=n(98695),gl=n.n(gc);let gf=["abap","abnf","actionscript","ada","agda","al","antlr4","apacheconf","apl","applescript","aql","arduino","arff","asciidoc","asm6502","aspnet","autohotkey","autoit","bash","basic","batch","bbcode","birb","bison","bnf","brainfuck","brightscript","bro","bsl","c","cil","clike","clojure","cmake","coffeescript","concurnas","cpp","crystal","csharp","csp","css-extras","css","cypher","d","dart","dax","dhall","diff","django","dns-zone-file","docker","ebnf","editorconfig","eiffel","ejs","elixir","elm","erb","erlang","etlua","excel-formula","factor","firestore-security-rules","flow","fortran","fsharp","ftl","gcode","gdscript","gedcom","gherkin","git","glsl","gml","go","graphql","groovy","haml","handlebars","haskell","haxe","hcl","hlsl","hpkp","hsts","http","ichigojam","icon","iecst","ignore","inform7","ini","io","j","java","javadoc","javadoclike","javascript","javastacktrace","jolie","jq","js-extras","js-templates","jsdoc","json","json5","jsonp","jsstacktrace","jsx","julia","keyman","kotlin","latex","latte","less","lilypond","liquid","lisp","livescript","llvm","lolcode","lua","makefile","markdown","markup-templating","markup","matlab","mel","mizar","mongodb","monkey","moonscript","n1ql","n4js","nand2tetris-hdl","naniscript","nasm","neon","nginx","nim","nix","nsis","objectivec","ocaml","opencl","oz","parigp","parser","pascal","pascaligo","pcaxis","peoplecode","perl","php-extras","php","phpdoc","plsql","powerquery","powershell","processing","prolog","properties","protobuf","pug","puppet","pure","purebasic","purescript","python","q","qml","qore","r","racket","reason","regex","renpy","rest","rip","roboconf","robotframework","ruby","rust","sas","sass","scala","scheme","scss","shell-session","smali","smalltalk","smarty","sml","solidity","solution-file","soy","sparql","splunk-spl","sqf","sql","stan","stylus","swift","t4-cs","t4-templating","t4-vb","tap","tcl","textile","toml","tsx","tt2","turtle","twig","typescript","typoscript","unrealscript","vala","vbnet","velocity","verilog","vhdl","vim","visual-basic","warpscript","wasm","wiki","xeora","xml-doc","xojo","xquery","yaml","yang","zig"];var gd=gs(gl(),gu);gd.supportedLanguages=gf;let gh=gd;var gp=n(64566),gb=n(68239);function gm(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function gg(){var e=gm(["\n  query FetchConfigV2 {\n    configv2 {\n      user\n      effective\n    }\n  }\n"]);return gg=function(){return e},e}var gv=function(){var e="[[TelemetryIngress.Endpoints]] \nNetwork = '...' # e.g. EVM. Solana, Starknet, Cosmos \nChainID = '...' # e.g. 1, 5, devnet, mainnet-beta URL\nURL = '...'\nServerPubKey = '...'";return l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"Deprecation warning"}),l.createElement(aK.Z,null,l.createElement(x.default,{variant:"h5",gutterBottom:!0},"Starting in ",l.createElement("code",null,"v2.9.0"),":"),l.createElement(w.default,{dense:!0},l.createElement(_.default,null,l.createElement(ol.Z,null,l.createElement(gb.Z,null)),l.createElement(x.default,{variant:"subtitle2",gutterBottom:!0},l.createElement("code",null,"TelemetryIngress.URL")," and"," ",l.createElement("code",null,"TelemetryIngress.ServerPubKey")," will no longer be allowed. Please switch to ",l.createElement("code",null,"TelemetryIngress.Endpoints"),":",l.createElement(gh,{language:"toml",style:gu},e))),l.createElement(_.default,null,l.createElement(ol.Z,null,l.createElement(gb.Z,null)),l.createElement(x.default,{variant:"subtitle2",gutterBottom:!0},l.createElement("code",null,"P2P.V1")," will no longer be supported and must not be set in TOML configuration in order to boot. Use"," ",l.createElement("code",null,"P2P.V2")," instead. If you are using both,"," ",l.createElement("code",null,"V1")," can simply be removed.")))))},gy=n0(gg()),gw=function(e){var t=e.children;return l.createElement(ii.Z,null,l.createElement(ie.default,{component:"th",scope:"row",colSpan:3},t))},g_=function(){return l.createElement(gw,null,"...")},gE=function(e){var t=e.children;return l.createElement(gw,null,t)},gS=function(e){var t=e.loading,n=e.toml,r=e.error,i=void 0===r?"":r,a=e.title,o=e.expanded;if(i)return l.createElement(gE,null,i);if(t)return l.createElement(g_,null);a||(a="TOML");var s={display:"block"};return l.createElement(x.default,null,l.createElement(mR.Z,{defaultExpanded:o},l.createElement(mj.Z,{expandIcon:l.createElement(gp.Z,null)},a),l.createElement(mF.Z,{style:s},l.createElement(gh,{language:"toml",style:gu},n))))},gk=function(){var e=ry(gy,{fetchPolicy:"cache-and-network"}),t=e.data,n=e.loading,r=e.error;return(null==t?void 0:t.configv2.effective)=="N/A"?l.createElement(l.Fragment,null,l.createElement(d.Z,{item:!0,xs:12},l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"TOML Configuration"}),l.createElement(gS,{title:"V2 config dump:",error:null==r?void 0:r.message,loading:n,toml:null==t?void 0:t.configv2.user,showHead:!0})))):l.createElement(l.Fragment,null,l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12},l.createElement(gv,null)),l.createElement(d.Z,{item:!0,xs:12},l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"TOML Configuration"}),l.createElement(gS,{title:"User specified:",error:null==r?void 0:r.message,loading:n,toml:null==t?void 0:t.configv2.user,showHead:!0,expanded:!0}),l.createElement(gS,{title:"Effective (with defaults):",error:null==r?void 0:r.message,loading:n,toml:null==t?void 0:t.configv2.effective,showHead:!0})))))},gx=n(34823),gT=function(e){return(0,b.createStyles)({cell:{paddingTop:1.5*e.spacing.unit,paddingBottom:1.5*e.spacing.unit}})},gM=(0,b.withStyles)(gT)(function(e){var t=e.classes,n=(0,A.I0)();(0,l.useEffect)(function(){n((0,ty.DQ)())});var r=(0,A.v9)(gx.N,A.wU);return l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"Node"}),l.createElement(r8.Z,null,l.createElement(r7.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,{className:t.cell},l.createElement(x.default,null,"Version"),l.createElement(x.default,{variant:"subtitle1",color:"textSecondary"},r.version))),l.createElement(ii.Z,null,l.createElement(ie.default,{className:t.cell},l.createElement(x.default,null,"SHA"),l.createElement(x.default,{variant:"subtitle1",color:"textSecondary"},r.commitSHA))))))}),gO=function(){return l.createElement(iv,null,l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,sm:12,md:8},l.createElement(d.Z,{container:!0},l.createElement(gk,null))),l.createElement(d.Z,{item:!0,sm:12,md:4},l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12},l.createElement(gM,null)),l.createElement(d.Z,{item:!0,xs:12},l.createElement(mP,null)),l.createElement(d.Z,{item:!0,xs:12},l.createElement(mS,null))))))},gA=function(){return l.createElement(gO,null)},gL=function(){return l.createElement(gA,null)},gC=n(44431),gI=1e18,gD=function(e){return new gC.BigNumber(e).dividedBy(gI).toFixed(8)},gN=function(e){var t=e.keys,n=e.chainID,r=e.hideHeaderTitle;return l.createElement(l.Fragment,null,l.createElement(sf.Z,{title:!r&&"Account Balances",subheader:"Chain ID "+n}),l.createElement(aK.Z,null,l.createElement(w.default,{dense:!1,disablePadding:!0},t&&t.map(function(e,r){return l.createElement(l.Fragment,null,l.createElement(_.default,{disableGutters:!0,key:["acc-balance",n.toString(),r.toString()].join("-")},l.createElement(E.Z,{primary:l.createElement(l.Fragment,null,l.createElement(d.Z,{container:!0,spacing:16},l.createElement(d.Z,{item:!0,xs:12},l.createElement(ob,{title:"Address"}),l.createElement(om,{value:e.address})),l.createElement(d.Z,{item:!0,xs:6},l.createElement(ob,{title:"Native Token Balance"}),l.createElement(om,{value:e.ethBalance||"--"})),l.createElement(d.Z,{item:!0,xs:6},l.createElement(ob,{title:"LINK Balance"}),l.createElement(om,{value:e.linkBalance?gD(e.linkBalance):"--"}))))})),r+1<t.length&&l.createElement(aV.Z,null))}))))};function gP(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function gR(){var e=gP(["\n  fragment AccountBalancesPayload_ResultsFields on EthKey {\n    address\n    chain {\n      id\n    }\n    ethBalance\n    isDisabled\n    linkBalance\n  }\n"]);return gR=function(){return e},e}var gj=n0(gR()),gF=function(e){var t=e.data,n=e.errorMsg,r=e.loading,i=null==t?void 0:t.ethKeys.results,a={};return null==i||i.forEach(function(e){void 0===a[e.chain.id]&&(a[e.chain.id]=[]),a[e.chain.id].push(e)}),l.createElement(r9.Z,null,n&&l.createElement(l.Fragment,null,l.createElement(sf.Z,{title:"Account Balances"}),l.createElement(d.Z,{item:!0,xs:12},l.createElement(om,{value:n}))),r&&l.createElement(d.Z,{item:!0,xs:12,style:{display:"flex",justifyContent:"center"}},l.createElement(iP.Z,{"data-testid":"loading-spinner",size:24})),!(null==i?void 0:i.length)&&!r&&!n&&l.createElement(l.Fragment,null,l.createElement(sf.Z,{title:"Account Balances"}),l.createElement(d.Z,{item:!0,xs:12},l.createElement(om,{value:"No account available"}))),i&&Object.keys(a).map(function(e,t){return l.createElement(gN,{key:e,keys:a[e],chainID:e,hideHeaderTitle:!!t})}))};function gY(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function gB(){var e=gY(["\n  ","\n  query FetchAccountBalances {\n    ethKeys {\n      results {\n        ...AccountBalancesPayload_ResultsFields\n      }\n    }\n  }\n"]);return gB=function(){return e},e}var gU=n0(gB(),gj),gH=function(){var e=ry(gU,{fetchPolicy:"cache-and-network"}),t=e.data,n=e.loading,r=e.error;return l.createElement(gF,{data:t,errorMsg:null==r?void 0:r.message,loading:n})},g$=n(21700),gz=function(e){var t=e.msg;return t?l.createElement(ii.Z,null,l.createElement(ie.default,{component:"th",scope:"row"},t)):null},gG=function(e){return(0,b.createStyles)({cell:{padding:2*e.spacing.unit}})},gW=(0,b.withStyles)(gG)(function(e){var t=e.classes;return e.visible?l.createElement(ii.Z,null,l.createElement(ie.default,{colSpan:100,align:"center",className:t.cell},l.createElement(iP.Z,{"data-testid":"loading-spinner",size:24}))):null}),gK=function(e){var t=e.children;return e.visible?l.createElement(ii.Z,null,l.createElement(ie.default,{component:"th",scope:"row"},t||"No entries to show")):null};function gV(){return(gV=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}var gq=function(e){return l.createElement("svg",gV({viewBox:"0 0 48 48"},e),l.createElement("path",{d:"M24 48C10.8 48 0 37.2 0 24S10.8 0 24 0s24 10.8 24 24-10.8 24-24 24zm0-44C13 4 4 13 4 24s9 20 20 20 20-9 20-20S35 4 24 4z",fill:"transparent"}),l.createElement("circle",{cx:24,cy:24,r:20,fill:"#ffecf0"}),l.createElement("path",{d:"M16.8 30.9H31c.5 0 1-.3 1.2-.8.3-.6.3-1.2.1-1.8l-6.5-11c-.4-.8-1.1-1.3-1.9-1.4-.8.1-1.6.6-1.9 1.3l-6.4 11c-.3.6-.3 1.3.1 1.8.1.5.6.8 1.1.9zm7.1-5.5c-.4 0-.7-.4-.7-.8l-.4-3.4c0-.6.5-1.1 1.1-1.1s1.1.5 1.1 1.1l-.4 3.4c0 .4-.3.8-.7.8zm0 1.1c.6 0 1.1.5 1.1 1.1v.1c0 .6-.5 1.1-1.1 1.1s-1.1-.5-1.1-1.1c0-.6.5-1.1 1.1-1.2zm-7.1 5.8c-1 0-2-.6-2.5-1.5-.6-1-.6-2.3-.1-3.3l6.5-11.2c.6-1.2 1.8-2 3.1-2.1 1.3.1 2.5.9 3.1 2l6.5 11.1c.5 1.1.5 2.3-.1 3.4-.5.9-1.4 1.4-2.4 1.5l-14.1.1z",fillRule:"evenodd",clipRule:"evenodd",fill:"#ff4169"}))};let gZ=gq;function gX(){return(gX=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}var gJ=function(e){return l.createElement("svg",gX({fill:"none",viewBox:"0 0 48 48"},e),l.createElement("path",{d:"M24 46C36.1503 46 46 36.1503 46 24C46 11.8497 36.1503 2 24 2C11.8497 2 2 11.8497 2 24C2 36.1503 11.8497 46 24 46Z",stroke:"white",strokeWidth:"4"}),l.createElement("path",{d:"M24 44C35.0457 44 44 35.0457 44 24C44 12.9543 35.0457 4 24 4C12.9543 4 4 12.9543 4 24C4 35.0457 12.9543 44 24 44Z",fill:"#E8ECEF"}),l.createElement("path",{d:"M24.07 11.72C21.7307 11.722 19.4445 12.4175 17.5003 13.7186C15.5562 15.0197 14.0415 16.868 13.1476 19.0298C12.2538 21.1916 12.0209 23.5699 12.4785 25.864C12.9361 28.1582 14.0636 30.2651 15.7185 31.9186C17.3733 33.5721 19.4812 34.6978 21.7758 35.1534C24.0703 35.6091 26.4484 35.3742 28.6095 34.4785C30.7705 33.5829 32.6175 32.0666 33.917 30.1214C35.2164 28.1761 35.91 25.8893 35.91 23.55C35.9113 21.9952 35.6059 20.4555 35.0112 19.019C34.4166 17.5825 33.5443 16.2774 32.4445 15.1784C31.3446 14.0795 30.0388 13.2084 28.6018 12.6149C27.1647 12.0215 25.6248 11.7174 24.07 11.72V11.72ZM24.07 33.01C22.199 33.01 20.37 32.4552 18.8143 31.4157C17.2586 30.3762 16.0461 28.8988 15.3301 27.1702C14.6141 25.4416 14.4268 23.5395 14.7918 21.7044C15.1568 19.8694 16.0578 18.1838 17.3808 16.8608C18.7038 15.5378 20.3894 14.6368 22.2245 14.2718C24.0595 13.9068 25.9616 14.0941 27.6902 14.8101C29.4188 15.5261 30.8962 16.7386 31.9357 18.2943C32.9752 19.85 33.53 21.679 33.53 23.55C33.5274 26.0538 32.5323 28.4543 30.7628 30.2257C28.9933 31.9971 26.5938 32.9947 24.09 33L24.07 33.01Z",fill:"#5A6169",fillOpacity:"0.75"}),l.createElement("path",{d:"M24.68 17.64H22.9V24.73L29.11 28.45L30 27L24.68 23.84V17.64Z",fill:"#5A6169",fillOpacity:"0.75"}))};let gQ=gJ;function g1(){return(g1=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}var g0=function(e){return l.createElement("svg",g1({id:"prefix__Layer_1","data-name":"Layer 1",viewBox:"0 0 48 48"},e),l.createElement("defs",null,l.createElement("style",null,".prefix__cls-3{fill:#b0b0b0}")),l.createElement("g",{id:"prefix__Time-Icon"},l.createElement("circle",{id:"prefix__path-1",cx:24,cy:24,r:20,fill:"#f0f0f0",className:"pending-icon"})),l.createElement("g",{id:"prefix__Time-Icon-2","data-name":"Time-Icon"},l.createElement("g",{id:"prefix__Shape"},l.createElement("path",{className:"prefix__cls-3",d:"M23.94 11.64a11.83 11.83 0 1 0 11.84 11.83 11.82 11.82 0 0 0-11.84-11.83zm0 21.29a9.46 9.46 0 1 1 9.46-9.46 9.46 9.46 0 0 1-9.4 9.46z"}),l.createElement("path",{fill:"none",d:"M9.77 9.28h28.38v28.38H9.77V9.28z"}),l.createElement("path",{className:"prefix__cls-3",d:"M24.55 17.56h-1.78v7.09l6.21 3.73.89-1.46-5.32-3.16v-6.2z"}))))};let g2=g0;function g3(){return(g3=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}var g4=function(e){return l.createElement("svg",g3({"data-name":"Layer 1",viewBox:"0 0 48 48"},e),l.createElement("defs",null,l.createElement("mask",{id:"prefix__a",x:13.75,y:16,width:21,height:15,maskUnits:"userSpaceOnUse"},l.createElement("path",{fillRule:"evenodd",fill:"#fff",d:"M13.75 16h21v15h-21V16z"}))),l.createElement("circle",{"data-name":"path-1",cx:24,cy:24,r:20,fill:"#e8faf1"}),l.createElement("g",null,l.createElement("g",{mask:"url(#prefix__a)"},l.createElement("path",{d:"M30.81 17a1.89 1.89 0 0 0-1.29.56c-2.94 2.9-5.2 5.33-7.89 8.05l-2.74-2.28a1.9 1.9 0 0 0-2.66.14 1.84 1.84 0 0 0 .14 2.62l.09.07 4.08 3.4a1.9 1.9 0 0 0 2.55-.11c3.38-3.34 5.79-6 9.09-9.27a1.82 1.82 0 0 0 0-2.62 1.92 1.92 0 0 0-1.4-.56",fill:"#17c671",fillRule:"evenodd"}))))};let g5=g4;var g6=function(e){var t=e.status,n=e.width,r=e.height;switch(t){case"COMPLETED":return l.createElement(g5,{width:n,height:r,"data-testid":"completed"});case"ERRORED":return l.createElement(gZ,{width:n,height:r,"data-testid":"errored"});case"RUNNING":return l.createElement(g2,{width:n,height:r,"data-testid":"running"});case"SUSPENDED":return l.createElement(gQ,{width:n,height:r,"data-testid":"suspended"});default:return null}},g9=function(e){var t=e.palette,n=e.spacing;return(0,b.createStyles)({cell:{padding:0},content:{position:"relative",paddingLeft:50},status:{position:"absolute",top:0,left:0,paddingTop:18,paddingLeft:30,borderRight:"solid 1px",borderRightColor:t.divider,width:50,height:"100%"},runDetails:{paddingTop:3*n.unit,paddingBottom:3*n.unit,paddingLeft:4*n.unit,paddingRight:4*n.unit}})},g8=(0,b.withStyles)(g9)(function(e){var t=e.classes,n=e.run;return l.createElement(ii.Z,null,l.createElement(ie.default,{scope:"row",className:t.cell},l.createElement("div",{className:t.content},l.createElement("div",{className:t.status},l.createElement(g6,{width:38,status:n.status})),l.createElement("div",{className:t.runDetails},l.createElement(d.Z,{container:!0,spacing:0},l.createElement(d.Z,{item:!0,xs:12},l.createElement(ip,{href:"/jobs/".concat(n.job.id)},l.createElement(x.default,{variant:"h5",color:"primary",component:"span"},"Job: ",n.job.id))),l.createElement(d.Z,{item:!0,xs:12},l.createElement(ip,{href:"/runs/".concat(n.id)},l.createElement(x.default,{variant:"subtitle1",color:"textSecondary",component:"span"},"Run: ",n.id))))))),l.createElement(ie.default,{align:"right"},l.createElement(x.default,{variant:"body1",color:"textSecondary"},l.createElement(aA,{tooltip:!0},n.createdAt))))});function g7(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function ve(){var e=g7(["\n  fragment RecentJobRunsPayload_ResultsFields on JobRun {\n    id\n    allErrors\n    createdAt\n    finishedAt\n    status\n    job {\n      id\n    }\n  }\n"]);return ve=function(){return e},e}var vt=n0(ve()),vn=function(e){var t=e.palette,n=e.spacing;return(0,b.createStyles)({footer:{borderColor:t.divider,borderTop:"1px solid",paddingTop:2*n.unit,paddingBottom:2*n.unit}})},vr=(0,b.withStyles)(vn)(function(e){var t,n,r=e.classes,i=e.data,a=e.loading,o=e.errorMsg,s=e.maxRunsSize;return l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"Activity",action:l.createElement(aL.Z,{href:"/jobs/new",component:tz},"New Job")}),l.createElement(r8.Z,null,l.createElement(r7.Z,null,l.createElement(gW,{visible:a}),l.createElement(gK,{visible:(null===(t=null==i?void 0:i.jobRuns.results)||void 0===t?void 0:t.length)===0},"No recent activity"),l.createElement(gz,{msg:o}),null===(n=null==i?void 0:i.jobRuns.results)||void 0===n?void 0:n.map(function(e,t){return l.createElement(g8,{run:e,key:t})})),i&&i.jobRuns.metadata.total>s&&l.createElement(g$.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,{className:r.footer},l.createElement(aL.Z,{href:"/runs",component:tz},"View More"))))))});function vi(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function va(){var e=vi(["\n  ","\n  query FetchRecentJobRuns($offset: Int, $limit: Int) {\n    jobRuns(offset: $offset, limit: $limit) {\n      results {\n        ...RecentJobRunsPayload_ResultsFields\n      }\n      metadata {\n        total\n      }\n    }\n  }\n"]);return va=function(){return e},e}var vo=5,vs=n0(va(),vt),vu=function(){var e=ry(vs,{variables:{offset:0,limit:vo},fetchPolicy:"cache-and-network"}),t=e.data,n=e.loading,r=e.error;return l.createElement(vr,{data:t,errorMsg:null==r?void 0:r.message,loading:n,maxRunsSize:vo})},vc=function(e){return(0,b.createStyles)({style:{textAlign:"center",padding:2.5*e.spacing.unit,position:"fixed",left:"0",bottom:"0",width:"100%",borderRadius:0},bareAnchor:{color:e.palette.common.black,textDecoration:"none"}})},vl=(0,b.withStyles)(vc)(function(e){var t=e.classes,n=(0,A.v9)(gx.N,A.wU),r=(0,A.I0)();return(0,l.useEffect)(function(){r((0,ty.DQ)())}),l.createElement(ia.default,{className:t.style},l.createElement(x.default,null,"Chainlink Node ",n.version," at commit"," ",l.createElement("a",{target:"_blank",rel:"noopener noreferrer",href:"https://github.com/smartcontractkit/chainlink/commit/".concat(n.commitSHA),className:t.bareAnchor},n.commitSHA)))}),vf=function(e){return(0,b.createStyles)({cell:{borderColor:e.palette.divider,borderTop:"1px solid",borderBottom:"none",paddingTop:2*e.spacing.unit,paddingBottom:2*e.spacing.unit,paddingLeft:2*e.spacing.unit},block:{display:"block"},overflowEllipsis:{textOverflow:"ellipsis",overflow:"hidden"}})},vd=(0,b.withStyles)(vf)(function(e){var t=e.classes,n=e.job;return l.createElement(ii.Z,null,l.createElement(ie.default,{scope:"row",className:t.cell},l.createElement(d.Z,{container:!0,spacing:0},l.createElement(d.Z,{item:!0,xs:12},l.createElement(ip,{href:"/jobs/".concat(n.id),classes:{linkContent:t.block}},l.createElement(x.default,{className:t.overflowEllipsis,variant:"body1",component:"span",color:"primary"},n.name||n.id))),l.createElement(d.Z,{item:!0,xs:12},l.createElement(x.default,{variant:"body1",color:"textSecondary"},"Created ",l.createElement(aA,{tooltip:!0},n.createdAt))))))});function vh(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function vp(){var e=vh(["\n  fragment RecentJobsPayload_ResultsFields on Job {\n    id\n    name\n    createdAt\n  }\n"]);return vp=function(){return e},e}var vb=n0(vp()),vm=function(){return(0,b.createStyles)({cardHeader:{borderBottom:0},table:{tableLayout:"fixed"}})},vg=(0,b.withStyles)(vm)(function(e){var t,n,r=e.classes,i=e.data,a=e.errorMsg,o=e.loading;return l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"Recent Jobs",className:r.cardHeader}),l.createElement(r8.Z,{className:r.table},l.createElement(r7.Z,null,l.createElement(gW,{visible:o}),l.createElement(gK,{visible:(null===(t=null==i?void 0:i.jobs.results)||void 0===t?void 0:t.length)===0},"No recently created jobs"),l.createElement(gz,{msg:a}),null===(n=null==i?void 0:i.jobs.results)||void 0===n?void 0:n.map(function(e,t){return l.createElement(vd,{job:e,key:t})}))))});function vv(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function vy(){var e=vv(["\n  ","\n  query FetchRecentJobs($offset: Int, $limit: Int) {\n    jobs(offset: $offset, limit: $limit) {\n      results {\n        ...RecentJobsPayload_ResultsFields\n      }\n    }\n  }\n"]);return vy=function(){return e},e}var vw=5,v_=n0(vy(),vb),vE=function(){var e=ry(v_,{variables:{offset:0,limit:vw},fetchPolicy:"cache-and-network"}),t=e.data,n=e.loading,r=e.error;return l.createElement(vg,{data:t,errorMsg:null==r?void 0:r.message,loading:n})},vS=function(){return l.createElement(iv,null,l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:8},l.createElement(vu,null)),l.createElement(d.Z,{item:!0,xs:4},l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12},l.createElement(gH,null)),l.createElement(d.Z,{item:!0,xs:12},l.createElement(vE,null))))),l.createElement(vl,null))},vk=function(){return l.createElement(vS,null)},vx=function(){return l.createElement(vk,null)},vT=n(87239),vM=function(e){switch(e){case"DirectRequestSpec":return"Direct Request";case"FluxMonitorSpec":return"Flux Monitor";default:return e.replace(/Spec$/,"")}},vO=n(5022),vA=n(78718),vL=n.n(vA);function vC(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function vI(e){if(Array.isArray(e))return vC(e)}function vD(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function vN(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function vP(){throw TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function vR(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){vD(e,t,n[t])})}return e}function vj(e){return vI(e)||vN(e)||vF(e)||vP()}function vF(e,t){if(e){if("string"==typeof e)return vC(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return vC(e,t)}}var vY=function(e){for(var t=arguments.length,n=Array(t>1?t-1:0),r=1;r<t;r++)n[r-1]=arguments[r];return vL().apply(void 0,[e,"type","schemaVersion","name","externalJobID","gasLimit","forwardingAllowed",].concat(vj(n)))},vB=function(e){var t=e.observationSource;return{observationSource:""===t?null:t}},vU=function(e){for(var t=arguments.length,n=Array(t>1?t-1:0),r=1;r<t;r++)n[r-1]=arguments[r];return vL().apply(void 0,[e].concat(vj(n)))},vH=function(e){try{return vO.stringify(e)}catch(t){return console.error("Failed to stringify job spec with the following error: ".concat(t)),""}},v$=function(e){var t={};switch(e.spec.__typename){case"CronSpec":t=vR({},vY(e,"maxTaskDuration"),vU(e.spec,"schedule"),vB(e));break;case"DirectRequestSpec":t=vR({},vY(e,"maxTaskDuration"),vU(e.spec,"contractAddress","evmChainID","minIncomingConfirmations","minContractPaymentLinkJuels","requesters"),vB(e));break;case"FluxMonitorSpec":t=vR({},vY(e,"maxTaskDuration"),vU(e.spec,"absoluteThreshold","contractAddress","drumbeatEnabled","drumbeatSchedule","drumbeatRandomDelay","evmChainID","idleTimerPeriod","idleTimerDisabled","minPayment","pollTimerPeriod","pollTimerDisabled","threshold"),vB(e));break;case"KeeperSpec":t=vR({},vY(e),vU(e.spec,"contractAddress","evmChainID","fromAddress"),vB(e));break;case"OCRSpec":t=vR({},vY(e,"maxTaskDuration"),vU(e.spec,"blockchainTimeout","contractAddress","contractConfigConfirmations","contractConfigTrackerPollInterval","contractConfigTrackerSubscribeInterval","evmChainID","isBootstrapPeer","keyBundleID","observationTimeout","p2pv2Bootstrappers","transmitterAddress"),vB(e));break;case"OCR2Spec":t=vR({},vY(e,"maxTaskDuration"),vU(e.spec,"blockchainTimeout","contractID","contractConfigConfirmations","contractConfigTrackerPollInterval","ocrKeyBundleID","monitoringEndpoint","p2pv2Bootstrappers","relay","relayConfig","pluginType","pluginConfig","feedID"),vU(e.spec,"transmitterID"),vB(e));break;case"VRFSpec":t=vR({},vY(e),vU(e.spec,"coordinatorAddress","evmChainID","fromAddresses","minIncomingConfirmations","pollPeriod","publicKey","requestedConfsDelay","requestTimeout","batchCoordinatorAddress","batchFulfillmentEnabled","batchFulfillmentGasMultiplier","chunkSize","backoffInitialDelay","backoffMaxDelay","gasLanePrice","vrfOwnerAddress"),vB(e));break;case"BlockhashStoreSpec":t=vR({},vY(e),vU(e.spec,"coordinatorV1Address","coordinatorV2Address","coordinatorV2PlusAddress","waitBlocks","lookbackBlocks","blockhashStoreAddress","trustedBlockhashStoreAddress","trustedBlockhashStoreBatchSize","pollPeriod","runTimeout","evmChainID","fromAddresses"),vB(e));break;case"BlockHeaderFeederSpec":t=vR({},vY(e),vU(e.spec,"coordinatorV1Address","coordinatorV2Address","coordinatorV2PlusAddress","waitBlocks","lookbackBlocks","blockhashStoreAddress","batchBlockhashStoreAddress","pollPeriod","runTimeout","evmChainID","fromAddresses","getBlockhashesBatchSize","storeBlockhashesBatchSize"),vB(e));break;case"BootstrapSpec":t=vR({},vY(e),vU(e.spec,"contractID","relay","relayConfig","monitoringEndpoint","blockchainTimeout","contractConfigTrackerPollInterval","contractConfigConfirmations"));break;case"GatewaySpec":t=vR({},vY(e),vU(e.spec,"gatewayConfig"));break;default:return{definition:""};case"WebhookSpec":t=vR({},vY(e),vB(e))}return{definition:vH(t)}};function vz(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function vG(e){if(Array.isArray(e))return e}function vW(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function vK(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function vV(e,t){return vG(e)||vW(e,t)||vq(e,t)||vK()}function vq(e,t){if(e){if("string"==typeof e)return vz(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return vz(e,t)}}var vZ=function(e){var t=e.job,n=e.onDelete,r=vV(l.useState(null),2),i=r[0],a=r[1],o=vV(l.useState(!1),2),s=o[0],u=o[1],c=function(e){a(e.currentTarget)},f=function(){a(null)},h=v$(t).definition;return l.createElement(l.Fragment,null,l.createElement(op,{actions:l.createElement("div",null,l.createElement(y.default,{onClick:c,"aria-label":"open-menu"},l.createElement(of.Z,null)),l.createElement(t_.Z,{anchorEl:i,open:Boolean(i),onClose:f,disableAutoFocusItem:!0},l.createElement(tN,{to:"/jobs/new?definition=".concat(encodeURIComponent(h))},l.createElement(ol.Z,null,l.createElement(vT.Z,null)),l.createElement(E.Z,null,"Duplicate")),l.createElement(tE.default,{onClick:function(){return u(!0)}},l.createElement(ol.Z,null,l.createElement(oc.Z,null)),l.createElement(E.Z,null,"Delete"))))},l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12,sm:6,md:1},l.createElement(ob,{title:"ID"}),l.createElement(om,{value:t.id})),l.createElement(d.Z,{item:!0,xs:12,sm:6,md:2},l.createElement(ob,{title:"Type"}),l.createElement(om,{value:vM(t.spec.__typename)})),l.createElement(d.Z,{item:!0,xs:12,sm:6,md:5},l.createElement(ob,{title:"External Job ID"}),l.createElement(om,{value:vM(t.externalJobID)})),l.createElement(d.Z,{item:!0,xs:12,sm:6,md:4},l.createElement(ob,{title:"Created"}),l.createElement(om,null,l.createElement(aA,{tooltip:!0},t.createdAt))))),l.createElement(oI,{open:s,title:"Delete Job?",body:"Warning: This action cannot be undone!",confirmButtonText:"Confirm",onConfirm:function(){n(),u(!1)},cancelButtonText:"Cancel",onCancel:function(){return u(!1)}}))},vX=n(70398),vJ=n(12794),vQ=n(75759);function v1(){return(v1=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}var v0=function(e){return l.createElement(vQ.Z,v1({},e,{component:tI.rU}),e.children)};function v2(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var v3,v4=function(e){return(0,b.createStyles)({tabs:{marginTop:4*e.spacing.unit,marginBottom:2.5*e.spacing.unit,borderBottom:"1px solid ".concat(e.palette.grey["300"])},badge:{padding:"0 ".concat(2*e.spacing.unit,"px")}})};(v3=s||(s={}))[v3.Overview=0]="Overview",v3[v3.Definition=1]="Definition",v3[v3.Errors=2]="Errors",v3[v3.Runs=3]="Runs";var v5=(0,b.withStyles)(v4)(function(e){var t=e.classes,n=e.id,r=e.errorsCount,i=e.refetchRecentRuns,a=e.runsCount,o=(0,h.TH)().pathname,u=l.useMemo(function(){var e;return v2(e={},s.Overview,"/jobs/".concat(n)),v2(e,s.Definition,"/jobs/".concat(n,"/definition")),v2(e,s.Errors,"/jobs/".concat(n,"/errors")),v2(e,s.Runs,"/jobs/".concat(n,"/runs")),e},[n]);return l.createElement(vJ.Z,{value:o,className:t.tabs,indicatorColor:"primary",onChange:function(e,t){t===u[s.Overview]&&i()}},l.createElement(v0,{label:"Overview",to:u[s.Overview],value:u[s.Overview]}),l.createElement(v0,{label:"Definition",to:u[s.Definition],value:u[s.Definition]}),l.createElement(v0,{label:l.createElement(vX.Z,{badgeContent:r,color:"error",className:t.badge},"Errors"),to:u[s.Errors],value:u[s.Errors]}),l.createElement(v0,{label:l.createElement(vX.Z,{badgeContent:a,color:"primary",className:t.badge,max:99999},"Runs"),to:u[s.Runs],value:u[s.Runs]}))}),v6=n(12740);function v9(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function v8(e){if(Array.isArray(e))return e}function v7(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function ye(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function yt(e,t){return v8(e)||v7(e,t)||yn(e,t)||ye()}function yn(e,t){if(e){if("string"==typeof e)return v9(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return v9(e,t)}}var yr=function(e){return(0,b.createStyles)({dialogContent:{paddingTop:1*e.spacing.unit},textarea:{width:400},closeButton:{position:"absolute",right:e.spacing.unit,top:e.spacing.unit,color:e.palette.grey[500]}})},yi=(0,b.withStyles)(yr)(function(e){var t=e.open,n=e.onClose,r=e.onRun,i=e.classes,a=yt(l.useState(""),2),o=a[0],s=a[1],u=l.useCallback(function(){r(o),n()},[r,n,o]);return l.createElement(aN.Z,{onClose:n,open:t},l.createElement(oA.Z,{disableTypography:!0},l.createElement(x.default,{variant:"h5"},"Pipeline Input"),l.createElement(y.default,{"aria-label":"Close",className:i.closeButton,onClick:n},l.createElement(v6.Z,null))),l.createElement(oM.Z,{className:i.dialogContent},l.createElement(i_.Z,{className:i.textarea,multiline:!0,rows:6,variant:"outlined",onChange:function(e){return s(e.target.value)}})),l.createElement(oT.Z,null,l.createElement(aL.Z,{variant:"primary",onClick:u},"Run Job")))}),ya=n(74855);function yo(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function ys(e){if(Array.isArray(e))return e}function yu(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function yc(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function yl(e,t){return ys(e)||yu(e,t)||yf(e,t)||yc()}function yf(e,t){if(e){if("string"==typeof e)return yo(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return yo(e,t)}}var yd=function(e){var t=e.data,n=e.title,r=yl(l.useState(!1),2),i=r[0],a=r[1];return l.createElement(ya.CopyToClipboard,{text:t,onCopy:function(){return a(!0)}},l.createElement(aE.Z,{title:"Copied!",open:i,onClose:function(){return a(!1)}},l.createElement(aL.Z,{variant:"secondary",onMouseLeave:function(){return a(!1)}},n)))},yh=function(e){var t=v$(e.job).definition;return l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"Definition",action:l.createElement(yd,{title:"Copy",data:t})}),l.createElement(aK.Z,null,l.createElement(x.default,{style:{margin:0},variant:"body1",component:"pre"},l.createElement(gh,{language:"toml",style:gu,"data-testid":"definition"},t))))},yp=function(e){var t=e.job,n=["Occurrences","Created","Last Seen","Message"];return l.createElement(r9.Z,null,l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,n.map(function(e){return l.createElement(ie.default,{key:e},e)}))),l.createElement(r7.Z,null,0===t.errors.length&&l.createElement(ii.Z,null,l.createElement(ie.default,{component:"th",scope:"row",colSpan:5},"No errors")),t.errors.map(function(e,t){return l.createElement(ii.Z,{key:t},l.createElement(ie.default,null,e.occurrences),l.createElement(ie.default,null,l.createElement(aA,{tooltip:!0},e.createdAt)),l.createElement(ie.default,null,l.createElement(aA,{tooltip:!0},e.updatedAt)),l.createElement(ie.default,null,e.description))}))))},yb=function(e){return(0,b.createStyles)({jobRunsCard:{overflow:"auto"},idCell:{width:"40%"},stampCell:{width:"30%"},statusCell:{textAlign:"end",width:"30%"},runDetails:{paddingTop:2*e.spacing.unit,paddingBottom:2*e.spacing.unit,paddingLeft:2*e.spacing.unit},stamp:{paddingLeft:e.spacing.unit},status:{paddingLeft:1.5*e.spacing.unit,paddingRight:1.5*e.spacing.unit,paddingTop:e.spacing.unit/2,paddingBottom:e.spacing.unit/2,borderRadius:2*e.spacing.unit,marginRight:e.spacing.unit,width:"fit-content",display:"inline-block",textTransform:"capitalize"},errored:{backgroundColor:e.palette.error.light,color:e.palette.error.main},running:{backgroundColor:e.palette.listPendingStatus.background,color:e.palette.listPendingStatus.color},completed:{backgroundColor:e.palette.listCompletedStatus.background,color:e.palette.listCompletedStatus.color},noRuns:{padding:2*e.spacing.unit}})},ym=function(e,t){switch(t){case"COMPLETED":case"ERRORED":case"RUNNING":return e[t.toLowerCase()];default:return null}},yg=(0,b.withStyles)(yb)(function(e){var t=e.classes,n=e.runs,r=(0,h.k6)();return l.createElement(r8.Z,{padding:"none"},l.createElement(r7.Z,null,0===n.length&&l.createElement(ii.Z,null,l.createElement(ie.default,{colSpan:5},l.createElement(x.default,{variant:"body1",color:"textSecondary",className:t.noRuns},"No jobs have been run yet"))),n.length>0&&n.map(function(e){return l.createElement(ii.Z,{key:e.id,style:{cursor:"pointer"},onClick:function(){return r.push("/runs/".concat(e.id))}},l.createElement(ie.default,{className:t.idCell,scope:"row"},l.createElement("div",{className:t.runDetails},l.createElement(x.default,{variant:"h5",color:"primary",component:"span"},e.id))),l.createElement(ie.default,{className:t.stampCell},l.createElement(x.default,{variant:"body1",color:"textSecondary",className:t.stamp},"Created ",l.createElement(aA,{tooltip:!0},e.createdAt))),l.createElement(ie.default,{className:t.statusCell,scope:"row"},l.createElement(x.default,{variant:"body1",className:O()(t.status,ym(t,e.status))},e.status.toLowerCase())))})))}),yv=n(16839),yy=n.n(yv);function yw(e){var t=e.replace(/\w+\s*=\s*<([^>]|[\r\n])*>/g,""),n=yy().read(t),r=n.edges();return n.nodes().map(function(e){var t={id:e,parentIds:r.filter(function(t){return t.w===e}).map(function(e){return e.v})};return Object.keys(n.node(e)).length>0&&(t.attributes=n.node(e)),t})}var y_=n(94164),yE=function(e){var t=e.data,n=[];return(null==t?void 0:t.attributes)&&Object.keys(t.attributes).forEach(function(e){var r;n.push(l.createElement("div",{key:e},l.createElement(x.default,{variant:"body1",color:"textSecondary",component:"div"},l.createElement("b",null,e,":")," ",null===(r=t.attributes)||void 0===r?void 0:r[e])))}),l.createElement("div",null,t&&l.createElement(x.default,{variant:"body1",color:"textPrimary"},l.createElement("b",null,t.id)),n)},yS=n(73343),yk=n(3379),yx=n.n(yk);function yT(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function yM(e){if(Array.isArray(e))return e}function yO(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function yA(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function yL(e,t){return yM(e)||yO(e,t)||yC(e,t)||yA()}function yC(e,t){if(e){if("string"==typeof e)return yT(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return yT(e,t)}}var yI=function(e){var t,n=e.nodesData,r=yL(l.useState({}),2),i=r[0],a=r[1];l.useEffect(function(){var e=function(e){var t=!0,r=!1,i=void 0;try{for(var a,o=n[Symbol.iterator]();!(t=(a=o.next()).done);t=!0){var s=a.value;if(e===s.id)return s}}catch(u){r=!0,i=u}finally{try{t||null==o.return||o.return()}finally{if(r)throw i}}};if(n){var t={nodes:[],links:[]},r=[],i=[];n.map(function(e){t.nodes.push({id:e.id}),e.parentIds.map(function(n){t.links.push({source:n,target:e.id})}),r.push({id:e.id,width:90,height:40}),e.parentIds.map(function(t){i.push({id:"e".concat(e.id),sources:[e.id],targets:[t]})})});var o=function(t){var n,r=e(t.id);switch(null==r?void 0:null===(n=r.attributes)||void 0===n?void 0:n.status){case"COMPLETE":return l.createElement(g5,{className:"task-run-icon-success task-run-icon",id:"success-run-icon-".concat(t.id)});case"ERROR":return l.createElement(gZ,{className:"task-run-icon-error task-run-icon",id:"error-run-icon-".concat(t.id)});default:return l.createElement(g2,{className:"task-run-icon-pending task-run-icon",id:"pending-run-icon-".concat(t.id)})}};new(yx())().layout({id:"task-list-graph-d3",children:r,edges:i},{layoutOptions:{"elk.algorithm":"org.eclipse.elk.layered","elk.direction":"LEFT","elk.layered.nodePlacement.strategy":"SIMPLE","elk.layered.wrapping.strategy":"SINGLE_EDGE","elk.aspectRatio":"1.0f","org.eclipse.elk.padding":"[top=50, left=50, bottom=50, right=5]","elk.layered.spacing.edgeNodeBetweenLayers":"1","elk.zoomToFit":"TRUE","elk.layered.considerModelOrder.strategy":"PREFER_EDGES","elk.layered.unnecessaryBendpoints":"TRUE"}}).then(function(e){var n;t.nodes=[],null===(n=e.children)||void 0===n||n.map(function(e){e.x&&e.y&&t.nodes.push({id:e.id,x:"".concat(e.x),y:"".concat(e.y),viewGenerator:o,size:400})}),a(t)})}},[n]);var o=0;null===(t=i.nodes)||void 0===t||t.map(function(e){e.y&&o<parseInt(e.y,10)&&(o=parseInt(e.y,10))});var s={automaticRearrangeAfterDropNode:!1,collapsible:!1,directed:!0,disableLinkForce:!0,focusAnimationDuration:.75,focusZoom:1,height:o+50,highlightDegree:0,highlightOpacity:1,link:{color:"#d3d3d3",fontColor:"black",fontSize:12,fontWeight:"normal",highlightColor:"blue",highlightFontSize:8,highlightFontWeight:"bold",mouseCursor:"pointer",opacity:1,renderLabel:!1,strokeWidth:3,markerHeight:3,markerWidth:3},linkHighlightBehavior:!0,maxZoom:3,minZoom:.3,node:{color:"#d3d3d3",fontColor:"black",fontSize:14,fontWeight:"normal",highlightColor:"red",highlightFontSize:16,highlightFontWeight:"bold",highlightStrokeColor:"blue",labelProperty:"name",mouseCursor:"pointer",opacity:1,renderLabel:!0,strokeColor:"none",strokeWidth:2,labelPosition:"top"},nodeHighlightBehavior:!0,panAndZoom:!0,staticGraph:!0,width:"100%"},u=0,c=0,f=function(e){c=e.clientY,u=e.clientX};(0,l.useEffect)(function(){return window.addEventListener("mousemove",f),function(){window.removeEventListener("mousemove",f)}});var d=function(e){var t,n,r=document.getElementById("tooltip-d3-chart-".concat(e));if(r){var i=50,a=10;t=u+r.getBoundingClientRect().width+i>window.innerWidth?u-r.getBoundingClientRect().width-a:u+a,n=c+r.getBoundingClientRect().height+i>window.innerHeight?c-r.getBoundingClientRect().height-a:c+a,r.style.opacity=String(1),r.style.top="".concat(n,"px"),r.style.left="".concat(t,"px"),r.style.zIndex=String(1)}},h=function(e){var t=document.getElementById("tooltip-d3-chart-".concat(e));t&&(t.style.opacity=String(0),t.style.zIndex=String(-1))};return l.createElement("div",{style:{fontFamily:"sans-serif",fontWeight:"normal"}},l.createElement(y_.kJ,{id:"task-list-graph-d3",data:i,config:s,onMouseOverNode:d,onMouseOutNode:h},"D3 chart"),n.map(function(e){return l.createElement("div",{key:"d3-tooltip-key-".concat(e.id),id:"tooltip-d3-chart-".concat(e.id),style:{position:"absolute",opacity:"0",border:"1px solid rgba(0, 0, 0, 0.1)",padding:yS.r.spacing.unit,background:"white",borderRadius:5,zIndex:-1,inlineSize:"min-content"}},l.createElement(yE,{data:e}))}))};function yD(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function yN(e){if(Array.isArray(e))return e}function yP(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function yR(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function yj(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function yF(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){yP(e,t,n[t])})}return e}function yY(e,t){return yN(e)||yR(e,t)||yB(e,t)||yj()}function yB(e,t){if(e){if("string"==typeof e)return yD(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return yD(e,t)}}var yU=function(e){var t=e.attributes,n=e.observationSource,r=yY(l.useState(),2),i=r[0],a=r[1];return l.useEffect(function(){if(n&&""!==n)try{var e=yw("digraph {".concat(n,"}"));if(t)for(var r=0;r<e.length;r++){var i=e[r];t[i.id]&&(e[r].attributes=yF({},i.attributes,t[i.id]))}a({graph:e})}catch(o){a({errorMsg:"Failed to parse task graph"})}else a({errorMsg:"No Task Graph Found"})},[t,n,a]),l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"Task List",id:"graph-max-width"}),l.createElement(aK.Z,null,i&&i.errorMsg&&l.createElement(x.default,{align:"center",variant:"subtitle1"},i.errorMsg),i&&i.graph&&l.createElement(yI,{nodesData:i.graph})))},yH=5,y$=function(e){var t=e.spacing;return(0,b.createStyles)({runDetails:{paddingTop:2*t.unit,paddingBottom:2*t.unit,paddingLeft:2*t.unit}})},yz=(0,b.withStyles)(y$)(function(e){var t=e.classes,n=e.job,r=l.useMemo(function(){return n.runs.results.map(function(e){var t,n=e.allErrors,r=e.id,i=e.createdAt;return{id:r,createdAt:i,errors:n,finishedAt:e.finishedAt,status:e.status}})},[n.runs]);return l.createElement(d.Z,{container:!0,spacing:32},l.createElement(d.Z,{item:!0,xs:12,sm:6},l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"Recent job runs"}),l.createElement(yg,{runs:r}),n.runs.metadata.total>yH&&l.createElement("div",{className:t.runDetails},l.createElement(aL.Z,{href:"/jobs/".concat(n.id,"/runs"),component:tz},"View more")))),l.createElement(d.Z,{item:!0,xs:12,sm:6},l.createElement(yU,{observationSource:n.observationSource})))});function yG(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function yW(e){if(Array.isArray(e))return e}function yK(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function yV(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function yq(e,t){return yW(e)||yK(e,t)||yZ(e,t)||yV()}function yZ(e,t){if(e){if("string"==typeof e)return yG(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return yG(e,t)}}var yX=function(e){var t=e.fetchMore,n=e.job,r=(0,h.k6)(),i=(0,h.TH)(),a=new URLSearchParams(i.search),o=yq(l.useState({page:parseInt(a.get("page")||"1",10),pageSize:parseInt(a.get("size")||"10",10)}),2),s=o[0],u=s.page,c=s.pageSize,f=o[1];l.useEffect(function(){t(u,c)},[t,u,c]),l.useEffect(function(){r.replace({search:"?page=".concat(u,"&size=").concat(c)})},[r,u,c]);var d=l.useMemo(function(){return n.runs.results.map(function(e){var t,n=e.allErrors,r=e.id,i=e.createdAt;return{id:r,createdAt:i,errors:n,finishedAt:e.finishedAt,status:e.status}})},[n.runs]);return l.createElement(l.Fragment,null,l.createElement(r9.Z,null,l.createElement(yg,{runs:d}),l.createElement(ir.Z,{component:"div",count:n.runs.metadata.total,rowsPerPage:c,rowsPerPageOptions:[10,25,50,100],page:u-1,onChangePage:function(e,t){f({page:t+1,pageSize:c})},onChangeRowsPerPage:function(e){f({page:1,pageSize:parseInt(e.target.value,10)})},backIconButtonProps:{"aria-label":"prev-page"},nextIconButtonProps:{"aria-label":"next-page"}})))};function yJ(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function yQ(e){if(Array.isArray(e))return e}function y1(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function y0(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function y2(e,t){return yQ(e)||y1(e,t)||y4(e,t)||y0()}function y3(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function y4(e,t){if(e){if("string"==typeof e)return yJ(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return yJ(e,t)}}function y5(){var e=y3(["\n  fragment JobPayload_Spec on JobSpec {\n    ... on CronSpec {\n      schedule\n    }\n    ... on DirectRequestSpec {\n      contractAddress\n      evmChainID\n      minIncomingConfirmations\n      minContractPaymentLinkJuels\n      requesters\n    }\n    ... on FluxMonitorSpec {\n      absoluteThreshold\n      contractAddress\n      drumbeatEnabled\n      drumbeatRandomDelay\n      drumbeatSchedule\n      evmChainID\n      idleTimerDisabled\n      idleTimerPeriod\n      minPayment\n      pollTimerDisabled\n      pollTimerPeriod\n      threshold\n    }\n    ... on KeeperSpec {\n      contractAddress\n      evmChainID\n      fromAddress\n    }\n    ... on OCRSpec {\n      blockchainTimeout\n      contractAddress\n      contractConfigConfirmations\n      contractConfigTrackerPollInterval\n      contractConfigTrackerSubscribeInterval\n      evmChainID\n      isBootstrapPeer\n      keyBundleID\n      observationTimeout\n      p2pv2Bootstrappers\n      transmitterAddress\n    }\n    ... on OCR2Spec {\n      blockchainTimeout\n      contractID\n      contractConfigConfirmations\n      contractConfigTrackerPollInterval\n      ocrKeyBundleID\n      monitoringEndpoint\n      p2pv2Bootstrappers\n      relay\n      relayConfig\n      transmitterID\n      pluginType\n      pluginConfig\n      feedID\n    }\n    ... on VRFSpec {\n      evmChainID\n      gasLanePrice\n      coordinatorAddress\n      fromAddresses\n      minIncomingConfirmations\n      pollPeriod\n      publicKey\n      requestedConfsDelay\n      batchCoordinatorAddress\n      batchFulfillmentEnabled\n      batchFulfillmentGasMultiplier\n      chunkSize\n      requestTimeout\n      backoffInitialDelay\n      backoffMaxDelay\n      vrfOwnerAddress\n    }\n    ... on BlockhashStoreSpec {\n      coordinatorV1Address\n      coordinatorV2Address\n      waitBlocks\n      lookbackBlocks\n      blockhashStoreAddress\n      pollPeriod\n      runTimeout\n      evmChainID\n      fromAddresses\n      coordinatorV2PlusAddress\n      trustedBlockhashStoreAddress\n      trustedBlockhashStoreBatchSize\n    }\n    ... on BlockHeaderFeederSpec {\n      coordinatorV1Address\n      coordinatorV2Address\n      waitBlocks\n      lookbackBlocks\n      blockhashStoreAddress\n      batchBlockhashStoreAddress\n      pollPeriod\n      runTimeout\n      evmChainID\n      fromAddresses\n      getBlockhashesBatchSize\n      storeBlockhashesBatchSize\n      coordinatorV2PlusAddress\n    }\n    ... on BootstrapSpec {\n      contractID\n      relay\n      monitoringEndpoint\n      relayConfig\n      blockchainTimeout\n      contractConfigTrackerPollInterval\n      contractConfigConfirmations\n      createdAt\n    }\n    ... on GatewaySpec {\n      gatewayConfig\n      createdAt\n    }\n  }\n"]);return y5=function(){return e},e}function y6(){var e=y3(["\n  fragment JobPayload_RunsFields on JobRun {\n    id\n    allErrors\n    status\n    createdAt\n    finishedAt\n  }\n"]);return y6=function(){return e},e}function y9(){var e=y3(["\n  fragment JobPayload_ErrorsFields on JobError {\n    description\n    occurrences\n    createdAt\n    updatedAt\n  }\n"]);return y9=function(){return e},e}function y8(){var e=y3(["\n  ","\n  ","\n  ","\n  fragment JobPayload_Fields on Job {\n    id\n    name\n    externalJobID\n    observationSource\n    createdAt\n    schemaVersion\n    type\n    maxTaskDuration\n    gasLimit\n    forwardingAllowed\n    spec {\n      __typename\n      ...JobPayload_Spec\n    }\n    runs(offset: $offset, limit: $limit) {\n      results {\n        ...JobPayload_RunsFields\n      }\n      metadata {\n        total\n      }\n    }\n    errors {\n      ...JobPayload_ErrorsFields\n    }\n  }\n"]);return y8=function(){return e},e}var y7=n0(y5()),we=n0(y6()),wt=n0(y9()),wn=n0(y8(),y7,we,wt),wr=function(e){var t=e.job,n=e.runsCount,r=e.onDelete,i=e.onRun,a=e.refetch,o=e.refetchRecentRuns,s=(0,h.$B)().path,u=y2(l.useState(!1),2),c=u[0],f=u[1];return l.createElement(l.Fragment,null,l.createElement(iv,null,l.createElement(d.Z,{container:!0,spacing:32},l.createElement(d.Z,{item:!0,xs:9},l.createElement(iw,null,t.name||"--")),l.createElement(d.Z,{item:!0,xs:3,style:{textAlign:"right"}},"WebhookSpec"===t.spec.__typename&&l.createElement(aL.Z,{variant:"primary",onClick:function(){return f(!0)}},"Run"))),l.createElement(vZ,{job:t,onDelete:r}),l.createElement(v5,{id:t.id,errorsCount:t.errors.length,runsCount:n,refetchRecentRuns:o}),l.createElement(h.rs,null,l.createElement(h.AW,{path:"".concat(s,"/definition")},l.createElement(yh,{job:t})),l.createElement(h.AW,{exact:!0,path:"".concat(s,"/errors")},l.createElement(yp,{job:t})),l.createElement(h.AW,{exact:!0,path:"".concat(s,"/runs")},l.createElement(yX,{job:t,fetchMore:a})),l.createElement(h.AW,{exact:!0,path:s},l.createElement(yz,{job:t})))),l.createElement(yi,{open:c,onClose:function(){return f(!1)},onRun:i}))};function wi(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function wa(e){if(Array.isArray(e))return e}function wo(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function ws(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){wo(a,r,i,o,s,"next",e)}function s(e){wo(a,r,i,o,s,"throw",e)}o(void 0)})}}function wu(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function wc(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function wl(e,t){return wa(e)||wu(e,t)||wd(e,t)||wc()}function wf(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function wd(e,t){if(e){if("string"==typeof e)return wi(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return wi(e,t)}}var wh=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}};function wp(){var e=wf(["\n  ","\n  query FetchJob($id: ID!, $offset: Int, $limit: Int) {\n    job(id: $id) {\n      __typename\n      ... on Job {\n        ...JobPayload_Fields\n      }\n      ... on NotFoundError {\n        message\n      }\n    }\n  }\n"]);return wp=function(){return e},e}function wb(){var e=wf(["\n  mutation DeleteJob($id: ID!) {\n    deleteJob(id: $id) {\n      ... on DeleteJobSuccess {\n        job {\n          id\n        }\n      }\n      ... on NotFoundError {\n        message\n      }\n    }\n  }\n"]);return wb=function(){return e},e}var wm=5,wg=n0(wp(),wn),wv=n0(wb()),wy=function(e){var t=e.data;return l.createElement(l.Fragment,null,"Successfully created job run"," ",l.createElement(tz,{href:"/runs/".concat(t.id)},t.id))},ww=function(){var e=(0,h.UO)().id,t=(0,A.I0)(),n=(0,h.k6)(),r=(0,h.TH)().search,i=oZ().handleMutationError,a=l.useMemo(function(){return new URLSearchParams(r)},[]),o=parseInt(a.get("page")||"1",10),s=parseInt(a.get("per")||wm.toString(),10),u=ry(wg,{variables:{id:e,offset:(o-1)*s,limit:s},fetchPolicy:"network-only"}),c=u.data,f=u.loading,d=u.error,p=u.refetch,b=wl(os(wv),1)[0];if(f)return l.createElement(ij,null);if(d)return l.createElement(iN,{error:d});var m,g,v=(m=ws(function(){var r,a,o,s,u;return wh(this,function(c){switch(c.label){case 0:return c.trys.push([0,2,,3]),[4,b(((o={}).variables={id:e},o))];case 1:switch(null==(s=null===(r=(a=c.sent()).data)||void 0===r?void 0:r.deleteJob)?void 0:s.__typename){case"DeleteJobSuccess":n.push("/jobs"),setTimeout(function(){return t((0,ty.qt)("Successfully deleted job ".concat(e)))},200);break;case"NotFoundError":t((0,ty.LO)(s.message))}return[3,3];case 2:return i(u=c.sent()),[3,3];case 3:return[2]}})}),function(){return m.apply(this,arguments)}),y=(g=ws(function(n){return wh(this,function(r){switch(r.label){case 0:return[4,t((0,ty.tA)(e,n,wy,aP))];case 1:return r.sent(),p(),[2]}})}),function(e){return g.apply(this,arguments)}),w=function(e,t){p({offset:(e-1)*s,limit:t})},_=function(){p({offset:0,limit:wm})},E=null==c?void 0:c.job;switch(null==E?void 0:E.__typename){case"Job":return l.createElement(wr,{job:E,runsCount:E.runs.metadata.total,onDelete:v,onRun:y,refetch:w,refetchRecentRuns:_});case"NotFoundError":return l.createElement(oo,null);default:return null}},w_=(0,b.withStyles)(ic)(function(e){var t=e.job,n=e.classes;return l.createElement(ii.Z,{className:n.row,hover:!0},l.createElement(ie.default,{className:n.cell,component:"th",scope:"row"},l.createElement(ip,{className:n.link,href:"/jobs/".concat(t.id)},t.id)),l.createElement(ie.default,null,""!=t.name?t.name:"--"),l.createElement(ie.default,null,vM(t.spec.__typename)),l.createElement(ie.default,null,t.externalJobID),l.createElement(ie.default,null,l.createElement(aA,{tooltip:!0},t.createdAt)))});function wE(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function wS(e){if(Array.isArray(e))return e}function wk(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function wx(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function wT(e,t){return wS(e)||wk(e,t)||wO(e,t)||wx()}function wM(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function wO(e,t){if(e){if("string"==typeof e)return wE(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return wE(e,t)}}function wA(){var e=wM(["\n  fragment JobsPayload_ResultsFields on Job {\n    id\n    name\n    externalJobID\n    createdAt\n    spec {\n      __typename\n      ... on OCRSpec {\n        contractAddress\n        keyBundleID\n        transmitterAddress\n      }\n    }\n  }\n"]);return wA=function(){return e},e}var wL=n0(wA()),wC=function(e){var t=e.toLowerCase();return function(e){return e.toLowerCase().includes(t)}},wI=function(e){return function(t){return""===e||wD(t,e)}};function wD(e,t){var n=wC(t),r=[e.id,e.name||"",e.spec.__typename,e.externalJobID,],i=e.spec;return"OCRSpec"==i.__typename&&["contractAddress","keyBundleID","transmitterAddress",].forEach(function(e){r.push(String(i[e]))}),r.some(n)}var wN=function(e){var t=e.jobs,n=e.page,r=e.pageSize,i=e.total,a=(0,h.k6)(),o=wT(l.useState(""),2),s=o[0],u=o[1],c=l.useMemo(function(){return wI(s.trim())},[s]);return l.createElement(iv,null,l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:9},l.createElement(iw,null,"Jobs")),l.createElement(d.Z,{item:!0,xs:3},l.createElement(d.Z,{container:!0,justify:"flex-end"},l.createElement(d.Z,{item:!0},l.createElement(aL.Z,{variant:"secondary",component:tz,href:"/jobs/new"},"New Job")))),l.createElement(d.Z,{item:!0,xs:12},l.createElement(iS,{value:s,onChange:u,placeholder:"Search jobs"}),l.createElement(r9.Z,null,l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,"ID"),l.createElement(ie.default,null,"Name"),l.createElement(ie.default,null,"Type"),l.createElement(ie.default,null,"External Job ID"),l.createElement(ie.default,null,"Created"))),l.createElement(r7.Z,null,0===t.length&&l.createElement(ii.Z,null,l.createElement(ie.default,{component:"th",scope:"row",colSpan:3},"You haven’t created any jobs yet. Create a new job"," ",l.createElement(ip,{href:"/jobs/new"},"here"))),t.filter(c).map(function(e){return l.createElement(w_,{key:e.id,job:e})}))),l.createElement(ir.Z,{component:"div",count:i,rowsPerPage:r,rowsPerPageOptions:[r],page:n-1,onChangePage:function(e,t){a.push("/jobs?page=".concat(t+1,"&per=").concat(r))},onChangeRowsPerPage:function(){},backIconButtonProps:{"aria-label":"prev-page"},nextIconButtonProps:{"aria-label":"next-page"}})))))};function wP(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function wR(){var e=wP(["\n  ","\n  query FetchJobs($offset: Int, $limit: Int) {\n    jobs(offset: $offset, limit: $limit) {\n      results {\n        ...JobsPayload_ResultsFields\n      }\n      metadata {\n        total\n      }\n    }\n  }\n"]);return wR=function(){return e},e}var wj=n0(wR(),wL),wF=function(){var e=iF(),t=parseInt(e.get("page")||"1",10),n=parseInt(e.get("per")||"1000",10),r=ry(wj,{variables:{offset:(t-1)*n,limit:n},fetchPolicy:"network-only"}),i=r.data,a=r.loading,o=r.error;return a?l.createElement(ij,null):o?l.createElement(iN,{error:o}):i?l.createElement(wN,{jobs:i.jobs.results,page:t,pageSize:n,total:i.jobs.metadata.total}):null},wY=["refetch","reobserve","fetchMore","updateQuery","startPolling","subscribeToMore",];function wB(e,t){var n,r=(0,l.useRef)(),i=(0,l.useRef)(),a=(0,l.useRef)(),o=r.current?(0,ro.J)(t,r.current):t,s=null!==(n=null==o?void 0:o.query)&&void 0!==n?n:e;i.current=o,a.current=s;var u=rw(rp(t&&t.client),s),c=u.useQuery((0,n8.pi)((0,n8.pi)({},o),{skip:!r.current})),f=c.observable.options.initialFetchPolicy||u.getDefaultFetchPolicy(),d=Object.assign(c,{called:!!r.current}),h=(0,l.useMemo)(function(){for(var e={},t=function(t){var n=d[t];e[t]=function(){return r.current||(r.current=Object.create(null),u.forceUpdate()),n.apply(this,arguments)}},n=0,i=wY;n<i.length;n++)t(i[n]);return e},[]);return Object.assign(d,h),[(0,l.useCallback)(function(e){r.current=e?(0,n8.pi)((0,n8.pi)({},e),{fetchPolicy:e.fetchPolicy||f}):{fetchPolicy:f};var t=(0,ro.J)(i.current,(0,n8.pi)({query:a.current},r.current)),n=u.executeQuery((0,n8.pi)((0,n8.pi)({},t),{skip:!1})).then(function(e){return Object.assign(e,h)});return n.catch(function(){}),n},[]),d]}function wU(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function wH(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){wU(e,t,n[t])})}return e}function w$(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),n.push.apply(n,r)}return n}function wz(e,t){return t=null!=t?t:{},Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):w$(Object(t)).forEach(function(n){Object.defineProperty(e,n,Object.getOwnPropertyDescriptor(t,n))}),e}var wG=function(e){return e.errors.reduce(function(e,t){var n=t.path.replace(/^input\//,"");return wz(wH({},e),wU({},n,t.message))},{})},wW=n(23279),wK=n.n(wW),wV=by().shape({toml:p2().required("Required").test("toml","Invalid TOML",function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";try{return vO.parse(e),!0}catch(t){return!1}})}),wq=function(e){var t=e.initialValues,n=e.onSubmit,r=e.onTOMLChange;return l.createElement(hM,{initialValues:t,validationSchema:wV,onSubmit:n},function(e){var t=e.isSubmitting,n=e.values;return r&&r(n.toml),l.createElement(hj,{"data-testid":"job-form",noValidate:!0},l.createElement(d.Z,{container:!0,spacing:16},l.createElement(d.Z,{item:!0,xs:12},l.createElement(hR,{component:hJ,id:"toml",name:"toml",label:"Job Spec (TOML)",required:!0,fullWidth:!0,multiline:!0,rows:10,rowsMax:25,variant:"outlined",autoComplete:"off",FormHelperTextProps:{"data-testid":"toml-helper-text"}})),l.createElement(d.Z,{item:!0,xs:12,md:7},l.createElement(ox.default,{variant:"contained",color:"primary",type:"submit",disabled:t,size:"large"},"Create Job"))))})},wZ=n(50109),wX="persistSpec";function wJ(e){var t=e.query,n=new URLSearchParams(t).get("definition");return n?(wZ.t8(wX,n),{toml:n}):{toml:wZ.U2(wX)||""}}var wQ=function(e){var t=e.onSubmit,n=e.onTOMLChange,r=wJ({query:(0,h.TH)().search}),i=function(e){var t=e.replace(/[\u200B-\u200D\uFEFF]/g,"");wZ.t8("".concat(wX),t),n&&n(t)};return l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"New Job"}),l.createElement(aK.Z,null,l.createElement(wq,{initialValues:r,onSubmit:t,onTOMLChange:i})))};function w1(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function w0(e){if(Array.isArray(e))return e}function w2(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function w3(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function w4(e,t){return w0(e)||w2(e,t)||w5(e,t)||w3()}function w5(e,t){if(e){if("string"==typeof e)return w1(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return w1(e,t)}}var w6=function(e){var t=e.toml,n=w4(l.useState(""),2),r=n[0],i=n[1];return l.useEffect(function(){try{var e=vO.parse(t);e.observationSource?i(e.observationSource.trim()):i("")}catch(n){i("")}},[t]),l.createElement(yU,{observationSource:r})};function w9(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function w8(e){if(Array.isArray(e))return e}function w7(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function _e(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _t(e,t){return w8(e)||w7(e,t)||_n(e,t)||_e()}function _n(e,t){if(e){if("string"==typeof e)return w9(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return w9(e,t)}}var _r=function(e){var t=e.onSubmit,n=_t(l.useState(""),2),r=n[0],i=n[1],a=l.useCallback(function(e){return wK()(function(){return i(e)},500)()},[i]);return l.createElement(iv,null,l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12,md:8},l.createElement(wQ,{onSubmit:t,onTOMLChange:a})),l.createElement(d.Z,{item:!0,xs:12,md:4},l.createElement(w6,{toml:r}))))};function _i(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function _a(e){if(Array.isArray(e))return e}function _o(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function _s(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){_o(a,r,i,o,s,"next",e)}function s(e){_o(a,r,i,o,s,"throw",e)}o(void 0)})}}function _u(e,t){return null!=t&&"undefined"!=typeof Symbol&&t[Symbol.hasInstance]?!!t[Symbol.hasInstance](e):e instanceof t}function _c(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function _l(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _f(e,t){return _a(e)||_c(e,t)||_h(e,t)||_l()}function _d(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function _h(e,t){if(e){if("string"==typeof e)return _i(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return _i(e,t)}}var _p=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}};function _b(){var e=_d(["\n  mutation CreateJob($input: CreateJobInput!) {\n    createJob(input: $input) {\n      ... on CreateJobSuccess {\n        job {\n          id\n        }\n      }\n      ... on InputErrors {\n        errors {\n          path\n          message\n          code\n        }\n      }\n    }\n  }\n"]);return _b=function(){return e},e}var _m=n0(_b()),_g=function(e){var t=e.id;return l.createElement(l.Fragment,null,"Successfully created job"," ",l.createElement(tz,{id:"created-job",href:"/jobs/".concat(t)},t))},_v=function(){var e,t=(0,A.I0)(),n=oZ().handleMutationError,r=_f(os(_m),1)[0],i=_f(wB(wj,{variables:{offset:0,limit:1e3},fetchPolicy:"network-only"}),1)[0],a=(e=_s(function(e,a){var o,s,u,c,l,f,d,h,p,b,m,g,v,y,w;return _p(this,function(_){switch(_.label){case 0:return o=a.setErrors,[4,i()];case 1:s=_.sent(),_.label=2;case 2:return _.trys.push([2,4,,6]),[4,r(((l={}).variables={input:{TOML:e.toml}},l))];case 3:switch(f=null===(u=(c=_.sent()).data)||void 0===u?void 0:u.createJob,d={},null==f?void 0:f.__typename){case"CreateJobSuccess":t((0,ty.t5)(_g,(d.id=f.job.id,d)));break;case"InputErrors":t((0,ty.LO)("Invalid Input")),o(wG(f))}return[3,6];case 4:return h=_.sent(),[4,i()];case 5:return v=_.sent(),y=null===(p=s.data)||void 0===p?void 0:null===(b=p.jobs)||void 0===b?void 0:b.results,w=null===(m=v.data)||void 0===m?void 0:null===(g=m.jobs)||void 0===g?void 0:g.results,y&&w&&y.length<w.length&&_u(h,ru.cA)?t((0,ty.LO)("Job successfully created but could not start service: "+h.message)):n(h),[3,6];case 6:return[2]}})}),function(t,n){return e.apply(this,arguments)});return l.createElement(_r,{onSubmit:a})},_y=function(){var e=(0,h.$B)().path;return l.createElement(h.rs,null,l.createElement(h.AW,{path:"".concat(e,"/new")},l.createElement(_v,null)),l.createElement(h.AW,{path:"".concat(e,"/:id")},l.createElement(ww,null)),l.createElement(h.AW,{exact:!0,path:e},l.createElement(wF,null)))},_w=n(83173);function __(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function _E(e){if(Array.isArray(e))return e}function _S(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function _k(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _x(e,t){return _E(e)||_S(e,t)||_T(e,t)||_k()}function _T(e,t){if(e){if("string"==typeof e)return __(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return __(e,t)}}var _M=function(e){return(0,b.createStyles)({button:{width:27,height:27,minHeight:27,marginLeft:e.spacing.unit,marginRight:e.spacing.unit},icon:{fontSize:18}})},_O=(0,b.withStyles)(_M)(function(e){var t=e.classes,n=e.data,r=_x(l.useState(!1),2),i=r[0],a=r[1];return l.createElement(ya.CopyToClipboard,{text:n,onCopy:function(){return a(!0)}},l.createElement(aE.Z,{title:"Copied!",open:i,onClose:function(){return a(!1)}},l.createElement(y.default,{className:t.button},l.createElement(_w.Z,{className:t.icon}))))});function _A(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=t.start,r=void 0===n?6:n,i=t.end,a=void 0===i?4:i;return e.substring(0,r)+"..."+e.substring(e.length-a)}function _L(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function _C(e){if(Array.isArray(e))return e}function _I(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function _D(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){_I(a,r,i,o,s,"next",e)}function s(e){_I(a,r,i,o,s,"throw",e)}o(void 0)})}}function _N(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function _P(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _R(e,t){return _C(e)||_N(e,t)||_j(e,t)||_P()}function _j(e,t){if(e){if("string"==typeof e)return _L(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return _L(e,t)}}var _F=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}},_Y=function(e){return(0,b.createStyles)({container:{backgroundColor:e.palette.common.white,padding:5*e.spacing.unit,paddingBottom:0},chainId:{overflow:"hidden",textOverflow:"ellipsis"},badgePadding:{paddingLeft:2*e.spacing.unit,paddingRight:2*e.spacing.unit,marginLeft:-2*e.spacing.unit,marginRight:-2*e.spacing.unit,lineHeight:"1rem"},dialogPaper:{minHeight:"360px",maxHeight:"360px",minWidth:"670px",maxWidth:"670px",overflow:"hidden",borderRadius:3*e.spacing.unit},warningText:{fontWeight:500,marginLeft:3*e.spacing.unit,marginTop:3*e.spacing.unit,marginBottom:e.spacing.unit},closeButton:{marginRight:3*e.spacing.unit,marginTop:3*e.spacing.unit},infoText:{fontSize:2*e.spacing.unit,fontWeight:450,marginLeft:6*e.spacing.unit},modalContent:{width:"inherit"},deleteButton:{marginTop:4*e.spacing.unit},runJobButton:{marginBottom:3*e.spacing.unit},runJobModalContent:{overflow:"hidden"}})};function _B(e){var t,n=e.evmChainID,r=e.address,i=e.nextNonce,a={evmChainID:n,address:r,nextNonce:i,abandon:e.abandon,enabled:e.enabled};return iW.v2.evmKeys.chain(a)}var _U=function(){return l.createElement(l.Fragment,null,"Successfully updated EVM key")},_H=function(e){var t=e.classes,n=e.ethKey,r=e.refetch,i=(0,A.I0)(),a=_R((0,l.useState)(!1),2),o=a[0],s=a[1],u=_R((0,l.useState)(!n.isDisabled),2),c=u[0],f=u[1],h=_R((0,l.useState)(null),2),p=h[0],b=h[1],m=_R((0,l.useState)(!1),2),g=m[0],v=m[1],y=function(e){e.preventDefault(),k(p,g,c)},w=function(){f(!c)},_=function(e){b(e.target.value)},E=function(){v(!g)},S=function(){s(!1),v(!1),b(null),f(!n.isDisabled)};function k(e,t,n){return T.apply(this,arguments)}function T(){return(T=_D(function(e,t,a){var o;return _F(this,function(s){return _B(((o={}).evmChainID=n.chain.id,o.address=n.address,o.nextNonce=e,o.abandon=t,o.enabled=a,o)).then(function(e){var t=e.data;r&&r(),S(),i((0,ty.t5)(_U,t))}).catch(function(e){r&&r(),S(),i((0,ty.cB)(aP,e))}),[2]})})).apply(this,arguments)}return l.createElement(l.Fragment,null,l.createElement(aN.Z,{open:o,classes:{paper:t.dialogPaper},onClose:S,"aria-labelledby":"modal-modal-title","aria-describedby":"modal-modal-description"},l.createElement("form",{onSubmit:y},l.createElement(d.Z,{container:!0,spacing:0},l.createElement(d.Z,{item:!0,className:t.modalContent},l.createElement(d.Z,{container:!0,alignItems:"baseline",justify:"space-between"},l.createElement(d.Z,{item:!0},l.createElement(x.default,{variant:"h5",color:"secondary",className:t.warningText},"Key Admin Override"),l.createElement(x.default,{variant:"h6",color:"secondary",className:t.warningText},"Modifying key ",n.address," for chain ",n.chain.id)),l.createElement(d.Z,{item:!0},l.createElement(aD,{className:t.closeButton,onClick:S}))),l.createElement(d.Z,{container:!0,direction:"column"},l.createElement(b7.default,null,l.createElement(hG.Z,{className:t.infoText,color:"secondary",control:l.createElement(hz.Z,{name:"enabledCheckbox",checked:c,onChange:w}),label:"Enabled"})),l.createElement(b7.default,null,l.createElement(hG.Z,{className:t.infoText,color:"secondary",control:l.createElement(i_.Z,{name:"nextNonceField",type:"number",onChange:_}),label:"Next nonce manual override (optional)"})),l.createElement(b7.default,null,l.createElement(hG.Z,{className:t.infoText,color:"secondary",control:l.createElement(hz.Z,{name:"abandonCheckbox",checked:g,onChange:E}),label:"Abandon all current transactions (use with caution!)"})),l.createElement(d.Z,{container:!0,spacing:0,alignItems:"center",justify:"center"},l.createElement(d.Z,{item:!0,className:t.deleteButton},l.createElement(aL.Z,{variant:"danger",type:"submit"},"Update")))))))),l.createElement(ii.Z,{hover:!0},l.createElement(ie.default,null,l.createElement(x.default,{variant:"body1"},_A(n.address,{start:6,end:6})," ",l.createElement(_O,{data:n.address}))),l.createElement(ie.default,null,l.createElement(x.default,{variant:"body1"},n.chain.id)),l.createElement(ie.default,null,l.createElement(x.default,{variant:"body1"},n.isDisabled?"Disabled":"Enabled")),l.createElement(ie.default,null,l.createElement(x.default,{variant:"body1"},n.linkBalance&&gD(n.linkBalance))),l.createElement(ie.default,null,l.createElement(x.default,{variant:"body1"},n.ethBalance)),l.createElement(ie.default,null,l.createElement(x.default,{variant:"body1"},l.createElement(aA,{tooltip:!0},n.createdAt))),l.createElement(ie.default,null,l.createElement(x.default,{variant:"body1"},l.createElement(aL.Z,{onClick:function(){return s(!0)}},"Admin")))))},_$=(0,b.withStyles)(_Y)(_H),_z=function(e){var t,n,r=e.data,i=e.errorMsg,a=e.loading,o=e.refetch;return l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"EVM Chain Accounts"}),l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,"Address"),l.createElement(ie.default,null,"Chain ID"),l.createElement(ie.default,null,"Enabled"),l.createElement(ie.default,null,"LINK Balance"),l.createElement(ie.default,null,"Native Token Balance"),l.createElement(ie.default,null,"Created"),l.createElement(ie.default,null,"Actions"))),l.createElement(r7.Z,null,l.createElement(gW,{visible:a}),l.createElement(gK,{visible:(null===(t=null==r?void 0:r.ethKeys.results)||void 0===t?void 0:t.length)===0}),l.createElement(gz,{msg:i}),null===(n=null==r?void 0:r.ethKeys.results)||void 0===n?void 0:n.map(function(e,t){return l.createElement(_$,{ethKey:e,key:t,refetch:o})}))))};function _G(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function _W(){var e=_G(["\n  fragment ETHKeysPayload_ResultsFields on EthKey {\n    address\n    chain {\n      id\n    }\n    createdAt\n    ethBalance\n    isDisabled\n    linkBalance\n  }\n"]);return _W=function(){return e},e}function _K(){var e=_G(["\n  ","\n  query FetchETHKeys {\n    ethKeys {\n      results {\n        ...ETHKeysPayload_ResultsFields\n      }\n    }\n  }\n"]);return _K=function(){return e},e}var _V=n0(_W()),_q=n0(_K(),_V),_Z=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return ry(_q,e)},_X=function(){var e=_Z({fetchPolicy:"cache-and-network"}),t=e.data,n=e.loading,r=e.error,i=e.refetch;return l.createElement(_z,{loading:n,data:t,errorMsg:null==r?void 0:r.message,refetch:i})},_J=function(e){var t=e.csaKey;return l.createElement(ii.Z,{hover:!0},l.createElement(ie.default,null,l.createElement(x.default,{variant:"body1"},t.publicKey," ",l.createElement(_O,{data:t.publicKey}))))};function _Q(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function _1(){var e=_Q(["\n  fragment CSAKeysPayload_ResultsFields on CSAKey {\n    id\n    publicKey\n  }\n"]);return _1=function(){return e},e}var _0=n0(_1()),_2=function(e){var t,n,r,i=e.data,a=e.errorMsg,o=e.loading,s=e.onCreate;return l.createElement(r9.Z,null,l.createElement(sf.Z,{action:(null===(t=null==i?void 0:i.csaKeys.results)||void 0===t?void 0:t.length)===0&&l.createElement(ox.default,{variant:"outlined",color:"primary",onClick:s},"New CSA Key"),title:"CSA Key",subheader:"Manage your CSA Key"}),l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,"Public Key"))),l.createElement(r7.Z,null,l.createElement(gW,{visible:o}),l.createElement(gK,{visible:(null===(n=null==i?void 0:i.csaKeys.results)||void 0===n?void 0:n.length)===0}),l.createElement(gz,{msg:a}),null===(r=null==i?void 0:i.csaKeys.results)||void 0===r?void 0:r.map(function(e,t){return l.createElement(_J,{csaKey:e,key:t})}))))};function _3(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function _4(e){if(Array.isArray(e))return e}function _5(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function _6(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){_5(a,r,i,o,s,"next",e)}function s(e){_5(a,r,i,o,s,"throw",e)}o(void 0)})}}function _9(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function _8(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _7(e,t){return _4(e)||_9(e,t)||Et(e,t)||_8()}function Ee(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function Et(e,t){if(e){if("string"==typeof e)return _3(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return _3(e,t)}}var En=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}};function Er(){var e=Ee(["\n  ","\n  query FetchCSAKeys {\n    csaKeys {\n      results {\n        ...CSAKeysPayload_ResultsFields\n      }\n    }\n  }\n"]);return Er=function(){return e},e}function Ei(){var e=Ee(["\n  mutation CreateCSAKey {\n    createCSAKey {\n      ... on CreateCSAKeySuccess {\n        csaKey {\n          id\n        }\n      }\n      ... on CSAKeyExistsError {\n        message\n      }\n    }\n  }\n"]);return Ei=function(){return e},e}var Ea=n0(Er(),_0),Eo=n0(Ei()),Es=function(){var e,t=(0,A.I0)(),n=oZ().handleMutationError,r=ry(Ea,{fetchPolicy:"network-only"}),i=r.data,a=r.loading,o=r.error,s=r.refetch,u=_7(os(Eo),1)[0],c=(e=_6(function(){var e,r,i,a;return En(this,function(o){switch(o.label){case 0:return o.trys.push([0,2,,3]),[4,u()];case 1:return(null==(i=null===(e=(r=o.sent()).data)||void 0===e?void 0:e.createCSAKey)?void 0:i.__typename)==="CreateCSAKeySuccess"&&(t((0,ty.qt)("CSA Key created")),s()),[3,3];case 2:return n(a=o.sent()),[3,3];case 3:return[2]}})}),function(){return e.apply(this,arguments)});return l.createElement(_2,{loading:a,data:i,errorMsg:null==o?void 0:o.message,onCreate:c})},Eu=function(e){var t=e.keyType,n=e.keyValue;return(0,ty.qt)("Successfully created ".concat(t,": ").concat(n))},Ec=function(e){var t=e.keyType;return(0,ty.qt)("Successfully deleted ".concat(t," Key"))},El=n(10632),Ef=n(90338),Ed=n(34064),Eh=function(e){return(0,b.createStyles)({listItemPrimary:{marginBottom:e.spacing.unit},listItemSecondary:{color:e.palette.grey[600]},avatar:{backgroundColor:e.palette.primary.main}})},Ep=(0,b.withStyles)(Eh)(function(e){var t=e.classes,n=e.primary,r=e.secondary;return l.createElement(w.default,{dense:!0},l.createElement(_.default,null,l.createElement(ol.Z,null,l.createElement(Ef.Z,{className:t.avatar},l.createElement(Ed.Z,null))),l.createElement(E.Z,{primary:l.createElement(x.default,{className:t.listItemPrimary,variant:"body1",component:"span"},n),secondary:r.map(function(e,n){return l.createElement(x.default,{key:n,className:t.listItemSecondary,variant:"subtitle2",component:"span"},e)})})))}),Eb=function(e){var t=e.bundle,n=e.onDelete;return l.createElement(ii.Z,{hover:!0},l.createElement(ie.default,null,l.createElement(Ep,{primary:l.createElement("b",null,"Key ID: ",t.id," ",l.createElement(_O,{data:t.id})),secondary:[l.createElement(l.Fragment,null,"Config Public Key: ",t.configPublicKey),l.createElement(l.Fragment,null,"Signing Address: ",t.onChainSigningAddress),l.createElement(l.Fragment,null,"Off-Chain Public Key: ",t.offChainPublicKey),]})),l.createElement(ie.default,{align:"right"},l.createElement(aL.Z,{onClick:n,variant:"danger",size:"medium"},"Delete")))};function Em(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function Eg(e){if(Array.isArray(e))return e}function Ev(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function Ey(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){Ev(a,r,i,o,s,"next",e)}function s(e){Ev(a,r,i,o,s,"throw",e)}o(void 0)})}}function Ew(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function E_(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function EE(e,t){return Eg(e)||Ew(e,t)||ES(e,t)||E_()}function ES(e,t){if(e){if("string"==typeof e)return Em(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return Em(e,t)}}var Ek=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}},Ex=function(e){var t,n,r=e.data,i=e.errorMsg,a=e.loading,o=e.onCreate,s=e.onDelete,u=EE(l.useState(null),2),c=u[0],f=u[1];return l.createElement(l.Fragment,null,l.createElement(r9.Z,null,l.createElement(sf.Z,{action:l.createElement(ox.default,{variant:"outlined",color:"primary",onClick:o},"New OCR Key"),title:"Off-Chain Reporting Keys",subheader:"Manage your Off-Chain Reporting Key Bundles"}),l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,"Key Bundle"),l.createElement(ie.default,{align:"right"}))),l.createElement(r7.Z,null,l.createElement(gW,{visible:a}),l.createElement(gK,{visible:(null===(t=null==r?void 0:r.ocrKeyBundles.results)||void 0===t?void 0:t.length)===0}),l.createElement(gz,{msg:i}),null===(n=null==r?void 0:r.ocrKeyBundles.results)||void 0===n?void 0:n.map(function(e,t){return l.createElement(Eb,{bundle:e,key:t,onDelete:function(){return f(e.id)}})})))),l.createElement(oI,{open:!!c,maxWidth:!1,title:"Delete OCR Key Bundle",body:l.createElement(El.Z,{label:c}),confirmButtonText:"Confirm",onConfirm:Ey(function(){return Ek(this,function(e){switch(e.label){case 0:if(!c)return[3,2];return[4,s(c)];case 1:e.sent(),f(null),e.label=2;case 2:return[2]}})}),cancelButtonText:"Cancel",onCancel:function(){return f(null)}}))};function ET(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function EM(){var e=ET(["\n  fragment OCRKeyBundlesPayload_ResultsFields on OCRKeyBundle {\n    id\n    configPublicKey\n    offChainPublicKey\n    onChainSigningAddress\n  }\n"]);return EM=function(){return e},e}function EO(){var e=ET(["\n  ","\n  query FetchOCRKeyBundles {\n    ocrKeyBundles {\n      results {\n        ...OCRKeyBundlesPayload_ResultsFields\n      }\n    }\n  }\n"]);return EO=function(){return e},e}var EA=n0(EM()),EL=n0(EO(),EA),EC=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return ry(EL,e)};function EI(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function ED(e){if(Array.isArray(e))return e}function EN(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function EP(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){EN(a,r,i,o,s,"next",e)}function s(e){EN(a,r,i,o,s,"throw",e)}o(void 0)})}}function ER(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function Ej(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function EF(e,t){return ED(e)||ER(e,t)||EB(e,t)||Ej()}function EY(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function EB(e,t){if(e){if("string"==typeof e)return EI(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return EI(e,t)}}var EU=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}};function EH(){var e=EY(["\n  mutation CreateOCRKeyBundle {\n    createOCRKeyBundle {\n      ... on CreateOCRKeyBundleSuccess {\n        bundle {\n          id\n        }\n      }\n    }\n  }\n"]);return EH=function(){return e},e}function E$(){var e=EY(["\n  mutation DeleteOCRKeyBundle($id: ID!) {\n    deleteOCRKeyBundle(id: $id) {\n      ... on DeleteOCRKeyBundleSuccess {\n        bundle {\n          id\n        }\n      }\n    }\n  }\n"]);return E$=function(){return e},e}var Ez=n0(EH()),EG=n0(E$()),EW=function(){var e,t,n=(0,A.I0)(),r=oZ().handleMutationError,i=EC({fetchPolicy:"network-only"}),a=i.data,o=i.loading,s=i.error,u=i.refetch,c=EF(os(Ez),1)[0],f=EF(os(EG),1)[0],d=(e=EP(function(){var e,t,i,a,o;return EU(this,function(s){switch(s.label){case 0:return s.trys.push([0,2,,3]),[4,c()];case 1:return i=null===(e=(t=s.sent()).data)||void 0===e?void 0:e.createOCRKeyBundle,a={},(null==i?void 0:i.__typename)==="CreateOCRKeyBundleSuccess"&&(n(Eu((a.keyType="Off-ChainReporting Key Bundle",a.keyValue=i.bundle.id,a))),u()),[3,3];case 2:return r(o=s.sent()),[3,3];case 3:return[2]}})}),function(){return e.apply(this,arguments)}),h=(t=EP(function(e){var t,i,a,o,s,c;return EU(this,function(l){switch(l.label){case 0:return l.trys.push([0,2,,3]),[4,f(((a={}).variables={id:e},a))];case 1:return o=null===(t=(i=l.sent()).data)||void 0===t?void 0:t.deleteOCRKeyBundle,s={},(null==o?void 0:o.__typename)==="DeleteOCRKeyBundleSuccess"&&(n(Ec((s.keyType="Off-ChainReporting Key Bundle",s))),u()),[3,3];case 2:return r(c=l.sent()),[3,3];case 3:return[2]}})}),function(e){return t.apply(this,arguments)});return l.createElement(Ex,{loading:o,data:a,errorMsg:null==s?void 0:s.message,onCreate:d,onDelete:h})},EK=function(e){var t=e.bundle,n=e.onDelete;return l.createElement(ii.Z,{hover:!0},l.createElement(ie.default,null,l.createElement(Ep,{primary:l.createElement("b",null,"Key ID: ",t.id," ",l.createElement(_O,{data:t.id})),secondary:[l.createElement(l.Fragment,null,"Chain Type: ",t.chainType),l.createElement(l.Fragment,null,"Config Public Key: ",t.configPublicKey),l.createElement(l.Fragment,null,"On-Chain Public Key: ",t.onChainPublicKey),l.createElement(l.Fragment,null,"Off-Chain Public Key: ",t.offChainPublicKey),]})),l.createElement(ie.default,{align:"right"},l.createElement(aL.Z,{onClick:n,variant:"danger",size:"medium"},"Delete")))};function EV(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function Eq(){var e=EV(["\n  fragment OCR2KeyBundlesPayload_ResultsFields on OCR2KeyBundle {\n    id\n    chainType\n    configPublicKey\n    onChainPublicKey\n    offChainPublicKey\n  }\n"]);return Eq=function(){return e},e}function EZ(){var e=EV(["\n  ","\n  query FetchOCR2KeyBundles {\n    ocr2KeyBundles {\n      results {\n        ...OCR2KeyBundlesPayload_ResultsFields\n      }\n    }\n  }\n"]);return EZ=function(){return e},e}function EX(){var e=EV(["\n  mutation DeleteOCR2KeyBundle($id: ID!) {\n    deleteOCR2KeyBundle(id: $id) {\n      ... on DeleteOCR2KeyBundleSuccess {\n        bundle {\n          id\n        }\n      }\n    }\n  }\n"]);return EX=function(){return e},e}function EJ(){var e=EV(["\n  mutation createOCR2KeyBundle($chainType: OCR2ChainType!) {\n    createOCR2KeyBundle(chainType: $chainType) {\n      ... on CreateOCR2KeyBundleSuccess {\n        bundle {\n          chainType\n          configPublicKey\n          id\n          offChainPublicKey\n          onChainPublicKey\n        }\n      }\n    }\n  }\n"]);return EJ=function(){return e},e}function EQ(){var e=EV(['\n  query GetChainFamily {\n    __type(name: "OCR2ChainType") {\n      enumValues {\n        name\n      }\n    }\n  }\n']);return EQ=function(){return e},e}var E1=n0(Eq()),E0=n0(EZ(),E1),E2=n0(EX()),E3=n0(EJ()),E4=n0(EQ()),E5=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return ry(E0,e)},E6=function(){return os(E2)},E9=function(){return os(E3)},E8=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return ry(E4,e)};function E7(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function Se(e){if(Array.isArray(e))return e}function St(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function Sn(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function Sr(e,t){return Se(e)||St(e,t)||Si(e,t)||Sn()}function Si(e,t){if(e){if("string"==typeof e)return E7(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return E7(e,t)}}var Sa=function(e){var t=e.showCreateKeyDialog,n=e.setToggleCreateKeyDialog,r=e.onCreate,i=Sr(l.useState(void 0),2),a=i[0],o=i[1],s=E8(),u=s.loading,c=s.error,f=s.data;if(u||c)return l.createElement("div",null);var d=function(e){o(e.target.value)},h=function(){n(!1),void 0!=a&&r(a)},p=null==f?void 0:f.__type.enumValues.map(function(e){return e.name});return a||o(p[0]),l.createElement(oI,{open:t,maxWidth:!1,title:"Create OCR2 Key Bundle",body:l.createElement(i_.Z,{id:"ocr2-create-key",name:"ocr2 create key",fullWidth:!0,select:!0,label:"Chain type",value:a,onChange:d,helperText:"Create OCR2 Key bundle"},null==p?void 0:p.map(function(e){return l.createElement(tE.default,{key:e,value:e,name:e},e)})),confirmButtonText:"Create",confirmButtonEnabled:!a,onConfirm:h,cancelButtonText:"Cancel",onCancel:function(){return n(!1)}})};function So(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function Ss(e){if(Array.isArray(e))return e}function Su(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function Sc(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){Su(a,r,i,o,s,"next",e)}function s(e){Su(a,r,i,o,s,"throw",e)}o(void 0)})}}function Sl(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function Sf(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function Sd(e,t){return Ss(e)||Sl(e,t)||Sh(e,t)||Sf()}function Sh(e,t){if(e){if("string"==typeof e)return So(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return So(e,t)}}var Sp=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}},Sb=function(e){var t,n,r=e.data,i=e.loading,a=e.onDelete,o=e.onCreate,s=Sd(l.useState(null),2),u=s[0],c=s[1],f=Sd(l.useState(!1),2),d=f[0],h=f[1];return l.createElement(l.Fragment,null,l.createElement(r9.Z,null,l.createElement(sf.Z,{action:l.createElement(ox.default,{variant:"outlined",color:"primary",onClick:function(){return h(!0)}},"New OCR2 Key"),title:"Off-Chain Reporting 2 Keys",subheader:"Manage your Off-Chain Reporting 2 Key Bundles"}),l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,"Key Bundle"),l.createElement(ie.default,{align:"right"}))),l.createElement(r7.Z,null,l.createElement(gW,{visible:i}),l.createElement(gK,{visible:(null===(t=null==r?void 0:r.ocr2KeyBundles.results)||void 0===t?void 0:t.length)===0}),null===(n=null==r?void 0:r.ocr2KeyBundles.results)||void 0===n?void 0:n.map(function(e,t){return l.createElement(EK,{bundle:e,key:t,onDelete:function(){return c(e.id)}})})))),l.createElement(oI,{open:!!u,maxWidth:!1,title:"Delete OCR2 Key Bundle",body:l.createElement(El.Z,{label:u}),confirmButtonText:"Confirm",onConfirm:Sc(function(){return Sp(this,function(e){switch(e.label){case 0:if(!u)return[3,2];return[4,a(u)];case 1:e.sent(),c(null),e.label=2;case 2:return[2]}})}),cancelButtonText:"Cancel",onCancel:function(){return c(null)}}),l.createElement(Sa,{onCreate:o,showCreateKeyDialog:d,setToggleCreateKeyDialog:h}))};function Sm(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function Sg(e){if(Array.isArray(e))return e}function Sv(e,t){return null!=t&&"undefined"!=typeof Symbol&&t[Symbol.hasInstance]?!!t[Symbol.hasInstance](e):e instanceof t}function Sy(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function Sw(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function S_(e,t){return Sg(e)||Sy(e,t)||SE(e,t)||Sw()}function SE(e,t){if(e){if("string"==typeof e)return Sm(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return Sm(e,t)}}var SS=function(){var e=S_(l.useState(),2),t=e[0],n=e[1],r=(0,h.k6)(),i=(0,A.I0)();return l.useEffect(function(){if(t){if(Sv(t,ru.cA)){var e=!0,n=!1,a=void 0;try{for(var o,s=t.graphQLErrors[Symbol.iterator]();!(e=(o=s.next()).done);e=!0){var u,c=o.value;if((null===(u=c.extensions)||void 0===u?void 0:u.code)=="UNAUTHORIZED"){i((0,ty.LO)("Unauthorized, please log in with proper credentials")),i((0,ty.Jc)()),r.push("/signin");return}}}catch(l){n=!0,a=l}finally{try{e||null==s.return||s.return()}finally{if(n)throw a}}}i((0,ty.LO)(t.message||"An error occurred"))}},[i,t,r]),{handleQueryError:n}};function Sk(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function Sx(e){if(Array.isArray(e))return e}function ST(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function SM(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){ST(a,r,i,o,s,"next",e)}function s(e){ST(a,r,i,o,s,"throw",e)}o(void 0)})}}function SO(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function SA(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function SL(e,t){return Sx(e)||SO(e,t)||SC(e,t)||SA()}function SC(e,t){if(e){if("string"==typeof e)return Sk(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return Sk(e,t)}}var SI=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}},SD=function(){var e,t,n=(0,A.I0)(),r=SS().handleQueryError,i=E5({fetchPolicy:"network-only",onError:r}),a=i.data,o=i.loading,s=i.refetch,u=SL(E6(),1)[0],c=SL(E9(),1)[0],f=(e=SM(function(e){var t,i,a,o,c,l;return SI(this,function(f){switch(f.label){case 0:return f.trys.push([0,2,,3]),[4,u(((a={}).variables={id:e},a))];case 1:return o=null===(t=(i=f.sent()).data)||void 0===t?void 0:t.deleteOCR2KeyBundle,c={},(null==o?void 0:o.__typename)==="DeleteOCR2KeyBundleSuccess"&&(n(Ec((c.keyType="Off-ChainReporting Key Bundle",c))),s()),[3,3];case 2:return r(l=f.sent()),[3,3];case 3:return[2]}})}),function(t){return e.apply(this,arguments)}),d=(t=SM(function(e){var t,i,a,o,u;return SI(this,function(l){switch(l.label){case 0:return l.trys.push([0,2,,3]),[4,c(((a={}).variables={chainType:e},a))];case 1:return(null==(o=null===(t=(i=l.sent()).data)||void 0===t?void 0:t.createOCR2KeyBundle)?void 0:o.__typename)==="CreateOCR2KeyBundleSuccess"&&(n((0,ty.qt)(e+" OCR2 key bundle created")),s()),[3,3];case 2:return r(u=l.sent()),[3,3];case 3:return[2]}})}),function(e){return t.apply(this,arguments)});return l.createElement(Sb,{loading:o,data:a,onDelete:f,onCreate:d})},SN=function(e){return(0,b.createStyles)({cardContent:{padding:0,"&:last-child":{padding:0}},avatar:{backgroundColor:e.palette.grey[800]}})},SP=(0,b.withStyles)(SN)(function(e){var t=e.classes,n=e.p2pKey,r=e.onDelete;return l.createElement(ii.Z,{hover:!0},l.createElement(ie.default,null,l.createElement(Ep,{classes:{avatar:t.avatar},primary:l.createElement("b",null,"Peer ID: ",n.peerID," ",l.createElement(_O,{data:n.peerID})),secondary:[l.createElement(l.Fragment,null,"Public Key: ",n.publicKey)]})),l.createElement(ie.default,{align:"right"},l.createElement(aL.Z,{onClick:r,variant:"danger",size:"medium"},"Delete")))});function SR(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function Sj(e){if(Array.isArray(e))return e}function SF(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function SY(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){SF(a,r,i,o,s,"next",e)}function s(e){SF(a,r,i,o,s,"throw",e)}o(void 0)})}}function SB(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function SU(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function SH(e,t){return Sj(e)||SB(e,t)||S$(e,t)||SU()}function S$(e,t){if(e){if("string"==typeof e)return SR(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return SR(e,t)}}var Sz=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}},SG=function(e){var t,n,r=e.data,i=e.errorMsg,a=e.loading,o=e.onCreate,s=e.onDelete,u=SH(l.useState(null),2),c=u[0],f=u[1];return l.createElement(l.Fragment,null,l.createElement(r9.Z,null,l.createElement(sf.Z,{action:l.createElement(ox.default,{variant:"outlined",color:"primary",onClick:o},"New P2P Key"),title:"P2P Keys",subheader:"Manage your P2P Key Bundles"}),l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,"Key Bundle"),l.createElement(ie.default,{align:"right"}))),l.createElement(r7.Z,null,l.createElement(gW,{visible:a}),l.createElement(gK,{visible:(null===(t=null==r?void 0:r.p2pKeys.results)||void 0===t?void 0:t.length)===0}),l.createElement(gz,{msg:i}),null===(n=null==r?void 0:r.p2pKeys.results)||void 0===n?void 0:n.map(function(e,t){return l.createElement(SP,{p2pKey:e,key:t,onDelete:function(){return f(e.id)}})})))),l.createElement(oI,{open:!!c,maxWidth:!1,title:"Delete OCR Key Bundle",body:l.createElement(El.Z,{label:c}),confirmButtonText:"Confirm",onConfirm:SY(function(){return Sz(this,function(e){switch(e.label){case 0:if(!c)return[3,2];return[4,s(c)];case 1:e.sent(),f(null),e.label=2;case 2:return[2]}})}),cancelButtonText:"Cancel",onCancel:function(){return f(null)}}))};function SW(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function SK(){var e=SW(["\n  fragment P2PKeysPayload_ResultsFields on P2PKey {\n    id\n    peerID\n    publicKey\n  }\n"]);return SK=function(){return e},e}function SV(){var e=SW(["\n  ","\n  query FetchP2PKeys {\n    p2pKeys {\n      results {\n        ...P2PKeysPayload_ResultsFields\n      }\n    }\n  }\n"]);return SV=function(){return e},e}var Sq=n0(SK()),SZ=n0(SV(),Sq),SX=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return ry(SZ,e)};function SJ(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function SQ(e){if(Array.isArray(e))return e}function S1(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function S0(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){S1(a,r,i,o,s,"next",e)}function s(e){S1(a,r,i,o,s,"throw",e)}o(void 0)})}}function S2(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function S3(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function S4(e,t){return SQ(e)||S2(e,t)||S6(e,t)||S3()}function S5(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function S6(e,t){if(e){if("string"==typeof e)return SJ(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return SJ(e,t)}}var S9=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}};function S8(){var e=S5(["\n  ","\n  mutation CreateP2PKey {\n    createP2PKey {\n      ... on CreateP2PKeySuccess {\n        p2pKey {\n          ...P2PKeysPayload_ResultsFields\n        }\n      }\n    }\n  }\n"]);return S8=function(){return e},e}function S7(){var e=S5(["\n  ","\n  mutation DeleteP2PKey($id: ID!) {\n    deleteP2PKey(id: $id) {\n      ... on DeleteP2PKeySuccess {\n        p2pKey {\n          ...P2PKeysPayload_ResultsFields\n        }\n      }\n    }\n  }\n"]);return S7=function(){return e},e}var ke=n0(S8(),Sq),kt=n0(S7(),Sq),kn=function(){var e,t,n=(0,A.I0)(),r=oZ().handleMutationError,i=SX(),a=i.data,o=i.loading,s=i.error,u=i.refetch,c=S4(os(ke),1)[0],f=S4(os(kt),1)[0],d=(e=S0(function(){var e,t,i,a,o;return S9(this,function(s){switch(s.label){case 0:return s.trys.push([0,2,,3]),[4,c()];case 1:return i=null===(e=(t=s.sent()).data)||void 0===e?void 0:e.createP2PKey,a={},(null==i?void 0:i.__typename)==="CreateP2PKeySuccess"&&(n(Eu((a.keyType="P2P Key",a.keyValue=i.p2pKey.id,a))),u()),[3,3];case 2:return r(o=s.sent()),[3,3];case 3:return[2]}})}),function(){return e.apply(this,arguments)}),h=(t=S0(function(e){var t,i,a,o,s,c;return S9(this,function(l){switch(l.label){case 0:return l.trys.push([0,2,,3]),[4,f(((a={}).variables={id:e},a))];case 1:return o=null===(t=(i=l.sent()).data)||void 0===t?void 0:t.deleteP2PKey,s={},(null==o?void 0:o.__typename)==="DeleteP2PKeySuccess"&&(n(Ec((s.keyType="P2P",s))),u()),[3,3];case 2:return r(c=l.sent()),[3,3];case 3:return[2]}})}),function(e){return t.apply(this,arguments)});return l.createElement(SG,{loading:o,data:a,errorMsg:null==s?void 0:s.message,onCreate:d,onDelete:h})},kr=function(e){var t=e.isCSAKeysFeatureEnabled;return l.createElement(iv,null,l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12},l.createElement(EW,null)),l.createElement(d.Z,{item:!0,xs:12},l.createElement(SD,null)),l.createElement(d.Z,{item:!0,xs:12},l.createElement(kn,null)),l.createElement(d.Z,{item:!0,xs:12},l.createElement(_X,null)),l.createElement(d.Z,{item:!0,xs:12},t&&l.createElement(Es,null))))},ki=function(){var e=rC(i.CSA);return l.createElement(kr,{isCSAKeysFeatureEnabled:e})},ka=function(){return l.createElement(ki,null)},ko=function(e){var t=e.errors;return l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"Errors"}),l.createElement("ul",null,t.map(function(e,t){return l.createElement("li",{key:e+t},l.createElement(x.default,{variant:"body1"},e))})))},ks=function(e){var t=e.run;return l.createElement(op,null,l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12,sm:4,md:2},l.createElement(ob,{title:"ID"}),l.createElement(om,{value:t.id})),l.createElement(d.Z,{item:!0,xs:12,sm:4,md:6},l.createElement(ob,{title:"Job"}),l.createElement(ip,{href:"/jobs/".concat(t.job.id),color:"primary"},t.job.name)),l.createElement(d.Z,{item:!0,xs:12,sm:6,md:2},l.createElement(ob,{title:"Started"}),l.createElement(om,null,l.createElement(aA,{tooltip:!0},t.createdAt))),l.createElement(d.Z,{item:!0,xs:12,sm:6,md:2},l.createElement(ob,{title:"Finished"}),l.createElement(om,null,t.finishedAt?l.createElement(aA,{tooltip:!0},t.finishedAt):"--"))))};function ku(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var kc,kl=function(e){return(0,b.createStyles)({tabs:{marginTop:4*e.spacing.unit,marginBottom:2.5*e.spacing.unit,borderBottom:"1px solid ".concat(e.palette.grey["300"])},badge:{padding:"0 ".concat(2*e.spacing.unit,"px")}})};(kc=u||(u={}))[kc.Overview=0]="Overview",kc[kc.JSON=1]="JSON";var kf=(0,b.withStyles)(kl)(function(e){var t=e.classes,n=e.id,r=(0,h.TH)().pathname,i=l.useMemo(function(){var e;return ku(e={},u.Overview,"/runs/".concat(n)),ku(e,u.JSON,"/runs/".concat(n,"/json")),e},[n]);return l.createElement(vJ.Z,{value:r,className:t.tabs,indicatorColor:"primary"},l.createElement(v0,{label:"Overview",to:i[u.Overview],value:i[u.Overview]}),l.createElement(v0,{label:"JSON",to:i[u.JSON],value:i[u.JSON]}))}),kd=1e3,kh=60,kp=3600;function kb(e,t){if(""===e&&""===t)return"";var n=km(new Date(e),new Date(t));return kg(Math.floor(n/kp),Math.floor(n%kp/kh),Math.ceil(n%kp%kh))}function km(e,t){return t.getTime()/kd-e.getTime()/kd}function kg(e,t,n){return"".concat(e?"".concat(e,"h"):"").concat(t?"".concat(t,"m"):"").concat(n,"s")}var kv=function(e){var t=e.start,n=e.end,r=e.className;return l.createElement(x.default,{variant:"h6",className:r},kb(t,n))};function ky(e){return"string"!=typeof e?e:e.toLowerCase().replace(/_/g," ").replace(/(?:^|\s|-)\S/g,function(e){return e.toUpperCase()})}var kw,k_=function(e){return(0,b.createStyles)({cardContent:{display:"flex","&:last-child":{paddingBottom:2*e.spacing.unit}},completed:{backgroundColor:e.palette.success.light},errored:{backgroundColor:e.palette.error.light},running:{backgroundColor:e.palette.warning.light},body:{marginLeft:2*e.spacing.unit},statusText:{display:"inline-block",textTransform:"capitalize",color:e.palette.secondary.main},elapsedText:{color:e.typography.display1.color}})},kE=(0,b.withStyles)(k_)(function(e){var t=e.classes,n=e.status,r=e.startedAt,i=e.finishedAt,a=l.useMemo(function(){switch(n){case"COMPLETED":case"ERRORED":return i;case"RUNNING":return Date.now();default:return null}},[n,i]),o=t[n.toLowerCase()]||t.running;return l.createElement(r9.Z,null,l.createElement(aK.Z,{className:O()(t.cardContent,o)},l.createElement(g6,{width:64,status:n}),l.createElement("div",{className:t.body},l.createElement(x.default,{className:t.statusText,variant:"h5"},ky(n)),a&&l.createElement(kv,{start:r,end:a,className:t.elapsedText}))))});(kw=c||(c={})).UNKNOWN="UNKNOWN",kw.PENDING="PENDING",kw.ERROR="ERROR",kw.COMPLETE="COMPLETE";var kS=function(e){var t=e.status,n=e.width,r=e.height;switch(t){case c.COMPLETE:return l.createElement(g5,{width:n,height:r,"data-testid":"complete-run-icon"});case c.ERROR:return l.createElement(gZ,{width:n,height:r,"data-testid":"error-run-icon"});case c.PENDING:return l.createElement(g2,{width:n,height:r,"data-testid":"pending-run-icon"});default:return l.createElement(gQ,{width:n,height:r,"data-testid":"default-run-icon"})}};function kk(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function kx(e){if(Array.isArray(e))return e}function kT(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function kM(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function kO(e,t){return kx(e)||kT(e,t)||kA(e,t)||kM()}function kA(e,t){if(e){if("string"==typeof e)return kk(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return kk(e,t)}}var kL=function(e){return(0,b.createStyles)({root:{display:"flex",borderBottom:"1px solid rgba(0, 0, 0, 0.12);",padding:2*e.spacing.unit,"&:last-child":{borderBottom:"none"}},content:{flex:1,overflow:"auto",paddingLeft:2*e.spacing.unit},heading:{lineHeight:"".concat(5*e.spacing.unit,"px")},subheading:{color:e.palette.grey[500]},text:{marginBottom:e.spacing.unit,marginTop:e.spacing.unit},attributeKey:{fontWeight:e.typography.fontWeightLight}})},kC=(0,b.withStyles)(kL)(function(e){var t,n=e.attrs,r=e.classes,i=e.dotID,a=e.output,o=e.error,s=e.type;return t=o?c.ERROR:"null"==a?c.PENDING:c.COMPLETE,l.createElement("div",{className:r.root},l.createElement("div",null,l.createElement(kS,{status:t,width:40,height:40})),l.createElement("div",{className:r.content},l.createElement(x.default,{className:r.heading,variant:"h5"},i," ",l.createElement("small",{className:r.subheading},s)),[c.COMPLETE,c.ERROR].includes(t)&&l.createElement(x.default,{className:r.text,variant:"body1"},t===c.COMPLETE?a:o),n&&Object.entries(n).map(function(e){var t=kO(e,2),n=t[0],i=t[1];return"type"===n?null:l.createElement(x.default,{key:n,variant:"body1"},l.createElement("span",{className:r.attributeKey},n),": ",i)})))});function kI(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function kD(){return(kD=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}function kN(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){kI(e,t,n[t])})}return e}function kP(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),n.push.apply(n,r)}return n}function kR(e,t){return t=null!=t?t:{},Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):kP(Object(t)).forEach(function(n){Object.defineProperty(e,n,Object.getOwnPropertyDescriptor(t,n))}),e}var kj=function(e){var t=e.taskRuns,n=e.observationSource,r=l.useMemo(function(){return yw("digraph {".concat(n,"}")).map(function(e){var n=t.find(function(t){return t.dotID===e.id});if(n)return kR(kN({},n),{attrs:e.attributes})})},[n,t]);return l.createElement(r9.Z,null,r.map(function(e,t){return e?l.createElement(kC,kD({},e,{key:t})):null}))},kF=n(63731),kY=n.n(kF),kB=n(93379),kU=n.n(kB),kH=n(97362),k$=n.n(kH),kz={};kz.insert="head",kz.singleton=!1,kU()(k$(),kz),k$().locals;var kG=function(e){var t=e.object;return l.createElement("div",{dangerouslySetInnerHTML:{__html:kY()(t)},"data-testid":"pretty-json"})};function kW(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function kK(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){kW(e,t,n[t])})}return e}function kV(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),n.push.apply(n,r)}return n}function kq(e,t){return t=null!=t?t:{},Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):kV(Object(t)).forEach(function(n){Object.defineProperty(e,n,Object.getOwnPropertyDescriptor(t,n))}),e}function kZ(e,t){if(null==e)return{};var n,r,i=kX(e,t);if(Object.getOwnPropertySymbols){var a=Object.getOwnPropertySymbols(e);for(r=0;r<a.length;r++)n=a[r],!(t.indexOf(n)>=0)&&Object.prototype.propertyIsEnumerable.call(e,n)&&(i[n]=e[n])}return i}function kX(e,t){if(null==e)return{};var n,r,i={},a=Object.keys(e);for(r=0;r<a.length;r++)n=a[r],t.indexOf(n)>=0||(i[n]=e[n]);return i}var kJ=function(e){var t=e.run,n=l.useMemo(function(){var e=t.inputs,n=t.outputs,r=t.taskRuns,i=kZ(t,["inputs","outputs","taskRuns"]),a={};try{a=JSON.parse(e)}catch(o){a={}}return kq(kK({},i),{inputs:a,outputs:n,taskRuns:r})},[t]);return l.createElement(r9.Z,null,l.createElement(aK.Z,null,l.createElement(kG,{object:n})))};function kQ(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function k1(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){kQ(e,t,n[t])})}return e}function k0(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),n.push.apply(n,r)}return n}function k2(e,t){return t=null!=t?t:{},Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):k0(Object(t)).forEach(function(n){Object.defineProperty(e,n,Object.getOwnPropertyDescriptor(t,n))}),e}function k3(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function k4(){var e=k3(["\n  fragment JobRunPayload_TaskRunsFields on TaskRun {\n    id\n    createdAt\n    dotID\n    error\n    finishedAt\n    output\n    type\n  }\n"]);return k4=function(){return e},e}function k5(){var e=k3(["\n  ","\n  fragment JobRunPayload_Fields on JobRun {\n    id\n    allErrors\n    createdAt\n    fatalErrors\n    finishedAt\n    inputs\n    job {\n      id\n      name\n      observationSource\n    }\n    outputs\n    status\n    taskRuns {\n      ...JobRunPayload_TaskRunsFields\n    }\n  }\n"]);return k5=function(){return e},e}var k6=n0(k4()),k9=n0(k5(),k6),k8=function(e){var t=e.run,n=(0,h.$B)().path,r=t.taskRuns.reduce(function(e,t){var n;return n=t.error?c.ERROR:"null"==t.output?c.PENDING:c.COMPLETE,k2(k1({},e),kQ({},t.dotID,{status:n}))},{});return 0==t.allErrors.length&&yw("digraph {".concat(t.job.observationSource,"}")).forEach(function(e){r[e.id]=k2(k1({},e.attributes),{status:c.COMPLETE})}),l.createElement(iv,null,l.createElement(d.Z,{container:!0,spacing:16},l.createElement(d.Z,{item:!0,xs:12},l.createElement(iw,null,"Job Run #",t.id))),l.createElement(ks,{run:t}),l.createElement(kf,{id:t.id}),l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:4},l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12},l.createElement(kE,{status:t.status,startedAt:t.createdAt,finishedAt:t.finishedAt})),l.createElement(d.Z,{item:!0,xs:12},l.createElement(yU,{observationSource:t.job.observationSource,attributes:r})))),l.createElement(d.Z,{item:!0,xs:8},l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12},t.allErrors.length>0&&l.createElement(ko,{errors:t.allErrors})),l.createElement(d.Z,{item:!0,xs:12},l.createElement(h.rs,null,l.createElement(h.AW,{path:"".concat(n,"/json")},l.createElement(kJ,{run:t})),l.createElement(h.AW,{path:n},t.taskRuns.length>0&&l.createElement(kj,{taskRuns:t.taskRuns,observationSource:t.job.observationSource}))))))))};function k7(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function xe(){var e=k7(["\n  ","\n  query FetchJobRun($id: ID!) {\n    jobRun(id: $id) {\n      __typename\n      ... on JobRun {\n        ...JobRunPayload_Fields\n      }\n      ... on NotFoundError {\n        message\n      }\n    }\n  }\n"]);return xe=function(){return e},e}var xt=n0(xe(),k9),xn=function(){var e=ry(xt,{variables:{id:(0,h.UO)().id}}),t=e.data,n=e.loading,r=e.error;if(n)return l.createElement(ij,null);if(r)return l.createElement(iN,{error:r});var i=null==t?void 0:t.jobRun;switch(null==i?void 0:i.__typename){case"JobRun":return l.createElement(k8,{run:i});case"NotFoundError":return l.createElement(oo,null);default:return null}};function xr(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function xi(){var e=xr(["\n  fragment JobRunsPayload_ResultsFields on JobRun {\n    id\n    allErrors\n    createdAt\n    finishedAt\n    status\n    job {\n      id\n    }\n  }\n"]);return xi=function(){return e},e}var xa=n0(xi()),xo=function(e){var t=e.loading,n=e.data,r=e.page,i=e.pageSize,a=(0,h.k6)(),o=l.useMemo(function(){return null==n?void 0:n.jobRuns.results.map(function(e){var t,n=e.allErrors,r=e.id,i=e.createdAt;return{id:r,createdAt:i,errors:n,finishedAt:e.finishedAt,status:e.status}})},[n]);return l.createElement(iv,null,l.createElement(d.Z,{container:!0,spacing:32},l.createElement(d.Z,{item:!0,xs:12},l.createElement(iw,null,"Job Runs")),t&&l.createElement(ij,null),n&&o&&l.createElement(d.Z,{item:!0,xs:12},l.createElement(r9.Z,null,l.createElement(yg,{runs:o}),l.createElement(ir.Z,{component:"div",count:n.jobRuns.metadata.total,rowsPerPage:i,rowsPerPageOptions:[i],page:r-1,onChangePage:function(e,t){a.push("/runs?page=".concat(t+1,"&per=").concat(i))},onChangeRowsPerPage:function(){},backIconButtonProps:{"aria-label":"prev-page"},nextIconButtonProps:{"aria-label":"next-page"}})))))};function xs(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function xu(){var e=xs(["\n  ","\n  query FetchJobRuns($offset: Int, $limit: Int) {\n    jobRuns(offset: $offset, limit: $limit) {\n      results {\n        ...JobRunsPayload_ResultsFields\n      }\n      metadata {\n        total\n      }\n    }\n  }\n"]);return xu=function(){return e},e}var xc=n0(xu(),xa),xl=function(){var e=iF(),t=parseInt(e.get("page")||"1",10),n=parseInt(e.get("per")||"25",10),r=ry(xc,{variables:{offset:(t-1)*n,limit:n},fetchPolicy:"cache-and-network"}),i=r.data,a=r.loading,o=r.error;return o?l.createElement(iN,{error:o}):l.createElement(xo,{loading:a,data:i,page:t,pageSize:n})},xf=function(){var e=(0,h.$B)().path;return l.createElement(h.rs,null,l.createElement(h.AW,{exact:!0,path:e},l.createElement(xl,null)),l.createElement(h.AW,{path:"".concat(e,"/:id")},l.createElement(xn,null)))},xd=by().shape({name:p2().required("Required"),uri:p2().required("Required"),publicKey:p2().required("Required")}),xh=function(e){var t=e.initialValues,n=e.onSubmit;return l.createElement(hM,{initialValues:t,validationSchema:xd,onSubmit:n},function(e){var t=e.isSubmitting,n=e.submitForm;return l.createElement(hj,{"data-testid":"feeds-manager-form"},l.createElement(d.Z,{container:!0,spacing:16},l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(hR,{component:hJ,id:"name",name:"name",label:"Name",required:!0,fullWidth:!0,FormHelperTextProps:{"data-testid":"name-helper-text"}})),l.createElement(d.Z,{item:!0,xs:!1,md:6}),l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(hR,{component:hJ,id:"uri",name:"uri",label:"URI",required:!0,fullWidth:!0,helperText:"Provided by the Feeds Manager operator",FormHelperTextProps:{"data-testid":"uri-helper-text"}})),l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(hR,{component:hJ,id:"publicKey",name:"publicKey",label:"Public Key",required:!0,fullWidth:!0,helperText:"Provided by the Feeds Manager operator",FormHelperTextProps:{"data-testid":"publicKey-helper-text"}})),l.createElement(d.Z,{item:!0,xs:12},l.createElement(ox.default,{variant:"contained",color:"primary",disabled:t,onClick:n},"Submit"))))})},xp=function(e){var t=e.data,n=e.onSubmit,r={name:t.name,uri:t.uri,publicKey:t.publicKey};return l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12,md:11,lg:9},l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"Edit Feeds Manager"}),l.createElement(aK.Z,null,l.createElement(xh,{initialValues:r,onSubmit:n})))))};function xb(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function xm(){var e=xb(["\n  query FetchFeedsManagers {\n    feedsManagers {\n      results {\n        __typename\n        id\n        name\n        uri\n        publicKey\n        isConnectionActive\n        createdAt\n      }\n    }\n  }\n"]);return xm=function(){return e},e}var xg=n0(xm()),xv=function(){return ry(xg)};function xy(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function xw(e){if(Array.isArray(e))return e}function x_(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function xE(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){x_(a,r,i,o,s,"next",e)}function s(e){x_(a,r,i,o,s,"throw",e)}o(void 0)})}}function xS(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function xk(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function xx(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function xT(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){xS(e,t,n[t])})}return e}function xM(e,t){return xw(e)||xk(e,t)||xA(e,t)||xx()}function xO(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function xA(e,t){if(e){if("string"==typeof e)return xy(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return xy(e,t)}}var xL=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}};function xC(){var e=xO(["\n  mutation UpdateFeedsManager($id: ID!, $input: UpdateFeedsManagerInput!) {\n    updateFeedsManager(id: $id, input: $input) {\n      ... on UpdateFeedsManagerSuccess {\n        feedsManager {\n          id\n          name\n          uri\n          publicKey\n          isConnectionActive\n          createdAt\n        }\n      }\n      ... on NotFoundError {\n        message\n        code\n      }\n      ... on InputErrors {\n        errors {\n          path\n          message\n          code\n        }\n      }\n    }\n  }\n"]);return xC=function(){return e},e}var xI=n0(xC()),xD=function(){var e=(0,h.k6)(),t=(0,h.TH)(),n=(0,A.I0)(),r=oZ().handleMutationError,i=xv(),a=i.data,o=i.loading,s=i.error,u=xM(os(xI,{refetchQueries:[xg]}),1)[0];if(o)return l.createElement(ij,null);if(s)return l.createElement(iN,{error:s});var c=void 0!=a&&a.feedsManagers.results[0]?a.feedsManagers.results[0]:void 0;if(!c)return l.createElement(h.l_,{to:{pathname:"/feeds_manager/new",state:{from:t}}});var f,d=(f=xE(function(t,i){var a,o,s,l,f,d;return xL(this,function(h){switch(h.label){case 0:a=i.setErrors,h.label=1;case 1:return h.trys.push([1,3,,4]),[4,u(((l={}).variables={id:c.id,input:xT({},t)},l))];case 2:switch(null==(f=null===(o=(s=h.sent()).data)||void 0===o?void 0:o.updateFeedsManager)?void 0:f.__typename){case"UpdateFeedsManagerSuccess":e.push("/feeds_manager"),n((0,ty.qt)("Feeds Manager Updated"));break;case"NotFoundError":n((0,ty.LO)(f.message));break;case"InputErrors":n((0,ty.LO)("Invalid Input")),a(wG(f))}return[3,4];case 3:return r(d=h.sent()),[3,4];case 4:return[2]}})}),function(e,t){return f.apply(this,arguments)});return l.createElement(xp,{data:c,onSubmit:d})},xN=n(57234);function xP(){return(xP=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}var xR=by().shape({chainID:p2().required("Required"),chainType:p2().required("Required"),accountAddr:p2().required("Required"),adminAddr:p2().required("Required"),ocr1Multiaddr:p2().when(["ocr1Enabled","ocr1IsBootstrap"],{is:function(e,t){return e&&t},then:p2().required("Required").nullable()}).nullable(),ocr1P2PPeerID:p2().when(["ocr1Enabled","ocr1IsBootstrap"],{is:function(e,t){return e&&!t},then:p2().required("Required").nullable()}).nullable(),ocr1KeyBundleID:p2().when(["ocr1Enabled","ocr1IsBootstrap"],{is:function(e,t){return e&&!t},then:p2().required("Required").nullable()}).nullable(),ocr2Multiaddr:p2().when(["ocr2Enabled","ocr2IsBootstrap"],{is:function(e,t){return e&&t},then:p2().required("Required").nullable()}).nullable(),ocr2P2PPeerID:p2().when(["ocr2Enabled","ocr2IsBootstrap"],{is:function(e,t){return e&&!t},then:p2().required("Required").nullable()}).nullable(),ocr2KeyBundleID:p2().when(["ocr2Enabled","ocr2IsBootstrap"],{is:function(e,t){return e&&!t},then:p2().required("Required").nullable()}).nullable(),ocr2CommitPluginEnabled:pq().required("Required"),ocr2ExecutePluginEnabled:pq().required("Required"),ocr2MedianPluginEnabled:pq().required("Required"),ocr2MercuryPluginEnabled:pq().required("Required"),ocr2ForwarderAddress:p2().nullable()}),xj=function(e){return(0,b.createStyles)({supportedJobOptionsPaper:{padding:2*e.spacing.unit}})},xF=function(e){var t=hE(),n=t.values,r=n.chainID,i=n.accountAddr,a=t.setFieldValue,o=l.useRef();return l.useEffect(function(){o.current=r},[r]),l.useEffect(function(){r!==o.current&&a(e.name,"")},[r,a,i,e.name]),l.createElement(hR,xP({},e))},xY=(0,b.withStyles)(xj)(function(e){var t=e.classes,n=e.editing,r=void 0!==n&&n,i=e.innerRef,a=e.initialValues,o=e.onSubmit,s=e.chainIDs,u=void 0===s?[]:s,c=e.accounts,f=void 0===c?[]:c,h=e.p2pKeys,p=void 0===h?[]:h,b=e.ocrKeys,m=void 0===b?[]:b,g=e.ocr2Keys,v=void 0===g?[]:g,y=e.showSubmit,w=void 0!==y&&y;return l.createElement(hM,{innerRef:i,initialValues:a,validationSchema:xR,onSubmit:o},function(e){var n=e.values,i=f.filter(function(e){return e.chain.id==n.chainID&&!e.isDisabled});return l.createElement(hj,{"data-testid":"feeds-manager-form",id:"chain-configuration-form",noValidate:!0},l.createElement(d.Z,{container:!0,spacing:16},l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(hR,{component:hJ,id:"chainType",name:"chainType",label:"Chain Type",select:!0,required:!0,fullWidth:!0,disabled:!0,helperText:"Only EVM is currently supported"},l.createElement(tE.default,{key:"EVM",value:"EVM"},"EVM"))),l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(hR,{component:hJ,id:"chainID",name:"chainID",label:"Chain ID",required:!0,fullWidth:!0,select:!0,disabled:r,inputProps:{"data-testid":"chainID-input"},FormHelperTextProps:{"data-testid":"chainID-helper-text"}},u.map(function(e){return l.createElement(tE.default,{key:e,value:e},e)}))),l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(xF,{component:hJ,id:"accountAddr",name:"accountAddr",label:"Account Address",inputProps:{"data-testid":"accountAddr-input"},required:!0,fullWidth:!0,select:!0,helperText:"The account address used for this chain",FormHelperTextProps:{"data-testid":"accountAddr-helper-text"}},i.map(function(e){return l.createElement(tE.default,{key:e.address,value:e.address},e.address)}))),l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(hR,{component:hJ,id:"adminAddr",name:"adminAddr",label:"Admin Address",required:!0,fullWidth:!0,helperText:"The address used for LINK payments",FormHelperTextProps:{"data-testid":"adminAddr-helper-text"}})),l.createElement(d.Z,{item:!0,xs:12},l.createElement(x.default,null,"Supported Job Types")),l.createElement(d.Z,{item:!0,xs:12},l.createElement(hR,{component:h3,name:"fluxMonitorEnabled",type:"checkbox",Label:{label:"Flux Monitor"}})),l.createElement(d.Z,{item:!0,xs:12},l.createElement(hR,{component:h3,name:"ocr1Enabled",type:"checkbox",Label:{label:"OCR"}}),n.ocr1Enabled&&l.createElement(ia.default,{className:t.supportedJobOptionsPaper},l.createElement(d.Z,{container:!0,spacing:8},l.createElement(l.Fragment,null,l.createElement(d.Z,{item:!0,xs:12},l.createElement(hR,{component:h3,name:"ocr1IsBootstrap",type:"checkbox",Label:{label:"Is this node running as a bootstrap peer?"}})),n.ocr1IsBootstrap?l.createElement(d.Z,{item:!0,xs:12},l.createElement(hR,{component:hJ,id:"ocr1Multiaddr",name:"ocr1Multiaddr",label:"Multiaddr",required:!0,fullWidth:!0,helperText:"The OCR Multiaddr which oracles use to query for network information",FormHelperTextProps:{"data-testid":"ocr1Multiaddr-helper-text"}})):l.createElement(l.Fragment,null,l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(hR,{component:hJ,id:"ocr1P2PPeerID",name:"ocr1P2PPeerID",label:"Peer ID",select:!0,required:!0,fullWidth:!0,helperText:"The Peer ID used for this chain",FormHelperTextProps:{"data-testid":"ocr1P2PPeerID-helper-text"}},p.map(function(e){return l.createElement(tE.default,{key:e.peerID,value:e.peerID},e.peerID)}))),l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(hR,{component:hJ,id:"ocr1KeyBundleID",name:"ocr1KeyBundleID",label:"Key Bundle ID",select:!0,required:!0,fullWidth:!0,helperText:"The OCR Key Bundle ID used for this chain",FormHelperTextProps:{"data-testid":"ocr1KeyBundleID-helper-text"}},m.map(function(e){return l.createElement(tE.default,{key:e.id,value:e.id},e.id)})))))))),l.createElement(d.Z,{item:!0,xs:12},l.createElement(hR,{component:h3,name:"ocr2Enabled",type:"checkbox",Label:{label:"OCR2"}}),n.ocr2Enabled&&l.createElement(ia.default,{className:t.supportedJobOptionsPaper},l.createElement(d.Z,{container:!0,spacing:8},l.createElement(l.Fragment,null,l.createElement(d.Z,{item:!0,xs:12},l.createElement(hR,{component:h3,name:"ocr2IsBootstrap",type:"checkbox",Label:{label:"Is this node running as a bootstrap peer?"}})),n.ocr2IsBootstrap?l.createElement(d.Z,{item:!0,xs:12},l.createElement(hR,{component:hJ,id:"ocr2Multiaddr",name:"ocr2Multiaddr",label:"Multiaddr",required:!0,fullWidth:!0,helperText:"The OCR2 Multiaddr which oracles use to query for network information",FormHelperTextProps:{"data-testid":"ocr2Multiaddr-helper-text"}})):l.createElement(l.Fragment,null,l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(hR,{component:hJ,id:"ocr2P2PPeerID",name:"ocr2P2PPeerID",label:"Peer ID",select:!0,required:!0,fullWidth:!0,helperText:"The Peer ID used for this chain",FormHelperTextProps:{"data-testid":"ocr2P2PPeerID-helper-text"}},p.map(function(e){return l.createElement(tE.default,{key:e.peerID,value:e.peerID},e.peerID)}))),l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(hR,{component:hJ,id:"ocr2KeyBundleID",name:"ocr2KeyBundleID",label:"Key Bundle ID",select:!0,required:!0,fullWidth:!0,helperText:"The OCR2 Key Bundle ID used for this chain",FormHelperTextProps:{"data-testid":"ocr2KeyBundleID-helper-text"}},v.filter(function(e){return n.chainType===e.chainType}).map(function(e){return l.createElement(tE.default,{key:e.id,value:e.id},e.id)}))),l.createElement(d.Z,{item:!0,xs:12},l.createElement(x.default,null,"Supported Plugins")),l.createElement(d.Z,{item:!0,xs:6},l.createElement(hR,{component:h3,name:"ocr2CommitPluginEnabled",type:"checkbox",Label:{label:"Commit"}})),l.createElement(d.Z,{item:!0,xs:6},l.createElement(hR,{component:h3,name:"ocr2ExecutePluginEnabled",type:"checkbox",Label:{label:"Execute"}})),l.createElement(d.Z,{item:!0,xs:6},l.createElement(hR,{component:h3,name:"ocr2MedianPluginEnabled",type:"checkbox",Label:{label:"Median"}})),l.createElement(d.Z,{item:!0,xs:6},l.createElement(hR,{component:h3,name:"ocr2MercuryPluginEnabled",type:"checkbox",Label:{label:"Mercury"}})),l.createElement(d.Z,{item:!0,xs:12,md:12},l.createElement(hR,{component:hJ,id:"ocr2ForwarderAddress",name:"ocr2ForwarderAddress",label:"Forwarder Address (optional)",fullWidth:!0,helperText:"The forwarder address from the Operator Forwarder Contract",FormHelperTextProps:{"data-testid":"ocr2ForwarderAddress-helper-text"}}))))))),w&&l.createElement(d.Z,{item:!0,xs:12,md:7},l.createElement(ox.default,{variant:"contained",color:"primary",type:"submit",size:"large"},"Submit"))))})}),xB=function(e){var t=e.onClose,n=e.open,r=e.onSubmit,i=l.useRef(),a=iz({fetchPolicy:"network-only"}).data,o=_Z({fetchPolicy:"cache-and-network"}).data,s=SX({fetchPolicy:"cache-and-network"}).data,u=EC({fetchPolicy:"cache-and-network"}).data,c=E5({fetchPolicy:"cache-and-network"}).data,f={chainID:"",chainType:"EVM",accountAddr:"",adminAddr:"",fluxMonitorEnabled:!1,ocr1Enabled:!1,ocr1IsBootstrap:!1,ocr1Multiaddr:"",ocr1P2PPeerID:"",ocr1KeyBundleID:"",ocr2Enabled:!1,ocr2IsBootstrap:!1,ocr2Multiaddr:"",ocr2P2PPeerID:"",ocr2KeyBundleID:"",ocr2CommitPluginEnabled:!1,ocr2ExecutePluginEnabled:!1,ocr2MedianPluginEnabled:!1,ocr2MercuryPluginEnabled:!1,ocr2ForwarderAddress:""},d=a?a.chains.results.map(function(e){return e.id}):[],h=o?o.ethKeys.results:[],p=s?s.p2pKeys.results:[],b=u?u.ocrKeyBundles.results:[],m=c?c.ocr2KeyBundles.results:[];return l.createElement(aN.Z,{onClose:t,open:n,disableBackdropClick:!0},l.createElement(oA.Z,{disableTypography:!0},l.createElement(x.default,{variant:"body2"},"New Supported Chain")),l.createElement(oM.Z,null,l.createElement(xY,{innerRef:i,initialValues:f,onSubmit:r,chainIDs:d,accounts:h,p2pKeys:p,ocrKeys:b,ocr2Keys:m})),l.createElement(oT.Z,null,l.createElement(ox.default,{onClick:t},"Cancel"),l.createElement(ox.default,{color:"primary",type:"submit",form:"chain-configuration-form",variant:"contained"},"Submit")))},xU=function(e){var t=e.cfg,n=e.onClose,r=e.open,i=e.onSubmit,a=l.useRef(),o=iz({fetchPolicy:"network-only"}).data,s=_Z({fetchPolicy:"cache-and-network"}).data,u=SX({fetchPolicy:"cache-and-network"}).data,c=EC({fetchPolicy:"cache-and-network"}).data,f=E5({fetchPolicy:"cache-and-network"}).data;if(!t)return null;var d={chainID:t.chainID,chainType:"EVM",accountAddr:t.accountAddr,adminAddr:t.adminAddr,fluxMonitorEnabled:t.fluxMonitorJobConfig.enabled,ocr1Enabled:t.ocr1JobConfig.enabled,ocr1IsBootstrap:t.ocr1JobConfig.isBootstrap,ocr1Multiaddr:t.ocr1JobConfig.multiaddr,ocr1P2PPeerID:t.ocr1JobConfig.p2pPeerID,ocr1KeyBundleID:t.ocr1JobConfig.keyBundleID,ocr2Enabled:t.ocr2JobConfig.enabled,ocr2IsBootstrap:t.ocr2JobConfig.isBootstrap,ocr2Multiaddr:t.ocr2JobConfig.multiaddr,ocr2P2PPeerID:t.ocr2JobConfig.p2pPeerID,ocr2KeyBundleID:t.ocr2JobConfig.keyBundleID,ocr2CommitPluginEnabled:t.ocr2JobConfig.plugins.commit,ocr2ExecutePluginEnabled:t.ocr2JobConfig.plugins.execute,ocr2MedianPluginEnabled:t.ocr2JobConfig.plugins.median,ocr2MercuryPluginEnabled:t.ocr2JobConfig.plugins.mercury,ocr2ForwarderAddress:t.ocr2JobConfig.forwarderAddress},h=o?o.chains.results.map(function(e){return e.id}):[],p=s?s.ethKeys.results:[],b=u?u.p2pKeys.results:[],m=c?c.ocrKeyBundles.results:[],g=f?f.ocr2KeyBundles.results:[];return l.createElement(aN.Z,{onClose:n,open:r,disableBackdropClick:!0},l.createElement(oA.Z,{disableTypography:!0},l.createElement(x.default,{variant:"body2"},"Edit Supported Chain")),l.createElement(oM.Z,null,l.createElement(xY,{innerRef:a,initialValues:d,onSubmit:i,chainIDs:h,accounts:p,p2pKeys:b,ocrKeys:m,ocr2Keys:g,editing:!0})),l.createElement(oT.Z,null,l.createElement(ox.default,{onClick:n},"Cancel"),l.createElement(ox.default,{color:"primary",type:"submit",form:"chain-configuration-form",variant:"contained"},"Submit")))};function xH(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function x$(){var e=xH(["\n  fragment FeedsManager_ChainConfigFields on FeedsManagerChainConfig {\n    id\n    chainID\n    chainType\n    accountAddr\n    adminAddr\n    fluxMonitorJobConfig {\n      enabled\n    }\n    ocr1JobConfig {\n      enabled\n      isBootstrap\n      multiaddr\n      p2pPeerID\n      keyBundleID\n    }\n    ocr2JobConfig {\n      enabled\n      isBootstrap\n      multiaddr\n      forwarderAddress\n      p2pPeerID\n      keyBundleID\n      plugins {\n        commit\n        execute\n        median\n        mercury\n      }\n    }\n  }\n"]);return x$=function(){return e},e}function xz(){var e=xH(["\n  ","\n  fragment FeedsManagerFields on FeedsManager {\n    id\n    name\n    uri\n    publicKey\n    isConnectionActive\n    chainConfigs {\n      ...FeedsManager_ChainConfigFields\n    }\n  }\n"]);return xz=function(){return e},e}function xG(){var e=xH(["\n  fragment FeedsManager_JobProposalsFields on JobProposal {\n    id\n    name\n    externalJobID\n    remoteUUID\n    status\n    pendingUpdate\n    latestSpec {\n      createdAt\n      version\n    }\n  }\n"]);return xG=function(){return e},e}function xW(){var e=xH(["\n  ","\n  ","\n  fragment FeedsManagerPayload_ResultsFields on FeedsManager {\n    ...FeedsManagerFields\n    jobProposals {\n      ...FeedsManager_JobProposalsFields\n    }\n  }\n"]);return xW=function(){return e},e}function xK(){var e=xH(["\n  ","\n  query FetchFeedManagersWithProposals {\n    feedsManagers {\n      results {\n        ...FeedsManagerPayload_ResultsFields\n      }\n    }\n  }\n"]);return xK=function(){return e},e}var xV=n0(x$()),xq=n0(xz(),xV),xZ=n0(xG()),xX=n0(xW(),xq,xZ),xJ=n0(xK(),xX),xQ=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return ry(xJ,e)};function x1(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function x0(e){if(Array.isArray(e))return e}function x2(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function x3(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){x2(a,r,i,o,s,"next",e)}function s(e){x2(a,r,i,o,s,"throw",e)}o(void 0)})}}function x4(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function x5(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function x6(e,t){return x0(e)||x4(e,t)||x8(e,t)||x5()}function x9(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function x8(e,t){if(e){if("string"==typeof e)return x1(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return x1(e,t)}}var x7=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}};function Te(){var e=x9(["\n  mutation CreateFeedsManagerChainConfig(\n    $input: CreateFeedsManagerChainConfigInput!\n  ) {\n    createFeedsManagerChainConfig(input: $input) {\n      ... on CreateFeedsManagerChainConfigSuccess {\n        chainConfig {\n          id\n        }\n      }\n      ... on NotFoundError {\n        message\n        code\n      }\n      ... on InputErrors {\n        errors {\n          path\n          message\n          code\n        }\n      }\n    }\n  }\n"]);return Te=function(){return e},e}function Tt(){var e=x9(["\n  mutation DeleteFeedsManagerChainConfig($id: ID!) {\n    deleteFeedsManagerChainConfig(id: $id) {\n      ... on DeleteFeedsManagerChainConfigSuccess {\n        chainConfig {\n          id\n        }\n      }\n      ... on NotFoundError {\n        message\n        code\n      }\n    }\n  }\n"]);return Tt=function(){return e},e}function Tn(){var e=x9(["\n  mutation UpdateFeedsManagerChainConfig(\n    $id: ID!\n    $input: UpdateFeedsManagerChainConfigInput!\n  ) {\n    updateFeedsManagerChainConfig(id: $id, input: $input) {\n      __typename\n      ... on UpdateFeedsManagerChainConfigSuccess {\n        chainConfig {\n          id\n        }\n      }\n      ... on NotFoundError {\n        message\n        code\n      }\n      ... on InputErrors {\n        errors {\n          path\n          message\n          code\n        }\n      }\n    }\n  }\n"]);return Tn=function(){return e},e}var Tr=n0(Te()),Ti=n0(Tt()),Ta=n0(Tn()),To=function(e){return(0,b.createStyles)({card:{marginBottom:2*e.spacing.unit},panel:{borderBottom:"1px solid ".concat(e.palette.divider)},panelExpanded:{margin:0},chip:{marginRight:2*e.spacing.unit},title:{fontSize:e.typography.body2.fontSize,fontWeight:e.typography.body2.fontWeight,color:e.typography.body2.color},panelDetails:{display:"block"},jobTypeContainer:{borderLeft:"2px solid ".concat(e.palette.primary.main),marginLeft:-8,paddingLeft:8},panelDetailsActions:{display:"flex",justifyContent:"flex-end",gap:"".concat(2*e.spacing.unit,"px")}})},Ts=function(e){return l.createElement(d.Z,{item:!0,xs:12,sm:1,md:5},l.createElement(ob,{title:"Multiaddr"}),l.createElement(om,{value:e.multiaddr}))},Tu=function(e){return l.createElement(l.Fragment,null,l.createElement(d.Z,{item:!0,xs:12,sm:1,md:5},l.createElement(ob,{title:"P2P Peer ID"}),l.createElement(om,{value:e.p2pPeerID})),l.createElement(d.Z,{item:!0,xs:12,sm:1,md:5},l.createElement(ob,{title:"OCR Key ID"}),l.createElement(om,{value:e.keyBundleID})))},Tc=(0,b.withStyles)(To)(function(e){var t=e.cfg,n=e.classes;return t.enabled?l.createElement(d.Z,{item:!0,xs:12,sm:1,md:12},l.createElement("div",{className:n.jobTypeContainer},l.createElement(ob,{title:"Job Type"}),l.createElement(om,{value:"Flux Monitor"}))):null}),Tl=(0,b.withStyles)(To)(function(e){var t=e.cfg,n=e.classes;return t.enabled?l.createElement(l.Fragment,null,l.createElement(d.Z,{item:!0,xs:12,sm:1,md:2},l.createElement("div",{className:n.jobTypeContainer},l.createElement(ob,{title:"Job Type"}),l.createElement(om,{value:"OCR ".concat(t.isBootstrap?"(Bootstrap)":"")}))),t.isBootstrap?Ts(t):Tu(t)):null}),Tf=(0,b.withStyles)(To)(function(e){var t=e.cfg,n=e.classes;return t.enabled?l.createElement(l.Fragment,null,l.createElement(d.Z,{item:!0,xs:12,sm:1,md:2},l.createElement("div",{className:n.jobTypeContainer},l.createElement(ob,{title:"Job Type"}),l.createElement(om,{value:"OCR2 ".concat(t.isBootstrap?"(Bootstrap)":"")}))),t.isBootstrap?Ts(t):Tu(t)):null}),Td=(0,b.withStyles)(To)(function(e){var t,n,r,i=e.classes,a=e.cfgs,o=e.mgrID,s=(0,A.I0)(),u=oZ().handleMutationError,c=x6(l.useState(!1),2),f=c[0],h=c[1],p=x6(l.useState(null),2),b=p[0],m=p[1],g=x6(l.useState(null),2),v=g[0],w=g[1],_=function(e){w(e.currentTarget)},S=function(){w(null)},k=function(e){m(e)},T=function(){m(null)},M=function(){return null!==b},O=x6(os(Tr,{refetchQueries:[xJ]}),1)[0],L=x6(os(Ti,{refetchQueries:[xJ]}),1)[0],C=x6(os(Ta,{refetchQueries:[xJ]}),1)[0],I=(t=x3(function(e){var t,n,r,i,a;return x7(this,function(c){switch(c.label){case 0:return c.trys.push([0,2,,3]),[4,O(((r={}).variables={input:{feedsManagerID:o,chainID:e.chainID,chainType:e.chainType,accountAddr:e.accountAddr,adminAddr:e.adminAddr,fluxMonitorEnabled:e.fluxMonitorEnabled,ocr1Enabled:e.ocr1Enabled,ocr1IsBootstrap:e.ocr1IsBootstrap,ocr1Multiaddr:""!==e.ocr1Multiaddr?e.ocr1Multiaddr:null,ocr1P2PPeerID:""!==e.ocr1P2PPeerID?e.ocr1P2PPeerID:null,ocr1KeyBundleID:""!=e.ocr1KeyBundleID?e.ocr1KeyBundleID:null,ocr2Enabled:e.ocr2Enabled,ocr2IsBootstrap:e.ocr2IsBootstrap,ocr2Multiaddr:""!==e.ocr2Multiaddr?e.ocr2Multiaddr:null,ocr2P2PPeerID:""!==e.ocr2P2PPeerID?e.ocr2P2PPeerID:null,ocr2KeyBundleID:""!=e.ocr2KeyBundleID?e.ocr2KeyBundleID:null,ocr2Plugins:'{"commit":'.concat(e.ocr2CommitPluginEnabled,',"execute":').concat(e.ocr2ExecutePluginEnabled,',"median":').concat(e.ocr2MedianPluginEnabled,',"mercury":').concat(e.ocr2MercuryPluginEnabled,"}"),ocr2ForwarderAddress:""!==e.ocr2ForwarderAddress?e.ocr2ForwarderAddress:null}},r))];case 1:switch(null==(i=null===(t=(n=c.sent()).data)||void 0===t?void 0:t.createFeedsManagerChainConfig)?void 0:i.__typename){case"CreateFeedsManagerChainConfigSuccess":s((0,ty.qt)("Added new supported chain"));break;case"NotFoundError":s((0,ty.LO)(i.message))}return[3,3];case 2:return u(a=c.sent()),[3,3];case 3:return[2]}})}),function(e){return t.apply(this,arguments)}),D=(n=x3(function(e){var t,n,r,i,a;return x7(this,function(o){switch(o.label){case 0:return o.trys.push([0,2,,3]),[4,L(((r={}).variables={id:e},r))];case 1:switch(null==(i=null===(t=(n=o.sent()).data)||void 0===t?void 0:t.deleteFeedsManagerChainConfig)?void 0:i.__typename){case"DeleteFeedsManagerChainConfigSuccess":s((0,ty.qt)("Deleted supported chain"));break;case"NotFoundError":s((0,ty.LO)(i.message))}return[3,3];case 2:return u(a=o.sent()),[3,3];case 3:return[2]}})}),function(e){return n.apply(this,arguments)}),N=(r=x3(function(e){var t,n,r,i,a;return x7(this,function(o){switch(o.label){case 0:if(!b)return[2];o.label=1;case 1:return o.trys.push([1,3,,4]),[4,C(((r={}).variables={id:b.id,input:{accountAddr:e.accountAddr,adminAddr:e.adminAddr,fluxMonitorEnabled:e.fluxMonitorEnabled,ocr1Enabled:e.ocr1Enabled,ocr1IsBootstrap:e.ocr1IsBootstrap,ocr1Multiaddr:""!==e.ocr1Multiaddr?e.ocr1Multiaddr:null,ocr1P2PPeerID:""!==e.ocr1P2PPeerID?e.ocr1P2PPeerID:null,ocr1KeyBundleID:""!=e.ocr1KeyBundleID?e.ocr1KeyBundleID:null,ocr2Enabled:e.ocr2Enabled,ocr2IsBootstrap:e.ocr2IsBootstrap,ocr2Multiaddr:""!==e.ocr2Multiaddr?e.ocr2Multiaddr:null,ocr2P2PPeerID:""!==e.ocr2P2PPeerID?e.ocr2P2PPeerID:null,ocr2KeyBundleID:""!=e.ocr2KeyBundleID?e.ocr2KeyBundleID:null,ocr2Plugins:'{"commit":'.concat(e.ocr2CommitPluginEnabled,',"execute":').concat(e.ocr2ExecutePluginEnabled,',"median":').concat(e.ocr2MedianPluginEnabled,',"mercury":').concat(e.ocr2MercuryPluginEnabled,"}"),ocr2ForwarderAddress:""!==e.ocr2ForwarderAddress?e.ocr2ForwarderAddress:null}},r))];case 2:switch(null==(i=null===(t=(n=o.sent()).data)||void 0===t?void 0:t.updateFeedsManagerChainConfig)?void 0:i.__typename){case"UpdateFeedsManagerChainConfigSuccess":S(),s((0,ty.qt)("Updated supported chain"));break;case"NotFoundError":s((0,ty.LO)(i.message))}return[3,4];case 3:return u(a=o.sent()),[3,4];case 4:return[2]}})}),function(e){return r.apply(this,arguments)});return l.createElement(r9.Z,{className:i.card},l.createElement(sf.Z,{title:"Supported Chains",classes:{title:i.title},action:l.createElement(l.Fragment,null,l.createElement(y.default,{onClick:_,"aria-label":"open-menu"},l.createElement(of.Z,null)),l.createElement(t_.Z,{anchorEl:v,open:Boolean(v),onClose:S},l.createElement(tE.default,{onClick:function(){h(!0),S()}},l.createElement(ol.Z,null,l.createElement(xN.Z,null)),l.createElement(E.Z,null,"New"))))}),a.map(function(e){return l.createElement(mR.Z,{key:e.id,defaultExpanded:!1,classes:{root:i.panel,expanded:i.panelExpanded}},l.createElement(mj.Z,{expandIcon:l.createElement(gp.Z,null)},l.createElement(El.Z,{label:e.chainType,color:"primary",className:i.chip}),l.createElement(x.default,{style:{lineHeight:"30px"}},"Chain ID: ",e.chainID)),l.createElement(mF.Z,{className:i.panelDetails},l.createElement(d.Z,{container:!0,spacing:40},l.createElement(d.Z,{item:!0,xs:12},l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12,sm:6},l.createElement(ob,{title:"Account Address"}),l.createElement(om,{value:e.accountAddr})),l.createElement(d.Z,{item:!0,xs:12,sm:6},l.createElement(ob,{title:"Admin Address"}),l.createElement(om,{value:e.adminAddr})),l.createElement(Tc,{cfg:e.fluxMonitorJobConfig}),l.createElement(Tl,{cfg:e.ocr1JobConfig}),l.createElement(Tf,{cfg:e.ocr2JobConfig}))),l.createElement(d.Z,{item:!0,xs:12},l.createElement("div",{className:i.panelDetailsActions},l.createElement(aL.Z,{onClick:function(){return k(e)}},"Edit"),l.createElement(aL.Z,{onClick:function(){return D(e.id)},variant:"danger"},"Delete"))))))}),l.createElement(xB,{open:f,onClose:function(){return h(!1)},onSubmit:I}),l.createElement(xU,{cfg:b,open:M(),onClose:T,onSubmit:N}))}),Th=n(47298),Tp=n(81395),Tb=n(47559),Tm=n(83165);function Tg(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function Tv(e){if(Array.isArray(e))return e}function Ty(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function Tw(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function T_(e,t){return Tv(e)||Ty(e,t)||TE(e,t)||Tw()}function TE(e,t){if(e){if("string"==typeof e)return Tg(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return Tg(e,t)}}var TS=function(){return(0,b.createStyles)({root:{display:"flex"},connectedIcon:{color:Tb.default[500]},disconnectedIcon:{color:Tm.default[500]},text:{marginLeft:4}})},Tk=(0,b.withStyles)(TS)(function(e){var t=e.isConnected,n=e.classes;return l.createElement("div",{className:n.root},t?l.createElement(Tp.Z,{fontSize:"small",className:n.connectedIcon}):l.createElement(Th.Z,{fontSize:"small",className:n.disconnectedIcon}),l.createElement(x.default,{variant:"body1",inline:!0,className:n.text},t?"Connected":"Disconnected"))}),Tx=function(e){var t=e.manager,n=T_(l.useState(null),2),r=n[0],i=n[1],a=function(e){i(e.currentTarget)},o=function(){i(null)};return l.createElement(op,{actions:l.createElement("div",null,l.createElement(y.default,{onClick:a,"aria-label":"open-menu"},l.createElement(of.Z,null)),l.createElement(t_.Z,{anchorEl:r,open:Boolean(r),onClose:o},l.createElement(tN,{to:"/feeds_manager/edit"},l.createElement(ol.Z,null,l.createElement(ou.Z,null)),l.createElement(E.Z,null,"Edit"))))},l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12,sm:6,md:3},l.createElement(ob,{title:"Status"}),l.createElement(Tk,{isConnected:t.isConnectionActive})),l.createElement(d.Z,{item:!0,xs:12,sm:6,md:3},l.createElement(ob,{title:"Name"}),l.createElement(om,{value:t.name})),l.createElement(d.Z,{item:!0,xs:12,sm:6,md:3},l.createElement(ob,{title:"CSA Public Key"}),l.createElement(om,null,_A(t.publicKey,{start:6,end:6}),l.createElement(_O,{data:t.publicKey}))),l.createElement(d.Z,{item:!0,xs:12,sm:6,md:3},l.createElement(ob,{title:"RPC URL"}),l.createElement(om,{value:t.uri}))))},TT=(0,b.withStyles)(ic)(function(e){var t=e.classes,n=e.proposals;return l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,"ID"),l.createElement(ie.default,null,"Name"),l.createElement(ie.default,null,"External Job ID"),l.createElement(ie.default,null,"Latest Version"),l.createElement(ie.default,null,"Last Proposed"),l.createElement(ie.default,null))),l.createElement(r7.Z,null,null==n?void 0:n.map(function(e){return l.createElement(ii.Z,{key:e.id,className:t.row,hover:!0},l.createElement(ie.default,{className:t.cell,component:"th",scope:"row"},l.createElement(ip,{className:t.link,href:"/job_proposals/".concat(e.id)},e.id)),l.createElement(ie.default,null,e.name||"--"),l.createElement(ie.default,null,e.externalJobID||"--"),l.createElement(ie.default,null,e.latestSpec.version),l.createElement(ie.default,null,l.createElement(aA,{tooltip:!0},e.latestSpec.createdAt)),l.createElement(ie.default,{align:"right"},e.pendingUpdate&&l.createElement(El.Z,{color:"primary"},"Update Available")))})))}),TM=(0,b.withStyles)(ic)(function(e){var t=e.classes,n=e.proposals;return l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,"ID"),l.createElement(ie.default,null,"Name"),l.createElement(ie.default,null,"Latest Version"),l.createElement(ie.default,null,"Last Proposed"),l.createElement(ie.default,null))),l.createElement(r7.Z,null,null==n?void 0:n.map(function(e){return l.createElement(ii.Z,{key:e.id,className:t.row,hover:!0},l.createElement(ie.default,{className:t.cell,component:"th",scope:"row"},l.createElement(ip,{className:t.link,href:"/job_proposals/".concat(e.id)},e.id)),l.createElement(ie.default,null,e.name||"--"),l.createElement(ie.default,null,e.latestSpec.version),l.createElement(ie.default,null,l.createElement(aA,{tooltip:!0},e.latestSpec.createdAt)),l.createElement(ie.default,{align:"right"},e.pendingUpdate&&l.createElement(El.Z,{label:"Update Available",color:"primary"})))})))}),TO=(0,b.withStyles)(ic)(function(e){var t=e.classes,n=e.proposals;return l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,"ID"),l.createElement(ie.default,null,"Name"),l.createElement(ie.default,null,"Last Proposed"))),l.createElement(r7.Z,null,null==n?void 0:n.map(function(e){return l.createElement(ii.Z,{key:e.id,className:t.row,hover:!0},l.createElement(ie.default,{className:t.cell,component:"th",scope:"row"},l.createElement(ip,{className:t.link,href:"/job_proposals/".concat(e.id)},e.id)),l.createElement(ie.default,null,e.name||"--"),l.createElement(ie.default,null,l.createElement(aA,{tooltip:!0},e.latestSpec.createdAt)))})))}),TA=(0,b.withStyles)(ic)(function(e){var t=e.classes,n=e.proposals;return l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,"ID"),l.createElement(ie.default,null,"Name"),l.createElement(ie.default,null,"External Job ID"),l.createElement(ie.default,null,"Latest Version"),l.createElement(ie.default,null,"Last Proposed"))),l.createElement(r7.Z,null,null==n?void 0:n.map(function(e){return l.createElement(ii.Z,{key:e.id,className:t.row,hover:!0},l.createElement(ie.default,{className:t.cell,component:"th",scope:"row"},l.createElement(ip,{className:t.link,href:"/job_proposals/".concat(e.id)},e.id)),l.createElement(ie.default,null,e.name||"--"),l.createElement(ie.default,null,e.externalJobID||"--"),l.createElement(ie.default,null,e.latestSpec.version),l.createElement(ie.default,null,l.createElement(aA,{tooltip:!0},e.latestSpec.createdAt)))})))});function TL(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function TC(e){if(Array.isArray(e))return e}function TI(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function TD(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function TN(e,t){return TC(e)||TI(e,t)||TP(e,t)||TD()}function TP(e,t){if(e){if("string"==typeof e)return TL(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return TL(e,t)}}var TR={0:"PENDING",1:"UPDATES",2:"APPROVED",3:"REJECTED",4:"CANCELLED",5:"DELETED",6:"REVOKED"},Tj=function(e){return(0,b.createStyles)({tabsRoot:{borderBottom:"1px solid #e8e8e8"},badge:{padding:"0 ".concat(2*e.spacing.unit,"px")}})},TF=function(e){var t=e.toLowerCase();return function(e){return e.toLowerCase().includes(t)}},TY=function(e){return function(t){return""===e||TB(t,e)}};function TB(e,t){var n,r=TF(t),i=[e.id,e.remoteUUID,null!==(n=e.name)&&void 0!==n?n:"",];return e.externalJobID&&i.push(e.externalJobID),i.some(r)}var TU=(0,b.withStyles)(Tj)(function(e){var t=e.classes,n=e.proposals,r=TN(l.useState(0),2),i=r[0],a=r[1],o=TN(l.useState(""),2),s=o[0],u=o[1],c=l.useMemo(function(){var e={PENDING:0,UPDATES:0,APPROVED:0,REJECTED:0,CANCELLED:0,DELETED:0,REVOKED:0};return n.forEach(function(t){if(t.pendingUpdate)switch(e.UPDATES++,t.status){case"APPROVED":e.APPROVED++;break;case"CANCELLED":e.CANCELLED++;break;case"REJECTED":e.REJECTED++;break;case"DELETED":e.DELETED++;break;case"REVOKED":e.REVOKED++}"PENDING"===t.status&&e.PENDING++}),e},[n]),f=l.useMemo(function(){return n?"UPDATES"===TR[i]?n.filter(function(e){return e.pendingUpdate&&TY(s)(e)}).sort(function(e,t){return t.latestSpec.createdAt-e.latestSpec.createdAt}):n.filter(function(e){return e.status===TR[i]&&TY(s)(e)}).sort(function(e,t){return t.latestSpec.createdAt-e.latestSpec.createdAt}):[]},[i,n,s]),d=function(e){switch(TR[i]){case"PENDING":return l.createElement(TO,{proposals:e});case"UPDATES":return l.createElement(TA,{proposals:e});case"REJECTED":case"CANCELLED":case"DELETED":case"REVOKED":return l.createElement(TM,{proposals:e});case"APPROVED":return l.createElement(TT,{proposals:e});default:return null}};return l.createElement(l.Fragment,null,l.createElement(iS,{value:s,onChange:u,placeholder:"Search job proposals"}),l.createElement(r9.Z,null,l.createElement(vJ.Z,{value:i,className:t.tabsRoot,indicatorColor:"primary",onChange:function(e,t){a(t)}},l.createElement(vQ.Z,{label:l.createElement(vX.Z,{color:"primary",badgeContent:c.PENDING,className:t.badge,"data-testid":"pending-badge"},"New")}),l.createElement(vQ.Z,{label:l.createElement(vX.Z,{color:"primary",badgeContent:c.UPDATES,className:t.badge,"data-testid":"updates-badge"},"Updates")}),l.createElement(vQ.Z,{label:l.createElement(vX.Z,{color:"primary",badgeContent:c.APPROVED,className:t.badge,"data-testid":"approved-badge"},"Approved")}),l.createElement(vQ.Z,{label:l.createElement(vX.Z,{color:"primary",badgeContent:c.REJECTED,className:t.badge,"data-testid":"rejected-badge"},"Rejected")}),l.createElement(vQ.Z,{label:l.createElement(vX.Z,{color:"primary",badgeContent:c.CANCELLED,className:t.badge,"data-testid":"cancelled-badge"},"Cancelled")}),l.createElement(vQ.Z,{label:l.createElement(vX.Z,{color:"primary",badgeContent:c.DELETED,className:t.badge,"data-testid":"deleted-badge"},"Deleted")}),l.createElement(vQ.Z,{label:l.createElement(vX.Z,{color:"primary",badgeContent:c.REVOKED,className:t.badge,"data-testid":"revoked-badge"},"Revoked")})),d(f)))}),TH=function(){return(0,b.createStyles)({root:{fontSize:24}})},T$=(0,b.withStyles)(TH)(function(e){var t=e.children,n=e.classes;return l.createElement(x.default,{variant:"h2",className:n.root},t)}),Tz=function(e){var t=e.manager;return l.createElement(d.Z,{container:!0,spacing:16},l.createElement(d.Z,{item:!0,xs:12},l.createElement(iw,null,"Feeds Manager")),l.createElement(d.Z,{item:!0,xs:12},l.createElement(Tx,{manager:t})),l.createElement(d.Z,{item:!0,xs:12},l.createElement(Td,{cfgs:t.chainConfigs,mgrID:t.id})),l.createElement(d.Z,{item:!0,xs:12},l.createElement(T$,null,"Job Proposals")),l.createElement(d.Z,{item:!0,xs:12},l.createElement(TU,{proposals:t.jobProposals})))},TG=function(){var e=(0,h.TH)(),t=xQ({fetchPolicy:"cache-and-network"}),n=t.data,r=t.loading,i=t.error;if(r)return l.createElement(ij,null);if(i)return l.createElement(iN,{error:i});var a=void 0!=n&&n.feedsManagers.results.length>0?n.feedsManagers.results[0]:void 0;return n&&a?l.createElement(Tz,{manager:a}):l.createElement(h.l_,{to:{pathname:"/feeds_manager/new",state:{from:e}}})},TW={name:"Chainlink Feeds Manager",uri:"",publicKey:""},TK=function(e){var t=e.onSubmit;return l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12,md:11,lg:9},l.createElement(r9.Z,null,l.createElement(sf.Z,{title:"Register Feeds Manager"}),l.createElement(aK.Z,null,l.createElement(xh,{initialValues:TW,onSubmit:t})))))};function TV(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function Tq(e){if(Array.isArray(e))return e}function TZ(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function TX(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){TZ(a,r,i,o,s,"next",e)}function s(e){TZ(a,r,i,o,s,"throw",e)}o(void 0)})}}function TJ(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function TQ(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function T1(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function T0(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){TJ(e,t,n[t])})}return e}function T2(e,t){return Tq(e)||TQ(e,t)||T4(e,t)||T1()}function T3(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function T4(e,t){if(e){if("string"==typeof e)return TV(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return TV(e,t)}}var T5=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}};function T6(){var e=T3(["\n  mutation CreateFeedsManager($input: CreateFeedsManagerInput!) {\n    createFeedsManager(input: $input) {\n      ... on CreateFeedsManagerSuccess {\n        feedsManager {\n          id\n          name\n          uri\n          publicKey\n          isConnectionActive\n          createdAt\n        }\n      }\n      ... on SingleFeedsManagerError {\n        message\n        code\n      }\n      ... on NotFoundError {\n        message\n        code\n      }\n      ... on InputErrors {\n        errors {\n          path\n          message\n          code\n        }\n      }\n    }\n  }\n"]);return T6=function(){return e},e}var T9=n0(T6()),T8=function(){var e=(0,h.k6)(),t=(0,h.TH)(),n=(0,A.I0)(),r=oZ().handleMutationError,i=xv(),a=i.data,o=i.loading,s=i.error,u=T2(os(T9,{refetchQueries:[xg]}),1)[0];if(o)return l.createElement(ij,null);if(s)return l.createElement(iN,{error:s});var c,f=void 0!=a&&a.feedsManagers.results[0]?a.feedsManagers.results[0]:void 0,d=(c=TX(function(t,i){var a,o,s,c,l,f;return T5(this,function(d){switch(d.label){case 0:a=i.setErrors,d.label=1;case 1:return d.trys.push([1,3,,4]),[4,u(((c={}).variables={input:T0({},t)},c))];case 2:switch(null==(l=null===(o=(s=d.sent()).data)||void 0===o?void 0:o.createFeedsManager)?void 0:l.__typename){case"CreateFeedsManagerSuccess":e.push("/feeds_manager"),n((0,ty.qt)("Feeds Manager Created"));break;case"SingleFeedsManagerError":case"NotFoundError":n((0,ty.LO)(l.message));break;case"InputErrors":n((0,ty.LO)("Invalid Input")),a(wG(l))}return[3,4];case 3:return r(f=d.sent()),[3,4];case 4:return[2]}})}),function(e,t){return c.apply(this,arguments)});return f?l.createElement(h.l_,{to:{pathname:"/feeds_manager",state:{from:t}}}):l.createElement(TK,{onSubmit:d})},T7=function(){var e=(0,h.$B)().path;return l.createElement(iv,null,l.createElement(h.AW,{exact:!0,path:"".concat(e,"/new")},l.createElement(T8,null)),l.createElement(h.AW,{exact:!0,path:e},l.createElement(TG,null)),l.createElement(h.AW,{exact:!0,path:"".concat(e,"/edit")},l.createElement(xD,null)))},Me=function(e){var t=e.proposal,n=t.specs.find(function(e){return"APPROVED"===e.status});return l.createElement(op,null,l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12,sm:4,md:2},l.createElement(ob,{title:"Status"}),l.createElement(om,{value:ky(t.status)})),l.createElement(d.Z,{item:!0,xs:12,sm:4,md:4},l.createElement(ob,{title:"FMS UUID"}),l.createElement(om,{value:t.remoteUUID})),l.createElement(d.Z,{item:!0,xs:12,sm:4,md:4},l.createElement(ob,{title:"External Job ID"}),t.jobID&&t.externalJobID?l.createElement(om,null,l.createElement(ip,{color:"primary",href:"/jobs/".concat(t.jobID)},t.externalJobID)):l.createElement(om,{value:t.externalJobID||"--"})),l.createElement(d.Z,{item:!0,xs:12,sm:4,md:2},l.createElement(ob,{title:"Approved Version"}),l.createElement(om,{value:n?n.version:"--"}))))};function Mt(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function Mn(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){Mt(a,r,i,o,s,"next",e)}function s(e){Mt(a,r,i,o,s,"throw",e)}o(void 0)})}}var Mr=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}},Mi=function(){return(0,b.createStyles)({paperRoot:{width:700}})},Ma=by().shape({definition:p2().required("Required")}),Mo=(0,b.withStyles)(Mi)(function(e){var t,n=e.classes,r=e.initialValues,i=e.onClose,a=e.onSubmit,o=e.open;return l.createElement(hM,{initialValues:r,validationSchema:Ma,onSubmit:(t=Mn(function(e,t){return Mr(this,function(n){switch(n.label){case 0:return[4,a(e,t)];case 1:return n.sent(),i(),[2]}})}),function(e,n){return t.apply(this,arguments)})},function(e){var t=e.isSubmitting,r=e.submitForm;return l.createElement(hj,null,l.createElement(aN.Z,{open:o,onClose:i,classes:{paper:n.paperRoot}},l.createElement(oA.Z,{disableTypography:!0},l.createElement(x.default,{variant:"h5"},"Edit Job Spec")),l.createElement(oM.Z,null,l.createElement(hR,{component:hJ,id:"definition",name:"definition",label:"Job Spec",variant:"outlined",multiline:!0,rows:10,rowsMax:25,required:!0,autoComplete:"off",margin:"normal",fullWidth:!0,spellCheck:"false"})),l.createElement(oT.Z,null,l.createElement(ox.default,{onClick:i,variant:"text"},"Cancel"),l.createElement(ox.default,{variant:"contained",color:"primary",disabled:t,onClick:r},"Submit"))))})});function Ms(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function Mu(e){if(Array.isArray(e))return e}function Mc(e){if(Array.isArray(e))return Ms(e)}function Ml(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function Mf(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function Md(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function Mh(){throw TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function Mp(e,t){return Mu(e)||Mf(e,t)||Mg(e,t)||Md()}function Mb(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function Mm(e){return Mc(e)||Ml(e)||Mg(e)||Mh()}function Mg(e,t){if(e){if("string"==typeof e)return Ms(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return Ms(e,t)}}function Mv(){var e=Mb(["\n  fragment JobProposal_SpecsFields on JobProposalSpec {\n    id\n    definition\n    status\n    version\n    createdAt\n  }\n"]);return Mv=function(){return e},e}var My=n0(Mv()),Mw=function(e){return(0,b.createStyles)({versionText:{marginRight:2*e.spacing.unit},proposedAtContainer:{flex:1,textAlign:"right"},expansionPanelDetails:{display:"block"},actions:{display:"flex",marginBottom:2*e.spacing.unit},editContainer:{flex:1},actionsContainer:{flex:1,textAlign:"right"}})},M_={approve:{title:"Approve Job Proposal",body:"Approving this job proposal will start running a new job. WARNING: If a job using the same contract address already exists, it will be deleted before running the new one."},cancel:{title:"Cancel Job Proposal",body:"Cancelling this job proposal will delete the running job. Are you sure you want to cancel this job proposal?"},reject:{title:"Reject Job Proposal",body:"Are you sure you want to reject this job proposal?"}},ME=(0,b.withStyles)(Mw)(function(e){var t=e.classes,n=e.onApprove,r=e.onCancel,i=e.onReject,a=e.onUpdateSpec,o=e.specs,s=e.proposal,u=Mp(l.useState(null),2),c=u[0],f=u[1],d=Mp(l.useState(!1),2),h=d[0],p=d[1],b=function(e,t){f({action:e,id:t})},m=l.useMemo(function(){return o.reduce(function(e,t){return e.version>t.version?e:t})},[o]),g=l.useMemo(function(){return Mm(o).sort(function(e,t){return t.version-e.version})},[o]),v=function(e,t,n){switch(e){case"PENDING":return l.createElement(l.Fragment,null,l.createElement(ox.default,{variant:"text",color:"secondary",onClick:function(){return b("reject",t)}},"Reject"),m.id===t&&"DELETED"!==n.status&&"REVOKED"!==n.status&&l.createElement(ox.default,{variant:"contained",color:"primary",onClick:function(){return b("approve",t)}},"Approve"),m.id===t&&"DELETED"===n.status&&n.pendingUpdate&&l.createElement(l.Fragment,null,l.createElement(ox.default,{variant:"contained",color:"primary",onClick:function(){return b("cancel",t)}},"Cancel"),l.createElement(x.default,{color:"error"},"This proposal was deleted. Cancel the spec to delete any running jobs")));case"APPROVED":return l.createElement(l.Fragment,null,l.createElement(ox.default,{variant:"contained",onClick:function(){return b("cancel",t)}},"Cancel"),"DELETED"===n.status&&n.pendingUpdate&&l.createElement(x.default,{color:"error"},"This proposal was deleted. Cancel the spec to delete any running jobs"));case"CANCELLED":if(m.id===t&&"DELETED"!==n.status&&"REVOKED"!==n.status)return l.createElement(ox.default,{variant:"contained",color:"primary",onClick:function(){return b("approve",t)}},"Approve");return null;default:return null}};return l.createElement("div",null,g.map(function(e,n){return l.createElement(mR.Z,{defaultExpanded:0===n,key:n},l.createElement(mj.Z,{expandIcon:l.createElement(gp.Z,null)},l.createElement(x.default,{className:t.versionText},"Version ",e.version),l.createElement(El.Z,{label:e.status,color:"APPROVED"===e.status?"primary":"default",variant:"REJECTED"===e.status||"CANCELLED"===e.status?"outlined":"default"}),l.createElement("div",{className:t.proposedAtContainer},l.createElement(x.default,null,"Proposed ",l.createElement(aA,{tooltip:!0},e.createdAt)))),l.createElement(mF.Z,{className:t.expansionPanelDetails},l.createElement("div",{className:t.actions},l.createElement("div",{className:t.editContainer},0===n&&("PENDING"===e.status||"CANCELLED"===e.status)&&"DELETED"!==s.status&&"REVOKED"!==s.status&&l.createElement(ox.default,{variant:"contained",onClick:function(){return p(!0)}},"Edit")),l.createElement("div",{className:t.actionsContainer},v(e.status,e.id,s))),l.createElement(gh,{language:"toml",style:gu,"data-testid":"codeblock"},e.definition)))}),l.createElement(oI,{open:null!=c,title:c?M_[c.action].title:"",body:c?M_[c.action].body:"",onConfirm:function(){if(c){switch(c.action){case"approve":n(c.id);break;case"cancel":r(c.id);break;case"reject":i(c.id)}f(null)}},cancelButtonText:"Cancel",onCancel:function(){return f(null)}}),l.createElement(Mo,{open:h,onClose:function(){return p(!1)},initialValues:{definition:m.definition,id:m.id},onSubmit:a}))});function MS(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function Mk(){var e=MS(["\n  ","\n  fragment JobProposalPayloadFields on JobProposal {\n    id\n    externalJobID\n    remoteUUID\n    jobID\n    specs {\n      ...JobProposal_SpecsFields\n    }\n    status\n    pendingUpdate\n  }\n"]);return Mk=function(){return e},e}var Mx=n0(Mk(),My),MT=function(e){var t=e.onApprove,n=e.onCancel,r=e.onReject,i=e.onUpdateSpec,a=e.proposal;return l.createElement(iv,null,l.createElement(d.Z,{container:!0,spacing:32},l.createElement(d.Z,{item:!0,xs:9},l.createElement(iw,null,"Job Proposal #",a.id))),l.createElement(Me,{proposal:a}),l.createElement(d.Z,{container:!0,spacing:32},l.createElement(d.Z,{item:!0,xs:9},l.createElement(T$,null,"Specs"))),l.createElement(d.Z,{container:!0,spacing:32},l.createElement(d.Z,{item:!0,xs:12},l.createElement(ME,{proposal:a,specs:a.specs,onReject:r,onApprove:t,onCancel:n,onUpdateSpec:i}))))};function MM(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function MO(e){if(Array.isArray(e))return e}function MA(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function ML(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){MA(a,r,i,o,s,"next",e)}function s(e){MA(a,r,i,o,s,"throw",e)}o(void 0)})}}function MC(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function MI(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function MD(e,t){return MO(e)||MC(e,t)||MP(e,t)||MI()}function MN(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function MP(e,t){if(e){if("string"==typeof e)return MM(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return MM(e,t)}}var MR=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}};function Mj(){var e=MN(["\n  ","\n  query FetchJobProposal($id: ID!) {\n    jobProposal(id: $id) {\n      __typename\n      ... on JobProposal {\n        ...JobProposalPayloadFields\n      }\n      ... on NotFoundError {\n        message\n      }\n    }\n  }\n"]);return Mj=function(){return e},e}function MF(){var e=MN(["\n  mutation UpdateJobProposalSpecDefinition(\n    $id: ID!\n    $input: UpdateJobProposalSpecDefinitionInput!\n  ) {\n    updateJobProposalSpecDefinition(id: $id, input: $input) {\n      ... on UpdateJobProposalSpecDefinitionSuccess {\n        __typename\n      }\n      ... on NotFoundError {\n        message\n      }\n    }\n  }\n"]);return MF=function(){return e},e}function MY(){var e=MN(["\n  mutation RejectJobProposalSpec($id: ID!) {\n    rejectJobProposalSpec(id: $id) {\n      ... on RejectJobProposalSpecSuccess {\n        spec {\n          id\n        }\n      }\n      ... on NotFoundError {\n        message\n      }\n    }\n  }\n"]);return MY=function(){return e},e}function MB(){var e=MN(["\n  mutation ApproveJobProposalSpec($id: ID!, $force: Boolean) {\n    approveJobProposalSpec(id: $id, force: $force) {\n      ... on ApproveJobProposalSpecSuccess {\n        spec {\n          id\n        }\n      }\n      ... on NotFoundError {\n        message\n      }\n    }\n  }\n"]);return MB=function(){return e},e}function MU(){var e=MN(["\n  mutation CancelJobProposalSpec($id: ID!) {\n    cancelJobProposalSpec(id: $id) {\n      ... on CancelJobProposalSpecSuccess {\n        spec {\n          id\n        }\n      }\n      ... on NotFoundError {\n        message\n      }\n    }\n  }\n"]);return MU=function(){return e},e}var MH=n0(Mj(),Mx),M$=n0(MF()),Mz=n0(MY()),MG=n0(MB()),MW=n0(MU()),MK=function(){var e=(0,h.UO)().id,t=(0,A.I0)(),n=(0,h.k6)(),r=oZ().handleMutationError,i=ry(MH,{variables:{id:e}}),a=i.data,o=i.loading,s=i.error,u=MD(os(M$,{refetchQueries:[MH]}),1)[0],c=MD(os(Mz,{refetchQueries:[MH]}),1)[0],f=MD(os(MG,{refetchQueries:[MH]}),1)[0],d=MD(os(MW,{refetchQueries:[MH]}),1)[0];if(o)return l.createElement(ij,null);if(s)return l.createElement(iN,{error:s});var p,b,m,g,v=(p=ML(function(e){var n,i,a,o,s;return MR(this,function(c){switch(c.label){case 0:return c.trys.push([0,2,,3]),[4,u(((a={}).variables={id:e.id,input:{definition:e.definition}},a))];case 1:switch(null==(o=null===(n=(i=c.sent()).data)||void 0===n?void 0:n.updateJobProposalSpecDefinition)?void 0:o.__typename){case"UpdateJobProposalSpecDefinitionSuccess":t((0,ty.qt)("Spec updated"));break;case"NotFoundError":t((0,ty.LO)(o.message))}return[3,3];case 2:return r(s=c.sent()),[3,3];case 3:return[2]}})}),function(e){return p.apply(this,arguments)}),y=(b=ML(function(e){var n,i,a,o,s;return MR(this,function(u){switch(u.label){case 0:return u.trys.push([0,2,,3]),[4,c(((a={}).variables={id:e},a))];case 1:switch(null==(o=null===(n=(i=u.sent()).data)||void 0===n?void 0:n.rejectJobProposalSpec)?void 0:o.__typename){case"RejectJobProposalSpecSuccess":t((0,ty.qt)("Spec rejected"));break;case"NotFoundError":t((0,ty.LO)(o.message))}return[3,3];case 2:return r(s=u.sent()),[3,3];case 3:return[2]}})}),function(e){return b.apply(this,arguments)}),w=(m=ML(function(e){var n,i,a,o,s;return MR(this,function(u){switch(u.label){case 0:return u.trys.push([0,2,,3]),[4,d(((a={}).variables={id:e},a))];case 1:switch(null==(o=null===(n=(i=u.sent()).data)||void 0===n?void 0:n.cancelJobProposalSpec)?void 0:o.__typename){case"CancelJobProposalSpecSuccess":t((0,ty.qt)("Spec cancelled"));break;case"NotFoundError":t((0,ty.LO)(o.message))}return[3,3];case 2:return r(s=u.sent()),[3,3];case 3:return[2]}})}),function(e){return m.apply(this,arguments)}),_=(g=ML(function(e){var i,a,o,s,u;return MR(this,function(c){switch(c.label){case 0:return c.trys.push([0,2,,3]),[4,f(((o={}).variables={id:e,force:!0},o))];case 1:switch(null==(s=null===(i=(a=c.sent()).data)||void 0===i?void 0:i.approveJobProposalSpec)?void 0:s.__typename){case"ApproveJobProposalSpecSuccess":n.push("/feeds_manager"),setTimeout(function(){return t((0,ty.qt)("Spec approved"))},200);break;case"NotFoundError":t((0,ty.LO)(s.message))}return[3,3];case 2:return r(u=c.sent()),[3,3];case 3:return[2]}})}),function(e){return g.apply(this,arguments)}),E=null==a?void 0:a.jobProposal;switch(null==E?void 0:E.__typename){case"JobProposal":return l.createElement(MT,{proposal:E,onApprove:_,onCancel:w,onReject:y,onUpdateSpec:v});case"NotFoundError":return l.createElement(oo,null);default:return null}},MV=function(){var e=(0,h.$B)().path;return l.createElement(l.Fragment,null,l.createElement(h.AW,{exact:!0,path:"".concat(e,"/:id")},l.createElement(MK,null)))},Mq=function(e){var t=e.node;return l.createElement(op,null,l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12,sm:4,md:3},l.createElement(ob,{title:"EVM Chain ID"}),l.createElement(om,{value:t.chain.id})),l.createElement(d.Z,{item:!0,xs:!1,sm:!1,md:4}),l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(ob,{title:"HTTP URL"}),l.createElement(om,{value:""!==t.httpURL?t.httpURL:"--"})),l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(ob,{title:"WS URL"}),l.createElement(om,{value:""!==t.wsURL?t.wsURL:"--"}))))};function MZ(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function MX(){var e=MZ(["\n  fragment NodePayload_Fields on Node {\n    id\n    name\n    chain {\n      id\n    }\n    httpURL\n    wsURL\n    state\n    sendOnly\n    order\n  }\n"]);return MX=function(){return e},e}var MJ=n0(MX()),MQ=function(e){var t=e.node;return l.createElement(l.Fragment,null,l.createElement(iv,null,l.createElement(d.Z,{container:!0,spacing:16},l.createElement(d.Z,{item:!0,xs:12},l.createElement(iw,null,t.name)),l.createElement(d.Z,{item:!0,xs:12},l.createElement(Mq,{node:t})))))};function M1(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function M0(){var e=M1(["\n  ","\n  query FetchNode($id: ID!) {\n    node(id: $id) {\n      __typename\n      ... on Node {\n        ...NodePayload_Fields\n      }\n      ... on NotFoundError {\n        message\n      }\n    }\n  }\n"]);return M0=function(){return e},e}var M2=n0(M0(),MJ),M3=function(){var e=ry(M2,{variables:{id:(0,h.UO)().id}}),t=e.data,n=e.loading,r=e.error;if(n)return l.createElement(ij,null);if(r)return l.createElement(iN,{error:r});var i=null==t?void 0:t.node;switch(null==i?void 0:i.__typename){case"Node":return l.createElement(MQ,{node:i});case"NotFoundError":return l.createElement(oo,null);default:return null}},M4=(0,b.withStyles)(ic)(function(e){var t=e.node,n=e.classes;return l.createElement(ii.Z,{className:n.row,hover:!0},l.createElement(ie.default,{className:n.cell,component:"th",scope:"row"},l.createElement(ip,{className:n.link,href:"/nodes/".concat(t.name)},t.name)),l.createElement(ie.default,null,t.chain.id),l.createElement(ie.default,null,t.state),l.createElement(ie.default,null,t.sendOnly?"SendOnly":"Primary"),l.createElement(ie.default,null,t.order?t.order:"NA"))});function M5(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function M6(e){if(Array.isArray(e))return e}function M9(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function M8(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function M7(e,t){return M6(e)||M9(e,t)||Ot(e,t)||M8()}function Oe(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function Ot(e,t){if(e){if("string"==typeof e)return M5(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return M5(e,t)}}function On(){var e=Oe(["\n  fragment NodesPayload_ResultsFields on Node {\n    id\n    chain {\n      id\n    }\n    name\n    state\n    sendOnly\n    order\n  }\n"]);return On=function(){return e},e}var Or=n0(On()),Oi=function(e){var t=e.toLowerCase();return function(e){return e.toLowerCase().includes(t)}},Oa=function(e){return function(t){return""===e||Oo(t,e)}};function Oo(e,t){var n;return[e.id,e.name,e.chain.id].some(Oi(t))}var Os=function(e){var t=e.nodes,n=e.page,r=e.pageSize,i=e.total,a=(0,h.k6)(),o=M7(l.useState(""),2),s=o[0],u=o[1],c=l.useMemo(function(){return t.filter(Oa(s.trim()))},[s,t]);return l.createElement(iv,null,l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:9},l.createElement(iw,null,"Nodes")),l.createElement(d.Z,{item:!0,xs:12},l.createElement(iS,{value:s,onChange:u,placeholder:"Search nodes"}),l.createElement(r9.Z,null,l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,"Name"),l.createElement(ie.default,null,"EVM Chain ID"),l.createElement(ie.default,null,"State"),l.createElement(ie.default,null,"Type"),l.createElement(ie.default,null,"Order"))),l.createElement(r7.Z,null,0===c.length&&l.createElement(ii.Z,null,l.createElement(ie.default,{component:"th",scope:"row",colSpan:4},"No nodes found")),c.map(function(e){return l.createElement(M4,{key:e.id,node:e})}))),l.createElement(ir.Z,{component:"div",count:i,rowsPerPage:r,rowsPerPageOptions:[r],page:n-1,onChangePage:function(e,t){a.push("/nodes?page=".concat(t+1,"&per=").concat(r))},onChangeRowsPerPage:function(){},backIconButtonProps:{"aria-label":"prev-page"},nextIconButtonProps:{"aria-label":"next-page"}})))))};function Ou(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function Oc(){var e=Ou(["\n  ","\n  query FetchNodes($offset: Int, $limit: Int) {\n    nodes(offset: $offset, limit: $limit) {\n      results {\n        ...NodesPayload_ResultsFields\n      }\n      metadata {\n        total\n      }\n    }\n  }\n"]);return Oc=function(){return e},e}var Ol=n0(Oc(),Or),Of=function(){var e=iF(),t=parseInt(e.get("page")||"1",10),n=parseInt(e.get("per")||"100",10),r=ry(Ol,{variables:{offset:(t-1)*n,limit:n},fetchPolicy:"network-only"}),i=r.data,a=r.loading,o=r.error;return a?l.createElement(ij,null):o?l.createElement(iN,{error:o}):i?l.createElement(Os,{nodes:i.nodes.results,page:t,pageSize:n,total:i.nodes.metadata.total}):null},Od=function(){var e=(0,h.$B)().path;return l.createElement(h.rs,null,l.createElement(h.AW,{path:"".concat(e,"/:id")},l.createElement(M3,null)),l.createElement(h.AW,{exact:!0,path:e},l.createElement(Of,null)))},Oh=function(e){var t=e.tx;return l.createElement(op,null,l.createElement(d.Z,{container:!0},l.createElement(d.Z,{item:!0,xs:12},l.createElement(ob,{title:"Txn Hash"}),l.createElement(om,{value:t.hash})),l.createElement(d.Z,{item:!0,xs:12,md:3},l.createElement(ob,{title:"Chain ID"}),l.createElement(om,{value:t.chain.id})),l.createElement(d.Z,{item:!0,xs:12,md:3},l.createElement(ob,{title:"Status"}),l.createElement(om,{value:ky(t.state)})),l.createElement(d.Z,{item:!0,xs:12,md:3},l.createElement(ob,{title:"Nonce"}),l.createElement(om,{value:t.nonce})),l.createElement(d.Z,{item:!0,xs:12,md:3},l.createElement(ob,{title:"Sent At (Block)"}),l.createElement(om,{value:t.sentAt})),l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(ob,{title:"From"}),l.createElement(om,{value:t.from})),l.createElement(d.Z,{item:!0,xs:12,md:6},l.createElement(ob,{title:"To"}),l.createElement(om,{value:t.to})),l.createElement(d.Z,{item:!0,xs:12,md:3},l.createElement(ob,{title:"Value"}),l.createElement(om,{value:t.value})),l.createElement(d.Z,{item:!0,xs:!1,md:3}),l.createElement(d.Z,{item:!0,xs:12,md:3},l.createElement(ob,{title:"Gas Price"}),l.createElement(om,{value:t.gasPrice})),l.createElement(d.Z,{item:!0,xs:12,md:3},l.createElement(ob,{title:"Gas Limit"}),l.createElement(om,{value:t.gasLimit})),l.createElement(d.Z,{item:!0,xs:12},l.createElement(ob,{title:"Raw Hex"}),l.createElement(og,null,t.hex)),l.createElement(d.Z,{item:!0,xs:12},l.createElement(ob,{title:"Data"}),l.createElement(og,null,t.data))))};function Op(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function Ob(){var e=Op(["\n  fragment EthTransactionPayloadFields on EthTransaction {\n    chain {\n      id\n    }\n    data\n    from\n    gasLimit\n    gasPrice\n    hash\n    hex\n    nonce\n    sentAt\n    state\n    to\n    value\n  }\n"]);return Ob=function(){return e},e}var Om=n0(Ob()),Og=function(e){var t=e.tx;return l.createElement(iv,null,l.createElement(d.Z,{container:!0,spacing:16},l.createElement(d.Z,{item:!0,xs:12},l.createElement(iw,null,"Transaction Details")),l.createElement(d.Z,{item:!0,xs:12},l.createElement(Oh,{tx:t}))))};function Ov(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function Oy(){var e=Ov(["\n  ","\n  query FetchEthTransaction($hash: ID!) {\n    ethTransaction(hash: $hash) {\n      __typename\n      ... on EthTransaction {\n        ...EthTransactionPayloadFields\n      }\n      ... on NotFoundError {\n        message\n      }\n    }\n  }\n"]);return Oy=function(){return e},e}var Ow=n0(Oy(),Om),O_=function(){var e=ry(Ow,{variables:{hash:(0,h.UO)().id}}),t=e.data,n=e.loading,r=e.error;if(n)return l.createElement(ij,null);if(r)return l.createElement(iN,{error:r});var i=null==t?void 0:t.ethTransaction;switch(null==i?void 0:i.__typename){case"EthTransaction":return l.createElement(Og,{tx:i});case"NotFoundError":return l.createElement(oo,null);default:return null}},OE=(0,b.withStyles)(ic)(function(e){var t=e.tx,n=e.classes;return l.createElement(ii.Z,{className:n.row,hover:!0},l.createElement(ie.default,{className:n.cell,component:"th",scope:"row"},l.createElement(ip,{className:n.link,href:"/transactions/".concat(t.hash)},_A(t.hash,{start:8,end:8}))),l.createElement(ie.default,null,t.chain.id),l.createElement(ie.default,null,_A(t.from,{start:8,end:8})),l.createElement(ie.default,null,_A(t.to,{start:8,end:8})),l.createElement(ie.default,null,t.nonce),l.createElement(ie.default,null,t.sentAt||"--"))});function OS(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function Ok(){var e=OS(["\n  fragment EthTransactionsPayload_ResultsFields on EthTransaction {\n    chain {\n      id\n    }\n    from\n    hash\n    to\n    nonce\n    sentAt\n  }\n"]);return Ok=function(){return e},e}var Ox=n0(Ok()),OT=function(e){var t=e.data,n=e.loading,r=e.page,i=e.pageSize,a=(0,h.k6)();return l.createElement(iv,null,l.createElement(d.Z,{container:!0,spacing:32},l.createElement(d.Z,{item:!0,xs:12},l.createElement(iw,null,"Transactions")),n&&l.createElement(ij,null),t&&l.createElement(d.Z,{item:!0,xs:12},l.createElement(r9.Z,null,l.createElement(r8.Z,null,l.createElement(it.Z,null,l.createElement(ii.Z,null,l.createElement(ie.default,null,"Txn Hash"),l.createElement(ie.default,null,"Chain ID"),l.createElement(ie.default,null,"From"),l.createElement(ie.default,null,"To"),l.createElement(ie.default,null,"Nonce"),l.createElement(ie.default,null,"Block"))),l.createElement(r7.Z,null,(null==t?void 0:t.ethTransactions.results.length)===0&&l.createElement(ii.Z,null,l.createElement(ie.default,{component:"th",scope:"row",colSpan:6},"You haven’t created any transactions yet")),null==t?void 0:t.ethTransactions.results.map(function(e,t){return l.createElement(OE,{tx:e,key:t})}))),l.createElement(ir.Z,{component:"div",count:t.ethTransactions.metadata.total,rowsPerPage:i,rowsPerPageOptions:[10,25,50,100],page:r-1,onChangePage:function(e,t){a.push("/transactions?page=".concat(t+1,"&per=").concat(i))},onChangeRowsPerPage:function(e){a.push("/transactions?page=".concat(r,"&per=").concat(parseInt(e.target.value,10)))},backIconButtonProps:{"aria-label":"prev-page"},nextIconButtonProps:{"aria-label":"next-page"}})))))};function OM(e,t){return t||(t=e.slice(0)),Object.freeze(Object.defineProperties(e,{raw:{value:Object.freeze(t)}}))}function OO(){var e=OM(["\n  ","\n  query FetchEthTransactions($offset: Int, $limit: Int) {\n    ethTransactions(offset: $offset, limit: $limit) {\n      results {\n        ...EthTransactionsPayload_ResultsFields\n      }\n      metadata {\n        total\n      }\n    }\n  }\n"]);return OO=function(){return e},e}var OA=n0(OO(),Ox),OL=function(){var e=iF(),t=parseInt(e.get("page")||"1",10),n=parseInt(e.get("per")||"25",10),r=ry(OA,{variables:{offset:(t-1)*n,limit:n},fetchPolicy:"cache-and-network"}),i=r.data,a=r.loading,o=r.error;return o?l.createElement(iN,{error:o}):l.createElement(OT,{data:i,loading:a,page:t,pageSize:n})},OC=function(){var e=(0,h.$B)().path;return l.createElement(h.rs,null,l.createElement(h.AW,{path:"".concat(e,"/:id")},l.createElement(O_,null)),l.createElement(h.AW,{exact:!0,path:e},l.createElement(OL,null)))};function OI(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function OD(e){if(Array.isArray(e))return e}function ON(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function OP(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function OR(e,t){return OD(e)||ON(e,t)||Oj(e,t)||OP()}function Oj(e,t){if(e){if("string"==typeof e)return OI(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return OI(e,t)}}e=n.hmd(e);var OF=function(e){return{content:{marginTop:0,marginBottom:5*e.spacing.unit}}},OY=function(e){var t=e.classes,n=OR(l.useState(0),2),r=n[0],i=n[1],a=null;return l.createElement(d.Z,{container:!0,spacing:0},l.createElement(d.Z,{item:!0,xs:12},l.createElement(r1,{onResize:function(e,t){return i(t)},drawerContainer:a}),l.createElement("main",{ref:function(e){a=e},style:{paddingTop:r}},l.createElement(r0.ZP,null),l.createElement("div",{className:t.content},l.createElement(h.rs,null,l.createElement(r6,{exact:!0,path:"/"},l.createElement(vx,null)),l.createElement(r6,{exact:!0,path:"/chains"},l.createElement(iG,null)),l.createElement(r6,{path:"/chains/:chainId"},l.createElement(oe,null)),l.createElement(r6,{path:"/bridges"},l.createElement(b6,null)),l.createElement(r6,{path:"/config"},l.createElement(gL,null)),l.createElement(r6,{path:"/feeds_manager"},l.createElement(T7,null)),l.createElement(r6,{path:"/job_proposals"},l.createElement(MV,null)),l.createElement(r6,{path:"/jobs"},l.createElement(_y,null)),l.createElement(r6,{path:"/runs"},l.createElement(xf,null)),l.createElement(r6,{path:"/keys"},l.createElement(ka,null)),l.createElement(r6,{path:"/nodes"},l.createElement(Od,null)),l.createElement(r6,{path:"/transactions"},l.createElement(OC,null)),l.createElement(r6,{component:oo}))))))};let OB=(0,p.wU)(e)((0,b.withStyles)(OF)(OY))},26842(e,t,n){"use strict";n.d(t,{iw:()=>U,tA:()=>$,KL:()=>H,Iw:()=>V,DQ:()=>W,cB:()=>T,LO:()=>M,t5:()=>k,qt:()=>x,Jc:()=>C,L7:()=>Y,EO:()=>B});var r,i,a=n(66289),o=n(41800),s=n.n(o),u=n(67932);(i=r||(r={})).IN_PROGRESS="in_progress",i.PENDING_INCOMING_CONFIRMATIONS="pending_incoming_confirmations",i.PENDING_CONNECTION="pending_connection",i.PENDING_BRIDGE="pending_bridge",i.PENDING_SLEEP="pending_sleep",i.ERRORED="errored",i.COMPLETED="completed";var c=n(87013),l=n(19084),f=n(34823);function d(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function h(e){if(Array.isArray(e))return d(e)}function p(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function b(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){p(a,r,i,o,s,"next",e)}function s(e){p(a,r,i,o,s,"throw",e)}o(void 0)})}}function m(e,t){return null!=t&&"undefined"!=typeof Symbol&&t[Symbol.hasInstance]?!!t[Symbol.hasInstance](e):e instanceof t}function g(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function v(){throw TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function y(e){return h(e)||g(e)||w(e)||v()}function w(e,t){if(e){if("string"==typeof e)return d(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return d(e,t)}}var _=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}},E=function(e,t){return{type:t,error:e.stack,errors:[]}},S=function(e,t){return function(n){m(n,a._7)?I(e):e(E(n,t))}},k=function(e,t){return{type:l.Ih.NOTIFY_SUCCESS,component:e,props:t}},x=function(e){return{type:l.Ih.NOTIFY_SUCCESS_MSG,msg:e}},T=function(e,t){return{type:l.Ih.NOTIFY_ERROR,component:e,error:t}},M=function(e){return{type:l.Ih.NOTIFY_ERROR_MSG,msg:e}},O=function(e){return{type:l.Mk.RECEIVE_SIGNIN_SUCCESS,authenticated:e.data.attributes.authenticated}},A=function(){return{type:l.Mk.RECEIVE_SIGNIN_FAIL}};function L(e){return function(t){return t({type:l.Mk.REQUEST_SIGNIN}),u.i.createSession(e).then(function(e){return t(O(e))}).catch(function(n){if(m(n,a._7))try{if(0==n.errors.length||null===n.errors[0].detail){t(A());return}n.errors[0].detail.json().then(function(n){if(!n){t(A());return}try{var r=JSON.parse(n.errors[0].detail);if(r.publicKey.challenge=D(r.publicKey.challenge),r.publicKey.allowCredentials.forEach(function(e){e.id=D(e.id)}),void 0===navigator.credentials){alert("Could not access credential subsystem in the browser. Must be using HTTPS or localhost."),t(A());return}navigator.credentials.get({publicKey:r.publicKey}).then(function(n){if(null===n){t(A());return}var r=n,i=r.response,a=i.authenticatorData,o=i.clientDataJSON,s=r.rawId,c=i.signature,l=i.userHandle,f=JSON.stringify({id:n.id,rawId:N(s),type:n.type,response:{authenticatorData:N(a),clientDataJSON:N(o),signature:N(c),userHandle:N(l)}});return e.webauthndata=f,u.i.createSession(e).then(function(e){return t(O(e))}).catch(function(e){t(A())})})}catch(i){t(A())}}).catch(function(e){t(A())})}catch(r){t(A())}else t(E(n,l.Mk.RECEIVE_SIGNIN_ERROR))})}}var C=function(){return{type:l.Mk.RECEIVE_SIGNOUT_SUCCESS,authenticated:!1}};function I(e){return u.i.destroySession().then(function(){return e(C())}).catch(function(t){if(m(t,a._7)){e(C());return}e(E(t,l.Mk.RECEIVE_SIGNIN_ERROR))})}function D(e){return Uint8Array.from(atob(e),function(e){return e.charCodeAt(0)})}function N(e){if(null===e)return"";var t=new Uint8Array(e),n=String.fromCharCode.apply(null,Array.from(t));return btoa(n).replace(/\+/g,"-").replace(/\//g,"_").replace(/=/g,"")}function P(e){var t=e.data.attributes.settings;return t.publicKey.challenge=D(t.publicKey.challenge),t.publicKey.user.id=D(t.publicKey.user.id),t.publicKey.excludeCredentials&&t.publicKey.excludeCredentials.forEach(function(e){e.id=D(e.id)}),navigator.credentials.create({publicKey:t.publicKey})}function R(){if(void 0===navigator.credentials){alert("Could not access credential subsystem in the browser. Must be using HTTPS or localhost.");return}return u.v2.webauthn.beginKeyRegistration({}).then(function(e){return P(e).then(function(e){if(null===e){alert("Error, could not generate credential. User declined to enroll?");return}var t=e,n=t.response,r={id:e.id,rawId:N(t.rawId),type:e.type,response:{attestationObject:N(n.attestationObject),clientDataJSON:N(n.clientDataJSON)}};return u.v2.webauthn.finishKeyRegistration(r)})}).catch(function(e){alert("Key registration error, ensure MFA_RPID and MFA_RPORIGIN environment variables are set.\n"+e)})}var j={type:l.jp.RECEIVE_CREATE_SUCCESS},F=function(e){return{type:l.jp.RECEIVE_DELETE_SUCCESS,id:e}},Y=function(e){return L(e)},B=function(){return I},U=function(){return R()},H=function(e,t,n){return function(r){return r({type:l.jp.REQUEST_DELETE}),u.v2.chains.destroyChain(e).then(function(n){r(F(e)),r(k(t,n))}).catch(function(e){S(r,l.jp.RECEIVE_DELETE_ERROR)(e),r(T(n,e))})}},$=function(e,t,n,r){return function(i){return i({type:l.jp.REQUEST_CREATE}),u.v2.jobs.createJobRunV2(e,t).then(function(e){i(j),i(k(n,e))}).catch(function(e){S(i,l.jp.RECEIVE_CREATE_ERROR)(e),i(T(r,e))})}},z=function(e){return function(t){m(t,a._7)?e(C()):e(T(function(e){return e.msg},t))}};function G(e,t,n,r){var i="UPSERT"===t?"REQUEST_".concat(e):"REQUEST_".concat(t,"_").concat(e),a="UPSERT"===t?"RESPONSE_".concat(e):"RESPONSE_".concat(t,"_").concat(e),o="".concat(t,"_").concat(e);return function(){for(var e=arguments.length,t=Array(e),s=0;s<e;s++)t[s]=arguments[s];return function(e){return e({type:i}),n.apply(void 0,y(t)).then(function(t){e({type:o,data:r(t)})}).catch(z(e)).finally(function(){return e({type:a})})}}}function W(){var e;return e=b(function(e,t){var n,r,i,a,o,s,d,h,p,b,m;return _(this,function(g){switch(g.label){case 0:if(e(n=((r={}).type=l.Y0.FETCH_BUILD_INFO_REQUESTED,r)),i=(0,f.N)(t()),o={},i.commitSHA!==c.Y.commitSHA&&i.version!==c.Y.version)return e(a=(o.type=l.Y0.FETCH_BUILD_INFO_SUCCEEDED,o.buildInfo=i,o)),[2];g.label=1;case 1:return g.trys.push([1,3,,4]),[4,u.v2.buildInfo.show()];case 2:return s=g.sent(),e(d=((h={}).type=l.Y0.FETCH_BUILD_INFO_SUCCEEDED,h.buildInfo=s,h)),[3,4];case 3:return p=g.sent(),e(b=((m={}).type=l.Y0.FETCH_BUILD_INFO_FAILED,m.error=p,m)),z(e)(p),[3,4];case 4:return[2]}})}),function(t,n){return e.apply(this,arguments)}}function K(e,t,n){return G(e,"DELETE",t,n)}var V=function(e){return K("ERRORED_JOB_RUNS",u.v2.bulkDeleteRuns.bulkDeleteJobRuns,s())({status:[r.ERRORED],updatedBefore:e})}},67932(e,t,n){"use strict";n.d(t,{i:()=>j,v2:()=>F});var r=n(66289);function i(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}var a="/sessions",o="/sessions",s=function e(t){var n=this;i(this,e),this.api=t,this.createSession=function(e){return n.create(e)},this.destroySession=function(){return n.destroy()},this.create=this.api.createResource(a),this.destroy=this.api.deleteResource(o)};function u(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}var c="/v2/bulk_delete_runs",l=function e(t){var n=this;u(this,e),this.api=t,this.bulkDeleteJobRuns=function(e){return n.destroy(e)},this.destroy=this.api.deleteResource(c)};function f(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}var d="/v2/chains/evm",h="".concat(d,"/:id"),p=function e(t){var n=this;f(this,e),this.api=t,this.getChains=function(){return n.index()},this.createChain=function(e){return n.create(e)},this.destroyChain=function(e){return n.destroy(void 0,{id:e})},this.updateChain=function(e,t){return n.update(t,{id:e})},this.index=this.api.fetchResource(d),this.create=this.api.createResource(d),this.destroy=this.api.deleteResource(h),this.update=this.api.updateResource(h)};function b(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}var m="/v2/keys/evm/chain",g=function e(t){var n=this;b(this,e),this.api=t,this.chain=function(e){var t=new URLSearchParams;t.append("address",e.address),t.append("evmChainID",e.evmChainID),null!==e.nextNonce&&t.append("nextNonce",e.nextNonce),null!==e.abandon&&t.append("abandon",String(e.abandon)),null!==e.enabled&&t.append("enabled",String(e.enabled));var r=m+"?"+t.toString();return n.api.createResource(r)()}};function v(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}var y="/v2/jobs",w="".concat(y,"/:specId/runs"),_=function e(t){var n=this;v(this,e),this.api=t,this.createJobRunV2=function(e,t){return n.post(t,{specId:e})},this.post=this.api.createResource(w,!0)};function E(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}var S="/v2/log",k=function e(t){var n=this;E(this,e),this.api=t,this.getLogConfig=function(){return n.show()},this.updateLogConfig=function(e){return n.update(e)},this.show=this.api.fetchResource(S),this.update=this.api.updateResource(S)};function x(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}var T="/v2/nodes",M=function e(t){var n=this;x(this,e),this.api=t,this.getNodes=function(){return n.index()},this.createNode=function(e){return n.create(e)},this.index=this.api.fetchResource(T),this.create=this.api.createResource(T)};function O(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}var A="/v2/enroll_webauthn",L=function e(t){var n=this;O(this,e),this.api=t,this.beginKeyRegistration=function(e){return n.create(e)},this.finishKeyRegistration=function(e){return n.put(e)},this.create=this.api.fetchResource(A),this.put=this.api.createResource(A)};function C(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}var I="/v2/build_info",D=function e(t){var n=this;C(this,e),this.api=t,this.show=function(){return n.api.GET(I)()}};function N(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}var P=function e(t){N(this,e),this.api=t,this.buildInfo=new D(this.api),this.bulkDeleteRuns=new l(this.api),this.chains=new p(this.api),this.logConfig=new k(this.api),this.nodes=new M(this.api),this.jobs=new _(this.api),this.webauthn=new L(this.api),this.evmKeys=new g(this.api)},R=new r.V0({base:void 0}),j=new s(R),F=new P(R)},1398(e,t,n){"use strict";n.d(t,{Z:()=>d});var r=n(67294),i=n(32316),a=n(83638),o=n(94184),s=n.n(o);function u(){return(u=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}var c=function(e){var t=e.palette;return(0,i.createStyles)({default:{borderColor:"#BECAD6","&:hover":{backgroundColor:t.common.white,borderColor:"#BECAD6",boxShadow:"0 2px 4px 0 rgba(0,123,255,0.06), 0 2px 2px 0 rgba(0,0,0,0.06)"}},primary:{boxShadow:"0 0",backgroundColor:t.primary.main,color:t.common.white,"&:hover":{backgroundColor:t.primary.main,boxShadow:"0 2px 4px 0 rgba(0,123,255,0.19), 0 2px 2px 0 rgba(0,0,0,0.15)"}},secondary:{"&:hover":{backgroundColor:t.common.white}},danger:{borderColor:t.error.main,color:t.error.main,"&:hover":{backgroundColor:t.common.white,borderColor:t.error.main,boxShadow:"0 2px 4px 0 rgba(0,123,255,0.06), 0 2px 2px 0 rgba(0,0,0,0.06)"}},defaultRipple:{color:t.text.secondary}})},l=function(e,t){switch(e){case"primary":return{variant:"contained"};case"secondary":case"danger":return{variant:"outlined",color:"primary"};default:return{variant:"outlined",color:"secondary",TouchRippleProps:{classes:{root:t.defaultRipple}}}}},f=function(e){var t=e.variant,n=void 0===t?"default":t,i=e.disabled,o=e.type,c=e.component,f=e.href,d=e.classes,h=e.className,p=e.children,b=e.onClick,m=e.onMouseLeave,g=Object.assign({component:c,disabled:i,href:f,onClick:b,type:o,size:e.size,onMouseLeave:m},l(n,d)),v=s()(d[n],h);return r.createElement(a.default,u({},g,{className:v}),p)};let d=(0,i.withStyles)(c)(f)},5536(e,t,n){"use strict";n.d(t,{T:()=>c});var r=n(67294),i=n(32316);function a(){return(a=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}var o=(0,i.createStyles)({animate:{animation:"spin 4s linear infinite"},"@keyframes spin":{"100%":{transform:"rotate(360deg)"}}}),s=function(e){var t=e.src,n=e.width,i=e.height,a=e.alt,o=e.classes,s=e.spin,u=void 0!==s&&s;return r.createElement("img",{src:t,className:u?o.animate:"",alt:a,width:n,height:i})},u=(0,i.withStyles)(o)(s),c=function(e){return r.createElement(u,a({},e))}},3950(e,t,n){"use strict";n.d(t,{ZP:()=>x,jK:()=>v});var r=n(67294),i=n(55977),a=n(45697),o=n.n(a),s=n(82204),u=n(71426),c=n(94184),l=n.n(c),f=n(32316),d=function(e){var t=e.palette.success||{},n=e.palette.warning||{};return{base:{paddingLeft:5*e.spacing.unit,paddingRight:5*e.spacing.unit},success:{backgroundColor:t.main,color:t.contrastText},error:{backgroundColor:e.palette.error.dark,color:e.palette.error.contrastText},warning:{backgroundColor:n.contrastText,color:n.main}}},h=function(e){var t,n=e.success,r=e.error,i=e.warning,a=e.classes,o=e.className;return n?t=a.success:r?t=a.error:i&&(t=a.warning),l()(a.base,o,t)},p=function(e){return r.createElement(s.Z,{className:h(e),square:!0},r.createElement(u.default,{variant:"body2",color:"inherit",component:"div"},e.children))};p.defaultProps={success:!1,error:!1,warning:!1},p.propTypes={success:o().bool,error:o().bool,warning:o().bool};let b=(0,f.withStyles)(d)(p);var m=function(){return r.createElement(r.Fragment,null,"Unhandled error. Please help us by opening a"," ",r.createElement("a",{href:"https://github.com/smartcontractkit/chainlink/issues/new"},"bug report"))};let g=m;function v(e){return"string"==typeof e?e:e.component?e.component(e.props):r.createElement(g,null)}function y(e,t){var n;return n="string"==typeof e?e:e.component?e.component(e.props):r.createElement(g,null),r.createElement("p",{key:t},n)}var w=function(e){var t=e.notifications;return r.createElement(b,{error:!0},t.map(y))},_=function(e){var t=e.notifications;return r.createElement(b,{success:!0},t.map(y))},E=function(e){var t=e.errors,n=e.successes;return r.createElement("div",null,(null==t?void 0:t.length)>0&&r.createElement(w,{notifications:t}),n.length>0&&r.createElement(_,{notifications:n}))},S=function(e){return{errors:e.notifications.errors,successes:e.notifications.successes}},k=(0,i.$j)(S)(E);let x=k},9409(e,t,n){"use strict";n.d(t,{ZP:()=>j});var r=n(67294),i=n(55977),a=n(47886),o=n(32316),s=n(1398),u=n(82204),c=n(30060),l=n(71426),f=n(60520),d=n(97779),h=n(57209),p=n(26842),b=n(3950),m=n(5536),g=n(45697),v=n.n(g);let y=n.p+"9f6d832ef97e8493764e.svg";function w(){return(w=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}var _=function(e){return r.createElement(m.T,w({src:y,alt:"Chainlink Operator"},e))};_.propTypes={width:v().number,height:v().number};let E=_;var S=n(15857),k=function(e){return function(t){return(0,S.DE)(e,t)}};let x=k;var T=n(9541);function M(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function O(e){if(Array.isArray(e))return e}function A(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function L(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function C(e,t){return O(e)||A(e,t)||I(e,t)||L()}function I(e,t){if(e){if("string"==typeof e)return M(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return M(e,t)}}e=n.hmd(e);var D=function(e){return{container:{height:"100%"},cardContent:{paddingTop:6*e.spacing.unit,paddingLeft:4*e.spacing.unit,paddingRight:4*e.spacing.unit,"&:last-child":{paddingBottom:6*e.spacing.unit}},headerRow:{textAlign:"center"},error:{backgroundColor:e.palette.error.light,marginTop:2*e.spacing.unit},errorText:{color:e.palette.error.main}}},N=function(e){var t=C((0,r.useState)(""),2),n=t[0],i=t[1],o=C((0,r.useState)(""),2),h=o[0],p=o[1],m=function(e){return function(t){"email"===e&&i(t.target.value),"password"===e&&p(t.target.value)}},g=function(t){t.preventDefault(),e.submitSignIn({email:n,password:h})},v=e.classes,y=e.fetching,w=e.authenticated,_=e.errors;return w?r.createElement(a.l_,{to:(0,T.Tp)()||"/"}):r.createElement(d.Z,{container:!0,justify:"center",alignItems:"center",className:v.container,spacing:0},r.createElement(d.Z,{item:!0,xs:10,sm:6,md:4,lg:3,xl:2},r.createElement(u.Z,null,r.createElement(c.Z,{className:v.cardContent},r.createElement("form",{noValidate:!0,onSubmit:g},r.createElement(d.Z,{container:!0,spacing:8},r.createElement(d.Z,{item:!0,xs:12},r.createElement(d.Z,{container:!0,spacing:0},r.createElement(d.Z,{item:!0,xs:12,className:v.headerRow},r.createElement(E,{width:50})),r.createElement(d.Z,{item:!0,xs:12,className:v.headerRow},r.createElement(l.default,{variant:"h5"},"Operator")))),_.length>0&&_.map(function(e,t){return r.createElement(d.Z,{item:!0,xs:12,key:t},r.createElement(u.Z,{raised:!1,className:v.error},r.createElement(c.Z,null,r.createElement(l.default,{variant:"body1",className:v.errorText},(0,b.jK)(e)))))}),r.createElement(d.Z,{item:!0,xs:12},r.createElement(f.Z,{id:"email",label:"Email",margin:"normal",value:n,onChange:m("email"),error:_.length>0,variant:"outlined",fullWidth:!0})),r.createElement(d.Z,{item:!0,xs:12},r.createElement(f.Z,{id:"password",label:"Password",type:"password",autoComplete:"password",margin:"normal",value:h,onChange:m("password"),error:_.length>0,variant:"outlined",fullWidth:!0})),r.createElement(d.Z,{item:!0,xs:12},r.createElement(d.Z,{container:!0,spacing:0,justify:"center"},r.createElement(d.Z,{item:!0},r.createElement(s.Z,{type:"submit",variant:"primary"},"Access Account")))),y&&r.createElement(l.default,{variant:"body1",color:"textSecondary"},"Signing in...")))))))},P=function(e){return{fetching:e.authentication.fetching,authenticated:e.authentication.allowed,errors:e.notifications.errors}},R=(0,i.$j)(P,x({submitSignIn:p.L7}))(N);let j=(0,h.wU)(e)((0,o.withStyles)(D)(R))},16353(e,t,n){"use strict";n.d(t,{ZP:()=>H,rH:()=>U});var r,i=n(55977),a=n(15857),o=n(9541),s=n(19084);function u(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function c(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){u(e,t,n[t])})}return e}function l(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),n.push.apply(n,r)}return n}function f(e,t){return t=null!=t?t:{},Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):l(Object(t)).forEach(function(n){Object.defineProperty(e,n,Object.getOwnPropertyDescriptor(t,n))}),e}var d,h=c({},{allowed:!1,errors:[]},o.pm()),p=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:h,t=arguments.length>1?arguments[1]:void 0;switch(t.type){case s.Mk.RECEIVE_SIGNOUT_SUCCESS:case s.Mk.RECEIVE_SIGNIN_SUCCESS:var n={allowed:t.authenticated};return o.Ks(n),f(c({},e,n),{errors:[]});case s.Mk.RECEIVE_SIGNIN_FAIL:var r={allowed:!1};return o.Ks(r),f(c({},e,r),{errors:[]});case s.Mk.RECEIVE_SIGNIN_ERROR:case s.Mk.RECEIVE_SIGNOUT_ERROR:var i={allowed:!1};return o.Ks(i),f(c({},e,i),{errors:t.errors||[]});default:return e}};let b=p;function m(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function g(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){m(e,t,n[t])})}return e}function v(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),n.push.apply(n,r)}return n}function y(e,t){return t=null!=t?t:{},Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):v(Object(t)).forEach(function(n){Object.defineProperty(e,n,Object.getOwnPropertyDescriptor(t,n))}),e}var w,_={count:0};(w=r||(r={})).REQUEST="REQUEST_",w.RECEIVE="RECEIVE_",w.RESPONSE="RESPONSE_";var E=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:_,t=arguments.length>1?arguments[1]:void 0;return t.type?t.type.startsWith(r.REQUEST)?y(g({},e),{count:e.count+1}):t.type.startsWith(r.RECEIVE)?y(g({},e),{count:Math.max(e.count-1,0)}):t.type.startsWith(r.RESPONSE)?y(g({},e),{count:Math.max(e.count-1,0)}):t.type===s.di.REDIRECT?y(g({},e),{count:0}):e:e};let S=E;function k(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function x(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){k(e,t,n[t])})}return e}function T(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),n.push.apply(n,r)}return n}function M(e,t){return t=null!=t?t:{},Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):T(Object(t)).forEach(function(n){Object.defineProperty(e,n,Object.getOwnPropertyDescriptor(t,n))}),e}var O={errors:[],successes:[],currentUrl:void 0},A=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:O,t=arguments.length>1?arguments[1]:void 0;switch(t.type){case s.di.MATCH_ROUTE:return M(x({},O),{currentUrl:t.pathname});case s.Ih.NOTIFY_SUCCESS:var n={component:t.component,props:t.props};return M(x({},e),{successes:[n],errors:[]});case s.Ih.NOTIFY_SUCCESS_MSG:return M(x({},e),{successes:[t.msg],errors:[]});case s.Ih.NOTIFY_ERROR:var r=t.error.errors,i=null==r?void 0:r.map(function(e){return L(t,e)});return M(x({},e),{successes:[],errors:i});case s.Ih.NOTIFY_ERROR_MSG:return M(x({},e),{successes:[],errors:[t.msg]});case s.Mk.RECEIVE_SIGNIN_FAIL:return M(x({},e),{successes:[],errors:["Your email or password is incorrect. Please try again"]});default:return e}};function L(e,t){return{component:e.component,props:{msg:t.detail}}}let C=A;function I(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function D(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){I(e,t,n[t])})}return e}function N(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),n.push.apply(n,r)}return n}function P(e,t){return t=null!=t?t:{},Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(t)):N(Object(t)).forEach(function(n){Object.defineProperty(e,n,Object.getOwnPropertyDescriptor(t,n))}),e}var R={to:void 0},j=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:R,t=arguments.length>1?arguments[1]:void 0;switch(t.type){case s.di.REDIRECT:return P(D({},e),{to:t.to});case s.di.MATCH_ROUTE:return P(D({},e),{to:void 0});default:return e}};let F=j;var Y=n(87013),B=(0,a.UY)({authentication:b,fetching:S,notifications:C,redirect:F,buildInfo:Y.Z});B(void 0,{type:"INITIAL_STATE"});var U=i.v9;let H=B},19084(e,t,n){"use strict";var r,i,a,o,s,u,c,l,f,d;n.d(t,{Ih:()=>i,Mk:()=>a,Y0:()=>s,di:()=>r,jp:()=>o}),n(67294),(u=r||(r={})).REDIRECT="REDIRECT",u.MATCH_ROUTE="MATCH_ROUTE",(c=i||(i={})).NOTIFY_SUCCESS="NOTIFY_SUCCESS",c.NOTIFY_SUCCESS_MSG="NOTIFY_SUCCESS_MSG",c.NOTIFY_ERROR="NOTIFY_ERROR",c.NOTIFY_ERROR_MSG="NOTIFY_ERROR_MSG",(l=a||(a={})).REQUEST_SIGNIN="REQUEST_SIGNIN",l.RECEIVE_SIGNIN_SUCCESS="RECEIVE_SIGNIN_SUCCESS",l.RECEIVE_SIGNIN_FAIL="RECEIVE_SIGNIN_FAIL",l.RECEIVE_SIGNIN_ERROR="RECEIVE_SIGNIN_ERROR",l.RECEIVE_SIGNOUT_SUCCESS="RECEIVE_SIGNOUT_SUCCESS",l.RECEIVE_SIGNOUT_ERROR="RECEIVE_SIGNOUT_ERROR",(f=o||(o={})).RECEIVE_CREATE_ERROR="RECEIVE_CREATE_ERROR",f.RECEIVE_CREATE_SUCCESS="RECEIVE_CREATE_SUCCESS",f.RECEIVE_DELETE_ERROR="RECEIVE_DELETE_ERROR",f.RECEIVE_DELETE_SUCCESS="RECEIVE_DELETE_SUCCESS",f.RECEIVE_UPDATE_ERROR="RECEIVE_UPDATE_ERROR",f.RECEIVE_UPDATE_SUCCESS="RECEIVE_UPDATE_SUCCESS",f.REQUEST_CREATE="REQUEST_CREATE",f.REQUEST_DELETE="REQUEST_DELETE",f.REQUEST_UPDATE="REQUEST_UPDATE",f.UPSERT_CONFIGURATION="UPSERT_CONFIGURATION",f.UPSERT_JOB_RUN="UPSERT_JOB_RUN",f.UPSERT_JOB_RUNS="UPSERT_JOB_RUNS",f.UPSERT_TRANSACTION="UPSERT_TRANSACTION",f.UPSERT_TRANSACTIONS="UPSERT_TRANSACTIONS",f.UPSERT_BUILD_INFO="UPSERT_BUILD_INFO",(d=s||(s={})).FETCH_BUILD_INFO_REQUESTED="FETCH_BUILD_INFO_REQUESTED",d.FETCH_BUILD_INFO_SUCCEEDED="FETCH_BUILD_INFO_SUCCEEDED",d.FETCH_BUILD_INFO_FAILED="FETCH_BUILD_INFO_FAILED"},87013(e,t,n){"use strict";n.d(t,{Y:()=>o,Z:()=>u});var r=n(19084);function i(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function a(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{},r=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&(r=r.concat(Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable}))),r.forEach(function(t){i(e,t,n[t])})}return e}var o={commitSHA:"unknown",version:"unknown"},s=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:o,t=arguments.length>1?arguments[1]:void 0;return t.type===r.Y0.FETCH_BUILD_INFO_SUCCEEDED?a({},t.buildInfo):e};let u=s},34823(e,t,n){"use strict";n.d(t,{N:()=>r});var r=function(e){return e.buildInfo}},73343(e,t,n){"use strict";n.d(t,{r:()=>u});var r=n(19350),i=n(32316),a=n(59114),o=n(5324),s={props:{MuiGrid:{spacing:3*o.default.unit},MuiCardHeader:{titleTypographyProps:{color:"secondary"}}},palette:{action:{hoverOpacity:.3},primary:{light:"#E5F1FF",main:"#3c40c6",contrastText:"#fff"},secondary:{main:"#3d5170"},success:{light:"#e8faf1",main:r.ek.A700,dark:r.ek[700],contrastText:r.y0.white},warning:{light:"#FFFBF1",main:"#fff6b6",contrastText:"#fad27a"},error:{light:"#ffdada",main:"#f44336",dark:"#d32f2f",contrastText:"#fff"},background:{default:"#f5f6f8",appBar:"#3c40c6"},text:{primary:(0,a.darken)(r.BA.A700,.7),secondary:"#818ea3"},listPendingStatus:{background:"#fef7e5",color:"#fecb4c"},listCompletedStatus:{background:"#e9faf2",color:"#4ed495"}},shape:{borderRadius:o.default.unit},overrides:{MuiButton:{root:{borderRadius:o.default.unit/2,textTransform:"none"},sizeLarge:{padding:void 0,fontSize:void 0,paddingTop:o.default.unit,paddingBottom:o.default.unit,paddingLeft:5*o.default.unit,paddingRight:5*o.default.unit}},MuiTableCell:{body:{fontSize:"1rem"},head:{fontSize:"1rem",fontWeight:400}},MuiCardHeader:{root:{borderBottom:"1px solid rgba(0, 0, 0, 0.12)"},action:{marginTop:-2,marginRight:0,"& >*":{marginLeft:2*o.default.unit}},subheader:{marginTop:.5*o.default.unit}}},typography:{useNextVariants:!0,fontFamily:"-apple-system,BlinkMacSystemFont,Roboto,Helvetica,Arial,sans-serif",button:{textTransform:"none",fontSize:"1.2em"},body1:{fontSize:"1.0rem",fontWeight:400,lineHeight:"1.46429em",color:"rgba(0, 0, 0, 0.87)",letterSpacing:-.4},body2:{fontSize:"1.0rem",fontWeight:500,lineHeight:"1.71429em",color:"rgba(0, 0, 0, 0.87)",letterSpacing:-.4},body1Next:{color:"rgb(29, 29, 29)",fontWeight:400,fontSize:"1rem",lineHeight:1.5,letterSpacing:-.4},body2Next:{color:"rgb(29, 29, 29)",fontWeight:400,fontSize:"0.875rem",lineHeight:1.5,letterSpacing:-.4},display1:{color:"#818ea3",fontSize:"2.125rem",fontWeight:400,lineHeight:"1.20588em",letterSpacing:-.4},display2:{color:"#818ea3",fontSize:"2.8125rem",fontWeight:400,lineHeight:"1.13333em",marginLeft:"-.02em",letterSpacing:-.4},display3:{color:"#818ea3",fontSize:"3.5rem",fontWeight:400,lineHeight:"1.30357em",marginLeft:"-.02em",letterSpacing:-.4},display4:{fontSize:14,fontWeightLight:300,fontWeightMedium:500,fontWeightRegular:400,letterSpacing:-.4},h1:{color:"rgb(29, 29, 29)",fontSize:"6rem",fontWeight:300,lineHeight:1},h2:{color:"rgb(29, 29, 29)",fontSize:"3.75rem",fontWeight:300,lineHeight:1},h3:{color:"rgb(29, 29, 29)",fontSize:"3rem",fontWeight:400,lineHeight:1.04},h4:{color:"rgb(29, 29, 29)",fontSize:"2.125rem",fontWeight:400,lineHeight:1.17},h5:{color:"rgb(29, 29, 29)",fontSize:"1.5rem",fontWeight:400,lineHeight:1.33,letterSpacing:-.4},h6:{fontSize:"0.8rem",fontWeight:450,lineHeight:"1.71429em",color:"rgba(0, 0, 0, 0.87)",letterSpacing:-.4},subheading:{color:"rgb(29, 29, 29)",fontSize:"1rem",fontWeight:400,lineHeight:"1.5em",letterSpacing:-.4},subtitle1:{color:"rgb(29, 29, 29)",fontSize:"1rem",fontWeight:400,lineHeight:1.75,letterSpacing:-.4},subtitle2:{color:"rgb(29, 29, 29)",fontSize:"0.875rem",fontWeight:500,lineHeight:1.57,letterSpacing:-.4}},shadows:["none","0px 1px 3px 0px rgba(0, 0, 0, 0.1),0px 1px 1px 0px rgba(0, 0, 0, 0.04),0px 2px 1px -1px rgba(0, 0, 0, 0.02)","0px 1px 5px 0px rgba(0, 0, 0, 0.1),0px 2px 2px 0px rgba(0, 0, 0, 0.04),0px 3px 1px -2px rgba(0, 0, 0, 0.02)","0px 1px 8px 0px rgba(0, 0, 0, 0.1),0px 3px 4px 0px rgba(0, 0, 0, 0.04),0px 3px 3px -2px rgba(0, 0, 0, 0.02)","0px 2px 4px -1px rgba(0, 0, 0, 0.1),0px 4px 5px 0px rgba(0, 0, 0, 0.04),0px 1px 10px 0px rgba(0, 0, 0, 0.02)","0px 3px 5px -1px rgba(0, 0, 0, 0.1),0px 5px 8px 0px rgba(0, 0, 0, 0.04),0px 1px 14px 0px rgba(0, 0, 0, 0.02)","0px 3px 5px -1px rgba(0, 0, 0, 0.1),0px 6px 10px 0px rgba(0, 0, 0, 0.04),0px 1px 18px 0px rgba(0, 0, 0, 0.02)","0px 4px 5px -2px rgba(0, 0, 0, 0.1),0px 7px 10px 1px rgba(0, 0, 0, 0.04),0px 2px 16px 1px rgba(0, 0, 0, 0.02)","0px 5px 5px -3px rgba(0, 0, 0, 0.1),0px 8px 10px 1px rgba(0, 0, 0, 0.04),0px 3px 14px 2px rgba(0, 0, 0, 0.02)","0px 5px 6px -3px rgba(0, 0, 0, 0.1),0px 9px 12px 1px rgba(0, 0, 0, 0.04),0px 3px 16px 2px rgba(0, 0, 0, 0.02)","0px 6px 6px -3px rgba(0, 0, 0, 0.1),0px 10px 14px 1px rgba(0, 0, 0, 0.04),0px 4px 18px 3px rgba(0, 0, 0, 0.02)","0px 6px 7px -4px rgba(0, 0, 0, 0.1),0px 11px 15px 1px rgba(0, 0, 0, 0.04),0px 4px 20px 3px rgba(0, 0, 0, 0.02)","0px 7px 8px -4px rgba(0, 0, 0, 0.1),0px 12px 17px 2px rgba(0, 0, 0, 0.04),0px 5px 22px 4px rgba(0, 0, 0, 0.02)","0px 7px 8px -4px rgba(0, 0, 0, 0.1),0px 13px 19px 2px rgba(0, 0, 0, 0.04),0px 5px 24px 4px rgba(0, 0, 0, 0.02)","0px 7px 9px -4px rgba(0, 0, 0, 0.1),0px 14px 21px 2px rgba(0, 0, 0, 0.04),0px 5px 26px 4px rgba(0, 0, 0, 0.02)","0px 8px 9px -5px rgba(0, 0, 0, 0.1),0px 15px 22px 2px rgba(0, 0, 0, 0.04),0px 6px 28px 5px rgba(0, 0, 0, 0.02)","0px 8px 10px -5px rgba(0, 0, 0, 0.1),0px 16px 24px 2px rgba(0, 0, 0, 0.04),0px 6px 30px 5px rgba(0, 0, 0, 0.02)","0px 8px 11px -5px rgba(0, 0, 0, 0.1),0px 17px 26px 2px rgba(0, 0, 0, 0.04),0px 6px 32px 5px rgba(0, 0, 0, 0.02)","0px 9px 11px -5px rgba(0, 0, 0, 0.1),0px 18px 28px 2px rgba(0, 0, 0, 0.04),0px 7px 34px 6px rgba(0, 0, 0, 0.02)","0px 9px 12px -6px rgba(0, 0, 0, 0.1),0px 19px 29px 2px rgba(0, 0, 0, 0.04),0px 7px 36px 6px rgba(0, 0, 0, 0.02)","0px 10px 13px -6px rgba(0, 0, 0, 0.1),0px 20px 31px 3px rgba(0, 0, 0, 0.04),0px 8px 38px 7px rgba(0, 0, 0, 0.02)","0px 10px 13px -6px rgba(0, 0, 0, 0.1),0px 21px 33px 3px rgba(0, 0, 0, 0.04),0px 8px 40px 7px rgba(0, 0, 0, 0.02)","0px 10px 14px -6px rgba(0, 0, 0, 0.1),0px 22px 35px 3px rgba(0, 0, 0, 0.04),0px 8px 42px 7px rgba(0, 0, 0, 0.02)","0px 11px 14px -7px rgba(0, 0, 0, 0.1),0px 23px 36px 3px rgba(0, 0, 0, 0.04),0px 9px 44px 8px rgba(0, 0, 0, 0.02)","0px 11px 15px -7px rgba(0, 0, 0, 0.1),0px 24px 38px 3px rgba(0, 0, 0, 0.04),0px 9px 46px 8px rgba(0, 0, 0, 0.02)",]},u=(0,i.createMuiTheme)(s)},66289(e,t,n){"use strict";function r(e){if(void 0===e)throw ReferenceError("this hasn't been initialised - super() hasn't been called");return e}function i(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}function a(){if("undefined"==typeof Reflect||!Reflect.construct||Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],function(){})),!0}catch(e){return!1}}function o(e,t,n){return(o=a()?Reflect.construct:function(e,t,n){var r=[null];r.push.apply(r,t);var i=new(Function.bind.apply(e,r));return n&&f(i,n.prototype),i}).apply(null,arguments)}function s(e){return(s=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function u(e,t){if("function"!=typeof t&&null!==t)throw TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&f(e,t)}function c(e){return -1!==Function.toString.call(e).indexOf("[native code]")}function l(e,t){return t&&("object"===p(t)||"function"==typeof t)?t:r(e)}function f(e,t){return(f=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}n.d(t,{V0:()=>B,_7:()=>v});var d,h,p=function(e){return e&&"undefined"!=typeof Symbol&&e.constructor===Symbol?"symbol":typeof e};function b(e){var t="function"==typeof Map?new Map:void 0;return(b=function(e){if(null===e||!c(e))return e;if("function"!=typeof e)throw TypeError("Super expression must either be null or a function");if(void 0!==t){if(t.has(e))return t.get(e);t.set(e,n)}function n(){return o(e,arguments,s(this).constructor)}return n.prototype=Object.create(e.prototype,{constructor:{value:n,enumerable:!1,writable:!0,configurable:!0}}),f(n,e)})(e)}function m(){if("undefined"==typeof Reflect||!Reflect.construct||Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){})),!0}catch(e){return!1}}function g(e){var t=m();return function(){var n,r=s(e);if(t){var i=s(this).constructor;n=Reflect.construct(r,arguments,i)}else n=r.apply(this,arguments);return l(this,n)}}var v=function(e){u(n,e);var t=g(n);function n(e){var r;return i(this,n),(r=t.call(this,"AuthenticationError(".concat(e.statusText,")"))).errors=[{status:e.status,detail:e},],r}return n}(b(Error)),y=function(e){u(n,e);var t=g(n);function n(e){var r,a=e.errors;return i(this,n),(r=t.call(this,"BadRequestError")).errors=a,r}return n}(b(Error)),w=function(e){u(n,e);var t=g(n);function n(e){var r;return i(this,n),(r=t.call(this,"UnprocessableEntityError")).errors=e,r}return n}(b(Error)),_=function(e){u(n,e);var t=g(n);function n(e){var r;return i(this,n),(r=t.call(this,"ServerError")).errors=e,r}return n}(b(Error)),E=function(e){u(n,e);var t=g(n);function n(e){var r,a=e.errors;return i(this,n),(r=t.call(this,"ConflictError")).errors=a,r}return n}(b(Error)),S=function(e){u(n,e);var t=g(n);function n(e){var r;return i(this,n),(r=t.call(this,"UnknownResponseError(".concat(e.statusText,")"))).errors=[{status:e.status,detail:e.statusText},],r}return n}(b(Error));function k(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:2e4;return Promise.race([fetch(e,t),new Promise(function(e,t){return setTimeout(function(){return t(Error("timeout"))},n)}),])}function x(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function T(e){if(Array.isArray(e))return e}function M(e,t){var n,r,i=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=i){var a=[],o=!0,s=!1;try{for(i=i.call(e);!(o=(n=i.next()).done)&&(a.push(n.value),!t||a.length!==t);o=!0);}catch(u){s=!0,r=u}finally{try{o||null==i.return||i.return()}finally{if(s)throw r}}return a}}function O(){throw TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function A(e,t){return T(e)||M(e,t)||L(e,t)||O()}function L(e,t){if(e){if("string"==typeof e)return x(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return x(e,t)}}function C(e,t){return e===h.GET?function(){return{method:"GET",credentials:"include"}}:I(e,t)}function I(e,t){return function(n){return{method:e,body:t?n:JSON.stringify(n),credentials:"include",headers:{Accept:"application/json","Content-Type":"application/json"}}}}function D(e,t,n){var r;try{r=new URL(t,e)}catch(i){var a=i.message;throw Error("Error when creating url with path=".concat(t,", base=").concat(e,": ").concat(a))}return n&&Object.entries(n).forEach(function(e){var t=A(e,2),n=t[0],i=t[1];return"string"==typeof i?r.searchParams.append(n,i):void 0!=i?r.searchParams.append(n,i.toString()):void 0}),r}n(80204),(d=h||(h={})).GET="GET",d.POST="POST",d.PATCH="PATCH",d.DELETE="DELETE";var N=n(14779),P=n.n(N);function R(e,t,n,r,i,a,o){try{var s=e[a](o),u=s.value}catch(c){n(c);return}s.done?t(u):Promise.resolve(u).then(r,i)}function j(e){return function(){var t=this,n=arguments;return new Promise(function(r,i){var a=e.apply(t,n);function o(e){R(a,r,i,o,s,"next",e)}function s(e){R(a,r,i,o,s,"throw",e)}o(void 0)})}}function F(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}var Y=function(e,t){var n,r,i,a,o={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return a={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function s(e){return function(t){return u([e,t])}}function u(a){if(n)throw TypeError("Generator is already executing.");for(;o;)try{if(n=1,r&&(i=2&a[0]?r.return:a[0]?r.throw||((i=r.return)&&i.call(r),0):r.next)&&!(i=i.call(r,a[1])).done)return i;switch(r=0,i&&(a=[2&a[0],i.value]),a[0]){case 0:case 1:i=a;break;case 4:return o.label++,{value:a[1],done:!1};case 5:o.label++,r=a[1],a=[0];continue;case 7:a=o.ops.pop(),o.trys.pop();continue;default:if(!(i=(i=o.trys).length>0&&i[i.length-1])&&(6===a[0]||2===a[0])){o=0;continue}if(3===a[0]&&(!i||a[1]>i[0]&&a[1]<i[3])){o.label=a[1];break}if(6===a[0]&&o.label<i[1]){o.label=i[1],i=a;break}if(i&&o.label<i[2]){o.label=i[2],o.ops.push(a);break}i[2]&&o.ops.pop(),o.trys.pop();continue}a=t.call(e,o)}catch(s){a=[6,s],r=0}finally{n=i=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}},B=function(){function e(t){F(this,e),this.options=t,this.fetchResource=this.methodFactory(h.GET),this.GET=this.methodFactory(h.GET),this.createResource=this.methodFactory(h.POST),this.POST=this.methodFactory(h.POST),this.updateResource=this.methodFactory(h.PATCH),this.PATCH=this.methodFactory(h.PATCH),this.deleteResource=this.methodFactory(h.DELETE),this.DELETE=this.methodFactory(h.DELETE)}return e.prototype.methodFactory=function(e){var t=this;return function(n,r){var i=P().compile(n);return function(a,o){var s,u=o?i(o):n,c=e===h.GET?a:{},l=D(null!==(s=t.options.base)&&void 0!==s?s:location.origin,u,c),f=C(e,r);return k(l.toString(),f(a)).then(function(e){return U(e)})}}},e}();function U(e){return H.apply(this,arguments)}function H(){return(H=j(function(e){var t,n,r;return Y(this,function(i){switch(i.label){case 0:if(204!==e.status)return[3,1];return[2,t={}];case 1:if(!(e.status>=200&&e.status<300))return[3,2];return[2,e.json()];case 2:if(400!==e.status)return[3,3];return[2,e.json().then(function(e){throw new y(e)})];case 3:if(401!==e.status)return[3,4];throw new v(e);case 4:if(422!==e.status)return[3,6];return[4,$(e)];case 5:throw n=i.sent(),new w(n);case 6:if(409!==e.status)return[3,7];return[2,e.json().then(function(e){throw new E(e)})];case 7:if(!(e.status>=500))return[3,9];return[4,$(e)];case 8:throw r=i.sent(),new _(r);case 9:throw new S(e);case 10:return[2]}})})).apply(this,arguments)}function $(e){return z.apply(this,arguments)}function z(){return(z=j(function(e){return Y(this,function(t){return[2,e.json().then(function(t){return t.errors?t.errors.map(function(t){return{status:e.status,detail:t.detail}}):G(e)}).catch(function(){return G(e)})]})})).apply(this,arguments)}function G(e){return[{status:e.status,detail:e.statusText},]}},50109(e,t,n){"use strict";n.d(t,{LK:()=>o,U2:()=>i,eT:()=>s,t8:()=>a});var r=n(12795);function i(e){return r.ZP.getItem("chainlink.".concat(e))}function a(e,t){r.ZP.setItem("chainlink.".concat(e),t)}function o(e){var t=i(e),n={};if(t)try{return JSON.parse(t)}catch(r){}return n}function s(e,t){a(e,JSON.stringify(t))}},9541(e,t,n){"use strict";n.d(t,{Ks:()=>u,Tp:()=>a,iR:()=>o,pm:()=>s});var r=n(50109),i="persistURL";function a(){return r.U2(i)||""}function o(e){r.t8(i,e)}function s(){return r.LK("authentication")}function u(e){r.eT("authentication",e)}},67121(e,t,n){"use strict";function r(e){var t,n=e.Symbol;return"function"==typeof n?n.observable?t=n.observable:(t=n("observable"),n.observable=t):t="@@observable",t}n.r(t),n.d(t,{default:()=>o}),e=n.hmd(e),i="undefined"!=typeof self?self:"undefined"!=typeof window?window:void 0!==n.g?n.g:e;var i,a=r(i);let o=a},2177(e,t,n){"use strict";n.d(t,{Z:()=>o});var r=!0,i="Invariant failed";function a(e,t){if(!e){if(r)throw Error(i);throw Error(i+": "+(t||""))}}let o=a},11742(e){e.exports=function(){var e=document.getSelection();if(!e.rangeCount)return function(){};for(var t=document.activeElement,n=[],r=0;r<e.rangeCount;r++)n.push(e.getRangeAt(r));switch(t.tagName.toUpperCase()){case"INPUT":case"TEXTAREA":t.blur();break;default:t=null}return e.removeAllRanges(),function(){"Caret"===e.type&&e.removeAllRanges(),e.rangeCount||n.forEach(function(t){e.addRange(t)}),t&&t.focus()}}},94633(e){function t(e,t){var n=e.length,a=Array(n),o={},s=n,u=r(t),c=i(e);for(t.forEach(function(e){if(!c.has(e[0])||!c.has(e[1]))throw Error("Unknown node. There is an unknown node in the supplied edges.")});s--;)o[s]||l(e[s],s,new Set);return a;function l(e,t,r){if(r.has(e)){var i;try{i=", node was:"+JSON.stringify(e)}catch(s){i=""}throw Error("Cyclic dependency"+i)}if(!c.has(e))throw Error("Found unknown node. Make sure to provided all involved nodes. Unknown node: "+JSON.stringify(e));if(!o[t]){o[t]=!0;var f=u.get(e)||new Set;if(t=(f=Array.from(f)).length){r.add(e);do{var d=f[--t];l(d,c.get(d),r)}while(t)r.delete(e)}a[--n]=e}}}function n(e){for(var t=new Set,n=0,r=e.length;n<r;n++){var i=e[n];t.add(i[0]),t.add(i[1])}return Array.from(t)}function r(e){for(var t=new Map,n=0,r=e.length;n<r;n++){var i=e[n];t.has(i[0])||t.set(i[0],new Set),t.has(i[1])||t.set(i[1],new Set),t.get(i[0]).add(i[1])}return t}function i(e){for(var t=new Map,n=0,r=e.length;n<r;n++)t.set(e[n],n);return t}e.exports=function(e){return t(n(e),e)},e.exports.array=t},70655(e,t,n){"use strict";n.d(t,{ZT:()=>i,pi:()=>a});var r=function(e,t){return(r=Object.setPrototypeOf||({__proto__:[]})instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n])})(e,t)};function i(e,t){if("function"!=typeof t&&null!==t)throw TypeError("Class extends value "+String(t)+" is not a constructor or null");function n(){this.constructor=e}r(e,t),e.prototype=null===t?Object.create(t):(n.prototype=t.prototype,new n)}var a=function(){return(a=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var i in t=arguments[n])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)}},25869(e,t,n){"use strict";function r(e,t){return t=t||{},new Promise(function(n,r){var i=new XMLHttpRequest,a=[],o=[],s={},u=function(){return{ok:2==(i.status/100|0),statusText:i.statusText,status:i.status,url:i.responseURL,text:function(){return Promise.resolve(i.responseText)},json:function(){return Promise.resolve(i.responseText).then(JSON.parse)},blob:function(){return Promise.resolve(new Blob([i.response]))},clone:u,headers:{keys:function(){return a},entries:function(){return o},get:function(e){return s[e.toLowerCase()]},has:function(e){return e.toLowerCase() in s}}}};for(var c in i.open(t.method||"get",e,!0),i.onload=function(){i.getAllResponseHeaders().replace(/^(.*?):[^\S\n]*([\s\S]*?)$/gm,function(e,t,n){a.push(t=t.toLowerCase()),o.push([t,n]),s[t]=s[t]?s[t]+","+n:n}),n(u())},i.onerror=r,i.withCredentials="include"==t.credentials,t.headers)i.setRequestHeader(c,t.headers[c]);i.send(t.body||null)})}n.r(t),n.d(t,{default:()=>r})},94927(e,t,n){function r(e,t){if(i("noDeprecation"))return e;var n=!1;function r(){if(!n){if(i("throwDeprecation"))throw Error(t);i("traceDeprecation")?console.trace(t):console.warn(t),n=!0}return e.apply(this,arguments)}return r}function i(e){try{if(!n.g.localStorage)return!1}catch(t){return!1}var r=n.g.localStorage[e];return null!=r&&"true"===String(r).toLowerCase()}e.exports=r},42473(e){"use strict";var t=function(){};e.exports=t},84763(e){e.exports=Worker},47529(e){e.exports=n;var t=Object.prototype.hasOwnProperty;function n(){for(var e={},n=0;n<arguments.length;n++){var r=arguments[n];for(var i in r)t.call(r,i)&&(e[i]=r[i])}return e}},52361(){},94616(){},90853(e,t,n){var r=n(34660);function i(e,t){e.prototype=Object.create(t.prototype),e.prototype.constructor=e,r(e,t)}e.exports=i,e.exports.__esModule=!0,e.exports.default=e.exports},66569(e){function t(e){return e&&e.__esModule?e:{default:e}}e.exports=t,e.exports.__esModule=!0,e.exports.default=e.exports},34660(e){function t(n,r){return e.exports=t=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(e,t){return e.__proto__=t,e},e.exports.__esModule=!0,e.exports.default=e.exports,t(n,r)}e.exports=t,e.exports.__esModule=!0,e.exports.default=e.exports},1644(e,t,n){"use strict";var r,i;function a(e){return!!e&&e<7}n.d(t,{I:()=>r,O:()=>a}),(i=r||(r={}))[i.loading=1]="loading",i[i.setVariables=2]="setVariables",i[i.fetchMore=3]="fetchMore",i[i.refetch=4]="refetch",i[i.poll=6]="poll",i[i.ready=7]="ready",i[i.error=8]="error"},30990(e,t,n){"use strict";n.d(t,{MS:()=>s,YG:()=>a,cA:()=>c,ls:()=>o});var r=n(23564);n(83952);var i=n(13154),a=Symbol();function o(e){return!!e.extensions&&Array.isArray(e.extensions[a])}function s(e){return e.hasOwnProperty("graphQLErrors")}var u=function(e){var t=(0,r.ev)((0,r.ev)((0,r.ev)([],e.graphQLErrors,!0),e.clientErrors,!0),e.protocolErrors,!0);return e.networkError&&t.push(e.networkError),t.map(function(e){return(0,i.s)(e)&&e.message||"Error message not found."}).join("\n")},c=function(e){function t(n){var r=n.graphQLErrors,i=n.protocolErrors,a=n.clientErrors,o=n.networkError,s=n.errorMessage,c=n.extraInfo,l=e.call(this,s)||this;return l.name="ApolloError",l.graphQLErrors=r||[],l.protocolErrors=i||[],l.clientErrors=a||[],l.networkError=o||null,l.message=s||u(l),l.extraInfo=c,l.__proto__=t.prototype,l}return(0,r.ZT)(t,e),t}(Error)},85317(e,t,n){"use strict";n.d(t,{K:()=>a});var r=n(67294),i=n(30320).aS?Symbol.for("__APOLLO_CONTEXT__"):"__APOLLO_CONTEXT__";function a(){var e=r.createContext[i];return e||(Object.defineProperty(r.createContext,i,{value:e=r.createContext({}),enumerable:!1,writable:!1,configurable:!0}),e.displayName="ApolloContext"),e}},21436(e,t,n){"use strict";n.d(t,{O:()=>i,k:()=>r});var r=Array.isArray;function i(e){return Array.isArray(e)&&e.length>0}},30320(e,t,n){"use strict";n.d(t,{DN:()=>s,JC:()=>l,aS:()=>o,mr:()=>i,sy:()=>a});var r=n(83952),i="function"==typeof WeakMap&&"ReactNative"!==(0,r.wY)(function(){return navigator.product}),a="function"==typeof WeakSet,o="function"==typeof Symbol&&"function"==typeof Symbol.for,s=o&&Symbol.asyncIterator,u="function"==typeof(0,r.wY)(function(){return window.document.createElement}),c=(0,r.wY)(function(){return navigator.userAgent.indexOf("jsdom")>=0})||!1,l=u&&!c},53712(e,t,n){"use strict";function r(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=Object.create(null);return e.forEach(function(e){e&&Object.keys(e).forEach(function(t){var r=e[t];void 0!==r&&(n[t]=r)})}),n}n.d(t,{o:()=>r})},10542(e,t,n){"use strict";n.d(t,{J:()=>o}),n(83952);var r=n(13154);function i(e){var t=new Set([e]);return t.forEach(function(e){(0,r.s)(e)&&a(e)===e&&Object.getOwnPropertyNames(e).forEach(function(n){(0,r.s)(e[n])&&t.add(e[n])})}),e}function a(e){if(__DEV__&&!Object.isFrozen(e))try{Object.freeze(e)}catch(t){if(t instanceof TypeError)return null;throw t}return e}function o(e){return __DEV__&&i(e),e}},14012(e,t,n){"use strict";n.d(t,{J:()=>a});var r=n(23564),i=n(53712);function a(e,t){return(0,i.o)(e,t,t.variables&&{variables:(0,r.pi)((0,r.pi)({},e&&e.variables),t.variables)})}},13154(e,t,n){"use strict";function r(e){return null!==e&&"object"==typeof e}n.d(t,{s:()=>r})},83952(e,t,n){"use strict";n.d(t,{ej:()=>u,kG:()=>c,wY:()=>h});var r,i=n(70655),a="Invariant Violation",o=Object.setPrototypeOf,s=void 0===o?function(e,t){return e.__proto__=t,e}:o,u=function(e){function t(n){void 0===n&&(n=a);var r=e.call(this,"number"==typeof n?a+": "+n+" (see https://github.com/apollographql/invariant-packages)":n)||this;return r.framesToPop=1,r.name=a,s(r,t.prototype),r}return(0,i.ZT)(t,e),t}(Error);function c(e,t){if(!e)throw new u(t)}var l=["debug","log","warn","error","silent"],f=l.indexOf("log");function d(e){return function(){if(l.indexOf(e)>=f)return(console[e]||console.log).apply(console,arguments)}}function h(e){try{return e()}catch(t){}}(r=c||(c={})).debug=d("debug"),r.log=d("log"),r.warn=d("warn"),r.error=d("error");let p=h(function(){return globalThis})||h(function(){return window})||h(function(){return self})||h(function(){return global})||h(function(){return h.constructor("return this")()});var b="__",m=[b,b].join("DEV");function g(){try{return Boolean(__DEV__)}catch(e){return Object.defineProperty(p,m,{value:"production"!==h(function(){return"production"}),enumerable:!1,configurable:!0,writable:!0}),p[m]}}let v=g();function y(e){try{return e()}catch(t){}}var w=y(function(){return globalThis})||y(function(){return window})||y(function(){return self})||y(function(){return global})||y(function(){return y.constructor("return this")()}),_=!1;function E(){!w||y(function(){return"production"})||y(function(){return process})||(Object.defineProperty(w,"process",{value:{env:{NODE_ENV:"production"}},configurable:!0,enumerable:!1,writable:!0}),_=!0)}function S(){_&&(delete w.process,_=!1)}E();var k=n(10143);function x(){return k.H,S()}function T(){__DEV__?c("boolean"==typeof v,v):c("boolean"==typeof v,39)}x(),T()},87462(e,t,n){"use strict";function r(){return(r=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}n.d(t,{Z:()=>r})},25821(e,t,n){"use strict";n.d(t,{Z:()=>s});var r=n(45695);function i(e){return(i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}var a=10,o=2;function s(e){return u(e,[])}function u(e,t){switch(i(e)){case"string":return JSON.stringify(e);case"function":return e.name?"[function ".concat(e.name,"]"):"[function]";case"object":if(null===e)return"null";return c(e,t);default:return String(e)}}function c(e,t){if(-1!==t.indexOf(e))return"[Circular]";var n=[].concat(t,[e]),r=d(e);if(void 0!==r){var i=r.call(e);if(i!==e)return"string"==typeof i?i:u(i,n)}else if(Array.isArray(e))return f(e,n);return l(e,n)}function l(e,t){var n=Object.keys(e);return 0===n.length?"{}":t.length>o?"["+h(e)+"]":"{ "+n.map(function(n){var r=u(e[n],t);return n+": "+r}).join(", ")+" }"}function f(e,t){if(0===e.length)return"[]";if(t.length>o)return"[Array]";for(var n=Math.min(a,e.length),r=e.length-n,i=[],s=0;s<n;++s)i.push(u(e[s],t));return 1===r?i.push("... 1 more item"):r>1&&i.push("... ".concat(r," more items")),"["+i.join(", ")+"]"}function d(e){var t=e[String(r.Z)];return"function"==typeof t?t:"function"==typeof e.inspect?e.inspect:void 0}function h(e){var t=Object.prototype.toString.call(e).replace(/^\[object /,"").replace(/]$/,"");if("Object"===t&&"function"==typeof e.constructor){var n=e.constructor.name;if("string"==typeof n&&""!==n)return n}return t}},45695(e,t,n){"use strict";n.d(t,{Z:()=>i});var r="function"==typeof Symbol&&"function"==typeof Symbol.for?Symbol.for("nodejs.util.inspect.custom"):void 0;let i=r},25217(e,t,n){"use strict";function r(e,t){if(!Boolean(e))throw Error(null!=t?t:"Unexpected invariant triggered.")}n.d(t,{Ye:()=>o,WU:()=>s,UG:()=>u});var i=n(45695);function a(e){var t=e.prototype.toJSON;"function"==typeof t||r(0),e.prototype.inspect=t,i.Z&&(e.prototype[i.Z]=t)}var o=function(){function e(e,t,n){this.start=e.start,this.end=t.end,this.startToken=e,this.endToken=t,this.source=n}return e.prototype.toJSON=function(){return{start:this.start,end:this.end}},e}();a(o);var s=function(){function e(e,t,n,r,i,a,o){this.kind=e,this.start=t,this.end=n,this.line=r,this.column=i,this.value=o,this.prev=a,this.next=null}return e.prototype.toJSON=function(){return{kind:this.kind,value:this.value,line:this.line,column:this.column}},e}();function u(e){return null!=e&&"string"==typeof e.kind}a(s)},87392(e,t,n){"use strict";function r(e){var t=e.split(/\r\n|[\n\r]/g),n=a(e);if(0!==n)for(var r=1;r<t.length;r++)t[r]=t[r].slice(n);for(var o=0;o<t.length&&i(t[o]);)++o;for(var s=t.length;s>o&&i(t[s-1]);)--s;return t.slice(o,s).join("\n")}function i(e){for(var t=0;t<e.length;++t)if(" "!==e[t]&&"	"!==e[t])return!1;return!0}function a(e){for(var t,n=!0,r=!0,i=0,a=null,o=0;o<e.length;++o)switch(e.charCodeAt(o)){case 13:10===e.charCodeAt(o+1)&&++o;case 10:n=!1,r=!0,i=0;break;case 9:case 32:++i;break;default:r&&!n&&(null===a||i<a)&&(a=i),r=!1}return null!==(t=a)&&void 0!==t?t:0}function o(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",n=arguments.length>2&&void 0!==arguments[2]&&arguments[2],r=-1===e.indexOf("\n"),i=" "===e[0]||"	"===e[0],a='"'===e[e.length-1],o="\\"===e[e.length-1],s=!r||a||o||n,u="";return s&&!(r&&i)&&(u+="\n"+t),u+=t?e.replace(/\n/g,"\n"+t):e,s&&(u+="\n"),'"""'+u.replace(/"""/g,'\\"""')+'"""'}n.d(t,{LZ:()=>o,W7:()=>r})},97359(e,t,n){"use strict";n.d(t,{h:()=>r});var r=Object.freeze({NAME:"Name",DOCUMENT:"Document",OPERATION_DEFINITION:"OperationDefinition",VARIABLE_DEFINITION:"VariableDefinition",SELECTION_SET:"SelectionSet",FIELD:"Field",ARGUMENT:"Argument",FRAGMENT_SPREAD:"FragmentSpread",INLINE_FRAGMENT:"InlineFragment",FRAGMENT_DEFINITION:"FragmentDefinition",VARIABLE:"Variable",INT:"IntValue",FLOAT:"FloatValue",STRING:"StringValue",BOOLEAN:"BooleanValue",NULL:"NullValue",ENUM:"EnumValue",LIST:"ListValue",OBJECT:"ObjectValue",OBJECT_FIELD:"ObjectField",DIRECTIVE:"Directive",NAMED_TYPE:"NamedType",LIST_TYPE:"ListType",NON_NULL_TYPE:"NonNullType",SCHEMA_DEFINITION:"SchemaDefinition",OPERATION_TYPE_DEFINITION:"OperationTypeDefinition",SCALAR_TYPE_DEFINITION:"ScalarTypeDefinition",OBJECT_TYPE_DEFINITION:"ObjectTypeDefinition",FIELD_DEFINITION:"FieldDefinition",INPUT_VALUE_DEFINITION:"InputValueDefinition",INTERFACE_TYPE_DEFINITION:"InterfaceTypeDefinition",UNION_TYPE_DEFINITION:"UnionTypeDefinition",ENUM_TYPE_DEFINITION:"EnumTypeDefinition",ENUM_VALUE_DEFINITION:"EnumValueDefinition",INPUT_OBJECT_TYPE_DEFINITION:"InputObjectTypeDefinition",DIRECTIVE_DEFINITION:"DirectiveDefinition",SCHEMA_EXTENSION:"SchemaExtension",SCALAR_TYPE_EXTENSION:"ScalarTypeExtension",OBJECT_TYPE_EXTENSION:"ObjectTypeExtension",INTERFACE_TYPE_EXTENSION:"InterfaceTypeExtension",UNION_TYPE_EXTENSION:"UnionTypeExtension",ENUM_TYPE_EXTENSION:"EnumTypeExtension",INPUT_OBJECT_TYPE_EXTENSION:"InputObjectTypeExtension"})},10143(e,t,n){"use strict";n.d(t,{H:()=>c,T:()=>l});var r=n(99763),i=n(25821);function a(e,t){if(!Boolean(e))throw Error(t)}let o=function(e,t){return e instanceof t};function s(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function u(e,t,n){return t&&s(e.prototype,t),n&&s(e,n),e}var c=function(){function e(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"GraphQL request",n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{line:1,column:1};"string"==typeof e||a(0,"Body must be a string. Received: ".concat((0,i.Z)(e),".")),this.body=e,this.name=t,this.locationOffset=n,this.locationOffset.line>0||a(0,"line in locationOffset is 1-indexed and must be positive."),this.locationOffset.column>0||a(0,"column in locationOffset is 1-indexed and must be positive.")}return u(e,[{key:r.YF,get:function(){return"Source"}}]),e}();function l(e){return o(e,c)}},99763(e,t,n){"use strict";n.d(t,{YF:()=>r});var r="function"==typeof Symbol&&null!=Symbol.toStringTag?Symbol.toStringTag:"@@toStringTag"},37452(e){"use strict";e.exports=JSON.parse('{"AElig":"\xc6","AMP":"&","Aacute":"\xc1","Acirc":"\xc2","Agrave":"\xc0","Aring":"\xc5","Atilde":"\xc3","Auml":"\xc4","COPY":"\xa9","Ccedil":"\xc7","ETH":"\xd0","Eacute":"\xc9","Ecirc":"\xca","Egrave":"\xc8","Euml":"\xcb","GT":">","Iacute":"\xcd","Icirc":"\xce","Igrave":"\xcc","Iuml":"\xcf","LT":"<","Ntilde":"\xd1","Oacute":"\xd3","Ocirc":"\xd4","Ograve":"\xd2","Oslash":"\xd8","Otilde":"\xd5","Ouml":"\xd6","QUOT":"\\"","REG":"\xae","THORN":"\xde","Uacute":"\xda","Ucirc":"\xdb","Ugrave":"\xd9","Uuml":"\xdc","Yacute":"\xdd","aacute":"\xe1","acirc":"\xe2","acute":"\xb4","aelig":"\xe6","agrave":"\xe0","amp":"&","aring":"\xe5","atilde":"\xe3","auml":"\xe4","brvbar":"\xa6","ccedil":"\xe7","cedil":"\xb8","cent":"\xa2","copy":"\xa9","curren":"\xa4","deg":"\xb0","divide":"\xf7","eacute":"\xe9","ecirc":"\xea","egrave":"\xe8","eth":"\xf0","euml":"\xeb","frac12":"\xbd","frac14":"\xbc","frac34":"\xbe","gt":">","iacute":"\xed","icirc":"\xee","iexcl":"\xa1","igrave":"\xec","iquest":"\xbf","iuml":"\xef","laquo":"\xab","lt":"<","macr":"\xaf","micro":"\xb5","middot":"\xb7","nbsp":"\xa0","not":"\xac","ntilde":"\xf1","oacute":"\xf3","ocirc":"\xf4","ograve":"\xf2","ordf":"\xaa","ordm":"\xba","oslash":"\xf8","otilde":"\xf5","ouml":"\xf6","para":"\xb6","plusmn":"\xb1","pound":"\xa3","quot":"\\"","raquo":"\xbb","reg":"\xae","sect":"\xa7","shy":"\xad","sup1":"\xb9","sup2":"\xb2","sup3":"\xb3","szlig":"\xdf","thorn":"\xfe","times":"\xd7","uacute":"\xfa","ucirc":"\xfb","ugrave":"\xf9","uml":"\xa8","uuml":"\xfc","yacute":"\xfd","yen":"\xa5","yuml":"\xff"}')},93580(e){"use strict";e.exports=JSON.parse('{"0":"�","128":"€","130":"‚","131":"ƒ","132":"„","133":"…","134":"†","135":"‡","136":"ˆ","137":"‰","138":"Š","139":"‹","140":"Œ","142":"Ž","145":"‘","146":"’","147":"“","148":"”","149":"•","150":"–","151":"—","152":"˜","153":"™","154":"š","155":"›","156":"œ","158":"ž","159":"Ÿ"}')},67946(e){"use strict";e.exports=JSON.parse('{"locale":"en","long":{"year":{"previous":"last year","current":"this year","next":"next year","past":{"one":"{0} year ago","other":"{0} years ago"},"future":{"one":"in {0} year","other":"in {0} years"}},"quarter":{"previous":"last quarter","current":"this quarter","next":"next quarter","past":{"one":"{0} quarter ago","other":"{0} quarters ago"},"future":{"one":"in {0} quarter","other":"in {0} quarters"}},"month":{"previous":"last month","current":"this month","next":"next month","past":{"one":"{0} month ago","other":"{0} months ago"},"future":{"one":"in {0} month","other":"in {0} months"}},"week":{"previous":"last week","current":"this week","next":"next week","past":{"one":"{0} week ago","other":"{0} weeks ago"},"future":{"one":"in {0} week","other":"in {0} weeks"}},"day":{"previous":"yesterday","current":"today","next":"tomorrow","past":{"one":"{0} day ago","other":"{0} days ago"},"future":{"one":"in {0} day","other":"in {0} days"}},"hour":{"current":"this hour","past":{"one":"{0} hour ago","other":"{0} hours ago"},"future":{"one":"in {0} hour","other":"in {0} hours"}},"minute":{"current":"this minute","past":{"one":"{0} minute ago","other":"{0} minutes ago"},"future":{"one":"in {0} minute","other":"in {0} minutes"}},"second":{"current":"now","past":{"one":"{0} second ago","other":"{0} seconds ago"},"future":{"one":"in {0} second","other":"in {0} seconds"}}},"short":{"year":{"previous":"last yr.","current":"this yr.","next":"next yr.","past":"{0} yr. ago","future":"in {0} yr."},"quarter":{"previous":"last qtr.","current":"this qtr.","next":"next qtr.","past":{"one":"{0} qtr. ago","other":"{0} qtrs. ago"},"future":{"one":"in {0} qtr.","other":"in {0} qtrs."}},"month":{"previous":"last mo.","current":"this mo.","next":"next mo.","past":"{0} mo. ago","future":"in {0} mo."},"week":{"previous":"last wk.","current":"this wk.","next":"next wk.","past":"{0} wk. ago","future":"in {0} wk."},"day":{"previous":"yesterday","current":"today","next":"tomorrow","past":{"one":"{0} day ago","other":"{0} days ago"},"future":{"one":"in {0} day","other":"in {0} days"}},"hour":{"current":"this hour","past":"{0} hr. ago","future":"in {0} hr."},"minute":{"current":"this minute","past":"{0} min. ago","future":"in {0} min."},"second":{"current":"now","past":"{0} sec. ago","future":"in {0} sec."}},"narrow":{"year":{"previous":"last yr.","current":"this yr.","next":"next yr.","past":"{0} yr. ago","future":"in {0} yr."},"quarter":{"previous":"last qtr.","current":"this qtr.","next":"next qtr.","past":{"one":"{0} qtr. ago","other":"{0} qtrs. ago"},"future":{"one":"in {0} qtr.","other":"in {0} qtrs."}},"month":{"previous":"last mo.","current":"this mo.","next":"next mo.","past":"{0} mo. ago","future":"in {0} mo."},"week":{"previous":"last wk.","current":"this wk.","next":"next wk.","past":"{0} wk. ago","future":"in {0} wk."},"day":{"previous":"yesterday","current":"today","next":"tomorrow","past":{"one":"{0} day ago","other":"{0} days ago"},"future":{"one":"in {0} day","other":"in {0} days"}},"hour":{"current":"this hour","past":"{0} hr. ago","future":"in {0} hr."},"minute":{"current":"this minute","past":"{0} min. ago","future":"in {0} min."},"second":{"current":"now","past":"{0} sec. ago","future":"in {0} sec."}},"now":{"now":{"current":"now","future":"in a moment","past":"just now"}},"mini":{"year":"{0}yr","month":"{0}mo","week":"{0}wk","day":"{0}d","hour":"{0}h","minute":"{0}m","second":"{0}s","now":"now"},"short-time":{"year":"{0} yr.","month":"{0} mo.","week":"{0} wk.","day":{"one":"{0} day","other":"{0} days"},"hour":"{0} hr.","minute":"{0} min.","second":"{0} sec."},"long-time":{"year":{"one":"{0} year","other":"{0} years"},"month":{"one":"{0} month","other":"{0} months"},"week":{"one":"{0} week","other":"{0} weeks"},"day":{"one":"{0} day","other":"{0} days"},"hour":{"one":"{0} hour","other":"{0} hours"},"minute":{"one":"{0} minute","other":"{0} minutes"},"second":{"one":"{0} second","other":"{0} seconds"}}}')}},__webpack_module_cache__={};function __webpack_require__(e){var t=__webpack_module_cache__[e];if(void 0!==t)return t.exports;var n=__webpack_module_cache__[e]={id:e,loaded:!1,exports:{}};return __webpack_modules__[e].call(n.exports,n,n.exports,__webpack_require__),n.loaded=!0,n.exports}__webpack_require__.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return __webpack_require__.d(t,{a:t}),t},(()=>{var e,t=Object.getPrototypeOf?e=>Object.getPrototypeOf(e):e=>e.__proto__;__webpack_require__.t=function(n,r){if(1&r&&(n=this(n)),8&r||"object"==typeof n&&n&&(4&r&&n.__esModule||16&r&&"function"==typeof n.then))return n;var i=Object.create(null);__webpack_require__.r(i);var a={};e=e||[null,t({}),t([]),t(t)];for(var o=2&r&&n;"object"==typeof o&&!~e.indexOf(o);o=t(o))Object.getOwnPropertyNames(o).forEach(e=>a[e]=()=>n[e]);return a.default=()=>n,__webpack_require__.d(i,a),i}})(),__webpack_require__.d=(e,t)=>{for(var n in t)__webpack_require__.o(t,n)&&!__webpack_require__.o(e,n)&&Object.defineProperty(e,n,{enumerable:!0,get:t[n]})},__webpack_require__.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||Function("return this")()}catch(e){if("object"==typeof window)return window}}(),__webpack_require__.hmd=e=>((e=Object.create(e)).children||(e.children=[]),Object.defineProperty(e,"exports",{enumerable:!0,set(){throw Error("ES Modules may not assign module.exports or exports.*, Use ESM export syntax, instead: "+e.id)}}),e),__webpack_require__.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),__webpack_require__.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},__webpack_require__.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),__webpack_require__.p="/assets/",__webpack_require__.nc=void 0;var __webpack_exports__={};(()=>{"use strict";var e,t,n,r,i=__webpack_require__(32316),a=__webpack_require__(8126),o=__webpack_require__(5690),s=__webpack_require__(30381),u=__webpack_require__.n(s),c=__webpack_require__(67294),l=__webpack_require__(73935),f=__webpack_require__.n(l),d=__webpack_require__(57209),h=__webpack_require__(55977),p=__webpack_require__(15857),b=__webpack_require__(28500);function m(e){return function(t){var n=t.dispatch,r=t.getState;return function(t){return function(i){return"function"==typeof i?i(n,r,e):t(i)}}}}var g=m();g.withExtraArgument=m;let v=g;var y=__webpack_require__(76489);function w(e){return function(t){return function(n){return function(r){n(r);var i=e||document&&document.cookie||"",a=t.getState();if("MATCH_ROUTE"===r.type&&"/signin"!==a.notifications.currentUrl){var o=(0,y.Q)(i);if(o.explorer)try{var s=JSON.parse(o.explorer);if("error"===s.status){var u=_(s.url);n({type:"NOTIFY_ERROR_MSG",msg:u})}}catch(c){n({type:"NOTIFY_ERROR_MSG",msg:"Invalid explorer status"})}}}}}}function _(e){var t="Can't connect to explorer: ".concat(e);return e.match(/^wss?:.+/)?t:"".concat(t,". You must use a websocket.")}var E=__webpack_require__(16353);function S(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function k(e){if(Array.isArray(e))return S(e)}function x(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function T(){throw TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function M(e){return k(e)||x(e)||O(e)||T()}function O(e,t){if(e){if("string"==typeof e)return S(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(n);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return S(e,t)}}var A=[v,w(),],L=(0,b.Uo)({});function C(e,t){return(0,p.MT)(e,L(p.md.apply(void 0,M(M(t)))))}var I=function(){return C(E.ZP,A)};let D=I;var N=__webpack_require__(93379),P=__webpack_require__.n(N),R=__webpack_require__(51424),j=__webpack_require__.n(R),F={};F.insert="head",F.singleton=!1;var Y=P()(j(),F);j().locals;var B=__webpack_require__(76),U=__webpack_require__(47886),H=__webpack_require__(63099),$=__webpack_require__(47545),z=__webpack_require__(9409),G=function(){var e=(0,E.rH)(function(e){return e.redirect.to});return c.createElement(B.VK,null,c.createElement(H.Z,null),c.createElement(U.rs,null,c.createElement(U.AW,{exact:!0,path:"/signin"},c.createElement(z.ZP,null)),e&&c.createElement(U.l_,{to:e}),c.createElement(U.AW,{component:$.Z})))};let W=G;var K=__webpack_require__(9541),V="/signin",q=D();q.subscribe(function(){var e=q.getState().notifications.currentUrl;e&&e!==V&&(0,K.iR)(e)});var Z=function(){return c.createElement(h.zt,{store:q},c.createElement(W,null))};let X=Z;var J=__webpack_require__(73343),Q=__webpack_require__(83952),ee=__webpack_require__(85317),et=function(e){var t=e.client,n=e.children,r=(0,ee.K)();return c.createElement(r.Consumer,null,function(e){return void 0===e&&(e={}),t&&e.client!==t&&(e=Object.assign({},e,{client:t})),__DEV__?(0,Q.kG)(e.client,'ApolloProvider was not passed a client instance. Make sure you pass in your client via the "client" prop.'):(0,Q.kG)(e.client,29),c.createElement(r.Provider,{value:e},n)})},en=__webpack_require__(23564);function er(e,t){var n="undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(n)return(n=n.call(e)).next.bind(n);if(Array.isArray(e)||(n=ei(e))||t&&e&&"number"==typeof e.length){n&&(e=n);var r=0;return function(){return r>=e.length?{done:!0}:{done:!1,value:e[r++]}}}throw TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function ei(e,t){if(e){if("string"==typeof e)return ea(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);if("Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return ea(e,t)}}function ea(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=Array(t);n<t;n++)r[n]=e[n];return r}function eo(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function es(e,t,n){return t&&eo(e.prototype,t),n&&eo(e,n),Object.defineProperty(e,"prototype",{writable:!1}),e}var eu=function(){return"function"==typeof Symbol},ec=function(e){return eu()&&Boolean(Symbol[e])},el=function(e){return ec(e)?Symbol[e]:"@@"+e};eu()&&!ec("observable")&&(Symbol.observable=Symbol("observable"));var ef=el("iterator"),ed=el("observable"),eh=el("species");function ep(e,t){var n=e[t];if(null!=n){if("function"!=typeof n)throw TypeError(n+" is not a function");return n}}function eb(e){var t=e.constructor;return void 0!==t&&null===(t=t[eh])&&(t=void 0),void 0!==t?t:eT}function em(e){return e instanceof eT}function eg(e){eg.log?eg.log(e):setTimeout(function(){throw e})}function ev(e){Promise.resolve().then(function(){try{e()}catch(t){eg(t)}})}function ey(e){var t=e._cleanup;if(void 0!==t){if(e._cleanup=void 0,!t)return;try{if("function"==typeof t)t();else{var n=ep(t,"unsubscribe");n&&n.call(t)}}catch(r){eg(r)}}}function ew(e){e._observer=void 0,e._queue=void 0,e._state="closed"}function e_(e){var t=e._queue;if(t){e._queue=void 0,e._state="ready";for(var n=0;n<t.length&&(eE(e,t[n].type,t[n].value),"closed"!==e._state);++n);}}function eE(e,t,n){e._state="running";var r=e._observer;try{var i=ep(r,t);switch(t){case"next":i&&i.call(r,n);break;case"error":if(ew(e),i)i.call(r,n);else throw n;break;case"complete":ew(e),i&&i.call(r)}}catch(a){eg(a)}"closed"===e._state?ey(e):"running"===e._state&&(e._state="ready")}function eS(e,t,n){if("closed"!==e._state){if("buffering"===e._state){e._queue.push({type:t,value:n});return}if("ready"!==e._state){e._state="buffering",e._queue=[{type:t,value:n}],ev(function(){return e_(e)});return}eE(e,t,n)}}var ek=function(){function e(e,t){this._cleanup=void 0,this._observer=e,this._queue=void 0,this._state="initializing";var n=new ex(this);try{this._cleanup=t.call(void 0,n)}catch(r){n.error(r)}"initializing"===this._state&&(this._state="ready")}return e.prototype.unsubscribe=function(){"closed"!==this._state&&(ew(this),ey(this))},es(e,[{key:"closed",get:function(){return"closed"===this._state}}]),e}(),ex=function(){function e(e){this._subscription=e}var t=e.prototype;return t.next=function(e){eS(this._subscription,"next",e)},t.error=function(e){eS(this._subscription,"error",e)},t.complete=function(){eS(this._subscription,"complete")},es(e,[{key:"closed",get:function(){return"closed"===this._subscription._state}}]),e}(),eT=function(){function e(t){if(!(this instanceof e))throw TypeError("Observable cannot be called as a function");if("function"!=typeof t)throw TypeError("Observable initializer must be a function");this._subscriber=t}var t=e.prototype;return t.subscribe=function(e){return("object"!=typeof e||null===e)&&(e={next:e,error:arguments[1],complete:arguments[2]}),new ek(e,this._subscriber)},t.forEach=function(e){var t=this;return new Promise(function(n,r){if("function"!=typeof e){r(TypeError(e+" is not a function"));return}function i(){a.unsubscribe(),n()}var a=t.subscribe({next:function(t){try{e(t,i)}catch(n){r(n),a.unsubscribe()}},error:r,complete:n})})},t.map=function(e){var t=this;if("function"!=typeof e)throw TypeError(e+" is not a function");return new(eb(this))(function(n){return t.subscribe({next:function(t){try{t=e(t)}catch(r){return n.error(r)}n.next(t)},error:function(e){n.error(e)},complete:function(){n.complete()}})})},t.filter=function(e){var t=this;if("function"!=typeof e)throw TypeError(e+" is not a function");return new(eb(this))(function(n){return t.subscribe({next:function(t){try{if(!e(t))return}catch(r){return n.error(r)}n.next(t)},error:function(e){n.error(e)},complete:function(){n.complete()}})})},t.reduce=function(e){var t=this;if("function"!=typeof e)throw TypeError(e+" is not a function");var n=eb(this),r=arguments.length>1,i=!1,a=arguments[1],o=a;return new n(function(n){return t.subscribe({next:function(t){var a=!i;if(i=!0,!a||r)try{o=e(o,t)}catch(s){return n.error(s)}else o=t},error:function(e){n.error(e)},complete:function(){if(!i&&!r)return n.error(TypeError("Cannot reduce an empty sequence"));n.next(o),n.complete()}})})},t.concat=function(){for(var e=this,t=arguments.length,n=Array(t),r=0;r<t;r++)n[r]=arguments[r];var i=eb(this);return new i(function(t){var r,a=0;function o(e){r=e.subscribe({next:function(e){t.next(e)},error:function(e){t.error(e)},complete:function(){a===n.length?(r=void 0,t.complete()):o(i.from(n[a++]))}})}return o(e),function(){r&&(r.unsubscribe(),r=void 0)}})},t.flatMap=function(e){var t=this;if("function"!=typeof e)throw TypeError(e+" is not a function");var n=eb(this);return new n(function(r){var i=[],a=t.subscribe({next:function(t){if(e)try{t=e(t)}catch(a){return r.error(a)}var s=n.from(t).subscribe({next:function(e){r.next(e)},error:function(e){r.error(e)},complete:function(){var e=i.indexOf(s);e>=0&&i.splice(e,1),o()}});i.push(s)},error:function(e){r.error(e)},complete:function(){o()}});function o(){a.closed&&0===i.length&&r.complete()}return function(){i.forEach(function(e){return e.unsubscribe()}),a.unsubscribe()}})},t[ed]=function(){return this},e.from=function(t){var n="function"==typeof this?this:e;if(null==t)throw TypeError(t+" is not an object");var r=ep(t,ed);if(r){var i=r.call(t);if(Object(i)!==i)throw TypeError(i+" is not an object");return em(i)&&i.constructor===n?i:new n(function(e){return i.subscribe(e)})}if(ec("iterator")&&(r=ep(t,ef)))return new n(function(e){ev(function(){if(!e.closed){for(var n,i=er(r.call(t));!(n=i()).done;){var a=n.value;if(e.next(a),e.closed)return}e.complete()}})});if(Array.isArray(t))return new n(function(e){ev(function(){if(!e.closed){for(var n=0;n<t.length;++n)if(e.next(t[n]),e.closed)return;e.complete()}})});throw TypeError(t+" is not observable")},e.of=function(){for(var t=arguments.length,n=Array(t),r=0;r<t;r++)n[r]=arguments[r];return new("function"==typeof this?this:e)(function(e){ev(function(){if(!e.closed){for(var t=0;t<n.length;++t)if(e.next(n[t]),e.closed)return;e.complete()}})})},es(e,null,[{key:eh,get:function(){return this}}]),e}();function eM(e,t){var n=(0,en.pi)({},e),r=function(){return(0,en.pi)({},n)};return Object.defineProperty(t,"setContext",{enumerable:!1,value:function(e){n="function"==typeof e?(0,en.pi)((0,en.pi)({},n),e(n)):(0,en.pi)((0,en.pi)({},n),e)}}),Object.defineProperty(t,"getContext",{enumerable:!1,value:r}),t}eu()&&Object.defineProperty(eT,Symbol("extensions"),{value:{symbol:ed,hostReportError:eg},configurable:!0});var eO=__webpack_require__(13154);function eA(e,t){var n=t,r=[];return e.definitions.forEach(function(e){if("OperationDefinition"===e.kind)throw __DEV__?new Q.ej("Found a ".concat(e.operation," operation").concat(e.name?" named '".concat(e.name.value,"'"):"",". ")+"No operations are allowed when using a fragment as a query. Only fragments are allowed."):new Q.ej(44);"FragmentDefinition"===e.kind&&r.push(e)}),void 0===n&&(__DEV__?(0,Q.kG)(1===r.length,"Found ".concat(r.length," fragments. `fragmentName` must be provided when there is not exactly 1 fragment.")):(0,Q.kG)(1===r.length,45),n=r[0].name.value),(0,en.pi)((0,en.pi)({},e),{definitions:(0,en.ev)([{kind:"OperationDefinition",operation:"query",selectionSet:{kind:"SelectionSet",selections:[{kind:"FragmentSpread",name:{kind:"Name",value:n}},]}}],e.definitions,!0)})}function eL(e){void 0===e&&(e=[]);var t={};return e.forEach(function(e){t[e.name.value]=e}),t}function eC(e,t){switch(e.kind){case"InlineFragment":return e;case"FragmentSpread":var n=e.name.value;if("function"==typeof t)return t(n);var r=t&&t[n];return __DEV__?(0,Q.kG)(r,"No fragment named ".concat(n)):(0,Q.kG)(r,46),r||null;default:return null}}function eI(e){return{__ref:String(e)}}function eD(e){return Boolean(e&&"object"==typeof e&&"string"==typeof e.__ref)}function eN(e){return(0,eO.s)(e)&&"Document"===e.kind&&Array.isArray(e.definitions)}function eP(e){return"StringValue"===e.kind}function eR(e){return"BooleanValue"===e.kind}function ej(e){return"IntValue"===e.kind}function eF(e){return"FloatValue"===e.kind}function eY(e){return"Variable"===e.kind}function eB(e){return"ObjectValue"===e.kind}function eU(e){return"ListValue"===e.kind}function eH(e){return"EnumValue"===e.kind}function e$(e){return"NullValue"===e.kind}function ez(e,t,n,r){if(ej(n)||eF(n))e[t.value]=Number(n.value);else if(eR(n)||eP(n))e[t.value]=n.value;else if(eB(n)){var i={};n.fields.map(function(e){return ez(i,e.name,e.value,r)}),e[t.value]=i}else if(eY(n)){var a=(r||{})[n.name.value];e[t.value]=a}else if(eU(n))e[t.value]=n.values.map(function(e){var n={};return ez(n,t,e,r),n[t.value]});else if(eH(n))e[t.value]=n.value;else if(e$(n))e[t.value]=null;else throw __DEV__?new Q.ej('The inline argument "'.concat(t.value,'" of kind "').concat(n.kind,'"')+"is not supported. Use variables instead of inline arguments to overcome this limitation."):new Q.ej(55)}function eG(e,t){var n=null;e.directives&&(n={},e.directives.forEach(function(e){n[e.name.value]={},e.arguments&&e.arguments.forEach(function(r){var i=r.name,a=r.value;return ez(n[e.name.value],i,a,t)})}));var r=null;return e.arguments&&e.arguments.length&&(r={},e.arguments.forEach(function(e){var n;return ez(r,e.name,e.value,t)})),eK(e.name.value,r,n)}var eW=["connection","include","skip","client","rest","export",],eK=Object.assign(function(e,t,n){if(t&&n&&n.connection&&n.connection.key){if(!n.connection.filter||!(n.connection.filter.length>0))return n.connection.key;var r=n.connection.filter?n.connection.filter:[];r.sort();var i={};return r.forEach(function(e){i[e]=t[e]}),"".concat(n.connection.key,"(").concat(eV(i),")")}var a=e;if(t){var o=eV(t);a+="(".concat(o,")")}return n&&Object.keys(n).forEach(function(e){-1===eW.indexOf(e)&&(n[e]&&Object.keys(n[e]).length?a+="@".concat(e,"(").concat(eV(n[e]),")"):a+="@".concat(e))}),a},{setStringify:function(e){var t=eV;return eV=e,t}}),eV=function(e){return JSON.stringify(e,eq)};function eq(e,t){return(0,eO.s)(t)&&!Array.isArray(t)&&(t=Object.keys(t).sort().reduce(function(e,n){return e[n]=t[n],e},{})),t}function eZ(e,t){if(e.arguments&&e.arguments.length){var n={};return e.arguments.forEach(function(e){var r;return ez(n,e.name,e.value,t)}),n}return null}function eX(e){return e.alias?e.alias.value:e.name.value}function eJ(e,t,n){for(var r,i=0,a=t.selections;i<a.length;i++){var o=a[i];if(eQ(o)){if("__typename"===o.name.value)return e[eX(o)]}else r?r.push(o):r=[o]}if("string"==typeof e.__typename)return e.__typename;if(r)for(var s=0,u=r;s<u.length;s++){var o=u[s],c=eJ(e,eC(o,n).selectionSet,n);if("string"==typeof c)return c}}function eQ(e){return"Field"===e.kind}function e1(e){return"InlineFragment"===e.kind}function e0(e){__DEV__?(0,Q.kG)(e&&"Document"===e.kind,'Expecting a parsed GraphQL document. Perhaps you need to wrap the query string in a "gql" tag? http://docs.apollostack.com/apollo-client/core.html#gql'):(0,Q.kG)(e&&"Document"===e.kind,47);var t=e.definitions.filter(function(e){return"FragmentDefinition"!==e.kind}).map(function(e){if("OperationDefinition"!==e.kind)throw __DEV__?new Q.ej('Schema type definitions not allowed in queries. Found: "'.concat(e.kind,'"')):new Q.ej(48);return e});return __DEV__?(0,Q.kG)(t.length<=1,"Ambiguous GraphQL document: contains ".concat(t.length," operations")):(0,Q.kG)(t.length<=1,49),e}function e2(e){return e0(e),e.definitions.filter(function(e){return"OperationDefinition"===e.kind})[0]}function e3(e){return e.definitions.filter(function(e){return"OperationDefinition"===e.kind&&!!e.name}).map(function(e){return e.name.value})[0]||null}function e4(e){return e.definitions.filter(function(e){return"FragmentDefinition"===e.kind})}function e5(e){var t=e2(e);return __DEV__?(0,Q.kG)(t&&"query"===t.operation,"Must contain a query definition."):(0,Q.kG)(t&&"query"===t.operation,50),t}function e6(e){__DEV__?(0,Q.kG)("Document"===e.kind,'Expecting a parsed GraphQL document. Perhaps you need to wrap the query string in a "gql" tag? http://docs.apollostack.com/apollo-client/core.html#gql'):(0,Q.kG)("Document"===e.kind,51),__DEV__?(0,Q.kG)(e.definitions.length<=1,"Fragment must have exactly one definition."):(0,Q.kG)(e.definitions.length<=1,52);var t=e.definitions[0];return __DEV__?(0,Q.kG)("FragmentDefinition"===t.kind,"Must be a fragment definition."):(0,Q.kG)("FragmentDefinition"===t.kind,53),t}function e9(e){e0(e);for(var t,n=0,r=e.definitions;n<r.length;n++){var i=r[n];if("OperationDefinition"===i.kind){var a=i.operation;if("query"===a||"mutation"===a||"subscription"===a)return i}"FragmentDefinition"!==i.kind||t||(t=i)}if(t)return t;throw __DEV__?new Q.ej("Expected a parsed GraphQL query with a query, mutation, subscription, or a fragment."):new Q.ej(54)}function e8(e){var t=Object.create(null),n=e&&e.variableDefinitions;return n&&n.length&&n.forEach(function(e){e.defaultValue&&ez(t,e.variable.name,e.defaultValue)}),t}function e7(e){var t={variables:e.variables||{},extensions:e.extensions||{},operationName:e.operationName,query:e.query};return t.operationName||(t.operationName="string"!=typeof t.query?e3(t.query)||void 0:""),t}function te(e){for(var t=["query","operationName","variables","extensions","context",],n=0,r=Object.keys(e);n<r.length;n++){var i=r[n];if(0>t.indexOf(i))throw __DEV__?new Q.ej("illegal argument: ".concat(i)):new Q.ej(27)}return e}function tt(e,t){return t?t(e):eT.of()}function tn(e){return"function"==typeof e?new ta(e):e}function tr(e){return e.request.length<=1}var ti=function(e){function t(t,n){var r=e.call(this,t)||this;return r.link=n,r}return(0,en.ZT)(t,e),t}(Error),ta=function(){function e(e){e&&(this.request=e)}return e.empty=function(){return new e(function(){return eT.of()})},e.from=function(t){return 0===t.length?e.empty():t.map(tn).reduce(function(e,t){return e.concat(t)})},e.split=function(t,n,r){var i=tn(n),a=tn(r||new e(tt));return new e(tr(i)&&tr(a)?function(e){return t(e)?i.request(e)||eT.of():a.request(e)||eT.of()}:function(e,n){return t(e)?i.request(e,n)||eT.of():a.request(e,n)||eT.of()})},e.execute=function(e,t){return e.request(eM(t.context,e7(te(t))))||eT.of()},e.concat=function(t,n){var r=tn(t);if(tr(r))return __DEV__&&Q.kG.warn(new ti("You are calling concat on a terminating link, which will have no effect",r)),r;var i=tn(n);return new e(tr(i)?function(e){return r.request(e,function(e){return i.request(e)||eT.of()})||eT.of()}:function(e,t){return r.request(e,function(e){return i.request(e,t)||eT.of()})||eT.of()})},e.prototype.split=function(t,n,r){return this.concat(e.split(t,n,r||new e(tt)))},e.prototype.concat=function(t){return e.concat(this,t)},e.prototype.request=function(e,t){throw __DEV__?new Q.ej("request is not implemented"):new Q.ej(22)},e.prototype.onError=function(e,t){if(t&&t.error)return t.error(e),!1;throw e},e.prototype.setOnError=function(e){return this.onError=e,this},e}(),to=__webpack_require__(25821),ts=__webpack_require__(25217),tu={Name:[],Document:["definitions"],OperationDefinition:["name","variableDefinitions","directives","selectionSet"],VariableDefinition:["variable","type","defaultValue","directives"],Variable:["name"],SelectionSet:["selections"],Field:["alias","name","arguments","directives","selectionSet"],Argument:["name","value"],FragmentSpread:["name","directives"],InlineFragment:["typeCondition","directives","selectionSet"],FragmentDefinition:["name","variableDefinitions","typeCondition","directives","selectionSet"],IntValue:[],FloatValue:[],StringValue:[],BooleanValue:[],NullValue:[],EnumValue:[],ListValue:["values"],ObjectValue:["fields"],ObjectField:["name","value"],Directive:["name","arguments"],NamedType:["name"],ListType:["type"],NonNullType:["type"],SchemaDefinition:["description","directives","operationTypes"],OperationTypeDefinition:["type"],ScalarTypeDefinition:["description","name","directives"],ObjectTypeDefinition:["description","name","interfaces","directives","fields"],FieldDefinition:["description","name","arguments","type","directives"],InputValueDefinition:["description","name","type","defaultValue","directives"],InterfaceTypeDefinition:["description","name","interfaces","directives","fields"],UnionTypeDefinition:["description","name","directives","types"],EnumTypeDefinition:["description","name","directives","values"],EnumValueDefinition:["description","name","directives"],InputObjectTypeDefinition:["description","name","directives","fields"],DirectiveDefinition:["description","name","arguments","locations"],SchemaExtension:["directives","operationTypes"],ScalarTypeExtension:["name","directives"],ObjectTypeExtension:["name","interfaces","directives","fields"],InterfaceTypeExtension:["name","interfaces","directives","fields"],UnionTypeExtension:["name","directives","types"],EnumTypeExtension:["name","directives","values"],InputObjectTypeExtension:["name","directives","fields"]},tc=Object.freeze({});function tl(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:tu,r=void 0,i=Array.isArray(e),a=[e],o=-1,s=[],u=void 0,c=void 0,l=void 0,f=[],d=[],h=e;do{var p,b=++o===a.length,m=b&&0!==s.length;if(b){if(c=0===d.length?void 0:f[f.length-1],u=l,l=d.pop(),m){if(i)u=u.slice();else{for(var g={},v=0,y=Object.keys(u);v<y.length;v++){var w=y[v];g[w]=u[w]}u=g}for(var _=0,E=0;E<s.length;E++){var S=s[E][0],k=s[E][1];i&&(S-=_),i&&null===k?(u.splice(S,1),_++):u[S]=k}}o=r.index,a=r.keys,s=r.edits,i=r.inArray,r=r.prev}else{if(c=l?i?o:a[o]:void 0,null===(u=l?l[c]:h)||void 0===u)continue;l&&f.push(c)}var x=void 0;if(!Array.isArray(u)){if(!(0,ts.UG)(u))throw Error("Invalid AST Node: ".concat((0,to.Z)(u),"."));var T=tf(t,u.kind,b);if(T){if((x=T.call(t,u,c,l,f,d))===tc)break;if(!1===x){if(!b){f.pop();continue}}else if(void 0!==x&&(s.push([c,x]),!b)){if((0,ts.UG)(x))u=x;else{f.pop();continue}}}}void 0===x&&m&&s.push([c,u]),b?f.pop():(r={inArray:i,index:o,keys:a,edits:s,prev:r},a=(i=Array.isArray(u))?u:null!==(p=n[u.kind])&&void 0!==p?p:[],o=-1,s=[],l&&d.push(l),l=u)}while(void 0!==r)return 0!==s.length&&(h=s[s.length-1][1]),h}function tf(e,t,n){var r=e[t];if(r){if(!n&&"function"==typeof r)return r;var i=n?r.leave:r.enter;if("function"==typeof i)return i}else{var a=n?e.leave:e.enter;if(a){if("function"==typeof a)return a;var o=a[t];if("function"==typeof o)return o}}}function td(e,t){var n=e.directives;return!n||!n.length||tv(n).every(function(e){var n=e.directive,r=e.ifArgument,i=!1;return"Variable"===r.value.kind?(i=t&&t[r.value.name.value],__DEV__?(0,Q.kG)(void 0!==i,"Invalid variable referenced in @".concat(n.name.value," directive.")):(0,Q.kG)(void 0!==i,40)):i=r.value.value,"skip"===n.name.value?!i:i})}var th=function(e,t){return tb(e,t,!1)},tp=function(e,t){return tb(e,t,!0)};function tb(e,t,n){var r=new Set(e),i=r.size;return tl(t,{Directive:function(e){if(r.delete(e.name.value)&&(!n||!r.size))return tc}}),n?!r.size:r.size<i}function tm(e){return e&&tb(["client","export"],e,!0)}function tg(e){var t=e.name.value;return"skip"===t||"include"===t}function tv(e){var t=[];return e&&e.length&&e.forEach(function(e){if(tg(e)){var n=e.arguments,r=e.name.value;__DEV__?(0,Q.kG)(n&&1===n.length,"Incorrect number of arguments for the @".concat(r," directive.")):(0,Q.kG)(n&&1===n.length,41);var i=n[0];__DEV__?(0,Q.kG)(i.name&&"if"===i.name.value,"Invalid argument for the @".concat(r," directive.")):(0,Q.kG)(i.name&&"if"===i.name.value,42);var a=i.value;__DEV__?(0,Q.kG)(a&&("Variable"===a.kind||"BooleanValue"===a.kind),"Argument for the @".concat(r," directive must be a variable or a boolean value.")):(0,Q.kG)(a&&("Variable"===a.kind||"BooleanValue"===a.kind),43),t.push({directive:e,ifArgument:i})}}),t}var ty=function(e,t){var n;try{n=JSON.stringify(e)}catch(r){var i=__DEV__?new Q.ej("Network request failed. ".concat(t," is not serializable: ").concat(r.message)):new Q.ej(24);throw i.parseError=r,i}return n},tw=function(e,t){var n=e.getContext().uri;return n||("function"==typeof t?t(e):t||"/graphql")},t_=__webpack_require__(30320);function tE(e){return!!e.body}function tS(e){return!!e.getReader}function tk(e){return!!(t_.DN&&e[Symbol.asyncIterator])}function tx(e){return!!e.stream}function tT(e){return!!e.arrayBuffer}function tM(e){return!!e.pipe}function tO(e){var t,n=e[Symbol.asyncIterator]();return(t={next:function(){return n.next()}})[Symbol.asyncIterator]=function(){return this},t}function tA(e){var t=null,n=null,r=!1,i=[],a=[];function o(e){if(!n){if(a.length){var t=a.shift();if(Array.isArray(t)&&t[0])return t[0]({value:e,done:!1})}i.push(e)}}function s(e){n=e,a.slice().forEach(function(t){t[1](e)}),t&&t()}function u(){r=!0,a.slice().forEach(function(e){e[0]({value:void 0,done:!0})}),t&&t()}function c(){return new Promise(function(e,t){return n?t(n):i.length?e({value:i.shift(),done:!1}):r?e({value:void 0,done:!0}):void a.push([e,t])})}t=function(){t=null,e.removeListener("data",o),e.removeListener("error",s),e.removeListener("end",u),e.removeListener("finish",u),e.removeListener("close",u)},e.on("data",o),e.on("error",s),e.on("end",u),e.on("finish",u),e.on("close",u);var l={next:function(){return c()}};return t_.DN&&(l[Symbol.asyncIterator]=function(){return this}),l}function tL(e){var t=!1,n={next:function(){return t?Promise.resolve({value:void 0,done:!0}):(t=!0,new Promise(function(t,n){e.then(function(e){t({value:e,done:!1})}).catch(n)}))}};return t_.DN&&(n[Symbol.asyncIterator]=function(){return this}),n}function tC(e){var t={next:function(){return e.read()}};return t_.DN&&(t[Symbol.asyncIterator]=function(){return this}),t}function tI(e){var t=e;if(tE(e)&&(t=e.body),tk(t))return tO(t);if(tS(t))return tC(t.getReader());if(tx(t))return tC(t.stream().getReader());if(tT(t))return tL(t.arrayBuffer());if(tM(t))return tA(t);throw Error("Unknown body type for responseIterator. Please pass a streamable response.")}var tD=function(e,t,n){var r=Error(n);throw r.name="ServerError",r.response=e,r.statusCode=e.status,r.result=t,r},tN=__webpack_require__(30990),tP=__webpack_require__(21436),tR=Object.prototype.hasOwnProperty;function tj(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return tF(e)}function tF(e){var t=e[0]||{},n=e.length;if(n>1)for(var r=new tB,i=1;i<n;++i)t=r.merge(t,e[i]);return t}var tY=function(e,t,n){return this.merge(e[n],t[n])},tB=function(){function e(e){void 0===e&&(e=tY),this.reconciler=e,this.isObject=eO.s,this.pastCopies=new Set}return e.prototype.merge=function(e,t){for(var n=this,r=[],i=2;i<arguments.length;i++)r[i-2]=arguments[i];return(0,eO.s)(t)&&(0,eO.s)(e)?(Object.keys(t).forEach(function(i){if(tR.call(e,i)){var a=e[i];if(t[i]!==a){var o=n.reconciler.apply(n,(0,en.ev)([e,t,i],r,!1));o!==a&&((e=n.shallowCopyForMerge(e))[i]=o)}}else(e=n.shallowCopyForMerge(e))[i]=t[i]}),e):t},e.prototype.shallowCopyForMerge=function(e){return(0,eO.s)(e)&&!this.pastCopies.has(e)&&(e=Array.isArray(e)?e.slice(0):(0,en.pi)({__proto__:Object.getPrototypeOf(e)},e),this.pastCopies.add(e)),e},e}();function tU(e){return"incremental"in e}function tH(e){return"hasNext"in e&&"data"in e}function t$(e){return tU(e)||tH(e)}function tz(e){return(0,eO.s)(e)&&"payload"in e}function tG(e,t){var n=e,r=new tB;return tU(t)&&(0,tP.O)(t.incremental)&&t.incremental.forEach(function(e){for(var t=e.data,i=e.path,a=i.length-1;a>=0;--a){var o=i[a],s=isNaN(+o)?{}:[];s[o]=t,t=s}n=r.merge(n,t)}),n}var tW=Object.prototype.hasOwnProperty;function tK(e,t){var n,r,i,a,o;return(0,en.mG)(this,void 0,void 0,function(){var s,u,c,l,f,d,h,p,b,m,g,v,y,w,_,E,S,k,x,T,M,O,A;return(0,en.Jh)(this,function(L){switch(L.label){case 0:if(void 0===TextDecoder)throw Error("TextDecoder must be defined in the environment: please import a polyfill.");s=new TextDecoder("utf-8"),u=null===(n=e.headers)||void 0===n?void 0:n.get("content-type"),c="boundary=",l=(null==u?void 0:u.includes(c))?null==u?void 0:u.substring((null==u?void 0:u.indexOf(c))+c.length).replace(/['"]/g,"").replace(/\;(.*)/gm,"").trim():"-",f="\r\n--".concat(l),d="",h=tI(e),p=!0,L.label=1;case 1:if(!p)return[3,3];return[4,h.next()];case 2:for(m=(b=L.sent()).value,g=b.done,v="string"==typeof m?m:s.decode(m),y=d.length-f.length+1,p=!g,d+=v,w=d.indexOf(f,y);w>-1;){if(_=void 0,_=(O=[d.slice(0,w),d.slice(w+f.length),])[0],d=O[1],E=_.indexOf("\r\n\r\n"),(k=(S=tV(_.slice(0,E)))["content-type"])&&-1===k.toLowerCase().indexOf("application/json"))throw Error("Unsupported patch content type: application/json is required.");if(x=_.slice(E))try{T=tq(e,x),Object.keys(T).length>1||"data"in T||"incremental"in T||"errors"in T||"payload"in T?tz(T)?(M={},"payload"in T&&(M=(0,en.pi)({},T.payload)),"errors"in T&&(M=(0,en.pi)((0,en.pi)({},M),{extensions:(0,en.pi)((0,en.pi)({},"extensions"in M?M.extensions:null),((A={})[tN.YG]=T.errors,A))})),null===(r=t.next)||void 0===r||r.call(t,M)):null===(i=t.next)||void 0===i||i.call(t,T):1===Object.keys(T).length&&"hasNext"in T&&!T.hasNext&&(null===(a=t.complete)||void 0===a||a.call(t))}catch(C){tZ(C,t)}w=d.indexOf(f)}return[3,1];case 3:return null===(o=t.complete)||void 0===o||o.call(t),[2]}})})}function tV(e){var t={};return e.split("\n").forEach(function(e){var n=e.indexOf(":");if(n>-1){var r=e.slice(0,n).trim().toLowerCase(),i=e.slice(n+1).trim();t[r]=i}}),t}function tq(e,t){e.status>=300&&tD(e,function(){try{return JSON.parse(t)}catch(e){return t}}(),"Response not successful: Received status code ".concat(e.status));try{return JSON.parse(t)}catch(n){var r=n;throw r.name="ServerParseError",r.response=e,r.statusCode=e.status,r.bodyText=t,r}}function tZ(e,t){var n,r;"AbortError"!==e.name&&(e.result&&e.result.errors&&e.result.data&&(null===(n=t.next)||void 0===n||n.call(t,e.result)),null===(r=t.error)||void 0===r||r.call(t,e))}function tX(e,t,n){tJ(t)(e).then(function(e){var t,r;null===(t=n.next)||void 0===t||t.call(n,e),null===(r=n.complete)||void 0===r||r.call(n)}).catch(function(e){return tZ(e,n)})}function tJ(e){return function(t){return t.text().then(function(e){return tq(t,e)}).then(function(n){return t.status>=300&&tD(t,n,"Response not successful: Received status code ".concat(t.status)),Array.isArray(n)||tW.call(n,"data")||tW.call(n,"errors")||tD(t,n,"Server response was missing for query '".concat(Array.isArray(e)?e.map(function(e){return e.operationName}):e.operationName,"'.")),n})}}var tQ=function(e){if(!e&&"undefined"==typeof fetch)throw __DEV__?new Q.ej("\n\"fetch\" has not been found globally and no fetcher has been configured. To fix this, install a fetch package (like https://www.npmjs.com/package/cross-fetch), instantiate the fetcher, and pass it into your HttpLink constructor. For example:\n\nimport fetch from 'cross-fetch';\nimport { ApolloClient, HttpLink } from '@apollo/client';\nconst client = new ApolloClient({\n  link: new HttpLink({ uri: '/graphql', fetch })\n});\n    "):new Q.ej(23)},t1=__webpack_require__(87392);function t0(e){return tl(e,{leave:t3})}var t2=80,t3={Name:function(e){return e.value},Variable:function(e){return"$"+e.name},Document:function(e){return t5(e.definitions,"\n\n")+"\n"},OperationDefinition:function(e){var t=e.operation,n=e.name,r=t9("(",t5(e.variableDefinitions,", "),")"),i=t5(e.directives," "),a=e.selectionSet;return n||i||r||"query"!==t?t5([t,t5([n,r]),i,a]," "):a},VariableDefinition:function(e){var t=e.variable,n=e.type,r=e.defaultValue,i=e.directives;return t+": "+n+t9(" = ",r)+t9(" ",t5(i," "))},SelectionSet:function(e){return t6(e.selections)},Field:function(e){var t=e.alias,n=e.name,r=e.arguments,i=e.directives,a=e.selectionSet,o=t9("",t,": ")+n,s=o+t9("(",t5(r,", "),")");return s.length>t2&&(s=o+t9("(\n",t8(t5(r,"\n")),"\n)")),t5([s,t5(i," "),a]," ")},Argument:function(e){var t;return e.name+": "+e.value},FragmentSpread:function(e){var t;return"..."+e.name+t9(" ",t5(e.directives," "))},InlineFragment:function(e){var t=e.typeCondition,n=e.directives,r=e.selectionSet;return t5(["...",t9("on ",t),t5(n," "),r]," ")},FragmentDefinition:function(e){var t=e.name,n=e.typeCondition,r=e.variableDefinitions,i=e.directives,a=e.selectionSet;return"fragment ".concat(t).concat(t9("(",t5(r,", "),")")," ")+"on ".concat(n," ").concat(t9("",t5(i," ")," "))+a},IntValue:function(e){return e.value},FloatValue:function(e){return e.value},StringValue:function(e,t){var n=e.value;return e.block?(0,t1.LZ)(n,"description"===t?"":"  "):JSON.stringify(n)},BooleanValue:function(e){return e.value?"true":"false"},NullValue:function(){return"null"},EnumValue:function(e){return e.value},ListValue:function(e){return"["+t5(e.values,", ")+"]"},ObjectValue:function(e){return"{"+t5(e.fields,", ")+"}"},ObjectField:function(e){var t;return e.name+": "+e.value},Directive:function(e){var t;return"@"+e.name+t9("(",t5(e.arguments,", "),")")},NamedType:function(e){return e.name},ListType:function(e){return"["+e.type+"]"},NonNullType:function(e){return e.type+"!"},SchemaDefinition:t4(function(e){var t=e.directives,n=e.operationTypes;return t5(["schema",t5(t," "),t6(n)]," ")}),OperationTypeDefinition:function(e){var t;return e.operation+": "+e.type},ScalarTypeDefinition:t4(function(e){var t;return t5(["scalar",e.name,t5(e.directives," ")]," ")}),ObjectTypeDefinition:t4(function(e){var t=e.name,n=e.interfaces,r=e.directives,i=e.fields;return t5(["type",t,t9("implements ",t5(n," & ")),t5(r," "),t6(i)]," ")}),FieldDefinition:t4(function(e){var t=e.name,n=e.arguments,r=e.type,i=e.directives;return t+(ne(n)?t9("(\n",t8(t5(n,"\n")),"\n)"):t9("(",t5(n,", "),")"))+": "+r+t9(" ",t5(i," "))}),InputValueDefinition:t4(function(e){var t=e.name,n=e.type,r=e.defaultValue,i=e.directives;return t5([t+": "+n,t9("= ",r),t5(i," ")]," ")}),InterfaceTypeDefinition:t4(function(e){var t=e.name,n=e.interfaces,r=e.directives,i=e.fields;return t5(["interface",t,t9("implements ",t5(n," & ")),t5(r," "),t6(i)]," ")}),UnionTypeDefinition:t4(function(e){var t=e.name,n=e.directives,r=e.types;return t5(["union",t,t5(n," "),r&&0!==r.length?"= "+t5(r," | "):""]," ")}),EnumTypeDefinition:t4(function(e){var t=e.name,n=e.directives,r=e.values;return t5(["enum",t,t5(n," "),t6(r)]," ")}),EnumValueDefinition:t4(function(e){var t;return t5([e.name,t5(e.directives," ")]," ")}),InputObjectTypeDefinition:t4(function(e){var t=e.name,n=e.directives,r=e.fields;return t5(["input",t,t5(n," "),t6(r)]," ")}),DirectiveDefinition:t4(function(e){var t=e.name,n=e.arguments,r=e.repeatable,i=e.locations;return"directive @"+t+(ne(n)?t9("(\n",t8(t5(n,"\n")),"\n)"):t9("(",t5(n,", "),")"))+(r?" repeatable":"")+" on "+t5(i," | ")}),SchemaExtension:function(e){var t=e.directives,n=e.operationTypes;return t5(["extend schema",t5(t," "),t6(n)]," ")},ScalarTypeExtension:function(e){var t;return t5(["extend scalar",e.name,t5(e.directives," ")]," ")},ObjectTypeExtension:function(e){var t=e.name,n=e.interfaces,r=e.directives,i=e.fields;return t5(["extend type",t,t9("implements ",t5(n," & ")),t5(r," "),t6(i)]," ")},InterfaceTypeExtension:function(e){var t=e.name,n=e.interfaces,r=e.directives,i=e.fields;return t5(["extend interface",t,t9("implements ",t5(n," & ")),t5(r," "),t6(i)]," ")},UnionTypeExtension:function(e){var t=e.name,n=e.directives,r=e.types;return t5(["extend union",t,t5(n," "),r&&0!==r.length?"= "+t5(r," | "):""]," ")},EnumTypeExtension:function(e){var t=e.name,n=e.directives,r=e.values;return t5(["extend enum",t,t5(n," "),t6(r)]," ")},InputObjectTypeExtension:function(e){var t=e.name,n=e.directives,r=e.fields;return t5(["extend input",t,t5(n," "),t6(r)]," ")}};function t4(e){return function(t){return t5([t.description,e(t)],"\n")}}function t5(e){var t,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";return null!==(t=null==e?void 0:e.filter(function(e){return e}).join(n))&&void 0!==t?t:""}function t6(e){return t9("{\n",t8(t5(e,"\n")),"\n}")}function t9(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"";return null!=t&&""!==t?e+t+n:""}function t8(e){return t9("  ",e.replace(/\n/g,"\n  "))}function t7(e){return -1!==e.indexOf("\n")}function ne(e){return null!=e&&e.some(t7)}var nt,nn,nr,ni={http:{includeQuery:!0,includeExtensions:!1,preserveHeaderCase:!1},headers:{accept:"*/*","content-type":"application/json"},options:{method:"POST"}},na=function(e,t){return t(e)};function no(e,t){for(var n=[],r=2;r<arguments.length;r++)n[r-2]=arguments[r];var i={},a={};n.forEach(function(e){i=(0,en.pi)((0,en.pi)((0,en.pi)({},i),e.options),{headers:(0,en.pi)((0,en.pi)({},i.headers),e.headers)}),e.credentials&&(i.credentials=e.credentials),a=(0,en.pi)((0,en.pi)({},a),e.http)}),i.headers&&(i.headers=ns(i.headers,a.preserveHeaderCase));var o=e.operationName,s=e.extensions,u=e.variables,c=e.query,l={operationName:o,variables:u};return a.includeExtensions&&(l.extensions=s),a.includeQuery&&(l.query=t(c,t0)),{options:i,body:l}}function ns(e,t){if(!t){var n=Object.create(null);return Object.keys(Object(e)).forEach(function(t){n[t.toLowerCase()]=e[t]}),n}var r=Object.create(null);Object.keys(Object(e)).forEach(function(t){r[t.toLowerCase()]={originalName:t,value:e[t]}});var i=Object.create(null);return Object.keys(r).forEach(function(e){i[r[e].originalName]=r[e].value}),i}var nu=function(){if("undefined"==typeof AbortController)return{controller:!1,signal:!1};var e=new AbortController,t=e.signal;return{controller:e,signal:t}};function nc(e,t){var n=[],r=function(e,t){n.push("".concat(e,"=").concat(encodeURIComponent(t)))};if("query"in t&&r("query",t.query),t.operationName&&r("operationName",t.operationName),t.variables){var i=void 0;try{i=ty(t.variables,"Variables map")}catch(a){return{parseError:a}}r("variables",i)}if(t.extensions){var o=void 0;try{o=ty(t.extensions,"Extensions map")}catch(s){return{parseError:s}}r("extensions",o)}var u="",c=e,l=e.indexOf("#");-1!==l&&(u=e.substr(l),c=e.substr(0,l));var f=-1===c.indexOf("?")?"?":"&";return{newURI:c+f+n.join("&")+u}}function nl(e){return new eT(function(t){t.error(e)})}var nf=(0,Q.wY)(function(){return fetch}),nd=function(e){void 0===e&&(e={});var t=e.uri,n=void 0===t?"/graphql":t,r=e.fetch,i=e.print,a=void 0===i?na:i,o=e.includeExtensions,s=e.preserveHeaderCase,u=e.useGETForQueries,c=e.includeUnusedVariables,l=void 0!==c&&c,f=(0,en._T)(e,["uri","fetch","print","includeExtensions","preserveHeaderCase","useGETForQueries","includeUnusedVariables"]);__DEV__&&tQ(r||nf);var d={http:{includeExtensions:o,preserveHeaderCase:s},options:f.fetchOptions,credentials:f.credentials,headers:f.headers};return new ta(function(e){var t,i=tw(e,n),o=e.getContext(),s={};if(o.clientAwareness){var c=o.clientAwareness,f=c.name,h=c.version;f&&(s["apollographql-client-name"]=f),h&&(s["apollographql-client-version"]=h)}var p=(0,en.pi)((0,en.pi)({},s),o.headers),b={http:o.http,options:o.fetchOptions,credentials:o.credentials,headers:p},m=no(e,a,ni,d,b),g=m.options,v=m.body;if(v.variables&&!l){var y=new Set(Object.keys(v.variables));tl(e.query,{Variable:function(e,t,n){n&&"VariableDefinition"!==n.kind&&y.delete(e.name.value)}}),y.size&&(v.variables=(0,en.pi)({},v.variables),y.forEach(function(e){delete v.variables[e]}))}if(!g.signal){var w=nu(),_=w.controller,E=w.signal;(t=_)&&(g.signal=E)}var S,k=function(e){return"OperationDefinition"===e.kind&&"mutation"===e.operation},x=(S=e9(e.query),"OperationDefinition"===S.kind&&"subscription"===S.operation),T=tb(["defer"],e.query);if(u&&!e.query.definitions.some(k)&&(g.method="GET"),T||x){g.headers=g.headers||{};var M="multipart/mixed;";x&&T&&__DEV__&&Q.kG.warn("Multipart-subscriptions do not support @defer"),x?M+="boundary=graphql;subscriptionSpec=1.0,application/json":T&&(M+="deferSpec=20220824,application/json"),g.headers.accept=M}if("GET"===g.method){var O=nc(i,v),A=O.newURI,L=O.parseError;if(L)return nl(L);i=A}else try{g.body=ty(v,"Payload")}catch(C){return nl(C)}return new eT(function(n){return(r||(0,Q.wY)(function(){return fetch})||nf)(i,g).then(function(t){e.setContext({response:t});var r,i=null===(r=t.headers)||void 0===r?void 0:r.get("content-type");return null!==i&&/^multipart\/mixed/i.test(i)?tK(t,n):tX(t,e,n)}).catch(function(e){return tZ(e,n)}),function(){t&&t.abort()}})})},nh=function(e){function t(t){void 0===t&&(t={});var n=e.call(this,nd(t).request)||this;return n.options=t,n}return(0,en.ZT)(t,e),t}(ta),np=ta.execute,nb="3.7.17",nm=__webpack_require__(82152);let ng=()=>Object.create(null),{forEach:nv,slice:ny}=Array.prototype,{hasOwnProperty:nw}=Object.prototype;class n_{constructor(e=!0,t=ng){this.weakness=e,this.makeData=t}lookup(...e){return this.lookupArray(e)}lookupArray(e){let t=this;return nv.call(e,e=>t=t.getChildTrie(e)),nw.call(t,"data")?t.data:t.data=this.makeData(ny.call(e))}peek(...e){return this.peekArray(e)}peekArray(e){let t=this;for(let n=0,r=e.length;t&&n<r;++n){let i=this.weakness&&nE(e[n])?t.weak:t.strong;t=i&&i.get(e[n])}return t&&t.data}getChildTrie(e){let t=this.weakness&&nE(e)?this.weak||(this.weak=new WeakMap):this.strong||(this.strong=new Map),n=t.get(e);return n||t.set(e,n=new n_(this.weakness,this.makeData)),n}}function nE(e){switch(typeof e){case"object":if(null===e)break;case"function":return!0}return!1}function nS(e){return(0,eO.s)(e)?(0,tP.k)(e)?e.slice(0):(0,en.pi)({__proto__:Object.getPrototypeOf(e)},e):e}var nk=function(){function e(){this.known=new(t_.sy?WeakSet:Set),this.pool=new n_(t_.mr),this.passes=new WeakMap,this.keysByJSON=new Map,this.empty=this.admit({})}return e.prototype.isKnown=function(e){return(0,eO.s)(e)&&this.known.has(e)},e.prototype.pass=function(e){if((0,eO.s)(e)){var t=nS(e);return this.passes.set(t,e),t}return e},e.prototype.admit=function(e){var t=this;if((0,eO.s)(e)){var n=this.passes.get(e);if(n)return n;var r=Object.getPrototypeOf(e);switch(r){case Array.prototype:if(this.known.has(e))break;var i=e.map(this.admit,this),a=this.pool.lookupArray(i);return!a.array&&(this.known.add(a.array=i),__DEV__&&Object.freeze(i)),a.array;case null:case Object.prototype:if(this.known.has(e))break;var o=Object.getPrototypeOf(e),s=[o],u=this.sortedKeys(e);s.push(u.json);var c=s.length;u.sorted.forEach(function(n){s.push(t.admit(e[n]))});var a=this.pool.lookupArray(s);if(!a.object){var l=a.object=Object.create(o);this.known.add(l),u.sorted.forEach(function(e,t){l[e]=s[c+t]}),__DEV__&&Object.freeze(l)}return a.object}}return e},e.prototype.sortedKeys=function(e){var t=Object.keys(e),n=this.pool.lookupArray(t);if(!n.keys){t.sort();var r=JSON.stringify(t);(n.keys=this.keysByJSON.get(r))||this.keysByJSON.set(r,n.keys={sorted:t,json:r})}return n.keys},e}(),nx=Object.assign(function(n){if((0,eO.s)(n)){void 0===e&&nT();var r=e.admit(n),i=t.get(r);return void 0===i&&t.set(r,i=JSON.stringify(r)),i}return JSON.stringify(n)},{reset:nT});function nT(){e=new nk,t=new(t_.mr?WeakMap:Map)}function nM(e,t,n){return new eT(function(r){var i=r.next,a=r.error,o=r.complete,s=0,u=!1,c={then:function(e){return new Promise(function(t){return t(e())})}};function l(e,t){return e?function(t){++s;var n=function(){return e(t)};c=c.then(n,n).then(function(e){--s,i&&i.call(r,e),u&&f.complete()},function(e){throw--s,e}).catch(function(e){a&&a.call(r,e)})}:function(e){return t&&t.call(r,e)}}var f={next:l(t,i),error:l(n,a),complete:function(){u=!0,!s&&o&&o.call(r)}},d=e.subscribe(f);return function(){return d.unsubscribe()}})}function nO(e){var t=nA(e);return(0,tP.O)(t)}function nA(e){var t=(0,tP.O)(e.errors)?e.errors.slice(0):[];return tU(e)&&(0,tP.O)(e.incremental)&&e.incremental.forEach(function(e){e.errors&&t.push.apply(t,e.errors)}),t}var nL=__webpack_require__(97359),nC={kind:nL.h.FIELD,name:{kind:nL.h.NAME,value:"__typename"}};function nI(e,t){return!e||e.selectionSet.selections.every(function(e){return e.kind===nL.h.FRAGMENT_SPREAD&&nI(t[e.name.value],t)})}function nD(e){return nI(e2(e)||e6(e),eL(e4(e)))?null:e}function nN(e){var t=new Set,n=[];return e.forEach(function(e){e.name?t.add(e.name):e.test&&n.push(e.test)}),function(e){return t.has(e.name.value)||n.some(function(t){return t(e)})}}function nP(e){var t=new Map;return function(n){void 0===n&&(n=e);var r=t.get(n);return r||t.set(n,r={variables:new Set,fragmentSpreads:new Set}),r}}function nR(e,t){for(var n=nP(""),r=nP(""),i=function(e){for(var t=0,i=void 0;t<e.length&&(i=e[t]);++t)if(!(0,tP.k)(i)){if(i.kind===nL.h.OPERATION_DEFINITION)return n(i.name&&i.name.value);if(i.kind===nL.h.FRAGMENT_DEFINITION)return r(i.name.value)}return __DEV__&&Q.kG.error("Could not find operation or fragment"),null},a=0,o=t.definitions.length-1;o>=0;--o)t.definitions[o].kind===nL.h.OPERATION_DEFINITION&&++a;var s=nN(e),u=e.some(function(e){return e.remove}),c=function(e){return u&&e&&e.some(s)},l=new Map,f=!1,d={enter:function(e){if(c(e.directives))return f=!0,null}},h=tl(t,{Field:d,InlineFragment:d,VariableDefinition:{enter:function(){return!1}},Variable:{enter:function(e,t,n,r,a){var o=i(a);o&&o.variables.add(e.name.value)}},FragmentSpread:{enter:function(e,t,n,r,a){if(c(e.directives))return f=!0,null;var o=i(a);o&&o.fragmentSpreads.add(e.name.value)}},FragmentDefinition:{enter:function(e,t,n,r){l.set(JSON.stringify(r),e)},leave:function(e,t,n,i){return e===l.get(JSON.stringify(i))?e:a>0&&e.selectionSet.selections.every(function(e){return e.kind===nL.h.FIELD&&"__typename"===e.name.value})?(r(e.name.value).removed=!0,f=!0,null):void 0}},Directive:{leave:function(e){if(s(e))return f=!0,null}}});if(!f)return t;var p=function(e){return e.transitiveVars||(e.transitiveVars=new Set(e.variables),e.removed||e.fragmentSpreads.forEach(function(t){p(r(t)).transitiveVars.forEach(function(t){e.transitiveVars.add(t)})})),e},b=new Set;h.definitions.forEach(function(e){e.kind===nL.h.OPERATION_DEFINITION?p(n(e.name&&e.name.value)).fragmentSpreads.forEach(function(e){b.add(e)}):e.kind!==nL.h.FRAGMENT_DEFINITION||0!==a||r(e.name.value).removed||b.add(e.name.value)}),b.forEach(function(e){p(r(e)).fragmentSpreads.forEach(function(e){b.add(e)})});var m=function(e){return!!(!b.has(e)||r(e).removed)},g={enter:function(e){if(m(e.name.value))return null}};return nD(tl(h,{FragmentSpread:g,FragmentDefinition:g,OperationDefinition:{leave:function(e){if(e.variableDefinitions){var t=p(n(e.name&&e.name.value)).transitiveVars;if(t.size<e.variableDefinitions.length)return(0,en.pi)((0,en.pi)({},e),{variableDefinitions:e.variableDefinitions.filter(function(e){return t.has(e.variable.name.value)})})}}}}))}var nj=Object.assign(function(e){return tl(e,{SelectionSet:{enter:function(e,t,n){if(!n||n.kind!==nL.h.OPERATION_DEFINITION){var r=e.selections;if(!(!r||r.some(function(e){return eQ(e)&&("__typename"===e.name.value||0===e.name.value.lastIndexOf("__",0))}))){var i=n;if(!(eQ(i)&&i.directives&&i.directives.some(function(e){return"export"===e.name.value})))return(0,en.pi)((0,en.pi)({},e),{selections:(0,en.ev)((0,en.ev)([],r,!0),[nC],!1)})}}}}})},{added:function(e){return e===nC}}),nF={test:function(e){var t="connection"===e.name.value;return t&&(!e.arguments||!e.arguments.some(function(e){return"key"===e.name.value}))&&__DEV__&&Q.kG.warn("Removing an @connection directive even though it does not have a key. You may want to use the key parameter to specify a store key."),t}};function nY(e){return nR([nF],e0(e))}function nB(e,t,n){return void 0===n&&(n=!0),!!t&&t.selections&&t.selections.some(function(t){return nU(e,t,n)})}function nU(e,t,n){return void 0===n&&(n=!0),!isField(t)||!!t.directives&&(t.directives.some(nN(e))||n&&nB(e,t.selectionSet,n))}function nH(e){return"query"===e9(e).operation?e:tl(e,{OperationDefinition:{enter:function(e){return(0,en.pi)((0,en.pi)({},e),{operation:"query"})}}})}function n$(e){return e0(e),nR([{test:function(e){return"client"===e.name.value},remove:!0},],e)}var nz=new Map;function nG(e){var t=nz.get(e)||1;return nz.set(e,t+1),"".concat(e,":").concat(t,":").concat(Math.random().toString(36).slice(2))}function nW(e,t,n){var r=[];e.forEach(function(e){return e[t]&&r.push(e)}),r.forEach(function(e){return e[t](n)})}function nK(e){function t(t){Object.defineProperty(e,t,{value:eT})}return t_.aS&&Symbol.species&&t(Symbol.species),t("@@species"),e}function nV(e){return e&&"function"==typeof e.then}var nq=function(e){function t(t){var n=e.call(this,function(e){return n.addObserver(e),function(){return n.removeObserver(e)}})||this;return n.observers=new Set,n.promise=new Promise(function(e,t){n.resolve=e,n.reject=t}),n.handlers={next:function(e){null!==n.sub&&(n.latest=["next",e],n.notify("next",e),nW(n.observers,"next",e))},error:function(e){var t=n.sub;null!==t&&(t&&setTimeout(function(){return t.unsubscribe()}),n.sub=null,n.latest=["error",e],n.reject(e),n.notify("error",e),nW(n.observers,"error",e))},complete:function(){var e=n,t=e.sub,r=e.sources,i=void 0===r?[]:r;if(null!==t){var a=i.shift();a?nV(a)?a.then(function(e){return n.sub=e.subscribe(n.handlers)}):n.sub=a.subscribe(n.handlers):(t&&setTimeout(function(){return t.unsubscribe()}),n.sub=null,n.latest&&"next"===n.latest[0]?n.resolve(n.latest[1]):n.resolve(),n.notify("complete"),nW(n.observers,"complete"))}}},n.nextResultListeners=new Set,n.cancel=function(e){n.reject(e),n.sources=[],n.handlers.complete()},n.promise.catch(function(e){}),"function"==typeof t&&(t=[new eT(t)]),nV(t)?t.then(function(e){return n.start(e)},n.handlers.error):n.start(t),n}return(0,en.ZT)(t,e),t.prototype.start=function(e){void 0===this.sub&&(this.sources=Array.from(e),this.handlers.complete())},t.prototype.deliverLastMessage=function(e){if(this.latest){var t=this.latest[0],n=e[t];n&&n.call(e,this.latest[1]),null===this.sub&&"next"===t&&e.complete&&e.complete()}},t.prototype.addObserver=function(e){this.observers.has(e)||(this.deliverLastMessage(e),this.observers.add(e))},t.prototype.removeObserver=function(e){this.observers.delete(e)&&this.observers.size<1&&this.handlers.complete()},t.prototype.notify=function(e,t){var n=this.nextResultListeners;n.size&&(this.nextResultListeners=new Set,n.forEach(function(n){return n(e,t)}))},t.prototype.beforeNext=function(e){var t=!1;this.nextResultListeners.add(function(n,r){t||(t=!0,e(n,r))})},t}(eT);nK(nq);var nZ=__webpack_require__(1644),nX=Object.prototype.toString;function nJ(e){return nQ(e)}function nQ(e,t){switch(nX.call(e)){case"[object Array]":if((t=t||new Map).has(e))return t.get(e);var n=e.slice(0);return t.set(e,n),n.forEach(function(e,r){n[r]=nQ(e,t)}),n;case"[object Object]":if((t=t||new Map).has(e))return t.get(e);var r=Object.create(Object.getPrototypeOf(e));return t.set(e,r),Object.keys(e).forEach(function(n){r[n]=nQ(e[n],t)}),r;default:return e}}var n1=__webpack_require__(53712),n0=Object.assign,n2=Object.hasOwnProperty,n3=function(e){function t(t){var n=t.queryManager,r=t.queryInfo,i=t.options,a=e.call(this,function(e){try{var t=e._subscription._observer;t&&!t.error&&(t.error=n5)}catch(n){}var r=!a.observers.size;a.observers.add(e);var i=a.last;return i&&i.error?e.error&&e.error(i.error):i&&i.result&&e.next&&e.next(i.result),r&&a.reobserve().catch(function(){}),function(){a.observers.delete(e)&&!a.observers.size&&a.tearDownQuery()}})||this;a.observers=new Set,a.subscriptions=new Set,a.queryInfo=r,a.queryManager=n,a.waitForOwnResult=n9(i.fetchPolicy),a.isTornDown=!1;var o=n.defaultOptions.watchQuery,s=(void 0===o?{}:o).fetchPolicy,u=void 0===s?"cache-first":s,c=i.fetchPolicy,l=void 0===c?u:c,f=i.initialFetchPolicy,d=void 0===f?"standby"===l?u:l:f;a.options=(0,en.pi)((0,en.pi)({},i),{initialFetchPolicy:d,fetchPolicy:l}),a.queryId=r.queryId||n.generateQueryId();var h=e2(a.query);return a.queryName=h&&h.name&&h.name.value,a}return(0,en.ZT)(t,e),Object.defineProperty(t.prototype,"query",{get:function(){return this.queryManager.transform(this.options.query).document},enumerable:!1,configurable:!0}),Object.defineProperty(t.prototype,"variables",{get:function(){return this.options.variables},enumerable:!1,configurable:!0}),t.prototype.result=function(){var e=this;return new Promise(function(t,n){var r={next:function(n){t(n),e.observers.delete(r),e.observers.size||e.queryManager.removeQuery(e.queryId),setTimeout(function(){i.unsubscribe()},0)},error:n},i=e.subscribe(r)})},t.prototype.getCurrentResult=function(e){void 0===e&&(e=!0);var t=this.getLastResult(!0),n=this.queryInfo.networkStatus||t&&t.networkStatus||nZ.I.ready,r=(0,en.pi)((0,en.pi)({},t),{loading:(0,nZ.O)(n),networkStatus:n}),i=this.options.fetchPolicy,a=void 0===i?"cache-first":i;if(n9(a)||this.queryManager.transform(this.options.query).hasForcedResolvers);else if(this.waitForOwnResult)this.queryInfo.updateWatch();else{var o=this.queryInfo.getDiff();(o.complete||this.options.returnPartialData)&&(r.data=o.result),(0,nm.D)(r.data,{})&&(r.data=void 0),o.complete?(delete r.partial,o.complete&&r.networkStatus===nZ.I.loading&&("cache-first"===a||"cache-only"===a)&&(r.networkStatus=nZ.I.ready,r.loading=!1)):r.partial=!0,!__DEV__||o.complete||this.options.partialRefetch||r.loading||r.data||r.error||n6(o.missing)}return e&&this.updateLastResult(r),r},t.prototype.isDifferentFromLastResult=function(e,t){return!this.last||!(0,nm.D)(this.last.result,e)||t&&!(0,nm.D)(this.last.variables,t)},t.prototype.getLast=function(e,t){var n=this.last;if(n&&n[e]&&(!t||(0,nm.D)(n.variables,this.variables)))return n[e]},t.prototype.getLastResult=function(e){return this.getLast("result",e)},t.prototype.getLastError=function(e){return this.getLast("error",e)},t.prototype.resetLastResults=function(){delete this.last,this.isTornDown=!1},t.prototype.resetQueryStoreErrors=function(){this.queryManager.resetErrors(this.queryId)},t.prototype.refetch=function(e){var t,n={pollInterval:0},r=this.options.fetchPolicy;if("cache-and-network"===r?n.fetchPolicy=r:"no-cache"===r?n.fetchPolicy="no-cache":n.fetchPolicy="network-only",__DEV__&&e&&n2.call(e,"variables")){var i=e5(this.query),a=i.variableDefinitions;(!a||!a.some(function(e){return"variables"===e.variable.name.value}))&&__DEV__&&Q.kG.warn("Called refetch(".concat(JSON.stringify(e),") for query ").concat((null===(t=i.name)||void 0===t?void 0:t.value)||JSON.stringify(i),", which does not declare a $variables variable.\nDid you mean to call refetch(variables) instead of refetch({ variables })?"))}return e&&!(0,nm.D)(this.options.variables,e)&&(n.variables=this.options.variables=(0,en.pi)((0,en.pi)({},this.options.variables),e)),this.queryInfo.resetLastWrite(),this.reobserve(n,nZ.I.refetch)},t.prototype.fetchMore=function(e){var t=this,n=(0,en.pi)((0,en.pi)({},e.query?e:(0,en.pi)((0,en.pi)((0,en.pi)((0,en.pi)({},this.options),{query:this.query}),e),{variables:(0,en.pi)((0,en.pi)({},this.options.variables),e.variables)})),{fetchPolicy:"no-cache"}),r=this.queryManager.generateQueryId(),i=this.queryInfo,a=i.networkStatus;i.networkStatus=nZ.I.fetchMore,n.notifyOnNetworkStatusChange&&this.observe();var o=new Set;return this.queryManager.fetchQuery(r,n,nZ.I.fetchMore).then(function(s){return t.queryManager.removeQuery(r),i.networkStatus===nZ.I.fetchMore&&(i.networkStatus=a),t.queryManager.cache.batch({update:function(r){var i=e.updateQuery;i?r.updateQuery({query:t.query,variables:t.variables,returnPartialData:!0,optimistic:!1},function(e){return i(e,{fetchMoreResult:s.data,variables:n.variables})}):r.writeQuery({query:n.query,variables:n.variables,data:s.data})},onWatchUpdated:function(e){o.add(e.query)}}),s}).finally(function(){o.has(t.query)||n4(t)})},t.prototype.subscribeToMore=function(e){var t=this,n=this.queryManager.startGraphQLSubscription({query:e.document,variables:e.variables,context:e.context}).subscribe({next:function(n){var r=e.updateQuery;r&&t.updateQuery(function(e,t){return r(e,{subscriptionData:n,variables:t.variables})})},error:function(t){if(e.onError){e.onError(t);return}__DEV__&&Q.kG.error("Unhandled GraphQL subscription error",t)}});return this.subscriptions.add(n),function(){t.subscriptions.delete(n)&&n.unsubscribe()}},t.prototype.setOptions=function(e){return this.reobserve(e)},t.prototype.setVariables=function(e){return(0,nm.D)(this.variables,e)?this.observers.size?this.result():Promise.resolve():(this.options.variables=e,this.observers.size)?this.reobserve({fetchPolicy:this.options.initialFetchPolicy,variables:e},nZ.I.setVariables):Promise.resolve()},t.prototype.updateQuery=function(e){var t=this.queryManager,n=e(t.cache.diff({query:this.options.query,variables:this.variables,returnPartialData:!0,optimistic:!1}).result,{variables:this.variables});n&&(t.cache.writeQuery({query:this.options.query,data:n,variables:this.variables}),t.broadcastQueries())},t.prototype.startPolling=function(e){this.options.pollInterval=e,this.updatePolling()},t.prototype.stopPolling=function(){this.options.pollInterval=0,this.updatePolling()},t.prototype.applyNextFetchPolicy=function(e,t){if(t.nextFetchPolicy){var n=t.fetchPolicy,r=void 0===n?"cache-first":n,i=t.initialFetchPolicy,a=void 0===i?r:i;"standby"===r||("function"==typeof t.nextFetchPolicy?t.fetchPolicy=t.nextFetchPolicy(r,{reason:e,options:t,observable:this,initialFetchPolicy:a}):"variables-changed"===e?t.fetchPolicy=a:t.fetchPolicy=t.nextFetchPolicy)}return t.fetchPolicy},t.prototype.fetch=function(e,t){return this.queryManager.setObservableQuery(this),this.queryManager.fetchConcastWithInfo(this.queryId,e,t)},t.prototype.updatePolling=function(){var e=this;if(!this.queryManager.ssrMode){var t=this,n=t.pollingInfo,r=t.options.pollInterval;if(!r){n&&(clearTimeout(n.timeout),delete this.pollingInfo);return}if(!n||n.interval!==r){__DEV__?(0,Q.kG)(r,"Attempted to start a polling query without a polling interval."):(0,Q.kG)(r,13),(n||(this.pollingInfo={})).interval=r;var i=function(){e.pollingInfo&&((0,nZ.O)(e.queryInfo.networkStatus)?a():e.reobserve({fetchPolicy:"no-cache"===e.options.initialFetchPolicy?"no-cache":"network-only"},nZ.I.poll).then(a,a))},a=function(){var t=e.pollingInfo;t&&(clearTimeout(t.timeout),t.timeout=setTimeout(i,t.interval))};a()}}},t.prototype.updateLastResult=function(e,t){return void 0===t&&(t=this.variables),this.last=(0,en.pi)((0,en.pi)({},this.last),{result:this.queryManager.assumeImmutableResults?e:nJ(e),variables:t}),(0,tP.O)(e.errors)||delete this.last.error,this.last},t.prototype.reobserveAsConcast=function(e,t){var n=this;this.isTornDown=!1;var r=t===nZ.I.refetch||t===nZ.I.fetchMore||t===nZ.I.poll,i=this.options.variables,a=this.options.fetchPolicy,o=(0,n1.o)(this.options,e||{}),s=r?o:n0(this.options,o);!r&&(this.updatePolling(),e&&e.variables&&!(0,nm.D)(e.variables,i)&&"standby"!==s.fetchPolicy&&s.fetchPolicy===a&&(this.applyNextFetchPolicy("variables-changed",s),void 0===t&&(t=nZ.I.setVariables))),this.waitForOwnResult&&(this.waitForOwnResult=n9(s.fetchPolicy));var u=function(){n.concast===f&&(n.waitForOwnResult=!1)},c=s.variables&&(0,en.pi)({},s.variables),l=this.fetch(s,t),f=l.concast,d=l.fromLink,h={next:function(e){u(),n.reportResult(e,c)},error:function(e){u(),n.reportError(e,c)}};return!r&&d&&(this.concast&&this.observer&&this.concast.removeObserver(this.observer),this.concast=f,this.observer=h),f.addObserver(h),f},t.prototype.reobserve=function(e,t){return this.reobserveAsConcast(e,t).promise},t.prototype.observe=function(){this.reportResult(this.getCurrentResult(!1),this.variables)},t.prototype.reportResult=function(e,t){var n=this.getLastError();(n||this.isDifferentFromLastResult(e,t))&&((n||!e.partial||this.options.returnPartialData)&&this.updateLastResult(e,t),nW(this.observers,"next",e))},t.prototype.reportError=function(e,t){var n=(0,en.pi)((0,en.pi)({},this.getLastResult()),{error:e,errors:e.graphQLErrors,networkStatus:nZ.I.error,loading:!1});this.updateLastResult(n,t),nW(this.observers,"error",this.last.error=e)},t.prototype.hasObservers=function(){return this.observers.size>0},t.prototype.tearDownQuery=function(){this.isTornDown||(this.concast&&this.observer&&(this.concast.removeObserver(this.observer),delete this.concast,delete this.observer),this.stopPolling(),this.subscriptions.forEach(function(e){return e.unsubscribe()}),this.subscriptions.clear(),this.queryManager.stopQuery(this.queryId),this.observers.clear(),this.isTornDown=!0)},t}(eT);function n4(e){var t=e.options,n=t.fetchPolicy,r=t.nextFetchPolicy;return"cache-and-network"===n||"network-only"===n?e.reobserve({fetchPolicy:"cache-first",nextFetchPolicy:function(){return(this.nextFetchPolicy=r,"function"==typeof r)?r.apply(this,arguments):n}}):e.reobserve()}function n5(e){__DEV__&&Q.kG.error("Unhandled error",e.message,e.stack)}function n6(e){__DEV__&&e&&__DEV__&&Q.kG.debug("Missing cache result fields: ".concat(JSON.stringify(e)),e)}function n9(e){return"network-only"===e||"no-cache"===e||"standby"===e}nK(n3);function n8(e){return e.kind===nL.h.FIELD||e.kind===nL.h.FRAGMENT_SPREAD||e.kind===nL.h.INLINE_FRAGMENT}function n7(e){return e.kind===Kind.SCALAR_TYPE_DEFINITION||e.kind===Kind.OBJECT_TYPE_DEFINITION||e.kind===Kind.INTERFACE_TYPE_DEFINITION||e.kind===Kind.UNION_TYPE_DEFINITION||e.kind===Kind.ENUM_TYPE_DEFINITION||e.kind===Kind.INPUT_OBJECT_TYPE_DEFINITION}function re(e){return e.kind===Kind.SCALAR_TYPE_EXTENSION||e.kind===Kind.OBJECT_TYPE_EXTENSION||e.kind===Kind.INTERFACE_TYPE_EXTENSION||e.kind===Kind.UNION_TYPE_EXTENSION||e.kind===Kind.ENUM_TYPE_EXTENSION||e.kind===Kind.INPUT_OBJECT_TYPE_EXTENSION}var rt=function(){return Object.create(null)},rn=Array.prototype,rr=rn.forEach,ri=rn.slice,ra=function(){function e(e,t){void 0===e&&(e=!0),void 0===t&&(t=rt),this.weakness=e,this.makeData=t}return e.prototype.lookup=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return this.lookupArray(e)},e.prototype.lookupArray=function(e){var t=this;return rr.call(e,function(e){return t=t.getChildTrie(e)}),t.data||(t.data=this.makeData(ri.call(e)))},e.prototype.getChildTrie=function(t){var n=this.weakness&&ro(t)?this.weak||(this.weak=new WeakMap):this.strong||(this.strong=new Map),r=n.get(t);return r||n.set(t,r=new e(this.weakness,this.makeData)),r},e}();function ro(e){switch(typeof e){case"object":if(null===e)break;case"function":return!0}return!1}let rs=null,ru={},rc=1,rl=()=>class{constructor(){this.id=["slot",rc++,Date.now(),Math.random().toString(36).slice(2),].join(":")}hasValue(){for(let e=rs;e;e=e.parent)if(this.id in e.slots){let t=e.slots[this.id];if(t===ru)break;return e!==rs&&(rs.slots[this.id]=t),!0}return rs&&(rs.slots[this.id]=ru),!1}getValue(){if(this.hasValue())return rs.slots[this.id]}withValue(e,t,n,r){let i={__proto__:null,[this.id]:e},a=rs;rs={parent:a,slots:i};try{return t.apply(r,n)}finally{rs=a}}static bind(e){let t=rs;return function(){let n=rs;try{return rs=t,e.apply(this,arguments)}finally{rs=n}}}static noContext(e,t,n){if(!rs)return e.apply(n,t);{let r=rs;try{return rs=null,e.apply(n,t)}finally{rs=r}}}};function rf(e){try{return e()}catch(t){}}let rd="@wry/context:Slot",rh=rf(()=>globalThis)||rf(()=>global)||Object.create(null),rp=rh,rb=rp[rd]||Array[rd]||function(e){try{Object.defineProperty(rp,rd,{value:e,enumerable:!1,writable:!1,configurable:!0})}finally{return e}}(rl()),{bind:rm,noContext:rg}=rb;function rv(){}var ry=function(){function e(e,t){void 0===e&&(e=1/0),void 0===t&&(t=rv),this.max=e,this.dispose=t,this.map=new Map,this.newest=null,this.oldest=null}return e.prototype.has=function(e){return this.map.has(e)},e.prototype.get=function(e){var t=this.getNode(e);return t&&t.value},e.prototype.getNode=function(e){var t=this.map.get(e);if(t&&t!==this.newest){var n=t.older,r=t.newer;r&&(r.older=n),n&&(n.newer=r),t.older=this.newest,t.older.newer=t,t.newer=null,this.newest=t,t===this.oldest&&(this.oldest=r)}return t},e.prototype.set=function(e,t){var n=this.getNode(e);return n?n.value=t:(n={key:e,value:t,newer:null,older:this.newest},this.newest&&(this.newest.newer=n),this.newest=n,this.oldest=this.oldest||n,this.map.set(e,n),n.value)},e.prototype.clean=function(){for(;this.oldest&&this.map.size>this.max;)this.delete(this.oldest.key)},e.prototype.delete=function(e){var t=this.map.get(e);return!!t&&(t===this.newest&&(this.newest=t.older),t===this.oldest&&(this.oldest=t.newer),t.newer&&(t.newer.older=t.older),t.older&&(t.older.newer=t.newer),this.map.delete(e),this.dispose(t.value,e),!0)},e}(),rw=new rb,r_=Object.prototype.hasOwnProperty,rE=void 0===(n=Array.from)?function(e){var t=[];return e.forEach(function(e){return t.push(e)}),t}:n;function rS(e){var t=e.unsubscribe;"function"==typeof t&&(e.unsubscribe=void 0,t())}var rk=[],rx=100;function rT(e,t){if(!e)throw Error(t||"assertion failure")}function rM(e,t){var n=e.length;return n>0&&n===t.length&&e[n-1]===t[n-1]}function rO(e){switch(e.length){case 0:throw Error("unknown value");case 1:return e[0];case 2:throw e[1]}}function rA(e){return e.slice(0)}var rL=function(){function e(t){this.fn=t,this.parents=new Set,this.childValues=new Map,this.dirtyChildren=null,this.dirty=!0,this.recomputing=!1,this.value=[],this.deps=null,++e.count}return e.prototype.peek=function(){if(1===this.value.length&&!rN(this))return rC(this),this.value[0]},e.prototype.recompute=function(e){return rT(!this.recomputing,"already recomputing"),rC(this),rN(this)?rI(this,e):rO(this.value)},e.prototype.setDirty=function(){this.dirty||(this.dirty=!0,this.value.length=0,rR(this),rS(this))},e.prototype.dispose=function(){var e=this;this.setDirty(),rH(this),rF(this,function(t,n){t.setDirty(),r$(t,e)})},e.prototype.forget=function(){this.dispose()},e.prototype.dependOn=function(e){e.add(this),this.deps||(this.deps=rk.pop()||new Set),this.deps.add(e)},e.prototype.forgetDeps=function(){var e=this;this.deps&&(rE(this.deps).forEach(function(t){return t.delete(e)}),this.deps.clear(),rk.push(this.deps),this.deps=null)},e.count=0,e}();function rC(e){var t=rw.getValue();if(t)return e.parents.add(t),t.childValues.has(e)||t.childValues.set(e,[]),rN(e)?rY(t,e):rB(t,e),t}function rI(e,t){return rH(e),rw.withValue(e,rD,[e,t]),rz(e,t)&&rP(e),rO(e.value)}function rD(e,t){e.recomputing=!0,e.value.length=0;try{e.value[0]=e.fn.apply(null,t)}catch(n){e.value[1]=n}e.recomputing=!1}function rN(e){return e.dirty||!!(e.dirtyChildren&&e.dirtyChildren.size)}function rP(e){e.dirty=!1,!rN(e)&&rj(e)}function rR(e){rF(e,rY)}function rj(e){rF(e,rB)}function rF(e,t){var n=e.parents.size;if(n)for(var r=rE(e.parents),i=0;i<n;++i)t(r[i],e)}function rY(e,t){rT(e.childValues.has(t)),rT(rN(t));var n=!rN(e);if(e.dirtyChildren){if(e.dirtyChildren.has(t))return}else e.dirtyChildren=rk.pop()||new Set;e.dirtyChildren.add(t),n&&rR(e)}function rB(e,t){rT(e.childValues.has(t)),rT(!rN(t));var n=e.childValues.get(t);0===n.length?e.childValues.set(t,rA(t.value)):rM(n,t.value)||e.setDirty(),rU(e,t),!rN(e)&&rj(e)}function rU(e,t){var n=e.dirtyChildren;n&&(n.delete(t),0===n.size&&(rk.length<rx&&rk.push(n),e.dirtyChildren=null))}function rH(e){e.childValues.size>0&&e.childValues.forEach(function(t,n){r$(e,n)}),e.forgetDeps(),rT(null===e.dirtyChildren)}function r$(e,t){t.parents.delete(e),e.childValues.delete(t),rU(e,t)}function rz(e,t){if("function"==typeof e.subscribe)try{rS(e),e.unsubscribe=e.subscribe.apply(null,t)}catch(n){return e.setDirty(),!1}return!0}var rG={setDirty:!0,dispose:!0,forget:!0};function rW(e){var t=new Map,n=e&&e.subscribe;function r(e){var r=rw.getValue();if(r){var i=t.get(e);i||t.set(e,i=new Set),r.dependOn(i),"function"==typeof n&&(rS(i),i.unsubscribe=n(e))}}return r.dirty=function(e,n){var r=t.get(e);if(r){var i=n&&r_.call(rG,n)?n:"setDirty";rE(r).forEach(function(e){return e[i]()}),t.delete(e),rS(r)}},r}function rK(){var e=new ra("function"==typeof WeakMap);return function(){return e.lookupArray(arguments)}}var rV=rK(),rq=new Set;function rZ(e,t){void 0===t&&(t=Object.create(null));var n=new ry(t.max||65536,function(e){return e.dispose()}),r=t.keyArgs,i=t.makeCacheKey||rK(),a=function(){var a=i.apply(null,r?r.apply(null,arguments):arguments);if(void 0===a)return e.apply(null,arguments);var o=n.get(a);o||(n.set(a,o=new rL(e)),o.subscribe=t.subscribe,o.forget=function(){return n.delete(a)});var s=o.recompute(Array.prototype.slice.call(arguments));return n.set(a,o),rq.add(n),rw.hasValue()||(rq.forEach(function(e){return e.clean()}),rq.clear()),s};function o(e){var t=n.get(e);t&&t.setDirty()}function s(e){var t=n.get(e);if(t)return t.peek()}function u(e){return n.delete(e)}return Object.defineProperty(a,"size",{get:function(){return n.map.size},configurable:!1,enumerable:!1}),a.dirtyKey=o,a.dirty=function(){o(i.apply(null,arguments))},a.peekKey=s,a.peek=function(){return s(i.apply(null,arguments))},a.forgetKey=u,a.forget=function(){return u(i.apply(null,arguments))},a.makeCacheKey=i,a.getKey=r?function(){return i.apply(null,r.apply(null,arguments))}:i,Object.freeze(a)}var rX=new rb,rJ=new WeakMap;function rQ(e){var t=rJ.get(e);return t||rJ.set(e,t={vars:new Set,dep:rW()}),t}function r1(e){rQ(e).vars.forEach(function(t){return t.forgetCache(e)})}function r0(e){rQ(e).vars.forEach(function(t){return t.attachCache(e)})}function r2(e){var t=new Set,n=new Set,r=function(a){if(arguments.length>0){if(e!==a){e=a,t.forEach(function(e){rQ(e).dep.dirty(r),r3(e)});var o=Array.from(n);n.clear(),o.forEach(function(t){return t(e)})}}else{var s=rX.getValue();s&&(i(s),rQ(s).dep(r))}return e};r.onNextChange=function(e){return n.add(e),function(){n.delete(e)}};var i=r.attachCache=function(e){return t.add(e),rQ(e).vars.add(r),r};return r.forgetCache=function(e){return t.delete(e)},r}function r3(e){e.broadcastWatches&&e.broadcastWatches()}var r4=function(){function e(e){var t=e.cache,n=e.client,r=e.resolvers,i=e.fragmentMatcher;this.selectionsToResolveCache=new WeakMap,this.cache=t,n&&(this.client=n),r&&this.addResolvers(r),i&&this.setFragmentMatcher(i)}return e.prototype.addResolvers=function(e){var t=this;this.resolvers=this.resolvers||{},Array.isArray(e)?e.forEach(function(e){t.resolvers=tj(t.resolvers,e)}):this.resolvers=tj(this.resolvers,e)},e.prototype.setResolvers=function(e){this.resolvers={},this.addResolvers(e)},e.prototype.getResolvers=function(){return this.resolvers||{}},e.prototype.runResolvers=function(e){var t=e.document,n=e.remoteResult,r=e.context,i=e.variables,a=e.onlyRunForcedResolvers,o=void 0!==a&&a;return(0,en.mG)(this,void 0,void 0,function(){return(0,en.Jh)(this,function(e){return t?[2,this.resolveDocument(t,n.data,r,i,this.fragmentMatcher,o).then(function(e){return(0,en.pi)((0,en.pi)({},n),{data:e.result})})]:[2,n]})})},e.prototype.setFragmentMatcher=function(e){this.fragmentMatcher=e},e.prototype.getFragmentMatcher=function(){return this.fragmentMatcher},e.prototype.clientQuery=function(e){return tb(["client"],e)&&this.resolvers?e:null},e.prototype.serverQuery=function(e){return n$(e)},e.prototype.prepareContext=function(e){var t=this.cache;return(0,en.pi)((0,en.pi)({},e),{cache:t,getCacheKey:function(e){return t.identify(e)}})},e.prototype.addExportedVariables=function(e,t,n){return void 0===t&&(t={}),void 0===n&&(n={}),(0,en.mG)(this,void 0,void 0,function(){return(0,en.Jh)(this,function(r){return e?[2,this.resolveDocument(e,this.buildRootValueFromCache(e,t)||{},this.prepareContext(n),t).then(function(e){return(0,en.pi)((0,en.pi)({},t),e.exportedVariables)})]:[2,(0,en.pi)({},t)]})})},e.prototype.shouldForceResolvers=function(e){var t=!1;return tl(e,{Directive:{enter:function(e){if("client"===e.name.value&&e.arguments&&(t=e.arguments.some(function(e){return"always"===e.name.value&&"BooleanValue"===e.value.kind&&!0===e.value.value})))return tc}}}),t},e.prototype.buildRootValueFromCache=function(e,t){return this.cache.diff({query:nH(e),variables:t,returnPartialData:!0,optimistic:!1}).result},e.prototype.resolveDocument=function(e,t,n,r,i,a){return void 0===n&&(n={}),void 0===r&&(r={}),void 0===i&&(i=function(){return!0}),void 0===a&&(a=!1),(0,en.mG)(this,void 0,void 0,function(){var o,s,u,c,l,f,d,h,p,b,m;return(0,en.Jh)(this,function(g){return o=e9(e),s=e4(e),u=eL(s),c=this.collectSelectionsToResolve(o,u),f=(l=o.operation)?l.charAt(0).toUpperCase()+l.slice(1):"Query",d=this,h=d.cache,p=d.client,b={fragmentMap:u,context:(0,en.pi)((0,en.pi)({},n),{cache:h,client:p}),variables:r,fragmentMatcher:i,defaultOperationType:f,exportedVariables:{},selectionsToResolve:c,onlyRunForcedResolvers:a},m=!1,[2,this.resolveSelectionSet(o.selectionSet,m,t,b).then(function(e){return{result:e,exportedVariables:b.exportedVariables}})]})})},e.prototype.resolveSelectionSet=function(e,t,n,r){return(0,en.mG)(this,void 0,void 0,function(){var i,a,o,s,u,c=this;return(0,en.Jh)(this,function(l){return i=r.fragmentMap,a=r.context,o=r.variables,s=[n],u=function(e){return(0,en.mG)(c,void 0,void 0,function(){var u,c;return(0,en.Jh)(this,function(l){return(t||r.selectionsToResolve.has(e))&&td(e,o)?eQ(e)?[2,this.resolveField(e,t,n,r).then(function(t){var n;void 0!==t&&s.push(((n={})[eX(e)]=t,n))})]:(e1(e)?u=e:(u=i[e.name.value],__DEV__?(0,Q.kG)(u,"No fragment named ".concat(e.name.value)):(0,Q.kG)(u,11)),u&&u.typeCondition&&(c=u.typeCondition.name.value,r.fragmentMatcher(n,c,a)))?[2,this.resolveSelectionSet(u.selectionSet,t,n,r).then(function(e){s.push(e)})]:[2]:[2]})})},[2,Promise.all(e.selections.map(u)).then(function(){return tF(s)})]})})},e.prototype.resolveField=function(e,t,n,r){return(0,en.mG)(this,void 0,void 0,function(){var i,a,o,s,u,c,l,f,d,h=this;return(0,en.Jh)(this,function(p){return n?(i=r.variables,a=e.name.value,o=eX(e),s=a!==o,c=Promise.resolve(u=n[o]||n[a]),(!r.onlyRunForcedResolvers||this.shouldForceResolvers(e))&&(l=n.__typename||r.defaultOperationType,(f=this.resolvers&&this.resolvers[l])&&(d=f[s?a:o])&&(c=Promise.resolve(rX.withValue(this.cache,d,[n,eZ(e,i),r.context,{field:e,fragmentMap:r.fragmentMap},])))),[2,c.then(function(n){if(void 0===n&&(n=u),e.directives&&e.directives.forEach(function(e){"export"===e.name.value&&e.arguments&&e.arguments.forEach(function(e){"as"===e.name.value&&"StringValue"===e.value.kind&&(r.exportedVariables[e.value.value]=n)})}),!e.selectionSet||null==n)return n;var i,a,o=null!==(a=null===(i=e.directives)||void 0===i?void 0:i.some(function(e){return"client"===e.name.value}))&&void 0!==a&&a;return Array.isArray(n)?h.resolveSubSelectedArray(e,t||o,n,r):e.selectionSet?h.resolveSelectionSet(e.selectionSet,t||o,n,r):void 0})]):[2,null]})})},e.prototype.resolveSubSelectedArray=function(e,t,n,r){var i=this;return Promise.all(n.map(function(n){return null===n?null:Array.isArray(n)?i.resolveSubSelectedArray(e,t,n,r):e.selectionSet?i.resolveSelectionSet(e.selectionSet,t,n,r):void 0}))},e.prototype.collectSelectionsToResolve=function(e,t){var n=function(e){return!Array.isArray(e)},r=this.selectionsToResolveCache;function i(e){if(!r.has(e)){var a=new Set;r.set(e,a),tl(e,{Directive:function(e,t,r,i,o){"client"===e.name.value&&o.forEach(function(e){n(e)&&n8(e)&&a.add(e)})},FragmentSpread:function(e,r,o,s,u){var c=t[e.name.value];__DEV__?(0,Q.kG)(c,"No fragment named ".concat(e.name.value)):(0,Q.kG)(c,12);var l=i(c);l.size>0&&(u.forEach(function(e){n(e)&&n8(e)&&a.add(e)}),a.add(e),l.forEach(function(e){a.add(e)}))}})}return r.get(e)}return i(e)},e}(),r5=new(t_.mr?WeakMap:Map);function r6(e,t){var n=e[t];"function"==typeof n&&(e[t]=function(){return r5.set(e,(r5.get(e)+1)%1e15),n.apply(this,arguments)})}function r9(e){e.notifyTimeout&&(clearTimeout(e.notifyTimeout),e.notifyTimeout=void 0)}var r8=function(){function e(e,t){void 0===t&&(t=e.generateQueryId()),this.queryId=t,this.listeners=new Set,this.document=null,this.lastRequestId=1,this.subscriptions=new Set,this.stopped=!1,this.dirty=!1,this.observableQuery=null;var n=this.cache=e.cache;r5.has(n)||(r5.set(n,0),r6(n,"evict"),r6(n,"modify"),r6(n,"reset"))}return e.prototype.init=function(e){var t=e.networkStatus||nZ.I.loading;return this.variables&&this.networkStatus!==nZ.I.loading&&!(0,nm.D)(this.variables,e.variables)&&(t=nZ.I.setVariables),(0,nm.D)(e.variables,this.variables)||(this.lastDiff=void 0),Object.assign(this,{document:e.document,variables:e.variables,networkError:null,graphQLErrors:this.graphQLErrors||[],networkStatus:t}),e.observableQuery&&this.setObservableQuery(e.observableQuery),e.lastRequestId&&(this.lastRequestId=e.lastRequestId),this},e.prototype.reset=function(){r9(this),this.dirty=!1},e.prototype.getDiff=function(e){void 0===e&&(e=this.variables);var t=this.getDiffOptions(e);if(this.lastDiff&&(0,nm.D)(t,this.lastDiff.options))return this.lastDiff.diff;this.updateWatch(this.variables=e);var n=this.observableQuery;if(n&&"no-cache"===n.options.fetchPolicy)return{complete:!1};var r=this.cache.diff(t);return this.updateLastDiff(r,t),r},e.prototype.updateLastDiff=function(e,t){this.lastDiff=e?{diff:e,options:t||this.getDiffOptions()}:void 0},e.prototype.getDiffOptions=function(e){var t;return void 0===e&&(e=this.variables),{query:this.document,variables:e,returnPartialData:!0,optimistic:!0,canonizeResults:null===(t=this.observableQuery)||void 0===t?void 0:t.options.canonizeResults}},e.prototype.setDiff=function(e){var t=this,n=this.lastDiff&&this.lastDiff.diff;this.updateLastDiff(e),this.dirty||(0,nm.D)(n&&n.result,e&&e.result)||(this.dirty=!0,this.notifyTimeout||(this.notifyTimeout=setTimeout(function(){return t.notify()},0)))},e.prototype.setObservableQuery=function(e){var t=this;e!==this.observableQuery&&(this.oqListener&&this.listeners.delete(this.oqListener),this.observableQuery=e,e?(e.queryInfo=this,this.listeners.add(this.oqListener=function(){t.getDiff().fromOptimisticTransaction?e.observe():n4(e)})):delete this.oqListener)},e.prototype.notify=function(){var e=this;r9(this),this.shouldNotify()&&this.listeners.forEach(function(t){return t(e)}),this.dirty=!1},e.prototype.shouldNotify=function(){if(!this.dirty||!this.listeners.size)return!1;if((0,nZ.O)(this.networkStatus)&&this.observableQuery){var e=this.observableQuery.options.fetchPolicy;if("cache-only"!==e&&"cache-and-network"!==e)return!1}return!0},e.prototype.stop=function(){if(!this.stopped){this.stopped=!0,this.reset(),this.cancel(),this.cancel=e.prototype.cancel,this.subscriptions.forEach(function(e){return e.unsubscribe()});var t=this.observableQuery;t&&t.stopPolling()}},e.prototype.cancel=function(){},e.prototype.updateWatch=function(e){var t=this;void 0===e&&(e=this.variables);var n=this.observableQuery;if(!n||"no-cache"!==n.options.fetchPolicy){var r=(0,en.pi)((0,en.pi)({},this.getDiffOptions(e)),{watcher:this,callback:function(e){return t.setDiff(e)}});this.lastWatch&&(0,nm.D)(r,this.lastWatch)||(this.cancel(),this.cancel=this.cache.watch(this.lastWatch=r))}},e.prototype.resetLastWrite=function(){this.lastWrite=void 0},e.prototype.shouldWrite=function(e,t){var n=this.lastWrite;return!(n&&n.dmCount===r5.get(this.cache)&&(0,nm.D)(t,n.variables)&&(0,nm.D)(e.data,n.result.data))},e.prototype.markResult=function(e,t,n,r){var i=this,a=new tB,o=(0,tP.O)(e.errors)?e.errors.slice(0):[];if(this.reset(),"incremental"in e&&(0,tP.O)(e.incremental)){var s=tG(this.getDiff().result,e);e.data=s}else if("hasNext"in e&&e.hasNext){var u=this.getDiff();e.data=a.merge(u.result,e.data)}this.graphQLErrors=o,"no-cache"===n.fetchPolicy?this.updateLastDiff({result:e.data,complete:!0},this.getDiffOptions(n.variables)):0!==r&&(r7(e,n.errorPolicy)?this.cache.performTransaction(function(a){if(i.shouldWrite(e,n.variables))a.writeQuery({query:t,data:e.data,variables:n.variables,overwrite:1===r}),i.lastWrite={result:e,variables:n.variables,dmCount:r5.get(i.cache)};else if(i.lastDiff&&i.lastDiff.diff.complete){e.data=i.lastDiff.diff.result;return}var o=i.getDiffOptions(n.variables),s=a.diff(o);i.stopped||i.updateWatch(n.variables),i.updateLastDiff(s,o),s.complete&&(e.data=s.result)}):this.lastWrite=void 0)},e.prototype.markReady=function(){return this.networkError=null,this.networkStatus=nZ.I.ready},e.prototype.markError=function(e){return this.networkStatus=nZ.I.error,this.lastWrite=void 0,this.reset(),e.graphQLErrors&&(this.graphQLErrors=e.graphQLErrors),e.networkError&&(this.networkError=e.networkError),e},e}();function r7(e,t){void 0===t&&(t="none");var n="ignore"===t||"all"===t,r=!nO(e);return!r&&n&&e.data&&(r=!0),r}var ie=Object.prototype.hasOwnProperty,it=function(){function e(e){var t=e.cache,n=e.link,r=e.defaultOptions,i=e.queryDeduplication,a=void 0!==i&&i,o=e.onBroadcast,s=e.ssrMode,u=void 0!==s&&s,c=e.clientAwareness,l=void 0===c?{}:c,f=e.localState,d=e.assumeImmutableResults;this.clientAwareness={},this.queries=new Map,this.fetchCancelFns=new Map,this.transformCache=new(t_.mr?WeakMap:Map),this.queryIdCounter=1,this.requestIdCounter=1,this.mutationIdCounter=1,this.inFlightLinkObservables=new Map,this.cache=t,this.link=n,this.defaultOptions=r||Object.create(null),this.queryDeduplication=a,this.clientAwareness=l,this.localState=f||new r4({cache:t}),this.ssrMode=u,this.assumeImmutableResults=!!d,(this.onBroadcast=o)&&(this.mutationStore=Object.create(null))}return e.prototype.stop=function(){var e=this;this.queries.forEach(function(t,n){e.stopQueryNoBroadcast(n)}),this.cancelPendingFetches(__DEV__?new Q.ej("QueryManager stopped while query was in flight"):new Q.ej(14))},e.prototype.cancelPendingFetches=function(e){this.fetchCancelFns.forEach(function(t){return t(e)}),this.fetchCancelFns.clear()},e.prototype.mutate=function(e){var t,n,r=e.mutation,i=e.variables,a=e.optimisticResponse,o=e.updateQueries,s=e.refetchQueries,u=void 0===s?[]:s,c=e.awaitRefetchQueries,l=void 0!==c&&c,f=e.update,d=e.onQueryUpdated,h=e.fetchPolicy,p=void 0===h?(null===(t=this.defaultOptions.mutate)||void 0===t?void 0:t.fetchPolicy)||"network-only":h,b=e.errorPolicy,m=void 0===b?(null===(n=this.defaultOptions.mutate)||void 0===n?void 0:n.errorPolicy)||"none":b,g=e.keepRootFields,v=e.context;return(0,en.mG)(this,void 0,void 0,function(){var e,t,n,s,c,h;return(0,en.Jh)(this,function(b){switch(b.label){case 0:if(__DEV__?(0,Q.kG)(r,"mutation option is required. You must specify your GraphQL document in the mutation option."):(0,Q.kG)(r,15),__DEV__?(0,Q.kG)("network-only"===p||"no-cache"===p,"Mutations support only 'network-only' or 'no-cache' fetchPolicy strings. The default `network-only` behavior automatically writes mutation results to the cache. Passing `no-cache` skips the cache write."):(0,Q.kG)("network-only"===p||"no-cache"===p,16),e=this.generateMutationId(),n=(t=this.transform(r)).document,s=t.hasClientExports,r=this.cache.transformForLink(n),i=this.getVariables(r,i),!s)return[3,2];return[4,this.localState.addExportedVariables(r,i,v)];case 1:i=b.sent(),b.label=2;case 2:return c=this.mutationStore&&(this.mutationStore[e]={mutation:r,variables:i,loading:!0,error:null}),a&&this.markMutationOptimistic(a,{mutationId:e,document:r,variables:i,fetchPolicy:p,errorPolicy:m,context:v,updateQueries:o,update:f,keepRootFields:g}),this.broadcastQueries(),h=this,[2,new Promise(function(t,n){return nM(h.getObservableFromLink(r,(0,en.pi)((0,en.pi)({},v),{optimisticResponse:a}),i,!1),function(t){if(nO(t)&&"none"===m)throw new tN.cA({graphQLErrors:nA(t)});c&&(c.loading=!1,c.error=null);var n=(0,en.pi)({},t);return"function"==typeof u&&(u=u(n)),"ignore"===m&&nO(n)&&delete n.errors,h.markMutationResult({mutationId:e,result:n,document:r,variables:i,fetchPolicy:p,errorPolicy:m,context:v,update:f,updateQueries:o,awaitRefetchQueries:l,refetchQueries:u,removeOptimistic:a?e:void 0,onQueryUpdated:d,keepRootFields:g})}).subscribe({next:function(e){h.broadcastQueries(),"hasNext"in e&&!1!==e.hasNext||t(e)},error:function(t){c&&(c.loading=!1,c.error=t),a&&h.cache.removeOptimistic(e),h.broadcastQueries(),n(t instanceof tN.cA?t:new tN.cA({networkError:t}))}})})]}})})},e.prototype.markMutationResult=function(e,t){var n=this;void 0===t&&(t=this.cache);var r=e.result,i=[],a="no-cache"===e.fetchPolicy;if(!a&&r7(r,e.errorPolicy)){if(tU(r)||i.push({result:r.data,dataId:"ROOT_MUTATION",query:e.document,variables:e.variables}),tU(r)&&(0,tP.O)(r.incremental)){var o=t.diff({id:"ROOT_MUTATION",query:this.transform(e.document).asQuery,variables:e.variables,optimistic:!1,returnPartialData:!0}),s=void 0;o.result&&(s=tG(o.result,r)),void 0!==s&&(r.data=s,i.push({result:s,dataId:"ROOT_MUTATION",query:e.document,variables:e.variables}))}var u=e.updateQueries;u&&this.queries.forEach(function(e,a){var o=e.observableQuery,s=o&&o.queryName;if(s&&ie.call(u,s)){var c,l=u[s],f=n.queries.get(a),d=f.document,h=f.variables,p=t.diff({query:d,variables:h,returnPartialData:!0,optimistic:!1}),b=p.result;if(p.complete&&b){var m=l(b,{mutationResult:r,queryName:d&&e3(d)||void 0,queryVariables:h});m&&i.push({result:m,dataId:"ROOT_QUERY",query:d,variables:h})}}})}if(i.length>0||e.refetchQueries||e.update||e.onQueryUpdated||e.removeOptimistic){var c=[];if(this.refetchQueries({updateCache:function(t){a||i.forEach(function(e){return t.write(e)});var o=e.update,s=!t$(r)||tU(r)&&!r.hasNext;if(o){if(!a){var u=t.diff({id:"ROOT_MUTATION",query:n.transform(e.document).asQuery,variables:e.variables,optimistic:!1,returnPartialData:!0});u.complete&&("incremental"in(r=(0,en.pi)((0,en.pi)({},r),{data:u.result}))&&delete r.incremental,"hasNext"in r&&delete r.hasNext)}s&&o(t,r,{context:e.context,variables:e.variables})}a||e.keepRootFields||!s||t.modify({id:"ROOT_MUTATION",fields:function(e,t){var n=t.fieldName,r=t.DELETE;return"__typename"===n?e:r}})},include:e.refetchQueries,optimistic:!1,removeOptimistic:e.removeOptimistic,onQueryUpdated:e.onQueryUpdated||null}).forEach(function(e){return c.push(e)}),e.awaitRefetchQueries||e.onQueryUpdated)return Promise.all(c).then(function(){return r})}return Promise.resolve(r)},e.prototype.markMutationOptimistic=function(e,t){var n=this,r="function"==typeof e?e(t.variables):e;return this.cache.recordOptimisticTransaction(function(e){try{n.markMutationResult((0,en.pi)((0,en.pi)({},t),{result:{data:r}}),e)}catch(i){__DEV__&&Q.kG.error(i)}},t.mutationId)},e.prototype.fetchQuery=function(e,t,n){return this.fetchQueryObservable(e,t,n).promise},e.prototype.getQueryStore=function(){var e=Object.create(null);return this.queries.forEach(function(t,n){e[n]={variables:t.variables,networkStatus:t.networkStatus,networkError:t.networkError,graphQLErrors:t.graphQLErrors}}),e},e.prototype.resetErrors=function(e){var t=this.queries.get(e);t&&(t.networkError=void 0,t.graphQLErrors=[])},e.prototype.transform=function(e){var t=this.transformCache;if(!t.has(e)){var n=this.cache.transformDocument(e),r=nY(n),i=this.localState.clientQuery(n),a=r&&this.localState.serverQuery(r),o={document:n,hasClientExports:tm(n),hasForcedResolvers:this.localState.shouldForceResolvers(n),clientQuery:i,serverQuery:a,defaultVars:e8(e2(n)),asQuery:(0,en.pi)((0,en.pi)({},n),{definitions:n.definitions.map(function(e){return"OperationDefinition"===e.kind&&"query"!==e.operation?(0,en.pi)((0,en.pi)({},e),{operation:"query"}):e})})},s=function(e){e&&!t.has(e)&&t.set(e,o)};s(e),s(n),s(i),s(a)}return t.get(e)},e.prototype.getVariables=function(e,t){return(0,en.pi)((0,en.pi)({},this.transform(e).defaultVars),t)},e.prototype.watchQuery=function(e){void 0===(e=(0,en.pi)((0,en.pi)({},e),{variables:this.getVariables(e.query,e.variables)})).notifyOnNetworkStatusChange&&(e.notifyOnNetworkStatusChange=!1);var t=new r8(this),n=new n3({queryManager:this,queryInfo:t,options:e});return this.queries.set(n.queryId,t),t.init({document:n.query,observableQuery:n,variables:n.variables}),n},e.prototype.query=function(e,t){var n=this;return void 0===t&&(t=this.generateQueryId()),__DEV__?(0,Q.kG)(e.query,"query option is required. You must specify your GraphQL document in the query option."):(0,Q.kG)(e.query,17),__DEV__?(0,Q.kG)("Document"===e.query.kind,'You must wrap the query string in a "gql" tag.'):(0,Q.kG)("Document"===e.query.kind,18),__DEV__?(0,Q.kG)(!e.returnPartialData,"returnPartialData option only supported on watchQuery."):(0,Q.kG)(!e.returnPartialData,19),__DEV__?(0,Q.kG)(!e.pollInterval,"pollInterval option only supported on watchQuery."):(0,Q.kG)(!e.pollInterval,20),this.fetchQuery(t,e).finally(function(){return n.stopQuery(t)})},e.prototype.generateQueryId=function(){return String(this.queryIdCounter++)},e.prototype.generateRequestId=function(){return this.requestIdCounter++},e.prototype.generateMutationId=function(){return String(this.mutationIdCounter++)},e.prototype.stopQueryInStore=function(e){this.stopQueryInStoreNoBroadcast(e),this.broadcastQueries()},e.prototype.stopQueryInStoreNoBroadcast=function(e){var t=this.queries.get(e);t&&t.stop()},e.prototype.clearStore=function(e){return void 0===e&&(e={discardWatches:!0}),this.cancelPendingFetches(__DEV__?new Q.ej("Store reset while query was in flight (not completed in link chain)"):new Q.ej(21)),this.queries.forEach(function(e){e.observableQuery?e.networkStatus=nZ.I.loading:e.stop()}),this.mutationStore&&(this.mutationStore=Object.create(null)),this.cache.reset(e)},e.prototype.getObservableQueries=function(e){var t=this;void 0===e&&(e="active");var n=new Map,r=new Map,i=new Set;return Array.isArray(e)&&e.forEach(function(e){"string"==typeof e?r.set(e,!1):eN(e)?r.set(t.transform(e).document,!1):(0,eO.s)(e)&&e.query&&i.add(e)}),this.queries.forEach(function(t,i){var a=t.observableQuery,o=t.document;if(a){if("all"===e){n.set(i,a);return}var s=a.queryName;if("standby"===a.options.fetchPolicy||"active"===e&&!a.hasObservers())return;("active"===e||s&&r.has(s)||o&&r.has(o))&&(n.set(i,a),s&&r.set(s,!0),o&&r.set(o,!0))}}),i.size&&i.forEach(function(e){var r=nG("legacyOneTimeQuery"),i=t.getQuery(r).init({document:e.query,variables:e.variables}),a=new n3({queryManager:t,queryInfo:i,options:(0,en.pi)((0,en.pi)({},e),{fetchPolicy:"network-only"})});(0,Q.kG)(a.queryId===r),i.setObservableQuery(a),n.set(r,a)}),__DEV__&&r.size&&r.forEach(function(e,t){!e&&__DEV__&&Q.kG.warn("Unknown query ".concat("string"==typeof t?"named ":"").concat(JSON.stringify(t,null,2)," requested in refetchQueries options.include array"))}),n},e.prototype.reFetchObservableQueries=function(e){var t=this;void 0===e&&(e=!1);var n=[];return this.getObservableQueries(e?"all":"active").forEach(function(r,i){var a=r.options.fetchPolicy;r.resetLastResults(),(e||"standby"!==a&&"cache-only"!==a)&&n.push(r.refetch()),t.getQuery(i).setDiff(null)}),this.broadcastQueries(),Promise.all(n)},e.prototype.setObservableQuery=function(e){this.getQuery(e.queryId).setObservableQuery(e)},e.prototype.startGraphQLSubscription=function(e){var t=this,n=e.query,r=e.fetchPolicy,i=e.errorPolicy,a=e.variables,o=e.context,s=void 0===o?{}:o;n=this.transform(n).document,a=this.getVariables(n,a);var u=function(e){return t.getObservableFromLink(n,s,e).map(function(a){"no-cache"!==r&&(r7(a,i)&&t.cache.write({query:n,result:a.data,dataId:"ROOT_SUBSCRIPTION",variables:e}),t.broadcastQueries());var o=nO(a),s=(0,tN.ls)(a);if(o||s){var u={};throw o&&(u.graphQLErrors=a.errors),s&&(u.protocolErrors=a.extensions[tN.YG]),new tN.cA(u)}return a})};if(this.transform(n).hasClientExports){var c=this.localState.addExportedVariables(n,a,s).then(u);return new eT(function(e){var t=null;return c.then(function(n){return t=n.subscribe(e)},e.error),function(){return t&&t.unsubscribe()}})}return u(a)},e.prototype.stopQuery=function(e){this.stopQueryNoBroadcast(e),this.broadcastQueries()},e.prototype.stopQueryNoBroadcast=function(e){this.stopQueryInStoreNoBroadcast(e),this.removeQuery(e)},e.prototype.removeQuery=function(e){this.fetchCancelFns.delete(e),this.queries.has(e)&&(this.getQuery(e).stop(),this.queries.delete(e))},e.prototype.broadcastQueries=function(){this.onBroadcast&&this.onBroadcast(),this.queries.forEach(function(e){return e.notify()})},e.prototype.getLocalState=function(){return this.localState},e.prototype.getObservableFromLink=function(e,t,n,r){var i,a,o=this;void 0===r&&(r=null!==(i=null==t?void 0:t.queryDeduplication)&&void 0!==i?i:this.queryDeduplication);var s=this.transform(e).serverQuery;if(s){var u=this,c=u.inFlightLinkObservables,l=u.link,f={query:s,variables:n,operationName:e3(s)||void 0,context:this.prepareContext((0,en.pi)((0,en.pi)({},t),{forceFetch:!r}))};if(t=f.context,r){var d=c.get(s)||new Map;c.set(s,d);var h=nx(n);if(!(a=d.get(h))){var p=new nq([np(l,f)]);d.set(h,a=p),p.beforeNext(function(){d.delete(h)&&d.size<1&&c.delete(s)})}}else a=new nq([np(l,f)])}else a=new nq([eT.of({data:{}})]),t=this.prepareContext(t);var b=this.transform(e).clientQuery;return b&&(a=nM(a,function(e){return o.localState.runResolvers({document:b,remoteResult:e,context:t,variables:n})})),a},e.prototype.getResultsFromLink=function(e,t,n){var r=e.lastRequestId=this.generateRequestId(),i=this.cache.transformForLink(this.transform(e.document).document);return nM(this.getObservableFromLink(i,n.context,n.variables),function(a){var o=nA(a),s=o.length>0;if(r>=e.lastRequestId){if(s&&"none"===n.errorPolicy)throw e.markError(new tN.cA({graphQLErrors:o}));e.markResult(a,i,n,t),e.markReady()}var u={data:a.data,loading:!1,networkStatus:nZ.I.ready};return s&&"ignore"!==n.errorPolicy&&(u.errors=o,u.networkStatus=nZ.I.error),u},function(t){var n=(0,tN.MS)(t)?t:new tN.cA({networkError:t});throw r>=e.lastRequestId&&e.markError(n),n})},e.prototype.fetchQueryObservable=function(e,t,n){return this.fetchConcastWithInfo(e,t,n).concast},e.prototype.fetchConcastWithInfo=function(e,t,n){var r,i,a=this;void 0===n&&(n=nZ.I.loading);var o=this.transform(t.query).document,s=this.getVariables(o,t.variables),u=this.getQuery(e),c=this.defaultOptions.watchQuery,l=t.fetchPolicy,f=void 0===l?c&&c.fetchPolicy||"cache-first":l,d=t.errorPolicy,h=void 0===d?c&&c.errorPolicy||"none":d,p=t.returnPartialData,b=void 0!==p&&p,m=t.notifyOnNetworkStatusChange,g=void 0!==m&&m,v=t.context,y=void 0===v?{}:v,w=Object.assign({},t,{query:o,variables:s,fetchPolicy:f,errorPolicy:h,returnPartialData:b,notifyOnNetworkStatusChange:g,context:y}),_=function(e){w.variables=e;var r=a.fetchQueryByPolicy(u,w,n);return"standby"!==w.fetchPolicy&&r.sources.length>0&&u.observableQuery&&u.observableQuery.applyNextFetchPolicy("after-fetch",t),r},E=function(){return a.fetchCancelFns.delete(e)};if(this.fetchCancelFns.set(e,function(e){E(),setTimeout(function(){return r.cancel(e)})}),this.transform(w.query).hasClientExports)r=new nq(this.localState.addExportedVariables(w.query,w.variables,w.context).then(_).then(function(e){return e.sources})),i=!0;else{var S=_(w.variables);i=S.fromLink,r=new nq(S.sources)}return r.promise.then(E,E),{concast:r,fromLink:i}},e.prototype.refetchQueries=function(e){var t=this,n=e.updateCache,r=e.include,i=e.optimistic,a=void 0!==i&&i,o=e.removeOptimistic,s=void 0===o?a?nG("refetchQueries"):void 0:o,u=e.onQueryUpdated,c=new Map;r&&this.getObservableQueries(r).forEach(function(e,n){c.set(n,{oq:e,lastDiff:t.getQuery(n).getDiff()})});var l=new Map;return n&&this.cache.batch({update:n,optimistic:a&&s||!1,removeOptimistic:s,onWatchUpdated:function(e,t,n){var r=e.watcher instanceof r8&&e.watcher.observableQuery;if(r){if(u){c.delete(r.queryId);var i=u(r,t,n);return!0===i&&(i=r.refetch()),!1!==i&&l.set(r,i),i}null!==u&&c.set(r.queryId,{oq:r,lastDiff:n,diff:t})}}}),c.size&&c.forEach(function(e,n){var r,i=e.oq,a=e.lastDiff,o=e.diff;if(u){if(!o){var s=i.queryInfo;s.reset(),o=s.getDiff()}r=u(i,o,a)}u&&!0!==r||(r=i.refetch()),!1!==r&&l.set(i,r),n.indexOf("legacyOneTimeQuery")>=0&&t.stopQueryNoBroadcast(n)}),s&&this.cache.removeOptimistic(s),l},e.prototype.fetchQueryByPolicy=function(e,t,n){var r=this,i=t.query,a=t.variables,o=t.fetchPolicy,s=t.refetchWritePolicy,u=t.errorPolicy,c=t.returnPartialData,l=t.context,f=t.notifyOnNetworkStatusChange,d=e.networkStatus;e.init({document:this.transform(i).document,variables:a,networkStatus:n});var h=function(){return e.getDiff(a)},p=function(t,n){void 0===n&&(n=e.networkStatus||nZ.I.loading);var o=t.result;!__DEV__||c||(0,nm.D)(o,{})||n6(t.missing);var s=function(e){return eT.of((0,en.pi)({data:e,loading:(0,nZ.O)(n),networkStatus:n},t.complete?null:{partial:!0}))};return o&&r.transform(i).hasForcedResolvers?r.localState.runResolvers({document:i,remoteResult:{data:o},context:l,variables:a,onlyRunForcedResolvers:!0}).then(function(e){return s(e.data||void 0)}):"none"===u&&n===nZ.I.refetch&&Array.isArray(t.missing)?s(void 0):s(o)},b="no-cache"===o?0:n===nZ.I.refetch&&"merge"!==s?1:2,m=function(){return r.getResultsFromLink(e,b,{variables:a,context:l,fetchPolicy:o,errorPolicy:u})},g=f&&"number"==typeof d&&d!==n&&(0,nZ.O)(n);switch(o){default:case"cache-first":var v=h();if(v.complete)return{fromLink:!1,sources:[p(v,e.markReady())]};if(c||g)return{fromLink:!0,sources:[p(v),m()]};return{fromLink:!0,sources:[m()]};case"cache-and-network":var v=h();if(v.complete||c||g)return{fromLink:!0,sources:[p(v),m()]};return{fromLink:!0,sources:[m()]};case"cache-only":return{fromLink:!1,sources:[p(h(),e.markReady())]};case"network-only":if(g)return{fromLink:!0,sources:[p(h()),m()]};return{fromLink:!0,sources:[m()]};case"no-cache":if(g)return{fromLink:!0,sources:[p(e.getDiff()),m(),]};return{fromLink:!0,sources:[m()]};case"standby":return{fromLink:!1,sources:[]}}},e.prototype.getQuery=function(e){return e&&!this.queries.has(e)&&this.queries.set(e,new r8(this,e)),this.queries.get(e)},e.prototype.prepareContext=function(e){void 0===e&&(e={});var t=this.localState.prepareContext(e);return(0,en.pi)((0,en.pi)({},t),{clientAwareness:this.clientAwareness})},e}(),ir=__webpack_require__(14012),ii=!1,ia=function(){function e(e){var t=this;this.resetStoreCallbacks=[],this.clearStoreCallbacks=[];var n=e.uri,r=e.credentials,i=e.headers,a=e.cache,o=e.ssrMode,s=void 0!==o&&o,u=e.ssrForceFetchDelay,c=void 0===u?0:u,l=e.connectToDevTools,f=void 0===l?"object"==typeof window&&!window.__APOLLO_CLIENT__&&__DEV__:l,d=e.queryDeduplication,h=void 0===d||d,p=e.defaultOptions,b=e.assumeImmutableResults,m=void 0!==b&&b,g=e.resolvers,v=e.typeDefs,y=e.fragmentMatcher,w=e.name,_=e.version,E=e.link;if(E||(E=n?new nh({uri:n,credentials:r,headers:i}):ta.empty()),!a)throw __DEV__?new Q.ej("To initialize Apollo Client, you must specify a 'cache' property in the options object. \nFor more information, please visit: https://go.apollo.dev/c/docs"):new Q.ej(9);if(this.link=E,this.cache=a,this.disableNetworkFetches=s||c>0,this.queryDeduplication=h,this.defaultOptions=p||Object.create(null),this.typeDefs=v,c&&setTimeout(function(){return t.disableNetworkFetches=!1},c),this.watchQuery=this.watchQuery.bind(this),this.query=this.query.bind(this),this.mutate=this.mutate.bind(this),this.resetStore=this.resetStore.bind(this),this.reFetchObservableQueries=this.reFetchObservableQueries.bind(this),f&&"object"==typeof window&&(window.__APOLLO_CLIENT__=this),!ii&&f&&__DEV__&&(ii=!0,"undefined"!=typeof window&&window.document&&window.top===window.self&&!window.__APOLLO_DEVTOOLS_GLOBAL_HOOK__)){var S=window.navigator,k=S&&S.userAgent,x=void 0;"string"==typeof k&&(k.indexOf("Chrome/")>-1?x="https://chrome.google.com/webstore/detail/apollo-client-developer-t/jdkknkkbebbapilgoeccciglkfbmbnfm":k.indexOf("Firefox/")>-1&&(x="https://addons.mozilla.org/en-US/firefox/addon/apollo-developer-tools/")),x&&__DEV__&&Q.kG.log("Download the Apollo DevTools for a better development experience: "+x)}this.version=nb,this.localState=new r4({cache:a,client:this,resolvers:g,fragmentMatcher:y}),this.queryManager=new it({cache:this.cache,link:this.link,defaultOptions:this.defaultOptions,queryDeduplication:h,ssrMode:s,clientAwareness:{name:w,version:_},localState:this.localState,assumeImmutableResults:m,onBroadcast:f?function(){t.devToolsHookCb&&t.devToolsHookCb({action:{},state:{queries:t.queryManager.getQueryStore(),mutations:t.queryManager.mutationStore||{}},dataWithOptimisticResults:t.cache.extract(!0)})}:void 0})}return e.prototype.stop=function(){this.queryManager.stop()},e.prototype.watchQuery=function(e){return this.defaultOptions.watchQuery&&(e=(0,ir.J)(this.defaultOptions.watchQuery,e)),this.disableNetworkFetches&&("network-only"===e.fetchPolicy||"cache-and-network"===e.fetchPolicy)&&(e=(0,en.pi)((0,en.pi)({},e),{fetchPolicy:"cache-first"})),this.queryManager.watchQuery(e)},e.prototype.query=function(e){return this.defaultOptions.query&&(e=(0,ir.J)(this.defaultOptions.query,e)),__DEV__?(0,Q.kG)("cache-and-network"!==e.fetchPolicy,"The cache-and-network fetchPolicy does not work with client.query, because client.query can only return a single result. Please use client.watchQuery to receive multiple results from the cache and the network, or consider using a different fetchPolicy, such as cache-first or network-only."):(0,Q.kG)("cache-and-network"!==e.fetchPolicy,10),this.disableNetworkFetches&&"network-only"===e.fetchPolicy&&(e=(0,en.pi)((0,en.pi)({},e),{fetchPolicy:"cache-first"})),this.queryManager.query(e)},e.prototype.mutate=function(e){return this.defaultOptions.mutate&&(e=(0,ir.J)(this.defaultOptions.mutate,e)),this.queryManager.mutate(e)},e.prototype.subscribe=function(e){return this.queryManager.startGraphQLSubscription(e)},e.prototype.readQuery=function(e,t){return void 0===t&&(t=!1),this.cache.readQuery(e,t)},e.prototype.readFragment=function(e,t){return void 0===t&&(t=!1),this.cache.readFragment(e,t)},e.prototype.writeQuery=function(e){var t=this.cache.writeQuery(e);return!1!==e.broadcast&&this.queryManager.broadcastQueries(),t},e.prototype.writeFragment=function(e){var t=this.cache.writeFragment(e);return!1!==e.broadcast&&this.queryManager.broadcastQueries(),t},e.prototype.__actionHookForDevTools=function(e){this.devToolsHookCb=e},e.prototype.__requestRaw=function(e){return np(this.link,e)},e.prototype.resetStore=function(){var e=this;return Promise.resolve().then(function(){return e.queryManager.clearStore({discardWatches:!1})}).then(function(){return Promise.all(e.resetStoreCallbacks.map(function(e){return e()}))}).then(function(){return e.reFetchObservableQueries()})},e.prototype.clearStore=function(){var e=this;return Promise.resolve().then(function(){return e.queryManager.clearStore({discardWatches:!0})}).then(function(){return Promise.all(e.clearStoreCallbacks.map(function(e){return e()}))})},e.prototype.onResetStore=function(e){var t=this;return this.resetStoreCallbacks.push(e),function(){t.resetStoreCallbacks=t.resetStoreCallbacks.filter(function(t){return t!==e})}},e.prototype.onClearStore=function(e){var t=this;return this.clearStoreCallbacks.push(e),function(){t.clearStoreCallbacks=t.clearStoreCallbacks.filter(function(t){return t!==e})}},e.prototype.reFetchObservableQueries=function(e){return this.queryManager.reFetchObservableQueries(e)},e.prototype.refetchQueries=function(e){var t=this.queryManager.refetchQueries(e),n=[],r=[];t.forEach(function(e,t){n.push(t),r.push(e)});var i=Promise.all(r);return i.queries=n,i.results=r,i.catch(function(e){__DEV__&&Q.kG.debug("In client.refetchQueries, Promise.all promise rejected with error ".concat(e))}),i},e.prototype.getObservableQueries=function(e){return void 0===e&&(e="active"),this.queryManager.getObservableQueries(e)},e.prototype.extract=function(e){return this.cache.extract(e)},e.prototype.restore=function(e){return this.cache.restore(e)},e.prototype.addResolvers=function(e){this.localState.addResolvers(e)},e.prototype.setResolvers=function(e){this.localState.setResolvers(e)},e.prototype.getResolvers=function(){return this.localState.getResolvers()},e.prototype.setLocalStateFragmentMatcher=function(e){this.localState.setFragmentMatcher(e)},e.prototype.setLink=function(e){this.link=this.queryManager.link=e},e}(),io=function(){function e(){this.getFragmentDoc=rZ(eA)}return e.prototype.batch=function(e){var t,n=this,r="string"==typeof e.optimistic?e.optimistic:!1===e.optimistic?null:void 0;return this.performTransaction(function(){return t=e.update(n)},r),t},e.prototype.recordOptimisticTransaction=function(e,t){this.performTransaction(e,t)},e.prototype.transformDocument=function(e){return e},e.prototype.transformForLink=function(e){return e},e.prototype.identify=function(e){},e.prototype.gc=function(){return[]},e.prototype.modify=function(e){return!1},e.prototype.readQuery=function(e,t){return void 0===t&&(t=!!e.optimistic),this.read((0,en.pi)((0,en.pi)({},e),{rootId:e.id||"ROOT_QUERY",optimistic:t}))},e.prototype.readFragment=function(e,t){return void 0===t&&(t=!!e.optimistic),this.read((0,en.pi)((0,en.pi)({},e),{query:this.getFragmentDoc(e.fragment,e.fragmentName),rootId:e.id,optimistic:t}))},e.prototype.writeQuery=function(e){var t=e.id,n=e.data,r=(0,en._T)(e,["id","data"]);return this.write(Object.assign(r,{dataId:t||"ROOT_QUERY",result:n}))},e.prototype.writeFragment=function(e){var t=e.id,n=e.data,r=e.fragment,i=e.fragmentName,a=(0,en._T)(e,["id","data","fragment","fragmentName"]);return this.write(Object.assign(a,{query:this.getFragmentDoc(r,i),dataId:t,result:n}))},e.prototype.updateQuery=function(e,t){return this.batch({update:function(n){var r=n.readQuery(e),i=t(r);return null==i?r:(n.writeQuery((0,en.pi)((0,en.pi)({},e),{data:i})),i)}})},e.prototype.updateFragment=function(e,t){return this.batch({update:function(n){var r=n.readFragment(e),i=t(r);return null==i?r:(n.writeFragment((0,en.pi)((0,en.pi)({},e),{data:i})),i)}})},e}(),is=function(e){function t(n,r,i,a){var o,s=e.call(this,n)||this;if(s.message=n,s.path=r,s.query=i,s.variables=a,Array.isArray(s.path)){s.missing=s.message;for(var u=s.path.length-1;u>=0;--u)s.missing=((o={})[s.path[u]]=s.missing,o)}else s.missing=s.path;return s.__proto__=t.prototype,s}return(0,en.ZT)(t,e),t}(Error),iu=__webpack_require__(10542),ic=Object.prototype.hasOwnProperty;function il(e){return null==e}function id(e,t){var n=e.__typename,r=e.id,i=e._id;if("string"==typeof n&&(t&&(t.keyObject=il(r)?il(i)?void 0:{_id:i}:{id:r}),il(r)&&!il(i)&&(r=i),!il(r)))return"".concat(n,":").concat("number"==typeof r||"string"==typeof r?r:JSON.stringify(r))}var ih={dataIdFromObject:id,addTypename:!0,resultCaching:!0,canonizeResults:!1};function ip(e){return(0,n1.o)(ih,e)}function ib(e){var t=e.canonizeResults;return void 0===t?ih.canonizeResults:t}function im(e,t){return eD(t)?e.get(t.__ref,"__typename"):t&&t.__typename}var ig=/^[_a-z][_0-9a-z]*/i;function iv(e){var t=e.match(ig);return t?t[0]:e}function iy(e,t,n){return!!(0,eO.s)(t)&&((0,tP.k)(t)?t.every(function(t){return iy(e,t,n)}):e.selections.every(function(e){if(eQ(e)&&td(e,n)){var r=eX(e);return ic.call(t,r)&&(!e.selectionSet||iy(e.selectionSet,t[r],n))}return!0}))}function iw(e){return(0,eO.s)(e)&&!eD(e)&&!(0,tP.k)(e)}function i_(){return new tB}function iE(e,t){var n=eL(e4(e));return{fragmentMap:n,lookupFragment:function(e){var r=n[e];return!r&&t&&(r=t.lookup(e)),r||null}}}var iS=Object.create(null),ik=function(){return iS},ix=Object.create(null),iT=function(){function e(e,t){var n=this;this.policies=e,this.group=t,this.data=Object.create(null),this.rootIds=Object.create(null),this.refs=Object.create(null),this.getFieldValue=function(e,t){return(0,iu.J)(eD(e)?n.get(e.__ref,t):e&&e[t])},this.canRead=function(e){return eD(e)?n.has(e.__ref):"object"==typeof e},this.toReference=function(e,t){if("string"==typeof e)return eI(e);if(eD(e))return e;var r=n.policies.identify(e)[0];if(r){var i=eI(r);return t&&n.merge(r,e),i}}}return e.prototype.toObject=function(){return(0,en.pi)({},this.data)},e.prototype.has=function(e){return void 0!==this.lookup(e,!0)},e.prototype.get=function(e,t){if(this.group.depend(e,t),ic.call(this.data,e)){var n=this.data[e];if(n&&ic.call(n,t))return n[t]}return"__typename"===t&&ic.call(this.policies.rootTypenamesById,e)?this.policies.rootTypenamesById[e]:this instanceof iL?this.parent.get(e,t):void 0},e.prototype.lookup=function(e,t){return(t&&this.group.depend(e,"__exists"),ic.call(this.data,e))?this.data[e]:this instanceof iL?this.parent.lookup(e,t):this.policies.rootTypenamesById[e]?Object.create(null):void 0},e.prototype.merge=function(e,t){var n,r=this;eD(e)&&(e=e.__ref),eD(t)&&(t=t.__ref);var i="string"==typeof e?this.lookup(n=e):e,a="string"==typeof t?this.lookup(n=t):t;if(a){__DEV__?(0,Q.kG)("string"==typeof n,"store.merge expects a string ID"):(0,Q.kG)("string"==typeof n,1);var o=new tB(iI).merge(i,a);if(this.data[n]=o,o!==i&&(delete this.refs[n],this.group.caching)){var s=Object.create(null);i||(s.__exists=1),Object.keys(a).forEach(function(e){if(!i||i[e]!==o[e]){s[e]=1;var t=iv(e);t===e||r.policies.hasKeyArgs(o.__typename,t)||(s[t]=1),void 0!==o[e]||r instanceof iL||delete o[e]}}),s.__typename&&!(i&&i.__typename)&&this.policies.rootTypenamesById[n]===o.__typename&&delete s.__typename,Object.keys(s).forEach(function(e){return r.group.dirty(n,e)})}}},e.prototype.modify=function(e,t){var n=this,r=this.lookup(e);if(r){var i=Object.create(null),a=!1,o=!0,s={DELETE:iS,INVALIDATE:ix,isReference:eD,toReference:this.toReference,canRead:this.canRead,readField:function(t,r){return n.policies.readField("string"==typeof t?{fieldName:t,from:r||eI(e)}:t,{store:n})}};if(Object.keys(r).forEach(function(u){var c=iv(u),l=r[u];if(void 0!==l){var f="function"==typeof t?t:t[u]||t[c];if(f){var d=f===ik?iS:f((0,iu.J)(l),(0,en.pi)((0,en.pi)({},s),{fieldName:c,storeFieldName:u,storage:n.getStorage(e,u)}));d===ix?n.group.dirty(e,u):(d===iS&&(d=void 0),d!==l&&(i[u]=d,a=!0,l=d))}void 0!==l&&(o=!1)}}),a)return this.merge(e,i),o&&(this instanceof iL?this.data[e]=void 0:delete this.data[e],this.group.dirty(e,"__exists")),!0}return!1},e.prototype.delete=function(e,t,n){var r,i=this.lookup(e);if(i){var a=this.getFieldValue(i,"__typename"),o=t&&n?this.policies.getStoreFieldName({typename:a,fieldName:t,args:n}):t;return this.modify(e,o?((r={})[o]=ik,r):ik)}return!1},e.prototype.evict=function(e,t){var n=!1;return e.id&&(ic.call(this.data,e.id)&&(n=this.delete(e.id,e.fieldName,e.args)),this instanceof iL&&this!==t&&(n=this.parent.evict(e,t)||n),(e.fieldName||n)&&this.group.dirty(e.id,e.fieldName||"__exists")),n},e.prototype.clear=function(){this.replace(null)},e.prototype.extract=function(){var e=this,t=this.toObject(),n=[];return this.getRootIdSet().forEach(function(t){ic.call(e.policies.rootTypenamesById,t)||n.push(t)}),n.length&&(t.__META={extraRootIds:n.sort()}),t},e.prototype.replace=function(e){var t=this;if(Object.keys(this.data).forEach(function(n){e&&ic.call(e,n)||t.delete(n)}),e){var n=e.__META,r=(0,en._T)(e,["__META"]);Object.keys(r).forEach(function(e){t.merge(e,r[e])}),n&&n.extraRootIds.forEach(this.retain,this)}},e.prototype.retain=function(e){return this.rootIds[e]=(this.rootIds[e]||0)+1},e.prototype.release=function(e){if(this.rootIds[e]>0){var t=--this.rootIds[e];return t||delete this.rootIds[e],t}return 0},e.prototype.getRootIdSet=function(e){return void 0===e&&(e=new Set),Object.keys(this.rootIds).forEach(e.add,e),this instanceof iL?this.parent.getRootIdSet(e):Object.keys(this.policies.rootTypenamesById).forEach(e.add,e),e},e.prototype.gc=function(){var e=this,t=this.getRootIdSet(),n=this.toObject();t.forEach(function(r){ic.call(n,r)&&(Object.keys(e.findChildRefIds(r)).forEach(t.add,t),delete n[r])});var r=Object.keys(n);if(r.length){for(var i=this;i instanceof iL;)i=i.parent;r.forEach(function(e){return i.delete(e)})}return r},e.prototype.findChildRefIds=function(e){if(!ic.call(this.refs,e)){var t=this.refs[e]=Object.create(null),n=this.data[e];if(!n)return t;var r=new Set([n]);r.forEach(function(e){eD(e)&&(t[e.__ref]=!0),(0,eO.s)(e)&&Object.keys(e).forEach(function(t){var n=e[t];(0,eO.s)(n)&&r.add(n)})})}return this.refs[e]},e.prototype.makeCacheKey=function(){return this.group.keyMaker.lookupArray(arguments)},e}(),iM=function(){function e(e,t){void 0===t&&(t=null),this.caching=e,this.parent=t,this.d=null,this.resetCaching()}return e.prototype.resetCaching=function(){this.d=this.caching?rW():null,this.keyMaker=new n_(t_.mr)},e.prototype.depend=function(e,t){if(this.d){this.d(iO(e,t));var n=iv(t);n!==t&&this.d(iO(e,n)),this.parent&&this.parent.depend(e,t)}},e.prototype.dirty=function(e,t){this.d&&this.d.dirty(iO(e,t),"__exists"===t?"forget":"setDirty")},e}();function iO(e,t){return t+"#"+e}function iA(e,t){iD(e)&&e.group.depend(t,"__exists")}!function(e){var t=function(e){function t(t){var n=t.policies,r=t.resultCaching,i=void 0===r||r,a=t.seed,o=e.call(this,n,new iM(i))||this;return o.stump=new iC(o),o.storageTrie=new n_(t_.mr),a&&o.replace(a),o}return(0,en.ZT)(t,e),t.prototype.addLayer=function(e,t){return this.stump.addLayer(e,t)},t.prototype.removeLayer=function(){return this},t.prototype.getStorage=function(){return this.storageTrie.lookupArray(arguments)},t}(e);e.Root=t}(iT||(iT={}));var iL=function(e){function t(t,n,r,i){var a=e.call(this,n.policies,i)||this;return a.id=t,a.parent=n,a.replay=r,a.group=i,r(a),a}return(0,en.ZT)(t,e),t.prototype.addLayer=function(e,n){return new t(e,this,n,this.group)},t.prototype.removeLayer=function(e){var t=this,n=this.parent.removeLayer(e);return e===this.id?(this.group.caching&&Object.keys(this.data).forEach(function(e){var r=t.data[e],i=n.lookup(e);i?r?r!==i&&Object.keys(r).forEach(function(n){(0,nm.D)(r[n],i[n])||t.group.dirty(e,n)}):(t.group.dirty(e,"__exists"),Object.keys(i).forEach(function(n){t.group.dirty(e,n)})):t.delete(e)}),n):n===this.parent?this:n.addLayer(this.id,this.replay)},t.prototype.toObject=function(){return(0,en.pi)((0,en.pi)({},this.parent.toObject()),this.data)},t.prototype.findChildRefIds=function(t){var n=this.parent.findChildRefIds(t);return ic.call(this.data,t)?(0,en.pi)((0,en.pi)({},n),e.prototype.findChildRefIds.call(this,t)):n},t.prototype.getStorage=function(){for(var e=this.parent;e.parent;)e=e.parent;return e.getStorage.apply(e,arguments)},t}(iT),iC=function(e){function t(t){return e.call(this,"EntityStore.Stump",t,function(){},new iM(t.group.caching,t.group))||this}return(0,en.ZT)(t,e),t.prototype.removeLayer=function(){return this},t.prototype.merge=function(){return this.parent.merge.apply(this.parent,arguments)},t}(iL);function iI(e,t,n){var r=e[n],i=t[n];return(0,nm.D)(r,i)?r:i}function iD(e){return!!(e instanceof iT&&e.group.caching)}function iN(e){return[e.selectionSet,e.objectOrReference,e.context,e.context.canonizeResults,]}var iP=function(){function e(e){var t=this;this.knownResults=new(t_.mr?WeakMap:Map),this.config=(0,n1.o)(e,{addTypename:!1!==e.addTypename,canonizeResults:ib(e)}),this.canon=e.canon||new nk,this.executeSelectionSet=rZ(function(e){var n,r=e.context.canonizeResults,i=iN(e);i[3]=!r;var a=(n=t.executeSelectionSet).peek.apply(n,i);return a?r?(0,en.pi)((0,en.pi)({},a),{result:t.canon.admit(a.result)}):a:(iA(e.context.store,e.enclosingRef.__ref),t.execSelectionSetImpl(e))},{max:this.config.resultCacheMaxSize,keyArgs:iN,makeCacheKey:function(e,t,n,r){if(iD(n.store))return n.store.makeCacheKey(e,eD(t)?t.__ref:t,n.varString,r)}}),this.executeSubSelectedArray=rZ(function(e){return iA(e.context.store,e.enclosingRef.__ref),t.execSubSelectedArrayImpl(e)},{max:this.config.resultCacheMaxSize,makeCacheKey:function(e){var t=e.field,n=e.array,r=e.context;if(iD(r.store))return r.store.makeCacheKey(t,n,r.varString)}})}return e.prototype.resetCanon=function(){this.canon=new nk},e.prototype.diffQueryAgainstStore=function(e){var t,n=e.store,r=e.query,i=e.rootId,a=void 0===i?"ROOT_QUERY":i,o=e.variables,s=e.returnPartialData,u=void 0===s||s,c=e.canonizeResults,l=void 0===c?this.config.canonizeResults:c,f=this.config.cache.policies;o=(0,en.pi)((0,en.pi)({},e8(e5(r))),o);var d=eI(a),h=this.executeSelectionSet({selectionSet:e9(r).selectionSet,objectOrReference:d,enclosingRef:d,context:(0,en.pi)({store:n,query:r,policies:f,variables:o,varString:nx(o),canonizeResults:l},iE(r,this.config.fragments))});if(h.missing&&(t=[new is(iR(h.missing),h.missing,r,o)],!u))throw t[0];return{result:h.result,complete:!t,missing:t}},e.prototype.isFresh=function(e,t,n,r){if(iD(r.store)&&this.knownResults.get(e)===n){var i=this.executeSelectionSet.peek(n,t,r,this.canon.isKnown(e));if(i&&e===i.result)return!0}return!1},e.prototype.execSelectionSetImpl=function(e){var t,n=this,r=e.selectionSet,i=e.objectOrReference,a=e.enclosingRef,o=e.context;if(eD(i)&&!o.policies.rootTypenamesById[i.__ref]&&!o.store.has(i.__ref))return{result:this.canon.empty,missing:"Dangling reference to missing ".concat(i.__ref," object")};var s=o.variables,u=o.policies,c=o.store.getFieldValue(i,"__typename"),l=[],f=new tB;function d(e,n){var r;return e.missing&&(t=f.merge(t,((r={})[n]=e.missing,r))),e.result}this.config.addTypename&&"string"==typeof c&&!u.rootIdsByTypename[c]&&l.push({__typename:c});var h=new Set(r.selections);h.forEach(function(e){var r,p;if(td(e,s)){if(eQ(e)){var b=u.readField({fieldName:e.name.value,field:e,variables:o.variables,from:i},o),m=eX(e);void 0===b?nj.added(e)||(t=f.merge(t,((r={})[m]="Can't find field '".concat(e.name.value,"' on ").concat(eD(i)?i.__ref+" object":"object "+JSON.stringify(i,null,2)),r))):(0,tP.k)(b)?b=d(n.executeSubSelectedArray({field:e,array:b,enclosingRef:a,context:o}),m):e.selectionSet?null!=b&&(b=d(n.executeSelectionSet({selectionSet:e.selectionSet,objectOrReference:b,enclosingRef:eD(b)?b:a,context:o}),m)):o.canonizeResults&&(b=n.canon.pass(b)),void 0!==b&&l.push(((p={})[m]=b,p))}else{var g=eC(e,o.lookupFragment);if(!g&&e.kind===nL.h.FRAGMENT_SPREAD)throw __DEV__?new Q.ej("No fragment named ".concat(e.name.value)):new Q.ej(5);g&&u.fragmentMatches(g,c)&&g.selectionSet.selections.forEach(h.add,h)}}});var p={result:tF(l),missing:t},b=o.canonizeResults?this.canon.admit(p):(0,iu.J)(p);return b.result&&this.knownResults.set(b.result,r),b},e.prototype.execSubSelectedArrayImpl=function(e){var t,n=this,r=e.field,i=e.array,a=e.enclosingRef,o=e.context,s=new tB;function u(e,n){var r;return e.missing&&(t=s.merge(t,((r={})[n]=e.missing,r))),e.result}return r.selectionSet&&(i=i.filter(o.store.canRead)),i=i.map(function(e,t){return null===e?null:(0,tP.k)(e)?u(n.executeSubSelectedArray({field:r,array:e,enclosingRef:a,context:o}),t):r.selectionSet?u(n.executeSelectionSet({selectionSet:r.selectionSet,objectOrReference:e,enclosingRef:eD(e)?e:a,context:o}),t):(__DEV__&&ij(o.store,r,e),e)}),{result:o.canonizeResults?this.canon.admit(i):i,missing:t}},e}();function iR(e){try{JSON.stringify(e,function(e,t){if("string"==typeof t)throw t;return t})}catch(t){return t}}function ij(e,t,n){if(!t.selectionSet){var r=new Set([n]);r.forEach(function(n){(0,eO.s)(n)&&(__DEV__?(0,Q.kG)(!eD(n),"Missing selection set for object of type ".concat(im(e,n)," returned for query field ").concat(t.name.value)):(0,Q.kG)(!eD(n),6),Object.values(n).forEach(r.add,r))})}}function iF(e){var t=nG("stringifyForDisplay");return JSON.stringify(e,function(e,n){return void 0===n?t:n}).split(JSON.stringify(t)).join("<undefined>")}var iY=Object.create(null);function iB(e){var t=JSON.stringify(e);return iY[t]||(iY[t]=Object.create(null))}function iU(e){var t=iB(e);return t.keyFieldsFn||(t.keyFieldsFn=function(t,n){var r=function(e,t){return n.readField(t,e)},i=n.keyObject=i$(e,function(e){var i=iW(n.storeObject,e,r);return void 0===i&&t!==n.storeObject&&ic.call(t,e[0])&&(i=iW(t,e,iG)),__DEV__?(0,Q.kG)(void 0!==i,"Missing field '".concat(e.join("."),"' while extracting keyFields from ").concat(JSON.stringify(t))):(0,Q.kG)(void 0!==i,2),i});return"".concat(n.typename,":").concat(JSON.stringify(i))})}function iH(e){var t=iB(e);return t.keyArgsFn||(t.keyArgsFn=function(t,n){var r=n.field,i=n.variables,a=n.fieldName,o=JSON.stringify(i$(e,function(e){var n=e[0],a=n.charAt(0);if("@"===a){if(r&&(0,tP.O)(r.directives)){var o=n.slice(1),s=r.directives.find(function(e){return e.name.value===o}),u=s&&eZ(s,i);return u&&iW(u,e.slice(1))}return}if("$"===a){var c=n.slice(1);if(i&&ic.call(i,c)){var l=e.slice(0);return l[0]=c,iW(i,l)}return}if(t)return iW(t,e)}));return(t||"{}"!==o)&&(a+=":"+o),a})}function i$(e,t){var n=new tB;return iz(e).reduce(function(e,r){var i,a=t(r);if(void 0!==a){for(var o=r.length-1;o>=0;--o)a=((i={})[r[o]]=a,i);e=n.merge(e,a)}return e},Object.create(null))}function iz(e){var t=iB(e);if(!t.paths){var n=t.paths=[],r=[];e.forEach(function(t,i){(0,tP.k)(t)?(iz(t).forEach(function(e){return n.push(r.concat(e))}),r.length=0):(r.push(t),(0,tP.k)(e[i+1])||(n.push(r.slice(0)),r.length=0))})}return t.paths}function iG(e,t){return e[t]}function iW(e,t,n){return n=n||iG,iK(t.reduce(function e(t,r){return(0,tP.k)(t)?t.map(function(t){return e(t,r)}):t&&n(t,r)},e))}function iK(e){return(0,eO.s)(e)?(0,tP.k)(e)?e.map(iK):i$(Object.keys(e).sort(),function(t){return iW(e,t)}):e}function iV(e){return void 0!==e.args?e.args:e.field?eZ(e.field,e.variables):null}eK.setStringify(nx);var iq=function(){},iZ=function(e,t){return t.fieldName},iX=function(e,t,n){return(0,n.mergeObjects)(e,t)},iJ=function(e,t){return t},iQ=function(){function e(e){this.config=e,this.typePolicies=Object.create(null),this.toBeAdded=Object.create(null),this.supertypeMap=new Map,this.fuzzySubtypes=new Map,this.rootIdsByTypename=Object.create(null),this.rootTypenamesById=Object.create(null),this.usingPossibleTypes=!1,this.config=(0,en.pi)({dataIdFromObject:id},e),this.cache=this.config.cache,this.setRootTypename("Query"),this.setRootTypename("Mutation"),this.setRootTypename("Subscription"),e.possibleTypes&&this.addPossibleTypes(e.possibleTypes),e.typePolicies&&this.addTypePolicies(e.typePolicies)}return e.prototype.identify=function(e,t){var n,r,i=this,a=t&&(t.typename||(null===(n=t.storeObject)||void 0===n?void 0:n.__typename))||e.__typename;if(a===this.rootTypenamesById.ROOT_QUERY)return["ROOT_QUERY"];for(var o=t&&t.storeObject||e,s=(0,en.pi)((0,en.pi)({},t),{typename:a,storeObject:o,readField:t&&t.readField||function(){var e=i0(arguments,o);return i.readField(e,{store:i.cache.data,variables:e.variables})}}),u=a&&this.getTypePolicy(a),c=u&&u.keyFn||this.config.dataIdFromObject;c;){var l=c((0,en.pi)((0,en.pi)({},e),o),s);if((0,tP.k)(l))c=iU(l);else{r=l;break}}return r=r?String(r):void 0,s.keyObject?[r,s.keyObject]:[r]},e.prototype.addTypePolicies=function(e){var t=this;Object.keys(e).forEach(function(n){var r=e[n],i=r.queryType,a=r.mutationType,o=r.subscriptionType,s=(0,en._T)(r,["queryType","mutationType","subscriptionType"]);i&&t.setRootTypename("Query",n),a&&t.setRootTypename("Mutation",n),o&&t.setRootTypename("Subscription",n),ic.call(t.toBeAdded,n)?t.toBeAdded[n].push(s):t.toBeAdded[n]=[s]})},e.prototype.updateTypePolicy=function(e,t){var n=this,r=this.getTypePolicy(e),i=t.keyFields,a=t.fields;function o(e,t){e.merge="function"==typeof t?t:!0===t?iX:!1===t?iJ:e.merge}o(r,t.merge),r.keyFn=!1===i?iq:(0,tP.k)(i)?iU(i):"function"==typeof i?i:r.keyFn,a&&Object.keys(a).forEach(function(t){var r=n.getFieldPolicy(e,t,!0),i=a[t];if("function"==typeof i)r.read=i;else{var s=i.keyArgs,u=i.read,c=i.merge;r.keyFn=!1===s?iZ:(0,tP.k)(s)?iH(s):"function"==typeof s?s:r.keyFn,"function"==typeof u&&(r.read=u),o(r,c)}r.read&&r.merge&&(r.keyFn=r.keyFn||iZ)})},e.prototype.setRootTypename=function(e,t){void 0===t&&(t=e);var n="ROOT_"+e.toUpperCase(),r=this.rootTypenamesById[n];t!==r&&(__DEV__?(0,Q.kG)(!r||r===e,"Cannot change root ".concat(e," __typename more than once")):(0,Q.kG)(!r||r===e,3),r&&delete this.rootIdsByTypename[r],this.rootIdsByTypename[t]=n,this.rootTypenamesById[n]=t)},e.prototype.addPossibleTypes=function(e){var t=this;this.usingPossibleTypes=!0,Object.keys(e).forEach(function(n){t.getSupertypeSet(n,!0),e[n].forEach(function(e){t.getSupertypeSet(e,!0).add(n);var r=e.match(ig);r&&r[0]===e||t.fuzzySubtypes.set(e,RegExp(e))})})},e.prototype.getTypePolicy=function(e){var t=this;if(!ic.call(this.typePolicies,e)){var n=this.typePolicies[e]=Object.create(null);n.fields=Object.create(null);var r=this.supertypeMap.get(e);r&&r.size&&r.forEach(function(e){var r=t.getTypePolicy(e),i=r.fields;Object.assign(n,(0,en._T)(r,["fields"])),Object.assign(n.fields,i)})}var i=this.toBeAdded[e];return i&&i.length&&i.splice(0).forEach(function(n){t.updateTypePolicy(e,n)}),this.typePolicies[e]},e.prototype.getFieldPolicy=function(e,t,n){if(e){var r=this.getTypePolicy(e).fields;return r[t]||n&&(r[t]=Object.create(null))}},e.prototype.getSupertypeSet=function(e,t){var n=this.supertypeMap.get(e);return!n&&t&&this.supertypeMap.set(e,n=new Set),n},e.prototype.fragmentMatches=function(e,t,n,r){var i=this;if(!e.typeCondition)return!0;if(!t)return!1;var a=e.typeCondition.name.value;if(t===a)return!0;if(this.usingPossibleTypes&&this.supertypeMap.has(a))for(var o=this.getSupertypeSet(t,!0),s=[o],u=function(e){var t=i.getSupertypeSet(e,!1);t&&t.size&&0>s.indexOf(t)&&s.push(t)},c=!!(n&&this.fuzzySubtypes.size),l=!1,f=0;f<s.length;++f){var d=s[f];if(d.has(a))return o.has(a)||(l&&__DEV__&&Q.kG.warn("Inferring subtype ".concat(t," of supertype ").concat(a)),o.add(a)),!0;d.forEach(u),c&&f===s.length-1&&iy(e.selectionSet,n,r)&&(c=!1,l=!0,this.fuzzySubtypes.forEach(function(e,n){var r=t.match(e);r&&r[0]===t&&u(n)}))}return!1},e.prototype.hasKeyArgs=function(e,t){var n=this.getFieldPolicy(e,t,!1);return!!(n&&n.keyFn)},e.prototype.getStoreFieldName=function(e){var t,n=e.typename,r=e.fieldName,i=this.getFieldPolicy(n,r,!1),a=i&&i.keyFn;if(a&&n)for(var o={typename:n,fieldName:r,field:e.field||null,variables:e.variables},s=iV(e);a;){var u=a(s,o);if((0,tP.k)(u))a=iH(u);else{t=u||r;break}}return(void 0===t&&(t=e.field?eG(e.field,e.variables):eK(r,iV(e))),!1===t)?r:r===iv(t)?t:r+":"+t},e.prototype.readField=function(e,t){var n=e.from;if(n&&(e.field||e.fieldName)){if(void 0===e.typename){var r=t.store.getFieldValue(n,"__typename");r&&(e.typename=r)}var i=this.getStoreFieldName(e),a=iv(i),o=t.store.getFieldValue(n,i),s=this.getFieldPolicy(e.typename,a,!1),u=s&&s.read;if(u){var c=i1(this,n,e,t,t.store.getStorage(eD(n)?n.__ref:n,i));return rX.withValue(this.cache,u,[o,c])}return o}},e.prototype.getReadFunction=function(e,t){var n=this.getFieldPolicy(e,t,!1);return n&&n.read},e.prototype.getMergeFunction=function(e,t,n){var r=this.getFieldPolicy(e,t,!1),i=r&&r.merge;return!i&&n&&(i=(r=this.getTypePolicy(n))&&r.merge),i},e.prototype.runMergeFunction=function(e,t,n,r,i){var a=n.field,o=n.typename,s=n.merge;return s===iX?i2(r.store)(e,t):s===iJ?t:(r.overwrite&&(e=void 0),s(e,t,i1(this,void 0,{typename:o,fieldName:a.name.value,field:a,variables:r.variables},r,i||Object.create(null))))},e}();function i1(e,t,n,r,i){var a=e.getStoreFieldName(n),o=iv(a),s=n.variables||r.variables,u=r.store,c=u.toReference,l=u.canRead;return{args:iV(n),field:n.field||null,fieldName:o,storeFieldName:a,variables:s,isReference:eD,toReference:c,storage:i,cache:e.cache,canRead:l,readField:function(){return e.readField(i0(arguments,t,s),r)},mergeObjects:i2(r.store)}}function i0(e,t,n){var r,i=e[0],a=e[1],o=e.length;return"string"==typeof i?r={fieldName:i,from:o>1?a:t}:(r=(0,en.pi)({},i),ic.call(r,"from")||(r.from=t)),__DEV__&&void 0===r.from&&__DEV__&&Q.kG.warn("Undefined 'from' passed to readField with arguments ".concat(iF(Array.from(e)))),void 0===r.variables&&(r.variables=n),r}function i2(e){return function(t,n){if((0,tP.k)(t)||(0,tP.k)(n))throw __DEV__?new Q.ej("Cannot automatically merge arrays"):new Q.ej(4);if((0,eO.s)(t)&&(0,eO.s)(n)){var r=e.getFieldValue(t,"__typename"),i=e.getFieldValue(n,"__typename");if(r&&i&&r!==i)return n;if(eD(t)&&iw(n))return e.merge(t.__ref,n),t;if(iw(t)&&eD(n))return e.merge(t,n.__ref),n;if(iw(t)&&iw(n))return(0,en.pi)((0,en.pi)({},t),n)}return n}}function i3(e,t,n){var r="".concat(t).concat(n),i=e.flavors.get(r);return i||e.flavors.set(r,i=e.clientOnly===t&&e.deferred===n?e:(0,en.pi)((0,en.pi)({},e),{clientOnly:t,deferred:n})),i}var i4=function(){function e(e,t,n){this.cache=e,this.reader=t,this.fragments=n}return e.prototype.writeToStore=function(e,t){var n=this,r=t.query,i=t.result,a=t.dataId,o=t.variables,s=t.overwrite,u=e2(r),c=i_();o=(0,en.pi)((0,en.pi)({},e8(u)),o);var l=(0,en.pi)((0,en.pi)({store:e,written:Object.create(null),merge:function(e,t){return c.merge(e,t)},variables:o,varString:nx(o)},iE(r,this.fragments)),{overwrite:!!s,incomingById:new Map,clientOnly:!1,deferred:!1,flavors:new Map}),f=this.processSelectionSet({result:i||Object.create(null),dataId:a,selectionSet:u.selectionSet,mergeTree:{map:new Map},context:l});if(!eD(f))throw __DEV__?new Q.ej("Could not identify object ".concat(JSON.stringify(i))):new Q.ej(7);return l.incomingById.forEach(function(t,r){var i=t.storeObject,a=t.mergeTree,o=t.fieldNodeSet,s=eI(r);if(a&&a.map.size){var u=n.applyMerges(a,s,i,l);if(eD(u))return;i=u}if(__DEV__&&!l.overwrite){var c=Object.create(null);o.forEach(function(e){e.selectionSet&&(c[e.name.value]=!0)});var f=function(e){return!0===c[iv(e)]},d=function(e){var t=a&&a.map.get(e);return Boolean(t&&t.info&&t.info.merge)};Object.keys(i).forEach(function(e){f(e)&&!d(e)&&at(s,i,e,l.store)})}e.merge(r,i)}),e.retain(f.__ref),f},e.prototype.processSelectionSet=function(e){var t=this,n=e.dataId,r=e.result,i=e.selectionSet,a=e.context,o=e.mergeTree,s=this.cache.policies,u=Object.create(null),c=n&&s.rootTypenamesById[n]||eJ(r,i,a.fragmentMap)||n&&a.store.get(n,"__typename");"string"==typeof c&&(u.__typename=c);var l=function(){var e=i0(arguments,u,a.variables);if(eD(e.from)){var t=a.incomingById.get(e.from.__ref);if(t){var n=s.readField((0,en.pi)((0,en.pi)({},e),{from:t.storeObject}),a);if(void 0!==n)return n}}return s.readField(e,a)},f=new Set;this.flattenFields(i,r,a,c).forEach(function(e,n){var i,a=r[eX(n)];if(f.add(n),void 0!==a){var d=s.getStoreFieldName({typename:c,fieldName:n.name.value,field:n,variables:e.variables}),h=i6(o,d),p=t.processFieldValue(a,n,n.selectionSet?i3(e,!1,!1):e,h),b=void 0;n.selectionSet&&(eD(p)||iw(p))&&(b=l("__typename",p));var m=s.getMergeFunction(c,n.name.value,b);m?h.info={field:n,typename:c,merge:m}:i7(o,d),u=e.merge(u,((i={})[d]=p,i))}else __DEV__&&!e.clientOnly&&!e.deferred&&!nj.added(n)&&!s.getReadFunction(c,n.name.value)&&__DEV__&&Q.kG.error("Missing field '".concat(eX(n),"' while writing result ").concat(JSON.stringify(r,null,2)).substring(0,1e3))});try{var d=s.identify(r,{typename:c,selectionSet:i,fragmentMap:a.fragmentMap,storeObject:u,readField:l}),h=d[0],p=d[1];n=n||h,p&&(u=a.merge(u,p))}catch(b){if(!n)throw b}if("string"==typeof n){var m=eI(n),g=a.written[n]||(a.written[n]=[]);if(g.indexOf(i)>=0||(g.push(i),this.reader&&this.reader.isFresh(r,m,i,a)))return m;var v=a.incomingById.get(n);return v?(v.storeObject=a.merge(v.storeObject,u),v.mergeTree=i9(v.mergeTree,o),f.forEach(function(e){return v.fieldNodeSet.add(e)})):a.incomingById.set(n,{storeObject:u,mergeTree:i8(o)?void 0:o,fieldNodeSet:f}),m}return u},e.prototype.processFieldValue=function(e,t,n,r){var i=this;return t.selectionSet&&null!==e?(0,tP.k)(e)?e.map(function(e,a){var o=i.processFieldValue(e,t,n,i6(r,a));return i7(r,a),o}):this.processSelectionSet({result:e,selectionSet:t.selectionSet,context:n,mergeTree:r}):__DEV__?nJ(e):e},e.prototype.flattenFields=function(e,t,n,r){void 0===r&&(r=eJ(t,e,n.fragmentMap));var i=new Map,a=this.cache.policies,o=new n_(!1);return function e(s,u){var c=o.lookup(s,u.clientOnly,u.deferred);c.visited||(c.visited=!0,s.selections.forEach(function(o){if(td(o,n.variables)){var s=u.clientOnly,c=u.deferred;if(!(s&&c)&&(0,tP.O)(o.directives)&&o.directives.forEach(function(e){var t=e.name.value;if("client"===t&&(s=!0),"defer"===t){var r=eZ(e,n.variables);r&&!1===r.if||(c=!0)}}),eQ(o)){var l=i.get(o);l&&(s=s&&l.clientOnly,c=c&&l.deferred),i.set(o,i3(n,s,c))}else{var f=eC(o,n.lookupFragment);if(!f&&o.kind===nL.h.FRAGMENT_SPREAD)throw __DEV__?new Q.ej("No fragment named ".concat(o.name.value)):new Q.ej(8);f&&a.fragmentMatches(f,r,t,n.variables)&&e(f.selectionSet,i3(n,s,c))}}}))}(e,n),i},e.prototype.applyMerges=function(e,t,n,r,i){var a=this;if(e.map.size&&!eD(n)){var o,s,u=!(0,tP.k)(n)&&(eD(t)||iw(t))?t:void 0,c=n;u&&!i&&(i=[eD(u)?u.__ref:u]);var l=function(e,t){return(0,tP.k)(e)?"number"==typeof t?e[t]:void 0:r.store.getFieldValue(e,String(t))};e.map.forEach(function(e,t){var n=l(u,t),o=l(c,t);if(void 0!==o){i&&i.push(t);var f=a.applyMerges(e,n,o,r,i);f!==o&&(s=s||new Map).set(t,f),i&&(0,Q.kG)(i.pop()===t)}}),s&&(n=(0,tP.k)(c)?c.slice(0):(0,en.pi)({},c),s.forEach(function(e,t){n[t]=e}))}return e.info?this.cache.policies.runMergeFunction(t,n,e.info,r,i&&(o=r.store).getStorage.apply(o,i)):n},e}(),i5=[];function i6(e,t){var n=e.map;return n.has(t)||n.set(t,i5.pop()||{map:new Map}),n.get(t)}function i9(e,t){if(e===t||!t||i8(t))return e;if(!e||i8(e))return t;var n=e.info&&t.info?(0,en.pi)((0,en.pi)({},e.info),t.info):e.info||t.info,r=e.map.size&&t.map.size,i=r?new Map:e.map.size?e.map:t.map,a={info:n,map:i};if(r){var o=new Set(t.map.keys());e.map.forEach(function(e,n){a.map.set(n,i9(e,t.map.get(n))),o.delete(n)}),o.forEach(function(n){a.map.set(n,i9(t.map.get(n),e.map.get(n)))})}return a}function i8(e){return!e||!(e.info||e.map.size)}function i7(e,t){var n=e.map,r=n.get(t);r&&i8(r)&&(i5.push(r),n.delete(t))}var ae=new Set;function at(e,t,n,r){var i=function(e){var t=r.getFieldValue(e,n);return"object"==typeof t&&t},a=i(e);if(a){var o=i(t);if(!(!o||eD(a)||(0,nm.D)(a,o)||Object.keys(a).every(function(e){return void 0!==r.getFieldValue(o,e)}))){var s=r.getFieldValue(e,"__typename")||r.getFieldValue(t,"__typename"),u=iv(n),c="".concat(s,".").concat(u);if(!ae.has(c)){ae.add(c);var l=[];(0,tP.k)(a)||(0,tP.k)(o)||[a,o].forEach(function(e){var t=r.getFieldValue(e,"__typename");"string"!=typeof t||l.includes(t)||l.push(t)}),__DEV__&&Q.kG.warn("Cache data may be lost when replacing the ".concat(u," field of a ").concat(s," object.\n\nThis could cause additional (usually avoidable) network requests to fetch data that were otherwise cached.\n\nTo address this problem (which is not a bug in Apollo Client), ").concat(l.length?"either ensure all objects of type "+l.join(" and ")+" have an ID or a custom merge function, or ":"","define a custom merge function for the ").concat(c," field, so InMemoryCache can safely merge these objects:\n\n  existing: ").concat(JSON.stringify(a).slice(0,1e3),"\n  incoming: ").concat(JSON.stringify(o).slice(0,1e3),"\n\nFor more information about these options, please refer to the documentation:\n\n  * Ensuring entity objects have IDs: https://go.apollo.dev/c/generating-unique-identifiers\n  * Defining custom merge functions: https://go.apollo.dev/c/merging-non-normalized-objects\n"))}}}}var an=function(e){function t(t){void 0===t&&(t={});var n=e.call(this)||this;return n.watches=new Set,n.typenameDocumentCache=new Map,n.makeVar=r2,n.txCount=0,n.config=ip(t),n.addTypename=!!n.config.addTypename,n.policies=new iQ({cache:n,dataIdFromObject:n.config.dataIdFromObject,possibleTypes:n.config.possibleTypes,typePolicies:n.config.typePolicies}),n.init(),n}return(0,en.ZT)(t,e),t.prototype.init=function(){var e=this.data=new iT.Root({policies:this.policies,resultCaching:this.config.resultCaching});this.optimisticData=e.stump,this.resetResultCache()},t.prototype.resetResultCache=function(e){var t=this,n=this.storeReader,r=this.config.fragments;this.storeWriter=new i4(this,this.storeReader=new iP({cache:this,addTypename:this.addTypename,resultCacheMaxSize:this.config.resultCacheMaxSize,canonizeResults:ib(this.config),canon:e?void 0:n&&n.canon,fragments:r}),r),this.maybeBroadcastWatch=rZ(function(e,n){return t.broadcastWatch(e,n)},{max:this.config.resultCacheMaxSize,makeCacheKey:function(e){var n=e.optimistic?t.optimisticData:t.data;if(iD(n)){var r=e.optimistic,i=e.id,a=e.variables;return n.makeCacheKey(e.query,e.callback,nx({optimistic:r,id:i,variables:a}))}}}),new Set([this.data.group,this.optimisticData.group,]).forEach(function(e){return e.resetCaching()})},t.prototype.restore=function(e){return this.init(),e&&this.data.replace(e),this},t.prototype.extract=function(e){return void 0===e&&(e=!1),(e?this.optimisticData:this.data).extract()},t.prototype.read=function(e){var t=e.returnPartialData,n=void 0!==t&&t;try{return this.storeReader.diffQueryAgainstStore((0,en.pi)((0,en.pi)({},e),{store:e.optimistic?this.optimisticData:this.data,config:this.config,returnPartialData:n})).result||null}catch(r){if(r instanceof is)return null;throw r}},t.prototype.write=function(e){try{return++this.txCount,this.storeWriter.writeToStore(this.data,e)}finally{--this.txCount||!1===e.broadcast||this.broadcastWatches()}},t.prototype.modify=function(e){if(ic.call(e,"id")&&!e.id)return!1;var t=e.optimistic?this.optimisticData:this.data;try{return++this.txCount,t.modify(e.id||"ROOT_QUERY",e.fields)}finally{--this.txCount||!1===e.broadcast||this.broadcastWatches()}},t.prototype.diff=function(e){return this.storeReader.diffQueryAgainstStore((0,en.pi)((0,en.pi)({},e),{store:e.optimistic?this.optimisticData:this.data,rootId:e.id||"ROOT_QUERY",config:this.config}))},t.prototype.watch=function(e){var t=this;return this.watches.size||r0(this),this.watches.add(e),e.immediate&&this.maybeBroadcastWatch(e),function(){t.watches.delete(e)&&!t.watches.size&&r1(t),t.maybeBroadcastWatch.forget(e)}},t.prototype.gc=function(e){nx.reset();var t=this.optimisticData.gc();return e&&!this.txCount&&(e.resetResultCache?this.resetResultCache(e.resetResultIdentities):e.resetResultIdentities&&this.storeReader.resetCanon()),t},t.prototype.retain=function(e,t){return(t?this.optimisticData:this.data).retain(e)},t.prototype.release=function(e,t){return(t?this.optimisticData:this.data).release(e)},t.prototype.identify=function(e){if(eD(e))return e.__ref;try{return this.policies.identify(e)[0]}catch(t){__DEV__&&Q.kG.warn(t)}},t.prototype.evict=function(e){if(!e.id){if(ic.call(e,"id"))return!1;e=(0,en.pi)((0,en.pi)({},e),{id:"ROOT_QUERY"})}try{return++this.txCount,this.optimisticData.evict(e,this.data)}finally{--this.txCount||!1===e.broadcast||this.broadcastWatches()}},t.prototype.reset=function(e){var t=this;return this.init(),nx.reset(),e&&e.discardWatches?(this.watches.forEach(function(e){return t.maybeBroadcastWatch.forget(e)}),this.watches.clear(),r1(this)):this.broadcastWatches(),Promise.resolve()},t.prototype.removeOptimistic=function(e){var t=this.optimisticData.removeLayer(e);t!==this.optimisticData&&(this.optimisticData=t,this.broadcastWatches())},t.prototype.batch=function(e){var t,n=this,r=e.update,i=e.optimistic,a=void 0===i||i,o=e.removeOptimistic,s=e.onWatchUpdated,u=function(e){var i=n,a=i.data,o=i.optimisticData;++n.txCount,e&&(n.data=n.optimisticData=e);try{return t=r(n)}finally{--n.txCount,n.data=a,n.optimisticData=o}},c=new Set;return s&&!this.txCount&&this.broadcastWatches((0,en.pi)((0,en.pi)({},e),{onWatchUpdated:function(e){return c.add(e),!1}})),"string"==typeof a?this.optimisticData=this.optimisticData.addLayer(a,u):!1===a?u(this.data):u(),"string"==typeof o&&(this.optimisticData=this.optimisticData.removeLayer(o)),s&&c.size?(this.broadcastWatches((0,en.pi)((0,en.pi)({},e),{onWatchUpdated:function(e,t){var n=s.call(this,e,t);return!1!==n&&c.delete(e),n}})),c.size&&c.forEach(function(e){return n.maybeBroadcastWatch.dirty(e)})):this.broadcastWatches(e),t},t.prototype.performTransaction=function(e,t){return this.batch({update:e,optimistic:t||null!==t})},t.prototype.transformDocument=function(e){if(this.addTypename){var t=this.typenameDocumentCache.get(e);return t||(t=nj(e),this.typenameDocumentCache.set(e,t),this.typenameDocumentCache.set(t,t)),t}return e},t.prototype.transformForLink=function(e){var t=this.config.fragments;return t?t.transform(e):e},t.prototype.broadcastWatches=function(e){var t=this;this.txCount||this.watches.forEach(function(n){return t.maybeBroadcastWatch(n,e)})},t.prototype.broadcastWatch=function(e,t){var n=e.lastDiff,r=this.diff(e);(!t||(e.optimistic&&"string"==typeof t.optimistic&&(r.fromOptimisticTransaction=!0),!t.onWatchUpdated||!1!==t.onWatchUpdated.call(this,e,r,n)))&&(n&&(0,nm.D)(n.result,r.result)||e.callback(e.lastDiff=r,n))},t}(io),ar={possibleTypes:{ApproveJobProposalSpecPayload:["ApproveJobProposalSpecSuccess","JobAlreadyExistsError","NotFoundError"],BridgePayload:["Bridge","NotFoundError"],CancelJobProposalSpecPayload:["CancelJobProposalSpecSuccess","NotFoundError"],ChainPayload:["Chain","NotFoundError"],CreateAPITokenPayload:["CreateAPITokenSuccess","InputErrors"],CreateBridgePayload:["CreateBridgeSuccess"],CreateCSAKeyPayload:["CSAKeyExistsError","CreateCSAKeySuccess"],CreateFeedsManagerChainConfigPayload:["CreateFeedsManagerChainConfigSuccess","InputErrors","NotFoundError"],CreateFeedsManagerPayload:["CreateFeedsManagerSuccess","InputErrors","NotFoundError","SingleFeedsManagerError"],CreateJobPayload:["CreateJobSuccess","InputErrors"],CreateOCR2KeyBundlePayload:["CreateOCR2KeyBundleSuccess"],CreateOCRKeyBundlePayload:["CreateOCRKeyBundleSuccess"],CreateP2PKeyPayload:["CreateP2PKeySuccess"],DeleteAPITokenPayload:["DeleteAPITokenSuccess","InputErrors"],DeleteBridgePayload:["DeleteBridgeConflictError","DeleteBridgeInvalidNameError","DeleteBridgeSuccess","NotFoundError"],DeleteCSAKeyPayload:["DeleteCSAKeySuccess","NotFoundError"],DeleteFeedsManagerChainConfigPayload:["DeleteFeedsManagerChainConfigSuccess","NotFoundError"],DeleteJobPayload:["DeleteJobSuccess","NotFoundError"],DeleteOCR2KeyBundlePayload:["DeleteOCR2KeyBundleSuccess","NotFoundError"],DeleteOCRKeyBundlePayload:["DeleteOCRKeyBundleSuccess","NotFoundError"],DeleteP2PKeyPayload:["DeleteP2PKeySuccess","NotFoundError"],DeleteVRFKeyPayload:["DeleteVRFKeySuccess","NotFoundError"],DismissJobErrorPayload:["DismissJobErrorSuccess","NotFoundError"],Error:["CSAKeyExistsError","DeleteBridgeConflictError","DeleteBridgeInvalidNameError","InputError","JobAlreadyExistsError","NotFoundError","RunJobCannotRunError","SingleFeedsManagerError"],EthTransactionPayload:["EthTransaction","NotFoundError"],FeaturesPayload:["Features"],FeedsManagerPayload:["FeedsManager","NotFoundError"],GetSQLLoggingPayload:["SQLLogging"],GlobalLogLevelPayload:["GlobalLogLevel"],JobPayload:["Job","NotFoundError"],JobProposalPayload:["JobProposal","NotFoundError"],JobRunPayload:["JobRun","NotFoundError"],JobSpec:["BlockHeaderFeederSpec","BlockhashStoreSpec","BootstrapSpec","CronSpec","DirectRequestSpec","FluxMonitorSpec","GatewaySpec","KeeperSpec","OCR2Spec","OCRSpec","VRFSpec","WebhookSpec"],NodePayload:["Node","NotFoundError"],PaginatedPayload:["BridgesPayload","ChainsPayload","EthTransactionAttemptsPayload","EthTransactionsPayload","JobRunsPayload","JobsPayload","NodesPayload"],RejectJobProposalSpecPayload:["NotFoundError","RejectJobProposalSpecSuccess"],RunJobPayload:["NotFoundError","RunJobCannotRunError","RunJobSuccess"],SetGlobalLogLevelPayload:["InputErrors","SetGlobalLogLevelSuccess"],SetSQLLoggingPayload:["SetSQLLoggingSuccess"],SetServicesLogLevelsPayload:["InputErrors","SetServicesLogLevelsSuccess"],UpdateBridgePayload:["NotFoundError","UpdateBridgeSuccess"],UpdateFeedsManagerChainConfigPayload:["InputErrors","NotFoundError","UpdateFeedsManagerChainConfigSuccess"],UpdateFeedsManagerPayload:["InputErrors","NotFoundError","UpdateFeedsManagerSuccess"],UpdateJobProposalSpecDefinitionPayload:["NotFoundError","UpdateJobProposalSpecDefinitionSuccess"],UpdatePasswordPayload:["InputErrors","UpdatePasswordSuccess"],VRFKeyPayload:["NotFoundError","VRFKeySuccess"]}};let ai=ar;var aa=(r=void 0,location.origin),ao=new nh({uri:"".concat(aa,"/query"),credentials:"include"}),as=new ia({cache:new an({possibleTypes:ai.possibleTypes}),link:ao});if(a.Z.locale(o),u().defaultFormat="YYYY-MM-DD h:mm:ss A","undefined"!=typeof document){var au,ac,al=f().hydrate;ac=X,al(c.createElement(et,{client:as},c.createElement(d.zj,null,c.createElement(i.MuiThemeProvider,{theme:J.r},c.createElement(ac,null)))),document.getElementById("root"))}})()})();
\ No newline at end of file
diff --git a/core/web/assets/main.b0b6f79f7f4a94560e37.js.gz b/core/web/assets/main.8f602c136d4004a835ee.js.gz
similarity index 93%
rename from core/web/assets/main.b0b6f79f7f4a94560e37.js.gz
rename to core/web/assets/main.8f602c136d4004a835ee.js.gz
index c505ea9eeade9a8933c1cc213f6e6d36bc873d85..fceb7ce3cbe253bc309228ad9e7047001c11ebe5 100644
GIT binary patch
delta 77848
zcmV)KK)Sz`)JTieNPvU^gaU*Egam{Iga(8Mgb0KQgbIWUgbaiYgbsucv=Awbe{CcS
zqpw0^d^O~x33Jr~h0(Dk*;XPikz{94bo_%PNWvlk8Vf0!;`jZpabNE~$*rpH1{w<&
zNse=J;>=jY(&(kSy1J^mma8~#q|9BTc9>UY692IuZ4c%FC8e|tQ&sAYUv6#L=?6T0
zr7inms==r-+iW2AIt*qSZ#vHbe;v;0xwJ{1FOvTF9J3{t8VIy@64(e#m<4}YnmCm~
zTyzec#O5XlDek=~pEcoPsC*kyj{~vDvmRoiU#cHj?x<w5Vxv#U8Y$0;WV8cEZn0bx
zmbctVU*&!VsqK>j(TD@$<cWBI0Tal@1AtYMyE##f;w5zL3Z{vYag<S_e@3A=jlAgx
za_a49<{h~R+L&%5T^^bEvCTOgj>+@bG}$SLpr-M}I=Gu)l;l?OX;PvUAWY&M(m~13
z;(lWZ{6nwcg*&p-HvDoPvP%gVdl#LGl)6eK?m<wXwX+%0^F&ap^J_AssD+_Km*_)n
zzNheg-j;iaz0VhLbjnOTe~ZmfDN{5BiLzlxx3{9ZCX!?mmx@<JHJZ6Vmpj3mkwXD$
z75Xv1R+?w|UkZGUPC}0=2_GR<UmjJk^w3=%2SmdPQURq}Z4nWRZ`g5a9gM`mUBEb+
zukxo5DHjYU<3^E;eG!isM&>NSRS;39C<fjmWVB<iz@K<v&iPXPe|E67)eb4OfDm9U
zo>8&`@EdX!d;Z5%bK6BNo9~#{*7~wGmL=iKbb__TVd3Bx=;f6>d(HZfaOxO8R=jce
zTA?_Zs=PoRZc5ZNAjXQMK2tqpQ9n9K#H?>m6-j>jzaZXg`$Kxb$2j2jOjVUllv55N
zRUdCERg?B65~`!{e}gg`#{URec$w&%w&vooto*Qjkqu`R2Ug6)#>kU}GeWL|=KaZ<
zBK4DysUKAtDj{jJ<N^HWiZ~p7Ce+sqa8==ZQ%v>axwE+XKXG`2g3SY(6g{M=%#Nv(
zcVHX&0XGOwncM<UWI_oX*ka_=x!x~K^$nz6A+2M8omg_he*_)564g+ax5<n^2vQ~J
zQ;vMadZKhnW;#gS8`l03(aBpWI(0Il69@-pLUbC!EQWF>lR6BLrOa5Cip2^L%x`a{
zW`m=e3|zlyKzlZBW#+dF^UK<;Bo>UbVvomo#L;d_{OLixfCV=Ev_$NPFqW(atc{yZ
zBnY`&oRRXZe<$T2GnRuoLRPZxChf!|BZW$9Ws(i*Py(Wouenk%zCH-l#g#|{LCe%o
zZ_wSgm(SSATr5^z79XOMI(%CCKLwyLWf8+CondSij%9cshsV^X*h0BuMG&c0o0I=h
zR+~yv(BSqKItS0$Ut_wN?TUHB{sh~bRrZ@JP5f|Ue*~dT*%rl$%!b|)n;HhuPh{Q+
zhyfdo&5p8Qtb-y?%+mVdktHtCpybgbYkvbXL7^qZEHQUr&5}zH8JDH&GsUOn2g%^=
z#P3Q`NRw2N=&=%zBvnLtu~@V}s7%mt%G9HM-fE+BG#9V9(1G^oaUGiUBh^ZjS#arF
z;EvkYe=U{Mk%_r&#|~^kk$E^h*Wn4bL0YHa*>L$R3<B4|G}OQ!a0lZfnb6y8Maout
zYbz4dQrWMIgI8>xXp3jj6hX?l>#@;3XR>unD4N?}B^~&(wubt1&+Lz6x(Al&%SSdx
zD+9BP%gF9(hSv6Mklo8Xak%4(@aeen7MahxfBNriE+SJ~9xhHFkRH|W)$JvvG4wVT
zyzz}{jg7j-PPX9S3~L>Yfs(_fIrx!b9!LbWCf)Ptnmed#ujwYrWNyY;RiT+4jQSV5
z3ltP?Fq8I6YY51P6NrpGkdf5zvFh@G3YAewuVJ8?FFX{oZ&pm5#Xz1B<azE(vf&)K
z55q3zOC)zT<H-~4VMBwqm#&cz7Z9u#?^C&N1wdc%*9G~$5EYlzkq{<-JrsaAOg>GI
zK4GBzMPQNWMg{~AK|A+G?$j8N&9hAah$hjntFewdbYWCu&mNiHOpc8cZ-q((4CBND
z?*)Q7I)8iEE98_}`zCjH;AAnqE%2>~N1UL2CqVxOmX8YXGXDijfQugx#`lY5#ND3c
z6ZPdQvr*ZUDp#v)*f;invc<hUD4*M`-@}>$I~W37kGpnI-~>%$CPC9ke_)>Sj!L`^
zKC^*m^$hI^2e$u2i#RIX?!w$?hj<<_q+L8y+fU0n*1qOGAabMTc&%>0p0e4p^hR%J
z=a?;342IB`LTp58oeR#_O2sBxIY;r3x%M<6VscGX1+Yix=}Y^6&iBE-17fBp^Yp~g
zO5$c-2}yaW-<wkQjZEOdD02r71c(j$WL{KsflF$M!2Lpj(?Ov*K6Ugda{ob43`<5j
z3rr}Y6GH8(dh4me;zdhHjpD=<1>C-(2a_=zqmR7U2FsFKH4tQDn7h~%jMAhLy3A)9
zCLGY1szCI!g-8~Eq*AUhksybVcnqgfXD=COveP;cx<Ss>N{t{Doy!F17SK=2<5A-(
zd`0)e=zi+ifw*1(3y(T^_(W;=kRwr?_elm%#9!FE9T@{K3c_|i8@1ix)|Pe2uXI?%
zo*B5_)$Ofysr}b~$$M@!&P9m`uB1Xj(txHBh#iQUHXiSP2?L@>MHlTn>_jF9I%<&V
zFnBfx_6RUurlCTAveLdwX9WVU!qVKwhP+m|prr1@8DXQ#l{3IA>m1g%xAF>Y&O}K(
zb`}!6w~(quQ=PFBN+FUG@lPBs!ixaBX!{A`4e3oWe>-NkBj~`4M8}-^AAdL}m`u5g
zDSTYi1jsUfjK1KxW4P&(uO@FUWM-gPDvYdP;C6LQT_Hzz(^m5-Q+3t{>Wwj9#OH`~
z90*G!$95<V#jmKdd5?Y4LV797oZOO7xfDWk42^TYJR*s5jH+rt_L3ei5u~Cl4jva(
z2rED?K|HivDC+eXimwxT1fq+#w_*Xo#hJV~N!TubzD;T$c<eio4zL2f5hLh%mi0MG
zUyxYvHo1JxJ##8!$0WZAcu>o@$vD5;QiZx41m8n=+PC%AeWKgDtXw5cm-a^bnqnYl
zQk=;{0*dRLcp~CpYOl;OeQ<lLom>3dQZ|K+!y9-i@lJd~p6l=I+mjM(um{HOZFT#$
zUPGUMh{K^d8e84c0afz&3D@gH!DQu7c^=L7$3&<sh5q5T)e=F<fJz~MpzJBorRtWA
z2i$z=+n3d7&&2Bm0}|sKNaV)&6Y)?cuxz-e`$bCR2;ahG6>yPW!*vbWjO-ec#I|T=
z)_P0nmzpoJ#LWHVUX<P&V{{C~iM&GC!lKE4k4v)(%omo!+onjHLtu8gvjV!1gs2O^
zSdNs4$K9v%8uBrzGLQTzYFnrmKkx*lHN+h?0ZRf($X7t>#b)4@Sfym}ls@PH5N{J6
zGXdCgZ-~yR{i%(V-vcJcrnBiw-Ym2Eo^b`B!MU5G2WO#T&`;H{TjqWn26Men4;n^)
zoQxLH;JfeSW{Zt7Y!W?odEurJm-1Rv0Gh2_MTT&^*p6YgT;0XElssv<j(Eav;-WGT
zFzS$Du<(Cgt|axF6@bm99VJmChna1(rlB*3nz$;J=IF!|nc_ipb@2+yKeA!lgns^D
z(>-2(Z(r8wE0JphpK*xbx7*RT;{EqZi0N@@ykijz@e5lmT1ynI!OGxp;CAKmBY1%y
zt%1<O#Ebz%i-5Tl8@*qe1IV|Tk2dv{Xa@%t0`8zUO~L_z&1Sq{qe%r!#K)IBmk=<2
z>l1wRs8pC^1%*PWeu*E#*O(BFzT@9VWeWve*9)oU&cjZ}^8L6>p}=Jr^+};%cjLQ-
zyj-N}eeDL%(T9!}yZXIQji<h&ANZriW-{&PIW);y0KZ8z_qUc)DIz3Gto<xs723V8
zLQw-z)6w`lO+W<|3Nry?)X%2B0l9B~zEtolQDlD*%ipz9GKGZ}H3R+Kn^Lg^J;qcO
z74}p=sg%gB$Ne214@{>!wB(^T&-?@Y&aCL}2=xIlBfc?*ImZyL49OpAGJtq^`p`AI
zm{Hk<YdT^BW*L|d*Dtnz12(|wS%CIGhZdUJ8JF`<a5Xca;!M40+E^v`5gXlqIhKj@
z9|>%<-?~c+y=HUji{UOfyAZNYs~EOG`ijLT4j|e?F)btOMVRrCn<qp?yTF}uYTf0u
zAtK7+i>_Gz<ik>7HO7EMvC9VYi$#zSFj`DB-WH9Q>x>Lwc9B1YsdG!Et9?P^MPs25
zZ;-aa{?OGa3JPu{0DR!xBKt&tJN6h+7b%Q+F0){TvPh_ZpyL_hZ)g}=&KlK>0Ml0n
zGd*aQirICN(H=ZwIIK`;fB@4_OVlZql)Xwztl7AQQ^3to2Gx%2B`@m$Lk^Id1T)%<
zM^Io&iMl9(vAQW|Ob+uMF0ni*i9`AX82K>d9?f6(<m+A*ghKCOECbIF4Vy>GlMdsx
z8$CeIJisiemw1^F9|512n3)hC0q>W%nGk+b4^uj?j#_?=s!OfrA*wET>~w(Jb@~_X
zwdHJ}$*Qf?WYtNNRU=JSV~Hk<Og0kDetF#%FV_`-_~XW`+)K^1x<#xOT{t2b7EC@9
z0S?M2KslF)nh;G3Di@-xFU$C<QUpGi;F=I=e^O;mO@`flVs-5xx4L)tsV=W3KUiH;
za;#QP1w&B*!hEmg6dSvZ3Whq`<)Mx+M$!&Et~GY6%@P|~7$j-Cw!5e34o1OO(btTe
z&Gj`SFCm-=x1z1BRbqc28PS31p9m55>fq6%+~*kZEfKUdP#U+tsUGg7dKj61AJxOi
ze@$Q*A?NL_n0mPI<%OvV&EoMU60BHN{{#tE43$f;qcBVP0oX%5^sV!NVvDjG#&4t)
zq%aWV(mlR8TyG;cVk@l4K7DuG>j5m(Effd@=Bd*^?BFu6#XkFEr&J_83atw53Hk+N
zcs?MGmo^KScg5!exb=he`?1!wCz8`5C0sT%rU6eyZSzFi2T^`hgFIk4HrTxxIs6#e
zHt6_5^7;JKPSlrdoDezz6ql!*5G?_Pm(`pQgIb@KElfo)0v5z}F5I!9H~)iKqsjP1
z4;?#Lu%X*OwI<dub`V5IefdFo7u8T~bljq@pf*!>Wb~nwQ8EUkyQL^NmQPODNgr)h
zb^!byTomU^{knjQ1pX?gm$ID@u?ji75)QWj$-*fwmu;R9Ab-HazzsVCtII3f+7gMJ
zfurS-VEFSA8^nuHdozJ|b{C`LTZPj%FFu?ezdt@LSkA=uTnEQpkh=ClF$B6cEP%8U
zm|jrQkm67%q@3BxoN^q;^5nHO15uCzz*?~OE{`)NHKiDxI6d?Otxyz?N*cx}E#<jP
zw|AmO@^!~AaDN6xvZ!d0k!fJyxkKa5VG=$^7@^dbtv_-v7StK#^W?;LFmwn;DUgrj
z&naFze$~o+wFDmsG%>=R|9n~?r3)<>gd@~eaGl|-lxHP48pbn4G!_FX7>=GL;lKiB
z&<7ja2zhd*PiuQz)spjy)G&$uh#e}sPPzYZq_kM)@_%h6B4)stIAPPs@0*Rzb2M3f
zBxbQPt0ZEQ=V-J>VUb&pb3<`7A5SWJ$ckL5dO%tob%5mo?lCCoSzXC~v|lS4u>?tv
z_+mAT&AI?|aro2JZWx^t3Q>d3_1JLfws`-Oz4Q*(w}N<k%j|9eo<1f|@pKS{J-ZzS
zxOOaW0)K)Z;)xFYRrdsgYvm9r?Zwb-n?sHAxf36eu1VtjWpG7tUDEH<1lr6gvvF@u
z{PUP*@ILu1OzLFe-SWPffN#YRSc?v^7O6h9Y}OI%h6h&)qv4~qdhWjM7KfW194?D(
zi0L8NrF&JnuOYKwIqqh~>@Oi6rg$D~ZDokvaepT0&LU~ZJi7imTF9F_Xdy5D3N7TT
zudRi=*hC9?aVIV0n{Qgk`)MJc{*APdr%5g34c9`xk;+Hu5RPL~zB=4o3wiy|(L!FU
zTF8@cTF7r&$ZuN6Z(7LJTF9dfRgA(R?+AD=w{Og+q%~<&DhtNr)E`=~C(pGl1BAYy
z+<zI^!>(q`$7UC$qBFZc2#ji0)hNF{f$9y|Z=K*ABYM>;T*dghwOwiKT1_^3o1<(z
zTCZ$WREu_;8j`X|I_|VsDvw@c$n=x*HzLI*svu!cN=b~5sw6MEgeAZq&?*QqUn?+L
zSph5(xlU3dmlKIxPQJ+HtT3h|joit!gnwB8(lVAKHFubdBPx7P4dM|^Nw<JOz4+Bf
zw_Wf;$4B*{g;|^kB6-3{(2Ba^DgLwCxr>`W>LsVBXqb8~?ADvA71wJOm+2HY6kvXY
z@txuL(06hGL?2`7omt(m!*wMn&9$+Q7;mo7o)rjdaWo+5$I!`<f4tpg9q@LRy??Ro
zrEjd&Dzls9Yi<Jr^G9PVu}!Q-000D(S`>v3BmSLRut2-0n1Ma~C(9c9G~xm>G6W%9
z^)R*8b)Kq7>Gm9W(7t169#RBoLQxULbR?@Kn#C2k&LOa9*Ex19fRz>GF-T9`nQ5rN
z!z#-b2SXVqs>~-U8<DU>4#Ao3Ab(+!fZ)e6!h1Gb!wK|lY&nL@1Xl5NR1mErnsBIT
z3{7(k;QXw@%nb_|$CxgrFaw+~=b1l-L-k`0@o)?!R2zN%Uu3#!e!zSpCG<-hnW&0`
z|5)J_{8u<~3%|jCtS~S}Bf|#<2XI0=fIot`CtQa4BMsG-{L%<nha&eSihuD~eprgG
z@~5TB-O5UAbcP8+xA*FMaQzXkcPsVnZMc38*Y%xRv!R+4{T6ZgLh=)g(0s8U3xz=M
z%w$GH&ZNOkx$k{1rLcVuM0yZ;FFi~dCKGEpr5{=qV9snQ>&Mak6=CDqCfyL7MV5Y*
z3!;=YSGp;#9l@hwY7D?8Wq(AQv8eULKaQLhC2Qf34PG?rMb4<-eH~58%Qc!5?1w7(
zJ(d#R3h`eA+|E$~$Tta9K#pvdX!7&s!sfgGslul9#f8mxLfDMq^kPG`gFi;OYMI92
z&sI46qR5MceYdxSRPghe|GY@38h-kV-04T}AM9z(`&d+;mHu~nTz|`1TIz8<`V=3V
zj6VG@$U`*xUG<QYTLk|couhzYQzF&_kf!MOlFqv5q)Tyh!DpCWGJXJpZ=ygoT>vD_
zE2EyS(?Y@bP8DYg)HY~&b%AsZwRJVr?%c_>ZRQN??hw8!WbQuDwbN5uJ90vV;D=Tt
zg9p}S{YxW5ra=9RV}DC^T@w#Sr`ozE>g$@QuWO=yXGm5b{zd)4i(vg1_4OEW*EZ_+
zAVClQqW<8;T)i`_s%uAHx$_sbFHd4BcV2<jdo0Pjwo$)x8+Tu%m4|;(TTdzOPFwEU
zM(xgRe332quB77b*u4owdoWS_0u-!zkB#)tU|8<HTR)gK*MI&5()$JIWaS=w$DhI8
z-JQ9)D|T)|ogYl#zW_C^+=ESfFfFY-oVebdtE%69Mr!xi6dp|TEBD}PHxf@oDtEGo
z_?0r3M*{SZLY;@wvK8f}t}1ttHP^nBvw22pv;&YDq+db!zr8KeZ;OQT5~CYMRR1{^
z)iZ9u)m%5=s(%_LuS#L^ob0zXrBF?dHR{=qMQge4MWc8#Xxofx72Tt=u42++L{{{k
zg0%?c3hMmgkyRCKj)YDjp>C@v)+eo~b83`hd4%~Lno=Y!)XDZtcB59DW14!yV?Lb#
z4=gJ%EEf9Ki8Hhvaa3&t3@z5R4iqi>7M*LBBSdnTRw#~f#3p|PRfSnol`7a8ohQfb
z@g#zH%j{MZh{ijZFAR_DNmIRHE<BefrVt;0R31t!?BU}M?_QS;S^!#ynI#^Mnx2kR
zdcBp?8tDFbXa|JNxjHopxHJsAmQTqzEq*E;;4zN1V3)8!+bv&@j?A{Ul$-cdfoP?J
zOL2ucHrXioWn0dOTE$Y_eKd}%x6rP2zuV$S>Z?b1fSjW!ToA_@1D2xF1WTv^sRB7k
zxh0-**Bbg(VOi};O(hY>yWau`>16%jS<cd9=?)uxDw1b~yI|cC>jM&E4$x7(l{;7E
z>La2`wjZ3DPCqpJF!WM%1O#(Jt(Oj`5F<Kx@|u#$#ke2m&Q1E0$c1jVg720F=n~<u
zX!IJkS5^XODF?zDeANlc{>%x?oASW!4~BSVY<Xq+NSAA;5Jv=FgB#bEwx<wp0yZj_
zC#VoQf2}-CSV_R9;+=EvG|h1xON)#yIbpK%>?*ATOC%bOdl@89T?~&9eVAP4@vTI4
zc!pUPfdIuN5uN>kJLNlG{DN<LLvb+X15!t5?joAIu>V;K8ScdILrlUPvZ1J1t+NNu
zrk*)Ibvb7GtlP>Nw|{_JpW)-a*o_-$b(piYm*A)nK>=--BB>Bae-;6V#TB5NYGe=Z
zC}8!H4jAYd#T)AYo*~es*?tdQ0J^Pm6}YQPyorwEoz1*IVC9lcfXQO<N(0U{wd@R^
zWfmQh=e#9n*eqIbhNHmVWT}M&`%q#T8KJrzwj*N)Z)+>q+Oj3@4lBk7FuE{z>WT>{
zU}esMD_NOva`<qde+9R<USuMCfD=NQ*W1*{LN1wp*86XGIiMIy5te{h7&F<x9sxdz
z0S4+`xbNif#L^SSZ2@e0qCel^rk%4v#QS2vxsJuY5H>|EVQVN1K)T-n#zj&|avk~V
zI<j(?1QMT4Yg7zza(a9*b_DN=OAJjtB8zI8T7b%T)vK*7fBqZ6Ci8$y$+={)dW0Cu
zu$Aoic$1Fr4+-c118A33Setiy&Sw(`KY@YuVbNMksDT*o1eSjE<&3_Z!k4r4Ury0B
z4OabNG5GGg#s1*?p(K4J;A3bP0VEwN0K_IHiOCyArch9P0=O;jMR$_uf*qT%S)vCL
z&kuS=u>)jCe`13$1L&}xx{urHKJK|wKTk|eiK45R_Oys?sUo(M5wX3bh|Tvq1s4+h
zb>CD)5M|w4dc=c04FgyC!c~W7`a$HC!C4g{0ST78%efO_A9@J)@8$A_rseWBTcbMn
zTa)?^v4=Sa!d?gHr>Iz9Ik4jgLEJ~O)-Zx(r;A=`e}SGLa@X0~;@>_}Dpu?8kX*^o
z`}RWE_q!1{9KBGW;V0%uwI%1o)rlcu<JK5$hiHnO6*DMW9hM9Iz#Vb+E{qHK$e{T^
zPaJ~nh1uskTrV!tIZ)(a??98y$NV?|Dk*jo@8n+o8>_sekN?wBzPtMO)$+Ihj%sE9
zhLWW#e}G^I7Oay|whZDvc5iRHY>W^{agps-gn;9%tuY&kGFcwBAJ;azy&VB1a`L3&
zSzK&#P&Fp7yd8yqK1|At9}+M5v*Wmi4+#Aa>>Ntb9!+fSwY-ZM-<x<4*IQfH>_XJa
zr|MN)-v!op!QQ}oK#8v9L5H8h&07y=mYv2Wf1e&`W6#ozr|b~kAM&YZCvkzp11@bE
zhwMlo2YVgAJ~~KRaN4B<biXld<A}Y5@`+`9)*3y7^>i6cGDv3<Z{d=V1|P*JigyY+
z!fk5u@w4Pqizk_hr3TW|C}hRFIZM2fPomk8*K%$|Y1vB&b-3g(hYJB*F(mj=VS{ng
zf8Vy=-rjPh^T$^EAmawTr=+gpjN+6<nhK-GSN-iRC0C1?$>Th^e#T;rhw*w*GRSe@
zdCS!Y!;k*$Ev!mFi~J=EEws(fb>G9>V29jB{$IUbPg}6xT0nc>mJT$mMWe6|{s^wv
zv)14sqo+7qs=;^;tU7cm?~9lOoyEKQe?iQX{DzS~Bc@6zQ!;*IOPa&RaN~INc3JAa
zQ}&E~%-H^)upWC2QcW>h4(D52Z*FgI(7f*)U4LN-!hPSSNqyJK(<r=NT(Ore*!<=y
zJ{WJ~eaWNAGG4RvW@o&Eev7E-FQe@M+J4D--PSv<o_yRA4<s`(W1m|fAH8Jff9w@&
zvp$=#$LyHhM4HQ+gI+@Z?MeA}I<N!ld~9|soL#GoivYx6W3%FUt}+PPJitEcZ*6^K
zZ;Eqdbd1j`YvN{DlK}+;AZ2PlY|WQ%IL2Ifb+m^j>Sba~7CIKv!<-Myt~)ifN})Qw
zDbOG^hHh%l&5=Evk(-3?LiMchf68^tj>`)Fe(H41p@sMEzv1>>J9L6j-j3i0J>Wz&
z<n5MG`*0m%8f0whdfju8r4IV&jm#l`_zXP^laGFZ>4={ofL>Zc$D}tk_R9TyVYYee
z4UN4~Zvy4|7pr}32QO#if#vuTFz|8e$;eMV7$j~NY$*|0H4XpjHG8#Qf92aue7TvB
z`bIHQ9@Ndy^rkf`0HEE8<@JULW)qm(74v2o<&pcj%tK}YHwyEpP7-e`F_-Onx6$jY
zsIu^oI+rc;KcmjVpD=jC_`;z4!chFu0K8XyhT{fB7;>rbLtzD7&m|!d-s^<;ZSpWV
zGrM*OOGB^YGj)}V<+@<ve<&d$Q~nTkr#>*a@NVq6<O`kis_S-WgU@@{LI1@33Q@KT
zDPUjp{$G20d+-XKeTZ5a^EXI%0-$*M4(|kc6eu55n(#a@`{_q*9$_y1nDdC~r{rm5
zDkB%qeRAwbKjj{a-ArMcW>=|vd#{2nq!<~gjAPQ$uefhj`e|oi5@srChxQP-+4N)E
z@c|xcU-)yE?ynFefBu$rLeIx<FpwYAgt>3;)dekL?8+VAFX(ifF5=f~_pOqcsV`EO
z8F=9^#`u3#cFbs|iRaYP@2;&GZjkB6Qo|8HKRRkW-QLC8XvL=yCwlE!ed{KEZgG4V
zja@H^$@qdc{a?gR3>e*oqB8tlx(a;FqZ6b)umf{wcSPU<e|`|nA88AIBH!<{oZ{Z@
z_Fl8Z`a??a((jb^i9PMLE;X|aTr&Wv?ey@62gxJ%C%o;N__xo0hWN(`hF$|NfCdcE
zC!0PS)4TC_XvN=tqGw(=v>lhOdQ{Z!*ftO+x*TmcD>b?rI~IKeoBqHJU|z%xhThZK
zra$06c87k0e-7QZh4k9Cy*B;$E(-5_C~Xg<(_V-y9b6;OqOP?)>`>ds4q}BJo34iT
zHA(qH_habM)yU*e++NR$M}`6&NG2vq*PSs!uj9>tR8b{9&<T3v^S^!>HW!bV_31CN
zLnw`R@gIo8^mBuM2j&p#=-LFS?nhW`*wL=zmp{X{e^l<-B>4mMuBir#j}%i5xgPiK
z!&~?q9ilZ0#a+!B+BY_p9*!uoZ=3$&O2&&|7~<qwHyvw8kxauO-uFzTns{Mj2u9aK
zJu8eFNKhG98P<$^8vX!sdw9O6_2l4t0k+>4)6?%ppzB***w63+U~p~YM}3;&{*Y#)
zKcc@le`?r~#sk73SoiJ(5n^D{YaY9@ZIU8oVEWhAkUze`)&?EA;q?v1*VvzdA5hsK
zz&pD$u>0;ub41sKGPc$6u^Yg0yEOF}4%r*+(3OpUu}dHEpE)tb565D0C6EX2qS4Y#
z0F(=pi_=?oXw&Z}{G*@-T%&U;?!^37)XfnZe}9_dcTB&@T7ATxkKxe9p26A~(QI71
z!H^(~wchaGfOJWg&y_^O+1SNU%y9WBwD|?0?a-dY=sp}y5K=>TDCU!646Y4<kif)W
z1M}pF%Wy0QV-t??XLJz^O+>#D;pfQyY$A$*9MpHaZGOd<{>W9RkW(cza2kZq4$OWn
zf3RSq@XLelkUz2G!a!B<$0Eo%AY9<k9h)B7bnV+%5BK1Ofg+&Y4o58vpFsHIeuh6|
zpvL_%zwl|rjbU<Wo%0KuFm>E9Z>Y+#<pKp1P=d{#3J%8cG{X)5%cpld^l4;ccWQZ`
zLJOmg@*97^aT<6lObf^1$hkd!Ax@L{e@)=FLnH)aisU^G$73R<V@}2JN0LswjzBe@
z1p|T-V&f+o|0j<9WUB%gM%92o$<dHDH?C0}&*+!d4Ah2y-L@-s1H24+9&C}Yxgz=X
z!Zwu;sk~31fWPzuP&DaxV2v!g;Li~NKyqO0)V2@Iuq}RvKx(h~HL#s@fqe(rf7=F1
zIOCTgZe)^T`Yt_%X(V|2<6-Drmwno`{7*glJLFnfsr?P97gHOhZ!Ks5!^3|Qm<{(6
z#M^-O(10)pg$dqj;8MQ=TAo3G8(k230e?3oT8%7vG#_x|MmM1Ya34mu6Aq?Ho9~ko
zYv^|PSV3U6Ia*Bka+naVPi#Lle}`o`@lznoQDsxUMyB>Pg7n66J*@j?G%Rzxym3Dw
zUf)QRobkmm<6FjO==l}rExN6~U+fQyz*>Z*{eD;X0ry<weIp~mR=>xYjX|s5<zJ04
zpIoDfQ8)T+yxy(V)!cIZ(O1th-S0=|_0T#`iAtj{Jhy<^;DKe|*P^7Smj|^FV}G;5
z0kBCYN9oV1tk7hIt~H_3BPatG<+c@=g?DGCe>m_*e)5NNZh3%(Z^QOa)=WOt9vBem
z$O1XL!$ZeoQi3~2cg+heG=N>SAHpu^J#zzCo*4OnY3Jfl0{!MSw#34bhclYg^gSK3
zvT8<7G^1(UWY+>Akg87?`mj2Hk_S6nHlTi6yqEB`5EliXtLQ=XmkhQLA%BfUi-J#5
z7K#HlSB}|<MDw$len_FkN`J!{ds};}zppNVZA6oC{&>I=#|`L>MWIA4-n=?3bP~xL
zY&8Ok>jrw^oo{V0_tcRZbp+$7SSC#ANsmHHnVtny5|<fp2LrZ2Wnx4f(<%5MLl0-z
zXU`hB6AL4%lqi8|e}>7Mk$--}ZZgeH-Ym~`mr<mRqMgk<QLa5L0O`~3xOjX<0fa$T
zKOdWpQAght?9+$V`k;6HsTd~DipToL_v*Z?1`VM4=ebo3d0==lT|tB=vlSj-K4Czv
zX~IC9kdQ2Bts59u*XrVtq`mA!vVY9GVAIKEu(a3*z83aP*wD?EhJR?M@l!!xF;?bQ
z%8UKAc?NT5Y;=Zuh$wO_dXGL1nSvj&ARiyae#~@tEEn&BnK@|>p5ynNa^xfxSWRXe
zfxFk)jozCT`!hE0A=~j5INA=HIiaeh3>_^ye3QqWFc2}`xkZwg;%H`N=zkGAOXi>^
z(^g_#^oUC-wOZQiCx1`1gS)1)=u$QdV2Cl8(2Z|YYm58FZzmFz$QP5h+4s+*4}cfr
zBPn#l(HQ7F&uPMk>&fAIGSem#05Tkgb73q83o>$Kulf>*7ez*b|BQQqCbE#oCE%Mt
zuRmF~ef*WMhphmX?AYqqJsXph{AsXflKjv-tm@LSMCL+~a(~+k0^pavVDF*@lR*z$
z$~PE3umO?`Y(p2DMzp1fwc=n16I*5D)5>Eb!3pFAu*KG2WrNf9FLHv@Dxql|HDm6I
z6d{fXqI&c*=E)UaW+JZbWDnZ8(O<*m^xZ>4puWbf|7!*?RSbAwnscLmro)-Ow>(lv
z+>M{BE{$aB>3<VmV;<l6XAR=~<<l=X06d?x1E`ZnC4~v>zuAEOu_s@Ka{90+YHZXs
zb{F@ltA8yhY-z)08jC-T*uQ!Ru^+vC(AVb@44j%h-GqUCBiW<==_bXWM#T?-RyG=q
zdKGZxq*b-5yR4rV1)S1>^bhrCcApyyV#La>J+Wa+cz*_b(g{Y+es14b-Qq6R`#P8X
zMOS3*O376n#3T)%j+Yc>`2rDqf5XVss|eU5Z);0?+UdBV6BM4ALkuRFjOR?cmcq$V
zLHo|RlP)8xSg6W`RBwe@0b*USwUx20_co5Yy<F^_i?&{nQ0gNdq51u#W_CK|HXkVn
zZHn_H(0_&a=1REbmr=|~w{naC6gjsZ&So*OH5%3J`z=DZ9qmU?yIs^M<ZVgrNXFQ-
zbdwibY_RgSSGM=sBnIXJ55gt>tZUo~2BPHctyV5;5AVh4$?KmsZGC7v*P`e_|EQRF
z0Gt=^4^O@4eOLWH5H_FLv`XgtNKwMSP?W)Mzn3Pu5F`PTmrJ@3Toka)$R*@b5NF-)
zUQr$v<sMy;SmKwvx)2@{Ta8c^tV^cbfxnigEpl>?zQsD1?79#rf34=kw1>Dzh~i*o
z8Z{1ySz7LKmSIy~%Y>u&sR4+0#RTI3&r)oI@#s-NdF@n!_1o7cSkGdD^_w7A8cQEy
zr6`vqKw<&M^hm7a_(7qd>-r{iPkyjie(?2dC4G8F^ywL%Cw_!~FZ0!7@4lFNEIa$p
zf!RUh$bd-#xPj(?e?;)dz|_{NJCzD_{BtgC9r^vp1@hoaE1^mCOnrsEytt17!l>n{
z7JkW5ExcH%TG)@Gy-aN1hDCYr!E&{FwNhasX@{VAY`xHXR|+U#2b1^HMtb;%4{pUw
z0y7814PJUc3MgRx0A9#GDzxT(98<ji{_h)8oEHD5)&_Z@e>H#7*BFd@KC!LoGxrAl
zF)D?|F8m*jWOGshk4*&dylZH$Y7HoMSgq(-96qb>=r#DMHO}c7UKJ`n{GnU;tu@Nx
zvP^fMN0oA;aagSvpr!)-)EfR?p;n3hU&gy~t#V#((%VAgv&MQh=8Hr#IW$5+XXTvj
zPwUuT2dzWqf1MjZN(QtI{(45OBEJ6@YUg^D+;5dpR=1(Y^@_gtvR>`zO&C_Stk(-w
zy;jzD^?F&~hCgtpSK;sOu)M7|%hhV9tT*62Ji^CVU=RM`BYLo{Z{s7VrH)^~;PHz(
zJf*7ZdKLacQN5{S^H7Vv_j$Af-!}Co)?KKS^&M&hfBr(Na8=hEoeFlRiLDlR%T*u0
zZ5G56ELfm|1^l)SJ=AyfU6=@b+tIfRbP<0rfu~Rw`qh**;;&Bw<1OL8Y{RwBqcZfj
z(A0N3<tlU+z_nejQJE%QR{1>uunJwT4>{cQT8BVW!||7E(AO#ystTCE=KwUi!tww$
zo#uphf0<W?!z*Jsgm(d9UZdaUuv~3GxvD^*Gqi5jtcm5gUCcs0w8yDO5t=lr+j|=E
zC1iW^d#nFRp&Gv`RO8pbIo0^_4pigU;+#W>J9*rff@~kwxAkhX0;_);|F7KD8i()~
zCV989w-ddn5h*#8kKwkUTsIDDQAzojs)E12JmaaM=U&4k3x_j)%L6!Rjdi2|D`_0o
zn|h_ugj(^gpxj}10n=*wUb9h;Ur^hJ@-b1m=o&wXN=A?QCznaS5Fvj}G^#uByQ4QN
z2%);ZQ{CM@tO8kSZbLcfN);dmE2Yw?LOGy5+q+n-+Su8~YAUt8T^vlUSqDN6%W1E=
zjn!6a6(H4hy}7-&N6qZ)!it2|zs<*9--bmC6s@^iquRIY+elSw+s!Jr3cY9+>OkeF
zH#>TLrw$;5>UL^X>ivIi73Q^}Z}06;vpYM@T?AaUS%(?NfmaCR+m$_N2PkS|mjGMe
zY1FV?c;3YCv0I1G?#@o7N%im6fS}a$ZG;N^R<^gd@%dhL2fJ6TRcXR&)$Im#e+PyE
z_t*%GZFjFO@1UyYAzi~h1|8hnYu0#&nz)7Ojb^h+GhMCHbO3*t53xU0Xb)#&x5oR^
z00aQ2*LHRq*dIP?FwUJ_=m=232CfJkFOH|8SL(YoJ+;bigO9Vii{Rg`Huer{K!CR!
zJA8VoG#%SDSel3w)g8pL2w~pS-`@oeK}Rap!x|7?m`u9CA=G!MM@<-5bywf5B9a4r
ztu}XX#%j%7n$dsy4&u=^;18ei-979f%tRe)fgbHtVDUDvhXlk%qe>%c)Bw>CjCB|p
z-0uJ?&`ej5MZlRxMBD>}+G|k#O~3@`M|Bqv5iw@Bvdi(c0tmVb-_@zzW*spG`n8MS
zLA!Nq2N1Z{pmu72dW1nuY!_y}g70A>w|T!RdkyOM_FjL5Fn70#paG1m@^Lk5h!Vio
z?D28$)DaGV0Cil_yLxS}Q9lH@?d>#a;&=Hx6OwH2?8zIBKk&DP6NAHp?!#xzdaaIN
zY!FQW#NDnDJ5s9w*x~u!UY(|4Z*PYXzq!Z1+uMVQ$6;X$r^>X(RHgZJ8#gw(jhxV+
zh2{o?W}AOtzTJ2UklcF@4|brDJ-u4xeLbxM^R{!!3&PlT8}F(3W{t~@_UBgrM`fd}
zDjRL}Z@$r1?y%8Ti*vh6p2|J@=EH|mb7pxTs+vfQ$epJ&dRnO7VIKzJ$=C8lD;cpv
zm{iG@J43%*=bQe&+7<lYA}>9p2Axjy_`)7pWi)>a(iSV&boC2FwlbcRE@Ry*_&-&0
z)y9@X(kS_$Ebi2;axDeSl^sr3b3QP~R$f7|V$?pWfYcbRC7?LS{=?!hkze6lOC9-e
z{D&M&A%0#He{pUrWqM10>&U?aL8<MTK$*4+^arb`(q%b*DBhqH1DACBdDVJXSv>6T
z9&CS|@KtSh01LgoJE6ZX@#%Yfy0We{kZ1r2q`hz(=3d{~o$LVh0zSWnJpB$35n}1L
zK?JJTKxC+HPe634eHO<eoMhBmeI?Rgzpjvs`rn*nH10q$>c#n=NF7F|f1O$crp9gz
z<R+VJW>mKs&nI20vH|z7tTq{b_0F*a-_U<304jPvzj4qKcCixsmPutjjyBXNY`lY7
zby95(%C+kI>NZD;6~rb1opsd4+U=RWYA$B?m%#|B1dbR6>kW(lir`dQF<KlBauTp?
zcT8B-s2_koVzI;GhNaN~aTW*${DE~)D<EG5ayFFO1(sn5FLzMjt?imzy&%5^ju3x@
zB9w!7#UFZJz-RETHiV^yECTQeyC^{?KS#kEg!XE+1CshKit7z%d1tST^rW%}l%z%-
zCaGOeC*CMN*%N={I8Z#_jwZ6Y)7jps=E>yhx^A}m4esx<ovTpv12YJ@VFIBZH%lPg
z+ZQRi1D>2)JACu%?dkEw@sVaM(_4QxnMjE4Nc{C!O8FTj(}r$RzH9CH?Cj0is#<?v
zU#mzD9MyUD?)B@F*DsdWSzBMH7dpb<gV%Zf?)>fX>!VdY{ds+@e(2+l%lj(yu!eF{
zxmd9NUhY(lO@Lb<BJpzt`TnL#^$G<tp!2%<*!6AlE7v@0NT>Z#Scp@r7Z`ud3PvA5
zv{1{MZE|PBctGyhs4$EO13#+S;BKOtdPPQ;;I8827>7Y?H1#<TmlX(m8c)!_W<|nJ
zL)Ut=@CuzHD=_V$pD<Od|HsKQP)t9j4mDB_dB5aSe$23&bIh=}&Vtd>p?426>rdG6
zuRT@J09sng=8n(qMrHZr=9qteZA<j6?@A1CWa+$JAzO7kO^Z92$=uUa%^tJ)0QLt%
zdxAN|pTyZMbhy{;ZfUWxKb9~o6ed7;A03QP*y;t-estSL0S$~q<@YplQ+kbw%++3R
z+~ai?k$K%e3mx8l>UwVK_NDphH|rH<b6;+wnX$Hc%I1OV4g-5kW@CSjc;9^*aC04n
z9o_lrhuIS=KFr=pTi={ncmfFc05Dx{d&A$$18iwu1Dq^ngqBt~a?Jb|dTjfH_?|C5
zehp~1#9SwNx;?R0oo-J8Jl)3OmDt4j0vk=wbps5W!-;yDp7W<jsx^#PMw@`9?i#gx
z3SLvm^2E!M<%yF+mN9=CwnCb1dHQZDr|+(6R)lFLM&=F9BSsi|pzZimG|VS|Xdb~N
zV@YV9Vri9TIo4ENt-)tlsjsamB9B)3LT2dwUtp2)V`9V1^I-TXelHAgTCl(}rZ^ut
z!b>BoD5p#-VTvUTcHkj;wZ3)>9<7#wDS?yIfzQD6`+dWO&dF2uojbMf$WqQ7Y;1Oc
z9)u3Ju`##>4chF)4UJ$cL;TS}Dm8~c_*vtl{^KuY`;Ym&aUtapN)>5v%g7+idk{_w
zuP|tWw0@6i=fwW{w9|}eC$yI@#t<JE78GBwf+)+sDXp_0T2H%E_Ctk&L<6-Zw`Rr=
z0s((FuX56{J5WNLil><PO~q#jU^eO9$zDz6cVa|Y&G+!9g2hQjBIUf$O1HaZuSvSi
zn9VVAVKy=@%~5dE<KfUA`?k+l+M6iksU@DPVNeHlw`(~9$-6m7-disu0|Eb<Lh{!X
zH$kLgVyFh@7`v9n(SULY^~Fj7N*zmja#(*>x=KoRX~`848`ZP7x6T8E)Vqs!+98)@
zawxzWNiW5(48A_UGLHF`!BSaorJ$FV@^A)n1iTb;FkZ<Vw23bmlb|-rmdvG0rq|_$
z;gUWH(t&PSJfb80oSHK?4CGeHS9L#URgdl{V?}b68*>;Bl&LuU5yrl{>ODOk>oR{a
zDZyRSxEJ@7n%sv;P4^U;hBJvh$o%>%1SfN?;Pl0$rb(C0p}vIFlv=@)ufKw4@d}=-
zmpC>QH@=*#abHJ;$!sNsn4<Xbfyl%R#fLWhJI)s$KCBcUrhlUN(7&%Q!{q!cI&i~2
znB%%V2{(0T{u3RtUp~a8dU71QRA+x*4yC&zn_O=I?8&)wo}S!nQv5n9e$jG@yE_<Q
zk4;`B*lcmgXo*9{BO7R6aAv`>^@H=V)scs7;!Q!k()gL&^I>@N%5^aEY@#qeFNhaf
z`k2j%)4$?JJOM1QXp=Y4%VwokgHAq$%bnew>MmTLQoQ2HQ<cUYavCQi+uVQN20vJ_
zuNo0NnF>wXIykKgEEk>?C@Aea-v|57ci)w~OXsR(!5_JTJcX{Eh}`VSoI+MfMmNHK
zsC4j1reBrB7ws#ogFG5LqoUF)kYRdQ%Of5EuqleeCGMx59f<2i$*?fTJA9%v{91HW
z3mx7{S9>Hgk)Bhi^sOy~)gvhwD!<nOb14w{6|kz}jrL#vC7%Kn6l36H?|JShIo7v;
zdBFgrfx-o}mki1f8h@3;Feoe-dXVXV{NbFaQO4kvD8uLr6B{q^D6KvZTQ)E!R>3S}
zhEXh`rfA?|R4}ERXLmD`;h<2BWe(IEW4-_+N~Sm8&&mEON`TO<*wOGF`+%Qb%ahW}
zs*;#HeQEmf{5Fn6BvBYJU`R=i@rpa1=B8Mecnbr>oO#(SntzjzO1rcwfQ@<0f1dLn
zKnJD#^C*3%z)KO+Jx&X(E+Hto&%vLuM3MmnxD65vi1RVKtX!o)V;cX0Qs`}MQEqH#
zD#W<e0B4>%J9<KrS&3<{%rSj%d#jyW{M#ICcX$I&<@AeBp8R+5z<6iho|J&b9vHi~
z)$QAQtpt~cLw|ELwz?&rg6#1V9jy+an$%DioO}4Km2b$E#!lGp1=0GUdJvSWMg`SV
z)qM{L7-q$FF1>Q~N<mpKB4v})qBPACdGIbR9&T0!+cjk@8;qGup?5*9v^>Wg0^4+Q
zgmJe`|J3H%CFtW6xPF+8r#w=l#;zn91BN&hHDvNE_kU0em@vzmkjC!Z4ZV&$>zQX>
z7@9`xIj%&^OUx$k{u)T-jO}HjCrZY}$s3Wi!0zGxAQCFZTzH4F0tsHNs699BA&3=7
z9pzVazKHR(3KY947+8g#i(tlJi9C8$K}l{2Sd1>;lgByGo-d^B5bC6?j{e~T&N(5!
zuqE;U+JCfR2Q8qGK-4Dau&j;Dn+wywK9V88VE26|D&Yvz4Tly!eTJLhejC#a?Jr{-
z?ohSVE6QjafQFNi2ue#a!eN)_xbV}b5M|zo>hSriL-8>%`8chowsZYsXbpMVJL(T+
z+so^8hJCq1m!(0@#Q=Idz&s3j!{~Y#vc?RK9e)bmpgcL3(2O6Q0mtu-j;x_MOGCi!
z4lT6q_1;>Z?RM2CGB5-Oh5!PE5FZYcpF~fTPlBlXc>wy!vc^^pZ0<67NK56byf)q(
zp4}Pvq}3w@G>*p&gIwUtCp@fO8gr6wFDTNv2NKxu1P?nVJds0Qne(uXdu-cM3MMDZ
ze}Cq>0jz9u{MMp~@xUoO3o%~-y;n$H-2HKFJgG(Bjd_Ad@)ZT*3+=1{VeN~;kh=MB
z@VOoDr^Lude6hhgmJxcFjocHffPN2UR*Ug4>_dO~2F7oqcRkDMLL-SWD)8g4GN5~Z
z_IxdRySV2ekGUShEq^t+!X+55$FL2|%zsbTOrca={K7wqMo&-U38Jhghj~4sH_yW%
z+M^-`h$&9`%?s0i6{0qHXcKaF2BC9}2ZdC&bM5weCooO6Ih5THPhXig@(FSUCdx84
zC7+mhJ>WrCBk425w}I&o&M}e5=0Ja6RabQUxVGf++hOR(ucoFQP|K9;!ga54EPv61
zcA`)5R{>@zu)5Fg^7<KqS%5Jy&0eUiuoZ~26lh${`W*0k16ur-!i`XE8Px6t6wDSA
zL^WEz3T4Vjllv|gl#;@1xSdgF^2tyx8Cyk9H{WBD1S2_u7iM5h&Dom%_jxJN*{Fu3
z5@t?X0&!xmEqMLESnUDKbZ-3w&VNPr<H<|X1}mzW&tFG1^J0x^MwMQF;a#Gpm=^`G
zvbc<~N@tR%ElKG~P)Ouj16$^Jzr12@3r{>-kE;79CE!5qmMw+Y{YOO?PYP_^0dcEX
zD(PL<u@E{Y4{PP{^tdJV2;gT5cs&AWmiDpY(!LNd!qVKwhP+m|fDu6LGk=mwT&~k;
zK?@ul7=25eTa}`c&~d-SRXE;4O8usi^L_HuhB}_E#YODUv;Hzg&-=u&2jR!<t(bba
z_#`iWN+>EmZLX;J{LfKTd{z||zvl|{Ag<C$gzFqp(nY{Qm;$npIS+sY(V8f+S_zh$
zcUie&Cj3-!VI+$^s!}1p<$q$K5PqOg(p1R=+SUm@jF@skhAbe8_f!SASrm%yL2L3D
zD2N^tsQbqBbjNHi^57ZyhWELj&EkW5*Es|XxHeE$^lY;{G~3otGbp=M848CvM%iv}
zd9H}y1D-dSWIl5|G;GWy=@`#=GR>l0V%VVTTSiYt1$`O@?sK;j`hO?<kRsb&@ET16
z6l2(f7;>#h+h94Ekm23g$)PlUC=N<Frt-^kU`#HSkLy@|q#cF8l0t)4o_B6=oCR(6
z3?wW9bzIz~Yi?(wt`UxFJTUGTIcdUR!rK^2xVkbDCvYJv<8KDK-Cb;SI2ARxI^Zb@
zS1X&GyebA6z0w`~(0^Rnhhw3GB-4&{5TNcPw3c`6Ok-tdgkjB+PUPZL+TtciS=?kR
zIsv4{<?OR4^ARE(0^k7c*19u8`-LY!G71+1+b?k9gn3a!9v9$ZU~N9q_~DT^dKLzO
z>s$b2C@DEU(vU{*OCu57y~IK!#0%EJ&3c&ll%CL+bd|s8s(;)ffK7hIgS$$74-f8s
zgzIW;XRiU*KjZV}PE$?sHBllXO#bGP5hfc&Mwt8zSO~)gzS>fwzXd0{_YM#&jxeVN
zlbqDP?y(|`r_Lsg4Gl7(4&RvbB<^TO*+?5o@>kM~GHX1Xw9AYPHe-EvY~b1Vtl6bj
zuT(Uc8P+zteSa%<v(zf_CmCx^ZG3~r%mCQpq~7vxZ;O6w4oG`Bsq1Kci7w`?%2i8~
zHyWGN@#RsxC05~ed@BoZhoV*uUh+%%0xhsxb$E;y8gY)3W{#a#W4-mJ-HmNM{6h@F
zNv2<DxEq<)U@K$?hF%K1jEk)e^oy6JVo67LZ6wyfWq%O^_R1Q$#k9FfbRq&s2k>Ej
z1RRzzyhPJD#7$p;QMMF3iMa|b{)WRUw>%%FQkI66SCSkupq#Z}ASf=)J~8<b$v<Be
zZo+yMk(b#{7a0#%*b~Qoh%Tnaa{$MZ##sSy*x_XinyalXyO_s!Oe&ZGsEy{<F<Jq~
zmH3$Pet#vN<?J>}T`CTW+TurQeah37HD=!YitwW4C2eUvX?jYNqooYHq2Pi^^e@Ry
z@q4vH;>klhV`e=@)7?QA2xAZb<KCA_xA0Ew6x}bl75X;cv>Fw4quTpAI*r{s=rne|
z=``-8)0kO*ADzZ5Na{3pxlUt8s4`}bys%WAhJSdxkxpappQF>*Q*;_LZ$s9mYnwy2
ze;CDXP{J)_96rz_--OQ%;l<ymVAux~$vHor09`<$zaP$lJiLt*uYxfiQjgLuQN#!}
zE0rrUAD`J-wqoYxvlS?42-OWK42ZFC9Uy|lQb?}DY|R2yQKM<3sBv2+Dr$WAsa{D=
z;t=oy4+wvfPEl@&;nHN69&?zxd~-HmBYl_Z3x_K<a$+gCPbsY*S8l-KbtyaiELY%O
z5@-Ong17eA8Ukf3oH*k!$g%2HbT~=P4fRjmX@K~})61k*!pUI+wj(7&j_~&?X)JH+
z39QTUg!z#EK%yQS;lUn`4%vI4aXv`6(fHjEbHRV(nP3iE6Hyr-xNYt)CJ6Q-Pn>oy
zmMK)YziiZ~%1RM<LcSey7i-#cXC?}VjooHb*>h*^SJ`uC{^on`Ec~|T-fz$C{Ehb9
zVPelE{D2)clv{02UUU+BZg1l~S0MI3Vb2vq6?<-Xb*>qnZ`NzU1Z0l~5@!g@_K}&X
zAG&|z*@X*)X54m7ugl1{(g;ZJHJ;_@uFNG0WAj*Xf`V^ttNTdfJChx2+ViTb=2n*^
zihdj_#&uq~FxpcKuyjR*+yHSl$bsSHagmN=HaYg#IPZEaUoMHIG3%<}fq`%@lSS#i
z`PqfrIoB1T$J`3n%dwXieQ#B|-E<r<MI(PfNizt#;}s`em)e^SKZK%$ZjoA;X{RO-
znRClRBidKolSaF``vfcxEn)}jqg<q2$d-HTC?36(;s)a==0+Wiee=j)PUxPNrtkV<
z3ACHs2`|<GMNMz)B}aXka}T*y-J$LR^Bd1>X>IX!%6>~#_J4ue!f|)w+VGa!|5JZ9
z(S^Y4_J-1qi1Bd<l+&2U-sff*xUfp>?jd>Jizp5a3JeF^@@SlRUYE~<(C06dND`LQ
zjlw|GS4EclvcCA#%cy=Tlv9L<+*8Ud&&11v*DZg4krCjY)KWvpyiNqfsO9U>&+?>2
z0neTtltmmmjYVMxC`N--=Fta8M!kPPqe$Q+N9brcwgX_oJ|j65K^%=aN^*VA1$H(a
zUV)0}L+nIGAm#5yrtQ$A(oxlls)n{7yydZv&k6K;TsBj8wlI}guqd46x~2|g!Oa>=
z7Z=SrF0PL?$&zM@w>S~0<$*kt0XTC*XIhs5@Pw!C)bbADeX(@4By8m@$Acw&*4`+1
zqR-=<4D{>mINnJi->Ew~YvEy6*6bS2gSU%lPk3mIm$lXqGJpB{*m5fdk4taq2!$3!
zlvpe_&IHXVb~3Hh1EWaZKY*jPBp$}H&PO}T7oK{m_f7#b5<B{x1|YV;)ibbaG*NYL
zilw5g5-3bDU@~|x?(p(DNhx^NRno9b@Kj@a7af3SGxDdMO;lyeRHY7)d+s08@BZ-r
z(}I8B7cc+&hnHs85Dr<VU7#PcS+S&}gC~$TpdyZLb^Ded6A@_2?c#&X>Jh$5cGs{N
zPlt8V^)U`x%HdH7WuQ-iq~JOHl9g!b6FlEd`bTmvP3i`!b(9qi05t;;w%Z|y1+BOU
zm(AA@7=Mi#H&IF^q)fcZ&y9+<3;PbI21^#M;Nc&>MB)XD73UC&wy=4#7|2g03N|H!
zUU;p<V3Zgaag>2e>#CF+97{2$3$pvfW&?Q}h2L4)?SSYH2-2`so}<FCUT@T4Ua#T0
zUf;o$al==}wYoAczK$C5)g9E3Z@#G^@27@*`hPc4L!KtpkgvEJ@{QC!9?FZS2{q*5
z=4!}`e~udRLRCYav~pr9L4RqVIzn>pwE+5x4syQ8(LpM)05di;IXeYm^`k0O!s%hO
zj%bO&`f_p*0~S`$Dw-`fxv=)JI$p8gGWps<kXZmIAE}%?$yvnf%EKPmsdW{|b>&9u
z%74vWSDsi`_F}Oh0ugQB1T_OF1cqJ13yhBdw>EBxS(Z8AVCH0j_I|QoWhi|K79jbJ
zgWpiy;v1hki91ZhG~^X5FtkCUQXv)ZMWO5)l~wKFqKPZetR&OTc&jizyuA`_!)<Vd
zZ7=vTa$AX@3Y<K*tRn3^(j_|;d?yYY<$o>NL6s;`g5gVwkt@?dD5+}#)4whQYfqVm
z%6`~^@%V+rQ;p%+#jCh%>~>Be($%~XE3-x{ZJbmEc}>%c6%D5(-@LREOB)r5mhzgF
zIhd9<3|Q}2)8gy~)*!I5LyF(VF@>r_l|h+Kqs!eoFebu?)9@Iv!-l;;%`|@WW`E3m
z3g((Myw=TO-}OLVAE94>*Vipf=jmHIz8hlh8&WXiU6=gpQC)3lr^nAP#A8v2R@GZ%
z+7S*IiU6R}pF!F46U35K=_&fzB5_X?eEs6|_`~th3t8Gk8}Hx@UD4ouRj>5Wr8m_}
zp$>oomw`KOH7l%ukzeV8M}DPCvVU@DHLp?~k-8Iv5{5Q?W(8A_!71&JkBy4*pIvu!
z;XbzmOmcPhE<GOHYB22QE2v`l1~+AOWN*)opC6ym$j(zAhK^$)t^@1%%o47AzHDOw
zf<`c~oD56u><co6gf3pdit(<xd@&ManhaX{4Q`sVt*u;w$ZiZxAwW04ntvu9%u19H
z=><k_#jV0{c@Ar|I6+cqqE8+w3dkgqlcvgk93;=?jV8k30b`rfP3WQfJ&;Tvo!zlz
zR;?go=eE)hB@y&nbJQ232V>{VLO#gpTTgqisU3Ol7$@0)Z4g-Zp*iN!`{0&ix79_f
z1!3QTVH}>jNb2EP54~8PI)66zi<JKC2BvMISHA;(7*WzD_d85r0+*zyJhJ+pWf{s7
znYXV>o0g0=to^H7$Ny<ir6UrfXcTdnKcP^{)f!#@BC?}6t~Wv_&Zz3>v(QqWK9`^G
zCZEY_+7v!wgy(>VDK!yuqt1Gmx5hgq6G?!Xngh0u>fvk4d&w)5w}0a0g2wq$w*1Tj
zR@8PWChN$&A=tqewnJBXogs4E4JwU|phDCv3zX{iDyT%S&S|^}0Fz;kG<-Ki1e-g7
zu_C}Is^uYpRmj#vBa!76P&o|p3Lwe_=-70gI$eS!RgTNx1#S#vZ?D9^Ua%0v#18yR
z#y#$kde#Oq{u`8#*E7E^_E*K9=G)=acDn9V2a0?=p+G2pfE1#r5lBWZW*X|1nDU|c
z!lRd~K3a&?-EHLuB$trf5Fvl6v2mL)TUB6;Tj6&e*7FRt^B6;cAaI6^c8O=n`p*7A
z^xOsl&e8lJEU)>hY#QNrsI2L%sGpONR0Dij9dyd;zJn$@(1gbWd+P$}T3nPWR!h+v
z+$%NJkR6>9qPMhz#;=3a>(3{E!8dWO3v_(UiX8WxlYkUsxdW)+S!{n^A3!LK^=?ZP
zRYDJrgyOk5vWKu>ebe#FzUA3HEsucYXu4+~^y?qlQpSsH5NzS+V))Xy0<G$4=jldI
z!hjwO7EC*;7YGcf&)ihUuPEO%0HcH`+?P|519f#dz`1n6L6c`5>P9(cW%zQ{LB{L1
zO`r<}@qfKqii7me&UJq;<z^F|c}0oD6K9T1#%I+igPcmohD4t+o=J4Dm^UZKBE+ag
zCiJT3((LH#XwP2XL3{T0FN)DPJNu@#yPw+b<KIYa_xxM9$+h7o<q}*PZgTcpQu)av
zO^O8s7tiFy$At3p+2+d6qkoR_^GH>GzRNwtiWN`XFCZO~5jB6Jzo{D0RW_NqYEh(4
zTU#2CHW)S12CgTaO>rls{kt$%*&$5OjerPBkq<9Ou-^A_yP$ZEf^kGw-TmOwM$Me?
z+*Qx@U`fI%veiL~!mw4D#W}T(dzYYQF2<9XN5Qg{SdAp|lK!YbA8GK7HH1fr@~_<j
z23;!<*I#&!+bw?<WS7V(n^!q@cAME`Ql-eAbDb4udO&_F6LYJrG`pm<TC$5P&)Cdl
z#-E&&hX_kql}Ok{eaTikJ7M!kt8R#53vQD3vejg>$N4#N*XF!iYBLt(+lmEwHe!Kd
zvGX~{bms9!DOF%;<oeP^$KRfkGA;iMoT`fQ5|THL-Q|C-IMVDu21|vB_gM54I9+ZS
z3A{<1xzMom_(qzwNdo~I?j`Tla)+Gdxm)VBjbmFZ*uzpzU_4av?#;pMS)X#p`35GR
z5HL<<i<`a7BIF%yU9#x{6FFxh@8jHja3h%y?*8zay<<7yah)uEUZhe$%wBvQw)>Ym
zu-!j><9?T`-w-YVJeS(v5Ho*1)L;hjWTsjvF}x=wLAsz%VHmMsg-R}xQNDZ~zhoV8
zfmN^`#r|4$upSgc*5PavTo4<TTh5Ej*XDd^hIW8W#Nn($rfp&OT3Sgy>Xa7TPnD_`
zn$G`y`}(?|XUjL}Xv6L1WjFLVzmPB>gH17n>)g$mJX7CV-djYmj(RUAk4G=76;^Aq
zW(9Bu5QcCuELS7PRr)e%W!)1f8+=!d(XxYZksqBYttO%ii7%JC;1DDQienK`oR{R_
z5G;TDnCQty{KJp`9RA@)!9T=sYDV^HFiWXCi$A(;nIsM4|BAedbSaXm>AH?jW$K7H
z*P6@=p`=lZN@vnS#Gj?&^~=X`Ea)iz^OA7t%KK$0AmaRRG7m&vCsS!4;x1-#Jgn(^
zD%(T)v69~*{pvgc!#pTt@;zi;@Yvc4R0MxC<daPLhs=v)4MB3$Ntnf%A?`7wN{H{g
zx<y8axZ+G`?KLf~2&tW4BquWW%7U2`5G&>_nG8ZcRx(1!N7=Lx(FA2OBt&zRNf5CF
zptU<fH15`y1ZFZJM1-oDaO&#^?y0LtiO!w_n7E-heMIs}@>8BjA`gxtSwsxR>~w#t
zi4kJ(r1Lf8ECkEnl-|X0^rI&-kwlu_DcK~Vna|H4k$9a=BeCptB9}xoUYSrL)twZo
z<>Z=3y^;wh<l|JDiM%PwW|>gwQ#Lt5-n&}rU7QO+K1n7-NGz&!;)CV07N<bih*Dbl
zeO1yn#JImad&SB!Q38dfkWHte_#b})+~s*E{sizZNk|c~L(8&KY&Lx<psPtMvO8_u
z(*!+SPEd0w<=U;_j$35@4xy&uP7hMaYY`7Ik;Y<GHOZ8{v*xmty)hrWy%`^j9>R$%
z;~2Fnm1sOt@9<l$jLFG74lP8wo19K>ukZBUW}W7}NpzbY$&M@WA@~C&_C<egzoYOI
zIo;k{-|gLOw?$^?<WJsMHcauJi2W@Fl|CWK9a<s-B7YP_yg@2=7Jn#{A&MzY=R*|L
zCh$0pkuIMA)~BSc#G*ib*+Vm5=VEax-*urNm2&FGq@T;nj9m}`S>nRUc2vY$zB+eT
zCDfknU@mPGQ%h`W(e*Z62XueEN7oKr16r}!4wQnI@X%YCq9P85?5PPW>?rJ^8AnoP
zZf;a%pR3XzKa+8kS=gG@aspL#S|Mt<d+@V7P}Mp;?8aHO?{qG^mlHT(Dt%)SL2qxh
za#`Ep#Ii0e7L~{@<l%wlfr&Ii6gViAD<FF=yDns47H4`QY!^ln)N+4wYeR)F{}lR*
z&o`YFXNon+m=xW7m=astNJTqh5egX&%V3A$=F~jUJwJaI2l~@rFpdVAf=7oEekw|K
z&S~&Kj3_T0Bd^oCfnAtep=T<W;goVJ9zUpJeg>XX?XPkMqGKw<+_Z_D)A-rvxSKh(
z%xsZDp|c`9TaRZspjCfw*hyQ}sr^;->{D}dJ^R$<hH|K4XC`xb%31DZV_lk87-1F9
z(nw1xG}s-?=g^T9cj1#J{2(ZXCF3n{v$l`q&3A_r3m$R*Ca7Ier%rvv=r85j8nh_)
zfs$q+it}Ji3!?t`Bn&GS8hlIUPGF8=sNiB#FiMj~=rX`3RN#MWOwBazXA6-Eol3bP
zUoZJP#bfvusq=mZ6w|*^q|RwFQYS5}+uNy()H&_Si$tW(Y458aP>7yvazG)7&_CgT
zLJXA~I7|nrm|4-vMY`7#i2-1J;rVjXuC%&k1IHyD)D^A^uNMp!2l=Ptnd{|M<fLM@
z=C~3KpPX9oTeyEj2OWA1*EQHDaxASSnJAhWEX`qUky@fZ=6;fxrHN~xq|&*B;a{n=
zEG(MbezufZmyrW#0TTiZF$~WP#38E_28bjY->CN8eKNVlI$BkRm|(YRTNuXsz!NmW
z5O>rBED0zfUzO0plkm+eu}aDCh=jq@M=^o(7)Aq^R84=vU%I?|uuIwqveqSUmf4)z
zT>)rt?#Q9NP@w>5g{on<OeO7Qp&{M9U7gV2yYHk+28AHUCXGi`p2M=xG~!Yok5LZI
zR<8DuZML1z;>C6hjH&=Qp^x1$$P%uOc*1YuqSD<QAcup6|MPNc5Fz{07I$TU0E}`Q
z76y*$_O^c}u1cjj`rpcG7f@YYyn^zNY#{j1&mU~M$II{S%Q}6<heE^P5W#P^qi@Cg
z?-A4E(s;)r7~&VUTC|oZT7#9r;efl4S&|>Y3;bvegcc^S_na01cOteZzcdGsZ!`Z2
zW}p)7J+S$~9rUJ2I3Tduj2CP)sep<2*x)<6nBafPLd`Nd9Y=ZvAm|Cb!l%&kW`*a-
zbAotUd<^V;;pFHMld?42f!rk|X}XETX<#plSRB47t&!kUT8XSYyhP>}pT2ejvJ6k?
zX1GjF0c7(e@T4d`9j{fsOxsx?jlzKR83isBsSql~IwJWh3k-R#D~p_qI1<VbJ|@8u
zt89M~fcO(2(q5%pn2uUaHtnPK0Fj4H9r!n)+cqf{W=rFHZ7RlV0vJ8GnMq}nv}4vN
zU{)rp;pfP}I2r4Y2c8f?s}^iJZDoSYkVfL&8`MaE^cvv(Q~jiZ#(s`!2I#3dptwyO
zkO%j7^jbCXB<_{K2?9Nk%aw+2IYxvY+Ma)1p$XwSb3s2_!t$`dbQJM6&|@qbw!B$!
z+81g8;2M2{$BGlHxab1U^B<q_WeoBnNtth5V2IEa+zO_ycU^X!;S3GPJFSq1YU{xT
zu1{!)b>W)CVm5{=sQ_xXfU$J_;&cKXDdE-uG^<xy7VPmO&+CANx=RbaX52vp&F6oJ
zw;QoOo3x6f7D!vEiS>}<0U;-h@Or>A&PC-qQAp7ar{mEED!%9lT8$+AvchVN!FIwf
z8?0R{f*dkml=KLyJOUrc#HG^JzSw{hp=yeLD-QDpdw54jCX7TF0BC-!H$5UDCHc%(
zvqka<HfbWF8IBBmiPrWS;EN>>4Re1`F(?9F2Q&RsP%0*u9&ep5J=M1v@U&K`Bywse
z$c|>nI!|F)q17Uho+$D4WgP&?fmD;Qwu@m55~h@>ixRMtE+{HTb_Am(2?a}R)++WB
zxDorSX3)Wl(80?^2bgy`tl()0c4`NR9W&o56CTAK<>O#TAhZ3BIoJNuj!%D6eEhgL
zmkZWX7c7QYWFJ(b7MHAuGSd+jIu_{Hk(ks$#cnd3(y@GZoW(NCGqNmT(A48PrDH|G
zcbsdn8fg(HLVGlmdO%~EqY?Zdqa>y9Ye_#`S5T4s(7w|TS^p%vlkcA-mEOWnX@6yq
z+Sn7u(SaLd0}T3|n@=Y{$f<v$cQCx^@}TZH6^)Y>U}zGS>tmDH0@sE<N8duO#y;Rb
z1}U@GewUlgcKv7Rl(P>G^q$NSt9tWHkH3y$^85~p$?I?WwfpJUZvIC4wTq;F?VRh^
zuBBQ{#-hYADPO(%`uepuo9ow(|2g`#<Fo<r^l2;)zRIy7@S`(heyD$Z|MU0sLHqg>
z@m#ylr3Rk4_LIx4Ay-O`PghEfrz9ahB?<8`S3*pL+}=;C_SE3iiITeQbcP{@#>P2f
z)04dX(OC_lhInDYqC3J6;H894<VYdPt?40;$W0L|nI#W+HH;OW-0k2=VhY(69gSlt
zF&s_IjE3Y-J;=S(QWJj!Qm!&HaF?ADja}siyB6^~g%D^{xM&LN>ANEf@S4xZ>t!eX
z+#{R3$~<vFUS&2-5wdWmDipgdAaB|1hLM9Bx}t&9xJneBo`8q|y&V-%u(({|ceU|(
z{(}zjk<;}zI=)|QU|H}HHVnH5qI7R)-IOtJ%j(YECFhmuFP(qj{TvHfM(wpVmFWRD
zai7is$+=V!`*E(rkda>?TC`&nC9cAt><@V^=6_bArnP)5ESn9uUF4oODTiFfCgqL=
z1t3ztSr=pmtW9!9{pm@g0H?Lz+>lrt=l}b^|8EfK-%Mx5Q+&*<Krir40~3UbEO?x+
zmO~*W2QLQ}_vwEJW?jU|>6A8&7&iT&<OD&P6C;k~rjuCVO=%}QC%s(HNl&;-I;-6!
zO;y#B@{mOrN^J{RF~vpJE3NaSEX}`yV`S1~<L%eyHP2!m>g}q72fw({dBc}5^~>km
z9%k;BVv^2QGD#naNjgKV`YHT-p4C;`&*5dD293?t4?BO^5?nuwF*CU%IqdGJ82*@0
z3`-SLfGQ?OsE?dAI$=EGB%QDc7g8te!ZoRCql4muWh!68Jy@>jbr&VW&b*(#CVi7{
z*u=6(|8c%xgV_DpVKgzaSW*`SHIrV5O@C`$YC`t}IOtj2?A3zn$m9yHxdrdfh@Ef;
z(xVrk6*qqhNDSlpa8ITSmlwZMme;d{l;4sONYAWZ6kb4mV5T1+Fu8Sca8Sg2#QKjV
zU|XYyB^a|WVxXb)E`rfZWuB|kk^(87KfvHo2aaLw+p>a|%gpH7C#f!MdDEgdE(RD|
znFmh=wvL|wK+gyas10>?^|4)2uI8u%XLJ7=6*7NO7tvs?*XqcaD{TsjNt9N%x#P<7
z7{_jJL&Vx6zHccn02W;-ZJNGs_nl$~Xgmm+81q<djSV6oBHNh=^D31)Rtx$XWP{DO
zx|hM#K1CkP%PA$=03sP(%RX@|C8bM=g~*<FtapSqMaqJeuk8i;jVJr9>2Lea_wp2+
z^h|%S5-9X^OerqoyCfXCY*1pCa?CQ3cqt_s$o^UfOQsG4?YX+zMQ{u`FFjZ^iTAz5
zJ{KM$yo`{FDHRg}8WD~y6x>B>73$pDVl`R?5n5FNow6~-bKznEToy_iC9a-QH(Tfc
zKX>b1Df`pAzbL%r^yRn6hifAr%Gp^O`EY;wSe4<`;aj91S~Uo9eArq!P>TonMYt?a
zw6$))*u~_489%ubgaS5;XmE})xX(#;P2fOq5a4XDY1BVh&c3bt6oytZ0JOXu-eqS8
zR?M<B;;d_ctXff7A^4#etz7+&Fe&$}ZrHJkIreTKD53RpoPh1WZD$+?e>{1D+17s|
zX6$nj78|E|fKYG&?1FMu$>w-$HvOgL6l?VwCbpXXM2W4Yzrf}DRvS~c`2%xo73Y{F
z*%;R-huf#nhOQO0GjRpHKdBT&Cgn&=eeveism3xaUV5>kaa6Q#$4k4SuJg*3p=qSg
z7h{{e(TM{rqNctgbn+3(0R5yB$?1QmTrH5;kl!Oc6Ok;P^RNxPpm6-ao^t_anWkp&
zip>+%0Ea@O=DtMaFl0>MGg&b)nR#9D`Fpg(qn;3vjZWjdtt}uMIs!Jw9v*nxRJLm1
z0?U}ORb!6(o_EJut}e>;5UFl2?xji@oT<X-;71YA8Zm;OvhizfpouD|0_lHniwNtI
z#w1!%76(}FJgPos9zeHYj4_QjD90LA{`<<jF>1{?@}wIELpn-gm{&q3W`*ayp2nU7
zP+nR?SdSN!1&#}lN#J1z%L6J@Mu!y=BsYo5H|iQYS%A2C8R;a*yV*>bxKUC3Oh5-s
zX1C}f=S#u0hZtT+i}F!MdM|%k!@t8CZdR%lT*JS%P#E%U9!En{*z_M&%p;BkP%h6<
z2dFj)RjQ*&#9<s1r@!mLZgKi65HrRpgM(}nUBSC|HF$@zm?ms?f6iTn(VBBoYYrA6
zbXBla8IvRu$nxroh~ecQVXabmR;Hh$Kf>q7&!1oMM3noy>#<`BbQBrcE@x{C_qD~{
zv#}>4Qc8W~ol@IRKcz{@mjdw+O@HNvWCPQZ!jYk=C=tWP=EJyr%PY8iD{GhU?OeWF
zKatCKJL>W+Gna2gczSol#a6`SyOZDly7}w)UpM9ahTRn3;baVS5{5nLigIf<4V8yK
zOX0OcMD0L;f<aawdGA}g;;!&wRW1BD-xeScv!95$sDQ0jqtm*J2pxO=Fn@GxZv{H`
zY)!{*MaSCa&qK%Bew2>wF*^2)ldrZdE=-w@@!PrR*z;e9jy;#?SleAD^R@kDv`j>p
z3tOMc<Z|^+SDkPL)C<JooiYZw16i^j#O2O3fxTqGtM@<wQzSYgzmBo3sCkzQ;O-*k
z@@hX!mU4TAEamo($Wm@Ubbpp|J5QE!d!;Pp_AElBxHas_lPn(O3ko<iykkyJzwAGH
zq`VJJs)l42YVoCych`LIc6@OB6Y;@lvU8iINb{+Oi=ns}NBCgx!QJY-C3#qH``1a4
zZp$gs?ddv2dYvM@PLW=xNastDZim^wK+t2^zs%UovVYOVR1NPO<A3ik8Mqsi<OSIa
z$&}!rf;&qIrY)(*P{)!uWE9@f@Q3p6Skf>HCGVN(A5{cBwKMaH+Y=0WYSY}|_CW2A
z>V0?SaC+7-x?y<14O&p0Lxl-c=o4&TCW5l!DZ{B5!EO!Y2*=ag6P^(ZTL<o3y-W$i
z68U?Z=GKxBELNLQ(|=)&da_5<U~Qy%u%t`Iq)&QeNT#GiXzDDvCRf2cO=Ag>?I0nt
zt<H~iYDNhf$`9uFyiF`!N`9@iMH(c3y;h0ke75EM+6vhwWS8aFy1K596Zy4t-`t>b
zSY;+ZJVZ6fzT6V&w*4T_c2?87K`WAZwlfhRH7f<Xlk_ksh<{bk7tj02Y{>X74O3qI
zoub|z5KvOBUagOTXBes41NBqRmzDNpG+Q>1fN2Q~LwEG6*Lq)0p56TtV^_m)tRu6q
zBMMxG1+IhPnSwGIACsx*vnbT5O=<9)T&N=ob%MydtDx3N?J`m8Bwp*FHc8Yv5QPRo
zt=CVUTs?Vm&40PxzpjG#XHfYNOs>>DDDFo_4;`nTiU@ROK9H{2xCa`6U!c)@1vI*X
zP+Ki%zYRmjf7RB9Gy_=-^KNPevK$~}rseXc5wEr@nLP}e$9tWEP7vZHraIhLgUK_A
zMuV{xcyn!L@ks@kQ`A(oda9bPuCi;2Le-gy3SRLFaDQxIh3R`+o6oi+i$c5oFjk!U
z3Raxv+8%H_d%)-?vIoqg_JBIG2Q-Blpd~Iw5qm%@zjEIGb(HhAtel@JLcUZ-mv(5T
zL-mFp+FGqVBSUuPJzPyJ`%U-*D6wVJqe{)_Demma1uYnTv>;X&>+XZ<LBq&5_vpD`
z?M4zlpnrY3{CHCu91p_ZT!C|&a`<n|MQD@`o#}PUIUHNlj$^nzLLp<THfEB*69q)4
z!I51PffjWsAOqgD%-$o7P{dCw1M$<Kh@T2HQ5BqlUt-gvU@litxCFn1L(PoyGF?9i
z$1)KQx2cSW+mz$sHfh`|#sN}B4}%{_8TS4z41b#ik4(D<;~qS)_P4865NTb)fPR)j
z2^6pRn+Cd+_M3cLaFz{2-r^?@!;lVFU`WS5!mV)h&~Am}JZ^>KmD~zvYfgSUPJaFq
zaq^2OCqHDI{7f+Luj1l7!pXnp=j1294ktg6Ir*!#nSE_$Uz^$2X7(&IJ8A!sQ{WF{
zO@D4M*k#}%8rUI?5l57Yu?cJiXyIhy*rlr>Y+*7rdYFn@-TCjB<j)_xbU;R(RLcuO
zPwhGGRc{cst3L+Hp$)BG&$KmyVs<0AYmPwx_bgAt4DBA~gR@WE@G7aEQAzn8Q#BG#
zB@JaG<so}B`4r>%xvHaWy5<C$)w7JTGk-WYrZ`ZcCZuicmZx(K>YK;!ST@Tg&~~4R
zBGDVkLFrJ2d|~vgnOEKV@3{7KWw<u{!b}3DM15kP+$opk-fpQo+j6F9kNAwmzt=^b
z<t0}L<q=!q3!wAaeJ5-()%y|yE_G&mC(@bSM12#dXN>VcO=NIfPt`1YXu6h<6Mscv
z@S?58hHWP*a%c8irxPv7M`A0b@M+}Ri3wapf=k;kqepFr$9K_mAA`ZoPyiU@6K4(x
zW<Y{(!g8Qc@lsWn1Z6;<G&*=xrwud4uZYRc!Gk;eD&XJNr_yBwKmN`HszkRWP%kD+
zd{A)W)qFwx_@zSq<0)bup}DgCrhm3fa|d}5T0@6Hz?xdJv&X1`{3vp6sa{_cioHWA
zI>_>rW6e|rZBX3A8KTKUZ^%&b4$CZtqSM+Ci+11-6rH5EV^Eu5!Atl91*71+Ksa6V
z5=M+?T0@UU`jial0r3%}Tws^oD9|Ll-ie*+O+hAQWlw)JfO}2(o=4ktNq_&_;oa%S
zhC*7KqgWPhE5*njywD03h~BD!7Ani2fj2Dhc)f~wyu45mco{&vhU>g$vvr9M9Y<^o
zxGA=X6K;^2i6z*gulaDzmwOF0a7FHN6ek(e+KQx!-~h5$=>zpa7UMb0$TyR3bYB*A
z<D8f@p%Pse2$PaBe78Jb$$vOQYYw#?IfU;U<b}w5{F20q7J+4{NhDYj7>~}iR@Eq}
z++hEumMM*wVyCQi6vd?T*A#$C8cXsE-7D9tr1&k1WtGiWGL_Hs4FgYkI);k8s@4Iy
z6<N3zf<$2x%#DueUzw)8GE$T(qi(npq|(XAQBoHqb`1&=(7VDx4}YYB0*XDZ)l<P9
zDL=Hk+J}HgL6_k-(&K_g!fmACiEstF)98J%=axhQD{P%dQCp)VC<JF>H5aMiSdoeA
z(G$2~xnYvxcs5bZPUl%RR_X9{!urXD4%NsZBAhd>CMx+GD`7dKoTwZQ&F-k<fUMTV
zD`2nP5U%SAv+Y<`DStnNR#U}PKS<lHcG&iSR8p87k>6?KIo_@oHoqM<{|w$ht54S~
zObmNwj0+B5q6M9Si5TPJkL#Q~F`V)zCuR`#tRD94fECAMFbf<PgMly_bjf)I9r$_y
z{SJk$F~eJr)E&(rY7x?d0LwVc0pZ~{R-k;c0J{{lu7^E#V}D7!Km-^#3Qg2ig48j1
z<y>&e%86AGs*cmU-h_|05A=}c+)zhBbr%HGUUe5{MinpAZjc*f(AD5QHS*YZG%AzY
zeP6|)gtf1UD=j1ncm6#@q<(3P(T@A%$>2zj+`0R416e(&`%bG~hB$3U5U20=({xv*
zALr<a;~XgmXMfuY7W!j_-|`Rm_ohhNe<zh7^c4xWC2D;%Q1H|n(DOY*fUiI&`p&Fy
zRLQ7-T{!4ccs@0b<o%*W3Q*NNc#X8J`LG>>&9%Jf$?@5{0$;)TkSl%b(k!%`k!i2;
zUH~_lV^A3PS%OR%e=_(4E7|fa1UWJkGdXw{KG#J+n19cmYtq>lO!*GL-Q-X)Uz8Gv
zm_@i*R(<Plax?J;2n;~Pr|gwJWe1^aF@#FVYn0#<kI4<IvT70ptMr3I4jhJ78L_{-
ze)u$zPhm{+>o|gSz4ZnMBNfEDPJ1Teh7B1Yn#t@zM6rlYUMSJ5LxRl_u>=0ZeoNd!
z5mfwX>3^|J?RUveCLtzyZ$+c|N?3*#nKec^BBI}AMnr$45z(J$MD$<u`W*(*euRI2
z*6s=~=q50{xz~F8FLZ;G_V3B++kfg2z&EXHfGoQK^6CbULPlyWOc&H@CRl_kcn9So
zOPEC)b}E0dY7;7D`9yG@YGTLoXw6_>Su{ZBt$*60=NT|r*(Z41kBI4)rn3$V8yXQa
z1xl%4f;_x`c=E6rPXGHjc{pqyWReH=JPvaobWgDxHZylaneKp1x*IBLVTG<Q4nZo3
zD~_}lJ(^w3c;9X16{d_Od6p%XrNx)p3Op+b<*dX-3c;J=ut-7}^f=x(41eJr8n}sw
z@qgks2xwhH)1a8$r-luir*Q4e+~9?Wm$}aAnqaNHwS?j1l`!m;W=mrG`6LWOk}%wr
zJ|$DN+!DrHQ1fY(Lc&nU6<ZGzi?+Q&EZWYGh(+6d=vcI!Jh5myE5)KcU&o@|E*5R?
zCyGUT7L7&QX0d3`c?eqF7qMu2ax7Zie1CBHfVU)9_}kX66aKa(g}>G9b@<yl{B0fn
zwhn*Gmt|ge1C<L1dYZ9<>s~=lITI?E87s0hw&li(y1UfUQn!+gkEO^*wZg9AUMvBg
zJyhhtvrgY44W89lpIe^q-Trj!x|OA^)(zBFaWY98=y2VkKP^;V>)!Wdj=R@--G7Ke
z^RIXi2Z(ZR5XCgBfw19tdfgGp<6W9OzN;tNNLg0Udpi~};{-Y4PD+k=+8N3-J$`Pk
zI4Ic)a*0jUrJU3RZc}JZW=URA#Zc{%^0uM8rdV1UYC`e}$Xp*5)=Kn?d9fpjg9LV4
zH^SzvcxdtJ`NEaZLS`@vnH9H?Nq=X42n(68dQ`jg6yTZCL<TA(vSDhzgKG-3`yvR&
zRUQs4601Xu1fo?7;Xy};<WB0{tj{g^f;fI!{sOlaK+WTtt#6ihK{g}xK3qR9Z*A?t
zbq}t$w#&QQa6QZ!Ts#JvfS&PlW>twrS;k{5Md_x938>z5V}Zy6*S!9`TYoNtyk=a&
zOl3wbb6XB*|CUV?4eQgS!>&GDo@mG`qK4NXU?FWeU4>?*o@sk(9Q1a!?GvQM6cbIo
zACIVD<B<GBy~pcN*??%WBJWl;!}2PBC^nfSW|fssS%!JVI362MNEdUNu)^4>Rv4)P
zXoIndsu{s52^-?gI@CB<QGYeYEHYCL5RH0AxqCYFSV)cw&W_W*FXMK7nm+tmN8^S(
zB$vlWu=(jB)5|Q~Ru3ar!U6xhG?Mp_o}p3*?S<@9>}Zv9VOdVDo@7X{HNXh80{8Z^
zYG^=?W%FnJQI5(Q{r(2?1;-oa^!xOI)U+>)?9hN48l6+sTnsK>>VNsSNg}d_q2N!<
zo;AZf0FA8+Eou_1Paec1SRdp!3Dz%vfJv}^{lF$c=;d;gV6@OOlVJU7Z4$hdNwD7j
zc}#-!dc?R#H`cdreCpvsAWmSPq_>*6?Q@(W{0jCt-c@d&8?EhgYx~^VKDV~dWu~Xr
z=id<?DKu{$e840!5PxQXs7pXFK}uI7`|HImQ*v^~Fx*klfy09i8iyCrpo360zA&eb
zi_`%Nc&SkcDK8XWQeEdqM1+Q4*H)3-e@v{T({-V}e6SuOVshyRZxc6J?~og&+y-%z
zV%sQ!ok6(4F!=?Kd`KE6j(Kj{qetB^tNGEUSfi|Bv3A8=6MwW4B=$!g4INx4=)%ZQ
z)zh7@><5}P%#>8jIzvb%dRYZEBiZcwC}u)60~4wlGoe~E?J|IUtO%;`d7F5k{{-e!
zQ(!yxIW;lWfSZ9evWwE|IMRB0hc=#GDaV^uPF=y0O4)jN_w#A!ZfM2B(_lKog_#<p
zCYOqbs>RF-?0;rLrRTR*wgZLJ;B>hUrIGAZ(g76dooIMuFD`QiEgzp8K9EMH59EM4
zJx;09<Ah#A-$?xc{vF;={A&FK^<-&L9zTqo<7fpt$JvjtbDTf4o#QNzo#SjJJIBS^
z&T%_C$Jd|8&haX0=Qv_^jtgPlcquNvM(iAaJUs7tnSbB3a{TL<R*q%U%7?XSWo=qn
zn^xAQm7JkZZ$ioU4|VjAN?h-zK8ZyV$wd_LM4i~X%i@Vt^6;DG;{D@{PBKkYZm0g(
z>QxKJN8$M)y<{0I0_BoNh$QQ~r+z=q)C2yevi}>Z2fU`&kLmR%MIaQ&p;9Q6n;r^f
z)#`_Oc7Gg{0i=vt=Nz~Q6M!rp2Q{N|6^n!F)<E*WIH<ox98_Q2c`ferFb)YMX+@(c
zM+-*dLlRAhQ%z4D8|9_NMs*XhQH4lQln;tR?w}}n9UyMkg6N6#6lI*0VgX^al&#li
zI>@>_h^H1B`&6bojTk{h5ez(Abr>aJpv`8M7Jpggf{g9mbz~J8;?T)c8Q65`OoBSn
zO`XkgFq>obY>v}rv#-N&B~CNx;fV)EF)`6jEwu9iml~%|v}Dpt5(ilC;Y3SOVX=u$
zr4)RkyE?4hyc6v$nbB_8nS3)EidX)s!E*I^7%b<oU^ycmEa!<~@sh!Ez0mSFq#;@F
z)_<WmA@~6<2Ofiizwu{|fSEfB<7wDwfj4$M?&jYzis$3QtG$1P;>$;c$+eQt=2}TN
zx{7s_WrMYqCRmkaHYTV1wOl^?Guc6<`L&|7zgAW<z*fHB0{iFk9{rx|QBvZp<PkY5
ztH_*{`xZKXU*7e%8C?&ABDw3q@~hHidVeT>#?SAIz9zjD)=*4WLslM|*sc%<@G162
zawt=M7W|=|_AJjFyj?yA?;~^YU*S%AZTj@nuZ)Q`4iY(-V4_p_w1O6y1Wg)J)1FPJ
zEEyR)d@H5Z|0T8heWtpyNmZ1;sER^C2aqO^`X>CV(4W84M_cszExq2R*YD}|&VN0*
zHp&#5qrR(XJE|#Y+p0fLdANlS_wK1-+cBTZvj_3HG|l`zm!`jV9o))w(6oOZ*Fn>b
zNJDgeeEZfE$<j?rT-dVffZxt#$A9+g*zuo9cKoKHRC&CibHz9saE&91@k{j|&-7c)
zU@$i04_!GF%BsP9NzqT-<A?E2Mt=>hrf9T5qo-G^@9E4XDoi+CxMn7tK0mn<yFdH(
zO~gnfbS|xDT{6vxO<yn4BPWSpJ(Ovs&9JIDT{IA4*?=<BTFUXDrI0zrVqPTE1Ws_M
zwi@5QIr<b$sOjM=zAAWy4JQ>=mPfBJ*i}5~7Dd$!_HYAX&<TSp#oJuMp?~P;1QW3M
zC(%(eHrYXq9Ilk<OW0+Na6@khYuY12a|}8Lk1L6_lSw(6IAS$8ZgiS9Vu>?*>(Qhe
zlefTRT`^e#jXFYyR-{EAafH6=BSQ+@8Qv~J#%714$y~ANJPcR#R^W=W9}tPq>^^WL
z0`ziuBto>%vPgvHcr8xcPJf)}|3u<MFDg!WOq>`CDPkxt`Vnzrm|L9S6yaA8CwN!6
zI5Ay^1+2pY)?oqbuz<{ri)Lqe#)VJ_3^}hNmT>`eT$N-2f(=8vz(Zm|kBAoIXXb#K
zfQ3LA_-QgRl7wj}u)ukOMrC=1MrHLJjmoc<rD1(vmPX~4X&Tw77=M*}$i;ZKN-jn>
ze=f!>I~Sv}S~A8gcQOWOAjx(&rz<66%+$#k1_;o}WQ^{8CS!DiWQ@dEHx24yWPWT=
zY?AgG(9zSZHR$b*=&uih7|>h+F`#)FS-4DR@}E4((!YEm$_)+gnClW>_8&b`-iOat
zLzM$+@uiPnuXVuN>3@J%KamdDj_QCc>z+?NT-3$IRYV7@=hp#$oviz&oOR!9CVf#b
z*pdWB<u4#AD1SjmP)KtzGH_TL?P6r0eEec4nZfJzejkQJk1CFAHh^IG#GRG82SxEw
zSm!ouD3Bl-XAE{0Js%J@n_n8Z#&r1pgf3K1v2bAHnKc@v7Ju1zFR*g<nHh+g4%>Y=
zsDWfKt9488ifMazx`xcCXM#~fW1Sv`XlWnL4nDNrG%k++tRHF69S&7?(kSZM2iusz
z;&rXR%^oRC$0qU@AmXr9*kMsq8ts9W-5yLP5O_SxBRC=OZMTS?OPA3J?Wsqz*tEdP
zx8Rfkc%Y3VW`ESi5z1f+%HRc*!BbKOq1OUESjZjlMcfsv$pfJA6qL{D(i5-{cnzf2
z&lZ8X11<7~1%tjv7c!lbsx1c*H%AY{r{*j0sn(CMvz|V*owb$6&e~eZ&e~Y>*xT{g
zgP(}Uo<w=<oblL(V6BJZ;vm9f5A*Zb(XYc}M>3B+UVqzJ*LK#mopo(z&9<{1<;cQm
zHiImjQ1HSOoSm!`9Kv&Ts%};?P6$N|tf0QDhd{*m`?($_<ba$FVoh4kMwg5QC2AhW
ztU3L_n$uV3Z1mI7iN7OfqrXzlMrgc)zOR(DQAy9*=;qGa=oYgOj$M5mb|+ufhMyx5
zr-vhzF@LGE)G57v8ctU=rC|uKa%Kf2^=*=J6cNM4)HzL$5oU85VkDctY0OSK3c_h}
zVO6`JcRpPHO|zrOzX=V<QlbrJ*EG*^0yTFHx5rOg$Ajj3J$AIQ_M|#CJb$A*w8lM6
zda}razf8fJ_Yka^w&gqtzT7;^0lr+B;xTXT1AnCg@lRK8c>h9x<>g62=O#$?EKA5P
zP2tD!(X#W7S*caCg`z1nc6i8L@oqC|+?6tEBo(%K@i1nCuPc}hUi}EO!5<H8Hh7iC
zZ18F&v%$-?+2D3&gAYHE+2BpoZ19zt4Fo<+^Rc-25HTA(&Tlrj_;t(%7qZ#l@3q-r
zZGSdcn+?`xgKV?G>w5si1)~0M28erJIgf^0@f+#ERlL9&@HSs471OpJ1nM^9Q@07M
zYMzrDR^`73$StT2inyx3|E)l7o1Y#WaiRGxjF9*gM_d46k$DC?d!9Iho$ByQ&tq@C
zTbkV6{FrQ95-owZQZ$3_qh<IAS$$icnSb8=n3dz*{0kGdacGOA`6s=Go{;8W@bCBg
zNt15=8BLRJzI_;r!}}F14x2y1;!u8Qi^FCfi^Jwh7Kh5(;&3~Q!`4q^aoCPp9NsgF
zLq!-GcE!b3#Nx2?@El_|zmenZuVdtRD;qhUuZ<jQBgfjvu{Lt#gQjing>vprRDaHm
zA=E}C?yllq3=WDtRNz1{F*%9@l~XLvh27NLTQ1%|Ti$J^Sh7~7L5K0DOEANJ+(<mj
z(iKJ~)erW#elYUs&u8MN{e2*|&ENGEfoeexaXfuwhH)|cjvoQ41-W_|P;K-1KNF~y
zP3%e#wUM=>1g902xF`%QTUtL9hJRL`sB{?G#9aOJVQBd@t^z=-n#L&fER^_X0n9dE
z-z~uG$W@{(SspvB-g^aaffmH!YEmOhF4bn&9zBg4*r@^fg*xbj76B=9f<QlWuew=L
zoYnn_pVWP;x0^@b^Y+O8p10e-ukyD4<Vm9Io;ai&C(BA2i`+xqD#2u>u78-33*S*s
zC+tD2)ll%GL@gF;2NZXdD~7H?FRc;F+#%d-%(9+TP6%x_=3zvBew(*8wlogc^qZfY
z9F?zy9oCL$PV6*vGV+w&b!T>3U!Cb4ZU*8_s@r7Jt11?k(+LLd_((Nq&P3=E0&{tV
z5AJ4u@U7EPebJhdn;{4fRe$a2SEu7W)lek|!CCi9@EctUaUT|}discx=DZEuT|OdB
z-*7QDQ9Ufm2{I1gZO0k=)|AeUh^6cu_{F<y+AGVpykU0R{8FEnI`H?GH#96<tZEw@
zS}_XUJmT0}A>YAVJ#$}W|DoxoV%^vT!R44?3%kicU}wSaE7$V*^?#yRH9z}bYPJw$
zyJR%Z8D9x?c-0$N4+G0?In(O)f14$5YIIT0pV<~d(cz<)j_*5@YNfOjf8L>%IR0GQ
zoX!iLgEqZj{l&sAwXJd)MDhjc7`=fRMs8~5@RdsZBieMXF`PAh)UD0FebZ+s*AzdG
zx~0aY>0VmqRjvG`rhkba8X0x*;oD~8thNac@Is^JuTei4?l~GS5BCJokte3M-hi|Z
zz4C{+bqLBzGtWFVCr&~V7nBN@0g6Ynpt(eQ3Y1LRr#38fx>{zm)yd~@=d0(~81oAf
z+-LhsD&x6)iyMTkBbU%loFP`8U&84omff?uXx=%D6NE%XWq;uwlt$Kfs@CVQBVRZk
zU*w)*e@S)G$q@D654jHd8||Dh9KG76xkX09+HRSQrnRlza#`A1oxuF5q1DiQ@`V2N
zxuHnYxVdvQ(b0`?gs}#oO$FCLTY~u+=%+BBrT*A)T-|;;nih$C<3C5!r=uai*EOv%
zz4f1POR~p~CVx>AaA{!rEo)-x#iyg*h8g)Oy)}qZ2rb+>`_eVhh8j>9tr*aC=_%}x
zN%SeK77w-zUGSG`SWhI=bY+`%kH&KZ3ngt`so3^#SCdwl3v9bXoiPz2cpVZUVWSQl
zB<8+ZMGN$ab7i`RAil%ia?R=3=$iV|_R|3dDoc0t{eSBJ`|W?dZyUw`ZNft(<fiX@
zm`+7y3qA^0WYoS*(0R}D;M3Pttv@#BT3Y0}AdoT2wO9b*o=j2d?`1`#drT85jWNVx
z!PJWEH)s)29w-GKN19ds%5brWc!S0RaJqkD_Wfkb2`mtQ=21s_I0%-F0Wlk$vC|#F
z7KVo{*MG3RzT*P*?;2BJN@MG9Qv}RNJrq&oAVgX=ba8A<J+sHE7lmO-I5Z9ay2QV@
zS)$Kqp#G??pxo`{l$&*gE^&{^CI>!^TMBtMrn;+$IM=*wrgLkDjnng!daHh<QJb<>
zzqn{z;IF_mO>bX(I6FH&dmY?HYE!bEE4>()et#t_6HI!yi3K{lQ}aLD(XH_1+c&?&
zr+0M`-*`tQ-(Y(-bj-n*mN!~glVLKu<mQTomF#ZwRZz86ngIpdy^;9~E~`v&UoIRj
zurQi`xC3km=ml~^BdL^)F3Am@L*Q#bwm<`yE0oq04W0pIULRf6x*#ufsk~77aQ5!3
z@qg(IQ5NV0$O%`a^ZMBlOjk|g7xX5b+8Uc-dPB^8Em#Fyo@l0#S6p<s{^(fJ<u^2O
z_X+=n&n-FKpzdnQ3=ek1jM#+L0sYs|2C;$OFAE5fCg{uttd<Q6HX8`JFL?d57pay1
zxx8{pZB#Y$Axo{hvb^poOeC!CNbRw0l7Fc7{qkyg6>_z*rGNA=_z|NO@FPa8b#%e4
zq6<c+KTmYQs1XqoM+^pmPd!{5h>KG>x`5x#<LV#%Ixq+$83ti=l2f{K9VaQ)rKz#*
zpkqKK1^)k~%}ViwMugIuR8(WqVYFIUK&D1TLM~h4x2u~3^8!K9xT<Q#%y)w7Q-9<#
z3?`<+9!g?w81)NPfgQE(ETWL<i(OSd<PPRTQi)E;g}m8Hg8<qJ;thk1=31Q@1($=q
zK_@@4)<p!n@cs!EMX6+WsF3VV6p|g~r}!N&)L1~uLt(Dx_{T>KA#~<XXFd%;XMQz|
zKF7r`=(AsQ_61YakO09-H1<Pg7JoA2<uZ?3!u7Nu=_e5+4ckpB#GqK^6UN52%Yu(>
zmsQq6#b@~<$|-HRB|iHxQOi>1fok3as6*_7;R;%yV}^W|hKY~nmy%_7$1@<aI!1Ej
zY?&XC0EHdc2kH=hVc)1apt?VK!U-Bw=VH8+T}+%Kz$7qAXDjdu$kZ4a0)KykhyabA
zWI)5YDQC@SCz`PBWaE+pHZ|<nc*)yg0U9yUFelbx)@><RadiB!Cc^N;M}gNt9~}u+
z0UfXgK$hhp6#|f713BSe@hI6BJ_tcfYLS9u{V##s<YI^HVuBY94X<%!i>@(_1cDC=
z80KdeS_}UvE&@TRnBuYvJAZVxT4R|wBsY0q{!zUF%~}i#ECgI_FBGv`yu`rtrQR@U
zz=N*1HCGVltdh8t`_>qw2i2(<$~TWpuj^V<A1zb_Sb4Y{Xp)8twAQT~2!<g=go)+$
z8N<P((G5rOToOYg-8U%%&*}twD;P9&N1+;@k4wD6e(nxq6Qdob>3`<lkS`KkN1}7K
z)VYhOjgGGYf8WR1Uh+|IKRs-7*{f)6tisT;a`-DbJ3s=`Hod*<1Kj9V6h45jO0Cp4
zywSzXW_qd9@l5xUMyWKNncFpCwJWV4e6X&skPlHdUbvC%(hIGqCc{8{(a6$MO|Z{6
zHX3fJi;U_gfn;}~!+&PJp=9%h^82b85>yYJ`qXOTryIdTtB9NKw=@$Tp3xxzx(Hu3
z8SzI;0`=}Ms88}$&DM9fo^5Rw$>@)oT>{Ga3NBy5?dMxt&z{5e2X^}<T)x5E&$f1f
z4~-tP+i&3V@7m4c#prKfmM{T+O+&V-!R?X<%oRj3heB13K7Z&S1wGdB1$<vGmc|ay
zNROEvUMnY<X(lf+k4L&;kO|Jr8()LCer(&O`=)hzQoU)nhyG+-9sPlJA`DcGY3fj|
zf4xDy5RpS~MxTBZ3wyVw_{%B&r)3oX<G%ocKz+Y6#sBMvQv8n(LGi=R{u$T_xb28j
zR3JE^S!wh;GZEyPT4R6d)Z+GYYvmX2zk~_sg$r8_gh7zs$RphcLf13r4W#e?Q!5t(
zAwHA@r@Yo<uO3XW2mr=NaorL&wqS}asn@^f={3x@5ntTdO^-GF+c&8hK{fzmw{O#8
zRe;l`yN7G|1<+NIANyQyMa|X^88yt-pD@#(HC9j~8ZQP{qL6=v0q@9D(57b8(1QxP
zz3ZX7lUv{%44%FTtY@$(fONu$SioOd%?Q`TY6hw-YDPpiV6?f|tkU_QR)AlV8^);6
zuMl+=zW-62WOL0)mUEK#%Q#8--<gwCekdm?KP)HNdhmR<(RM%=;p?#s=(kP>2$IMF
zXmR=!W<c{hiDQ4}MI0GVQ$Ur2T~gB^yA1un{Csyx2idjH595wz5{$N&=2VP!lD*+M
z6)BwxJHzhB`vUBcg=s3g)(25N@;u%vM&{Y|SEm!ES%im(%g1Ubv_mPaLJSeFjTtlf
zc=4Hu<bGsLUTU_+XeTpUV;9piaLIsf^qgMrpsKVB|Mq_}m@$pudi+vEa7CDH$u)bk
zuBj_h27`QLC{9;S!hkIJx7v;jv;#N{s+G{b_jtke-@p`XQw8%T3_veqoxz-Q7WCwa
zS_@~PoJozI>E;P)fz07E>fK*zVap^1yBIVp>;sLYzjgdM;l6_E=I-r6(XA^ETLO!z
zfV<;AG!%c(da3}?kq2aFW~1_+eAcHY<FdHiy9gEDUffso{iq%~3PeCb5W!NFf@Dd!
z*Q;_!>f)Bc^Vc6xK#Q%VYT6nLmko-Gc>;F#?rg}CI|P#_69egx8x|&Cm0q~*=nPA)
zr(X5L(!nQkgLFmm$c2HMiWz<zEYxCFZ8r8aAX9%C9sNpf0@+>CB63eAoxgYt^RovR
z1?FbRJfEfFjWD*7Oh)|5?kCd_!(60TVq%oxD!G;tkR+(!%<*4g*d1M2ay>i`XnAtt
z+{|KkbDE8a!vfr{NanU8ALUw~i^xpO^{OJ7qwMZO1KAzWy9GUJhovCe5>}ThT%{2s
zY=VCRf8{5uLm@Y{&>7!qNDHX;Ey7r&yfHRGA`U7m^N+>dv6;})!huG6Y!_KPE=h~b
zM(S&h!~3HQ$_v;3+<o}<Zw1o|UssC4>0m&&k{)BiqAb!Wg+<j0wlY_+L07Pa0^3}j
z$t0GeE!HTm%PD5jS^T1D{SEv^J|D`-bXk9}r6r+uv6UBKd#RnrEXqKP7j1>rqiqOA
zP2`rt7IR5(w`vj2W^9=yM<Pu*Ll+T(3+Bm4H?XWOVQp3JM#7?JM=3Jn1RX$kypw#K
z=Tqrcqw4|P%U;z{Nt-U~^knMTCIx>+e?}L!x-ZS`#PkhZJ|*7)m58{`m3MBs=dgc#
zV1A@ujVaE$SN&{#A-K4z?#3qOYYx#pLW@Tg0YjXdh3(tNH)^5${o5wdp1@YGg)#UR
z3iP7B3#k>-I>kJg?&uiaV7O&SFMx7uNW?d2x&-sPTyEg^v<1OPyd}l42rs^f^YXd(
z@U(0e(lT!eFZcAvPQUM&J}`9KCxw5<V{2luA2IIk>7pQigA{mK_D*pb>{u2RO>lX!
zq~tp2>dL{_XPH#7OQ|9Z5t$qCZ=B@o)+-&^HZ|zNIOsHyMAzs97r%YeHZ`(Y#z2=u
z3DczoDm$!%OGSikL`2|&sQVk6#s9Vm8$ysaBZqx-L3cDa47<0%kNv>>IYfVQp+wq%
zixBkF<${FBD&J2R5MYNVLvNfg%i3UB))w2GJ`oH6RpkYl_me{vQ|{A9>M{Y|oEu#q
zsTY;KO+|>+I4!wYsR4i*{<LcKR0_acBspV`dbQ3qG~F8-Q&Yb|`KLOq&~%u;W|nLA
zbnSv)X+<(~t&FDu++TVbn8SbhP@RKrTX=RL#ZKU%0(NuOfu)f;qNnIaklw0dMAz8r
zG1UT=&%~(CF$JF0LzkE``<*@ag&5$`pRXKulKN>-d18L*zG?QnjR^%?bvH0KMO)mt
zg(4+WcX%N)sNq`z5`u<PsS!G%{F-ONozWj+cChX~tOkzhSti);H|BpBHZtZk2x1@Y
zEY`O%q=hyxl8zGnrR{&T$=YAM<DSB*6dk3Pyq_N~jx)MB47ym=pp%zY&+HXC*9CuQ
z0&{@5EHL0)w}1?YhO_4y8fd}lBePn6gMB7?E#2UK56{H-0YeZp=QabO$fZ`L0E$hd
zfJyFI9>Y8E1H@$5`5J%Q<SbVj3Exynh5|KJPz~T<j4Jvx@SKuBzXbo4$ekaaIkHG2
z8Mng&fK{=%NydZf^98vr%0kcbqtmI%L{E2|&WCX_>&hfGA?$S?Uf7$2!d{09dy<q#
z`_8)_2xNWLO{LhDwBN|yi>UviP=JLYVN1#QxBN}-(6MckHvE48{(C9C8&i)n1-wb7
zfH$B5-h`^Xmx_`olMN!XcKslkN%O1xnMw2Z4*-mv*B=-#7J9iHFg99f8DQ+Z`Gdk4
z=A(5k*{yQP=JTH?mu%iz$E+-kSrJ<>HD+ag8sU<ZE`IyQHxOKij67T!(p!y(=dJmZ
z067o&6_NmXS6P1&;QVBb_q)dXUE}?(@qY8+{mu_Vb)~`8l>qVf!xS`7Q&w35S2HO*
zrr}goMWJJS5IUo0$y&H$niO~)tga+nZnAC#Xs)b1MWJ(L%_y!L#k3=(ew3{tDRiVH
z2=B`Naj4blnQ67qp=Dk<xehaN2l`|9L-}{&JJB!Y!ViC*A7*NL$5hihq?+DQigB7b
zEqw_{Yy}MA`DGpqVUTAWPoE!yWWlh6@g#4MHL9QI0|e%x*ultzoji_yZ@Hu2<BtAr
zO`Mft0R1UN)Oz7?rJFMK5#OpW<RgL<*86cAQTVDi0)nloJ*73axykpbjW}iKUp1>Y
zD0NhQ*!6#`k$pr>?$<!M4B2L&9a5!kOrT6K<tH&X-eCX=G>pOV;>36+U!H_N1(`ew
zvpba0dN;`yA=}{r<YNU|Z<qR>DWL#)9|H%`jS%4XR;rOG3h0`E@db6us|{0Od?kq9
zB#8>nt?nm-F;c0LhL8fxLmHV54c54Hp0yUWXR?3l@F;7ES;r$d#QP_WqTUzSy3scz
z+7K-tC~vd``m_!G>b2f43T5E)7R*5uIk@2Jy>RS^RAM_FTUb&D`m3S~&!_z4<!)%u
zqbFt0&uX^5^Q^M9EtxCk=V9jd{QT$5+@@snBI5O;=d&LlWw^G&6Wr6w7+o3^aM0_y
zS*3q^6U$yw#_777r$C-8BPe%;wyMt>KH+e_n3V&+j=h(T<AYuVn$Q=-{;jH$PM<vS
zVH-m&>EA8kF2=eMz)t!>+jCwyKc`1~-C27ceP4ruBkcb%O{%2MStZh-$^*?=C3Vhj
z-Jb6ppo}^DQB68@CP4Sj$FqTD3!v=jUm1Tpvr?x@s=3N5r)JMG?A6|IyEFHCl~-Ol
z?v;UtKcp_et=NFbeJAs;Iq{0T*>vh)%=cTT!$X$NfmFI7c5V`N5*f!Ug;Q-<rvj(X
z^kxigvrC-fqKUX9(M^In8OSp<B8GaKM6BI~+1DjT26yWHJ|-qfBCk_|A#;Js*W7;v
zL1sWw3c8O#6cL3%Y}8HW+tV;w;xn{@ScKjBQdGHQffe2`&~P&UBZ(q3|GFF>5*CEd
zqF{rw{_H1DY#Q)qVRAflm;wt$<02f{Gl>vGd>}oL!2>DF+yDHf>X9z`9oX1{EEzuT
z;^QtEVt6AvEs;#ar$c-?Bpv)v*QI|?C*ji$KJAbJds?B7FT=+Jd^{l6Xp|f}SG=89
zVIQxbJh{$}=U`p0S|sXoG!&s77ophVBttuJl=+IYYW)neFCRn@d28Xy1iFHeAxGSo
zoGwJ=3k9Kmds_8I;8nq9@Ta!(k@e0@cMLyJ*hnDhh~NV01`jSc#5)Cc%QJt+CW~82
z4KoP*@v)GDhCRM6)IXl00g&%SxDikuMfi+gkAfs=@V3Tboayy~&_BgH54qs0A~GiU
zGcqE0BXtzQfeOaMWh$0Bh=PA&gBF2~<q5nH??l5c$Se_YoU)eV<7@J<MRP-O@m-@j
zf29~ziSmn)jojj+d%*4$IA4F$vW881KNz|kb0V+H*3c~QY6=GXWC7SnuK;_MTEz==
zob$!P$nA+ui*@U1De-2B=@GwaJ{`OK&goKaf<Sc%CM&!lrV8(b6O}9Uh>mxBoKKF=
z-W8_CHS^cx8*0&-y9qm*$4)M93c`fB4wU-QSoK>ab45pYiw|diJez-?I>7cEHxPzV
z^TmyAc1Im&u8|Wu&H~i_6}(a4uiU<;Db0x}QrYcj9A4n(iCvOjQUviEDWJ?L(&j3h
zP?6p@F1_OED;e1gw;vl>MOiXF#~vdbw$n2U99g?ycm<=-5mnHGv-jB~vSF0!-@k*V
zvppO!Eof42q?^3a(w%?Y`xuXa58f+W4Xy65;J8K?<YL_07?Qvuvv7~|!0v)&qZCBt
zp?o_%(%!^wuYUhJScNJ^j3e@hN;gGRCj6vQLJp}ZKC=AX+jF8wlj6K+dV5~P4tx(-
z5&Maph+W+WBZ`@S<Ux<z=EIKXJF=U%9eiBYky^fQ8l*<XCt`nc`-!l6!6aBcoB*p=
z3{q?FnD|xlGlojY87jX9XQ<pWXQ<p4XQ-$+L*>pmL*-#uL*<{u8Y(K*Q2FPvhRVMW
zYpAGML*?FBL*)*6LnVVZTxJ-txZ#SPV_Fk-LHxBS-aSXTV||JlxpQe#yDQOQg>8Qs
zJ!Y@u)1_8xjLLs)u&g!wo%?8x!X>e+HSCr9X-v}FvAi|(omCR7R^o+mcZy6(lFx)f
zE*=OQNI`d~*kX)}S~el+2d@fa2u6|6WUK~Hzbb^)<5^0;JpKHHCEn%)b7XSjRi5N}
z9L#6mpQ*(rn5A0+@x?S-ZEUzS=RB6LRV4G5YVcwEaO{70Cd=8Hnl?pF2wWtV<UPVD
zroZ)@NR}~|Gd3K13@fQ9f}Gla#>%O(ky&96Pg&1fcvh<)<}Tc=)pv3i?$?4S22GQ~
z6_|-!4o!f^VGIKNNLrmRQB$(xh@X<wDQ<-hZ>T65CBSdU9$$8=60Nq9thN%bwi2(l
zqNrBo$mM_aDLuC0TME}~@JQi<<<An%Rt?r{uV(BUjP<6YeFR=7!~(<U?qSW@cS@!|
zL~ojS4IfNv-o7V%bn=5vZMHw-?m0FLk;ju-cfVVT43qpk&68!E;Xdd436m#bH&t!n
zu6Sv5M?D}eETK~6rE(7NeO|m39KNC~n|2s;1$Te`nR!(Rr330)QOO3*X==*i9~qv+
ze&{uHiEy7*dt#4x)gj?SUY!!|0<Ct$s`IK76~A#>X>E~dqDV*ep_7N0t~1t(nJ;7$
zOnv}js#j4#f+KWwLFONnG_~6w@Ell1TU|k0Et$3&GHrEo(pGO3+B#c>wsu#ct^E~f
zD~*2)6$iXhbRQbj*$XMIAH*|c5newU=@8IhxG%0%#Mm!MH{Uv)LpswXlRb_QYM<JT
z)n#Nd8!u;t&thafUUDLy#Hf9|9PA+WB*6sYB}d`22zQ|6D$2f85`C$p_N5Z*OC_Z*
zl~`XYDSfFV`cg^ni;5*BYG=w%sY}bIv#Wo!_gKn|naa!3-kZ>}>3lBzJz7}J1miFD
zV+9tR*{#YV87EY*NX7{jEHdDMY8E-D_4oVV%OY*YBHbUrB56|p-SJ2x#v>)r6f5MB
z!;nW#10LB4c;qDHkpsfxn`o-=_p(d-AHpuBSm-wopNRQ5%o=(VN9U6R<J)vGunm70
z;`7NRqyh=(YBtx>j~2(GE)*p0#cv3<#UT|GY%0u;;q*HS=qz)Bl%kjr6j1a48cUFF
zaU-D7;)X<u<DabD%_rluEq_y>3?rs;_7J20QhpJm>vGZ(5^VW5CB!*0h#oJ+4WIv=
zTwHP7aCrr(*HwHmh1p+0-d8N+D=mN5s~fJ+D5!V#LQfxpzn2fe>%995mJjY>$1}!J
z08DW=eH_fWZ@RWIhQeYoxaP$1%?}^MZy5xWpHj@SRoJbufkvI?)a-`ilE{g>G+ht+
zls+7<mk-CM)D@AnFjDbBRqG@+pYj}jmBu)I0VHQ4z004Lclljvmt$x$B8z|QljRQ+
z&CHK16YEYMR6teF-eo2TexwP4k7<J7U-bHK#QpmS|Nf*uU(-jw)9X+8=r4Ezf8NqN
z@9@s=@b7&xxiFsDgDJ&9q;HtoQ<f1Q%82;zLV}@ri=l-QXWe`lAe!<DKs1#f0YtO)
z&_FbmJU}#+m4Ilr*LX0u!-Id>`HApgcB4opWrk$3EdWgR#Kleo$>jON3($M{kxVv!
z9VC-Y8Oh|?8p&jhWU@vwStFU`Lo#WFCuRUak0F^HQmrJ#?w~VqRsfo0mSxx`_(FhI
z(#@=U3BpO{#}r^E-K4oBiFNYt4MNf~mugQfKVvN%nPW43z7l7t^fG^oCy!X+gOvG|
zf7ZmR#@Jsz#&*USCm}La`;CosboXVxsn~t9%r7kk8cID7C$k;vjj3ETc9!zra#4pz
zDqSQki(XS`krq7`1y>VXJ2_LryN27V-b_H}wCtCT?>m!Z4mg<_Hil?*sKUWZX`9n|
z0d!qpBOy9{X==b`_04}$&qCa3x5(eE&*4wc48Bw?FGzQ2O~vmEYcTW`A7)_3pzzr~
zh3f|?J#ep-sN19@o)NtGWYUUKim|6WUP)1gKHx1rGJV4udsTGnOvlD`RqKqM?nqmZ
zuTBTW#KRycosY|j+4rkjC2Lf;3!^lF7mI{-oxZlQM|cK4{keY^ZNx#Boh}l#r9U?3
z8u<!(oz=g_me3<i@a~3b_cSsvrqZDS@o^>EbgmU?YJbbC<%l6wgo=5SD#d-@QMki8
z0ZMfkQmz1}b|ymBG()c~J-V<p%hRe`M0w|H^?Bu7L|-p!ci<Mt8LpVG0U|MF`S&F+
z1U>$kw7N;;f|h@if?U7@LO6nfpgz9v%I~kxAyp72J5xu>{GbQxL^e<6Fo=xI>_Ld7
zOTs8r>9Jct1jqL{7T>Y@e%w&u!jca9lpJFFnjTyiwJKs}VBBc5ObgEsuC`|M6k##Q
z{q-Ox2Dx(Qquk3m%FLiG!IBtk+!@HoWPkxLo(vN>ONW06?AGSHI*kTvA^@KLXtPKv
zMbfWz(atc0KbsiD5iP{d^MYcX+7ydT;Lj$8W~3CmtPQZ(75sr>?Fiw&0^Z3nBw83i
zjCgfTSv0z0^(@FJ^4<hbt0yhF<V2J_t*Os;dsM4+7NmjAbUeM~DliY<2AGHBM3l3#
z%N>exMs|O><C^Z*=38m=NsPcR^el!V*bPtwyD=0&{zg}Z2`rNeAzKV4u%YX^n}7+V
z;{A>6?m9lIIwD-8YAS-_q`Z_!Xq=f68fRvQ#+jw$%}79;Dd(dn!r;t!nsp+k`B9Al
z-Gn#yW54OPON2fL?*%vaW52`qqM^)>_>0or{ltHr;N?oBqm_C}jGP(I8cal4iw0L>
z9jzogT2Xbh66<Is+0lx!qm@KQE6R@Y9HHue-DoUQLaY8)C^n}A+mZhw8jquZ;>Bor
zRg@jRz~U^D<rTqotT;<UQIt<c)zPD|)8fa2v5Y_4SKnq7e?i;;mvb|Q%V`C;oIbj}
zx~YG-oYFC=nWnX3#(AlE%xYTIlR-J5BW8~}ErUE?o-UUO%;`x$n^p+S86s<L1vsUF
zLEi{_PoxrC>ByR)`ydThlN{lw-ij7G0WEgawAe|b#V1Ny+(V3>+zY|Uvk)?ka9Il>
zj~Onu5ZEidhgb&AZI^+ax(v>0Fe7)o4A6hs(J2P4df}u%`#NdRzK1F6q!U8>-mF>h
zngy>}@SU>Y${kSNO#6Bk<;`P2*Q!m><s#IVqha4M^-aKAC#Y`@c<b=QvQ@#Y>FIcq
z29G{+x3|bXD=!vN?`ec9$5md!D$&0S&|a{CE8|IAC!^cjBzlrE<`ir|;h6#e(dmEl
zxOs&Q(Qji%47)o7LOiZsvg8DyH)GSV^~)j=X$#G4U`5d`N%<Y>kIF>?>t>;7(l|B4
z;4Hndb@37=`|%uKV&p|Cm|S321B?RR^uTrSXfvEP7w9d_8a0v=Q<UI0#2bokO}^qM
z*b8{{bz-ImQ_;KR%XJ(R9xWrQyzzhhgvja~T2qC!NXl;T(3(@d8C$mbhIucvt@3n^
z$PfVlWwoG@K=D?L`{Y%8SIF*zRZw-d%eOo5{dVVIdJ`3*fMjutV?-{ohD)+eetZ0q
z7DS*AmwjKzRI0DHx-dfhK~%O1k`@#-x5nayNJfRKWM3*-kxJeY)FWXijV^yE?vF~o
zXPk&csu-!^JAQ<AIiBaFNcvg!`jO7CO2V9;o?+9IPYKsGGzNE|+Ho(TW+a{cfMO;;
zFhmpQBFvIHR#o(Yjdh1n;!`~&!L9JkvjuHMYgn`O?PrzedvHC4>%Gmb=R0uSq4#%o
zp2PJ7?{97H?nuGAt-*r?Ot*h7^9M|~uGewDw~G61UHv?9zpZv8f|st3Z{PUT!$n<O
zT*-02{C1uoT)wb>g&<tsRThNXY9{>-s(1`4*~A?E3p}$G^QlZGwD63`R!2w?pLfdT
zFAGdqRTrGZ3L-d+2)&>I2iq(dV5D#|HPx=XAjb=IFNI4lhwBY{3Qd1W`21QZf`uU;
znm2)^AWKztDbmYD6926=Tv|nZtg?l)NUH88LRF)@Mo-g~>cnBi9%;eQfZ%^5eMn<W
zVXlN{;K=eYny?8~o-(&))A(NaLnCkHN-Tw^%#l}|#r<Dt6XZ-m%iwV)>dDKi`55=3
z`M6Qd#|_!8qtJZL=&^rZ@x#0@eOX&Y*>PrhlpQ9{(C~}9lZ(-Zy_G4NHfc_wN+xZM
z@NAV}6;}OHG9_~b0eN{-a06ru$37*-cly!8=0V|{W}afOOv>l!47Cq*U@{^}6?HDd
z_2CnyjSz&%_u379gqHMHUR1+;ZNE4_EPS{)SvF=f*IKZJ)oOnwX|vT`ej>?KBr>L2
zRQA#qzvZVsu~MIyF+9NIBZZ)!C`H##j&gOLX-mP{^HqI9Q)>$!S@LYYH=sOA0Hvq!
zEO|k-F5G8gfS3Sj3-g|x*BC;FI5dXH=(!+BlA&{%LQbUCMKE`}CbTAm#MAttMu0OR
zlmh1aDJq&qD*%6vHzGsV>;qZ->U7${%6ckAI#TtF{#icI>?|G-$~HE%Jf$OP*7;ux
zbE``{gL?T}3C;8X`H3_3ttlP!NUcGlc6Og{K-?eLFxqJ3(HLH;ln9;#=wtS#m~{zM
zT~@wua0$9NivASEf@!_2(>0Y?Z~1?pE&r46T@D|b*sy<blkq~@!Hx9}PVC3^c6*5J
zcH4~;EZu|k()}?a>Uw{yCD7<*lspM1593KVT)~rYy!IsA&XaKT6L}KOqMn39=1Djf
z4uo@YaTM_+oagr>ocubTgcI45a8bJ{SGDu{+0pUYYmIDzfO&p&(5g2zQmJYO=jRuV
zkM$#sY*l}?i~8I8VGDn3SGB`~v%~ty3I5utYDe{xI(@Q>#XdIP!S#Z)@*XAZ8y)Y0
z`YO`0LjS|u!~a309iule!!w4pav@i0;wz<@+;>i#E7LtRJTp8xSP3&4DOs}Y?sx|K
zf+EO})*q@2!z5^khI0oTqV-bu5fVv;Nq8BdVzqzPD|iiP*=Ncw5eZ5_z!9EbLRS@C
zNfM%#y>BDdc|cQRTm}I`C<%()hcA^pXJYDZk*$gk3g6Aw6@)MB!I|uLC{w3{Rddnl
zV8EYEq@vL>nnnwGH3tjL;13k)G6d;U=)ayo7rWu>wpu29)xwonvv4U^EL;Zb6|VVe
zr3HWJTCJ7?SB8y%v~>f>uRMRS1O2F$R^%~!W{H3Kx8I0gV#s_v)GpXOAoGap-+q(h
z<-$z_MS>sEGQqBcBH}t)LTo-Lz%S!9unkEopqIb>wg|R7#uf5*Bjw_^p+u3G3j+KZ
zbF`FmAVzFIAQ@0s>*BNZW#7&`OF5?Qw*G$rPKCi7Kvo@BI)ys||D+UAHq?^KqFBvt
z0qd`5?mac(^A{LDi`c}2G3-T11YbP#>wL9{`KYEy(5(i!3HDdj1gVV0bMm22eeFQ`
zTDYp>3o*K+q6;YP8>h-|gzG=;y;l4^f#V~k(k)WGjLQNkt)}pOc<A06Vt7w=My7vb
zqiYVGG4PoxFkZv$4iQVT5VS<)N1>sj%CB6$Ma_nN$BHO6f~ye=mU|bao5NUeU(l-P
zdNUYXNqp&jXa-6=`(0t)WxP^k^moPHjx>@MA+fVy_y*me5BYHmnko?LyPL$9@A4+G
zfM+jk5~Cj8{WMD~-R12vrm$`<&0c@lumgVQep)6r?(&wo=2z;l4O@1>@7zzz0vfWs
zX<drcJ(k;cC~n<P<2XTE-ZYldBsGlZ9o^S#Qp%cVGB2G`bS~))n)6M1dY@a(-mDTB
z6vVVtc*xFUh1mBdMeG||<DP5UdE#|cu`k0)G=zo+@X${DofXpZA`4bT8HRtnxqG`X
zWb29>$Y{1ifu~E{_CW8}oZRp(RQ=l?!`<r9cu`LrC&KZs2~EYv$c)~tYktf-i<ZU!
zu=v)U{UCF8za(Qdb7+y*Nw8p8e8UnhxFYdu^Y=LpUxC%<v(s8!xIk!Rm~c=t{1Qc1
zLe1GNrkNzaGWQ!6vQi73ksE(nRn=NB>wr-c+7@W~AZ5x>&cSIF0(Eddr2t|avuXmp
z<H-{v8NK#*xMmDRXxgweZqwML8w8GGXV1l=lx*PK1jSuMK5{{+HWzHKf2!TE7ieAp
zT0;xbbxvlkh00_Qv_j9XYQ0N2VvWTr=iZ%*yyx+4lJTJWe6fN=7D<2CxiANo2YNuP
za|&W^yi3he8R9t@^5GY)PhoVn&(6h@mHCekV<r7-1uN;FKLDV*_4@+@R6{S915`%~
zEd!`-y=4OzYJmj{Ms{BXH%tSYg)U$d(}s>wD=3Za6vv71-&d~X^K01I=4by)&5i*1
zy<gk4Z)exu{E6(^6k~s0&;Y*%1OKl$Wc~{u=m1*=H8y1-RK73c=KF}752MPL=E%JE
z(0Z)EM&>03rr)@-#o}cx_Fz8Unk!7IStX(J3?qy3%_Gz6y4Dm1M2E#*EQMQyMnt+w
z<D1xmpAl|ZWRFIOTP5lp_=|Z5-V3LI02;@YA-%Qr;P~RaCAohb5+8pZhr~zOA+fW@
z7hmIxukpp#_~JS7#dibs5eWKHd~rP;PMo0_XW)mg4jQfiB<?E?IZ7fD%LhWS{|k=C
z;y}UCL$bt?Wa^``QjUPi06uO4)fh**@_i7<{~kcfyO}`B&naN?E(J{9OEGSYcA0TQ
zvUJ!oexjR>pJ;#8=9lb%a&ZE=6&O4`xTd23IvfZ?2od;P0TDO|AOewtJ9!Kv-g3i;
z#|<N0(hp1{29U2*%g4U4%qT*7HN9H{^)Y0Of&NF;wk{cyelRaPG03D|;9%>;Ad_(P
zJd>{>(n|qM>ZJiD&2$~wr35(yN&be~FG)8Q=w%!Ly?}or<<)wrKrfDnuX7YwYXQ2;
zI1j*D0O?|~{>1D<8Z1B==Otn#;S{YGLwQLd4%}H7!+^0R4483<0VCHZZR=?HKxv~T
z&=zUvSFiPPCWH(qBjL#AgpiTcfbKF7ng0IjR=B7I&PNMeGR^cIW<7G7QjePGo~2Nc
z$1j0al<<FJY34TTQf<i^mJU84WQo!B(FTE4NYLIU(Wt#pk$TwLOUqnTRcR_Jc)dym
z(KgXcOGTsRM<Rh@K~7DjT~ZjKsiD}Lnq3c6R=cNASVMO;2I=q!fpqL3XPN;be48B2
z?G&8hTsfLyn%@YPt_VZPpCCy;zMc8;SEtPa#vgwz%Q6fjmG1QO@kr<e0v&&4K}~)%
znrS~Rb5j`-9COfx5y4U*F#i%Pv)HGK$$c!3g(Adv#X-ql5W>|QM0;n>jlFM+kl`wC
zO2lk^>i+;6@u~g5He%@IavO29P>PKhKXvM^%@u2N#oAo4HdkbsE6AypFD_$hOih<X
zLSKJbJrIPRmCMv!dur4=*C6zHLnxu&P%E@W;RUA^xb2#M%`DgK>DmRqqVX!HPBNh5
z)KUWdOOd=TBC^QtPI?3Y2gsmD00=pi9s__#8fj9}@HFl@bqN*esbbsg4$X;CJvBmS
zs_xf-BPb>FQ#YpO*@2p8D*=*0VKZnAUt)jyoz2w)V!=O^I$$pcc3u!QkPYhxk}*1t
z9{u^saVM!m^fe_%=ZxZ)Axw!App#f3Y9U=JRl5`{85Qv20oKv8JXBR%!3jl5sZ<%H
zv!ii<H7a&tgsUnd#5qm#oDVNh!V*bZ!?(ohVThGjyc%KJl6;4!xdz`0@!6c2Kc;^U
zPeKp)5uiD+8$o1Ze@~5hwX#FRcEHER%y$l<2^hr%b@clhKP#!K*)T1}Sc91yk3Z4v
zMx%zz@%V6Pc1KmMZ;U-tDY7}ORFs!_62-;}JAtr1VZ56n<I7P^git7YiELlOXSY}N
ziTIog^|N)zVKe0vu2b(pf)h?>`GbEGPP<FWVw+`|aV*?t8BTEKDpk3{#gm9bT;b@7
ze6qjx#^1^tf7<(byz!^QoNe`{D6;;rW=^AgaYo(Ue1*crKwR`>clT-M!QI`b6G>^H
zn;aT7W`73k&oI)&L2marr((Z?dz^Pw-cy%>JrHJ<`Mml(6#^Nx2(@e@1NDDiS?0Ls
zq5njBginOWL^z&8F3f&2D-yfrb_3Zp#yv?<AIa%umXGB08hs?#e2`7AawZ4zPq!qP
z!L$<|r#y-Mz?TkGMAXCTCWR?HhyiaPbTig{o_$E8k#c0>l7lYMY?)|BP+OiBQpvwv
zyWvR&)tKF<Ajj%z1mOh5GiZMWRpKL=Erly<JT6eYvVuFaZ7gI^TMCpa6+RtYoMAFu
z;kXaC@x__P>M;u*Y=HtwAucq(U@!z@Np-h8-y=Zi*e8JI@i=<81jc0spToNFgTSjw
z2t`SyprBt&C{lKd=Lcl;i+z!PL41vN>i|A~?aT_^j9*-VNQIP{eLR0z-99voB~Mht
zC{p~X9`Cg3Sry9aVOHx3&FpG<hNWZkxu@C%2z;~;TtQ>4<Qf{wkHLLTwKQt`25CYv
ziO*`lNmSU7-P#O|9ewzNc8XXresJ5c*26+m_ydJHF*8_S=KzpZ6J>rMSMnq?jnDz%
zqBrZBYUR%qmdpR~#npel$*TSAd?}JaX5GMuob1d#Ugt*eouKB+NY6;9becI6_m-up
zDFuG2CJ0&IGhyfTM8;SOo^?m(89y3j79!gRG>l2f>S31WlP5u5AEpWiNuNP}U*zuh
z>Lr;i<pfPMm9J@aTWfNw>}6O<w;Ju+c7st6(Th}-PWmLTo_c@IQ4MS%bqML0;R(W7
zDjW*(1k@L~HI<Pmi8JhLnZ#k1M&6Xm?;W1o496{J@&QIIk%bMC+iiABT9Cwp?3ou*
zvg~RJv=S8WAO_?knZVR1Ys3%Kz_10IAi$4($0udX)c`<}SO}xR9boimi&R*g=$RXA
z>ckwVyubUw%us(56}CY#M+GU=(i@-}gsUl1Q((Lbt5P`Y63EtmNg>l_jS)-Y5@=2^
z9?P+RWWb;0$AO?%Qz14l^7O?>JL^GFHX=PQNSUc>x{O<}Y}AX<J?ts>uy<>Ym%dx4
zco<H2HbrrTv5~rbsRxUcqJVg+=@|@hMcad!F#tIg6p?>12Akk1FoRhl?bhj;LZ>lH
zp}MC&<ia`T=4WP^>JlakclS@*pS!%dUrJm+=F)KNA(N2lNMZJiJBhhK<>O}AJ6xs`
zw61Ey6RQ^q7vfx|>Lwp?0jO%RM~gnkDHn>y%NeL@Op_Gsi3k~5F^$3N$-y~w_}~mP
zP5_y*6F`5W4iMRQGm$0%#bo3?(upC)B8t9s+I)Bu&L}iBG`XokBdHdLbK@Fg5|t*0
zxVa$`9Kmjdu_NsF*YFY5Um_v5DTWRyd^2joh=>~s%f%?uaxtft3m6S@dJX?tDOr$0
zJF{i&%$2n>E3Taxl1{d2JXd<s^Hybf;L-DpoM(So)h+yoMhpsqr`QN)nCXiP_Wqj~
zWGd51*HV$xZ~aYGLi1@|?k1tDv1)LwTFfmTD<D<?bH^~sViS47t5zcL=Ja7)GL02n
zG6z2*7U<-mV}TCx!~z|xk}rCCxONoX&QWyy6FG{Gq8^wAb7mY0$BTd?#6C%HojpAJ
z&X0e9$cfM|;ZZr25)Mx<))9Q`2)=a$-#UUXU&7((*H9xmi)uuF%}n>Y@CuWzB;`bZ
z44Pfx_$W**l+bW=d<F%iY{D?9Czk%E(4~^9P(%a!-gLb5T)5M(Y1&daP_L2$6=Y^I
zaX99XJ_?j!oqbr0ocP7^FPFT_@;LF8U{HT&OTNY@ffSZxcrN*}BHc4NnfEXkua?in
z9~pDOl$ThqlB?EL7E7*Q-Y;dXiV^apNQ7h}?BX7W?T_Wd_A+DGxT2RfZlv%SSYX$z
z7WgT1!4Mhh7lTE}Ut_N)2Uh*vf7HmnTt2cNGDeoE%}W<#S6M7|K`LwgM-AJDObdV1
z8)||2iWaCj{CiA)zM`Qtf79zf==E!Q{gPgPqSqhj^}Cd0!Ve8hCWLk8%ZbRgoUfdj
zmF!;Yr*F7{91~)zH!uSx+Dw<GDuWv3c>3w%WUBJ%n;=!0bVa$pv&;2Gx!2j{dZOH?
z%yRdUB0VJ?G9d$US<|Pr)00HBhs}SK4ieZlPA_6H@3O^Q74u%`%DKyBQXyn3%w0AT
zxywCv9tY!lvT0iO4=fhMD27q=(WGW4NNToGOzoy7HA{zvEaAt+F#S1^;hc{JYgJ#)
zYNpX{?4$8y=2*J2FQp$lVY+gdZ@d-cb_e;!Uf5|OmDozpHx4}nY3T*zx~6}3Zns2c
z!4jFNm&hz_iFDJJ$O`j6%QOE<Q6g*BvxEuNT)P3%?cGoI?6#BLNuBJgnm&2x$?iSW
zWGmTp)?{ZfYSm<SL+Idt&}>gqXS-d~2ddfTb4_OVK>hnL+m33s36nN462M8Fb}yKA
zs|JfEoyJ>YTCI{=$_?h-OU{3LreLdKs*@VP!ZZDrH8Gu;uL%81E*B%f=PoWtrCiRt
zX1tthW_EjaFi2f9bv^@z7(YYC)O`_|uDU2wPmZxPxT!H>rxGlGwJy1|+M!G9Ds*~X
zN4;B@0{%ZXlxZPS4ws~qkxS(C<E=3;mW8@4$DOEJJr(T4={pH_;xB)tBiMF&=EEXK
zWS<aS|9D!UIKPGE01gybIwz9!qfKl8{FmZ46mw$w?q;_2O{;aj{5We3V|V=0(D$cM
zc0ahPt^l&Iv?-sOxf^ojv1ZV}YIub|AKv}*d#Gjq8BY{BgEh*nh3zn41MkKoHA3?h
zT^pftD++L(mQMluK?i>#jKbg*0AcJk>@kNeqb@pyBK&)%BK($WwZBuX_WjD+Z|SKa
zD~DQqFTOlG&Hk21>!*K_8|<zEhWd2#;TK#vTyUGI#&KL@NplYNVij|^yi)n?<dVKe
zYfU+Gkyhv;Eu*#OE&SU`vN1HARN{t{h)D*GC^%!(h=MLuVMKqyfT954-p*sBaF-h?
zTyCTg5evQ$BYd`>A~J>~=p|$foP~7Z;yqul*4@ep+xd@+#n0zCwt}5m8a<?9^`lDd
z?>(y2jvQ5rjgKG`(Scv26Os5?pdo|LQ<jqMTm?B{-`AS_N~>z;JbXG&1(X-;^S@Q?
z>_CeJKkhtCkko(f3PDoO*Rejgi}l(2iDG@8MPq$-S**`<9^%vRMXb-B9P86CADs8{
zmgI`{+4*&1eRks6(~Xb?!z?L;Vo!(=7Yvs)TR6@Zi9@+%RUx=xXUP{07v&4=3M?h-
z9?v#y7^|Ia+HewQo5HP-O!9_^b4_u4Fa?FPq%Z6k(uRKp6|<vA8(yk}&(9nMX^jd*
zc!8%`(Fki;$;Ox%vKPy#!B)QIaic+=C_nF@Vd!27_Q*u1R)EhQMoxWq@b>pbY}2KC
z+XI_cI4hA3{c2|<x_fC)EI;*$mHH%pfIW&yc@DadSV3}>r|Tq7L1bci$~ADSD<jt3
zXQH=gM(uxc&Ya9i$~7uC>B1(ayEUhVjcA*&V%TIB`Y3<n(&@(108^6yPq)bpCi~HC
zOyzlVK~IZMw##M9JZKS3ed@v&{i;Plo6b%59J7~P`B!7gFc&_%UkL8(s=cuptV~)w
zc4nrq4$~g(<14jLO8#w=XitEt*0iFy=i<f{6<&Wx&5*V|o;KYbVa6iM974_vdYXnR
z+Xgkj<6)VudAWh#14$mmt|i5>2rr({*c-Elmm0buH=Jc^?4JJE>GwU;2esYyN#XI>
z!Xzd95z*m2T@>TxNr9JSZ%Dd52mV%Q@oFBN(B?s2Gf+F0YoMfmx&GehX7blD<*zU}
zq~U+UzkX7Gw_Z^w_o?A}CX9h@;#oJkMyD3!L2Xkbn`MloNR&VtfCb8BR>VbHKw})S
z1@JM{eUQ2S+a_!T?FES(iN_DZ+i+0bTF~>gnX$lt3t=p9;F=i=ge1P7W+|vT`|0)p
zXHl$LiRTTE>GNLIVoX_}xwBpC6Tz0NHlcqr6O<Ek$9Od!*^H_@Y4mPw@gJ64FU!`y
zf{B0YJK?Sy{m@6y7^>y7`Ga@}G7a3Vxm|c;c*A8rfgzO1Z&c6rMcjuUBF}eMLeDmf
zclFsbSZwC9zS>ym&N_;U%z<CfUt+FraoM-gS9##ymCNK6XmQKFh??GAeXr##`<j36
z+||I+4Blm*V;OPzd}s8Fchk1lhF3Uut>sH?V0g6LT@4C;_yoCAjt|pvw>_a&`sRgk
zRd{30m0uhPgW}MffB%<`fI(${hK4}I#JK6hi*cP$jGM-d8g+lzat+&KDfWpR?danm
zx;E3UfxTu|xS83NnBd?SU1!`i2n>IOUzu|uE85-AAmWR2i6lFT?{M%r8~}v`*U6ON
zCRBp!Pz%XmMGpM%PC!kb0*<M1TV=j6g!Mb;9zl6sUOxP~ybjmpWvY4+U4i;zTrE-O
zpcyT}3ea+ST!rct&I@Ghj{EZ-Hm)<*?iF3T*Qk9=;9pzmJ#1V>GzK~*|4e`XVRZKL
zdlI8llj<964Cs2lTaRL+p5LSB&wpBfq92ZL#H~oT)`GMT_%*qqxRKR8V%ojxp4!y&
z9j-?DA><{=59NE;cW&_}m%MX2IDtp8LtLVs$;QLOvNS?imPRw1-KTpqZo~IOZXa@V
z!KRfAJx2C2K~@?RWCi;MW2S#bSW%KP>H@H27l3T|e^^YFygZ&VcUxiL<wTeG$!B@K
z^}~$tfhi$}9efodJXI+3*x;Q!rI<FJqaf9tmze7HC5$exg^9p~TCG;TN1Hx~pxPhK
zj5@gO|NH;_A73CfQ|v>T(ig5xic6Ne12J?!Kh-hNs8e2SQYb+G7CwK0WE-M}!idYj
zQo0N_%cQbHcFJV4T;|>bH>dYN9;6&j1Z$}i!OT~=o2Xi{8Ut4wnB1~}24no_13M;8
zAD+cELKb(LQ*+4UqKK`o?{!w>VYYYbwrFH>&;!ar8>l$U;or$UxGgF>ve)8Zb+1L&
z=nl;d!|rWx|3!Y+#WH{YM1mT%$PLyCgo4*uHIj}A#CmQV{sY_&jrRAt9ZmwbgS2^%
zA0%?Fag;xDu5q@GoV!)zT;u%biJWU(M3@F$AK$+5sfUZN;^I6KIrlYp7#m;Mzd{%r
z@9JV<*6h-7(!(W73H~cZcox-OP_E*~Wwe}WwH!UIVkdrD1zLYR{-|XiKL8Ud#ZQ%K
z_>^0-DXbFwp@2seg*t^$rfXKW^kll5c*Yj+S|sC2@e~8e7NiGKhv|kVZm4i7wFx}a
zC?r5sdaD7QWr(^!$$Q8{a6Dbbacge5^yfKO-*O=S@>yDt{0zn2O=PS+RTz9O=V^RI
zRRPubJ(b<)byj~hk++{#>EGj?q8i7{QBB9SdIM9{iq3AHRv^CcK=JnAB*)v)j8X;U
z=(8M^e04f)kv6I7$LYs>m8jlrU*~w&ohfH=-p}zaXltr>M@Ei!c|c%N80qDBS=NbE
zbsT2Z5o(Z*!*mvqd&Z_;XuL$>ZCbkeP=r0KCk(lbSMY!D51IhHySH5tCwpi>+zQBU
zfGfPPOFbR*ZtJS57i<6Xf%pgX;xT!5LNDHsWA^AHIeJeoK9TNAdeI^$4SI1({2h8R
zB7gbxVou(6>BS*Ac}6e(Aaz#wB{!f`=)sz;@9tLio@3mqt#5DcmCG2bYL{#Vy$X+?
zJqO<L0`Y(HKpk^2xw}|8K5L&}G+tlSo6VYL*|;DFcvO!@tP)2~Zy%o>Hcs*4uyOY4
z_~P`Sb=)|E;v68kZP_rcc+q8`-3FT+sRnrQtbT~Eg>OM&+hlfnspQLx<D=L0uoT<o
za*5_iy?!1R@W!S&#pm^li^fI$sK!oxK)iLU1nqx5r*Q5yt;>&e>}hn&x-cMn&&r!y
zuu$M~^Lcr1yGZ(QxwXAl*^;cay$2D7hf8GPUgUJa=??(g?L08n?lcF~?sOHT-ARPe
zGkG6R?a0s_d?C3G4eyxC!C&?tJyPC>2313G8EWyvZx0^)0Lsgs;%LHaX;BTSxX;e{
zyP|*py_DtrtK4FK@0XGCdlD{fdksswhNWG@(yn1?GY^)p*Hmin4ergVPncnpo+8s7
zv0rr0FGy4QUO_%v9q1b|O6_OG{bR}s^*Y?Zw5$agWqfs9Iv$qJ8m;43f3%w)4i7;R
zm4X#adPb*L#nZ~?D$_+;9qrTRYclZ$2rYj|S~<T@Wyr|a*@)oRPjh{p))4u2Bjdf(
zQR$+7SU>()Z#R!$pMfwgM!=Y%2<BT|bjMYhAG-u>+qF6~U;?GcbNI?Zl6Izl<ki9P
ziJWkEl1);5JyO;C5A|k?R|TYbR<gtite`irZZi2%kro6B8Va?GVu`JEdHvv7YGQv0
z336M;Gt<~Q<TOH<MT7gW*h@Vc{{{k&exMfv88=y?^wq-wiZzdY`;i@gUkKH1?QOGh
zR-*n5UGZ5O?*!Yw1A@dm^BRL##@JZ1cBH-!Oj5cHH=V0P&{%Ljjj>k(mQy$6!GZC^
zyeX*8q{kE$Nr;<fTv`KUU^oY&1|WYQW7G9@?a-NxQMU6727@gP3l+Rs$Gi4G4g_(J
z9)H(C*Qn{13a2Q?fvm?)b47TaCdhz=u>*8!=y*P`MG_lnRV%0$=qBiARqFFXJq2QB
z;}gLq!6uBQdayY?lcI%6yTEae1axS3Y{5<ZiSq_ZFuY}49rs8V9(vZmHqd{{4SJu2
z#!2@Lg((HykIpiaDy{ytj_?{7i$v(l)iWT=gzf{ognx)=N%bbt3@B_ANwghs57e^Y
z^YF6^n<w}_{H7;Iy$G^wugnfsY~$9i_3vn(nPP0w)6UtA72L}%&mOtK9ditFfKSQ1
zipo$@NMEEAc$k|)H9oXb=pcUxDH7Q_mO6~1LtPlowHTiG=!D)+{ZLnpjn8S2&uP#N
zD=1bWGBkflPlL7{Np1UJ+5VoS2EZyoWtu2+tAR+khfdEt@bz+}#xt(>@J%9wM2*=q
z{2Hp-;g_&}yT&yg{OTdEmn+=VS}e865Bgc?_>KV^5_THR=GCA6?{9xk2SnS@<Xcbi
zR$IPR!#lEWcOH+!lKGcs`Y2%sh5|o@e)?+qDc{CD#Hgd<ZnUU5r>W`^u>~DJ^LZX(
ztfqc!ugV0_mkD4vP8UoI`_Uv_Ec0MPT~-1TRO*-m%Z7Gez+c#8)WWCVEYb<kxsp1`
z%U5)W;X)U>LB9q}Co_Mgo|Ot8pc{pr*`;S<qAkL-U1vPr*CI>;RvN5&KV%Ya2w5zs
zxX+jYr{!jXmiwq<(+)C20K8(C5_c8U-HtJyVt9~hbTAQn*c--2)1@R?L4Wx;LHU9!
zy-;AN*f0?EB=OT%2kndV<D&v_6aJ%das2xD3<_LYu4B_s&me#FqF}%~un9~5Yiqw@
z@){k#uQfrEzfJ=pcX&}hXw?NpUXWKA0<H8KJ4iDi<P7AS{GmdJK>2e)R3Pxj3!(x!
zhb^-pZxRP>$3<8-xaI1R7BUf*wUCOiFg?sKC71|}I83f#{D}SvSu1h%5j9(?C#?w@
zy=piZt3c}P>Meg@oF-$C<Z-Ms#7%a`lDw3P?yz|h-9g6?r$KL>&c)3BNWB)SO{sq^
z5(|36TchlaMO14d?2QGzaf9Ccy$k~+V6yv+$AY%l(v|!W)Tjm1B16XiIvgXGK%jj%
zZ`LnbXixL^H8CJz1WmD;yy-Lk6%+x1GG0ydym8j7$LoKI-%V8H)U?!xFOn8?;WaQr
z^Euabh+hksxmPQ{@cw1K@P7NP=zsRUgoWWp7Fr8mDi$&-&iuJq0G$)@_28q_!`^TR
zjf8U1BOWe`zj5)GxJg1OT(P$eDqu=hxKAQXDv)q%9X-QjNj%acLqZ|&#VhR?zVRTy
zHy*_BjnRKhjF{8R&qaxRZCv`JTzXY+9lmM5{BV47)IL6Y)oAmDQ9pv^gkfcRne<C%
zMV;dDA_Ou4x!ajcEWi2Y;1ObN{1N^}%N{>Inm-bUNe9DW)O087`;<V|kKp@GsWY?2
zy<@u%S`4Bqlh2heFL=*tn*wS%!2Xq>n>Wc8A=`f(xF5HFP*cepI#+rz4m<4C1{`#l
zn0gP!X}D~h!gda&c6wyUV2ih7u*HR`{DlsDVY2KCXqJHLCrrbxP00kR#`UI8BcIq#
zMMjpnfSH1g9InWBF}{Ihg`fYd(Fc?#epJ!2cObVge`EV?<7NBe!&y@k13w-e(F5dx
z=6Zk9Pez43;=#JoZ`eVz)z7Z*TYe$@yn&Y{5CjH~vLMuFo9S()p5U+KvO+Ij372r-
z4i2fN6*y2H=}|vbF=-e-G;EZ`&@x#t3N#9(V8H(eBt~PS14Q$w#}qD4L&_)p3Xzx!
z7_Q5<H+2=hu-LSqBoBXKrmULJE+Z<gYUqD$Az4!tLwqHw_bJ2$TNKg7E3Ar|_&EQ4
zVS3KY1!cx4Mrsbr_1Mgca*iA}IlGVX?ZSv&R-WQAYO{~GY1jrCrw{Hdb#N1_Q9Zz7
zwBjS2Iu2cV9QyY$4m~ywJb1{woM>byvDu!8ktNggap|Xy%fR%hz~?C!k7f7Fd2D~_
z(BdmC&x|+3cyqqYPE`=EGqMnWTlQr0B9t7+Z_;*$b4FvTgDLA3bM1s)&YdtU%B>BH
zvENcLX`yuPW1&pgLc#bXTqbPAXk?JSEIR45C^2P{spaB?;hUWst}*dm_{eTdyQgbL
zug4;2fCI5hG(w1{&?Y*U$46Ko{KbEAYe0xFsdtd(9ieeTycgWW*Mc9?TSf;oKgX8e
z;kPux>_B=@s3^T>+Ncor<oEb3={<g@D7eeyH*H`0%@3UEVb+|jT19SAj|lLW_c8O=
zZ02c19J!K+!!;5IJf-Wn$70^_NR8CxaJhsv32iEEGfo{3#r_-iL1{bUgVcY0c10eQ
z<-JkAj}dCJ5gI!KO>)U4MxdTWCr_NgA&s3>l1e6QMktr!1v5#z0&0mhq|vNqJ|feU
z2XcNN1KDB&$pRTA&tPIG=UGEZam#XZ94wuW;bhYNRzAAliX?>G#~2>4F=TeUwlI!q
z<RpDG8|i|L!akXAu$0C)^{ao=nIFCvAHV1*AMhr^E2%?#AP@23eGKuj5FSBWYg?eM
zY2+w<bPrQUm+nc`I>lbSuDA5#7=1sxkKUZentqlc<_h%`IrWh)o)_a%FcpEZ%s5_#
z37YiTH2!QHPykXut-myUJc>W2RDnJ^jXy%(M4z<dPsIACPfy}cK}>)Z%3d9Rgbx?w
zg5GjVAIthp2Xtc|@c}yVSNg=$FN)+9y*!7@1=-wszL%v>{z=uyo~%Ybt32OE!-%bK
zRkk*Fi!|1FZ)<mJkHs24-`>R7SrKb2D@0<c=ra+A2a{_J>~G)X4JHg=er@xG|F5_a
z?1lf^Z(^N>HZT865N+$Cx5F-fCIbD2hS#{Vc{b@a3$j6*;gcu2`Puzav*ADDWTpbJ
z=@feb)527VE>i>6kT2|6dYJ?cS{^liBf_6<Iy8pz&>1^!Rr`;Z^}~asU5#i@suayb
zg91i(G;k4wgcb6sjmfb~S3}D;iTeGHGj9%!o^w^z%7w~wUf70z<$^nZ=orwN&B_+3
z?Cg+osSJ}=U?nPY3Hm>Lsx1~|%CPsbtx~OJjU=1Ki<U4029wE??al02<n_FL*nFPV
zhs_<@2hRkNuSa{4du-vg9%f^^(OL4D6)M_C>DKM$E>gvvP9I-t7ZxmHvw9<1?1QFI
z3Wf#EWs>E9QE6^L6&N~ye0Bs34$IcXoO_Xo)zes{pcYiC(YQm64P){}XXaD4oyNy8
z_{1UxrIYbW_$|_MX25A_KY3m{&p4~zxQ>H>0Fkj+;Qx`natHJ85xW+6U;TZJzphn%
z3KG(@JgWQvvE$ytE)4?aL1Iuf&>Gk5lb)3PHWb&GyG5q>YY0q#$u(ix;fG@%j;-#9
zOz8Eg1C;p0G%iihQzL{@mr_=`M6{%8F*Ke&;q_EIgq!SXW}8{UKSZv$I)RA?@&_s$
zxvY75QSW`WzmQ>|x4E%&86!ZFnCUkQGLTczE`h&HdFD*7MhTysEQ6p&u+DaNwsx~v
zO^dRcZWgNvd5IB!@)G0c<|R%|#VHIMwuF!VXL^Ar>T2E;8nf*ca3`Rf%ch6cB07Wi
z|BTG*z6*2V6|fW#Aw&oMPxwpoqo6wz#QLClms`8#o;g4wu_zKXI=<(2DM-$h)$@mR
z(GN{)F!Tw{(111INK4zp7vQ60#&^x5TFra%#7kRAnl%A`ee(vs0UIh@M6-RTBzmoB
z1in%=2yH;sChYU*v|7Mt5-ZFpVlY-$C8o!}J|hOMUz5h6Zav>AXG%ZkJm>1`J9=@c
zUYt8S&!0VGa?tk9?(=6<4g%rFpi+>&SE-b@S<cn7&F#uAwlolv#<XOY=Nd7As+T2R
zlstBz<+pEt&<$I<e`UC~We@Pai2tP`pvXEsG5dZZZ<p|g7j%3RS-pgROvTh<+}?(j
z=J_q)FAE+en|LQ|E8}`Vzel`=_@iijylcrC?MOjhmra|7R9*p`Ooxp3D#Wp)Yn*?D
zE^@KB9hq(iHm!ZXW{66vF8#&2Y|#ubLsSLR3zXG=DB(O12U9a7dvwMk^`by;L+bGT
zYi79Ypw+~h4pDvrj@fZ~*Oh=>TK3R%Eng!s%$x-Y84>0_PDM?Wlh$rTA0KV<IfV-`
z8ILxhH%JqwsJuyq9lcoUIL?^A68sb|iW`h!beM-#-p)Pr@V#Kx+oYNq@4Xv4kWc$y
zvy<k3dn_cTR5%}-=qDVS<7r{$6*|`ipxfA#f&oHzK}!s%2KR3mz#X1R=vALS9YFhL
z9c1%QJrGuWw(h$A$nu#@8A0)$TAnvEy{DjGAyw|o1_jrgIxb=*vEB}9lZe?fIQ}G&
zy|j;fJD9G0=~_4GsC$?>5=&NQ$*z%ns`$x&DZuLP^kd1vn`-QA2iUmWXL^-#28(a?
zF_IJAgK6BNBj8zZ;rkRv>KgNI+uv1Xu&$$()|HjA0B@OanCZ-ors=1kd-1$bOmd08
zcZDeUQri*wir7+CO#Fp*`~@4)k0N;)K`<6i+=va2=vUCEM1kN5P1&Ga_wm=F-Yn{W
z^&(x(^V(=Zo^O|*=U}2=m-EhNdwaXghQJvia!<5SFy_hmC^FBja(TDRQgt~?MfSN{
z-l>$4eFArV_UsvGh(r9svr73nIs$E-CTkZ#;)WW4^%p_j#ujYB`-6~qUs9GlU|qb1
zAJgBo=l$K@-d4rzKYwQKZ9m_7wz~~~tKo8>y^s<T1CjLV=N3uZd3e;M)FM|p72~d{
zw8l{RkPH?YQ=XN|1g#fsnN2X6?h=@QJ)3k)R|t3E9Y!ka|37<gvm7~+tc$Jn7D>z)
z3m8UaWhVcskd4k^Rk6Bjx=7ZLtnTS%^YDV1ND|E?kPRToVv~98noOn#khGA0WRgtM
zLMtt_lw>ApHQL;_xG$hrkh{k(fIudze`d}(cgCiR2_SwvB0M}iBHTX@&iee80+?X)
z`6i6a)#GAG0jD0dU+;Rt8&a}rpC8o&b8K#O&B%a%8+fC~qZ{q~1Kj9mfg8R1mxFEe
zstj#J?#(*_&*-iA`_6QCe*5@;;C%n_#OAYO8oh3UG~(br_d?$A9rBzF!))|Q0v;I%
zJzEW1CE7=AEZj%czB;QuX!FHW(zP8`jQ~^Hs(~qiObmhd4%1uM!NZ)}nZPpQJ42w6
z0A?P!!J5#fU4uCFYWq7%hkGY^L|83CZl(4us?jS1M#&VSlP5#sB|*V|F`Wu@oJ||k
zUGmU*Qyx0+dYN!{A|Pf$aROIYV}xura4mrgr?A@I!kiT;rqvYC3ggll3dDI4-Jpp+
z-}InqA}BrQXv+!x{Wfv$sY*X#vTXknk05T09pWAQrprFuI^N>>i0PsPda6_)<(hCi
zsGqG(K%Fa6L|;E{A5T4h7jY7wIrF;GU5CK>0fbLHzEjKrYcbLe!Y<eEjI+A7%59=&
zWy{dBV08dS#c&=QY;xhRvyT(MXWNPjDB9|WVR=gnWaw#EFUG+WD+g8FuTgm8nGn#C
zCPy?l{zU`9R&226k7!-*Qwn@cclAnLu4Z#R=PnZp(Pjq$$A7(lf+v<kfy+(YmMZNG
z@s8M;vB@}V#_4?oVPel`V~P7LjB|3>E0IqVV{YXYD-%r`4m!F{y;y#7M957)e1$#<
zgzn`1EM6E>nvpLg5aZw(&MtrA^3`_|;MowKxz~N7<6vI9BBLh+x9)Rhx#Ac@)4w5}
zSa~E*ETC8kMM?C3d-Z~@2#f?ExYAbw7Rh{XZ{KC9eJb_eu89jKXiX?Cp0V|>bO6Wu
zhpz{YZiTw7V$KeCxr09lJ<aFSU45^<h;8}#9Io+4>Pibr#`OmesN$sEZabd9CS&hy
zs*PNI{L<P3Y4o~Og%7BtBbRentQH;=%+b6+9Rj>(A7S%<XRMX}wEb=y#?syA8|NQ5
z{H;b%OG{^buRRxCWLbA>eRKU0#|K}s>`M-$rcuty#|L7Mn92<vKRqBIuZmH&VdG!m
zZaNy+0H^8fOah}MEP}l$-vS`3alF8pdcMu#Li~nRJAw^+09my9KK!(uKi{C4`~QLY
z;NJtwO5GlRO<Pg7wqWas6rchbM+1C=l7lv%1(~#oT$B=>e?{D4i-u;+`8vvnSv-YB
zhP=qyy7LInJ*&IX!b&5?<^<7tjFSr0hZAF4Txxto8;eCv@C0zf!e&A-h3J)PbBjke
zmwf6<&1DH~lBJ_H%T(KvdDTc>a;0E^Vo=~vFR3$sA2j2oFUyK9U;ae&9r=INMg}HJ
z)AUG|l`lOa1-$qORQ@4ezugOoqb?Q*Rt7}G6eD7rmn0HPyE<D?T~XJKdTw;giPAas
z(PyrfwQHnNs5lZ^sh~T3;W(Brz#{PNDKuz{&pB1KwWy%9C{XhDS2)Mm*rmRKZuQu`
z?iC(?l*n2UdPw=4vyC1t7n~UdXOAtIoRIwHF5us}vt?t=u~BoZYZf*y`NIRzP>G%t
z&E>Vwv|onm`#VVOi+@P%rBeHPiPXONS1h&f{+?3%=5HmnZ`oOJ&x5OU=6(0p#ETW)
zvVr!eX17vW;7cwx_)G369T+atq{!|5YQp}1?D4{0!HnRX8}L7E3jdXV16rz^$(DJ8
zJNJTHj4;s&cmxW6*Sa7x>^Z5`mYjQGaS2=OkFF@<X_q0WOG7EVmp-|eAPDmID24)F
zzXei`>-kC8`4JbiN5QTZv{!#8LHqF^f_AB(y;>q@kN*`5+P%N0pgsOu3EG1|YiGuP
zwLClwXITc!{UMu3i~cgg-!BrI2ftKD24S<egU<Vhpd0S`>UQQMik$-#JDU80LgC=O
zk=8$JV2x69*49deVPGo|Ah}(NQaMF+DCLZ<OHP?Z;kBYe`U?vx5P4)tVOlHB0%_ST
zj4b3GZYHfkvdU4b0e({;X0^AtU5b)_xRH?MZPLx*ty{X)cw}i9L=N~7k311oN}dfO
zrY>T`124dwkXBhmcGn6o&?&cJH(<h28ep9UDrb#1?h$OW5O|F9`5f1|SHVude4F}r
zSm$2<W1U;N&b?i-&h7szUgzHbJ=eMYztuW-7~o~6T*!X-)fTeDUtuAWTC=Zzfa_jM
zSqC(uhr5=N_I0nELptC!opZbiexO~@w>kg?#U2UUAHGFDfYL#|f6mll{}C(O|Gi>a
zG>TEQ`fr%>c=W$*e+QMnR9F)HQseFZ+vB%8@6L{ncaC=*aiabqh}$<Wh^jAxmvcsE
z=hmZn6=j5AnPzOrCTz?`^2q*w?IoSm$87J4euV7X4*kg4hy&DQ?1w4+NYTtu+5@_?
z^45}%1a27lFND-FIy`WU2Zy=CAcovA&s|>M1E>7#u%Sf*sHVbqMoL;$RT_G#el3-v
z-T-ZrAOzaN(xzD~t$OdwpB*-7I8f9Z>hgO_4qUEl$?>Hnt!S6+Z8f!jar{}%V0^IU
zu~ea6L+^}(6nZC>y;H}O(^<{84jVV164ufy+QwD{KAqltYe`)zzx>|J@!|bz3;pI>
zOX^zr<@Y>?iSMVmhd-MsIBhzG#In*Uc<DL?f5sFX`i_VA`QpRj4iDC2duyZ?*jFl@
zc&?{7swO!y(i|V|>>urayeidbytAh~vL!W3)xcsZrG5oGI0|y$!JPA8Gb&u*G=Fp0
zXaP=|C8zpk&B^i4EZO)6XU=HBSaf;%Ef=zkyK&D96YT26X#985h{Jzq#7i~e*sc+C
z@4<ToK8TjVS4n!CI82}p>Nj(i|7vPh`ZJGN1K9p9h7uf*Z(gB)0UJDdN;wPiIipZq
zi`adiD;J8*tq7v3@cEo=udi<`EHSf8oOSdZsNf%LzUX#0xbeZ}dXL}_?!{hoZx(-%
z#UuY-ny0M)A(aLp!U_|Tyb80?mt@W5-xqN)iH`54=|vV!FYlyRbJg=1%`%0trhm^v
z;Q9CDgnocE6?cArd)@HkpKz<!-|cR`>Arb`W<6-s^SkxoMrXK%mMGeh4qlJPW2fXm
zFO!cpyW1Vd@C=mYM$gCLxGT!d+R;^eXS>s3=;TL_C)*fJy;M!szUv6Dd+p;V%X{<Y
z&C54kMJEunb#9?E9QC$CZ4xVUkH@2M6zbd?8|&+ko2YSrem7e0jeFyUMr*5DUm-TY
zx6Sd^__@Pi|MoJ>bjJa|lKHIcXVTrVnkezyto?F_cSC#IGkVkc-Sh7AC|t*gg>hcI
z=fUfaI0&R+){FH<<LziuSqj1P@O)z^GD>r;ku_`d0!BnT0sd|y8g0DTBw&Qg5VipV
z;NUPE#gMmu%9O}Rz_$@+VIKHhxYRGo_^d}Aa;*K1lQcmmW%NORhxWM2{8`4M8N(=0
zByI6*7-5&oW@Wo+`$ysDYX2zxTq}*GDR_)x_*FESVEabE@`^5}n?=_Sx5}=)Ci1`G
zHsu?g&b&6A%`Ov^JKgEWR-U3?f&g!5iT}5|Jr8PslG9n+Za?h_Lp<Ju4s%vppZ~#;
zNvPGmdb{%3`K6#km({L!z#Pp1g~0LeK@#r6Ab!oQ)zD9lTKOitjwisqPw@~Vddk7&
z*-P~K*$an9^!NtSvBUH{EmHPnG`Wdz^U8Lhpb5)?C!Xd}7Q@s#7Yt=%7G`vDyGLD5
z_Hw0vzHfIdz0c6V@Jngn-`?2T=)J&HVhU6{`}wv9+ZB|c*^!XWPum;3w%(H3Hfyz^
zE85Skt-Eg+;bTs>_ky+fe_pMXRTebp=(aZ-Tl6#QK*~2CS<fiWr;`weN=h9e>5TGv
zz~r0D2d~%JeEytjZLFrZxSHpWs;9dS|HD*&#!PaawmZGWb+0d~d%gXLiq|{qo7<mW
z@rJ>e-3_CPcU17Y7(4!MF9I2TP0Xra9!3|l2`pknQoWwb?qVk4P28$BaJ}5XE)>*z
zOhN1I?afD&wf?BGmh?KzV{G8YW6F9An*#T2LwTEzDX-gJUfTM)bwIXESp?IuR?g;s
zuO*AbdO@1lBbv0F$u}FA87d+@xBF|<1MS^hRLP_GP>Z={DG%-0wp2tK)hNBi%P+oy
zIUQKxag|?3h$i^2w$6J@Ch0aLL2u`dKzYJ6PrJ56pfBj!HW$~XFryaKwk~VyEv@bO
z;@Z|FhSieV)|b~N;jpY-AgbF~(0*Be9d&o7DUqsfT@<yby3GY0P^xa@SE+7mA?0R$
z&zIIGd&=7BqP}feUw0X2ZZ#!R^=-=f)|=~l{+RmKWq<aT*0;5!z86?j?=kglEv;|s
z5%ux5Z7iv9Lk{5j(h6~ao^C9tkeFff5f%12ODo(KBebwW>doz@-rCU9rYEO=^DnHB
zhUdj&D%^Nfg)f#>NWIm4OodxZD|{|1++0wh>a9f;5`#V$H7~A^xNu>OTe7>B)wtey
zT#emjHEzrPT3TaoX^k%)RpWEnVT)=+veq|5)k|u`a-ME2sF9fT#bavRT3TaQ@&2MJ
z`K0bP&Fl>=b=RMZx_@z%RNMN0BdXl!JhIA-WmRH-u5Ui3%HHxS)pGrGdqI`!a+nrX
ziDSL7A?jXM<>s;~H{>uat#WHom8S|lk2@&hq1R<}9U*+)oKb)n>tVRMt;q!Xgo4M6
z1R%#@G>)<;8A{X*gq3MshI#S?;|xYg3!w_*aDraIt*5PgHjOgZE2ThxK#FMO=!mED
z-!4>52}cq^DKw^vx+8)nO`>7(@US9&Y2=HChuW()YyhqWFvUujfG+CSPVcky<DE>@
zA*dD6*w-)`jVK+p%3Ms&PEMI|rGq9$D;)u}qV78|LaJ(PTE63R(*T-3sFm(l<LL3L
zj}yFmJMCwt8B->aMq<Q&ly={UjP3I{8Hpt5b)=&~tgepT7)_yMQ#}?dEF$vxHn4~k
z;kj;*o6GCHJVKN@Udq9Eps(AEx4!iT=<JNDKRbJPu;xNkcl27FTVna>QB~kO#p<ev
zo>A1f@d!D+6@8p$JRA`Ri;3dm5?-H2EzF5Vk|ulh4OWn?6*%>O1qCRTAIbk&g0cAG
zMm93<T&wr7i1}IIAP{m&**#VC&(kinM2%z(FNUHCKp#0LNm#@;QEQlvqEmBDP0B`W
ztE;Y)Do~lJi_kWfxlwq7!p};*UUG_b$M%6Y!L^KPjZqE?7R?11l(^RWn%g72WM|tY
zU{8uLXT3IDU0sNOyJVu`Kr8wCfs@l;$CnsA<!Cn&N5#?`d*O6Ikn!QPe3$B;2MrNa
zK~N1%JgL5&TcclzN7X7oe2;__h(TshK+}rMDRIcqPS6-z1JDu0lA84_CrC2S>`-kf
z**GtvC6l6TrqEqBMaFbHUl9V=|4i13muWhQLZdG@zRkgZxM{Tz89sf%xX?U$?b>2h
z3W%~m8s8Q&0;gpZ`$<qIEi*<w79qrwAhUzhNdkCu24p9)fw(Enh#3u?2!efq_8$h%
ziRNT|6*yIt#9TDlr~aci&Q8hjQcM&Tx3kUT^%3Z-;~_qSF!T>jWGFwGhH)!&Kbo^s
zmT8+`_uQp_QV}xZ(;Gk_wPjqP=C-^HM~BgmvnVg9Mn_W{Hc)i?TXgA%1UMFL25_S7
zLf;m5ReGWZdd_|edXA#(CdwX5!tQT8NEkw70^0Uthv?|H86q+lIuzlre+{-b@-)tX
ziUVQ||56$m^{n<uJ<~p^ck1_|4cSr<qSvtHXlEFIlKzBjr>O!)5m5L?JKhnjSjX{o
zl+FrEP}{<l+Z>(*;eAmYdF<4iS3^zx#<-HlkH?kV`v<P%&%%{F_?Lq#xl>}|W5Si(
zQ+Sg6?}3Rc`R>uUk{|!0!Ik_da3veiI?<5v660JAYLele4~g%<SBHUaIzk;Hoa6|>
zKAg;dMv*h0`)@0|ueYV*OTpz!rAB1M;TMC%|I^XIewz<fJibHp5Nl-uM>6;C5vpoh
z_zo&oLaBN7Lyo~99f8946q(zxq?nswyI+?M1-M!&17LE`MLs2!5Qy8?xa40%eLjW6
z^r1hk+e<w7K@}dsu4dV!g&0vSbP)~AnCYy4g%J9I5jmYXeoH@wp57y@t_tRaHf8Ak
zlvuo(lwOMyrV3fvZ@^@a2N~>SbdXOOATt5g)t3v?f<#7mOixGV%I1mtyhG5|?kKo?
zc;K<OJ>;-}Gt#L2{s2K1@LzgDzZZDKKlm&S{e^))&Cz|dRox&I?Dqs{y>BeDhkO)&
zWo&hiq$TD8{pTb+byGy#&bjmz13L8XF;0c(n|V&MdQgDu_0=jH<>}-mf>%6>e1<B$
zs`CdMtfw3Xu8`<OT^$(N)@dwPaF>ee%}kXi#i|b7klKeXN)#^DVNvx=sg#EJlM<z3
zYfB;PRgO2mMHIVlg9S0~gL@9z2TLe_I=ULY21ImMV_;cPbFA5xe$N?3gGZ-av>iS<
zRc_K@aF2cA=WYjs$w6ND*#$17&+xkks*GhjDm4K&tgS?r7!5d_z}jKoc7$g^>~786
z6KMXa+1)dk)pWj5@7yn<gx8HO#o+|x$LOvVeT;@Plq0Ypl0wx_`yTQ&mJxJ+8Ll&N
z&|3}Bpgj|6fG?h?3YdD3LVf~0L})6R$2thbiX8`USF{cTDn4|!R9s~LOYg!Av^k6j
z0-6x77DNC|sZ;1096RoJ*x^7+T|W-O{y8+}svOt8m9~iu*4Cuc1y;(iO2S;C#GAfO
zl?9Xls_mTi(Zo4UW)V-e?T0~s+6JCzPt&REv9yhR!XI=}Y4uF39tZG$p3XBI1>%!f
zJUxXTfL3n7vWTsEc<6~=o_C)H9aZccidz?-ApJ@VIvvpYc}&mv^RxJ5opSM}P&0Us
zVBRg2SA72rIbEm5C#L!kbHrxSUMXo0W(MyER5U|RW`YlxX-N;wL%DB%ia>e_37LEM
z(B)e!hh0w4QR*e=x9|kiY!VL$ZVvT?RfCF-7TS423~&c+b6=WstQ_|8O*!mkIwf~d
z8TzsmhLndM<;ujH5EZREmlPS17Z;o*Ny;%x?Wu8<63J=VT9&9BuD2mME_Jd{TK$$L
zD@P=^r{@c%$RJkHMG2LE^NpeTmXcafvMHEqO}As2JSuzddIVq)Pa;%ht0`%DrllE{
z<a7|j+UzG7a!zTXA$mPcg4bgE6}T|^k`E~KkY{Y0^Fi)UQi1!KX7L3E?qU>w>J{D9
zNCK|hiJ`BsG3r=+S+^XIf1oQ9<kV>H8Vm6UBh8l$5hqmQFLeNajW2^ATubOCrj9Va
z<;AEpv5H$5^C_-mD@;7ltthlPKZy`x`edD{8F<oT1?XI-eJO}(i5KZV4|<&rZdv%_
zXX~Agr_1OWWkhY%mt9Yk)5CH$Ivs1>>y~`=?&Y!qm7qK7VNvorFS%<idE>ONvtfuK
zxtd^}UeB6mOHs3b!F~@}PUWH^N`mzcH4v8{oZKRxQi3f`$O~(s+n?CPU9*YX)j`-S
zb^8lD!OsQ3S()H7Si*UN7rw6VNcBy(<4a0UF(#(xE#uYS8;t$avcx}W#{Q|o*bVHg
z6r<*@Gj7<#A>2UzC_~F=$dra7It`TK`Crf&wE2Qo*X#Iy=hH`Z(HFXXk3Ag(`LWsQ
zE)FO3?knNb`k^OK2BKpDE>Jw@a08~dUT^!wX4%cvfHeQ^Jzh~ER=(?~AYN^K-szPr
z1^6Z%Gvy02mG<_jUI?&m*yG&K`Avy&qeHv-X_)1>q6=*T)&~nfNY1H1Vk$=f1w}MO
z<l{xX_f^h+9U9s3R6sMthoV2H*Ss5z-lM@lUq@$(4yAbkn|#L>gcJJmLl1=T!-L~g
z+77z)b2qMRy^MVCzH*&1%7s(Dc*i25<60s{0UfrsyS?rsY*uvaKfZgBTm1S)CmF!H
zc%Dbu4Iax4ioksIU3kXpZ27`LTo?Tq6rNuM&L97OXry4pJZWbx9y;?eklMAxztG`J
zu%|7juz55Y5AYxB8SQPHjMCcy|D%o}pv((s$%P+r`wZ9(WH3PFOq&Mbob|ff+sh+=
zr-~a^I!GO!dXi6AYYg)j$mmxm2#Rffl$d$ui4W9WdR)T;oHe&VmO<84gmt^y8$BGe
zs2zQO#Nc@r&*f1%Bzc3=_b9?UMf%#O%G(*D(!WBeL$7|`Fz;(`b5#tw+ucaKc3_he
zQsMjAXJ%pjY;DcsC_b<*LCuHwX{T`U215hNgclfw0CcAhQ<yccV102t5li{){`(Kd
zB0BQ%?q7~~4tIAPkiX}XS>}o@h}wK{^dGH%ac0qVdK2wTCRA;XI+<>j^D4~v2`P_B
zjQUDFgV~yghs5e^9<{^Kh;pDTB5RQX5)Nlj04jJdHn!H+$!T8>d|}?%$U6<-H+~b5
zpjY%g`k!NjSegez5`{Dlh4p9-hjGZQ32?`RmJQ+wH`}FiL~&!)O43o(ZXI7nSwx3_
z0w6k!F9>D;(gW?zrjr;WLyn+F@Z=mu?&;IMm!9OXafR(1{AD>Q4M$O-lwso_gREOn
zdq)nJ77tvNr_)fFB#hU28|J>VRuR*Yv0H?s&b-u`S9ilnJZz03JTi=u;hnP<dvl{Z
zDy@Hmp1!4)wp)AQ6*d(5p-5Y>O}UAGN6=tAhl-OMJf9m;!o1xw`wk~#jZ{9NQUo5j
z$A3WxkTe(vGhy2ST*SMI*0jJK2gbqt*pmkaD8qrRaMVXBb=D{tpFDk9oc1T~hz+T<
zk%ypIx0kpPf|)BeaM)uZB*hyr^B}qsOHYu&_zjxm!hZ5uMmK0;uSIug1(8C3hi6Rw
z?&{chMgz=+Jge8Y7fv5n9}Zp2IhotS;Dcf^CKGhc1l>}C3z5mI(_75T+RdYB6lOVy
zk*N2b#oQuxBje^1pK$GEDqWjytpZTswmVy!n+q3}W1+K6<BF<gyM%SKCX+AsURie$
z7Nc<(OT)LiS}w0-4K}ZujH%myR}vGC3$2Jvq|l1Mmj(ReNei>S#cK6ajRs%QaWUw`
zAO-Rk9S_0u6npW)TXRsv;qh|VGH%V#L<`GwN|*n*!@`3b!#*vVbAUQ#+8GKnvSLs%
zIP`qiG`ljb50Sq_gx9cs2>i&v?2OK4Yj^#MOJ%~C2FJMehdzJgNX2}Aq+%SY_|z~k
zZra0ucC`6?Yq>3S39GN*5xH#_7RG50e*eqfyDy7kDr|C?xF|==S6nD(^{%{6ul!yR
zxUtwSJ?nNl4;_!`&66LSwi#l#CEu}GHu3S|n_G2&63;O!>ifIuO^(il<-(-Lt>~xc
z<6Bp~%YlN<C+Ybk3c~JxdI?G06J6vfT3ZY!cse@M7o3RpV<`|6N^uWp`Iycb2v(bs
zaDIXs+`IHvYH+7>2Fzu*CoUyKHqG(MROy*Rd=<Ab<}~O#{J0RbUZ@#1F>D3FWZG#m
zNyCvj@-fPMRNh3ZIhq70VbBlL3EHzf`zN>khk@sx{L}YG-zTSke{fH}&%Zx9g;&3S
zc5%(BR@}m-0vNSSFdlK!mlH?^OCsVZ1%#}G|ExL8SxYdwFiYH-i(QY@(m_Lz!Ed~<
zeWmZ719kTt1SCY{2VCWN6FfYdDFpZPX1PQC`D6%Fl#Xv;$!Oz^H@D)z1IFf!REBZ+
zUTnPRsZC9FqT+pjfa@gb>u8!qa;K@SWx4vg(lsYI*F+PUm*jLgyQz(Vx`>I;)~J+d
zfU-B80H2T<5=d0}0x@r>J)l@=Mc*!y>XtvW+KUUW71-*v@mzOu1QI^Hh?IG$P&W(1
zz*B7RD>+Ugb%V%PrfhW;S~J6u48+=#d1c-)l!a{0HhLR>+q5;PfkhTUX$Pirfzt4N
zV|#18yx;pK&8{LWaC@`&qWmcl<t-8Y<rPrQ#0cdpXhX2L)YluSwPmF>re9irU`s16
z{`8`f;i95px#n!Mx4zZIhT>+ayTyNXp6fVQ@_c1|V{5D9)ij0$=KrSSgn0>3THYDw
zcw=y4Lt8t4JB#wYbTpepxTn|e#cT@H8}ta;+<H;n>zOw3kx|+p(r`)83&t4#yvnI_
zDwWehswRr6V6jU``7QaTxSszguYsRKIpbvh@($>3Z7hUe?UzCH#PnXlVfk!ZdOExn
zc&i6e-)4Bltx#6+5;rBdhoE~JIO4a%@OBsajR1gu&L>eG^x&)cf+wNt#l19(f_3<=
zp7_Tsq8Gsid=kI;hiM9`<`%rgA2Mw?x(l``CH&$q`6BZiUeYfIc%t*-MQ70lWA8|u
z1%La6INu!Z(2pUT<dqYx#O<wbZf$t|#C^X0VzZ|_ncVJrcXI=Q-S}alTQx0FUEL-f
z9epN$^3~Of1*Y-sBs{fyGqtL6%XJ8X>Cf+INy&wg$joxBNFjBj8_%u(Kq&ThsT|TW
zFlKEGVy*OwxP6#T^h>24x09&21xZYw$nS`se3`FtZ)yj!CpW_!Jt$C22pcd^d${43
zc&1Iv7!NVp4rt>)q;cXp-{T1|8<yH^$^a#QKPzp7k*hW*gjc0Tr)Uag(2vJboX_?+
zMNn^oBbS8;5y&QJn5gWdbKIXB*SQliR1BOQWaN}vZnH_5ESzjGAd?Ddh*eClP4W;V
zm|mJB2EvLJUW;Bsq|%u?@!*Z3Gyn!Sg_p5SlV^y;AKx8&WTwZ8xv;*56?k*KyYMW3
z_^aBzia=~86vWPYuLC=&qk%9C!WGjwJKK4G@b29KV#VT7=h>O#`L?&^>jb_^%K(~W
znfMVmZHg&Da@jFSD|uKfjb&=Zx%YVJ-rx?@t+@l?ED^{{`^IRC!Z6?|?iafo>syPu
z@IV}VTvZ?{OG3kbPgS+-#`z@eaONm~6QTbXRsDKj$izRrq8}3$9*H}j>r9Z9-_?eg
z%S1f%uV0dU6NOiM;S?0a!zdgU`{W7epzQ(j*zLET<?b*EZ{iCy+CtVGfvSQAVoinP
zQC=D>utRJ7gzN{iI$d2A&tZO-4BrZ4HP~I(b1op7->S6LML{XB>l}}=AJt-i7?o`2
z0t-;?lRxC6^xE-04}ilS9)RyA!EAMPWeDoy`gXUs?Cil*YC&Wapwu=X=Mv_w36fhj
z;TD=D?Xa}yx1GvI%Cc63Td>|AaQ2C)9(fl<Cf-O!hMPFp??~+=)qA&YXLF;sh>ibb
z0LB~Zb*9$q%Iqnf3%jtp(Px~0*5=VbiUkW5Djr4NisFlMz}^9gQ4XF^;j&2w-~5P>
zLLijYHrTwKoxR@u`s@rwU(^=oZ?g2KD53Ly*x-rR<1C7Piu4tNaJw{3QPm-$XKdxf
z#am$sreUZvEky=hRHIbuZgjej7?ZH3Qt{Zl$j4sog3wS8QaUpQ72-yJs+Fs&_v*J#
zJvohqW`jR4t^$fbmBuqOlL-<dW_ZMvaA~iLL#@4(mAkHJX0F+kIB!vxL_dfd_Ny<1
z;(5zaxGzhAi|MGG1fafB{W?x3;&MB+Z)rfVDd>fC@Te_}pR(B^RZ13@kQ+uQN77V#
z99S#Qqs+V`5Bc?NvgWjZ+&qd}mqjtn{b$cE;^K04j`nQNLRuzC7y5DXES9Z&It_<c
zpv2^!<0ln;DgzeBsdb#bPp5b+%=N2~<%l$3?tQbl!A5nRrf+(->sx7U`!mD49c<|&
zIB`bN`3&|vu=~M(@lXc-@GS>(@)%@k;heH@FwxQ*lNz;*?6&QHP^-=pfvg{kY3Yg+
zAdpHA5Ark!%9IDv;#KKPT2*!_&wb>GyM{oR&tYdb1TAUEod~FH!N?VjM2K;y2VYPV
zaP5Nj;xn}yU+`@gyy0EIZ3d=+%^v7tlAec?W3u*sc(`m_K%2gzQA5)=UUt*hOY_LX
zbqu?6$8$X~)y@Nd&^R4-9h{uA^HZ_C03l}%-Gy7~OyMgnWwKZGk8atu&ndf>`lch)
z8-Cqm>ozk*O%+`TpwFf!*QeZ8;wHE-_oa7>nS$bY26sz`@NVG{-YpoyyM;q&`+B!z
z2-#WbICd9uuH0ISDtD;8HsO1WpBr`%x6BcV966TvQF7yd-|rv1-aXsh|GG4^u+mhA
zsu5y<x20p80UQBgu+qBxj=Oc+7By3wy*ad%82Ad6n-1(PjFJAR+jQ0bk{y}ee8*TU
z=iI^2b<R06Yr%cPZam-qVf}?ShoTu2fq^A9wjQB^R<CInUi2-E?NHKDWws2DU6aS%
z^x?4^9m-~Zr$GY$7>BY=H+>~zCtBcpo6mdQ<%UtFncT+aR+EvT8!z0%2z-$07Dl?(
z3~V>>QaAA%U`m>+v!j&2`xW_Hcd!M!gwQbfWpB3w8cNUZ-Gf*;C#QAr9BH3T_A+Dw
zCH(7r(+biwKOy5>-5y^bOo3J~a86VWhKD+SV$Lal9yX}&rw%Vk=y$#Wnj+R?hwja#
z8p3skYQ!#a1rnJ{vDPjKHK#BZds*_yt2i4X+VZI*HeM&E+OrY2B@7qasEnwh?u#?!
zERA<iD+bAR@5I=jA-Ix&(OBRUJ|-|04X06tW|=GquqU#R!YHQjz`38J5t}%YNMT@{
zHC!=&*I*cY=N{F>@)@Bz!JBdG6K!XeaJ4d1XMwEcpt-}`si6Wv^9X=US{TXhhHfS-
z8cB}&K%D?zwXZ#oqa34;g(}7{lzEzfrcSr=oqqmV(qCJ{t4lfropD34LL*ysF}le>
ze0JLHcB|XEPBU`whHbu|ecnZXGW}WcY{ndaof4Klk6{PKr4BeX+CS2p+vr5z%eBAr
zPMd97F@T`ubp-61Phofm>X&p&Ei0Q1S8g?*Z+$cU{Ry9Jt!K<}j1Q;3rxz8E@WLv#
zO5#e}7gqhm`!=t2*v&YoeJOwOM4L;^842v=GCo!^{^uS<m5xNw%<hN0JuBjg?C$n|
zaF!Q%3?xCGP_v8iF15GWYdDj&+-t8$t+iqwsKZA(ACl-J))<XiYAe=)5-%>IEFug6
z88RvoXM^8-5XXiez9<F3i7hK$Xz*l-K~SdK0x%U151HF3-(iYAfn6(X>2Mv_-%jAo
zX&|<2X@fJI=qxgKqEPCA2&vB9yP{-&gi(2u5z{G-)2j%0N+saWB7<-oOKeVGyk!<k
z9V*t>HGon$@@4VTKPq%n-k15JrWoGYnEwja7D*~^p3$&`|3swnAQP^7>11}D1TlXi
zeKtt>!!(O-U{_7Q(W$j!Y5a(0A~C)qi*apPS45EMz9NZnT6}}9nyc8Xb|!;=%1jN7
zg6f-x1X%fed;LZ4vBv+%4AV(mxX-@NzE2)bzE8f-PM=+%@kJ<>S2CMd24@*4tl4LB
zAtB@M0yRtgN1$6I8o31>T~n1B&(MmK^wjHnYip@WgpPTlxcu{!C(6-%w(mWCn(O09
zUV6&%(v?_~nJ1q7D&x+zwZcPxf!IRnho`X6iT{cGtue<Wu2@qbHZn<J!s@?+_h@(n
z#T#kVm3l&}1F?J=X0JfP?G(V=!uzhf?sxejZGK(rf|icmB7LvW>_*jPdO*M6p3&<)
ze{C(Un8#<Ut1EP7#WlI`;UWGkB<z?V##MZ!J1?K`xkV6~o{%UOJ61=3oqBLHEACMD
zv>fxyao8td7Ok$DPeAa~F7=c;V!|=U+m{wu^^;>YjHLJtBl5&~LJyI4!^SI<@4t6y
zuk&Cfdw75@!mC8Q0#T}Nj_&Nxm1NB_TMMvO;2;J+Q7cgE_V>xN3no7L5zBRIk3Df5
z=gHbkCx&N8{RAk158fJoeV5D2yYJ-kvTfLHZLe=Gbo#oi+?tgS#P9ca_I7;-Pvsr<
z`ry@vz1{s|-+3)AZ5(#+ewW9pgst%#ihX;q?>h%m+-1Sozs7Tbm>;};y>s|>=jFTI
zQc7v{U?x1;eYZ<NCeMy`p)%!#f<QIw&D-5~uYKoD98E?J+d2GyLXadeY9Pho&KLOZ
z?CAaB?hdBS!VCO#G(`&thrQi@_jZ5xOs4alx9DgV$z(<eCZ+PTtx38aSUQzhe2vl?
z%6fOO125i8(onuSIzD{6{{=LRB(Qk-^5Edz?he!=6b|uv|HHd?(El*c#Eaei4|~3|
zo6N4oi+692p!|1#aW0ELc=;!cvMiLq(#tc^d;F8=LmmP6?bpzX*A(R#FB};T{Ohyh
zZ{LgI9}$KP)h6CzmHg#C3>6Y8lcxz1%)cGI`f_(~r__^2!^`M8H2YC=5td+QB`mJQ
zC9ihg?HtxK9D&LlX4TZ9{q^FhC#tEbo64h)ePt#ghoiH9uXo;kC>QuPna+5pms20_
z9=_RmwOgkESS8BFFuSWneAu^k$cMzz8ORm&q{t=Kly$NdL)F{Z)OFNSd;ckxDrHdI
zRUSs-kKMl<@9rNN?6E6Ne99wTN+$=}NNW;nq}5~^X)A+bBrlDLk;51gBefb4Bc&b?
zBcU9R5)IXVE-sN#>S3LY-|BW32iW{lT#|9ekcn}s_Tt6%);hmQq%%3s>T1}q^MS1b
zcPO;qk(JPU=KZRBtpUe}7<?8J(SpGEjPR|2`9Syi6hc;=52JSDkZ$at9VrHxZOap4
zJQ`+Ak#;jYdqI1`%7L00t9NxZFCpNfNin@cj7J`SD0bMi)A*%I&llX-sg-ei?oZNz
z%D9d9v}x$d%|dtHudDx{#kkOsFVoQ-hsQfda6F!@-8zhh5zO3?uTNL_1tA_?GN+A)
zE3^ket8%%QqANzRm6FI92jg)b6>3*idP_T+&pUz=e83~>avJo{={_Y@4t?*Eks@}Q
z<}pft7of#jIB&cvo<IJ~3g+gCEILT|S^L{JWtRtag>po@U1vT&^(s5FiLo<7tmYv(
zn!g~c?FFHy-&AzA1!pK+Ll<Wy@>J<KycpD9`OY8zXgs1#==R2DuV!_wt#1wI`X~3!
z&h8|>aD3<cj~MjU+1Yy!53Beq9L|b}f9c|X^Dxea{IQ3R7g=~CK6mh$A6?_)CO#JN
zWF$VX<MZr#!k;z}VejDmxAYXgz^7p}ipAG$c-}q!k{(7_?yf-wCf?O#g!pKX@f@F3
zJ?HTB#WDQ;9DcktN*Up^E(K$gy){Z1;<GAc3{UT{l+WPDzHZbAyW~KZI>JUCs8UCN
z*vbQ4>Il2+AfJT!C4WX*4~*il&kkg*BOHl8e>lK;anrz@!`&}<e<8KUUmhIp^Mv^L
z!Jq=W<b$RH`{08?1$N*ERSUNCTO%`eOsJnDY+|Sii+c1Zzn)_Y!$>kugd~T$stCs}
zyq*eX3Ke%?=w2t(EswC{LP=AErJiShH|Jr-+l$2xHGf3NANuk9IX!~*Pl=JjVLH9j
ztTmivS(NZ+EP51iD$bF-QH-v@^gPCLBctt@Inr&%evORQVZBko$8wBiMXCkZ=i@9K
zc6+?0k$m3Z&qMLNE}n4+FABk@u|Wc6j5P_EE{;A9c{L#pPHa$w#m0Qap<<DLabrak
zK25?OXDQE&G)@Y^)z{%rbT+2Cj)xgfb-qcDqfsh~#6C*S^C?e^txm+J5Nl8Lpkml-
zC)I5k;~=N1En^&tR1=RenVmEnjd@`qf4b(i(vzM!7;@T4jjE8!R5o;s`~tEq<az07
zGRv<y3!EcaQ?#z;6(Lp7Cxx1SW|``ubL^r_a0|`4oUY373Hu?x6kLX*l+UJJp6dmF
z5<}nPPwV^%Ys-I<6J~^+U0kLaCvA*XAbN7nzhWITqXV%QX1W8Bx|z{|Sg-7Z5PN8*
zdIX2&&L{~9zLRqTJMT^<9Xs<Uc>1uu`MmS!1*8Lc|G)p||AK<Lz31?M`#=1r|117p
z$M^r?-~G4r8++&f{V(Wek6!-|^n0Ct|1b1=gMR;y^m~(j|4;OL3x5Cm|D1kq)9e3@
zeq&94<*8rL>;D6PZ(yZ=rHVGNqQ4SZ8@#;#ntpH5@BfB=^8)`n`c0(&yZ@ek^Ai7O
z{JqJW@n6#KF8%(m=r<OB|L-a5CN<+f<H@lZe<jK{d9D8^{l;4V$_pXN|8M$<_5AgJ
z=bgT_{bFP5(Vb3yYB-=#LUvjxT<>96QEc8jc$^)lGh`*0H${uyOJRsiOwowMTS5Z$
z>5qIh4N;2RI~cgrckVlL`p^n5Qkr|0QD(f(={;d&BG9wW2RfR6Ok-p--sWgC0uwOI
zipWa0{8S@de=w=nZ|e;Z-z;qqUzRmP7hY+J%ukKEP7_=e>P_JvY7LRE&1T4V^+wPa
zOB3k*vIfXvE9CRMMEq?OUD;@-_chYRTa$9}s!lk5u+WXKmys>XtWZrkiRe*ySE2b1
z*1#yk_a&NB{zlM$Tcp=%M)0;4av`OKT6nvRSYAbiR?J7FUc!z7vs5~gUfamP4;DJ`
z^)f<4nH5SXC+E{Rp#`BvjQC*XKKf*1Kl-qg|76Kk2IRSkELdYxT%1j^l7>OzX)WaN
z56j3ARn^E5xe??WS9y@V3ngpTwg^^wS(2;thPQzW&a5qeD3|0Z!3as0NX5cdsd!tG
zhlNpXNf;KY`jR9pvb?=a4DvFoG7xhv6M$`-_-ogMU!|wuMMF<v(nV71%2FYJS&~^-
zl?vfSLxq_1U!TO`GNq9pFF8LxR$xeh&^T!D$$7*~movGk9Q;I0OhW3^f6UQ;%+Y_$
z(SNRUluuB9@uymtnJom4;kUW6jvw$C7ZVD#CDv0N>%YTJ5)6&c*GLFwH+;NB-I169
zpK!V7-HlI|j_xwb>gXopbM6Sr>0hZ0JjG3VnFb*`3@XGF(R2tF7HnDKDGNV2bCXUQ
z-ZH6th|1)O?&iC}3YFEZoNXKDn3AEg=dkWK%!yrpR`qRazA-Bw-~6gJY}16xoL^N}
z?W$^-yQ?~-U7tja@ClyupPk)C=jgO`c1^eyXTxxK8J(RWkgd8S(24LKD9+%!zFKN3
z0TE})VI(!8F+T<n7Sjs~2<~GHjDx@x(FolxL{9&Hu3}zPv*(mk_zWo6j)dvomgXSp
z5U&M)ukuvVxg}{k38LV0X?9jYNx@5zsBJ<QMRhuLQFNCQ`siz1%$bYnxsyCo2D#<n
zwF9WSDXOg>Vcp6<uy3o-fa*yE%w>0#$7n*~ieZx2^VRI(q2?}`tgfO#)&{0dj3z%k
zbhq%G4Q!W?!IWKkA`DDzuE{o9300PRBp|AP5XL~ID8-EX_!sU8LOi;KcWT(_^@zTH
zjr??Vb>-h``>PaVjFBzd0vF&^y8uJihRBaNLW${Z94c%V`o!#`9J3HZA<sS6v!@8?
zY8pnrf>vltoC<it75m4CJ~mxAC+yyIWa`j;A>Mc6eZH;0i=gcCSnFBsV&>JH&dk7n
zrpR9p4>I&{-6Kr7;@K+UUTR+1XKmilo0r!koT9E<izDlK?crrS8NrhM@IYpb{2@SA
zYU(ma2m`0ubqKI2A?{`1tD_d57NDnqhD9ij<Tlmf!bu7iM01qjK!0GZ4|&wuJ=znm
zTKQd4gdZ8%F+?F=c&`ELjyw!r8`;}`oJtOQlrI$-5m@IO$+kto0_&Hy&CFI$tK2Ag
zFQJ2EW4CJ=qdfM|+0M?Ui5T;!jp4=efKYOp$GV{xr-Abf#w#lFXO6v^p>WYA!K71&
zvE=I}m*X{1CuQ~>*w)ka-g<WnUB+!6pLcs(h_r0`wz>5J!6NO2cGjPFG1`}ZwJmOr
z5Er(50sv-W{kXmUVto@sir5RCcx+@Rbi0Rm^OyFIn=iJvJvOy|>~22agpcRekG<y@
zJfd#|a<<2!;>t!rXfG&g7)D1$gz*AIL%%tAl^KPk(FZ3U#JHdWU-<<jM1)AJ?}8#L
zUl5GqE`s?;6Vc$hFWh{IHSX+x9lf>j{Dsl7+r?3~>Y)Yos|@42Wzxk1R#J(1vbw6#
zPtx=%Mi3{5g+|wK;B{vYgYTRj9(*|7MHA#q0FgV-P`btB3>~&X-o;~q;h(p~-snR%
z;k}<CoXTDM&mJ!9P-cqKaFS+G=IID^#?_GVok-vw>ri<vqmkTm{H!y7H*e3NmVV;i
zBU!$)e{lTv&9`T}hldA;XM0CqIP5yV@Mj1iVFbKem{`RCl|;07r4EI{F~O=0Wf&vF
zJt+{kH$nfXB2~E!tEI?*V!0-2p8eBpo)7%?+A|N`dCcI5?bf&HjNAX9KnY<3a-OHd
ztEgxT{IFg7oY`96G#!h7kNzg{YOj{Wt34{kT>mJS`vvQb@D{OzsFhzzfod%gM5Bre
z^<#p)=47Y+_lonnXH4`f!eReN{~pl4$EHvC!J{L*9{ooX;q^#Fc*Umf1SdD_78J!(
z_726*dHX|(NHfOFcvV5JnYQ<i5xVA`J8fT&gloBo+P3HJVJsGZ_#c)2))F1@mAl*i
z?mgS_<|N`@2X95hPTMSfvA)h@c-q&}eUBa5m&@)(4;JVj8uA@_><wxnZ_w=y^r^tP
zB)5Y%?HtA!$Vv$emxri)?|SYJ&_i#$KK$XRv3zg-vSC^B*az#EjqT^p;p3NfodV$<
zJ@)&CoSPe<Q~YFq@1zaX8@{Lq3W34eZD(J4t`)dBi$-Ma4ZJ;95_ebz`Ep;jzy6BR
zuCn^&%l3El!K;1w(9Uvuo)7JvZ(x`3F&q}SK|od1S1aVami#AV6sp5R<fD3NlQVW-
zq<%E_8mhw3a%qC$Lx11?ZjNk8O!rOj1r6X=_Ws=50HyGM>p)S)ehgm2GXG;cpPlE!
zEIyCiT3`QYC<Kk`d_UrN17Cwo=&-Na@gczqaH;d1WwKOTb=m$25t%@SME;NU4*N#*
z7H{QWg72u{KQ*YS>l^DH`?Fo4=J0n>WdDkgiSV_sAahEbO$s+8_Y|;9LVKgA{T1wF
zn^-Mtzk=R>!VM&69t+bdyru{}WP^Jip+#1?LcY{`SIc*n1e*n%KuPc@3AZ*JBm`*s
zbNlKG&s9V};qZp<dEk%?qnOYpb&9*55yi5_bb75b0*>5)9)jucWa18Q^F`X5IHd3^
z4u5tKjAhz>;`#OJdoSvYoV6u23e$0phy@sgBC%_K{2bU-+qq{Zropcf>0SakC5SM}
z7etSIX*s?yU$Lq>4(u|4CkO!pv@56#wBstamQu3r6B@}x+D~`-b$}_UUVW}~v%$R#
z8|sT+UE!S@on&ikr=XQSM!VsyZ46`o8*4XF{Aise3jet(Ezz&7w1}n}+Y0gKw^rGs
z^k0O3TTGPK{bG>xnqy4Fk3gHxl~e|Y-5b!bbLmVISz>fFx;KE38rnkXL^Bu0Ncu1F
zw0Ld|=_l6oLwFddbm$1-tVQ!aFJ}clm*UbvSBlAIgr^gD)}@4e?nL7tf)7f{K~qQc
zrWETgx}<lA(-23w38NNGOHsfO!b!mFtOQAaQxKebXz#>~ZKFe_D|{GpxX(*VuAZj-
z(o)HnMBycl(JxM-%Tqo%M38q@atV))jVjEOqLR~CDb)p`qhd6Livj<GcP)8T9LLvD
zIx9?7i8mP3H6uR;X}zyTKB>n0<mhfCShom+0nJNA-I;xIHbmB%O)HmdBv#c&(F<&U
zMc%&kMMw!7YKK>V@`C6>a-64l05MCHRtQ6d*FXY1Qk|t_L@dr$gVtLf+2M?H0irHl
z(O8s8O5oLxvuG9>&v>p91)x5ppo17#IMG?Dy_Ahd*Sv2og(J-O?a~a_++Ad4kYsHx
zGw>IQC=mUE0*ZIb%k%ncYp_O}4cnD+$f$Fce<ZkoDRfQM>b^YKim^8{T+3uEK>?G+
zjWuE&jvld_G)jUv^g>iC>QWYaW<tV(62O;cF5DL&_MGF3Tt>KiIcy;fTj<SYy93?s
z0r8rzT4sDA?3QwGn>>0Xy9b%f(xLSJd^R3OS*2h-svJm(pUxFR!AaB}4kPA?idQPR
ze+5;#c+GAn)#6SWOwGEsMNFsbQp3%U6QZkTOc#OVQk{DIrJ4r9FR{$N{FR`d{E|Us
z`$@4>LO{pSM*_I>h^NX`iMS=Aw8V%qEAa1e*vkbYFq5toC8kM(99Ii!j3E!qzA(nR
zTrMymk<B6w(1$^WXffwbi!xt><DzCwf1_08#>k?N&7Q9!11FXOrU!h1FTogTTo%I0
zDM4Z%x%D!Hc@+i86Cs%&lSu&1@?3IunzT3MQxo}@^_o#;y$_EY`cODw6J4d{(W?iw
zJ5Y*5YZxZD!k^=>$pm+md3m{Sh?%#rP{q5jE77jOMxmvK!k#NA7LB!qg*B?9f4qHO
zF&vW>q#)mzBM<lyqfzxumuV&k%s0KC=R8t*bmhwFuL&iN5OxNZ^9B<^xjFoty-Tr4
zuI|ssu6`+5XFw2PKrv&YW2ALg!b2Lp=kks)FQd2~gJJoE5JHU|<HS}9M2INry-asm
zGN)}n1s!SXil&xUnI~GJYvQ_ie=Y=)Yq>gG-b!GtQb2E6vX;0B$rMZ^+G@5*rbCgS
zdcc^7i4qeoseznN;tA;R|NQ%g5V`TBT(H*Pw3D)EG#f_0RVNAESoDu2xaH?v79-|W
zSOQjHX%L$8IQjIB<<oB^Ca_T4Td#x<5B%;l4G>YRFv1U4Iyx7)p(zGsfBW=)#_<Fl
zaz#fT5E;z4rd;mx-p3ftc-(Z?$`LvO77i3NVysg%x3df!zx6DwMk)*jVf)sBELfsW
zJ48@#5y>0D+;snEr}FAsjGH+WaXrKZ3|^-i778)unnnlJ4c@lM%E!f${tZpYRab46
z3Zs`iKXqeqV|Eg*tzn?df4S1okVG?NI6rJDi*Q*i<wIdI35&hoPSTbqN(1jJDBP1%
zwrpvk1H+o+4fR2(=;V;ER2ck81bSXLaM_}P%a#lrXU<p|7D7X#&w~zbw-AtUh&zL>
z$5P_*zJQ3$e^ynZ41+6imFBA6>MGtE#A=(HnbXS>y1*JEMJfB`e}&qzbR+wmM59y7
zjSdbrM%Kfg59;<ewsQx_F~EQPsIS1A>)K#puvsF`pB)v@0*@-95$TpybmfBH^5Z}^
z_F#h&*9wpAh07kfb`e4^t{`kDgV?XIv+l*%;5pn-;;t1>@$?xS&QL-4*wa?BwF1lA
zR9acZs2hj2u;fIUf2&&T^;g^^06orY<2^xNE*=R#>*&)V5wU&9L&s5Za?e|p&Gp-k
z;+N7}K4iv27EKaG+^$m9uT!;vL(Fqc<i>PtTUCC^a$@L8i+S4n<j&!spGgJuQ*;hS
zT6#q1h}|MxH1aKDbZOr#@)=tP28#B~Ghe*kOjMK}?3{W?e{eHN;wb}t`$2qxP78&M
zvsN~(m6uv24aFupqJgfoQawWeSGt32`cCGwjl^9nBQ7JOeSSXQaMy6m<dM9N7U_5@
z`~=6~_oETJO!ML}LK9NrWIwu?*CW;Oll%j_wO1uZR<vUdUID{(qND6_I%9r$Z(9iH
z>db<lNr!a^f6*)Cr@UuI8Sv+J^n>fXK|B&r0}RamR2IaXmip~@Wl;Zt)51Ta){_d_
zzd#&zo*?GGgXVCEn7*ItqViUlfx0=Fq_>d&_A*LZGqiF+Wkld*@)HP9L$kYf>mZrj
zsV}9>ZKy*vWdpj?2DqvE02f&vGZUA{QlzEY{X5~ue@hV~I!Qyss}Gv2cI)5B-{_0*
zZ!`cHzbh9FMaP~<$~-bVfwpy3F$js~+lfGHn<U6iI;TcAd#qu)z?XZ2X~e9eXrvr0
z+77p>#>jW5^BtBOK&rmTS_W5DDRN(yT?J1?f@Nk73oFlb=j?Qj2fHSRW7N~qEy_F6
zbIX<%e<!D&2t9p2UmPb7^d6(fPJ@WVfG+)2DISKHF8rv!g7K;%UhpIPN-KSdh_5T_
zH{IJvLGCJZf?{>GFs^%R44E;ULu!8Txu-ZXG1(?#8(Sdn`4Lz(Yz9G#8?Aq<HK6-5
zkWXXZ7FZ*CZ750#<IxtQ%?c7u1)C$fUkXece;vp`e;Op%n6=eFz6Pt9Wxm&CmQZq4
zNk-a3BW(#g*OvGPBeBBhwIzIGBs8#lZArg1k}4QrTf&z{LKB?VmiB{@R%83xQhsTq
z)Ud#|l)pDpYD8gM%AX`mKHvBK;9@vA=o8@0=%kRdZ=dXIT%p#A`!Gy@$kV^Cq?h`y
ze@gcf6Nvo+OnulfBFb*w5cU|!!f5LhheobV83lgSb;K${3yg~_Jq%o!Licm;Br(ND
z-^ds0d>`y&*U92S!jM@%xe0U|62%gge{OWlm&<zO_tgYA?TvfJ+M@sD_!7_O2`f{o
z$SvoIvSAn9^aPgwaSKNoKC0zE;UNZ|e;|~&BNnoJHbqqk7G!daQV}4fKNOZzsV_%U
zrSvAsKn;#aqis#%>$srRr?jqbZkn_F3sX(vEp3k^MsQ9>Lb&`H@2rbLQdtxzkD?7t
zkMu^PmfzT~5?_VzgO7<ZsO1VMbVNZRM-`+l60cUShPu@)cvd0N+A8W5gNUrkfB8rO
zu>MzNT@5d$`DN)h!HFYWAxIx^;$%3P5zb?N6;BbofSU{=Ivt|R3RgRa!5aQm#mv#f
z`W5%f1^J}nQKGD){Df9Se3Mmr%MZ~X9$<@Hf31Qq>m6>TMA_l>yaUTS9~JL*4y|&f
z`;DHinO*%xPgBq{@Y+cGf>g<1e~xQt(O<hUB=#J6Nh1v<xZe$YF1&uY7C;`ECFRLw
zBg^4`6VFN+k7DqR5eSQ7|3;^k+-T_}PcyOBKWeSMN;ah>Qv6CvkB*+^>^?`sV-Yya
zw^-zUt$6fnyj~|S$**ljR@E3}Ec($i+}xudE1m#clPJ&tt9txFCPrqPfANr!23cG`
znEa{__|XQB?C4;#%`k*#Nq78C8%8dk!4|>)h`F4VRtd{oW{DY9!yxQ0rQ^YH5{LOf
z{A~;SQ$qq68UG|_tBSiKB936}TdC;x<Ih5Q*bz%}!!!snGCcOhpDE@DD!*rEs03n7
zs57MI)<tzN5Sx0Zd@aoee`1f8dOmD{)6==t+_bIB^^8Ef@*O`^)L~vaY!+nw{Ii(~
z_o9iOVdSu3Kn;hzKniVdo0}dcyj`j^3}wYbQ&0Z0sRB}{1e>bVEoqdcJ%%kgp<&id
z#I5Qwd$LP`rTBiD-10^(2@0+}2V3u>>@u9@WFnqKkOWraTS!HAf8n(C6DZy-f<<vI
zew;Y1BD@$-Xkq`^Gbk!=^O(YU5e~167{gEb8u4tHW>NdHxSsqDa+j>j?UZk9%Pn2y
zz=OoHMY*%>_E%K@c{Sau>6Bz;*(u2r9$tWgJ+=(e`0=wi$bgQ*j*CI#XwiXzZ|GE!
z)|$*Ci|6{pT6?_Ie@0rKx_%aPnX_|!9$(DTSza4eAH5ih5OglRF)Z{^g+6~N9Wt1O
zZ@ef4M2~u=6zNbH@<)!$!ow)gsXM1eHR~l|^(#~W;(vw9Hwzb(!d43T=TSVLiVWTO
z8DuRwe=416Y#Pg9&u}oU4?av5einnqLFVDy9-c6XA(y9Re+GA=61}{X%}#km+p@}<
zf1!fLM)qdc>TY8WuQA)?cp7dK^3*O(qNd(%DsHo9m2kj(jl<u-Q3Y=d=K*e6B`Iy7
zX>mcD>t!~0L02C*<@;t3vJS=LG)V6!pJg@21K1ehQPzS(=~$eyan(20{79J;qlOO;
z&h?D%3FWhCe;G&b<T@PB8`c9}*~3He@Bk`cOc#6l2(I6BGQKMVG}gGAvn@gd$Z5w~
zl1$brnFAthNN67K8vEJ}Qyx681@<)IcF=bX)ykV%<ST7zhC3;_T}-ShrNTL)LmVjY
zC%np3g-Z3(OypG#OSd(d_iCH(>oRgYGGY4i#76)XfB8V))KKF=uy5Qp;4`D%gtzo}
zuFd~Ssc;<2Zvv^FY2!p*!~hl-@zZ;F;AhCb<CGdjI5Wmw-ibW>c1m?P=ouqgNgH2v
zL4-!1;^OI4Op;2R-o>+|^SO>x9D9vdHSuH;U4#>Lgkk^`#HLo!+cqL?>sA(}m^;Ow
zAOx!8e|9=H-O~$mHM8B{VKqfad5v6I#gUgn0cgp`Ej#1V7Efm;c%*x2iq9{^$#@9e
z@(gRr3}d}q1qsXM<^|?=#~$)Aj;Twxaquf_wlY?x(}Kz%GOVV_0?J|}LB^mq<8#q}
zp4EcF2+u4#V<75qJ)f*5-6FAVK#kx?N|h6}e^A&=qZ)qX$~me?$Z!+?;`u)jT^M1J
z#hZ+*BMLOUvBoq<&!$-R4>?MTcKV_1tr`2=^!KV1!xDQz=6l}6=wpNt0~(@5>708m
znV{j+V<4J}h`ajh(pXe8Q8Re0NQ9|Lfp(2vc?n)!#dWiN8=_Y!@_g(%2<(B^kI15^
zf3onhTNnZhq)2uhCn4!W$fm4ydl?TeVVRgrxZ;qct!O;P>k=3+k7a#h%q#<B8=1`L
zHLD4WZFCw2s`weD(v-B6OFgYU4(u#ySTE>p5f1`ODNKf~6j&QX%k<z9qnuAp@p7}9
z1guCcuV-Vl&p<&Njm&ks*Q->LCc71<e*$qPgm-$}M9e@^6c%G_rQ4UzXXU<&ii28#
z<<658a?^AkxtA4ouqhs^jTL#r*B<)K7qj4=mgAFCCRJwt#4+?d=agAgIY^U~S4KlI
zp%6Fn5T4LNja%bWRuAF{rQN8Am=5>%bWCNWT%s;Ql5xt+n`wBfPpse@9ml{+e>wz1
za8*vZI)z(8uXG$X+l(|p!KHg({k=qM`IrY1Vf$XC$w=J1FRZ(+*DmY%PbppAY2xVX
zYfF4Gu2J#PyeY+JbsvZi>KYLr)a@gUDPDvj1L^Bac+Icv)N469mA+NsAN40aU_gNk
zGOAfXMi>=cjEQt;QT?(SPn6hQe{U=*J(ijQMN5;R9L3TszaCMvR)>vIY{4;`GR89G
zWQ}=M?^a@vHkD+~0y*=_>|2je+EmsfW^P0L(qGU{ON7%$bT=m!^Vh?kJ}SFnZc8lG
zM-6vlK-5Q7ubOWOllqvUmQf6IH6v8KP|Ut?3Rps^Hpo6pG*X@N5o2qQf2{gRMbyKs
zT4}BG!?N^>0h;2jHsq6(%~>(5#?Llw#*2x0;r%m1c@{I}O2Fcv3WEasg_8)~U7mIs
z;c(7mT8W*>Ci2G^zmM>r%OL8HQle|h&V#kJ6c1zMar1R>zPgG;<?5bj?4FZWGz@S*
zG?M!vu_qs&jExBCvtR;se~#MIbPB4?HRX%FSuhiTA;Rlj?%6N!a{LB1-gl*q_sr|x
ze0C=ZxRD$0+u-ix=Cprta(f!g;Gg*{xR}eL&Y+atpwr*|Oi{ioGad!`$?hqJd%xnp
zy0CpmV27u{8F_3ApTnzxJCn`?N9as&1||5jlcUq%YCcbcjPLfze{KK?g<j9v5v<iY
zi|Hec3=CP;#t;H@Gsb&vGKdGMAD*PAzH}WHND9zngUQM8)W1~c9PoPP;r1v_W>J5#
zx;o}pYeRnJ{80j<;&pqOCuW{-B<+CW*#7W^hi^)-xe}vh=jgb#pN^t(h}R;;7_T!C
z<CXR~$3X!KF`Mz@f5vm#b{$hK?#JL*Z2H-Z4cUZ^*~s&7&ph<Fhdk1P7ug><S-?kQ
z&KiB$yty*PQPbfgj7-j3d@^JoPeJ8A=k3zX`se{ueH6@8D{?+p9SMb9udeFiW>DPu
zKxFaJIzx<_A2S+UKV>+ye#mHG{hZ-Y`q>;t-L1|+=-t80f9L2NfjbS76W&h<jG@{y
z9ZXTR($f@1bi@goAoA<Xo5PNC66qdL+YWOgLa$r`_vU)G0ULYl(m2c+%R69kBqPv6
zGGUovg$`GB$!%>iz#}i%_xgxA0|L6i7&6x9w+hK3gxrzH9qHVm*8qf}&Va+dyou%{
zThgX7ZEB)le-xt<UW#EpBzER2$-~2nJYaozC~nZ=BD#sPJBxXjk)ICC<FVX5kfUMW
zV)!R4h-lacz#wD~Dqot0M70|NHQX^%(^75<T3IxXGIZvn`^i5Vwkf8qc1w|4Hb6Ft
z-sr%GSdl3*l2H(O!s+4$E3qHXxr`|;?PoZ}IkDJEe;56dri;^bOp6ckQt>A4%3&8n
zh#5d!9{;3$#!;Z$>kUNZCOB)4B67blyBDoQXry^j>P)B@qK!&25bu5d=d;*gpb|C>
z4BokWqK&15mDDMVs69H@g$bBq7!C^#k^NgdJSbBvd^Ae9(Iprj19({==X=!TGC;L!
zo>eLXfAOqAOpWD01auAmN94O<nqfz`IDQ%${Ao)+sGhF-H2Y=EJXbAyqbsej61*p?
z(GnA-Ad})TzgaRFTS2KwE5}bFWl_-^JsIjCZtA5Fn5i_!LvayRGdboTJf_gemeFY-
zDyXSWH%;ff<QAW$rPh2pIf%ws2xu2owI4Apf6i#4(-jeM;9X@Vb9+Q|08N6bDVO1g
z&xf~u9=9JAw`q1IW7)UHAuMmBcFROtmWOqDlo8qlod>nF!CKb7j`BRbh)Opk8`2jo
z=E&9jJS}6fGN%H$bZcu3%na>l<a+H{7OS({hX<>*Kfh_gDg5jLZxDZ+po?2^)&v0G
ze>1_+i(M^O(5T@&9o-qT|ET;GNIQ(eQDmUS6<1~ww>WFR-ZyX+!~8B8zLofYrfB+D
zE*gd|3a^dt$K~&YGWe2ke2heU<wVnXYTg<hDA|P<oOY5FJf~X(6<1)xXP!LmkQMEP
zG`hW-l5|H)Qu4y%_QfC!R}de7+?_$ff0ljBNg<*?Vad|3fJu~J#^b`Z`eNeZ-ciuk
z_}i6GnoPh%q64aOSJG7G+_f%Zq1+19r8^#RgHp%+oKTT4FZgEI1&Bqkpa8rjGiVZ9
z4T)rFD|J}DDyw0hm<xL{K!+7SRySg@o>+F7?gKy5pQ~i>7opI}p@vhuh$x{Ee~6L9
zi-7C&Cc?A9D2ZVIG75{(VX0^NB!GW%>o*L~G_!rdQ<wa*;Ul?z;y3baO-j|{qgf?A
zt7`D6R5ZR&#nB2hX`B{AoDoVL;uGJUeA*0worN()-svd<lOk!XxfoRO^P0vGW;Mod
zvhj?-Y%AmLp+lE#u7JQ7;5Bp4f70sYQ(J9->lCjHqlbnDV?)D{t-p&;t=SYwZw>X3
zE-H7q1vhGoxDr6>E5o%L1gf~uJTl+DatpmOxE@dOv6_Mlcn}A*q{n8`caYSO^)k(#
znPvycD4iF4NUoCfHfbTz+>8=69AJ)Vn&gq}m3HerC?c?rC)DDw#Yqwye;J-s#!x6;
z2UY(9z9SI8m9l>Bq7gVp1m?EOCmLRO^5O!7F6Ch&UZtZ55ku&KC&4ID1%o|%vEQ&*
zzrau~#e4hZT6bf83%(u(OG5k@tNjlp2o+d!xNCX!+^=7(t)a`0>Ed1}?Z0?a3ZX!c
zl8eaD5&fwZ7A-+IeBM>&f6{zYRlI~XuiKA5OZsbTu~!7BNM#oY6cwGsI-Hi!{JyP?
zhIwJhbD}9d!8fAz^Rn4MqvGjVeCsh`uYo!psDKKSFV1<-259%sUt!$FSLrm4a=ACO
zLE;fX74=Rd9ne)WI$%Q=^w8G5+WRpf^u|wnX8*^s|4V)dhI`|{f33J5)YjdYZ_5s4
z%%@oSqD8{AzJR}Y)GMvm6Qfr|;Ddx2&b~Mp@hQu2tL^nu%nCFijy0^cWVsBTb@wLC
z_V^Ha9#jyd9zRc8mJX?*2v>elxx}vLvEjCvuAeKF;lnxN3iP(>iS-~7x=Y8z3%FO2
z^!%oXd*m2httcFgf3QL5;86xtC`^Y+*nVeZ4G>Nc8`)H2O>at|dLJ#pV%miBg}##f
z_vU^62Qt;5B8((IHTlO*!#j+6SS_;T6^Ca|d<yq<ErJ(|_w56;`8HaE%BcBlRR^_o
zT-3%kA$kb~?qZ<=v3c6<ho6JEdiqqcXM7T#vOI|M{czu1e@nf={T$t^@{<&p2V`45
zPn2Luq(=+Y^UWs+&998sW4JCBvb1knh+U%vG)`)ve#py=GAdB6kDu8ko3e9u%`Vst
zyJNTPjP0@`cEvujW46Z**iNbZKV6FQRf+GEL;1V*Bs`BM+@rkJ@zoJE2)JY5l-DqS
zM;K7aTrQ0de`>2QF!CwP;APZ`lAAb76K)7N<;!M#P0{GW)-;{mjpNA#R?9vYghq+3
zGb_eVpF0?4OkN-0a&SqDes10$B=UMD!MWseJIADWN>{uXi_AGkPlqtO3mi5H1QgIr
z=9;y|p;hh<J#SF^il(yM+uW9u8$?3JwV~WwfwY@We?pk}&rY5=r_U~!;~4M0@4M|k
zc+W1b=`|D#+Klf!b=Wv?zR$i-o<3D42Nd(naoA-*Iu@Iv7Al4cmOUD)E{@g8RA@CP
z>ug<0_>&EGDYl%aJZ;a%8FC%C=fS&nj!_akPn;B81m^_l!)}6_6VdhH+Rxh~8W;E4
zV|VIaf9$Ee4qNLYaTjc~7TmB~_%1tU%<jDY?dLG-Xw^8AS9E8Adk~zAq=aO*&{Xko
zyCzHZ*eUuvKqnj^)ZK1yrpl$R!vA1^-K)So3W~4YGgaKK2eQA+2zX6Fj)qt5B7K+M
zM%gRq6VN18k+?F6=p)a5$O*%;q8=(2;ughve`|>fNLTb*)%<wsBNQzJ0l}5=V<2e+
z3h~J4I4ICP@S}o^p=I~jQ=oqj4@x{A^Yc|xz~d|0m*w)wkiEwP5Yfl5qVM6&W9bWs
z*}XFO&T(6Ohc(75vXZitXV1f^G|Gy)A(d%_3?=Rj_6%!lpIeT*?hb|}IVtwr-+pl#
ze;jiQw4CjD<O?hX0LIosjy7k1_V6I_semBQmuX{5+W6rimT8YYAGyKW?XZR!OC<Ec
z%5ht~z-^kS0o@HHK9X5W`0x-a#4K@u_zHG}-?^`F^(ajbY1Io8w<~7px`~2;^`s5;
zqz@0NtcM{S?7W0X0uw^-2n~-;Zp`T5f7EIA&kl4@TgT_To4_pA2GDY*B~pf!XB92I
zJWaCJm1+6~0$#=Q$_7$6$jWWa=fQfX1MB^3)6$azfSMk+Jepr&gm_ijKAIXjhhq06
zod1WzD9^{UiQhVmhEaS2lbBc6Lb+x_3yCOzUVllA`hLf{jeD=oY#+Io!)+(7e}J@`
zGrH%ylIGBNcFrZD6L$*a=l^abHiLMV!heZbWV}F8VsLO`nIp-=gM{K|GGAp1a%<6s
zIfxF{n)biQomTND=r|0fQadT(N2^(1hg(Q$L}8Q?5qlezV@*tAof(>*L?61?3{}4)
z!|u|o`P1TXm_=Khsn^;e6Z}Y>e=x76D8aE-_#7>Ze=ffkieFiI2Z9Fc#W%9o_$pF<
zCB!_w6f|(oRp%HK$mu%H3HS=nLby|rM$@wFc^W+#OMWVIujW<bJi)6VhG@-PyZ&=f
zxe8pt&5Dl0q!g5K1moN2kpg;xLn*#@T9+a))p-=b=n`NS4=X*nYlR6$e`e%`K_6gJ
zN+uE0@KWa(zQ-Twynx41hMed+g?U<dvJzfIEq4-MMdTTn`_G=;-rly8>Gcme`2>nI
z&xTo==TAA|qNJpVF?tfJ&4LC-H1XhA7(A;;d4#Mlq3CyUa@8{947J`+@aGU`gAZ*^
zgr3c5L$8n46QkBAeU;+Af5pRhz2ecdbn$bM?T_4(@fp7<#++2KjMNp-X}Vd4d;fjX
zA_oJXzR42Z`_?Rr{nitC$Ml2=`sUvE7>WV2wOS=Z_H{gn>DmLTZLh!RnOotGIS=t{
z;+~sl6zlS;zZX1*{pGr_B)9S@ced4b+ZG4f-(%!#^4!&y=r&QXe_3|2WXOvNBF%k|
zar<nx>bA&m+7DI&cVUp>7p~(vjH<9$S2Kq}Hxd8_EXAA<Wi7%S{1)QcV;ET*H-w-k
zfd~~IW<18trh8IgZ6~k<oqD)^J*8s&aBj1bx3xo(NzI@zDZ)=vS>Te^P_t@j6>AO#
zD^J$2(ZFu#n!<lme+R@w2(U@Xu--NvTdvV$gv;dy-8N#$0N?Cz)AXQBX00b#O2Y%h
zF(lkuOIRMHYkJ5sV|ZjEm9=EiLz^&}9yo;+&t0Agna9IF9{$DA$aM$E5t(Z*fLg=)
zCBJgst%~C-E&@%Nop!q|`QI3Y8iN5L6@LO-KbL#}SlOzHe|p`<qS$gGgJJzJ^Bs)R
z1#c7H6PfG@i%)`$2pZy~Mokvj=hl+pm;I!io%LF+Zv5@MKvb_$gOm*vy)&~JJkR@i
zEu3rjh(#jJ@S9ka%yg)*8yA#uq}u0`ba;g(B}KRW?mLgPji}`RTnrr8Mv!E$m{@@J
zRd(5ErflHAe_9toIpc7WM<778Yezj+395*YL_2&eYO(eNu?YJUXH7_1G@|CCwdS0n
z05^O^EE(@bMs7tdGtO1U2H~@Cj@m87O4IX?rO7GR2raxcyUh*Plt%E0xpr2ucMhL5
zyhltg7Hf$-=?WyR`L+}ru5E4_6D=_pL$dHM351+Vf28&ne0qSuPdp(DyheAJ1tXwp
zlf!`Y&+UFQHu@{{VJ=5PB-v!9rq$+b(a=LmdTAE}zOw4FQDSj6EK$UrU<#6=%8@YV
z@*D-vYD=s$nd;A2(^&P|Sw>#jbdMB(ruE)U5NCN%Spk#s3g~P8P7JR0_*i8Y4Z*X!
z2rVQ0f0J|-RFs6iLjB6s6-|Zez9#pgUwxEShMzywHpiu9bXL~!qBdV=3Ay|f=EBYW
zF(eMb0DEsu5cSX^ux3S*#Tn`oN#YW{L=!@Cmq~(-$h=aek6|CP(8tX8W)G`RY?F2T
zq3lJCviW6w+GNh6X%te(Q({8pu_f0eZ4(Nsf736W-flK<TDnFDp)%GSbZ{qLi3P7f
z!>Zn5zifS>Q|nP{@iJreI9t3fsB#~>JXn3zeqEU%X!<1!M3YC{Z$juVmT@-cyI&^W
z1ZBTS%2_=8eyM=tR4tZs&3=NvP!y@rS}2iBSBi}#$FaEFwvF8e!vp$LE=kNo^i9)>
zf43f6%j%)nH9Zu&r!Xvi<7#GwpH<UQbR@5Yqh{DOM9*vgkj8ivY`RQg0Aa_7Pg`u6
zM;5@!_gX|ohKQV-0a78|FZaN#wh!^x`0)?yCDxKMmCq|w!sd?d3*<F-f*0R-p68S<
z1h$QAPrGz~q3?7Pvq?#0B;^E=$4H)Df5RAW^8>vEhBIMF#*#R=Cor~qahv~V0%=<5
zF!8*r?;KaU=;ua}Q@<p00=%<A3r!}h3;g?VIE<z+E`NCT2Z@{{FOvQGMKJ<K@!$gY
zJTkrSygxWPcII=Igbj{EXiKB{JgJ3CKRJa-)az$;!!8jyrfk@yLXq90^B%_>f44c*
zSnqO6_q8!u@bdO}>|S<BQ)*?A!L)J4oI=TD(I~=0?Fk}Y$L4cT`ie)94W&~UAskjL
zQdLF8iQhqz>jxIL>jNu%JJX<g;ecf5n`kyOPJ40$TjhvcY!cj;;lNU+LB(e3Vl`~n
z7!3`XjT!=MY1?E^N<g&)g*#+Le+Opvy=0}B;f0`Y20}=31>3TsCc6cRtr8=LF1JOb
zD(DWYEk44!mu_%R$)!@+I%U>+KB0oFUcr5u#TRiBPN-XD3}vczF8!$<*}BYYz`V{*
zqSLln&uKuf1f(X5xfq!R<@iaqYbLsPMW>o9olGL>OL{+4Z&0uxsCYO*e__G{>yTYj
zB`3pGlPB!g3yEYIg}D$WLsP($a45@_gu56xCMI@ZU}7hDZTR8v?W^>9nkINjLkLC&
zmLb|~t*&PBkx588R>85OG!@jjN)pVYCW-W&5}w=?$TPrjNXB$iK3{q3I-EMSD17(Y
z1IiEQb0ENgxf5uK##EE0e|<)kDX-F)@Q$9TrAl*Kr8!k<;_0P)1)8CS7Dx+_6UI{Z
zJICwO@-~4vJ`*t>iwsS=hWe?)CPF%m1F}sT>JkQyH-LY9XH~As_rOXpfc|i8yq0iH
z0zP_cGgCrL%taHCs*cMpH#!=iSU|@CIp5uW>sgTF=yDEaz^EL~f3a-*d_UKSp|dOo
z1xsJt541m-UvRY$%jBk+8K~_b{Iz|~APGV4rPPxZVM^k<F5O9N&+_Pt-QzcD_GgZ5
zOnod$_>jQYkzy}}5&>f~TwNWqu~>V~jy;Tn?LY$%`2vZAzeJ)AF|cdmDb|UBmsL`9
z-U=bksn=I1ZpEJoe+qBR`*BoJWen9NwP`N7)<4F)dk^>{GgevnWIQQNXDrvwxry#p
zgccJGn6$TKFF^xjIvB#(+><0p+x$*==QhluB+A7^90s)y(C<UObGU>bH$VUatB&#N
z>%`&r&4O<PfbLTcofM2ccDW#xC<zi?at5C^=@zgWr&@VAe;0k8lDeV#Gi~nA)Y_lZ
zIlB%>n+riFWr!ldE`n>RP_Y~Mjq5u0){Pc`tE(#$-dA_ZUEEyXjHGCo1hZUdC-;_n
zYHo3Z5D4{~S=8qffj@m`^)5&2tUGcYhi*3NE!zv41VM7!;>!zf87V3F1PSYv3$Xx7
zw3B28Y;+dff422X$adjTER(R)Iz!`dnJw7mqkF`zf=>tDF5&eWYT=xHL{m}(7M5#Y
zQ&C5<s4CR&kuJ_-#{s$6j}YJh9qUD@IQTOda`9XOVy5lQ6>lrwOau-{6xbpkKRkT&
z?k|+)tA3%c3<-|C09rOFVpz9|XV>w^Xw-N5A6Hk8e^*y6fRWCgO#9SqMBW;uX26`*
zA36CR`#9KJGmNRl%<G$(kEYQu=(anowny^Gloaw)X_T(l>Ge9#dmHt{FlS`r+I%Y(
z>`{;f><Q>(*)^Pd4g%1QVs_)Po#3F&S4s8`e(Lobd;FaWy)uE{{W#d+cr2(LT+pOM
z72$?CfA58*tYN&VbH38SO)AT)vhYG#zI;(7c@Jb?R4v80DWn#!_tG2-G(r)V2V}8n
zkY_Q9&*X_jW;2SfoMXhRtIz&PanARgb)LoT0`W9sZ%}+ievW?e7qo3-k2I<)8E>Nh
zMtDx4OhhEn<gyWI*U&HuawL=*MpA;_O-6X5e=Z#FD=@r?l(<2m;*ZpkcnjEICexq@
zC7LTs&I4z?z1{9^J1n`jn;rGKh>;G$t(9B^t`~f61H---BGFH77#YI)$=zHy2`P6G
z*j|_XMf~J;Uh^sG4<~2>mYm%i_FkZNt#n``kz62DXq>liqwoqBR_S(j9bQGR!y*id
zfB7U$uVz!X-ELPfI{61_yf-gD-eUtr&~DkOH`3`V3O<KVqy${XlhHA#I^>>|+)6u8
zVQ@I$MyEdi6O>4ElRHr!EDF;oy0VanuN8sjgGnBqn$U0v?04yZxVoBrmQfgBN*xEK
zo`SEt<nM<>;!B_WOVi|{U*MF8Y35J@e>vrejj<u~O3MvuD&>0v^%5b$<!@T$zkwfn
z;S?qozUFnyMEr@8VG@?`?lz(@Bxn?yM+8nx>5?<IL_nDl$hOkhDG+9Z@c&U!*m+1v
z5irqLakGO+fLzgM1s@?S)mJ*Ae_+?E%RjQZhYh%Y*Om86J>>j|?_aJOd^E+he;|)u
z>>UJ^$nOT&<!BxT|4ApiG@YpKJ8NHO+W9UQ4w_<|_<PjHUf!V@iyR#Oo}+Tp&v0}d
z7YLDObL))ruZX54u7;X=;bd5LUPS7u_OV8Og%NRNFpSYG;u|3a)$w$x0%}80Kkugr
zXRD06q{{LIt0D)fWw&2CNUDu$e_t?TCfv{}vJ$zm)+vH5`2hnrKGq{Z<3dQ|a-2&N
zFP0s%5^`s8iMh@zK#xoDA&6Bt4i%D2;2_2x9_mpl?!JK&#;0FZIlim`X=BeIlv;{_
zgIqF@3({8twO_!!&Dy9q@l|rD0S#v&bzMORnJBUrf?r9}d2<OFWbd?`f5sGgjLQf<
z^pik7SI+BF^l&frD6EXlG|@rU1mo1@C&M*5eQfCViJDrn=6M4j>)x_3b2$P6OBx!@
z@d{QbKwgfAC`RDDtO^<giCvyDsK^VN6qzS974rkm#*B$v_nc(EU^t{05nO4Ult5r<
zCm)+a875_EK*2(d6Px5%e~~VxIpXohVtvV!xX{Nkxax5d<7#UWBwhg$S#0}Ic?EHs
z9GiHdNWncn8cnWHiQ(e;IvWT{>*JDVtR;IDhyAMRZ3eqUoP7kXq=PPoK$g-)gz+G2
zD_u4W?osEq*{Io3KFoU?7bl5%HajUp{}0S;YiqgCTrGGU=u6Zee+EOo0Z7Q1s_Itq
z^l8pW86iz6Ly<j0luX$u3?NVf9ziz<%oJIb^l)`G)J4rpX#2X6IN&<boS#r~SP|6i
z@QR2|MbV7}RA@<yX@@yO{d5JCpcMWu3WK89NF0B{j`19NSaDmudq(Y9qEphgL36}`
zfrGT8*EsDxZYDNBf0I;#NO(t~7Q%mNWkh4tk?XtRlpa-_(xatL>5=ln;wWVT00Et=
z1OW<~EO}?$Z@k!E-+Te{{Z+uDlPB-mm+d!ici+7>W0up~{hhsCagAa|H7s2uyfwLX
zC3<)$TQ3_1@)qbwrO#lU=q*OH9PWIvx4VCQcJ%&mcjq-of0(y!C7?MEE31hxLv<rX
zJsu2Vi^8|Pb1AHuaK<)6xFq|=u=8UwmY9%&4MTvG3<?gSKo97Cgu7deLd5Z_=&`hG
zHRc0ftj$w0^pc~a8oP`j38Be;UnU!*TaE1#Lr5nSA~;fE*GVwz_#2s2{Lw_+h;Sr(
zWLz@jSMQ;1f2Lnya#+1`1~M_~P$qv=Lg6TM1;l5TH!GiM2uC-jD?<-9T!kl*c}dle
zIizh|;+li^yN5f+Zx8lig@5yQ|1JJhs-l85H1P~+6^`w!S1%)TOL^zk$SM3b#Ces@
zCL=oZ8e=4Bb%KX@g|ast?stgS>mBs)u!K*0+U=(te_SH<O5Z_yTiW*3)wMMa4GWtN
z<a4^(DDzl3ei7n#&GACX@*UO)Z7qSWE)%s|8RH5#3hoKAwu(49ELoi?w4^ZsU}5v;
z2uDDurQCjfRQ2*0+5Ca3l_~ktog1!JHIjI&cBY{^+|cXOf}*(InAGY3yXwlapxj3^
zxnHfje=@%oQm~*8R3!QdP3D?ng-b8v4s4Y?v1S9{s0oRON_LoXgUAm*?+_FGLivts
z&FX3;PHs6i<-pC#eIWRAguSS`Qo!ML=B6jZeYK4=DzrJObKjh+;$s~ek6-fGy$!N3
z$z!YpSS){daI3F0G_QG`A?MZz*T(8#+iV-Af6(~C^D2c~lU6Ap<`FU15!~lolGMK}
zNAt9<Ys+NHVCp8W^bju%kGH&GP{X;v9U^yKtZb!O?mj$_b=kv110y^<oLgp!$Ih)a
zW0!t9m16UHZDEI%6?f%aY`Td?MHtMoiw0?UU8dGE<5=qp)7LHt#7hu}WvO%V|M&JL
zL+o)I$J*#$8P3g>flsY5=`9ZCAai6bj%>-2B|3J(@aljwAPH*-&;Uk@$@%ZMmR_nG
ijUkoze0d&69H7yASJ(Phw|K%4m1hVQH4{w_Mn3>EY%|LM

delta 77867
zcmV)7K*zs})JT=oNPvU^gaU*Egam{Iga(8Mgb0KQgbIWUgbaiYgbsucv=Awbe~lvx
zqpzZHay`;C#Ax+Gx7sJMoy6VF(zcUc+&=j!iINygq{2nABJ2D9*SN2DpX62*01{lZ
z*iNTUpH9!jB0&%Y3WY*dp_Z#SZ=}p!qjs1#W)lCgA8ilj0VSoh4O3O>j$dwV+35nF
zzS5TcFx6mGnQb-@dmRQdjW?a=e}E3>R4#3j=ZmC2KF4gyr3M16odh-l6K27mmL^VR
z5Eq>TC$YH+LW+BD%4bcu7%J~Z)Z;)b@~nrL=$Gn8mOCo>S+UV4WQ~+(MKaofBez&C
z3d>vWq_1*6gVgp(foQ}5aq>hwz<>$l;sL-a$=#f&M)4B5b_LT!$vDa=e^H}QoJQVs
zft-3fnt4Yqf;OhxNY_Uuer$6Nhhy?QHcfU4BB*IRu@3Gg7$v!tEKN$Z0)$DNLpmt=
zS=?_dfq&=~yl_W$+J;}wLv|?vWACC<k<wPF#61WKw01T_dY%YMb$(5T6tysv=n{RX
z&G!_(&)aejvG@4`j!v10e`m27DrJhMAW=39>GoE1*F=(R;!^R7s75mv=yE4`Gjb?E
ztwKNM*Gls&|4V_d(Mjl0CE+8a>dT`BmL9sx<A7*bK`NkBt1Tj8@eMmpt%H#`xC<CZ
z^Hu&7BISbNWZWo{u`l8g!^oUPxC$cb6ve=Mgp79V75Ebm%sF4Gf8P$aw%Q@377zlg
z#WPBF0DeQRV$Xk>T5h|jW%C{L+FD=N#=0bYnNF~_IxHM~1HHVGXRlfR5l$WBV#OPW
zuN8`usmcrF;ig1Q17fU5>NC|t7WJc(M9lj3RFUMT{|n;1wm+l?e2fEb&s0^}L^<UU
zQuXnsQZ;FBBB448e?KU*Vf>Gfg_nuGX=^SX%gPVi7uj%DabU$vY>YfvI3wgbXx^V}
zDN;WPnfg(cp%RidOCG>~u870YYeId^09O^hH^o#xo;!=H{}YEdDA+upNzp@^%Iugr
zc?Y(UA8>>4l*ugsMJANMfh|T(o$LL=RNp}A71BBe*oh@4e@xJkD^U$)eVfb(gdkOd
zKIO<)tS4%xWTu1Ey<zPy5uLo1qEja$I)QLtCPb$p%wi~KGO5D=S;~xMsaUK4!Tk1C
zYBo5k$-woS2DE46R%U*?Fu$zbN@Bq{EB1JdM;z^@#Gf9t3s_*oPfNs(2xG}=z}mRk
zM1qjZ#ThBje|l05GGjTYBV;A}ZqiOnGE%6tRwmh?4J9Bd`I;*g<LiS!U0jJY5VTAU
z^#<K-d-;r=%*A5mW$__8sl%(K|5E@8Qx-9N(iz5P;aG<Ead=F9iY=5oRs@l1wK@48
zWwog!1r2U*p>t5q{u<NGY*)-1_9xihtg_!+Y2t?)e<KKO%C;z0WH$7c*wiqHej@Wu
zKn&PuY<83dV;vNEVwTnqk1TPC1|^RkS^FE92?{MKW{J52YnEJs$ha(BpD8{qKS&1u
zPW-GCg)~W3iHengB&jOOgT<o#L1luDQ>Gs6^Hv+3qq%s+g$}ewkK53sAE{QN%z{gw
z0(aEDe{QLqj!evLJ9c0Tip<05xeiab4bnOV&xXrqVGy_urlAJ@fIAo;$%Ni!D^j-F
zTU(Ksmdbuz9K2%l#J6}BO%bG=yB-_ub0)uz2}N`JtE2;8_N}4*+%x+lneKsQ`tp&@
z(aOLq<1(_lnxVBl8)Ww~PaN*JB78coyhY~qf3E&Jn~TWQmWPYe2c$<ee06(CZ4AAQ
z6>of_T4STGv6HPhIKx&)W1!@)X%2p5m<JL;tx5NMy5<h*+H1OrGMSrkR#o^+4@Uiq
z-31B?H<(HLr8NZP!wE#j9>_>)_}FxLK$Xg<q}MP|%@-aD**7bu&SD_X2=YAlCE0Ke
z5ZqxG^CglyoAKm{_OPMBx0kJv5El@x7VlHJPX$0<@y7-Eybx8F)R7P-e-#Qq941TC
zqfZzpe-T(Dx{(3FL(tB>kvla8Wb<qj0HR4W>}ssz4qX`4*t18bH<M%I#9N^f0mC@)
zz<Yt9j?Uj6_6j*=*1pNz9XMG`Zwq`Y;t?lk-wDvaf#stDJj{Q<65!$ogz^1i8F9BK
z`9yvB%4}3NrOMSR8}^O8e{6Mc59;TB*6(3UfgKD1uE$+FC~$(NF_WNaq+c*kc}FE)
z2cOx%vwDX1gag}uqD35)Zg*jBv_m|P7}74DY3-+F9cy269}u}wbG%kJU{Bd>S$d;4
zv~$dsDh5O7OCdHQwax|SYo%fnt(>EH$Xt7x5HYzXssh*}^z@~Df9LyP-vKexlX-gL
zXeIGyUI|Hgso$GY_l->8!6<VF4+MxG_Q|}c=mMA25`p`L0;hvQbA0OPQ{?`Gpcs~n
zbQYLUL??vSRrS_Wg~f}OkQ&8_DGIoKMGq!pI7Tmdu??0bwQ3;9#xQsBQ!q-CM(8r1
zX_#<8W2yqt&sHK?e~@aq!bE}`LgF!;N}auApvg|_K<EZJS1UDwRCO*Bpj$vcEssZy
ztMC=w52O33X9wbX0W3V~<lz<N!-pJ+;=E5Xcq0D7-tEX3fKd>(^Vz8F4!5?fOMa!p
zBKFL{^{#GjtxN5{{!89-t8p$$L~tb)5|RcqjX>-`)U@$<e@_??Ju13r=V2!@InYsq
zOozd<Ij~27@iGk+`jeIRT{<fecomlBK7Pn+g$qjRKAaIYx?DK}yt2+=eS0gf(B@3k
z#A9b6!Fvm-S~S%eJE0UJDG~p~;Uc^Uz>Bt@Al{JP6!W)Zb~}O&%t&<1ssHhZbAri~
zyO_eqMNNRLf5Yevo;!w{F8ONm=0au$ilxHH3I=Xh*VGkqbT@4^pE6ZveW2bL^F@4)
zNXLP&L~?A0;!ymGI-B>{CoQCxvdqb?35`o3G{?|5_st`cD95O(24pYk@e)BQ%HrU0
zQG>7o<PyX~%Y~v|kD>TFp+_LPczY`r5L}$ei<5-yf8yJu_JPN~6X^ge&>Jy=o@ZH~
zqx1!d1#gqf=iD==GImVzoqz|mj6WIYcU!7ZmxJJY2v7UA-nvh8dzY1~r0LS$NMBP7
z<V=b)c}PHUof9P@4yN|X9McQ8x7xYI-z{ZR*f{(HPbJ=oSIBeyoqc;!f(`b-*uAZ8
z-_~pBe-m*yG)H5rTRNad9zWrFohX>B94gPF+5VUam8H->+_qXGNEuKm<PVfR1-ew-
zvhjeMFMa#68ts{Qy<k9Md;^Kx7=I!j$^@1T_jJEVi5%fwxU2#$(qp);A)Aq1Lz37Q
z&CFVFDg9FOC6<`EpWKVmdt;1_p*WFO2wPY*fBA7~R)P7#a`?9?(&iADo$joFE+ir9
z0x*^%CE{`S>AZ$~OsdQye~Q``>ctN{L1_(fN1uQt0X5_!AoXH1@Jg&wGI&ZKbO4CA
z36GfoY`Hf?=hXhxM#}F2lVj7_^d<i+v-zHJ1)#yXo1+J3p<>Wa)v#OUej5gJy-x)V
ze<Myti)irOcXG4Ek23rudhGJbO(U-5wWtDowsI92!trW5hS_p;7voa$q~$u|3BQS}
z%0R%VLx#b^|9QQV)NfV*HkWpkM2#F~w$Yk~&Kzpus#Kbz6HjD{2hG*RBdGt#hHVr2
z`GZaOc=^43S*N!|t_>{X5W#o1qj$ygOYafW<Jx$~A{gQuwpz88s9J-S!QsH|%H>P&
z0AE@Ip@oSV1Bey@b161@zcdGsZ!;fl>MPL>4lD%RL2sIb0|J}Pc)>=K3Ydt+mpYda
zFn{9{EP7Nb%&~z&AynVQ7vXJ82uJVn_oKRng0Aa@)aTB_PRH{7xK5$KWf--jP_Vo4
z-9lb2QtiHWgXic&M~hv3U#P}Y@6iwZ(PA^1_VXN?WG#T-B%1qM%c&F*k|oxDmahu!
z-dCZhfvD+d{Fx@8f(nJ1fHCT4)9--XH-BF$_?0NKKZxb;S}B>rLW`P#{_ahwSb`p7
zs)`DGs-IL!WY^>V4#fl0=?*P<=*=_#0KYRUx;sLB0L+MQ%wf(kgeybxhnfr^9-cmQ
z%`RqCcHx?i*nn9E=EL=i?cab6uzD7t{m-F=rgp~V{1aTw3}`shE}Ax0$$i8|cYls$
z;`~Pf8|}C5(n_z{ocdz83(hWttkWunEs(xq@reV7_E1dA$a)cGeB|Z{QPnPR=bT!1
zIc<oDvUsB_)<5~MR9KBMAW`hH!Te$oBm|5W6OFe;<K;Rd1DIXpPhslZQt4`6(0K8&
zP>453TVa3b>J$Y9Hxd9o@NSWPqJJHGjHrtg#ypo<utHfS)IZSi4DmNK3@vAkYDR$R
zD}$LHG)u+oI>~4co-rI&C^SHTX{aUYluF88r6tyE{Do7%%}@r_j_f5b>i|OzkeUQD
z+Kfj~U`ma;sDZJ%DQ8R$^Bpd+JSmAo`UDvHFytQ1ANS<rUKWHx?_n$h&kzlpN6M29
z<E<M#K+ZhCENPc^nGhcVua}mY5FY{em$sP@eo}=gomWS#zed%iHuDfw7Zf`k;C7w<
zg?nu|8)&j>D>Yel(qz?0lhs(F$s&`D#Am;}Zj0CJ3PAjEV^;2^=34zlY!+QOA{Z7-
zJ`({B$|yiRmxh`UO$!<qqO33L_^MI_UYFjQ5NUtXWKK(l-F;$p?I5?gclT*7uO&ZN
z-BNO_R!##$(E!4HujLdQyNwElI@;x-jxa{j4iwiKyVYiijVuh3v|ZcXQ*;NT;H&6s
zM$YE?nvs_fPJ~<0*48SqKah;*!1Paq2zzz#=uvJt27F5dEe({9+uu|V_fkEK%)gK7
zVdQ@%FpQA%_Et<iT=??BRE1_yyom%WR@Fa2f)zvM66`3<QhosTP!E0UJfPU3tcLL$
zDFrDE1i5sNZw}Yn$c@+vYqC%89rt<w3v~+x0)ctz^bb3@3~aH_{@5uMNsmISLVJRK
z!5E$oh~uTr0_I)u`2cSHVEulqb?u4dv<M}a4UK8QQ_;71qV0nyKdM0<upArg-i#c6
zjO;h)_(Jme{M1ggmuj34IssIdrJN8g0hO22oDhRrOUo9fA{YS+VmlY^*wCB*!K~3_
z{Gx}B9W2<;?Vnl`YZyBSqNBcip}dP~C^kB7QCCo#DLXRyP|7G71Jd166dcPZC+wt;
zwkkUSeh)5+^QC@Wz(oRomGhUdoe;4KJ-iYQw*bk)DX*7no)92^Kw;p9oq^Tmjcsj-
zM9#p`@<=eeyu=3aBGleY;F;aU==fIQ^v#P8r^oM)PYaeau|3zpaTlbny-*B+t_=$y
ztpuhQlr*F`6bdP4wlb$2$FV$lZOuRw<N&Z1ti8+Qj7d!?Mkh`W{Xi=eMNvt^7^S5=
zm+AIS^pSks@e7=PL6IyfT4ZDz7<lf`xO13<&k;r_t!3Mf+=~TuM)^EB@f{2uf>8=&
zar`>PYsa@*nYWhU1A!(+xbvS+3#4?R1%q&e)(WmOoR#vd1V_VorijL3AO*wGvm_i?
zzzq7}$2LNqoaxir9#^&GJR&trqCaAX%C1xHKO8A7*13Ftn~8`SFeXmeH1hjqqw^e1
zRv(F3tjsEjnB+Mctx;Iy*5lkz9L>j*iXO5em#Q9+R!1FRd4PKiN_tjTvLEf&ibgC!
z(j&fD4P&z|09_pZG_@N>=Y&GkpmRMoT)HjZ|70({!}YBo-rh31TY#sJ$x}QXL}AZv
zhXJk~%bS3I;D>mk1Ao;$!QfgsL`r)xblc`oqkQhfN2FVlIDZ*jQCyew^E81rbLwo|
zn-l*$rWw3XehZU2S$Ma+ZzkYdF$C74L##!rPc55u1iRtEmBMKFXsw>RZ@b0eW(SAM
zVjE(52zKdSmF{cEELe`aSuy)dh=(c4gRQL$u{+Lx1l?IA4Vg#RUq=gha|bQt#b2R?
zeD$@pkQbY1AusNvg?#f(3wb{+<kP>A7V<Qyg}mWf$Tw2?C>_FaOv+n_n`<Gj|2bO7
zYgG$*@=Xi*O$+%=3;9h8xmpW(w4sVoIOH7x@8$N5`INLKjY?&~c%1q}3-;u>wq=0O
z7nD1H1AExjjQQB?qEvKd_XmMd&8iyZ+b7Vx0sE~JoMS|<T7|0^U$?d^ja{qBMsIVJ
zjYsR1jf!f~j#EQY7D>mQ7E9&PYYdrwa{fl7*hCd1>`5t!@lloJMVGJy_ybx6A?9lZ
zMk_0TMIzTpO5}1Pk;};!xttZol%$b6nU*kr3qV@Na-`-ClW|0q@2NpNqABSXFsK*5
z`slU`Ug-F!KD0246G0?T7ztWYS3JdkRy%ib^GChp6cr6q&xPH3Q?=rHt>QAB;)Vju
zk1)P793T2l4uI%mOuaL!8+N#^1f{t)_7UUF722}`VJ(gZB>fmVIr5LUyQ~A=&ax+e
zw!QR;wOVC%lYGo=U|{}eY$djd)d&E9fKrR1@L|Nia|;$|7Zo$GhyP?*W1mJ`Kt_fj
zgsUE=*1FD96)D}G0}tAF49!D|0H07)L@^!7YKdlX1FmxjEZTLB9SdM(1$hk86L)4B
zD)6w$vc<trhKVZkiONPK?2tonraMS~m?R+hv5fGZ&9-m?eH&Yj;WB|$d>s|U*AY!P
z)HH^sIR<ckR$=Cb1&m`%7gLx4&X@DdAH$*gGKY9Lh8n7kKL0N=T{S;oK9LgorHxEf
z#le59@CyDb9Jz(x;6GLv7^9Kl1A_xNp&h^<LEIBA!@NjCwI#naLe`<keTiy+JeD8U
zqO1IAsdBfn5*wXig3#@~`W{?=gzMc(eR~_OpTl*1r`Bw!CPlwRT)vR}1S2$G?8ibO
z&^t4k5s@=#uv6}P-%BZM-vf~zMBYmeQ-;aJT2ASQRt1<dTgv)zbbm$Ic(zG5L}!tu
zU*&=*WzCgtifc#ksF)f9ut^zz(Pk`KJ@Jntr$xzHIAnttje3zY>UUp9lk#$nCI$PU
zN`8-}#J58H7Xi0(lmPNcLKToBn<YN^d2?a&-Tzc!)B57V<~t#5#&CMEq1wS8qg=I2
z<M3xI9DY&cMZ&(@TS6-M`OJS_BvcJQ{YCEdqxTQ?wB~&*s%54BogUYJa+a2QT#r7*
z$0nms{|oXEjeb`><m48?Uq|OCAlQ_M^#G(P`n{yHE;{K_99^&s(@Vw$AowOKRMQne
z(!4V2={7ACeDBn7rb2ClFR!kUZlSiWh1#7vx%Qhm!@4_!?+Tf_4|MJH)Ygui5Fz-X
z)yUw1by@$?$dIW}|KiwxQeF3nhoe(%-6!hnK2cxyiTa%(S$+5$^#?D4^>5VIW5iv*
zQNITXdhi?d2QTL8oncj7JMzk%->7|g5>vVJ3as8^N#6Av^*ev#?u)eY@HcAfDaGAs
z%U!=wyYn}`$QFE8QgL_e-h`q(m?(Y$3Rb<xM*3$kEO+0nA55EnYkvai{Q`8dau2@a
z&tUKF&fMG;J2#=u4<_(mfEris!KOW!mR254T<^|R)$cwdwR>y|52pE*dvLWIi6<hJ
zJ6S~hN}0<e0s2Rw&O>S0it<udmAlBAYhTLQJR>#Q0Z0wfuOR&2-WKV%MM8Or(TyUi
z{~U|z88_f+t{ZTFRSlC@r7(F;_T8FNsV2u7_3X!@wOse2QM?(nZAP_<?$KFSF=;U(
z8+uQ{T7+^1b$;>4s){y8LZ^^Ww^bDDlUCF@HOjF(!u$?RDUufIWP2vNQ7g_dO}*hU
zpH6@WmK7Kl3w`Uv8QP9Gsx|_K7VBCEs+N6=&Na&sA~{TdE5|rulRtv0!mO!E75o~V
zC&%C8Nd)nh*{vuLjdw6#7#`V^rh3C%D1-j+1iw)XK1}ng2RywmT$p`4b7DQXCfy;a
zYAMkcG#*MU>|t?-cdyF^EdZ^<%n}brO{L?MUT@{J2D(2U+5us6u1<{tE)B!3<x?_F
zi=Rpdc#LCzE!ZV2(00q$qa(AeE#)SDRUlgF;8I*+j!ia7zS)*DqBgM<cOQ-8<}I{q
z-S4(IlKScq9w6r^3Kzt2#(<@$e1av^fYgAT+!9Z@YYly?u&i~ZrILu_-ERSebh3W%
zENAJlbcc;T70I*0U9fJ6^#KVn2k5BY%AKon^$}4LCEE{9O{X84eHeNvIs$?@p|6(<
zrw}7LD0xju<zn2AbLS@gN#sJeTfuir19XXSSTuSKzgJcQXekH68obpB%Kpp=%$xGS
z?hl4|W^8$7dP$dPrw~U3-hvyqm$Ro3Zvr){mn5hVIzeA~ny`|9O~pIs-f5cSI+hk0
zU2?)?=h;<S2bM@Q9QQIvpt=|yA^I@6%;Q^$>QIJR7J&f8H4&Ztfji|pUi^TUpQsQO
zB+o-k!W^=pXjyHu2W3;w9G|)zGkw-=<&4`uz^%{labN7lAD7su5JmxRmmjGRNPkuV
zh{X+{n`&ea?<ipPk`5T?7{x!<0X##XOSAnRx&U-r<tlJjm3R{!$2*&Of56Hmn*fu=
z;*|!RYiijUKFcgRB+q$E&ahdu;0#BBy~$Dw3HG7HGBQGSJ8VbB4&K&Qu(f4N-W^tq
z4`6g*?$i|%P{7KZ16Q&#;pFh)Kz|EvZ@tJw_y8w_GOxGkBMZ4?`dRP4;pKp0C`DKT
zVqwf=1A7GcC<Yj)d*Qy5!xKwS7`Fwm>52Y)hnsfJ1`+Rz0p~gv`$E_ht%R+iFaYU(
z2N)MgCCPQ<tLw<hT@pxqI;~ML#L4OL#n=(ND=slK^@uF0X=(u~-&L=+wtx6<1e;6&
znUZtKV)Y0ymSHQ|@$n`d-yagt0S540R$*=4?Kz)K9Q*_Z)`vxFEujWtyc1aZ(VH`R
za|&<H*1tJL+ca49gT>&x?-u)m?}w7~m4J_-T?CMHr~nW@F-c6`FfxUL>Jz|ic`v$?
zL>KJXgv}B?ka&L3Gm0G`Lw^z*gc(4G_0)abR`+qwo%(rVYDyGc#k8kIY)cifos5X>
zB}Ht$-zm6|;II3pDuO8M-qIr;>}eRd${VgaJkt*%uMEzr2nk5A<Xz642>Z}OxPLE~
zH+)(yZ?iS3bH6pI{}6kab0F+>fPRXG1(pLleh|ccBx?;LNOrpDm46oK2_ko$tu6lU
zBc)-r4G+nc483nJgnhpoal_FA1sZ;0j#OK6PF$TBA~tS~(RPTY*jX`yqSax&&=1@Z
zXYazef{zTE5A?(#*j|`@&cpTMDxCvG4)zW-`T3Y12S6poZsMKX%YS2&m-O;~TFQG@
z|GrxO^xsjd?B7tcbbkd9?7)I`GRl@g+{f<iZI_J^0x2%C-HH%!ytOrEBT*;I!}jCW
zMz^;kphQldR6L8TO%AHY1eUj>@Xv=ynejv7Aul_QTlj#`|G>_n7VXi*=3dLYi1EFN
z2XVc%b<HkBt9+_n#qC{Sdl&2tJO`BMS{`)xDcrpEaAw(QTz~WFfj0Im&3MWV;rSt-
zdUg_5I6UCerg6xQ1ah#~@#CX|qy?v4Izaau!#0lCTd1E{#%Hb3GgwcT(IkU(Ch-<7
z32Cq>Mp3*|&=GD^laH?@r&^R`CYC;so<<=n=FM5+kt~U3M_$Xh5w&G6CDh@P!yGOI
zaK(_|M}-Z>O@DvedV71zmCheq?SqUP^q!KsiZhB+7HKMs9$)phx0GBhW+spG<oX$l
zH6F(6Madw?f#)q(9}GYGx3{n=0WI>EEPSDDcCPy#<_0_DHuC@K^?KTZ{ni57`?hqT
zVJjMib?`@U#h$eW2N^xZ*-{P0b70k>Q+aR1B<L*O)qf9Sp5!--{24J-N}ZDN8(Z=@
z{1|Q=kKQgz-FM2Kv5y(s{}a|@uR*FQM$6%RYwOMJ?G2juoulh7EJ3*M+cc@~T6r3U
z*NZFmvIU#pT*U|DZM-jeG+D-Lmfq})chGMUHT`9@9l*C=a$dLfj;kjhw?u(tMrQ1D
z3*@7h?0=lSVr|xEGxnGrvzthBd2`T9$iF=)|4s*XV4aW6j)k*pm2nY(7;J1-J<nAJ
zL7NBINBym>kL*oxj*O1+S!GS!3~Mr=fB>XS?T4-T@(stB3$Kp$&_umVjLAaBLVB3<
zf!TGZhE^$5$2SEUgvQWK?YTL!hcj}M@Lg!06@Om2j@fZp;onc4t~s>u-u*Y+zH5h0
z5X##T{GbP%XokGqGHM^LLrjB=O<k{hF0#}?AH9(|<b}`B!!TL&3rt5`f&hAH2_2K(
z)YvQc^M%>wUvFsajd~L(*S}cpYdd&38xJhUmw<tnQzaumRWL~0F4$5cvT7Rs)ob=@
zy?@HLnfP)uA@z-7q&%pbq3KO)Q~*G`6U*xj5zHnqw=3q&Fv=tMbD4+C0&W!MQJp0I
zt;Afm>)l4Lv!cnuL)u)n%>Rrw3xC4k4dV-g@(V-pO9Sv;?HP_66k*7v!ViTNbUl}Z
zM0l?g;<w4e<jm~aAuJ8Oj%Dg97t3|Q#D7sjM5g>9>`r}PaN*h5bIBJv=TX<~&<3CP
ztb_iE`3<6M7gE5!==s0)_V(ZrI{Of{GUjiP@B~2d^c~&_@+eSVs5GHGF#GAEHjglu
zF6KO9x|BSPOl9Pv+$YD5bSd{(>}D#{G`mXU+j|vsA;ri@WgL^1e#CvN(xsh&nGtEE
z9oj?SX4A#C;{!a@zVLFF?5_|ce}0#BLeIx{FpwX#gt>3;)dekL?8+VAFX(ifF5=f~
z_id7xsV~x&8F=9^#`u3#cFbs|iRaYP&#tW*Zjk9>so{vrkB%Bow|B8MTJdSbi5`1a
z-@1v*EshVPvFjx<86VK5|BKj(0i(N6RffMyH-V3Nbb{0ic3=+ejtE@9e-EO0k+$F`
z^8HTBDemoV?=?%TKcoaN{Z470*wbF?QZw7YH3N{^P7i;0kUVmK!rQKifBXDrh<}`5
z=r!;HXutq{vgx%kJsXdQR{ZWKD)YLb?YMN+qpE(#wt+a&<!HNEsnONgvFIh(^apML
z^CE6A^q$r>{Q>{6JM<fLf9Sp~q}R6Xwdu!qQF!M=X?q}@_CjRo;2MDzb*=4ThuS`N
z5F6~+bTzcENy;C(A489>MkX(Ddp#>2847eDnV2YDcg6_4jyD5RMUD7CC#cBhfBiCS
zE*`Jz(_dtVP#W*zKM;rM=LY`{%ptbXwFy$)kFeOVqg}@@e}-+Tf84W4@(1W$QwtU!
zDW)89J?`Cyx9~bTL~9m`yP7q$Z)~bP98qN7HvPqwj2FQ$#L2a8I@XXPnTA8W@0mz7
z@xsOsjIM`zRv0yqpfav9Y#I49`~l?l@O)A0$-(ym{C;0dPrn<1u5Wc=Kf?=v!L^Mq
z^=XRxLz<2Li2mZJe_=-&4+w`~-MbS+h=ECudF;xzNs5$#>0etzUVMXJ8+7P~w>KDH
zV}AyIKy`xv@9fUN?z<n&5nU6?*jC5KZUD>e($r%(WN)-XS2q5|E`7v*=EM{~9E-)3
zKpwn{MoTvVP%ca^PEXyTO~0S;kAfO-jn1jK6Z2cqHb-due`$)}G5sc6^$~kMhC>^B
z25V<TvvKVPLxM22dc%JM(j{3wR}u|pV;4g)!{w*Y<`;yvLwgdV`*1ixNDbYgm`{!|
zxHber0uz4?%#$N7!?7HUO*qEO=pq=Jh<+o&&yoGvL=*!#sPA^${E9FAk*iQ4r%Gtx
zGzgy^nEhH{f5ArKmj~S;FR|mwKvnR^BFH%)T;R|hn+k2Z_HAs3d+@?Q5zuajqZWow
zApCJZ!=Euw<Nlam__X52FuAnO`GrlGI_{V^)a2N5fdUFB!Ddet2jh5};fDX^(>ose
zG_tWfwY*QEg;7WOjX&Tx4ZIbmh2wDK+#bIWr%C)Ke{kC&5`r;B@*aodF%i=-r(*ac
zNhe-Mpc>DD0YM3|@e_^z6UTnCRRIj6W<a3iXh@qI*C>u>^h;|7TEo9?+ZDS3UIsl6
zwn*4qk^FjLo9c&D-zQMOU-|(kn)ExcMiyQ0as&X792h%&+XrUY7QaIvwb%R_*iO2@
zzJu&-e*-0)@yif5GD$Igmr7w83EuvA7&_NwpLQ+(Q;+@*xmH$ce?#iU)JExB3mU-i
z@ZSVx!~F#DHlRH;Ak0Bwf`2t|sb2vt&mh2!E(pDVKbsP*MixDq54droo6rHc52M=&
z2h*g@_sNMhbUS>kATZk;Ehc<9ObFK}wjY|qf3lqTDG=tUu_<38Q~Mf0dSkgBwtX`i
zmN{PDxE~R(ZzM|2_~MxHE#ouv{EG7y-B#Z(_J>7aEyB`%zpMLzdoJ?6k&$4l-{Z{2
zpw;j4x5k)HuF=G(8~rw3@7C&SZn^&Gt7n<+_oMTA_&QICN~144w}9E;fo0#<qNJyE
zmj|^FVt=*60kBCYN9ot9tk7hIt~H_BBd7xx<+c@=g?DGCe>m_*zVe52Zh3%(Z^QOa
z)=ZXa4-ANOWPzOB;i2O(DZ!niyXJ)!8o(~v4`CPdp1A=mPmFxPv~zJNfqwHETVmnJ
z!x>F#`ksziSv4akn$a}=WY+>AkeW|d`mj2Hk_S6nHlTi6JeTja5ElintLQ=PmkYKK
zA%7o>76qTAEEET9t{k%yiRNc9{g6V7mHvh^_O|v`e_ve!+lVIP{PBP#jvLSui$aN9
zym@t6=p>Rg*lGk6*A4W-JKx%1?x`a+>IlYDu}qlKlOBbZGCd2ZBrY@H4hC$4#>9v^
zrc>}ih91ta&z?1MCl*FjDNzE`{tS~hBY*vd-DH}Zyjh;>E~7{rMLU~!qFj4g0Me)5
zaq;+!0tkbwem*uGqmI5Q*ryMz^+E6YQ!z}Q6_53g@6~zP3>rZ7&vTm?^1$$9x`GH#
zW-C0ve8PZS(}aOIAt71NS~oDRuGPgONqgCeWdE3V!KRbTU}?1vd@byou%VkR4S&&2
z<EMhYVyw)qlo$JJ^9<(B*ys%R5K-k=^d5a2G8I2!MLs@?{g~<QST5cLGjq}&JjeGr
z<;Y1Yu$s&`0(Y;o8@)Fx_GfI~L$>2BaI_sXb3#>189G{a_$H4#VIX3>bBiP~#nH^l
z(ElQKmdrs-rme)f=n<DvYPGc2Pk)|j2X{?p(WPt_zz}0Fp&Q?*))x1T-%cbbkuN51
zv+tirF90vbM^fm9qcPBVp3{U6*OSBbWTs6f0Ax4}=fYSH7G&heUiBpqFN%x={~7lJ
zO=KaFOTagQUVpM|`}iwi4_g5&*|F8Jdp0I1`O{#}B>ACvSk<LtiOhu}<$typ1i&wS
z!QMp+CW9Whly5M6U;`u>*oH1Pjc7{|YsJA3Cbr7Pr<KP>f)mIKV2fXWl?_hYzsLzr
ztAwU?)Qq_+QiM1ni0aYLm?u|wnTfczlRfy(js6-gr|%vb0`)a+{a-VHsbatb)0`Xi
zGab(Kz2%WY;%@w0b!jA1Pk*2A7W4SdKWh-@FQ0zF0pR(h9YC8rDk)50|IG&Mk3IP^
zl+%YrQDdX7vAeiWTm5T6VM`l+rm^_bi2bXF5c|>F2fckR!N956(@hxIH<CT-pKen9
zX;l3XXl0|(s8<13PFhu~y36``QNSr3NdHiOX7{<VAV#e0+7lbLgnwtiC!JvA?C184
z)h+H~yRUQEUvx$0u9RHWK}^yB+IUG}mM;*&_cx48y^4T6^0v0Lr=5-)Izi!?ImBR+
z$#~ABYbl%@6}0c1JLxjAiiN67NcC2j6(H6HTU#01dT-;X+snn?x%k!#5=wo<BQ(Fi
z)XYw&+~y+%p-pkV1b?~^-&_f|{4$C;>8~6k07cHNhqGBsY>h^B`+keiZAbgj({2|v
z3VB<SJCZRrE#2hR78|U*?UmnqZ4v`>fd}Cdf7X563I?L)?X6ZWYY*?m>B;M#HvRh0
zcCJO$gZ@!5Q2?A5?+;JC=Y3cGJ`gsa*|bXL`$$p3-%ymnZ<iyw5G4VTmr1%1Tomw|
zkxR&>AkMnoy`nrU%00Rwu|$`-x)2@{+l){ZtV^cbfxnigEpl>?zQs0|>bejpf2-!i
zw1>Dzh~i*o8Z{1ySz7LKmSIy~%Y>u&ssV_1#RTI3Whu77c=RZsyml(V`t9oztY<O7
z`b`iljinE<Qj|*)AhCdBdL&kITu><Jy1ohBlP@fmAACJqNuS;keR_uHi67zL%Y60N
zyDz35%g+9DV0O?rGGLMbZlF0Je-ZpKFtxSnPNf1J|C~!(M}9wYfjs!qN@!9&Q(vJk
zFYcp&FlxD~g<o=13ollx7WSiPFB99hVNu?Duw1QPtyGvu+94<&TQBt9l>!Rb!Q}n4
zkskixgIh6^z{~-0gNGiF0t#3^fCsXV3axn`#}x0s|NF)ir^WxNwLxBJf6brtH3s9J
zPi$-Y%)LQ>j7p)g3;#zW*_>3sV-o>9?;6^xS_7&bRx3JIhu7*mdJTSRjdLo)t3t(x
zKXePfwMJQ7mg(;Es8Vh;4y*M7v{ay<TEpKf)GE>c%Xn9=RnF^8dRl0F)>zNRe357-
zhejyqtems`X&u|^pmoT+e{%y!$$+-OU(cvj#QXn3?Od;t`>ry|>NfPaUeWhn)~g-8
z3B#(E^?ISI*UI{?UN7t0@CWYnD*W9Ymbdk0xmxX%^#(kLA}q!Vd+-m7s9;;)#v*8?
zj&H!=@r^o^Qqy(43V)%h-qi8)(2BnId9(xXHuWa9U8t1x9r_0Re}%8YRb6j%D%hPS
zezm~AT=ntYW<iu-#R63<;JbC`p}wQ<!bITHj=o)>i}-~JltNwTS5vl#zdj9&e+mC(
zKV17fDnow@O?|ghu0nSKT-)Uu)oJ2omEQvZtI+lOki$){bqF*y9Dlh6eXT;Js(=Z+
z4nU(TtPfDrX-;^Te|cj#yfW59coz`nHTrE1%hd+ds|o}<L+fVEnplq8#Vq7Qdz>nY
z(4<k_-qVOLA={hZTm4T8)%aDR8o&O{sm70Ypc=mx=Nv-Z$>Y8hWc#qbtyh~BSpD1h
zf90;$IE242$-9lco#;W0NXelrhTDR2-8ig8HDxh11%H3XJ5xi?y@p8^4rlz92XN9F
z>qr4M(m1R)^-7}&t>Rrlxx?-Prq%SlW}_ZIpl=__Vxn}>HNFznjEeaymq@-4A%CA}
zRCnNaM{iaTLUnzoy1RW?1+voIhI-JIDnJZYN~KYSdO&@)cd=Tvv9pcMRBC&>IG9?q
z4ul+*(_VEOo2}F;K&tC{b9--(KC`n6D-u@!HXnO^8x}24wB~M&THmg3BUP<!H>>zn
z=tZ+o2P#Ls+0pAebpRnWw^OT9?|*lzFs}`LdvAw6yR*~WMZi^?b(nD+c!fZ|UD<>0
z07Y%=5@72)jT(Lz%A5E;cIyznyR%biQv16#ASg9`8=(TfmF?|qEZ?i{VE3xEDouE;
zy4|4e@4ztN9zOzO+uf_nJ7}tTNY}8BK?nEtnl;{`CT?MRquFfIOjoNk9e)7kL+no#
zzK651TjTv{00IEiYdbp)><^zc80XF|bOfki16Kr&7spf4EA?HPo?2zM!N*zMMeuJ|
z8+(T}Ai&#=9X>r(nvU%nEKNj;>JDOAgfQ>v@9zSKpd*#)VGRf`OeWpn5b8VBqb3Zj
zx~uP25y^qRR+~FGW3}ck&3|Zp2k~ed@Q2U%?jH6KW}=R*K#z7Ruy`BTLjq!>QKb<z
zYJg}6#yX4)?sotcXr?R3BH&CTBJKe~?KP<VCSU^eqq+--h#0e5+2#0J0R-KJ_v-ZB
zW*spG`n8Mi!FTKU9YEk(gT7M()FTXP;&)-@EBG8Ha+~+7ve%$~Z-4Jq2y=I<2pYi1
zDj!#~hA07S%^n~3P95O@2vEl*y{p&u8udef+ulx-CVrRCGa<?L&YryC_yd1yI59Xp
z=svvGtk>!Y#s<+8K-}#bu_Lt_fE~*B_UbeZdwV;C_{}~3-rgQeJPr%LaH>peOjVjs
zw{c^m+sFwGzR=u&(0^<b%(oja0g`*~p<o9-vZq(8ysxKqVBU64c|{o8ZsR>w-|XXZ
zqy4$n|54d!tI9@O{hM#Jl{;*-)#BXllBaUdzWMOs)SOw~hpHwLBXZ{{jY<pEJM6<C
zJo#F_XeA?d2$L%L<<8JA*ZHRZuXY9hx5!HmsX?a`J-)C<R(~1Ig0#g7HeG!Kk*$p9
zq{~?M3jR-(T(z;~kTgm@D2qFFt6WO~b7hCq&72R+v6WX*tQfVADj+pRYY8Y0vj4C+
zOypNM*HTA59RDE)Q;5rJ;xEo^rA$xhZyh;!ASksx6DZSmf&O3<Rk|$4h2jZHF>pz@
zpI5DSmBqvU?tj7732)VQ2e8oVyA%5R5=-A>>B_d&K%xO8koLlDn0tL^cd`T23;6sR
z^7K1EM2Mx|1`()U1CgP+Jps|F_E{W@aFS7L^_56}{klRj>VI>R(YOQ2s2AsdB6S#<
z{&i{*m>Rn=keh6>nNi(lJfC!}$_CuSvf5<$);q@ze1Aiu0I2Bw{Ki2`*u_fhTPBtD
zINH!hVdEXts*`GSP_9+qSGPG*tROZC=&YkQ)^5-2RdX@BzYIo5C2+(rSZ`STR|Kch
ziqYb5kduIAyJNztM*RT%5sMubH!O_~h_gU2;18^WS^@bgkh7uIF0c$kc({WCZ*AA)
z>IL~WaDRj#6rmivEB;V<0n6Z7Z3s&ZSp?t{c2R;(zK()72<_Es2PE}f6xSQ@<(<7U
z(v!*_P?8#Tn51?=o%lzwWKaB&<3RCzJDSMqPG@_knkSR1>$=(MH@LsccCJFv56mFs
zh6#jv+$@1`Z(pS74tR2I?eNX3x2MM!$48p6On-0PWFjHDBk|W`DdlIBOdGmM`L4C&
zv$Hp6t6KeieXAlpaMb46yVtKzUcXr0W^H|&Ug!va58meayYsilua8#s^yl@h`k{|I
zF7K<*!y3v-<zm75d%06JHUVydh{Vqo<olZ{)hiUpfX?gYW7oIIuUzx2A)WR|VIfYf
zUVmUTD;RwM(L$|jw#l6h;{my2qrxyE4E(5OgS&}l>J=GXg1d^7V;lyp(bRGtE-MiB
zG@hV;&5DGdhOYH!;T1YZR$$sgKVhm^|BsVrpqMVE4mDDRykD}EA2aOc95d{#vtYDz
z=-tE2`V)5iYflw4fR>iBx#P3DQC&W{Ie(^K+Y){2yAlH&Svzl6$Tl5M)8Y<hGWRr9
zv&U>cfc?SHo?uS#CvkQQ9qx6zTUu=Fk0lHXg$WSeM+YMmwtB&|AKkW5Km#Mu_&tr>
zlwM;ZbG6qS_jsK}WM22rLWg&sx}KZ5eQAFB&3c8|+?U&EW~^<VvU%XT!@wSs*?*WL
zo_C)H++0UtM|ZyZVfMs|53_gD);DJso&W+q08E$L-tg!009)GE04GZsp`{g$95cU#
z9^3vPzUPaNUjy1LG1p0+ZcnULr`wYNPq%S+B{p%sz(&(^-2lVpaH5{3=e!h2wTAJ^
zXcN%XU89yy!D}j6o_JZZJaKZ!GJi(HR!FlgPv1@D^xaj>iZIQ@$h^UM#0X;#v>ktn
zhWX?V%_Ep(ED6n1tgX^4$C|3EHTVoG^|duc<k3oB$PB&z3oKH8Ol+8W9t=Ol&xHX_
z3l><$6z3yHcxhx6<&<e9OtFN)4iutS>ua~*(P}A}5;!>>_zXP1-#1+7oK*b2bEoe+
zvX*lP8=GCA2cg4lYz%HegEl+yheoiKA^zwfm72pJ{H*a&|M8cy{l|RXxR7!PrHVAT
zWn>WMJqV|TR~R%wTEEA%b7Fse+G$3#6TX)%#t<JERupfrf~d>iDXp_0T2H%E_Ctk&
zL<6-Yw`9f;0s()2Uge}?cc6qg6;Cnon~Kj6z--dHlf9bC@5G3*n(yJIg2hQjBIUf$
zO1HaZk4d`Cn9VVAVKy=@%~5dE<KfUA`?k+l+M6iksU^zQFsK8&+qE2l<lP)3@2wY-
zfq;KaA^B^Hn;=p#F;oL{j9p9PXh1oH`eLO3rH&;%IV^uGT_q*EwB(A2jq2IkTjv2n
z>fOaV?T||{ITT=xq?h7X24A0F8OQv}V5zLPQqW6Fc{l?(0$z$a7_Vdw+Qb)(Nl+VQ
zYvxiW)9Z4>a7mv8=|HzE9?_A0PR*Gc26C(9tGb`Fsz-N}u_C$3jX8`5%2XWw2xDJe
z^`0J&b(w#dl;Eyu+>3ikP42^_rhAG^!<ob$WPbe>f|I#caQb3W)1=Gh&|X4nO0D3@
z*I&W2cm+?^OB@@D8(&V=xUZwaWVVt*Oi_IJKxATu;zJw$9p{S=A6AMF(?3ys=-=0u
zVRHTz9k^j1%yHeGgqylE|A`LSFCXGkJvokDs<VF&htl1VO|CZp_T*eTPfu<(seT<*
zzi2td-5m_D$0n~5Y_>RLw8SCfkqxvjIJ02c`oa0w>d3=3@uVOgY5Yv?`7peB<vJL7
zHc=VN3*v#6K4!Dx^so35PXG%n+T;!NvRSFspp#GGa%Xp^x(nB*6t8&lRHbo;oW{w>
zHn)Gb!4FpKt40J*rb3gp4o<5A%Y|nJ3QGIV_rbpN-FGGL(z$9`@JFs7PoZlkA~$<7
zr;t^W(T%VlDjhtM=~pH3Mf(ctAdkk*sH*e|WSAb-@`y(OY>MJ=iTkN%2jY5BGAzvT
z4zDO5el0qxg%1BpS9>Hgk)Bhi^sOy~)gvhwD!<nOb14w{6|kz}iS}RrB};({iZSr9
z_dIu$9P3-aykG#*K;Z(umkP=d8h?$$Feoe-dXVXV{NbFaQO4krsKe+D6F*+yQCfW-
zwrpTdtb$p{45L^=P0_%`s9;Jr&+cX>!$F}M%N(dT#(V)tluU2FpOgJn)BvGdv7_NV
z_5nY=mM5i`RW&hp`qK2{`QJDakwjs@fFUJ4#w+f4nww%>;w=mibLM5UXn#&VD&M75
z0c^}`{_~vw06Hl3pGWCC1zw7n?r~aRbqPV$eGdMNC6Wvvz-^FVK%9@+W#uXb8q@e2
zltOQ7i*jSbr$UTd4RGeUv!fD{%t}mqWsd2E+gt72;_v2QyTd>5R8GHm<;i~+4~%#A
z?MVq}?18a+Tiw2`*Gh1CIDa%pW2;-@Daal_(b4Jvnn?|H!MTUuTKR@tY3zjkUJ$Jx
zss};2YE)1?Ro(Z1fMHf#=h7=zuN0K^B2qRvElSfYkq7V6;^Agxuw7HevcZ_i6nYor
zO3QQ1A+Sv+M;Le8^iOTBU4lMNf$N9ac*-L+YV1m)F<^*8Q9~xra(@rCfC;m_32E%k
z-O%gEvz~e8fuU){p5scyyu@ts?yrGV&e&cidZJ`poV*cP3+x{54<eyr%!PL-E0EyT
zirRD29)ehb)KR`g=ZhFmt3a`<f`L`&xd>(qmdK-56_n(bfW_$YJ$al1?fF954xvuU
z>gXRn;G7fk3tJ)&pnpvpcF+O}2}Esz4$Ioeyty#_>mwNg40hjlq7jZT-Ee4O=`-8}
z_uH6eXnz^waEGR)UQtHd05qJ8L{M6a5e~aV$AzChg(&kz)P~O=9g3HM$;W9uwVmr9
zLu<&>-cf%r+g@I$GwjP9x-1QHE(Xx!0p?-I8%Ec|kTqs-?0-=32BqX&LNhKp1CHMv
z9a%$jmWF`c9a?DJ>%Fx++wH0)GB5-Oh5!PE5FZYcuS6xvD?!x#JOKS<Sz{{)Hg}mk
zq^0sv-Z$PHp4}Pvq}3w@G>*p&gIwUt5+2qrjXBAu7ZmB-0|{(+f`=Uwp2#7u&Ux6z
zJ+^Hr6_b<YKYw%G09Lj+err+0c;FPCg_y5^o+~6T?*6zoPQ2ywvPmr}9rHr+9|eL8
z-(CaO+82c@b^YNWbvxcq322P?0)(|KqxLQvxhGZz{T|9p7vo{rhyL<Sjo(DidY09N
zk0i#Zz>h!5fbRX-^R+1N;y#Fc=X$KS{M953mu0+0!+$m~I6ql4g?e@I4gV+_J(b22
zM43<y^Lj*2o`*xUQAMf{Q=#;e7pDIzL=ExKCWP$_LgyL}52<eF+U@mDV47@mD7zs_
zUzs<u1UUs0<r|w4QcS!a@TIGf^cmvY!1M>_m|SFYpuexGt2{2QEh&CG4E^}g)U*To
zG9|!p-G6HwOH|NK^eKKTz{~|!_t{+@KSMAJFeawi3zZeN0&$iCjjLXt1AcEnpZ`+0
z5vnbN+P#2+8DxT}Max&AOj&AjpXGv5QkV_5IO<G38OkMNtLW+G`%aQzBuDVV46La+
zThsqOuO&JgwUAWI%t><~PVuz`Z~qsoJ%E|cZGWG@xyZgec}W^#MP2jx>!@p9tWnpf
z674U%OY|w`MM14BE_bZbqvUB&Qo0iq9JwaJmU-VVubA7yQ_$9<>OM*iI8eJ~OTl*k
zQPIWI16y}M1S^(Gde?O<gpSEWT{%2uZizht_?ZG;j{usbeQdb2FNBV;H23jCUMpO{
z2!EjU8A&QG*YmXC3mhC6kxQIqm7<!^algdXI^IHR0!$?j{N$$%^*&vTi`}7T{bkCZ
z_lctr!jIcqG4*iqNnZSvP+ol6TzT>NpQF6^tST>l&lU1Pgr(C7*Eym@jDUkM1!OgI
z9smiVHBn-<5-d0GvU0^t_^IN;NLG7PrGH9(%f(6|{6M9o`H~5=trL0}MdgBwTR=ST
zsY-FPD3srW*5olz5IrVP_l@)Ej@ew~#xwGb@pE6B#fSN>a|jr4ZJ_+<*=BiYwymLN
zP{ye;R1R|twcXzG{1L$iJcBUFq~>^N*qB|?F`n@Rn?<|C@Pn>z89f;(^l2El&wt%c
z=%4U|i|qG;*Jv)F7|0&PkZVO62+P4F4e!oQ4y8dvaZt)JpI@FAV{);4T*vYy?I;A6
z6h3I>dF%$qS<q(BMZzLb$HiT`=5{vf8sWIcgXMma(<cltyp8dNt1F{(0vEC}CTF1A
z-Ni-+R?!Dn2SFv_YUL*<uZlrN*MD@!J~UVM;aKP;$=qWd1gJX+P3B!Y(^%OVVQjOc
z6S+8*w!#TgRyf&)P5`NKIr}WihJ*-*060Kfw(iW(e&I=xjKamh_6wXiVXhRB+Xc87
zSeuVDexT%yo`pf+Iu`&LN>q+T8qx@UX(R%^msp5|c)>cjSq~GhQVG3DSAY47uF9<h
z*yL9{%&XM*@G$R3xUSZA_8M^gGnO}Znrhmwi4rYg@;8r`Fxe<t!sKVbLKrsi)s`9&
zE;!M>cYt7V)HyZ4<fQg>j~Zz_bv9{iXru{k_{N+kc1PRFM%s9iKa!@ES%c!Ft!8Az
z8SB7fqtCu)%`UZirJ}*iuz$AM?OU<yrB;bw$yjh|;~PAB2EZ04^_G8oTl8CVK-$Ym
zT}O*dbUSZVu3DPB(b%Mp50Bz4u?mmlTUmiS8MSKgkYCCNXqDZnLor@x#5qoyIksPo
z^%k9WH@5%q4>2$&nS-G*Z)9$RUm@Et^jzR|T>RQVzj#?HmUMLCMt@=rToy54udI<<
zOq;MorzC)M03YT@z+o9<Of;86-1HR~Woto6%vEUdI~-QI_4zQBx-_)Bn&hMb^{fR0
zL2+qDiph^i{`snK6BezAyv%mG$auKI#yIv(bTM6?12~p6*b0Ed4liTSTy1UH#XP=a
zQo*c1Z8X7-(F!=O#DB|-_bXABv)d?bsW>QFi;L9ul+u+gW}f_t@S^1<?Q1=0j!KiG
zrHs9y;(|%^FUd~vd$mKN<e{B0vtFd>?x0(Qv4{V0k4&Xoc&B!X?ibuLeVcDujf%Qa
z?R_1c#_k<-8av-~8u!v^%&fnUPGc4%bsD=|r?Dec88b&-SbwTcLlkeM)7bmx=rr~e
zoyN@DkhSUB=FsgQM)4c~T0o`0ln@LVClEB#H{o?dc=k6c7zzSKa?VfZhj<{bZzIL4
zVBCjPQQA$47@=mRaz!TPGds&x%)ETI0tF4Bx*>%DF&3@^M37ht$#s~mS)eLvG>sHB
zZp%bPjSoN7E6GV50)Bts0YTDH$}KTmn(WeJ4s(}p&gN^R?^1o?aK%PWd<FL@rTXK_
z4OqM`WsINY3fxPA55QLN)*f3!pp1nRXB-AOmfngEC#kui{;4|+5WjeOnbb-+Ic&go
zq-4ku{$3>w=xsfLbvfQKAJQ*K)MFz&*u&8wdk-|u2MISCzZ-vIet0|+%wcOHD&qsU
z&3(uO!CvHv)9%GGg$nnfjXtWfQUsomZ^zv2n)ck8iNaxHx7k$o+?o4T_S~7j`JOuq
zzwNpA+jBdAqdj++*mDU#V22ImR@;*ooy4Bo+j!3vi2YC4bHz}_p4(lWe}?Cv^;$3i
z+2eu48N#xCWM+TrhwgZG;R2x<w_VfgGV-@H0@8bpXF0knbBV&(JXRc|;9cA5KGOKk
zWXGEJyymL8%_WJVABT@|omVc5_S6C_UC|&nN}LUHU^sbPq~n-Pjy*Qc#U9I-OX6$H
zx+-{JAl&n0QMzx=cHxT7bw%h!x56EB?Bzw|Ta|)09UFg4(MV7t4TA1?#Yxwt_NK!R
zp(x2)q!wn{sR=~p+_KQH_7(T8(XQ@30n5XU*unb97iqV$<z76BmoKHg!PttqkqBdd
zJ@TOwx~HWny}npd?Iw53i*-QJr#JSTqrS|!*W9Y^P<Mg(jc2yBw)#3{zojbszd&o@
zxVv#{c*}o%0w}}iLg00KLup6E{Wt{5Y0P7fbTbTGSS5D%ki79lWQPU?i-T=>G)|P)
zWqA<#{DBf(!g9J%Xo&i%XmelIKc9LTwNI6Ds_-y;N}c7|d3iv)<<BoN0^E~YY6zLf
zi69xZd>#5(p0p_7*|USPh)t)lC=>z3ZLrEbA_0HNs26Ay37q5zoe#%$08H3tB&Q;<
zqcKNGuJ5_P&Za{yP!)ZMoyZ8J{MpE~9hy`+s#?+1(DsA3JRb5nfnJa6X4=kHrWy+t
zg}7YzsY6+DvyY{#i_bYOu8%bdlxB(tIT5Ml!99~fIdj8lT9*Ovgs1M*@($s7v2?X0
zl;tQa$E$qS-YB4=&tsqr^y}?721+5{(K|Y8;h|X8>>AF4w~J^`cxc?0u+|VVZ#n$f
zaw`UpOK<6@g%(AbSS&Wq4$UccGS$=rBTL>tsH3$cM#i$vM?1?Go_cEcPC+yhJNlgl
zAhy8OGq7qjQFCvKrJ`&SC`>V6GN3T-@bWrIDR?GU(y&bMRAYM=oq}gG^0A#wRAtLl
zr4EtHmr>Uc9)Cw(pdYhYv81EZCy+OwB93l#`<5RQ5%`qb#e&T05&lbd*RU8*k#*Ab
zF*aMu2~r7fpihCM;5qz~m1yY`Jl{?FOmfdn>ISNHlobsCH3JZ~+aZVrt+)z9DTYMW
z4*<5kMs>RZU^`wVzFta(znICF8h@gcOj4P6l%FpZZGRW`9Zn6FEL_3EKYWSA3l<yB
zArx(4^JX!SpGp*fN(RF4T8Y6ZaWCS?1DDoSDK}u2Von!i_leC0@-_;|v$Wd*(H{_`
zVXHhxg=4+msKdNo!*#vBgDc~PuZ(MTWn6q6HRP*1s3G5cQ$yZQ4f*tMq=r0Asv%!-
zHRKzqeSbWZ7f%yv$ivOmkQe_PHROe=hCFHI#94y=(mr*B<lJik^c5ZCe37GrRN@0>
zY-n<J3c~6~RcM6M!)P7R5`*>S<RAttte{miTW)e;?PGJiVZUYawS^$F08l<sIeC(^
zh}V^eJ+M>jDv;~Sjn<W$yRJO3uI$BPK?EY&zJCd722cnL#fBFcGXZXG+!C`abHKsO
z$pY>DWWUN#`VuTa@*M}?p|-_4K6e~<n22-88(3htgG8f3D&C92+czq!zJrS<Za}k=
zOgH0Sh4JC-mH0N?23Pp)1z$#PD-mdcljoLIq@72)X{Q46#G$0TB|E4RIZ7~mNilL|
zihl?tolRi+*JWVsDf>{_4?8d(zmO=^7>->$itEO%=oB_x%_Xrilf=@Gld2%^)AV4)
zhf|VoUaE<u9~H@$@;)o`GA;cuV7+5ai?bV8gTTrTDW)686lxAt24y;pE_ds|m<S_I
z!(+q_8}<S<)A-VxG50B$Yu4~uH-~-K1Alpagnj{DU$-#Dr*G-_Y>4@ANWqMEUGlj{
zb+w_L9zVYj#iA0es<+6rBOEY10YIfcgSzJ@h$X4oQ}nY%;-0AZ`o-z-hvTCcvbKpf
z-oY8VqQUd3Ug@DrZ>pC<9RL+B19#kNR#*X}!O{hf21}P@<<M$gr8**YCkQ1BcYpfK
z3Z@`~Qz{@IKPu{fcHPm1``ivN@zvS8^muTq!BC*Dpo!rd+?3Uky*)dAetbqFJ5RkB
zI*x_74y@xdOStm+@*4{fG=hQUWLR=%Uyv~*bnyaKjCa-Li_sy|WYE%YaMPS^ZRHX~
zc4KG?0lER!G*K`sQIez=7||8C3V*}pd9Bgn1WBQZK6$7pAd^T=nkxHo;5?guG!Y^X
z7~7m~LJ!^Vfn@sV0FPg0)e16pZYy0ViJ;$_qrMnD7&~Vc@<C4DdfJ0c?Z|V-ILQWV
zgTT5E%`uPY2e%x%tu9(E2>T8U?eN@1QV(T4^kRAH*xWBt`m-CD%84HR4uAMzM2Vc-
z?=YzeT#};l$m)BRWhf;wmtU1OEg6AW`&YM)|I?sJM<h$pC<-wzq43Jp8eRV)GNw4L
zH$o@QsOjjn&{9gD%hz|4WwMzzg_IcKIpASRO~l-&vmWNM@lMG^5@4q0g{`A{_}cPb
z@&@Itc(|Z(zLZ~nW&tZ|yMGj?b!6TU?BEUCp)0-45IOD!mBvO;A!?QdN_Be`RH8@c
zG~NV&$uLJ6z8fN{&7Htl5nvR}@-V?FWNYFhk>wUpISl*?Aj$>k*mRycU4kSvj?3T$
zZVY5^uf)V&un@$=4*W~TLhg`y)&?^E8`O~3zb^Jy#iZuj;na4z?j}?RihMkw;3$58
z6r!jRNJcJZAL^Bu@}hXdqlc?rT8P!%ZRH0kmx|mFA%B{&ahot(RbY%;;ddUk^9;4~
z7(;;|aE6R_iD%CG&i+C4+y(;9(flARuX(F%8sT@Stm&+1pOcW(2l%o&=#<yJ2cPJ`
zCp;ePTNg;z;-XZsT8f_FUa6^u?C6{jJ*6EqejKD8e?9>WzKL61pyOj!<hbXY1f&?t
z9Y6)oVt@1c077A`cUz*U5_)hX6wl3(J%k18n~q=hEzj<0c?2X!(>?p3U;oIKGG1hZ
zU<*GN!<WVtXjM-;Pd6$F11cCSn08bz5ExLOxv7p{QNC#aMhQ{4FQ+62>gsZUbLoPE
zCeJ+7jq=XQkmjm`jMs0QKo<()|9Z6)2kxJp>wjL#%_chYijs>b&K#SJ&#F-dIhBqL
zi9TaIljvYEZ%&Ry*inm2=vB|9+0ob0p1r<<_U!Fn6t{79_DyYfKegS*zmeMR`L__1
zYeP`VCAc&M<?Oel@{>oO6blG0p2>@k3FYUr&6S@={~YD#k*fTBmwSj6E1tMtKsrn#
zYJWt3Q#GQiY%+7zqDY;#wlpAZFlwX?Tu(Zi;!aBYcVVuwLzuK10TGlUA6}4Pz3=6A
zK`|Z$<A|=h`@yA+nmOUQtDft@l7v-ctAiAkVXHEWbNV{&U4ojq7*Apz1<+RFH<HLp
z`lAB9q`^DZ5Q-A@U%Leix>g{rzwjKlTYs#`E|F6<uX60{HnYj3Mv*<|IxEiffc#b_
z=2ly2c1fwWWEWSSv6;y%Ksjj;5tgzkk;IGol5KW&!sd}y-4N9l+$8N~tI1}M^Yi4c
z&4ahpW-Q3J6$|og!~(@)=W~wf%;SyHtiaO9^`(uDzda?5TK*Y0H5KJ5BySwM%YR*Q
zq}hQCpb8W3v8WU{U2Yf&yh)tR(6IFQMw+!r0|6TDCGXX8hn(g4T<W!rV_PiP!_rV-
zj8yXO&B5$hpYqB11}3BsFivHVo4w2;<Q;8YvMB@;d1xZ<<J=r^Bbg)a{_vW;V>uyn
zoh*G`q|!pnUVI(4`<FYg-9LTfewU@+5H0~mm(<@7Gk+FpFoSq9Q>~O3-jk9bUD2m7
zj99TkH5bV!U%rlSvW~dGCRmSRe=R#$4~ik{a5f4qh>gmv=SAjgb3QafJHSuG;jBWY
zZDIFXT1gglN(=6%N=*w*=l{NaeO=JA<r{Rg;db*f9(tT#NEnd8rWnF??&eIMsc$Xs
zEuvUQy)To;qnFhRt2J4(0=NSRL%0~0tC8a>y_vMK?g^9)zN^M)*+IC-m(G;0CZY?8
zH<z{G5F`bvV--=Im)_tIEPo@J=*dR>!;k+Q{^3W#Kg4iqM)qkiOR3z8Ke}z1I1S_f
zid>6yDH5&ex{jqXokW~}P3DSFQmaL^GpQot*HSV3WpNw}I?4&XB%HePd|6tEIA@&9
z4UyN$RBDL0i<!I+Yx<tb0Ff?Maz3OVohM+J2Zc-yh|B{XTU&vOfPaQ8$)tqHJV>?>
zBuAZuS)4869y6+h_|9uvWQm9y&V<%p^Tib*wezdwMCM*uF_RWz#k?gGM95+#ON1=S
zrizFrD4j1td5}t-5KUetbHoxz*X{`FxW8W#%E?R-5e{eKtgj!qr!FrgY<mu1;t$1n
zC6Xn{S9yksJUEIh5`Qrmvv{CpOo+jgPUMiYLM(q%LKp|wk4j{Qi8LWp(o94%pPyPH
z@i?1bV%g(Fl8I=%GSft=J1JDlNkWl&Br{RS;#B^LyeZ12pHK-`HfuuOvs&s|oFqY(
zBr_!>7F9YU!tz;*b0cg-LaqG1D)}5@++Uv7Vr88uv%*ryrhju({0{-{@`MzB0{E9?
zs)+ccW$7w5o4yp#)od2oEjaFJf*vj>s5z8!?N)Hdy)%D@P;+*t2dN~yh=-WSZ?USG
zWPaaSb6I}hm_gp&j6p`%;Y3Pu3}=<fN*?Kb_$}Ac<fJKwFGNb6oKA1A@ATego#wqs
zbeoD~$CbblynjFmijmvzC@w`#xA)d}dpFx{kw!ZClQ)(P^T8*Af{Q_=k4|!jmPnV#
zi-L$ZNF~+cg)(!Zn9_9eMA2*lkK^F!vIMX`C59yy1uD`WnkG9Ji&M$53k9jIQ(q><
zU0xdPf{4@-S5AIMMZD#!b9Ytt?b!|{-bVSg#HJQqZ-3KuK-YV8?a(!#6`SoqEqDlp
z-pbq+ahzmN&17Lm@es{8#4>Yp!!7$<$Nu=446w|?)~uEj!K%{=QT5$}pXCv()+uN=
zPQiVr1KYivhyqjTG>Zs&d#jbp+6G6Nb!p0|gnS{_540Oh<QJldLa8JI*#p~ku>`X?
z(-ZN$Fn`3LmYawh8ie_$m|%Rq=@2<ntw~m<=>Nl%pxZ_&3=)e_$Z%K&I}A6c<$><`
z`Lj6CpZ<aYHqb^qI<4?i;j?p&i3egtd2t$fo7N5N!rVMP)3}VYl+*C|K@Ic6@tkIV
zl`{~XUm516pU63;pM8$InbXS57P%EVE8@2Gcz^l>TJ?sVG-93FUqt~wH8)qlPhD<7
zhq`xWGMDG4<?c7urFn&+SMiXI)TctV-N8f;9Z7K)KB>qLf?`-Q-U2sk`$*n=cQ~=2
zh&w((>x!Or>MPcODVNuvMM)8q{0mV42y0pp?Z-!C*sxITTQaEva})~(7e57~G--q`
z1Alx%&A!IewB&xa66w~dmMfC`k|R_+hHoJ}?{{)B{TqewoF+qf(!#pEoyriN)2_To
zgz%j9zWT|9=*cE07lH`=6HYF~P`Ty9bdU<B6|G#Pdo7VM0M-{CJSPoKt6Mg3T+(x0
z;kxj8!C-Na<2oM3US37sD`snsE79=D+kXY$g-i6@p~rAtgMA{$1Y44cqM5<c9M%@8
zB|2*ECy7~_xCTm&ol6-0l}gLPqR9<wOPO^Ud4?7+Q_v9O^UOdTvN~aaNTTtLYTw-_
zTU>0TRb_|?cB{69@x2c`K_d)tN1uQt0X5{K5}JMzzIi29DH$G-FerT#6F84yn166d
z)g=6-FT4l4q>UhJUGmQ|n^U_h01eI^dAb)W6dA2hHSCtD<ijj9q#wAe6B>N?o%Ge9
z*yQ+0<586-w=6V`xR%F*m&0c(SNq5|+fHclYC8soTL7HU$L<(p30Frv;Wu$r>4y%G
z!@<J;c|A3{kbP;3yD~rkM!5|O1Aj+#ds`D%rP3T7b7iv&Xs#|ELH$QI5Paz84>sN7
z<@fewo!;U@p<!@{;Je$=yW;uxi0N@{ykijz@eNz8T1!-|!OGxpz+K2J$(P^(zO)8H
z3lrFTPK$s$5nGgBnghtUnSTW{P>J>)*!<uQdebBv5ZG+S3pScmz(g!I_<znWCb+Ut
z(~nNakzN4^dP1-8DYU#<;W_f0Af6T<1AAXMIeNsTEDd)ccL_<FZX$6S*vleThj&VA
zB>0q8A}bFsk-5dIuib!5#uK_3E|XJa**pn6DN0YrYn3n4b{0sZFd%(KfeS?{gi5iF
zNIuE}Lmv3bD(51=gffJWNq?}!Dw_l#{sf4$S1A{!qgInm`=~uY<Y7|>{!Qq%O^Sut
z(!gJvit(BNMh|XgQrRR8oHdH1l}UH_IkG%X1_9&|DMU1@1)EM=ndmd5k$Cq8H4-4b
z26+EeKdGP<prhIcdTMegZY&4n!TlZGSxr2NdnIs!Ko8_{rA1thb$_9UMrl`QTe!}S
z(9hPeJghJsMZ6947^{XYZ&sZ4g<1f(M&IB;<isj2y1?`N$7g&QgS<#m=35sSBJ>fr
zf~o6WmtAK#L(B3`E95cUdT@d36F$Vca7|({8^e`U0JU4dSh{|3I)RRqaO(h?)hjKF
z0{M|Ae85WGrIlVY?teLgc6G$tjaZ*eTE$Tdq^;D%ddTsBkP}9DJ>aS6qI#Vu)@X;*
z@n{1TZ*&B$Mv{J6VKv5JJ7Jd%)-D!74w)}XdIVJ-nh#{+Qt4`6Y`}>aHbuV`$A5!8
zyrUx%Mj{LVG(QNO9+8leEc4Ygl039cnuutIBO_v>8NLSiVt>g)!yHr$ih$R_O#c*=
zipizNzs{GQ>huhFTB}qN$+i<@M>Axbr?9NhoRLURlo9)~4uIr9s!3Se#V`g5Q)<*j
z4cJK+6s{vXg3*#pgC#a=75fR?h#gro=-@@@;N_wN%)1;`@U#RwwFAVCnQxT|j{=hN
zaWEv1*?z~IYkz-f$EPVieq5Z(1#77b7Gp264=PcMYgR;^=?E(w3-s$qOzNOwHyLN?
zSUx+>Vi_hNSr$oX>T#XYv7+ER&NXF?w1^X-J(@{9pfSzS2!4>^lT!G#q#v#;s7QXy
z-|2^}<C5LUcU+Q6Z{fhSzcPAl>>}gnz>Tp1Mgz}Hw11Ny{nXJr825B}wD+8b#>oaS
zW(mu6zDaC>Yh$9L(;-)5AMhW8l-X<F%T05;{<U;2+6PB~PbQC5-F&9UUq>-{eh0<m
z^*8<6{q$=$e<S_cMN+?Z&h=~8QmrO~RN|PFw_bgH{o0$&^=rrf9R1pH+A?_hG?oWn
z<=7DT(SMmSKUBW|`Fr}Hef^1eu0iNh%g<cH%H`IOE2YM#E2YL$k`SMggm{=MAtqvR
z@26FJYSijPP2F}n!w_R;;~cT+NnT><tcFlSys%)=9bs(nQbH$kq!8uS^pJ<@rcjp5
zk_WsR1`$v0c2JU-LUu(*<5)`!M-wxnA^B4ea(^$i)C7T)tIQ1CWv4`ASGiHJMPN@M
z1lklwn&N%>?#KeX=JWA-*-1Zl)h2f{Ph60@nN3rKES#wd#cm78TQ==s<hh1EY9KYP
z5{0KHAR<6-M@1AYE>}2YZG4{pphJA*bp4Hv?-v_b7JP&a!|s77-5XjrWlZR@x^s6)
zhJU3xQYUyn$3m7-du>f+-oQ=#s&hbcE>*;SoCGms<S>Y)?igN)t1u`nM4s>YpOwLB
zEguWZW&>^)x#vylA(yd9y<<TEh}3V^1(_OalcZ9AdNwJ*Y3(;RBo@c{|Nig)8$|jy
z)0y$yA2Tb^3%t|71fe1eiu2WSD5T`z<$u89&i=rxivT*E(x#!rrXQ4KAt-ZVD3aVf
z6D!;-?SxCEm+MmL2|r3_wI8Las#;R6v*=r?Z2>E$_|AHzbuN~r`B(6mOqy)G{rbG-
zS<FMdU3Ku_7dJX@_!6dm`Fz{M%>7bK(%DKT=_4^oXQ)*_g@4bpx@!A5JPg!mvVXby
zVJBOI>xVIzCigIh-5nLf9}|jUsbUIH#pDR}k+Vi8j7OZL6E@*O>V#dmCRJ^8P<*gV
z<!iVH%N4!uqGZ^a=hN4uZ}JVBSQhD6&KGPD`z1S!CPr3E>Y|`!(hITaZ>>vB=$-%v
zJ&T*YT5uhiT){QB;Qbk~6YfBI^nU`h;zj|9VZa~m;&kEi>Q~D0dX|v#TQW51nbnKp
z4yXlYx&VR6t&4+$A|@)<e=Gsp8Womc%)SVYhSIx;QZJQxu1-q|q<CI{QKb$X!`ioH
z11*=C(X~%fUD)!bMQ>aTFz7OmstRl!KLLQA5g1S#>g?)cyQEyrQ3uZE{(m(pWTGyj
z!CJ4?k-=En6fKh|t!{J2mFF>z-QI?XwMTs4QXT*-x>DLSec$do#SYMT5Hc|svidbP
zh=7P}XCnTqRPI<U=xdOTLf`6M23PwOk}xmXl=ub^$>>`4iDM}#T}muO_Pk@gBeW?}
zdaQhHFVJs1*>6pM+jqW~r+?t2XM&YLF{xupaT(tw;m~D+61$XRmKnxNDbYao*E(1-
zbs%WZ)zvPdX2^Nz!J<h#?=AMZ@DSl;gj7svm=Ms2aBQLAE>f#d=hhah(JF}0stV|o
z4K|(&7YpFBQ1UBr^_05VLI?P{TlY%YpWgjNaWAJYzlB6x8xm2@&VSO7h||Za46hE~
zBK^>+L5SnS*2;leJn}EXWqAg!bpysOCI`&;$(<k+uvtWdbCkh-PO@tP2ZDnDXM4>@
z{e$J~+qzd_Xe9$c%j@A?c6MOJEL$Vax(|?5D=I4lKlGxNtN#%u<(}0IJ618r-VFpL
zw0@2=v;DX2jKkoMCx1^c4O_&FeJ;Xc<1`Nt3NC<MP|hmZ9FNVWzqFiUtzN^7SJR&;
z<JI&RxP0GgV=gy;V2-Wg9J41I;~FJ*`xM&HwW4+=u7LL^m7++o9BHX9-n=^1Scb(*
zFLpGJiuUbzX;;*BUb!+fjr93qY?C)SaezhC)K`Q~K0+CwpMP{BIsKHY1ri(bd!%O~
z#HDi{wt*KEjvv@_F2F3))C^v+d7>HMP-xWLmxvsOjOlwO8zv?*uPZ)(j&^v|6C$$F
zX`HvU1!O}<z~<P)18<v3V+~wj8B@7x%yHlI?pVv!MY$d#)$PT-R4IcqRTv%oC?Z`W
zM(|TMe$5RuQGW$hARTTIVO`RgL@P?~0Lz_++sBjy=r)YOr||~mSfk2+Uzs;Xtr>@;
zbi-gsM@bA5PRNX{P~Pil>^T7Cr8R{0ctPpmxB!_19(J%iph{(QSRp}jlW={buCbE^
zh?|$HPJ+CfO_7Nk6$RD=bkJnli!O4$6m@%uafh@hQGaEm_o6lYJFMYmrCPx?{A&w^
zA>ZZ!HZ+Az|53#};#dIX@(gu=YLif<I+{cr#zArVyB_Qor@sO*W1KQL$TraxJbPDz
zXDEwl!e;m9+*KH@IVZK|U=c!B1xuANNg{zPuf2#EUj7l*DwStt`Z@X|e181=`4!Jl
zxzD>EI})ZqN0IGvwzhCzTiiWOdm>cjmjm$-O@Afqkt>~ffAv?Kl(-?;z_g@rWN0c%
z#IUjXFfQNn3NGKu+U0vYm+#h3<nrB)x_ryb<y#S+-W_qV6><6Q<oCaB{yP5GO*y||
zH^p~283Ub!VNbfE+?q{8<>Aj#-0cu*I}o5?kQET$`<AY_E4)}$3qQ`c1qj6KCxS65
z@PDk;u(j?YLdTvz3?18BfsQ>})3IC8v9|g1(6P23rDJ=Hjy>b#t8I%5Q>J75b}l;h
z{MVsl&m}t6c9+R~ZGRap6A|XZ)~7PLT)op(M_&Q;0<n0fj6v=|maGSHxid{*FIn*F
zJy5_DiO$HcV{9vG-sJ+gyNJ2G+7FYZ+<#snOS%0cvXt8oou%B)lcn5VDNDIMi%=<U
z4SVt=iwF6F0uBxDnA6iQ`;Q(e??aQSA=!mmeCgxeH6Oek9~}Qgd@!2q+-51#eCpw1
zC@#hkKG=J3w>oc09@g9bbyB3;a*A|&x=xW^r%10;q}M6Z`BJ3YVfHT&^jP*UGk-R-
z>|b;-Rl_^S_&ZDn?gk}!LH0s2B{-<y&QgMDOX@Myu_O)|g?BXkq5M0RG|WQDduIAa
z6+ut!%zWbZ1cRR1G<Uc?Q2V2L-<>&}o;8ea7+!FL7F6d@VFDHU1lyO1psaYxaB4=d
zTLU@5@$~kDXT-wRfjd_(Q^K%B{(s)4xwRw&i`8b-bXcRF>=89s8)+Ua>5?(&lO7q8
zDd`ZJI!ms}RWMJ}SVCkwNQi8!^JATwQG$l@6FWX{6HAwpUu$iV2FYKqRbn}xZ8^WT
zLbeInW%;$PuIuAOel6WMH>ey|naK}NR}Hc+w?w*aKghG4)%0%Aie#ScOn(GO%}T-U
zBs~lYVioko^L{cLGQLa0lvjVJsJ90MlvJx%>to;<MymEe{gm@%r9BzVmJK9eS^~q+
z9sTOH-j|bScfZ8g)i50E$SmxL0+(Td>tJ}MpiIWcWGebB3Uz8z8ayW#>WD&}AoA`i
zsC81iOw>Aw*E*<8615IQp?^V8>-Cc-S5KZ?bFTNVt04XvR6YcgD|HWw`;pN@$El|x
z0-c!;q-!?rfkxmLX!KqIjjkZnRtws1!_e_xwe=y*Ko-Nio0@?v2MC#Ixx8t_tL;i=
z4}<3MUZ<cFgm{Um4)@hy@=T)9U~C26T$@>ZQUT@^HC3&is-~-}?0=e~P<5uFf>*o(
z92;0+`rg*&vn|P@&~87B6{o&}6{oqj2i(pcF#3t?0rRLmpw8?8O<@LTiHlLh9?;6K
zoVR}+<-9E`=ckI0FV&f*9h&J-y`iVMRx8iQ&_v)=yqZ|{oA3uvV#}syn3~b!-Pw~1
zS}^)(L98y;-3Qf!hJTT7?$HCo+KnW9K>Kw0xu-NZ9)!QS0_Qg6RN$D4&?p@`)9aRV
zIJTx8$8dXuLdI5Y%p`#)3W!dFBfBO7E$UK02E1#Ty+<0Mh@Vyl;-^6oKNV=ADmVkb
z#HL5VT&|*U34RHOni=P1x_%IjWg;GKQyCApDaXTY(zsWQ1AnB99tJ;<GVJ|b7&Z$Y
znRXAxJ$PX4Z&$4#(z=8J{VatNC|>b54Rk5(H~F^UEE|Tr#ZMlFAsw#3kdA+ZTjA)T
z-3rHf+zQ7lxfRaVocwm2{QM{4<QGv+e#kianPA{w#l?AqlYh<6$xnVAPJSYD@>gp!
z``XODHnXqI?0;EicGCVMr@$Y^n%rQp%fLl6utORnjwlsl6W9vS!pX$3OIJhK!enan
zFcr1B^WQPapFeo%fQ&k+mKTJc+H>5i-XLsOe+-mE8(O`dX=?<<>_%|c9D@MvS)PU&
z+C9t%XP>y?RZ=~plJY&KY9yXY8p=k>L-uC!DaP}2Rewj@bj=Agt7jQwXK-#zaiBs?
zNZZ;iPv;ucH;>=3Y?e!)?LHGlqBoL*(xD9b!suBuue$Z$aqa2KaBcX7nFLIU`ouoD
zQ!dNB-BNe9<xJBa@fnMMuZud%ORf;gBeud9K<BgjPS|9s_az2g>df{|q%*sT`X)}#
z7~@Hs$baCto~l{)&~z;yCyK)0MO%#x+fG#E&g{2NCt8w^#8yh-)5y0I6S#;3m$qL<
z&)^P^@1p5G27{ZS05HfW&KwZTfCS%!<v^k0rK&Co%78v;bnpyM8)l4O5tE&R2Y2{Y
zz`w0erOOI_{GAC@iEc@tUQCwwpy0%-`GWZIOMiv>$5X^SLUU#NO>LRx4)P+jh7N;(
zHML}Ck5L2pQRLiGy}l?EdxuhVkmV`InyCufpty;{MU#i#kfGuomRSr%r?nv#?Z6)>
zI!SNGpf<sRm+%J)M!|W3aJuFtj2O?fh8~UdDH+g{<0DA9z%IK{ph<YW6Fcskf=tTF
zo`3#m0QZ{mJ&(5QlK!{DyVH*ig|s$Du`JwHijh5dp%p9;y;TD(RF**lZ&={*dKL3{
zd7&ckGJtpu*Llrm>k=J0j@TG*Q*03@+#od*ORz;>^WmB=_Zn*8irnQWPBNyo6-g7p
z0c5Yz2kL_?#&ejFZzkX9zAWm-IWcKMC4agu5GEyM_-=W=l5vLC9BMmq2;Voz3z7Nw
zC5aU+0?Sg9NU$U@9-V8gs!>w8!Tw7vQyMSDPFd?Hib?0MDFBr;mgE<@SFTq{@mm(l
zDx0rlDxc>Y2A=YC3>A4*tpjo^vT!W~iNYqB8y(ZXGEIABq$pKJ-Eb#JrIV4Pq<=0*
z>>3m#pm&9X9!LcR6nk8&r-D6FerR{K4*`#YF2ir6#|4dq+epI`;R<x8(feZ0Er|qH
z*gB7*wnj-%2+qW6E>gj<A`{o6M{~n+!z9J=Y@(W-&a-T+(&6ib^^*%7s*yuPIA>f<
zRPr}g!g5AAQ8^r%-BHH@S*?p#z<*x5AzarLX4|o>Qho@nri!V4khWXxu<Ze<q%b=o
zzthG8zFjSBemiXb8N7j3pRQS$81~E<7aYDs3pxW6F~-Fo*ExA&IOR`H%pmMpJ?z;5
zD~`ut7C0^j17S4ilJg2W@bv=v9SU7zhPNK6JDNe%BBTcamT{N^!ozQ@K!5pU0d^^9
zT@QQg#*%n}2rzIIny9M;sblcUx!{zQ6RRRr9jAA_2_J7C=poIyp^k#;E(oZ->MqQT
zDqg7FAUDXMtHFC}<gxE)R3^3izKTN$YhM#rT1XV`{CkK<{n8kt9rwwT!I2)hbNAy0
zvU*VWomRaJaoUa`PT%jR>3^<DKhDt;$2n3C&bAdS^v4Rn<sb0xO_8+!PAWm@D-v!?
z)cR<k;HfvD=X-_#Ux7~aomt_il2HM>aL}djd}<uY`$dZspsIQB8fjbeVLJw!YkAR=
z<Fj`KzJl{1SNhhaS!g*U(_ZDh0B$nJpfK*U1er4aWbg@AvgKI_a(`qfW^(W@e6EXt
zFrPcuq_Z!W@*RM?$)RGtC?yavi*U27`qtm%X5tMH7=VaR*(-g@4no&r2$ho8D8VNl
zlN(lL)g%a3=?8}#I1H^aVt;x4@M$8S!kFgQaRlpn>kSS@Du{KR_DsYL8!|vNli7oa
zViBFZP@-9f1e+sb2Y>vD{g$|eBB=P&(qo(2?~<KNLQL}BibnI5una9SYm9P4M8C_7
zi2g_;qCe4y=)dUoI}D=z2><@9-4$NYO<;I)ul4p{=msb4-;>q1|I{OZZ(7#?S#|^D
z)eRnnjMQ3~E~wQ^un1T14$4KAFpD<qRQ_VsCREDuiQqid#D9+E(VD@&vS@(LTeU^c
zGhni^Pw==O5z{YCXB`+eG$LjSlv2S2d3gWu<Y6<M{`Yb6aM(P^BoFL)9Ogdgo?<s_
zX6}YE-2t0)H&oQZ3SD0uf>aV$9BD0jG`pJdzT3(xOc_h^EK4j)i!Zemcvce1S&54j
zf;Yusk%TblaeusT82-XLG;k9U<Hc_f(7J}EK{2~e4I4I3;o6zG!3z&BbDh&Q!CHH3
z3B$=NVc09pmc;h+Nf?GCVYn-ON~UVLC5*SA=F=*LgrSftwjL%HZF_}Sw4EOji?;jF
zv1mJaV$pV1ibZ?Ajzzm&EZW{r6pQvO8jH5gV$q)S5P!6~FJjU5<XE)2`QY*aZ%MB3
zx2<0%{B27Lf2-T;@V9mN+dBMh9sZUt%e?LeDi;v+G-CzVy@H%_CR8pnR%B^x%Z(Lv
zcd4bNZY3KZOOcOig<ZwHSOPqIsK|k5oxVjHJgc!jw>;mw{pr|sD@$9g8>p?~WRf<}
z;krYAT7Rg#*1hk^9Cxqvx)FuuU-2Lg5arw;ifL8@VZ-tCx+9XuyEJ)xS5LH&vaF!@
zb}VAX339}plpOK2Gn8j~{M=k|P_h-|5}T+?IjITUrqG<slDwjdq1q+oZ9{oYv9vVQ
zgya*DxjrncmFO4qVn-4O3GB9Rgw0#=(Bjqeg?}rdh0I_UGAnK&lg|7Q7BXS=sCMZo
zz%!+Z3{*&D!_<5S*A!^?MG%auJRDjiR)-h~M5`9UgN_i%oz%NopIh<;as0IW1#T^X
zn#VO;-z@KfY)0yRxPD&V+S-Hb9$as2mv^_}dYCh~cnmZFJ>%!hsuGK`jK^4t(oGQ)
zP=CGY#sZNCu6g}=w_FB!&A5b_%8Xj(wj9v@Et@79)~88_U46Jb(U4a}4X;7KLfUe=
z3e8MC)ArOj=<RIVCrFDaCYpLb9#O%@A^C}VkJq8H0nubd-mPke<yHPrY%)pADl4C|
z4D*U{JT{(?F6J^}g|SnuFj52124fRdGk=0r5;nw}b*OQ!qH2s;WTqS-8ugBH_jKs7
zkQ^7B9jAR?#_jqvefYJG#tnH$E{~63^V377msz^49!9Q&1O9nwB<~?TL!}Vf3)!dG
z(JJS{vYcE!$&g@cfDvc~?(JpO(10Av=Fj+}9F;Zt{SD>|jyKHd_vr(vX<ruEp??84
zG&-lMxfoo&)bnqXL}U#^!Jn8tYle9M8e11y)FfD+JcvoKKFDtptY7{BlVJV&flY$Y
z%jG7)XrW~$!TQzOBzP;6V7>kGm;~$fh;ff@tZ(1=)Wd~9oWMRwZ#8q<=Qu_973_1o
ztK2>}THEK=_PMovZf&2-Oi!)Pzkee<QfS^h_<%`dAj|+!mw;e`l&(nj*Na=G<m8ND
zxTBy0hX)-r4lklX2cc|yVNM+vsRI`9Qlk)3UMRezy3UV?2o1lkts=Sqm{>`t>q2|^
zU_C^{<kAn`CT_CcAva994dN!nwowE-gK&dk@(UjMkTgyl^W3yYkGf%2^M9jFu|`?N
zV(p5#CTJx{?2kGcI=E2Kg^{7Er#oTU4>W6-DXExshLBA3vI=TOvf1@f%!FzNCR8(K
zLbYhxWdQqF5me#xHt|6J3CyRaz;^6&YGSGZHv?;A7p2#6r1kU;Z9KhFjyJ8Gx`HK@
zvi0!p=hM*L(29qr!E}ZTGk-NmO)eD=Rg0Mw*v*7W&u^=22MVXb>2e=RBiX5>11Qov
z(eTJ#T;>c~K0Y~oAdO5P$N_bFoKmO93B88Ck@^ArJG`Ix)%pqQ$<m@cei%E)(F%5s
zvmasSIDcq6$5|db$Jt7Dj*GRO<92qAuRoEU<5kqoam4H#7s9;pQh!{0jo3N<czE9P
zGQVl%_}4M59LuJa4{OuP+O)DZt*lKeIYXb`gp%(c>gXYrxZX{D5{o2~izwoWI<a?`
z#S^LI;Wx|0`^OobWSXelPW`dfs}_!r!t+CV$ud|3$|a8wN!E8y{eGOO2mDQC|2I?*
zculV#)9X))Kq!zyrGHQ;H$4=}s?`tm>^LX`NEx-xIdBms09iZ^YDVQM76;X>f#iX4
zP=AX!sJ^)KTHNVj91=*<ibhk87L3M+B$^PXnw~l~%1eul>Ly~N3Xz~F9~6b$K~eHL
zK-{hc(G%$@$~Y;-0>Wr1Td&V_kac+wPc1a|sZ4hoF@lI97=L)S>M%;cK%31hEwai5
z8QZ(-$SN|#p_8XFu<6p71a+jFI-BEQHplAO9H-4@Ux(pJoMzI)6Az4HVxpZ|Xy*ei
zHBOyq$)uMg4zS+CiI$?mViTQ8DfmQpby&N3C)!&wqusDG`DQc}ul!Ym<?8b=Sk7U=
zaz;E@&J)ApC4YnEdZFcUNJFyTtwV7_@B>^9JO&4U<IfxcGj|ro)3DP5Z|r#7&A(+7
z&&P*Xd;bc>myZgQYbBq}wUTah73(O=25T!#uqw-JOiuZ0xqS9#vV%(VYei{)t*m5#
zt$e=)_Rr-#`aRjBq{LatBXU+&kvS{(Ep-0Ayz6f>x_=%BMRM1J<yWQ4^iceapWhdK
zO?oS=p_s0QtUNTaT_FzOQ|yi8P^S7U_(MDGS)Ms~yL=AbN9N$a!kzTm^y#Nx853(9
zByuppM5pj+1uZfOnlz-QJ)2NjGBS4fR!Xb?OKSD|Om$_GswjU^6@`KhAWb0kP54)#
zKYyo>wtwjLTY9}suiw+_oqKX^lqobveOJ+TR8!ElRezrHa0?&q-BZK1V?LK>58`ua
zn)!V$O@Hk=xRvXmY5zQ~gQgpihUohE_N^(BrJI(xuw~Z)zn#mD|LoVX<3E$^_)SBp
z@_0k%ig7gH8b=i4m+C*B>9?H0U~I-8x^gI#Reyu|lA@ou#}DJ5j2c=^(P)E4Pp?+r
z)0s<Dm~gsq%}h9besU#tfA;O0h>=L>Tw2e%WSSA1zFwq9P7=R*DAP)tVO4XwXduM0
z0cEDOl;c55A#;kwyhx@AoZwJxHNJgw^eLK9)5BMMRqzTMPAaS{k6vN0t9a5aimDsz
z;eQ6gpc4jHinqChL($O*CSdVTqN8SPvV$5qTq)C+u*(|ZhTag?v`2>K7<3FCR}yO{
zlX5h1#A<Nd=rnD_5@+_-qe(X=Z-L3WVzLApb%YMBNQ*w=2z}K@h7`Cnyj_Hh%??SE
zxnk3K7_R88z!hgdAQGY3ec(t0=;iWAgnwwEWswNY@mid?ojB3|iNuLsRGjdbI58Gd
z#86!HBjUs`w>ZHm!ml7s@UC)kV!93sSce6y!vfY}0ht*W&Cc?S3!xAga$ZF&;{xco
zD#-!_8-{j)hs1&&5iQ2g%mFn43xP85(_~^K3DZzuf%627%JK}2%IY~9m0vAO!+-j|
zERD)7(=@VEF)H_vi}7xiT#Ro1T#Q+EE=FawWQ<wvWDL+ilI?CzS4zg1sgp4b5TKLE
z7~T6!#^?sg7>TiN8q~$e{Mew_B<(ezqo-MG(Ayo+UmpfBpt%BKK=U%PaGB2JKY5a+
zfB8a`8yem**CoE}KYFCR51*}uDt`ym;!7XDUh9Cj(*du3A|0?D)d5-7J)e5GsEdoM
zhz?lKuLJ%%S@%sj>%Q4c`l4X4B?*kmUqDn){(_F6kmh1!;IK5>#mGSU_{C5%gV*c*
zJ`9N-RUFxD0KxEyJ1cb$isGZN&TZIGAVD(D80;*1J|Jv1zcg@->G1stU4N*aV&TBX
zGix+TEwb@mVCC#HGY~T!w)=2U1Ib`k>z3dZ)AsOm4Vh8T1fzz=Iz0^0(mtFWd}zIC
zTpa&dKhmH(9IEW3QPi~$wlRan>so)CJyMvCP2?{?#9^zj!=k1%+5;`SJ(x@&@OYL-
za6;hQZV^3~E~69LQ;%k`X@7y0Z^0=8@IV_!%&3hcl))5~!3!vZr=$!*uLXLrkUQXu
zxGPwb2SDQ~D4)}%CtxA)8c467Edp}~TI3B227Qk%WI88RTMi;_jvj_j%~#-4tsh}$
zJ$-09Yb%ePwY8F+wXx>0x8tz~KM{{TiSpPv<FO6FS`Wp=L4?O1=6~n0qhE)|j$|Ht
zytcEh?W}7%>)OtmZD&2ok%iN223a_v;DsqTJ6S0>gy-s1-K=Ds5Q-RBL48*bfr#<<
zb3IJR0XZAQnzWpaE*T3-)I5$^bNYcbr?1Z0=%=F-e@D(nf2Ev_(0B)ZUnyy$lAg8E
z&7HN;EoLDcyZSinPJh0v4L?UBP7g;aV^U|SQ+oR}oUUq0!w_EO%nC^A+a%>EB8H2p
zbDAC_%;q%2NH%}dn4NSKgwy20s&+x|e7O9ZW=D~K6B>}EL>tVmX`bZ-YVI0tkDs=V
z2hI0->}X@{Np);^{zi9bjeDB(WRVAdnSwR%Ay_kQ%Xt!fxqo?<1AMtM#be&w2TBFv
zpRV5U{)GU`%aer8O_1tYmXKYV!jI#lW#=8UQmbYQMN?|*@Q}OW-Dc9bD`nD1Ds1!O
zVax_!S1=pA`VnS>KOWj_@G6hl;MGcIgO_Ww!R^cjAATaU!JDYr;43p52z;34V{!2z
zVm5f3-)wO4>wlOHE@ZR8-)pnM+H9~k8?4O+*=B>+_W+0sME&0k5cj-t9u2qRH`0Tv
zc!4$GZN5+{rfoe4)NRJ6ZWCD5JSR7-%6|`#TTmSoaaDi+TY=m*KRr0&Li1f1A@M1W
zxB$c=^9*+OJaGm))!~<($KHImG`YL^G1<5zS^{sSXnzLZN6YXLvii0>GrjpSE62O}
z7ba}u&=yJaPkIeKA<e(w-|zR6Cf)oqnkL<R`!E)V_bXT&Hh+Z0q5RMmhs`_|hs~8N
z4wbdV;dT~>t)Ix^upPBHyk{1NiZC?nii@p?#bM{+ImT{&Bgflc$H?(kHgY^)8#&fS
zj<u0vZGYs*2Tj}D3+3FMsGJ)^sEtb8UB$f^929$~z=2|7auf$Dr&yc|yQ#UiT)cm_
zyxUB%WUWer4&zUkV21s;k$9G+D~wF4AMA1cVC2)E&%{sr`#@})zw0Xk)q))2c>2f;
z<6`(7KLS(>a`iHx+UE0rCQvP#*p(n^BWp(qPJb&baZwmrwzPgI46Qs-=`gg3x%%hB
z(DG?q1%OsHjZx@XDDlq%m~FnkTY%Y-t3+F}Ja$^W_X^$uEr`R_q(+ups?DxFdKx#d
zQv>u1b<hbd0#fD#fqv#*b+e*4tNRl_sry!MH;=yO?UDUGZ?}J6<!%4TlSJ1&aY#8%
zmVcEr7P*JIRf5S%T`?mUzN4N_*n?QBq2Nb}S}fKMDDEg%3|)g>S|gUZL%7+PWj(2!
z5ZY|a!-)L+Hg9cgX&kQUH$OQ!DqjmbtR2yu*lFlw<SD!B&g`_lI@3Gc48)sMx5=be
zRV*&26Aaw(k!sMKiO?kk=JE<3+|B&pTYsmc`l2-@H$xB}s@l`9PRDzyp-K*dv+kGR
zH@Xz!J}g-E^bsY^c^kO9d_<bQ;bLr}dRUYbWE{ZTjx+YHDV-e=OW8Z{i+9<ySC(yg
z!|b;Cr9Llp;O{SQXjr&d)iyS?VidZ0#Id(RzJs}X=Dy1QL(@&gy0Hm@%Q3?ic7KzB
zz|Ml-SFYvr>qW6@e)hlAY$3>Y$!MH2z7p#2syDD62A17&rq%8LHcQ^r=%SuKvn_<8
z!$&V2-*+a}N@*wlyhAN<{JFL{ofkX@ZF<4_i-lckTjer{<O|X<dIK|z+|<h9E0y?1
zwCP-9IBWW-Tbq6Rrq58WDSjSxOMi_^)4jCJt6KR>O%p#fGV0>Px6Q^`Z4(~gg+|R^
zqkb~nb2MHa?g^qJPfTsS0cjt4<qvV|5R{c>o_T6coP;DUC>1UP6pv;>bBXp8D4DcR
zZCL1ZwajR%lh5JKSI@CA<`*Qm&-Ry8#&h`=HwartE}@+`L##Z%gwstdyMJeO(Y$jQ
zCkTm(%ECP;jjZoft<PaczHmIg$UVjWlIo(9A?m>&avk(H+Bso3dbLe+i;RY~-7*<X
zYg@bJvb422f%#KItD*Vi3H|GHLy@L&bLVKHqZ{D}V+}x?3a){+1oJb{Phmbw{juY?
zy8U!CEfV?0e~zY4M?-$EYkyi}dh0*omSm3|O`;~?(!lgv*2L6{Pe;8CGxAe<YY?Rn
zTDWuerE8)MHJ~tBF`(<xQ`jMs=u=oN9&8!9;4js%o=B$Y$~NsDjpqm!O4_<ovF+im
zCao|R*mj3HV<JTGIwV5EMjbdv%zd+p7U&b_%5)Dwe22Z|n$xk-HGlP|?WY3_RF>}O
z`_=#V+y8psHj4k-gojGVP2c%2or=m9d=#$8sC}ED^Pc6wr?0D8e{9aRw8(QoAY+tk
zu>it7nWEI+%Zf<%m?l&jV~E9qsTJ98&?2HdPzpSbG^_lT;bIZ-28{>cbpOQc`^lCQ
zSRnq)qmJ}&5G)%5Vt+O|W2ZZUEesD^u3>w9#|7%&HKxFn#@64a2$+$2D5A(gh_r0z
z;@FsaW{*`b3d53cXd3=?iGOjkM4!<>{ZU;(x!cPrH|q#p;vSPt4tyH76!LCNbypE_
zu6f%`=hhAzr{^d2R{cn$Hf61TanZQIUx8_w-oE&7c6NOBI)Av0)TU%RS9&op{YqFS
znDlNF3v_m;=6|-MTj9&MZ+?kS@9HAH@s3Kq!S-zEn1e4ZZ?vu^!(?{J%@qwR+1=)=
zplYi$0}8f#Bl8zrR+-|yTsT}{VKo162iOqM3*?4IQYjl<k{ddQz}J9mfd(#DD6J_P
zJOj$SKDw%PL4RK8QhA~D;q2X6<I@?UEYJ&(6Rt|<^|K?GuA0U#=uJAcH8#WahM4<W
zunM?5(M%(+xae^G(Xph<Z)oD~6aEXITXMQV-PM#C9_)x2u?edK`mdo4VgtQj77!v$
z(3uTbEgKeWHV|@O@cL;lQY-&+dF7PasA}dzmRfgZd4Jtgm`GUNk=kS1BvI}A<<;^k
z<Z5M0|L9@xBStIWM~qtQ=z?2C7mQASp6G&6BO)Y@7z_fRdbl_c7pHP`0l%Hc)j#@m
zU=T(!48rInr*!8!PExE(Q)Ash$AC%-{QpavmEsGH2&FZtsK%tjXtl6_OpS_!T(-n-
zS2qdf1%HB~aaGlfnePPEr^sa(OiYD6l*HaJ>KCd4J8IooL?P1`yQ+N19n6QM5}l9>
zd9#%U0kjpw8wMNAwK_8jE(d*sPJUvoiwJh%{SzvRQpxU6A=#ZMBs<Da@jG6qv4E6^
z!d%bskB=Ba=**wad>Vkx{Aw6|j*DN=XTRp`3xB4lApwGwXzYi~EM&;bWgfSL>uEvK
zPa;SfwwqLlL9xmwjE!xV1s~fktE`2J&+<i-Q`&M%eD-6amZi)C)w~H%hu8<h6|_Ld
z4EZb#6CcelCCl!PXFz6kjO57KGCv{#3Ole5)FJ%BzEO2Rb${}N6EvvK#ds;Zm^ep(
zNq=CJ&Q{<Rkf|{;1pWjO0UABYfQEBZ&YICqG-2Dx#w7=AYS^*ylDESGG-9G*POQbO
z+fuON==fnxgyDye0<VKUIufh`I$#ZeEXzYG1R%c#a>BpjQL-<55Q3Q0A_d9%Ujn(w
z#SYoU1TPvIUgOFZU1J;x1RoSI%+D^g7JvRzTm*trF~wyUcIa%i#xik8Zt}kTqk03H
zwHOvy2)No_C}OvGiGk@$y<yUT2VHS%t{~1?C2=YDtuaUss#7tPZyuRm*R`fTTBr!H
z@^CrOBn=m6ty?z`3`2?t6U*&0hJ#6?8;;_+B!))1Z&C)H)d}`iFlg$ILNz`gmw$MN
z{oEbKCPq6<)6KmhUnIDWMCWX&a~Dw?9bW_fzK^rL<fGnxdf4W&SJB#7g`s8T@K<tn
zfCQv%dVARixY4aBd;njSTB&b%ql=l%^irqeneHWxQfWFfw`;;`S6V^%U|nA!AEIo$
za3kBL7g|wGhJpB^k)@}aV4rbpG=JPu7a7%00?F<|hs}IL$>t5^_f<0_s2)1?snx_!
zH-d*&5jWj$X(l{8qeB985x#6P;*XXD>fK*ZpX95Wt?zC<+uAIW(H}Lt1eEg?T)u?c
z&$qUoJ%{TL?Dk8ze1o^2ZS4Xd8a-yW-@xVHwVTC@(ci!<VFLV`hHO=X+kYhwm@9~6
z4uz^5eb7M)daUCM_`Y5&jUAwo9y2?<R!%U}OkQLjk95Nz6P%ehz6Npq*tSjgP3!ce
zded$X{mHmG`U3!tKyknAL>Q<V)6}6_|9XRZAtHy~j6VG+7WQsU@t0HlPs=F&$A4#v
z|JM(t_#YpF;)k96Gq4kI+YzUzKyZITv(o5yW+KQnwZ_t^#qH<T$}il12@}u@7q%P-
zgCM_=N4gJ$u4m30NZ<dbRxSoYd?*P{d9BA@J(yq-0F061x+QFE!4z9kuYb?eYnW{#
zzPPiS9&7lwZ&EXYYyie?-=@W?0H;lN57+PupsON3_PO4Qnynu)YM8A*VWxjSYpkF~
zG+qp@L?I0W-jS!EP0gsG2NiUC*F$$Fx4=0VJbe>b&tOvk>4XunfWNYu5w3~V3{+Xv
zjEHW)XmhbyrSn0p0KX<Tj8UOqA?hl8|D!m`=9-f%=Opi!agy@CGbgG1P)<^QSWdF_
z;Q4H$?SL-A*JBybZ=DVhB$0mu(Bkwd%z);1635JoI5M85fGP*Oq^3c38Tx_w`R<es
zvTL6o#vRQh7;P`jsTl1fd&6@oQaTlOhTV_%1=t}A(^Ph?52AYHdAwJQ%(LsSPA5#W
z2oDjLkJV0Shf-RF7$RO9GiLJf;xiM;{m7cU)NGB>PG+{oE~aPTk^z6+=sCUKK~-rN
z{_SNjV;aHr_@#*8iZI)fYxZVcQ&*%62KmTPoUWXN0a@^GwH+B~2XGivE1`Yw@q+8W
zfhpLg3g%51fL_KrgE{9c=*bhc7S2LBlNvqK%@foDnZsw)yT8=JmPrbBF=$rU2O3F#
z>-clReFfFc-P?ttTUUP^wgeVa0e8oLXegldQ~{zR56I5UM&&*EtWQtIWpTN85h}dB
zxUcB@Q9X1Nh=771f~6`2$&zrdSLKk@#Vv#9uRoxG7F$czv^5qk8x$Aw1nlnJ*^ni7
z2qsS^2GSunEKI&Cy>Q#n8J1j6z3PXhgHPlJ>5Al$3j;S5GyH!xSg6IU+HCA;K&CP}
z`jy-Svb&^3<ep4AfAJXRXAdq4%*~K_K1;<LVQeLtjQEw^Po^P;xk$0Z#3;j6axEnw
zNl?L=<G;eNJG!#udUzht^5n$1nZ@qrG#e3z1-M<2%xy(J%C$Zhk(rq5RYfvK+1-Z*
zvOA!63wqQJOF@6MC9E!2xJn~N*aQXs%1>5@LT+lIGrrZ37EtY5gt16@V{C#%98^~3
zAB($VGohu01C93BF0y!Bk`|eb)Ylw`_eU9&7q0)g`|#`E3Z@mlt`vpS!GLZhJ;sDZ
zS)@}6i>eiDWv*a@u3!rVwz)c!Ni0WOtWjK-Q_P~X_(gxy`WyI-d_I(u>9Sx;OG52p
zD=)zIQag`Xlz|v8+6t>j+YpSJ$SsF0=91uU)gqkD*fL9wM4EDjE+PaM%#)FBU|C(l
z+N#`*ghkJeQe?&nI)LtYC;2$fr_!xP*8{qjy{e;<HeJ@~$<(n;3jU1#j4o_-Uz*#A
z=^MCwO1^&sDiLv=EAQNN&tdt%{7AnVQ=E0L`q}zIaB)@LjZMtg9HM)K7LO_dhB!A1
z+qaKz)I$0Dw@sowfvsK(WAH5$=tX@OQY)l&ig_^I(J{QiaLbTh0Oi(@h;Ptz3FddX
z+`#W?3xbh&ONwI=UVIVf<#X@hY1u5KW!@5A?&*JzoqpdlePHOePYRF6*2H2zV%*)+
zMM3@sDe$uFo#Hasu`DW@;PPTg$#u}xm4mO(GO1#hQbiadGB@DgILX(oS30t7YS4vo
z&}kxxuF(lDe*30vYGkvFfi8&>rb`P{c326QiU{3^h`<L?_cu0+|7{aCgdlB34*TeW
z?r48*7<O-iANzs%bBN?ZiL?P1A?T;e1qqQ=zMn22zz$D_-Z){FwZXEiEw(v*A{YRw
z$_p~@Cx<Gg+^3P$Wdgi8H@ZGjFDiSRiV&-DT5_>c0{}JrY1Qhf6o9!%a>gF@YMpCn
zx;HeYrhbF+Pjy<M=`erIEZ6Mm+6BMTie!K0S{Y9RxWDu=Fo*M@ItSgh@a#Z}oxno{
z?B=WkOCxnePtlDay;a4CuCdi)ss${ciBX+n3OuWaE-_{HJA3X6F~FlgUpek1_0yp8
z#QfBK)9iU06AHHKZeVVTwzzW(MM|db@Iq!#!?y$^1P!NBBXmOfHP3`Qqd&y#VBLRx
zSPdN0vrMqxZ_F`lWXx$0#6H?ttZ!pT3vFN|9VPlp+y7{jwZC}BJ%v>%I!Z5jKR;X?
zXLNHIbg`;ICoip@*(-Fe3;xgq<^Xe9V8FR<0T~btXU{b>(1O)RX0`qX`%Ls&y21M%
zo{8}Th9GFpZ3aS-ORY))6q`r^liYu^Jcf7R2Z+hA^EI}~S*|n^zNwN71!}6G8o<FA
zRrG1#IVFL93H~dQJ3l;gWRXTPZifc|t73DLj0e@{3vyeOg`VX{r&E=Qp6)oE594Ik
zl}Tzs*y}vJur~>Xy$%=lBq@*fop(JD$oi_AO0g|zzmdHcQU67u01HFHmXd$*Z~2?v
zp<~-7ZTJEF_fmQ{rXFVsc#}*4Z$JgS2~~S96(vz78$@R9`av?2=2!VMljiLo02n*3
zKQLe{^l~|1Y_!laz}R{72Zb}tN9$a&Tji3?=RZ#_*}S!mSy>vhBDP>^%*y;U!X+tP
z{PvA+Ah-}2dAKs9w;B)6Tl0S>0dgMlD<lE(uCgS+`N<mZca8VE#`|64{pQ2_ogaqk
zN`tE_0pjh4DQKXktg-~IW>R=e!>Ou@LdW<ZbVkpTwQ$EYDeyX2T}imyWZeqTTv>aH
zLg&hwQCv5QX-7)^C|g5P=txNr-j)61P^;53(`unZ%e-=O9cJPV^v8ejhw|^lccNd)
zg&#aW%+&Obsit>GHNB%0<1}+x`Vx@X3K+uk%RCsuAkR3SK0gM@f?)~cN!}o9R6oxL
z2+T#XgOLe4c^v)Ta!0?%9sS*!I4i{f`csOi^}^vwH)ZN0zExkyM+7OX_v1FA@KtXF
z1Y1>mN^5L$lkZa-ams(tziL)*Q0l1qu<KbP`-qy{uYqzIvdus{q)OeGK$&35PhxPq
z!vGX$7=z=*iSbOnJPCgaGI<nccPOLvZjvoRw!;I+#|pIGF7-WALILtV1`eVdA;9mg
zR3lLo&@}<$3+k3v8>YheN)WwC5*3_V-A@K%q*5gfAqAL+G%|l38mw{YJZmj#&t%o%
zQPvW(jz@5a_fHx{y)UqJqi;yGAzD6A-e?K*X&d_0YrS6-%E0F>n1d*CaKY7k;n)$W
z#CAHiu%r(3S49_|Px;Bq-O!*%Ps*O3)ogv|S!HWmGFQyc!_4jZ`OllVP08j(#Op=R
zXFop5aBYPrxTk-YF}gG;;GoxYvr6?Qmc68m({(pbfjn78Q0@wCRi8C{!r^=|D+hiZ
zdoLZw2fYY1p)ZL2TU95WK6&E9HilZ#zgxmxjCCV`o%DmY=e%-$PLKAwv-Ujtz6J$H
z*#BdiR7st)N~A%R2b!}=>YUxWJ>NM%8FTidnsn$)fbM^tk7onR7C_n4zcO}arB0Pp
zbCp+4&7Ni0tG(fNXYTbXue@^HD+3LGNL_$iu>q0$PUc^8;uU$b>D0lP@3&5ehb)}~
zsdPi^+$8EGGLBaYr`oVi1x}yo%^2EdmpH{m6LCqRn*?<-kY{K_4D~jNSi1|euS<*!
z?$rBzOiX{0L|&%^L*@dNuel3?%z&g6bRU5zA_{}psGH2Ur(v|jXJ`en2)p&AsB*~y
zE4*Q#;bi_t5=ChKbvZsHEC`=P!3Jmj*-xI>G~my|<ap>X1s00NML4o&5+R28Kzbm9
z2U3=||M^SRBVF`6u(1VMGJM>{$6YeS@J4o8BAI`NPlxz)NILkTu1lXz!lxa4+93n>
zv_c<WhK~pMctEbvC^>YlcssAcK3+e0a-AK|!Ma|xNYv+OC_+0fLb1h3hIZg6^A%^+
z`Wa?lK8PUl*20wubOj?rj<_#5U5LsT3PSz%wCat(tAfqoPi^NT>z$eI7=ECzkwDTB
z!3BTP4IW%@h<6I?mS>Jl7PpidW)S$}V<86(dwgA}e>_D4Am58{BcMEr@EN}z1xeE2
zZH>b?)9VGHe~Nb=a=}+cWK8g9WJK^r>L`Q*6^w_=R4jE61^>hbEdm|O6L=xsiH2Q}
zSt8;%Wi7|Y*W_c1=7!?pyGC{XN-?Su<rjY=8@a_t_ki6iaK5Hx4V(0SFmyTQL|&Jz
zp;_S76b$ys0<e)@0ro1jiWlfO=Zl4r+Y_4>>(<j!;>{A%BYx9-I(GS;)1}-5f$9=W
zR(L~972XLaDp%+c9q;%!pB$gPD@=`R=C8>&)S@+a6LvI@om}1&gb8yUDD|VU>bHMN
z=8BH)79Y<3cs4(EfbBVMAPl4CiyPbQjyld<BPVp61*rWic%#5yxqVMlniEl^vfI%(
zyui;ByCl7&2;w(VK$%md%~d#|BE4^1dd1UMGO`(NKQ^+8vSfUYJw`Zer)L&8vUb7n
z3PzzLs-OpF@3To{!zk6ie+NxxdpLh$TF|84NH=+-r8~LzF&+UQyjQpyTHRs6ag8p>
z#kjXIB!NX{;U4FK-37}=DTvBL`F47wy@}mk{r+{Z3RR34N8}NeZi=W(_(`RN98yz!
zWcj<d=R}bv#d*>6_PmH4_#Ut#_7gb~ySfiX6f^(GgC4ofhaJy%WH)a+__%+pBei_r
zG)Rq%PsHT*6Jhm&Nw9i20amXVq}JXs@vG!#43&^GRDKQ4P`PK$P`NM8P*HJ)%AIkB
z%EPdR%0G!UR8*{?^3P)pm46@BP*Jmn%Du6M${q5CN(OJZ%rIhc!xcTpv?lC=_-j$T
zdyaC)`V=#A=hCKjSE9oT+x~wtddyzQr%SEY7?s;#S!?(^_t6}MOJZ4T*emzbn54I3
zd28r9t0Y*h#0%r@6q%GHp9zIrJP<aJg6>eU#TXa0Y(mlxUKPd=j3S}QSPh<jRS2uc
zvy^~&`uPb<yv+&b$mGPUJjwMqn9sgHQ;SV7OSc5#i)psn*l=mic`Sclt4QWA)!@VS
z;n?v^ma{cAZHk-_xJWF?dxTL;f9p4qEMqQbY&iB9R#H&}Iko?cl~ZLSv%(&pvYxl_
ztX4nFUASAT@8mAruLV&InkI!SFcY~PngEZ(7zFr{v^rs;rewzvKP9PC+zK7uP*F5W
zfZvckzU)>dT5Tm+Z6$wRZ6#i9MNzHFk<05-dThnF6t3Cek-`VdpCz2F8m!q~&Db{>
z>rF@d2)s^+1%}bx!<w`2luUn!-Zb$VKA6_LeNXu4<OiMFY=6exb8HwQk0-V6ezz1E
zCi!`qC(Ag)ea`n2CQrg{s@lR`@zUsydO%!QLZ!+}<s9Jqym)^rIDAD}HtjIx3hw+f
z^QsU^2h_Ksk`0{G)Re_PGCYa>&}--t;XbYQ#2)dgL&Ar=Iwjl%TJ4Bc=T#>ve&e*#
z+9K0Lk&fy^Cl4`QXRH-7U&tny`~bvMucCqkN9gK;%s(h;YPUb&Ik1ejx`MV^GHo?v
z+Un$_t==lMb+&&BZSAf?Tl*`}RvH;94tS;LJ~XJa7gAh5h-b(mynZy&A)vu<UtFt*
zv0svIzI8f>bf!xtdmJIuKD8UG%gAIlUd{@i#mIWR<U~A)QTuo~*g@<`f(gV+j>2aV
z?m){`lzpir`cg^lOC{EqN=jcUvA$GN`cg^srIOwk6-$3g)XtQjQkRxZXIE+Ov6LAz
zm6xTxH=$+I`CR&Yw6K~9#$W2k3M@FYTa`sJPN-m!j1wwYWWWQ}EOJom@Ato#McRx-
zx<7zL(xm>o<B>*;M@pb6R>&iVA&;B}JhBt;$Vtc}2ZYBr(Ny8@Wta9pgk4Ip&~F|-
z5%Y1FHS~Wbj?O0s#<%HWU>h*R=aWlF1rpHJY_6prEsjN9C`jCk-w<qzLn<iPRG1&b
z>30;+S>^;OMKK{Lpy&ZKmLT2YMnI#*4T%)TKUuk(PsV9m{-!_~Moi`GAx8hD{31rz
z<)kGf*z#{mh;w8RJzk0%KL0zpxZ=3s@(NO~tN4Fn3bVh0ysucsS6Z%DH(a4nQ19%8
zo<0PBFCT)}dG{AAAKb%^XN;o&nBs2wIGA(abZuh{g~eiU&57fiA3liRG6*I=rI=-_
zuv=pTjXKS#*$u}fkrQ`mx*qf?eK=k(AC6C{D<W%Qq~e3B)=6wW<vIK+jdA({NX|rh
zmp^|k@AA9UF2~ShL>Ad6%O571nIBmu)}1`4fU2Io%S;gbND~Af(*(i4==I--`}Yz4
z{YihmrjLH7*PrmwU+@I}yrp;E;ho>%-}_{8VLY=3Q;LH~-!QeOEF(UY5%J-L1Vi%{
zLklI&y7@3bH02e5XevJfh-T}dfoLjufM|azD*@4Lukm1RhX=Fs6XC(^Mv+X)49R3$
z0GRBFi=7CP$@7O7p!f14nQZ<#NG6*ylF73*lF1s$WQ}C9Ml#8VWYP*x%m9KOLozv}
zT1krCL1*Hu05r)g%dk!Gg#fLjn_2e~gp<sVDZoy;NpndO>*U`XgrsFI)t*{@##(<k
zGRJ26d?n6O>17sA9<jm)Df27;tcg{PvA=wb?Tj%_LS(4+8yo59?#p~rvHND3Us?(@
zlzJdeW;@m!Q@LpDEakuDq7IK#x=30Uy{6D2EqW{pt|qv4a;AiL4YyalnSjn|*)JX6
zcP7aka56P)4AJUPg@c#UHmCCf=(>NvMnZJ@($s*>>YJsWg}Bphk-uA?!=IiRe5qPq
zknYf$ir*L3VCXA8%)pL8;j?`T*AG&9;9e<Fw@FDnBY5%2q!pzUV^4X!lA;WKz*~G|
z`i3?3s_534j*aW8))_n9k+vXToeqkLhe1#}AD0ue?^m@-)~Ik7Mri^s772grI(=<p
zkMIn9`g1SZh=VRWT_kKve{9Y*@)h(ttAC9xp+}hD-3`<3X=Gqbr9%Va<4UyYTr1Ml
z{+3tE5ksm774s%liu=B!aEEmQl<F{~Tmeq)OoXgyhF)8GbYW|jr&YIz^3K=l^UAr1
zzFyYuz%7t7Trpn*L}JSF?@NDP2zvZ6X?2sx1uZ89xqt_Ra0CNEeSG1S-(R6asvt~u
zrjC^PK@Zl6Y@W<v5E+@-gAhxXgi)x{W4C|^j_+|SzGL<MxS_&@B^~rBImGrgJ-9Av
zRm9A|xY1~t7M>qmZO!N@!eWs7>p@Noa^=oPxtDX4nL%5EB{A5zGmw9g$p8ahJQ*f%
zmJSoxt<86J8V%M&06hKCW|35iq+jczonZ)nHZh1JT8N$J1;skGDHfZ+pG^$SNGWz%
z8(^_3_yfh-5yF23ypv-{v@n1e@#>ngXmrKuS&&iWy$POHPg-)xi70tmQ=jejs8;JN
zNCTVcczVlKU>?2=Fb{vpi701fmpc^YjO=p9HQlexx6<a57=d5tSqw$68=wewV<>|B
zjjjw6SSA%hwirxcL)UdT0TW2Y`y1Kab$nEHM7T)RR0PFIc`1?5I5Q<Q&dd&tGfT;v
zk$^Z;&PPv#!I|+i>qJcRqZ$Lc32*Mle$#E22z?IT3vTYmeusbWMMIe%@fW4L`-wZj
z%auq+EA^BZIWwL$n253#4X(sGT1j@aqUvZR*3n9`qZMUGD~XO)lpW<cLe>Ae(O9H}
zR{gI~Y)%QbBmYG-9!CMii_!9`C_8+C#aSfFD}w7-ah8UnD4&d~qeo+>#g7ML8Gp8~
zzRf89g17-L=VpHlm(vPxIem0{byIOUrDIYvO>4!B^HTGe)wHT7gK|Pg%pP@G26?_b
zT`m)t)02QUtq_<qMAqC2a7qJ%z7h7GNF}z?ku^j2K^m?mIl@uB6)koGTI{H4v6DuN
zPn5K{hZsG%7lM;#A!HiivKB%fGhA#TuvdByu?(EsE(3o%bs3!1U`FnE8KASHQw&=5
z!bySlb<&`H4^!4jCxrIBS+n3Z3tqF}J7vL@JD|Lo_Vp~vo5z5zRhyv8MW`=F!@gtc
zn}D}YP~RNz*5Qd|tAbn8)A1w?9)09)Z;^dgUM!;C(+F3NtGt9&qJI~ly<h`Z#*?^C
zMz^;~^dx^}%qiG_!ZQT`qSNPb^9mcH-^Pv@c6SJbcwD_?$q7Jj#-?HGmqjAd7Mj_>
zilSYT@;lTYm5T({%|g+nacYLaS$bpZ;w4P><2k;>$ct1kxxlUl7zMoPf$QMWW;ksw
z&|8=_Y9uG7D8X-tHx%8Pe8o?&7x3uo#7qySqIZAEm+LqtJX%IpdE@yBk<~f0rV4A3
zl-=N=HK%$rwruka^Im9M<>?%eAp!u(YC$7`;;k6>$*cITklhEXpz3UwZ+GDP?asmU
zCMrY$$>J8rh+JX~mt>v%_V^_&h(I4M`@WE=R9|m(VTAgFsB9G^EhuVkjl~O*j0#oB
zzEpp*B9*))s7Jz38eLG_AC-L1I1!0dF;c^K{0QxGJkLpy^t0^sBb{NDggHGu!=@*n
z60U1#4DLX+<6c6|NILrg#Y}!+h$hZOm?d?rs^|k7>kgyDr+P?&Tj85$3)+g-ux9Jq
z&nnON;Cc$zdz)L&ci_51@9*q9hwBO6-`aoN-I0QKTZ0D)m~LI>514LUuj77i75Ce^
z`g!7hTkS{$FI^wszVWGti@LbDlH-2)?L0xad}03zLAboDEC{#NO!^&E@fcLHi8=Zg
zcxEf+Q<+R?;Te&wj*ucg@08157MQTAE;xx5L~s}pdO-sYwplR1Na18^s$F?Oju(IE
zUJ9394%Zv@6q=Io`L$343qw9MZvsm}ma6Phq?d~%{#$Ffw2JsxWeaJMRNYO4sz!N@
zo~A3+iNlIL(t@D@!T(75kj9w8TnW#>k>z1DVH2u6Wp2%;@xAbeM&8PmSPD;>Bd<7%
z`@hmA$eDtc!Q)KSlb2WXG44n6aif2lj~lXGN1^$g(PO>hhk0T8vbKt{<IM6XJ4~FR
z;TLx&7o!h*D^oOW(wst-OxhaZ*($**too&7O6Cdz^75wO2FMnUeM*e)^rMH(gTgt@
zJjGy{l+V){Y9HvpWJHoG>Rg8F!zWA|AqbQ2wHy2hE$OYisD}C4esO+S_;7!5vTV#|
zuC-tbtJO-<W~;mWM3SjUWK6ZF?4>P!%TIk`r9LrZc!0-83PC?nimsm=<?1}smV&kC
ztNMhd))qdp<k@_0KzWt`N>AZg@`7qzxX;7@F#*yR<~=*FF@z3rXbh3jb3u?KL+3Ju
zoJg&UVD5HJXiW%-r};yT0B3(fC<V;-Q&cpKRsbAtM24=}2eSIr>9m8D^;C*<r0N;{
zvwWc0Sv(+=ZER?HN=MSH^S>76R+o4N_42n8n&|=Z6KCvOQ#$C8T7yLG>^|RsxIeIA
zw9&|;F}zeM5j+Xd$Lvip>k_ECtbF0%5_EAC{V9qC(|TK{Ybvqc^8bH6TmC2CyBt0=
zv0>vT<At<?8|xjM*pKV&_7L0cwi_o{x(Dl}`(s4Z_5N5(pwZ1Jc@j<@#*=Wkf+yj4
z?Mb+uC*kNP@+6!^Jqd@*lW;5?2<PJBDB?*t&+kb%`E@)AC$cBuqIOfRYUlN{qvNyJ
z8rcK^^Ze+bRc~sfQq_MB&d)CzAL~aN*{W(6^|$rI7XH|-YKI4BhxL;a{Iyfnj_N0M
z`eYZ2eQdmg>ji1$JxbU&I^G5KRitHw{)f4T|AR_9MsHw-XAEoQLax-rS4uOv@0>VS
zrh903W_Wb45@s|~vSiua@eK9_MUWw_KU5ipNzf1t=MFeT>!pA0BP5axlkhS^#cHir
z@EXvv&y-yv5|n^|BRs!^t}42cBt$KH-$tzSfTqT{3<88u5)``+Un+Ud#MIp)TNNJ^
zzMHQr2w&KPGuiJ@rcMW|=AzTVfIpi^MWbajjTZ814i=ihA1Ksi2-2s}e?5UNcEi_g
zwM_V`g)6aU;ZlFBShx(<D_rx{N(<1nS}g~z3>yJy>jsctdH!Gr`cW;d$Yc1-694jV
zzY)L0kokD1U9fpT<`LJw{U*oDg_{V91V5r>f?Wqi#C5cU*nCicU&d=-8<JK)FMs=O
z5o~#kE9C7)%EfO(i6Su<1o$)NXesAFjM#oaGN7*3#b<x(%f6j?mU2wpZT$h93WGU-
ztU9iA3U>tlNhzXis3n(0v6|fi)?d-wduqbxFED-<v55y`*o%+|zIf=@`DzjKQB9Gc
zTMcp(?60Z`QW=Zq<U^nO+JW-5a8<<@VsuGG7f{+aPL<yX*MHi3t@wKa$45$~Tcmm!
zmjzN<P2qq0@X)<C#PFW#j7-Ny*Bm-y;4@WVyoTEyB9>$!Xo<>?LPJHBU%7mXnhpDo
z6;W&iS0ffI_by5|hq2(kpjFZJW-zvr_|p5(43v2GyTZK7c%{hb?~1)0X(TN|VrRkd
z4Z1-e^5YgXRUp)NH;FIb<xOG%&tBLhMm@ayX_kLjy35;TOkv$zn!T`L2mH?cv`lQ=
z<t=l~uhd~1w(Nr6xu2E=G-P?xx)iB<EVu1Y+`6B}ae}tIX)L8lY8cNuy06)!lr_&}
zUOJ=bT+$mf=bQBOKDU~^StT$ih-s<tke$a0vF}Za*f+GsJ=e7J#OtVHUxt-v2n`S5
zp`CyDJ1eB+MHZ}xG7Nch_jX~())hC9(QJtVPnWpuf!?h-x#3-?`nNrXyVaxdqMkTT
zgyUZmnu?E+8NFNA{FrwZEsX(S@vS@iLFVj!NycjC&?2vsV8O8Xh9z8ZMdH`y?{gf!
z0;|twr?t3nfzZe>;h<*tC5o<unzLI>Gf97bW$rgDWTh55BR90Fs<mL&0i!0gEztBq
z%9Np;gVQPm>fnA#0mL|F)dYISlP5+pdhPFU%@~T%v|(x7rm;yk2pq-Eo{L2(*}%C8
zio1w><bqOdF4$iGRJ&m>(7XV&h8CjhoXlJcmB}Dzg`Qv4dY5v<8jDrVy*n3q&*OjF
zB;!H#`C<i$ERwEsVGb-0^nh6B6vW(kmzt$A#B(s@!!KH&!su+Dor@<c^B*6^O8VCd
zR?<Iz06=x?_Xh^3hF&fQsE!s|22kC4%LXpg0t*(5?7j+am<BcrUBD)$4IQIaP#W7Q
zjuYX(uUyOL*RZqA&;FO19Rc!tzqWsC-_EYR`4ic-DaO2@0e%ez{$Fv({1-mZ0k#Zk
zY|28Yd|$@R_YpTAMwKtkk$LT*^;m(8%u5VRzj0-Y#midk!F;+kSC~|@N<!rsMi%9p
zN2b?xttkwM4vW253bzQ2h;)_4H?ajjBiypc9*q#UO4K{>7xNCh7ft~IG>(5OLwalL
z!STg;OL93RKK?omiI1{FVrPvnzQz|{<BPBH#dG3|?*{545cH+^;(9uqI72bczz<&?
zG+Y5l+*cfOltd(!4}@a>7aWhpfr6ulWQilm)JJ8d908R9eB1=8F^+WQ`yi12J%E&V
zGl7(!Q^4e13Yff?V%!+*GUI=SWa+SF{6se$KhdhqFWCX*;skOlFnD-yO-BKAI1q*q
zBJjBaB5)8u1R@7_@)$<E<%SWD8%DaMADBiAAYZALk9}jAQH1nrdbbAZW5^f-{g0|`
zT{0&9U|x1&kV(D3!PbjGCgJFLCSOCOmjam7O9M=r={mGa333RM{0)D#Uy^Pr(91Xg
zdI3estMyWWUK|l$=P0n&0(6&g9)Ps~(#2%`iP?uVSb#FlOT<dTDOxXv@{&RvxU(>Z
z0b@%TFyjydMy^lV*3t5T(nd?5Ez;1hUhCsb2pLdD!ja7hAtR{)-DMy${r%Oga8V1K
zj~2LOn&~^tdgL~x9yNc_Jxie?k6!|<DB;J_%x%`C+LARa9ehH_5~J&*4Fao>puJ6^
zQG1~x^{};<mbs{^(o|INdX);IZK9c$ibl<kL;}TvoSI6zq%cBLL$NnCyB?^lc2A+O
zhVE(%(%}&T>DWQeGy_EVHaVKxDLBKqax}v<zY#255r&dKL6U!dd^_{wuTGl<j6YhI
zWf(>(-RbA!k<beSI{wOnn*3-q(|%g!rZOZr=Aa8Bf~7!U{v}vuu}>9~`&b?eMTqZ;
zgOa@<gsVA-_RgFed*2oz!&Tmth}rto{{c4QQ~QB!#L&y-HsWZZ6dN&q>eOAEE7s<U
zwYg$#uE;W1kW+svUtGr2n3^t&gub$RAP7Axm#Mq<)Tni?LFn^_P(r_<R%naD3r;I=
z+cp21S+3dBwF`bl<5f<bWI)HMr3CtyB6(dzWRcyS^aubBkU@_C5OOL#1^|&X(xjx}
zY20(_5-QSD#kScUniHdXYJ|>I-LC;hP)g>fZcNRy12uooRstl0!e-DKzQpu9o2v)J
zf`2M?z+MjQydY{I8`cjbV{{xn`tz0JPEv>HYf6sJ8O1L{m=Y&IC$U1*Lb_C{b}3jg
zD&WNftfOansH(Pt6N;2lsWM1sN8<o%RP4eCS5-uabDHKkA6}q@C6cs;Z;92z5G%2G
zHNvzd`3`?ia}B;1;<Gt3e@q>ogdXrCKyzR>g2=@Fo*MINWrv9EfRBxt?;JuCFp3N6
z==U{#R#H{7VOor_1~WMxf1=xsMh%(c@!`<yj;dPU7<;BtWOG`nC@=FQij5U^0%3i^
zcsE7Hm!p~pp-}V^*}jC&Zm;SS@i`ajXX}u|X3BplT&LcH1Sg!%@&_lJc9)dJHp?>O
zSh&wJoZ!q=s&a*kClQCZ!qFA^WPk0Azm+%swD<FP<4=b<+v-hGWc^{yoJRTLjJmt|
z3WbY-xai65?$geLySq;(lF~poIW%g_{tVckVWf$J-0pEs#eN0%IPa>wr!E6~Aj~TB
zdG&vJDg-iW5o*~+2I{@C%yG{{|B3Vnp9qhMa6E-vnEhr}BzDd12C{36dy=9)lGDp9
zAIa%8`be<(Ae&z0Ob+CqZb>kMX(v2Rc@q19FCD0esE5@}3R8Fx1KvRBW~}=>`;bN>
z<;cV(2VJ7sGSQBpwmdDQl7G8)!;=iEF}r_HL5|hc2*L@9XV40&#78n)3Rl*6T%dSm
z1$SoKSjeEZ6ev|Hd^)%|!(_U`aUX8ui!+baV-`Hv0tJ*pTxfp5U<k&N>TY?yM}W|=
zPXNv1arAHrjLQr@hjrlxfmf9fijqn}LBE(#r0f>Y56I{j`y%~<_!{lj0et@2nH7J$
z8Nav!kqRj@`*^ateP|d<o~VXVr1(=k-f7jdDwNg3tkxBp+12t4OULGOPqhmW_-G%v
zg2r0OH8hqVgZrFnY1H-&(u8CZpVfeqsIVcswHX>a`tS$s6tQCb;I?6{hlQr_2MTp!
zX0X1_0U)a;%KSdA<Vj{4p##E2Z`OY`)ykhKESLY|i>rN;Rr}fbQY3@Sx`7cn*_nO3
z&W+$ZLCu$uo{>=LG;=2IElX2V3j9<}5VF2!!p`f7jIk6v>yFMdel*G~M79rT7?YCK
z!z|AyPlCKYOcf52K7;(e$ldSNOEO!^37TjsU(@Qg*5p>%%dnDeHQKlB2BUu<q8F(u
zo%BgwJ@uTU8rVYW5YjQj6NIx=I27aws4sGBDkD=8XV}*=iNh?7yeXI8J3O};j$6*;
z1B_ZC3mYW2+w7LKAc+UrGcTlM+0_zgB`DrO49G_^fvHc{h##ndVGA}vfFJvgPs*69
z0e~d25JrPL!06EysjxWFGdF+O)QLGzd4KnVnV}{sY=dNu3R0-0H$XKAS5u^>z<3o_
zrEu0IkgffaLZ;0cBbLM^(41gAmSg|OfIrKR13|B*LTp~->5Gwe)`OyKM0#G3GE>!b
z8Mk2Bs28Jq*i-Id@75eIeYZ~WFr4sgisA}mBX#*w4;Cp!0r6DRGZ=s3ina$cV*qk0
zC?aDFHo;S12D3!kt<y7wPGgorbx(cBg>%f!&&)E_B}^9X?w__lcX@Nal(>M*rQz5^
zCLz<2!t57!5_5sd$IY^LxJ)HzUDbvsRxc7R#JNn>O+MlRP}O3O7JZIWE)<QIGf>r-
zCMnnx5i+!58iUu9gL8lC@WB~ooB%RqCxAp9AhPdfB25B{$;f-86GMze6n*Qo`S2#3
zQD|yta#MpwQY{YW#x=$yDoqY?b3-IJg53&ZN7(PL;UlWQL_%&;3>{MVX4Hfc5jPZ;
zi&3WKVoog=FdF3a8veCXvLJ<aX3N@{D{E&~Tst!)oov;3uJnJT=dH@}z@z6GInT1H
zTlf!+7!(9gu@THL(-#-){WmelRHl=zr6Q@{`kShR=F_^|O+r^=)!<sSm|HwnK&$}f
zj$xF=Ch~+=twi9>>BG2W8Y{SD4t_)|(8)u`0v+Uu1v*$IU-a~F?I^mPqv-f2augj!
zJunUC%s3Q|7Xg1qh<%dYI(vBbogV>_6QN(iqjD-G9G+gRBly-4eCr6lbp&6&gu~OX
zp+<BT)rkI@neKJr6((It%8C9MG`qs_QJ7jNq2cKG3<^lugke%oEd5QPOC?pIhz9n(
z>3He6aHn6>w54#MUL^-A$joHoaLgfn6ez<w`>+@}@r!@uUoLr<<#FOG!Jy8Te2q^6
zDJ;qGT=Hc_x@U4S?_n-pEuV`&GUkFQFR@-FSFNiomR!HQU&>k)Bjibu2+2g)#XSz&
zAIpdBWyY{^MK5jKNZ~QCz^+*>@Kff3Au`l228)ot#$HbjtopnEsF8iSd}Kdlj4V@|
zmoCVzvRHrWf>hS}j~ccQnHH!w)B^PtEl_j#_n7{CMMG)+rq_Sa>(})9CB6PcuRqZ1
zcPYt)9~ziU2<y(56OnB>UpX@?*}c|J-*5vtCd5{6U<ORInJ!IL1~tm@^wY=5ROQn*
zL8>z8igJHvm+Omiud~bbM7d9y<?bUzdP+KELI!{2vZhaKrzeSM51T0+B(QCqUc_SF
zWsA8g=DpCBbC=7cLdaH_yKE$KmwW6y4#xLn)3od#SS*N945R3yNzG1>)NG@e+D%Pr
zmJSVB!jFq#`g0<~IUftws=l1nOrzb{N8`!Nv2<l$N<VhObmcJLcq_>54)Tq?u+u~;
zv6X+GZyb6E($WjabxrTwZi&o-B{EYlky+Xj>834_73P1IXa1F<MAocl2@|Thb_1l_
zyPxdYZ6~{vI@wn>ee%$g-Fv9XR<h}=$<AWbs>$w#(82$p*`B1%cDtqzRI|<Jn#}Hj
z`uAbB9o1|TCT(IQfRj4yUNG%e4Hiv0jkkZqv|1&#lpD;umz?)Z!B)dmCpCbDXZkH`
zVmdQl5&D;0E=GXQU0je#xtw>+csbY1?Dp(nkh*5-d<G0Leuj*x`yw)3by23C9Ajy4
zQ)9$VC0PDyU2<u)LzmW7==8dddbchG{C{jH(?X;iE=egPm&obITVr4>3w2wLJ5hhN
zdMen7({~c=#9vBBu<i8BheeLaJ|VjP@w7m3ehbS194N4KP9*6^o7e#OFU4;t=EU^f
z&1~zNR_lEEan>5f?)asl?@yuZesEP?0c2rmQ$96wH{{A=&7gnP@CtuEy!+?(P|N-^
zo+xq#Ym{3H+hM>4-i=3Ugyt){HbQ^pRutemEuRARgAPO(g~2NT!q{urV-8zJU33aX
z`1edj_$}3Hf2UgQ`<1uf(o;iL4z>7Re0g@7{VkE!PyZq}*j)t-_37rrFSv5J;5Ji@
z<G99><{a$BD&}x`rSjX!C4G<9nsVkMt<XhUMr+Mm__vj0V`w<3#0@7AlMH_vQE<kn
z5d~eS!ia(aMFGIQoySPwE;mxR+(;oJ7JMN__-sE#WDH5rOUM{F3+cked%j++yOk5R
z^B)(BpU-n_1v|4edPv3UN0r*&dsL|%IjR&JA3-Lf1HVWoBJs08Lk6FxEG6B!3Ub1}
zuQmCVR@KgV_;j8MC@<LOf2)7m*?|@de%yJOAgSFIf~20WV|{KH>$CS0#riyp#`^5C
zSfA%S#HZnlSf4#P)~8`UIPc{x$rbCf^XtU=?8LLD8zBpZSyBkao)94}7%pkHaGWg?
zhjPoRLU6;*k}n!A$`{xbSW4DCo^9GNRy*6Y;UvyBg<Bz+<P8z$n&N->U<wLnNnhA8
zqzwxyW=D}Wyi^IFpE(NB8Wo7}0#CD|5!SGhjWID~FP2k-t$fSlMuR+2e%?XD(7h7u
zk%>;N0G~aKociwI?eB}&rc3v>2R5y6Rw5nx)y_zC_tKtNe(Dn|^-25ydlZxM9CRPC
zg5)Sq*GZm&$i(uLYv6xYS4OP6&qQz0jN0X#Ihm7`YgBI1g-uL%YfcRt(Kcblu*od+
zQU1oI(~YG8rX~TNZj&2K_M_XF%Jb%eo)({Mm&=xU&?1`p)P*nlRf~c)oty4CW-qz&
zuf~*NE_`;s5Zu{Sdt)<LnY4K9%uHb&rajunS8Ab@{M#nco&bMSt!YJZ&&7=^D!h=I
zA#Hm+ZMr+cj763?gq#`lG!0d@4QhbL!!lj-as$5yl01rCONwI=UOb_(H)annHFQI6
zILp-7J^iuM?|Y^XYP;=|!sD@pNlN%5qQiT-D8|c^0x!wlkaT+v{H@U9)jT+%&4avV
zpmr?RKuP~{{k?zD&E&6R%3on{NW+DH{iObGy`oU=Q^WO47z5qJvu<>aPA$lT+NMS}
z%NR+KD1kHp3zW;Oh>Ny>#yDaN;A5!!Aanh<P1p$93lcdJj~|4$;h?&;pyz8dV}St|
z!dT$IH8U0nNqj%eQc!jF)9nM!qFA*O&l?`o=e?@Mn6iIBb7#BOCxR_kZ9-=zC@1EQ
z@oGG>8C7}G=-t}lKP<UkmaTsU6aUtC!d*A|p^u<3RLf`c2k{VO8n|0?yYR;FhRb{c
zLnxEqsGjYMxDP)>p6{-No^2NI>a%CC*vw^pwXx8hbrcnu1HYiZ#9ZIvvTviW^1#0<
zm&q&8;+B7X5jDNL`d-Uf_BG$RtAV8%yvshvGUD?2&gd8KrfshcuW;^K%a_`~@MyWa
z8WjBS338_#AExDQdqS=B%?snI@Wz}gzc>&E#i2R>{x2N?gUbF44S|S>anpwv<2s=j
zH;o%L>i)3h8n(w$>=QZK(Z@k_ZKhoVd(EzJGqZmyF~Pwvy3V+35Eux*GUq~8w7a1}
z#24ohNp=$7;ox&P0164NlPSSXs07!c7Lvh=9Qfg#fSNo798=@A%6wx8>vzsQg7Uh&
zeE4;F9j?pERP`dd0`<qZTB6QDGg^Wbpyl$o3e_u|7s%Kh_vbxqTxYJ`E4p^CQTv#{
zzqWtUd)T;&Xbf~r{+a&6=<Mb9Bu1wu)i>A}(Di<|9>qpIzemxZ|Fr%@KOEnPTaj+9
z1!*7fYjQ(zBddGFw0qS(wW;SjT#fWY$V-wR%J;7C+~Q3xdFOO+0*_*cxI{gZjfaP2
zX@syWjb=8xPxofrhVO^mKIG_vO)D9CjO>49f~+(s$O`ri#!QW{q9kS11z^c80NL>W
zu$U@&c|2wAw!*;6i7xSz&+>fhhZ*4mQ$h|q_$o$ts!-;!!8>_MF>O3YL8?11G1co!
z7+qis6M+e}TCIGKHhmC5wLhF0b#UAN_y7ApzCdcG*oQKuFI<}xmn?S&V(5T=s$+kk
zQK!7vq)>qVEqnsWHbf1D5to6bbQx@xNo9xZl*wkf%)JM0PVa#{NI9Gc)>0>enXhs;
zQMF_>2Cg<Rxn%(j#`w_(c1)Z;Jd10DEbcU?=8(rl5nEl~>#WGbZ12=<(a7YW2b6<0
zP;r>Uzmt1#TU2&ruf@UYUW=~L9h!d|hTYrX{)_ysi)H?a1T|`r8>|%w1+TMeBpnlo
z_1rl82e=&??eBFvoCIzMY4aXGNaS4OD1YQ!<7^!{cdN*`#`(_^IoG&|Fb%pszJ23U
z4;Np>#d#!h?rZKaHomZbg)lbW)y2ZB*`?v6hf9_c{8x(bEULYrT*Z&eXgPn=YB_pZ
z#ZLUR3bc6qQOiDl047w5pDNSvDYs@*SS9#F0gosObqb+O*Q{>o$#ggIj4j}`NXC`o
zDF%`)NDrhA(+yADP~lW+6L_XkNPwvHRs%ZA5Osl)_mGF+c)E(?*4%RG&vUN6<v{%9
zv$P=j8H&4`$XI)-F!)@~)A)agssgI<dn&up>#S-bZ$GWlzsEgAHIA91nvQGr2BxYN
zo!vaGKz!kW;_bmnj<=&3r3%Q=XE`eQ>U7#7ZBo^b(~tQoQN7!~&hf50Q_kYNpW|K7
z)>Q9~j2!RsfWV|M(#!F(tP`o~ILxXe)F2&)=`0}kj7`7Lc!|Q>v~+*<p$L0ePZ)9=
zui)PwGy!;bZ@VH+_RxU16_DKkS9oEUdOGOc)>Tz6*8b-M@ek<5WAg5VUc4d4?9oSZ
z^qyXPBHfqtqD4*`^x~BGJM>~i{_^R?oV@MQi$ikqj9&af>a6ffZa}BdgEd><-L33B
z$GBBn-`?CSmoZk=F4=z!dKDf&dk(zg1>)s_I_6?>cd>MQ);_;zyuPS6n>Ed{aX}97
zs2+`2C61ilK0Z5aoZ`h{<LuS(#pyxoxN!!>IY4sTvSD2DqRT+L4K_Ja4e;Vw{SaRZ
z--5!n$?Wt}$(I+$N3ZK)DYnh!63vr({X8t-jZJfk&+8W#jf;Q!QH`DYfOzXx3EF*5
z;oNIlmmlfa)99FWVL<ktl{dFwp}^(l^YY$yk@VqmYkRM<C0T2G4<ZZ?m&n4s$mxR9
z9{{%7d0?#FX%48}=_*LOlL(_{@;;v0k)b>ILUJ7%-Z7VhzwAGHq`VIes)ph+)Z&NV
z9z6H~l$Srn(S(23(xMttai5*@cSZkuDa-j+xyAh6FC*pmBwX6|8kTkqOS^`pUBl95
z9xPw4snp&Z+?!ROFvBQ4MW#Dqzv!M{kf!pzf_%0*&^Ka~+Ruvn$CMT7b-00PSqn1C
z`0BWHJS?3xTF0;cXg5C`9)ct)1uK~Jj83nLr<KoDri*{HI@+hr*JR=i5L%G5a(<u6
zkdd#m5y7vY=K4CVA@c1;#(Sru(nbBSe*CfCZXUlr17Tc@fH6Z6%(uGej;k_1b_v+F
zYjtM81WJ+T@Rfrk?M(m3tApbcIpOXko22@Bq^kEH>dh9f3P|&;WQh}4L2qE)Wb&gT
zEeI4e6l#AL#S&ZT^7_HE)Wi}J<hG1wrm=O%X@oF~2KQmHmwGh*4Fn$jKraR|Zn8w_
ztA_&=YaaXdBRl@S5USnU+h*geMEx7O;<Gf~3ATR+1c`U%H3qSav9V_DNPQoeq;wl@
zI#-9FvEY0fW3L1(r*6oD1LKEzQ&62rk0~mW5I29#xU>eyz;F&k4M0A|rt9n4p)(t!
zZ08pY23r~yDtNPwckO{32;v?+{;q?rQPV9IPEn2nS&yCOitsv3kO2#02k6w$@qA#5
zBsS8jR!}d{P0-J()aQkI3dGFDCxT6aO&Ck{U~_sVMGKX7f#V(t=+N%if}8jg=M9u#
zc*}pdI_{A!JoK!AZJ?DK^gauXlkOV|Qwq8ton<CfTK#Js;WaQ8iO`p;XF!$--3N9F
z{}9oV>P?~<P}nGvXglB@sAa+D;b#{%Pw;*CO;3(`5oFn3nH{Xy#;srL-_brZ#n_^!
zowFM&xR+g?J#vFP<{0DvpOSeMm7%1NzDR#3@Gv)pYJ6y=&_NJVB(ilZbr?s7x-gt;
zF+B0n3B8~Cp{^PmpVJ_p)1VtxP^>~^X#SF(25mc%+V;V+{XIzyfK`IZG*RYO1CekK
zot}B%>*Yv|XI$^$n?wkS8nb8kHB`03FJb+5jcYpi)k9t{SGcLQSZb3W^s~_M9Rq(h
zB<wVr&8t8C-`}1Nh_<20x1QpywtTCGcVyk}JRXN7^DoczQNj)k1%3+s^wsoJzKwf`
zQAfqyXi;-cQ`IG63p#%0^E|{@P5szjl?k9P6TonsE|?bfqe;40=D~)#tOO*e)G-H^
z4eh>wzp%-ug-^d(q!XZXC3TXQujqde!-Xz%gMJN|PG(9yD-}LKHwrzoOV7kaTZC!5
z&Un19MVJJvG+6b1$RyklvRF`YpD_bY%gqEW_ff~D9b|?8c*QOy?kcFe9b-Jj@F3Ob
zU?TRgH;j*_OG&bV{_=5x@&#9Vp}<hFVIb&9;-{|;+85`?M+M*}{72*B`1ODB85Fp*
zT*s!No<ZnE!GL#Q6PEth)_%j}H9CG@Yl0+yod!hi@S=Xustby|Ag?k6TIn@*kY+&0
z8OS&JLxm23^5=r6K;VxTL<MpVTV_GtBo5k+i?D8R%he+-WFjnUAr)a^dYE5IFcBJY
zm|Vm75&adiR^sX-YPM8QS`&XXdev|+R)N&n)my+gO~xR}<5*{io9vDyc_|g$Ve=%q
zgN`9igWfuwi<$kAdM#9&QvX^c7W9U<M%f#SsMbW-8w+~l2EF-v83steWcL}51#PjV
zEBPU)Q46L;hK&DpI7TdiK>KjstY5Uyp62gsVnD(OnqoD1(`WoEC<1>1WxSf^dE=~E
zkJl5wo2baCX{iriBrWK|YhZ@vbFS+UzZNiauU3BH{mXpe{q|eY|LlDU3&W2rv=+Wp
zEM!!i`E#=XIw#`m!AGfwz2OiV3FV?kJX{uk<Ki!IlY~;ZVs9H%z?7_TpG25cAmP?J
zdWOl8c%(;$ghJqpSK5CueB(iYZ#;<M8>5*RF{hcIixT<Txb#Q4^s3%EeA9mU;rQgJ
zeSG$+(dG-Iegw-2!^-qB>6gxmI>qBf2xJ0sw=<boe)G-2BgESHBm9k)J$`&Ne<Ti*
z4u-?1=}y-7DS@mX!S|g~XJ(Ci$95mI7(`blpDSNp@SfE+1=N3Xfc+~$H*b<HLbf?@
zKW_h^rjj>wuJmFYcG#;8IOs4j^&X7VaM?J8?Ho$&^vICG7H`L3iwjfv3my2vWZ4(c
zECJO|n1)@Ok_l9e>rJ0VKCzvOj4X2jGX)ztT#@f$d;`e}KmS>y4=7LksG?=>KyG3F
z#`fFB%l5^Gv!;J027Wv`q6f$W&Gn?8j0$_igLS3fu!Cl+pIza%{6hG7120V=2n-%&
zL8#9*)7wlv!C%Q`g<iZ8F5$o(98ygyaG*TWqkgJl(lCB#*eHvkWwKxtXcS7pfd3Cj
zjK)R>h~`s|DO{e0lu!B<A~6*(T$gQc>MDF;v1vg`9{zvAOj$LbT}D(~)zI5QvZg48
z_)1joQ-}+;D58s3SQRz#asK<l^qiRs%8XHr)Et)Uv6&U+964-qb|2&0g%Q21JjG?y
zW*=|UunjU!AKY2$;3ih1dVs}f#YZ@G9J=y2^zUOFdTbnc@Q`^q(a2C@vpo?bOQz}L
z(oY?if$4u!fzMMe9?R~T^Vrg%#aCLM8E=U3=6so*svurxWFh{x?8)XuC^?Ydr0ovp
zjK)+4Q`Rfy+6ld!J7HLqTN@T*zolZ*Lh0PcLYc6Ig7HbXOxTLi$RK@Lbkb>2V#*{_
z%f$)9H#;|6W8%H=k=>YfPuGlIk44Y`2V$3Kgb;sEp-prykB_iG_>1M%fDmC)?;y=P
zLgR#ZFSv=X1wW*>j1FjijxE2#Z)t?tf%KqIQF_m`Q6cQf@9|sGd;CsOaF@w%+P?Oi
zA2`#)tT|h?irk_e5#TTHW9F~f%+rWCawQRmYa|YMO4o6Z#k}E>8mY_SatUh^+Em(R
zoH~CViv2h2gVJ`y2dVq)iaaXId!v3IBh+LgG<F7><dRE_Ks}32o;ZU;8at^Zl}y--
zP%gy_W|DRV)Dmk*qgl;-M5ZYZ<orGcvc(3H1u{yW!NgF`vxbu5mgVL+SUMlW$)x+O
ze00ARNeH=*F+5;n$n1D+VI0%QN&09u(glATg?%#LU@47p>Q|>TKYTAfe$i1r;7x>A
zQiu3J9^%9M7~*3gJc72?wm@Ce$Wi*}9;S{i-IJ<yioJSWZ|TP|`hIpFy*ZCH{VYSw
z73wK+>Htqbu)iZ+JTJzjU@8J*nQ^=f6Ex|wY5dtZplJAb6n{*q0)2EEe}ue=K556F
zi1kl@pPs~@f|vj+l)X9#A1=rRz2%lZmi3zs=*B$a19alA^ogfm6v-=kc@CEgvbptq
zFH4{Nld6$DS&e*FdA^N?5nJD?Y;EoqX{_<y*6!9Gi#2|}y@|22BGy<|h{RISXCe*{
zCf6F+-@eHkOc=oY+U5)YUvVSY3;(y@#5xUsZC?JDAllYNZ--q>1o{mPuW@DbY|?8M
zWP>)tCr@<qv-_oH!+*rdOa)-mDfR-Ug{cx<rUtAbU)ZzsG6@{CJZk(#gg@PMXbk0{
zGj`mn_8%|nhX+Ty8quCqDVm1{1&r=!;35bKE96rflVg{zhL&#<_4^%X-W(b|=c=lI
zl?#>Wys!=b$_01OF`zY@l`T@)*&*dp878g3N>t<$^ndtNTP(<wVeeyGrCQ4xNj8la
zEnx->CX*-Io7uC->v{XI`8=x+n>(}*o(UpfkM<(>*urZ)%*J-3v*a@?RJ4!Mt=r9A
zq>4M8KEBj0ELg;5^+vSV2Th?A3=5in%OuMIqte`hDll~T><AbfmaU69_aYIir?E&u
zEvQzbafcck#^j66%%^TUjgMpSiA4-bC*zgyTcqX8fYZ``^1O7OaaO%?9R~pcB4e?@
z|08|n4(8t@b}jI}`uiGxU90*OB&26~RQUm7$GwGJ8U)OP#Gq=RHLlqwJt_HrZ78lW
zcZ*E%*ASSJYr?d{563<nTip?v(CbqNDDjDDT$-S#MhK-YrL1&`Xi3##Xgqzw>#24K
zH`&w7HnW6(h+J`X0uvA94^%jES@ZOw-urBSA;Um#b7Sc;Mt~$S({C1JAg7{T0)LtE
z%$Z(|5<WRu20@Qto$c&w?Pjrmnigd>-7HoU@)9HDCC1OqOPrdDQy4aE2_OB>^a4-R
z)x0S*X4@;^PCz%8O%JU_bO!DJ8JX987v{n%U@0I%hz|Up@R#OCL3bvI^+EG4w|2`t
zbAUu*Q6y?~e9!Gtken;4=MU+kADY%+=o6Zu0c*gKmbQm4z(>i9@0v${wVL<jiI=vL
zG;0F-<_&xUHdMHXX8TS_^jgyhe5Gm-+JLG}*yqt{wSdngR+v-7V63i6OpkwkMhslP
zCXGYgdcIT6lzz^6&ehj<^x{&zICplQKYPaHpzWRA=g+7d1j3I&r67H;QYmk<oU3P>
z+m&5xX&@$zX~{0nHDUsPRWD1tD0%Ea%WvPH8@6=+%5ZJV9^icu|4T(ck#%}v_WeZO
zF5wR^==dhGdI|rSimAo8y$vhP^IO1Q7CcHe@lM!Q#`S=Hk9ZC7N74Ft*OE2bk%GJ~
zn>G!pyaG6x4jJ!Nh+{|BIR6S=<YI9<GTjbrTKj&@5S3J2`ipgc*`gU>hNudr7bvSy
z!g(MLre;X?=!`|`MS<Ri)ZzQr%y8L3tBExoqWlCLv*YxxD*?N-?4jvezD8o0ISUdp
zBFuf9ikc`Vt=)(|KHB7S3KwEB9&JKzkS0!1d6Nn|da=}ToH2hT_$gi#HyFd{Fb}J|
zoqOovd%>)?Ni{Qn-g`H8AfNWZW+%<}SV&B%a6UHCPdGHk)56Rvbgm0Px3MV&1BC8^
zmKabC?%yzgJ3N!nt3G`?fcDKg$mXAVAguUo-F5wu<ujWyg5o{3Ja1-tPeH#zs@$0k
z3a&YIT*OLZy&cph5wmA-{7E8vX&?D^FkSo7wQkZ;_b_vRB$lkql3gSDRPmEjfYsgU
z$C86L)!5k%uyMK1^eW{H7T@Y)BqzED)3`-Pz_Z}O_bHClHRj#6zpKh%T}LaeD=TFI
z-ZJ4Z)0rDh(@#P7;(4K%<Pv}H3Q_Q-wj=Zvv8Ak-_zUg$3pS!3Me;I&U@V@v5gQ)S
zub@wf0>Kl1nzBK;?&GgTy;;=jMY@{jwb6n+-!4DT!9>3<=bg{?_I8;Kfiptno@k+9
z%#-s`WS(2)@@|=>>T;Hf>~pugQz;|+1n&Cm*)z}(hxmnOmGX0R1ll@H)-Hm?4K)Dk
zFM_;{E!cwh2O;ymq%3*Bx_AvgroU;=`@6lpt%})yfBwwe+kU?FY<C-0!{tDGAtfXR
zBI(u7Et0nL@Tf_tMXq!z#$8isjiK@(87wrWJS&w6S})o%n_x2CB`^VdHtGET?7hu$
z<VdnEw$@uDF=H%X7?qWo{HsDXI)_!o>aOV`SwphAr<={g3uYooG?PF!fFz4e=Cx}w
znI1rY(n69+GD!=qw9rzLnWWWdbKl~=fL=lF9=`wrnXLYqIp^FNn=U4R`0<GF@bHLm
z|2)d1a;M*LQMntO_4zFYFu~^YO&FQ0$HkHYPCaVB-t~kxq-51TKdJ}j*xcxvkpcfU
z@J5eEH`@6JxY5r7H+uIk2ixdX8QO^4n|B0%p3z(J_nqnP{Pyv|`TpaH&1c6ndffzR
z#KC*+g}mWA<T)FL+31x7JTee^wi>odw2#_YxR0uRbyj`Q=8LDKYdfkM0j9K715*N-
z7y|Ddrnj(zhdH-1fn~&ZhCm|$%sg^~HK9$r265`u_IH#H_fGPNuv&!NO6^-zqgM!j
zjFKrtCr^gNOM-%9Iu+<Rn>MDq<e~GXJapdmGU4t-K+J^V1g@^e2-$4lS^^hNVYR)5
zIV)03t0|xr#-%e9i1Q-4K@)wx=|R&(P<qbMmJ|B>ZQ|Zjm43ox+5ROSLEIQS#5?#+
zmwmW(yv6eo(?tpNRH;D9HQ{zpKU<rBfI3&Ch`xT@KAw6m;v_zE=5?jJ4uSOp2%mU-
zr<eoQVx%2}U9R65XLW6r+eFXGmZ4|C>Hv(2;XF3j<icNPA18j#wiOjnwABy8@|G6J
z(9^D7jDsgu4yw3cqwvNvA)q5oj%aZFiw1(N*kI2e(YoHJ6!@6#>Xo`&&E|T4&Rr%H
zqRkEhj{kZEPb`N5mz%gPRoWTi9kDZGlX2FJ)B6a*#GcQ_68Bjc=j5<gBA+J4+{!Cf
zCYm%Hbab71vHawSkehz^3Vjj?-O2k|yfCITBVR}$#=$e3UH-)7tM4Shvmrclulq#D
z!Mt`wMo$QC-RI15#W9Aae?vTfvGPcsSU|B7ijwH}>IGd97zsddrLP1mlKI}=zRObk
zRO-K76BkU-nowLkW9wh(0FL($Uk@DJ3Uyn>oE`3R2Y(QHn$M@Z`d)nz+w$`{T;q?_
zl@^qY>kl4K#Ywx}c07Si#@^dh8@c-UrL_mr=yj<IA5ck0F6XdVEj%cHn4@`tIs|yn
zKEmeDSS$T$``tE-rMu5J&OdPYTaBQWmd^NIdoH@jvhLRU=K3R!558pCmmEk<qnwqG
z55yiZl^Z;MdO$#46{Bp!#=pSbbTqI5PSe?$1V%|%1bb7y1wdBgc!4wZe4E9E_zkOe
z1RM4MvS{^v_-Q+TzCkm8_x}U)!M_KVmAXBewxVur!PXHeKm{_62KWXg2W>tJGHDaJ
zC?z`oinzrV4b7VKb(9aYcnXUQd6Bhs=MkQJR(GR?l}3!s38M8FCl#s>C&sq8)cA-t
z7K@tT3E+l>&4gkK(JR&F7LRT&`P7w~%M#ioOGj&#skSBas*${Z<VwK+#h}2UUQ%a1
zXvRxlmK9yT{E6s0^8c!h3`~}$>5(ieUwT9ec<~Xa{6oBcyB88iT`Ul+42Xy+M#MHR
zNhFqbb+(|oqOKeD+~}ASrE}_|&s;5Q*GQvKaU`}<L3jGXaV%eeMc~_0XwVj)bE;}<
zQ9)@@pychZaE`Hmu}gge-RiM>-77pOk+mZ9kn%Za8$DVsI5P^)9$PRuA^FW+z`t{6
z%f^~xqvlxGENou#hX<me5<MxJ%WI)&zYNv)caYi_|B%{CrS|m_seSXWSZd$>J*D=|
z-%4uVva{fx2UqFL`|hoY7c0DF1MN@EZl$!qmt1V{m)uc*Ixt+ONs-(A)r9@o<AuF~
z8NoR>;D6c_{wx0mv{W~fE%OF<?gh6PVWJc82o(OVbwOs>b5g4<IrqZi61LbMT~Wl-
zE<;e4hEjMheR45D5ajJq3<bP?3#1&^^OLaiBQ9u<f?X|Wul`Pg_TxVU?NUK|wM5V!
z|0@=>dw)-VL3{kS60`?_*3OJ;d3YGkvJ9B}LpG5X{bhu|UnDjUeyNTO!e(y=o%atx
zH{A8r?aW6MI|nFsH2DRE!ohnZt$)_Q8l~o}t(6MHz*ZnYa=R3za*FCu${AgkoHC2T
zYek3j7Zy|?^2n0Hv{sx2(z06^S;#xwOj?6vm7`XF1N^2y%xZ6OyA&mHBO%M%q?^NA
zw{)xV$kH%~9PlF^c_ONmJR3wzUBre5UVu3vt+I;jt`%OOQ*Og<z=WkVz&Z_7&Khsr
zBiLpk@EGUwIj(cBf}MW(HudkY&b|J}I=6J4d%I+v+y7U*&b|M8u5<f;t99-$z{^g#
zkp1v~t1V=QzrsQ$wPs%d*S(gq4roRXcP%CD>s~pBbiivm=XewRK)axCbpQ&AJrcG*
ze2abnrGt9^oT<b9BUZNmd&RP76r*VM-!SFz=zrV(4k~}Cuq61U#@qe3$8UGuogE$T
z9Pc{fMEye$w{Kn$RbK`#=ZwzItw-}J$_T-KGR@eKP1u-?<dOZ`OFF5K+1?fX2-&wC
z`jN8{2dK%|4^#S)qM4(#2XtrUttB4`+%WQA2&rRqc;FZh4s(Y=47p>TyS%;!PWjnk
zLyHDbO@;4_l(ed<H1t&cS}H}o0oo=(2(*QzO|w{9_1>93J8aT$pr|+0<@c5xxLntN
zlH*HDTG1}s+iGg#__LhB_+ZOpsY1Pm-Wdle^iC>!r;aJ7vzl)mHf}&Atfg19jjafL
zI=%VUlDbxY`MsIr!~543`pvhN)V1=<?|BXr-%oQ7e>PKa+H?wuWu;T_(sc^{j43$u
z9S`yI#fQTk9<0aq)<`X|uT(nmTu*U-R84YZq&Ys^*+1HORjSc=XHR)#OKO&?fyGox
z{R((+6y(5zIp@J<RJg!t{^qdJ0-Q8UPW8>2ljEORvhfejoY8`@=<@ViE@T;Z<DMBN
z*wu^C`0u0<hyT!smukeZT_fh+gZB!25G{kRlJqulm_QxWZ{{rj)zqx?XCAYE2C)5I
z3?(=q-@HNtHhA)sau(!sMxnSCvHLz(E)<(v5kytt^EumIU*A|*VrH2*>*zU9!9Uo1
z(d}+<<Acrh9>E{ni@oUHEdC;kNB+GuPg(y%Dh)z}6(%Hk6=tI^$(qZ*FXCbn9p6pU
zi!7X8-bt_Ks^>GBWeQ_W|DK0`!1M3P3H<<TD(?LDy5Yw^;a0D|+ueNAee(v*deErn
zck9EA&TtDYQM4l+ydICoPRW5@CLe8fw>ysE87Rw*o{z(ESCpHzqpSALcBjM8$&VgS
zwlSJ|shX^P*AZU#+Q(0p_vX!;mv6d?P9SLO+(KtK>TQSGBv$4gk4NEuDAc((HrCf6
zH&NsKZnWMT_r?v4)>gH?LTrF<o8ztVbBDqH?PZwhjst!r^I6%?q`PA^QR2B-`{fSr
zhW55+^rrK>=iTQ~xQ-DE<Ggs!gV!B#5J<zU7we72+tH@76oTjB`NmLWl;&C^Yu4xm
zjEHsu{M|-0+IX=^zzCOrA#4K#z`<cSiXm^6DUp$YZzImaJn*}4sb7@wS&us8So<9(
zX@XA5=!5<a?Qxa)vy4YGhEbqM+Tz(T!Y-H1%68NCkHXK@{!#k5RvJrF@EFDLt7tO8
z_Kkq$6<tm@i>@7Rm0f#H<bT6$$~QWld2KqIT_z}Zy3>!XJVn2M1OeXA68~>^dmhvz
zr?a-*e%cd;c)ST6=B&0p|AQlwP^)|OcIC74OF@S&t6lGaIhq3sf#ctUB;1EV{F+;<
zp`RSJ@=bUhPk?)$;vq)#l!ME&m+14e7Y>i;@eQP7hv|7*r0mORauea^mF+-56P5!{
zJk6slhN*Wh7|O<fEX?TQc8|KA?Bz;*-|kp?pP_-_m(sw$y|J~?dx5FM6sUIg^KB2d
zD=0y;BO#riwl{cfy(P76)@nmnw4YmBci%9=$DD5O1#9vDyjm-(ENIZtZErTV=x5e}
zly5$=o>81nCm{}%lsZDv8RhkW$v2k|UazzH{5jRySWRz#aW&5$RZn*v{)efIndCfe
zcY2HKUSCxAdixO-uXolrw?Dn&4TCYe8%7oHsNi)mcKqF51Ty-Xm{q?#j4oyqSj32=
zdOerj#Z1DRxK(Z7dbxpJD5&?Cg4WyHn~x}K{ZVBt>2;XL*uag)l=T=k1@75~@-`n+
zUbnrxwDom=>ws*TvIwSQt(?tYOBRXsf;6#5G-)}LZ#FP9R784i_t&Tg+Pk@^l1K5O
z7IV!~9@?{QsfaYHQF@D)Uwj2~I<UgyD!+~pP4HiBo%fhb(rrkB-p(C?@`P!gc5R73
zU(mH}F0M^sMlGmqUDnoHTHEu*wXI7Gt0lFqFRx91!eLpvKvcJ}p#8Es>h4ZcB30eG
zC~8r4n+rOiRNcm}Qr*@<%FX(oFRf4Zl(o}EecQ6W?lR8YYD%Q)+m!XKH`n+4G4-v>
z{_HKSZ)-_?FR-ZIW9r*lTHn?q>f>$OSW@AJ9KiLZ72*Ir-B?f|F~jB~D(rQZR=6!j
zXkmqa)SKH)y|tmIO;1keUsxdx&x^-Yxbdh8Uo5MTdaL`G3b&S4_*_=Fxu8PTTZ<|r
z27NASUR)t@;ldiXWOpsAalP}n8oSGC+?M^dw8q}j8ecrB#^<ub7S)Jkt#62`m(+;m
zJl$GQBQfcV$JDsBw8pOD{Y6#sN!@Ll*&AAa>aIT*b^qcjskZe;RJqZ4WR)Ass>J?W
z-+WA!z2#M^<@)LNf-2YLFfFPQ$9iK!)V-|A&1F??$YEMq<<_DqPZfF|cTmJbugmB<
zLioHnqX041!*F$5lL_<*1&<jCK#s#`9A!~5l&BjBE7Q6R^W+J}8H|z^LKVj01igTN
zTTfg0Y#L>*S4x3^6w%1h5l`p8U8tH8jwFIoXiOD#M+8lpM8o3YVMYAX$QKU}wO4J}
z09*@Tij^(_UDU6g-e>8@JDI3MP%EObuVFMAQ95dsxtN@toHFA|2ThDtIs#}#-FIMw
zRMptDe8=ae0W^P5E8VZg(c@PiCwTXNcG}NOGp0-;jl_s4?Y<Ei+vjmI5=qeONJoQM
zT^+kInnKB@dMs90MC9{rU=b<8bKM{}m)CoFgeY~ql!Ng=U$+@=ed`U-*%?)TcJ}aK
z&4sA$=(Rex#PZRjs=#-O)m0Haqo{M^5psGf`Z&#aI3f-f6UD_PygrXwm=leEBu)10
z8>}E(D{$%y3Q#IPlK-;=WAVj}Y-HZKR_|jG^RvJ~Amo&?d#dQ4r(I}?8p#@73`G-w
zK5|Zyu!wJ>)-WAKr{<iRl#SR{S6wGnpfXbzp=~U4qwofWpOt#O<P_<S?E`OuYZ=uV
zqZ|}0nhP)}ajo|?w?}%(&bCW`z@8Lg&U$UQy1Ec|$wbA0R`T})C#S!TFEM(`(QYJ;
zilsO9!s&n@<HKqBF4a8`8X~BIpc<NZQhhtOM!yn|s#Spa9tkNBgUq0SrWKh};*g=8
zpfR=vpd*SUHS1YUkYt|Oq1sZiab84ACPmpyp}TB~jOlj1A_T7gnXDCmFVl1qg+^a+
ze4B%D(`q3yeENcMp?UP$wZ*Cw5M_ZhzAa<~PRl6vlb}voW{i9+LWn0pW(TK}1n}q#
z$WCMfaZ{QRGa5P(1p5N*KMbA|&B^*IaH=SYxoEOa{YP({os!|Dm?$c4XPd|CBhXpL
zLwp8d=pUTOP<}EE<5uW@el%yNEYmi>?zu~)B4os;H-JED%eX?#ZFw1v4x=AuQC?7u
zj;1zjpy>9u=+X}fa4gyk;6&SnzAf&m^h6Exoc$K`97Wkpls%S&-QReSFoehiwC%?Z
z(a~=+L}V^>D8gU=8f<UmX`BHS2gDlwr8F|?S?!a0rhQWH)bB-q8?vP!M6Y4X(ata=
z{R!DlQw5A7pzx1&ydzk#j^pbnofVd#wuLLVIXnr%`=U7V*r_+KhMM|~aV3u*k1M(N
z4_wKgg)4dRF9%n0r^Lj^ge$qH@Fe-)0~1&B-J@|OKmJF9EBR62N;aT%q9NlY#<?2Q
zB*Q%)65oNZ4g=kPbc8xYILQ%$eK?toB4<AL-&S^CZ%f6Og3FgmjmV0_F9wPKr=x@Y
zHXo{Ze23^E*2)BqWbWT1RMoWb9aOA@QuFMG9D_kR0)_7>GPh$%F*n0@zb+jLaJ5th
zz~r8bd`c=I5Vx;!$-jvDd<u!_Lw{Pgmw51lDm;Q+&9X^<3o)Wv=pq`JG1FNKA@l<y
zayoPTmVOL9y+>GG70d~3%Fz8Ov3N5ny%r}-6|%D5fXN;YGT6!JAfGZoW&*0KFBhf-
ziHz`=o{r3w%@g-|hoG(9QE>V2z+-QF$YB9zq*43*0fH>xzx0HDFYt(e@L3xA3j=?e
zqx)#9x<M#^*zXC@df!-P5BVs{*y<ihOUwoO&q;Xdrii$mbLlGvbm-k<oC?u5^PFV$
zpa9wHt5r72)5%Q)uXq&s3{`qn=MOemPdN-+A<>JvIxw=W(^#(HE)~_AnJQ0;RUNt^
zwGUmCC|s(;qUxDaDGl)_B}&ECmO|F69B+P$D0bg}1`A@|2lpJb50+4LbTxVni0H1y
zz_Oy|ShFqto->RFk50L0JA87g+@!<c9{a-2-3|tmgS_yw3tUK_;dc*I8OwH5Y65Op
zTZt?&8gMv)wZp#c2+xAp-I}>4(EL-gyJs+~>3pN!xnD#HuNz&8!wJZb(OoP07!7AA
zM_@sJB!#M<_C4flEF<VLTxa5-w;G~BdnVKXUp!G2F!dmX`~-T4&{Q&ybr6abI}YBi
zXdMPreCTYcxXAvO-h~-xa~Kf>G$CFshya>Wr_ePxcHHl<!-1B%ejJ4Tb7;&}Ij(&x
zZ4(=;tx2Z~tdwDugt<hCH+`Kd3n&3p+d1ujqlt5z%p#s_+Yf`Z4Ls4Frc>8rX&d>3
zKj@^=>X}$Q4&eVhoo6@-#3!+MdI~)Nt=xiT5nJ`}&=bEr?>-GWs@ORcw=O<G`jr@T
zI-v9On4a<HXYt88<>F1DX7C=tyjv=-`2HDkx=xKxO!Xn=h|Q$EQqmsG4Bii@XojAD
z%mg1W(~=&VhjQN(f%Fs-GWYJG%ePn#yPTk-)JxEB;R&eOBpwjl9O?<H1{EDGwDW`*
z;11g6zBK1pIqc<|a@fmsO75UC^kpdwDGxo$m5DbYDq43gDKa82E;vh)lw+3KQ{yTn
zlGC!aEKxaJZ$oli>SUp``YlaXj!15QPtO-jkwL7YixMj58$<IgCAFYrQ!v$<ZpSit
zRQBHW2*4noM5xMEQ_}KGOEWCV=^%!+*-tR!oYF!=^m>{Euf_H&aAEW%A5iEa&)7ES
zgWR8_0{1h`;tLGi#VG#NE4r(Z1YEfjLtkNI)Uo)oZaE(RKvyQnsnOgu7UB<oMw%}h
zB2K8pU+MrFUj{$8me5U19btUSi&1G}6}K?vQ(Vbbn0TODQD}315+TI&$vRUr@TA8I
z(78_gQV`P;FVcS=^g12fvhc^x);k?fm(erIh}x(xyPhbghvjT^I@Y?^E&1x*%Vh;B
zL3h-{qU3d6a@Sh&#%W(?!w^G%ay7v`y`DACmZD~Z{T{NM%0)$#1nV7YATB>RxkWyu
z1Y4Yt7uG_zKe36sW)ruogRoiZ_7`@7p9_MsGQnrCg!2S1d|ls>>YHxImz17jOia&P
z#;d<K82hJXiGR|J{Zoap8`xPXM$KJk+^~s5xPkmphL+KgDGf(-8Ysno^S_`mX!8ZF
zuGjI;r;qBQFLe7JdpZd6W3$s;98T!nSHh?DLr<U#M8^VLpm@&V225|g-u8>lvYV>`
zY5v`NyrM#^eAiJyyxRJ_(<@mD@J%{q$`@uT?d?;&5MbS~$GM;Ln-b$jhj#PRFw1d8
z7up1@4;FxsoKu0sRE_|D3W{im$j6I%@2i|UG_vEVfM$pfMSo7Oc{dupM}vXBj?NSv
zO7j9X`Hn3JC-miq9th!w2gj+j9dzsGZd}=V8TsCQ<vL}Q3#WYXjzvVrwM2{pI&5us
zd)-IatmxQ(eD@-^`1OrWGJtjQJdd&)JeC_2f%)jW@Ql~l@`ZzcxGwrJC_KLioIn22
zNWqGE(#~8wbmn6qwQGrgp~IJ8Pg_o5^Jp?2;6K(g+S@o8rMCnAM;${znHSKK3qRua
z8L%73V1US(HVwi#>vgxcmq-3i6*sJOkUBi|B%iR>80IgK(XUPr6x;kLG4sq5AE>+Z
zxP}KfYi@xogRHB62<vvYH+nc`Q9JsG!SgJh%cFEi@&>2xQG|Dj^tDfww=+bge}zzo
zUj4jb-q+sdsu*;)yODV9z$Pc8!uPY!%)<KF+M35vd|+LInh){QPT}GWh6a=gFE9)N
z=uRJ|Fl%1H`r>*bmh#*E_aBZ$bmZgRzZ~xz?(R4sf6pg>v&<D+5ViT@=s#NH%%bb`
zCfb=ysM;KLGTkcYRhaP;QXZ2S^_6-Cvo#M7iPhOWYKNl{<v>|P)*=NY9L}HsRPbJG
zY^|@8)4m+|!o0JQcN)NN{3aqnujqU9KgS5MG!KR(3TYe)>(Lwz<B(eu;Eo9`8^jZC
zwoB)T;>N0fm87Gn-8#OEvWN}^Ky(;i5X=Ci2il!YCox8b96^uZ$vKSN)2DqeJ;`C?
z3fnpO%W_g0j-o;-!^S}dS+}6}jvOv69=Iw`r=c)O7_aj-%zbCABBmo_w+Km{d8sw8
z?uL_i*cwH6WEdsGJ7+ES=0<l^TK@(;eM>EExAww+D{LtALy@*%n{pG6puu<!6(=`%
zJ~yI-dAnuy9Ztp?seD4E2t06)|AG)8X)q3E!nOmrh<6pOX@NTqjDz{HCl3rzh67vS
zsE<<WtWhvNdHS?C?N8hh8&YW_4?(eRFL5ITGgoZju*X73iZ@{9L3AaSo*;wq8#Kv<
z{p7QMjBe1xUW@L~3L=FL&zSt()v@u62AB(ZR<Ca_oIb8T9J-iuGPi}n2gPJeCg_?8
zx}^jcB9m9Ax0si;n@7_q%yJMTQSUp8xkc<o#?2=_;o8eox;EWf1)#ufceXY+7cMHt
zLT8)C6;;i43F~G}CSUHovhE@*M&mG+hHrI$wOn4w8f;!Q8B@2fBqkmgS`nK_p%sBI
z3;4&A7G`~m)#|4j4Zfn|V$g{}3gj(19)js9_Tq)N=Aekf<K?hr+?t_@7MAIhF8^_d
zg$Fl=eOff<0Cmi?GZbcI#h_wv==rW`c4b;0B7cbpuVMWV_>qCx8J*46?)nv%%7ih0
z4UTc`4}Jc~k&5|9#W+&&sbOH;w1)xhX!H5ja$D#UR$sv*a@#H}jME<c{+GRXUlzqw
z*yJ#AQI43exKPgOU3s5g`Mn@;W3gR&*6nm2Iv&%TCqFiAGsJF7zGJg&;^W0Px9R{T
zo?}+j_jlEs9GwZvg-MTF(NE9Ex2}4BmjeZzPtx;86olRN5|X+ny2w+swir(EbabXK
zI1%l~QXnXl;vUfQF`Y9ItTrRz`~)?)cj>Lv;7;cZn9FWYTuO*+n&XwJ(ldwnDsE%U
zY0!80aUp2EP%~^|*b0Klw9{mgh9h(2W0d)*yopwGGzn0`pdY3av}bwtPj35v4+GCX
z`KRxXzE4j7;GTS+e}8leuYUjR;+j>hxP?sxFlw1#JmRJ=Cy)%5M8r`F2w4gLS#y}P
zmSA*Ymbfz)yB?{fgN7i3-*{pBO5Z&P>h3uRNQlS}xXSS+cz8Bb2=3?2a)<i!$q=R}
z9pAu`(Z(BZZpDEIjLjRV4CC^Dz1VosQ=6LVM8*36*GbaX(KL(XPE%XUa`knkYff;k
zi6$~H$?0--QyT+y5fh=UQ7O>?Wp6qGJ|QzCkf`znV%|`DK(W$_zFj8OEq`dW7Z+SB
zu+?khx$fi$Bz$-gDf3dHZWe}tr`X<Ca-2l!29d8!+3G5^W`-jfh_xqw^UAzqC=1z~
zZS*#_X=_jei!6fD4ov3)rQ!L;_SSlNzxPd=T}4>n_Ga%z`BNgwTO#_)E1;Z-5z1H4
zhG222uQyU_%SvlZzqJ0qmR4T;=|v^OMMcAM&DmyeeXENN#m!Q8i~s68*Kw}o`O5mn
z)>g->X$%X@|4qjU^Ae(ew7fIU@y6i9hPHNg7Ug^CXf}y(Pp{vL*%YWZ=n=HJ^`g4h
zGi~A{qqIS!;gX;ij4}Rsl~d<bDyM~1O%zqZVwaHeTk=hDJ^xW&13!my#>xEU9njs{
zSO~w`FN5fb>Aix(^4YfZba*T9Ru81U&G3p_p{(L1Zc1<uLH9I&aKvwi;q5N;8vy{F
zPog~N!B_JIPeRv=dubL0>+oGY@sC+VFM<vDB!2S`(-c(AEqIGRWZH0a7i?2X_{CrH
zMdmrYq+bs3MCZke&Y}&*-jO&9{`L!TzB$~XA44|DD<@is+gsn<+VJ{``+WVyW>0xC
zx!v{d<^}@0@xwxYw`y9Vy1Gp|I{HlHtE&|YOyk>0cxv}%YE|Wy>ktIfpWo4vk_#h|
zndMrMLh430o?HKcQ0(neIizJ^%-R^lTIm&W`!Jp8mr6ZuCsA<=l9)b`-w{9gGGF7~
z)DC1%ZiYE}P@tF)HejIkaKkV0Oq-Z79%8f|(8hmA<HU7;zQ+?_HY~N-lmSY9R@w+7
zS8YxRuS$(h(G<#{ACILtpY3sqpxy*WE(;MNkWJ7qQQ1f5xIZ_pb0=h|7&tq~$SJqn
zW|J~mIN4x8CKb{UtC(J!<RM5fy);P-gcU2i7QKc@r89Tp!5c+s01R#lFJqe~&k%_}
zzB~5FOpg_Rb76fAEAZxeci~y^SG9W;f!Itah@JIb2X<0N17R41E2eXHw)6hr-Ma(C
zip8VOvopu@ZEwrh34E270W`@n@gr{96jOravSX4~@~~JM%hZZ<@A1&R!5yeua|gm%
zB9NE%jnNi`VZc+|FLpQ9w-$BbfjIcMsz6khgogcpo~mlujq^#`;mlDcLjNzS`t`n$
ziGO-UKPD_Z5_dk=nIJ2_s|_)iiFoK=za;r43a|FUDJY1CQ8+C2$rI2)+XLjW+iyL~
z-C+{m#209^g{(OORRs;inhM9Gyfj!~ht~KB*$-xQy1FW!!~8B8z7@u5u)D73TtGCx
zRcWh#i-J;M*Et?#KdQwrD%s8j7NFcGf5=Dawc~vr0Eaz10N+i5+3M=b5Y)%@?QU<`
z*@LOng2*U9sck^cCCptDB)4qBEi_BoVQJBCJC%==WvvLeV7))!>=RKv@-B)@ypfCy
zH*v7vk=jYB_io+J=0<N38~@1wj5pTnOs&^{mDy7|7j|KHqt7_4&7*-73l=I=Jc_&(
z#TVs(y#o@X96X`IWs?rR`4J(7Kq#wiuz5Q>d%gSh*%^$!s4dRlWa&>)Lg)Rk!4t2?
zSrq*g=_>@`c4?ZTszXH2*vg5Ex55%k!%$~hiVV7_Myb}_=yV@3CSgsb;<0&=kG<M|
z1)-rHq;zHqD#VRcD_2+V)o-7AavBTG27h2&1r&cOjb~;i6C_5=@Q5qn(q0#bT6-xg
zcU{rUT(c>0-l8sveh@e8S6>Ll^OmD<UzP$F(@{AIKz*h9b(~Jb<#uY{(tu!7&<p9{
zQCk>4WwS-9lq@bGH;hn@q^b5euvVUbN11s?9`ftkWX);0c@(uSi(;Dl&z@bx#pUcA
z?b)7%v`msN^yB1NEL-_>8V;{OiOD_3Pb&IU1}u(K>o|R%PVrcn>sKMm5oy5O`(|^4
zjp{m0-}G$Px6<17XNGq>*wRUG;*6s68SHsr_k;i9p$z=tTMp*rG04)wIc4L2V4|fr
zCN*jq*=^gQR-GpTSw9xj(iJB_Ae9~-<Y^F;DG#K@tJ0aYs_asp`^XV@4S_J9!_IC9
zTGEg^5m4KLkt-UB5aUn}zMv-H+6C>!XKFXT;M*>E!@Gdn3`_%?J<!D@Jr5_xWbOU%
zaM`$kHho2-hNf@4?53}m=8=bg>lk+Dj^}z}s+|X*aXRceI5}tMr($~nLe3nz3%Asn
z!dF_#WUuNU-Lh++Q+6%&O-HCV{JO{1ZDxv^D!LFrpG{A$Pr0qcO>klEOYasl1;z0U
z?v@VW-NGTfTQG!o3y0A5^=`=!va`~0>@MV7xwRHm?ofMe!uJ?IH|!vPZkZzzIdUxT
zqvXcF-#>W0d$zm(b!li}rKt{8Bg6o2OUF0^I0C|8rFHoock8w-YNj@Ob7(6u@D(aI
z9oSnKBmGgg>8kxDJ2Jibj<HzIxr3qWoO5Q@g8PQuc)tC^`U`IkMKdS@150ddJwgSo
zUehkT=vx}wp`@eAY#APZyC#pj>BD0;I+V>$g9QFD4rQBe`bx%5w7~Z^pZB`U4Wmpm
zxsA=OCL=>PUbu-7_#o9SjC8FT*lysZZsIq<lr&doM=62#EAqGQU<-B$p<(dL-fjmp
zl%CzY2eEQaPV3+~(mtE)Wyl0d_}BTS6{Kl?LdLneJ-$Ae0<B<w;GC!$3=ehu#GF$+
zY*61%9bS^q?|cI^MXbjT-J44_gzF5|h+X0eBr=y`tz8gmPGKzevgDIjaW+J><x@v&
zyiQKFXCrP)7%sL^8Bs;u7iY>@8t<T143g{KiLpOJa3ukwvA`#MOkgY;PNNLXGFcE{
zPh=s5QB2{1b3aFaBQ|j)k;1?@Yq(;r!7%vFJ*tW2GeUKOH{;eP+RiHBYGtO*0$IyJ
zbBDQ8Lj{875dfLAFp}L3-Aq_Ck{tDcIsv|FUwa-$IYu7~Rg7UM^E3fXoo?kj{rt0}
zzqW=~mvjg^<A!2|Mz-o=bd!Pj?6lkMR=0JXX5`=v+k8KN`@D<(Wcst>*^D_lB`kd&
z!w!r~9dK&2f223J(TTj5Yk%jRHrupf071*^2-r2B!tf5%FX@(ARyG^1+-g4G`eyq3
z6F%8m&zR#FA5MQyFDf44g;i{o#Fe%$ton)fZC>lJn{iP4QvTwJHkX<+64=XSe5_>r
z&pn7L9f_iUncWY0dsf5~+1>5oEHCgFNP;|}W*6gKYHzdGa3*WH*ItoYYsEfLhmUkV
zB+*B#F&eehR;&djUR*?3L>K}xWK<;12EX|rjtxJ2Q3`?+TUNZ#;K>q$piH*~U@9IS
zGPhH{!xVi2yH?oJ;X1Croxq#ZKy2C424^_YS!C{iM4{9J5mKGIcSXqvqw*#rrc)fJ
zR}t`(O2D5*2H`lC*qpw2%Pf{URIIOS0Htu`%i^VfROqI>FY`rBF}$-e{}rq)l2qP2
zqhSgEiAd!^CS3K>$?Q4_V*W(>Y>@JYX%^kUu9|+MQ)|W2_z}%SVthpw<Jz*Wh#=E_
zMH1tGwD<;HHCM4&?Mw!hnHm}e)i)0bu=4r#`itIUjsKAurjxjEpM9TwpFEs=pM0O4
zKD$8Ui%=}DWHzr1&N5I~v(My0LdM?(YL@tqK(|OVatk`TrYbd_p%o|Tsn_?`)>4%S
z9rHwS`R6H5l%xA>-+THr*T<8*^pxeLE3qbjGfzDERmPobYlVjbv4zqPPhp`G{}cIJ
zV~$B&v8F(5WRk*!)qe-?(eMU}H`1sp^@LUjV)-)6UV(($DS)|!_g#10@A5_3{JPc!
zEgic>`d*>gjjGG^fPTR}qt|=>+FD#OkIz<DSLn=&YjWYkL;P7t*fBwjtN2QHUOwS}
zbBiD}Jt0vncC3y%_26b!+@bDiIp&$;uus4&T3t1tfZ(TH>M3=^gkz4kFD<g_C&y|S
zN%0#-<cafy9wP0AjaMe$fA7>@=fO($@Bm$eSBZE9qEy`+-Pxfl$(m)h7GSNwK@5JP
zR-o4H?~`X2Onmesmh03Wd*V3GleL+DP7KeG`Uy}1AG|gCE|-^g-^t}=+pyc(Uf*2k
z^mSReH7g&8-|z42?fMR$$~)}!!K)8@yZgt!^IBZmIPBp4E{|0STjMtr`}SbpcMhhw
z%Yw0gjpqO{KY0Cm=kV>$%Xhn_l+x<KOn9{WZkK{go*nH%Wy%W$foj;Bx4Z9uUi;3Q
zIGT(cwsZJ}AW34>K#IeiFYw*j(fh;Q9ZZ{r7x?LDiWU$Kd%OSc?f&kWOy@gq(a|iD
z$&3<AO66x;lXN?<bSkm<8l^Rq_3mH?Uc8y4p?r08eE4?%3uqWgVDa+h!NI%T9jHer
z9OCu<hj;Iw|6!hq7rXl(_Izi5H<?|F7w_I4LHY0ETo!-u@=q9LStx;}muI5)_$Sea
zJOc3Bub~yMDatWkI5Hgg*JsDyz8AwkA`Ba<O}xb_`OAG6DkM}UPZK1Ve>-~h<?h~2
zsV9$ym(g`-_M_$^EWyr7SX_xqUhTZwIjm<m0+l(;s;Nc$>%~(~R8v!bH<d>p`^rp0
z4o7ES@4Wj^F7RzKo$*dDr#{|2e6#avw@v}DN|cRZc2|k`uy5^<4~eBSkSpp*kxQ&8
z>trj2s<*MJ>!_vn{!=Vf%AmNbJdDI2yMH;}-9IweV^^B^lt;RhP7bt@)+E+QtI0Id
zRtCjLUK$f4hcP5ZYBeH%MoK*(MnX9rB^s(-Tq2{?!#W$k)$J}0u=%C9B;$@D6XR6v
z#f$B&b$*jbXL6p^)v#gb16u{|P-wp+E1~zy`&IW^1C9?d_$(%(1%dGy;adaqf$sAu
zgseIrM(xHS-Pl1pQVcTNmM6q`G|ZYJ?PhrPg7$=!12r>N@9JuQUP8b{lVW;@7>_(q
z?67I4@k^DSFSxN&E93UupQHnoaU1Vx)6kWhh3>pxSN}naaiJq$rlUI!k9UsXcsyCV
zbr=mJn7JcgpRVu=LOi-;P8$zbXb*x`<#I1YSBzpSC6O@>#^XFH)UK-ZmUc9scLXK)
zfJfBjH0YnxeM+i-9QxiRBSq{q&0~}<K#R3--gs3!fBcyh%*_*7bdd0~_P1}!E)VJo
z<%o8>&U}9ARd!|*V`qj~%|miDe?eB;3qnu7spxDA&QQ39F3w8isnT(HF{r=toj?B3
zcto4f?TyV|&FWlR-x|*KPwt(a-AR1m_|EqqG3c$cv-ci<9#-*JIGhy`|I)?hVVn*5
zV-FuMvhYTH?%*>&y2i&%d@SP0NPJ$$=h^jyKW!kw-og8C=_!1HPs3;wi?7@8ynFm5
zJ&ds2U4slvysOCw@zEgTIX<g;&f)2cWBC0!{CI1WGQwwF3dSaTYm_p?XI07=p59?8
zpTUoP-KY_NcFBP*b%c#PP^FHrl?S@i5q8-@J_++n{*1I97{y_q9mrZoI1+#UaDesV
zrhz$!yI=7BLTZn{JUHCv3GwlRK?Qcn2TcX`!3Tp1?7$DI7HsLaMrQ1oP(Mf5#84F$
z_2^N4J;xS?kz}3-Ne*>Y5sqDWJr&FpD(=A0y-uiqTOMJ@g_5QSOFhqS&clqi7mFQg
z{)mu2^yB$+dIasC5+jAfbb6;*YdFiYDB;go^eEy~oFjRo7+rzsd5q;oM%yuSq}z`D
z8X2v_dZU7m<rvF~R12`r$5}Y+_IOPr`MklOhvIo%JmU~v6oOA<g9OYNYZ5SB9DN+}
zYC;@;oY<fUi;ek;L&YNF#)>F>nuI^jQl1%UoD_nqufw6}Y)o|>4>O+Xe3KqWqf``$
zeUzN%Q=S-Gorq5%)}H7=#jw{-s@pQgK~7a$#yAwICLUulJ83o=^TI;@bj@p}Cp~j8
z<g}9-RUwtBZ0H#I1!P;u^U~8~mS1xgI7hO7rf6NwD?+NEPYN~7GSx-r*hQJ(7MgWA
zU6tVz_CtOtxC}=rpG~_w*9-n6hQ7z2*7+0Gmj5It%m_QXxJ)xn+8C=q^yHj>#X4q2
z2VyVGbO$1JGou5sUfBmB_RviA2oBAiQ4$h-C+7rq-knN1cIHp;^kIGTdFRm!NC)zN
z{(t|^{{;ngd(YwbfA~-TSNy$>@BhQU`)}zt_RjzNU(nAUz5XBQ_d5OlU+DJ+{r(^6
z_a^=RpXm1%{Qmd<IsM$G*Z&*+#+v@hQ@^0s{|Elwz)Js06>VTee<iXuczORd{obPA
z{|)`-1^##Rn@In6|2_TYCH~L&dy_YR<G-ZeUHbiB(QhpN-&592YQ}%YlVdafN|bN%
zTK`Y_jkW%j7ebW(-}Dpf`Ro7AJAG^W#m3g7JDvR0a6qGk?6gq0-ovn>*t~b}I6F>f
z$VxD8iWa?>!VsC5q7jL=gaqo-ANgt;q7=DzFmR{u+;`^mp%q@FH1{r}%y^xD(|f|m
zM4)G#4|Ft{#>i&8&CzBACSaHqk(F-wsYbf~U{bH&)*B$cS=u1JENg}?ywVbxpBi(W
zCb%lpo5DZT8X{kt&5-Zvji4`<CeZt34UolF$me;9_}eJDve8cOYov>}CgtK)opAhM
zp&MT>BU_YNp_+0M(WCILLh~JetbtL6?@KhN{EeWuNUzh3;B77BLP`s@@OBxoyow5~
zn2$)kgdGKDsdOa0wvmA!EOg-OWrT<_E0j=9&Zlug3qp+;@xjV{^vTA4^kFIg$&#xK
z$a51}u*RmiIGbc84THqfTFBuamXRZ>s*xjdBgi+d@*sN`O4h7x5v=rovLsjO4Q~S%
zoLO5?F3D4Z5t1&EiiNFG@wOxn3!~bSFf3H{B}rIhd3%`{<YiW6Am&^q0NXb4*RBb_
zN>9OyhMvNti=@_-r9%F)B(tt66~c>#3Nh)wK8eF+N+UmBa(;ZQz>or=anRtC^N5))
zXL3_H_=%dBgw(13n4|xHn4|xgqyJpzD4(F>Pqi>JTL>J(Z*yfGKj1MgCKPH*tfxBG
ze}|nU7#g3ikr2*q_;`!DBQXO$;d0Nr8=o#6-DQ;3(M`tZ+!2)1zfv1`iktK@4MKDn
zREQ~}=@2X|*s{b^7JhQ(CY?0AWm5SNmB|&|&3A(pDyv&L+cwUBF(pG~&tctfm=n9K
z>f6+OV^%)C`BiP$rU{ohzpAd<Rn;<gS9MCeK8YIP6FliZJG+g}(P``Kns6)5hT-rs
zIy*xkTXjdE6X88joWXZ}wbWDsBF>b<NNPl5eheTirWX_t+{YLg2Z1Z15xQN7oc{e>
z#k{Cy&nc(y8Bnl)9SPIFEzLpHAzlk!<*B4|OVV}{M8W6M?5u*4f|nvu+k`HP>U8R&
z=q@Gn(bu?`GZ)iyCwZm}a?8PM2T*lWR9ip7x|M%m-&Uak)sqOA%kC<V(S*Vk!z8ii
ztJ%Xt&0R8CT}6Ye4NRRFO@4UjZs9u{*e)T1DZBJU7?|3BT$63I5~?isNI+B}jDbo~
ziW&FuFWeJ^cytTz)Uea*5q<p{`RVHF%D>h2S1HCABU`owF2JdF0fw#(kson{64To_
zRM;-`iP=XvW+8?`o_nrmPZ7}7G>m=)t<aV@74U>B_Ky*LY`Snx*uCk<)S>%Ayzj>Q
zd|QDRLD}VhvDUNN#muWYotc46k-r`uWa#0#N0@TOvsJ>q)V#9K+PtARFRw>9MP0WR
zN7nP&!^?Owf+hRmfy^5DLx8N*)Mbtk22Qo>5MWb6+{?gMM=d@rKu-Y;i%=ZNZK}nE
zlN2n7<|x5|{=ixv@~E|Yv?pG*^1Gx6KQgjoh(f%7@LmJf9eEhMHnO)ll^paaUn(*p
zu+BM>ZHs~h)-P?FnXR5yxl!_7LI=slZr3tKdF-LHot;e+G3HSl!;9qsq2x4=bwe*s
z1LqlxS5)NB9D6lG;i64~Nv9BF$=6LT$7`TY%IrI^t*7g~_3jqBjN3jw@AkG3Y1#H|
zbL$0vf<@X3?W{lVVze)7TihHWE^PS(0L;YtaeMv6`X+`Hu@^e=*vL-kb`SC9FYO;U
zUu<uCY-;`3-F&_YAJ45Hd(Sa=MBfPHY>!37m5qYXUQpC9jE;&3;{}L@esl0DGYUzg
z4^BLYaX|&X@(W0a2$5Ld1w~fAAQ;761oM%9CZfT0U%2@aYuwp8dTZnP3!`PXi=%AS
zLksFx8OC?Zq>Bfvq!ROFbycIEr0G?RAWjYojjrLq>&_kq-#I%x_;9?7CdiopB6psl
zbc@LuI&6cyi^l@PKW~e@(T8lpdp|`umAm$zJzUtK%oL^JB+a7C(-G>7t0Ch%k-$BF
z)}iuTMkBfB_*rLe-kw1%{lvXTvV3R%;P~yEZ_joQ4-XE{_Kv=A*mZv4&k#bw2za+J
zv5EmIiD>ak9SVhGf>j&JFh+)ZQXp<`g8orOs&X4vOOXM^a!u4c`={GHANcLHXCAuq
zn86X-t#8vAxBo$b62b=LJWq#LQPCEE_+h*DIkUCCX*w1k{Y~Q4UM-1NdsK?K{!uRX
z3)UOqEn*2#E5DQi)mkEmMim$8#{_%L$xi$473X!&nCMr8!~T)}J)nP&O`q_CM@M))
z`i~~U>ye1?icQ@KPHxyOD2k`-9g3gx_J<UaW{jEfs)AfIZSNf;bj>?=+P)rt3D<HF
zwQbMc!&ofvKPvsLB|73OcenlBd$!}vNyNVn-inBwwpsdOeVxbfw6CT69y_!zm)(sX
zEYLqR<U91(8`MPJpxYhjQ-O0yZU=ALIgBxol@b^(4^jEv_1qtzhu(O7_`^|S`QH3x
z!?NVD57sXm+s~iF$1m+V1;RUjdhGWNIX5>zr})X<NgJp)d{GY+0)w^N&c5_qD{ylb
zjmX*?czdoS?ywB<<-Tlx{S~8KW%bLK?eFM=SNrmzo#pmCAKE+Lz%JoqI4p33fU2mk
zR>*lR`A^6wRELMiNA=PsXY9U6{b=qrRE44C(geeY{=WU)9NChX?wjC$3mU+$?ESg9
z0ZQT5fufB47`%pM{>OGcJI{w%d>*;AzW&ir2pZS<e#G$xz6P1lVPCc5LxL6HQs+C%
zWU035vi%bxGJy<<{2%Kb_KoN*-paoO-%-JTYEV<xH`YD&XS+hp;qRiz{uLn;;cH<*
z=9D;_6mCfFDPWm|_C`^E`zzSVHnCdPeg(aS8%WMP7N%8rO%Zy?2KPKdi>z{me5v)W
zmhUVHHVZg`lHgGiZf!V72+;KB_SF}jtB8KW;SJyOz#$n%F`-TB6n8x%ie-!G^jc>G
z9JvEM1k>Tk#2wz|i?la!Na0r;{_G$a%e4K(^Xt|3Uep;mYfEZ>6sF@G5eqN~MPk?Z
zIk2m?bI(jngI^=ky##Vf5Mh)rh#vXUa(rRFVpVk<*kuAw5CR5hS5O&f$5m`CrDWYF
zG?Iz5pYHVQ08>)E`dsN|gL@e^)EB?H!aFxQ$=23RK`VWXcEelS7{>lL)^4Ks(K<^M
z{&Q7YqF-BS5luCJwiV*dZ>_RN>AwiKm?*FN#USZ5$C!v8fi|BjsSFOgH=tqX(wQc*
z#OP>rZvY`Rw1v`%W-g48^k3p>@!S~FPps*O@Gwy6&=JB}i{^b^&I)`k#ifI;6qC&e
zPbcuKO9}bhiN-+$AC#1XrjF=MDb`(dN$(J+A&znrMlG6umZE?mgp+{TSqYM+AUO5V
z-iaC8Mu$pQ_%P;hpO=<gJx%+irIIg+!b=>ZUz|jjr+jjVAn&Z?5*{5JRhTD5C8x1c
zstZC##b^o_1O5l^TJoqkj<2J1R+y?1Z!oB9Mt%&^dS8uvQjPb?(cMb0ZV?6pnwN^Y
zGyCLhh^#e#n^rE_NUW-lq8HeTynXA7kP<f34zB>^1<{4%I8X5aVgbA^L(!Hftq_I^
zuYm-3q&iE<h*+Gh2CcU|vcnnYuqcz1z^fl;(JV5a@mwVeKz&F-2Qjd4qO($aDI1Tj
zdEZ<LN0{&1r5UcdyU5BQ$=Y0I;4czUAo>Lb6z`Uo=k?dte_)L^8@4OukWuF>NpJyE
z=$fk4eR;4IV{c}-mdRLx0w#+aYs5MnJz_U$lmv0;g{W54r7ZT$goFhpfG^ElxGzBL
zImZ{djBxjI*g_h%(3{J42fEz@;x%8j%=kpuE#=-edGttj4>FmhL+SnbY&?##O2K+m
zIgk=RohyWbf0L*^97fC&6|Yos3#xSSn%z#S#ho&knssf9m`>NFhMONJL|4t2E&|D=
zI`#NVH4TJcVwrvUD?vT^C4<WLlVYiafR3Y&1aRjOPnD|@aZ5yLi4kR1;NRo0mkUN<
zCS5B^Op^vVt`^i7LmrrYVT^UTTwp*Vn?)R;4}%QRe`3y^7G=H$$3@MWMybk;kwqVy
zJzqrzPAmmX5BLIKf-%y#EQFO)g2X;@>tzV@DhiS(LNY%llK`CMx#a9LX>Z7<Ch{-q
zHKWXWA09XKp>V<`x=PEVR}X4;pcIMLFidcTKgVB_3GOQM@^ar0GjCy`ig#gGqFsZH
zLQ4&We?3=FEE;PI3u{zIdHcL#I3_DdLB26Z9`GYZqw1S3(@YMSZ+bt^d8G2_%9Yb!
z6G|K*><ldD4JLwebND%XmtvD#-Jg+N{Zg{dfFQzvV#Y+rNb9bIhctT6<sD&OMsYm`
z!}19sgc>`>iLDff5K+{7neMV=PTPJ8I?~h?e@!i|GEcNb*Ti-4TnHrBa&@-6mB3o1
zfZnoXEpZc)DVRvK)ohbYhay4sfH4shB_>=_1390>6VT!R`S%SWa^p$4V6DGtCuPxS
zHjI9&P7=DY=pRdP%g?(kM$D_Q1gyZ)AT;N3^64GRr{79UV4=9TUI`x__}yt5Afi}d
ze}o^dbaXCoLsJaO_UZkM;|V(CijF)WGMI5qx!mWyk1?9@xaqEyBXk5T94KhSSf^-i
zXBjwt>seZjR2U4x_N@b1utc49h@jpgk~f06>Hg17<<++sH*+ZBdWZ`cyiPSN6k^OZ
zjSi|Cyls({kBcS!8=8=-uG%aWMlX4Of9l5K#_S|qTf;z^bETmniDt-fe%MkL;j&oD
zhr(nM7JI*)q%BXB2HsatxF@G<+0sG>hBe6>>Vs0z$su2<F!+-Q^t^E3vPA=zEg3k@
zoUt-2goZ|+2OZpQAt2!pcLrULrNrfZ0TG-3tg1vA23O)L%~ieCRlGHb)iyUXf2Wrv
zbb&QSic<E=3$<nGM)o<0MyHk=9UN?otcN`x)a`F<=MIo#fdBYWUx7E*wZXz*vqYRf
zJ1U?B9#upm(k-j#$_2gU$ANC_!3HI+6&~9QmpyXrB7|OCLD)_Pv0q_l-HWlobGV_z
zT`QjA=`%Q-p@Q(Sr>$gb1(vs|f3&iSQ8x~4VabUySGCydueeD7dYsqBdxE}PJQ9A^
z(WgTqV*8MXj-%q_p0_HS>$e@nFQvD9$c%?9nk0(2U8SmDr)mL*nCF_vjp^97s{E4W
z#L$%%^R)NLox?#tlM3jk=p2l+^oY(8yG6Qa<Xgt*(!N>bGqw&46z!R3f4+FVnW!i|
z*g5r(;AWD<QwI9>gZKiS777_>t!!E=FSSY<icNGx16^sQdWHb5bO+h=oy=()iMv=v
zTt-Iw{CvLQuHl%;BY7Py((zRI368<<M<aHb=EY%zCZxp4esnRfN2=o|`3H7uuS$%p
zXvZA90*32EN7>_a#{BZ$f3^_N)tLo9lMd?;qF2aIdC!b8;Lq*o2iJLncqE_(7?}O3
zEQmQR_1p2vp#B4=g?~n^Cl$1RfjI0uLCk*#&EXI+eLvMj<*hISb#pRFZz2EfWt6mL
zXyt;+h``I_ClH{9W_Rt@K{B~hUrL$VP={*D26U$la8vaGF0wpke<m)GrASM)`**^R
zmm)@Vl7@&^A2eC**1wUz(HG(0XaF#NS1uZgjy;i-d1Q71ZR@IH5E9L|6M@z?Nsyg%
zPK|E%Si^LIFZTx1h*?F^NI6)v9d1>Pk?&CFJ1jSVRDF@P46dqD<i0Gs3Z9At%gh`W
zR-Wn3+36e)c1;e)f2gOWTa<UC=awxkPEI`$dis98I8GkuJw}h61`&w?UHYq1JPa{i
z_)&ia<5fkx;79hAR{9bVUsu*|y0?*n+*RfT#p-HdT=&)(GGjQ0)coLcPjO^ovQ5S|
zwm{zVBd}`N41yLnTK`sSK=)@LpT@o|utxOSP?QwLqb)|8e-$L03N}Y{zZ94@I*@_>
zG)S;9Ypa2L4OTJBe6Pzaq2#KPjI@VF+7foIE%6UVVujIbOZdh}Xkho+l74F>RWQJ|
zgfESRCOEGx?FS>R#`d+P{L)CNVS#Nae{ZDJh{Cp%KS`K;zVG|N#c*=aC%~K0Ng-$7
zKH1l}Lai0|e_@#Zkf(oNNiX$ZmF^`b5c>s~`mkd}l-;}`>@kvs(bg#rja-{D3jC<+
zh*g9Z7#CT37`QNn?&sb~Vv3KxkuTKwKG?~wlf{LEA+vsR6X-T1iX|%l+~}Aum-Wc+
zs|j%08~2R0MgPh1C7#a{R;E;uTh0?@!!Ek%2`vBPe-@51d{oPS!b1!^K`3!YEM)m?
zimDJS$mAHMB0x%iC@iN^Uyi0q=}nY@8XS>E+nU7JaY3t3X<gskG-vr2rkccC+8#-a
z;GB$vaQQRdSr>(*vM5j<MH`wP>5WD$zp-B>z6#+79}{Cx%N0=Qh=M|nDo9-<UaedW
zb*o$Of2=~HwN=zB1`%16^N|8z{jbWp8eUBE%hGRx6Gym0kUrqV$#60woX7kso+5Yw
zHyK29Iz*Qhu67QCHT<iJnWKsIEAE#I@=3*`L|I4q39X3uCad(8AEG}zz!tgwS_NO$
zJKRc%vcv0n2bOm}D&FlJTIEXj8$De!yZViuf2N>k;I)zV1*ww39M{mIzjk9t>^bt1
zMjA?RzZ>{mc>QoKfIKow%9G1Rmc#!ho|Q5l#o!ww5EjM$jZQ1M(b7qtW@4>>)LMO&
zY)VU{_?46%9X-w2eU665B5;^*vB>>e@#xohy-r?|U)zkVsxin|^rL6Exko=%JOQ{S
ze^H<TR`vLUOpMGn;~^srvbcUQ`BfkAqYWO}(ZOb$VF=HX?)aTHj9ff}ErS0Mb2%%m
z5|+8l5;LlXLD*kP$AjS{4)cNd+ZOhxh6FG&{z=YO6?a8M9KqPPQqk|npM~<UBbMfd
zX%J#$c<hTmQ_K-me$UQO3B;OEXGqPhe~ap1AU5?*`C6I{#2zj6eAoh~r*o^hX<L`;
z8G&}?JASCB!@P9ZEXex#XEPP<MH4;4$YH~P8V-Ab6x!Z4H$6;vyHsfy%8G}kp8RK1
z1*A|3HdU!x(kM%N3|n$S!>pT#Th(RuWS0U<@%=Qp<&9br6kK@@w%$kCWjM{re?&Zq
zAPKC-w~&hL!fER#P`q0Ni{f1TIB{A<crl>R!v3>oP*mRLF@^IY99|hQhM)2^;@L3G
zqV{ERJ^3BvE?Jk`Dc{(ZTe`}D2Z?2ia%bD^uc-d>YPwg`Dap#RQ<5h<yZ{AzY#F5S
z<7aV@0Ud=M7lX#pq5}ip(5WJ=e>Is$7SHvGwf1<ajkG*<{VeD*XXpAnzL=%6yf&&n
zdNCFu=v;bZSm>h)eg0B9WH1Zgcu@+79`#Hq(xEWqj~tnWhf$zYcTSCJ)=R?bSEvBQ
z{|c9H7A`1-trYUlqj)|Q8M^T^$Xay%R65hxG?v4j;b2-He3&f!EC!8(f6T+VJv?C&
zLoQFt4DLiFdU+|Eo$`vdWtBDmLIsVD?9Hy#-NqbVW46ihG~6cSsa={xO}*Vz+-A=z
z;eh!XhrfZN3f>sb1KhGoQrbY%;(|8U%WUw1u0C+e_st+=9g4?kkls%|%W94Xurb1;
ztObYCu{dSps&B0MkuoVpe+?fVoa-6i6Ut}PGLGKKbvT|ktOvZZhlk?f0aU=4F81^h
zT)*jLd{+i&tZ_GITZ9OZ(~h+ynXFYZ2SnJA&^+EX_O%<PJa}FU>}kU7pzj*0l{dA>
zSK8DJcT#e@m{?Uxg>yuQI8feCc$KLNmFlIL$g3QdZfi2{)i&SPe`Vx&WWx02iH`s(
z@`1jop~iz?-?(kSXGXmVZ|Uz`oBx$k;W(Dx1X4ZI#)-U$0W2=!r}yx{&yan`DK(04
zW{kVM6M6RSl<IKMGe)$MHooeD2#r3)#nY*nB$YV5i)Tsaa~-KT_8PBh;>jes2q)?Y
z#Q-RXO|7E0ZA9AEf2}M^F?WhVK?qdG?R0Fqrx)gGX1l+`YKoBZ8o9EHBQJ#l(2|c^
zcE+VGp3Y40NcYkdpI?ZR@esP@8P=2;#(KF55|+))3(W71J>+8?Q<rYz;8)meWvoo6
z1(iW$SWS}!l*LGbj6rS2=c4~Ss|AG-o>_LrK-A%SK3Pq=e??;3fEvM(lqx4`p|F`o
zHT=kxb5xO#;U@mY^M4|`Fv22>HyK$+6li#3jcJaaO|k4Ba+DP9^h4WQGxoXZ?^P*=
zCH8{M_q>VG#|R?^G(?NiIrm&LLBpxXKr|H*clFn$v8ZOEX7E~(2vd^+?HaxE61=*K
z>t_2lM6XihfBD#T5ZD8+ACW~-W#MJFFa#Dzk?cB7LehtjO<C*qG9F&SGBKHO#UV*s
z(Rhs4B`{zf%lgKcSq8{9GMUk9RudN6=rjye@iR)LDQPK}dRluN*jd!DUeMbj9t4(B
zm<(Gfur`R6>A@vNIiH;3<z_btSdm&@&&Ft<fr2&~f0^rcuUDxgO?E3z1>#Hy@ASBd
zn1Q4yEXLSMw=bQ~%6%6V2eksrohK{grs+I#FDvX|Q#@81EAob~J@lI|X2Crz$0w&u
zs?7e0W9WI#DYK|@kR~awjD})DA#UU$JfVdex5lTe9>fz$yHOD_9q#Yxn94}GL|ud=
z<CK{<f79?*pIE^+I*x&tbO?svs+@9l3b%w_={Rh*8EJxoOZUL~dx_TaF%Kld_Pt7z
zk+^wZSa)5oUDorTQo6j;#L?H+miS~`qvE4^Q;N^(J`f+&H6lK!+eaExya+=E($|;p
znqS+g*K%|!eXGJh>Q8#WfC3q0RI`ALFe<tje-r7@qWWbuo+z=q-dI$6EHwj)mL@|v
zilte8J)&r>4jZG`f@3yijAh8l8uO~&t;8U0D#@G$a^{uUw;rLisjNrL+=lq2zo4C#
z2&a$eZcZ%buZKN-RCdMOmRP8d8t%q`sE?{%HQy2@^)W*&qZsCDMyPn9n0?_Cu!K@=
ze~^8aXrwyjBgWPqS@n~OsE1p%(pu+-W$6_IG{s$Q$R{bAvtn3{pKaQV7ZdZs`)7vo
zEN04;fW<)-1_kyDClR{4Jnb^V;hf2|5<8Pk<c~3aAK^cjLDV0mMAwv^2Wx979>&Py
z=Ih{mbrp%q)jiSJJtwVb7~p<rB=<vNe@{L>85<GOXTb#O9JQzE6jYmQ$`^aHU?u=V
zgx9;=vtQul_zi5l?@Al*nb*Jh>`oGJBRAf+!QIKtY5(Hn_B5EmKl52|F_%T1K`FaI
zr@#A|qI_3oJPPuY-BS$re#L)vVf&824o`zK^4JzWhgSo4CY=e6(3#*2O7LeVe@Cam
z)qI`?8Q<-b-2f5_y`HrrSgUgu(?=Q^7_zL5Aq41VjQ8AR5D!v6JV{S|={hWs6rjfj
zlat}8f2qzn;PuSI?NOY}qW)xcb<D5UhWyI;qXb69>-I8F%sk;p+5yF}{oxA_-;`i;
zB}UE8(Q#`(9Yy63uSJS6US}f4e=F^Cj)MXeVm9N)jpwxOI;L9OkHN9n^s^ZovI!fr
zk>}x_dFXKud87p|vOjXNfRDzUHTtr7b7hL7ro%@VnVh%yWXL|Ag35i)+ohZJ(F3OX
zD43~M<b19=5(>LsUDd_Spt$pa$l{}Qh8Q(JW;D2d%5Z4?kkP>UIm4m!f3rD^x?7!t
z(7S_~&(S#ocN!!oyq^#lL$zl*n4)T>rzwo+h!ZqH<ky)uhaKl6(mkNI9p*%YUbzJB
z&Gl>pHul)1ahNlfcfjIEMxcje!ZO1O9j@w<+uCG+M_#b+^$~Lh1ayNjWUS9`6_P~=
zxg(J~(z!#g0SH5#0f&8ge-q6~wxmsE+SEk9C`Ki`6vKQ-?95k^hldq;!20k|+@Qrp
zbQ5KF7V|D6KOLCIW4U`EN5j6w@K0C}(XbDILC79dzBCPqYBvOGxMQZKrQ8&>vS=J-
z=*&m=lYca9Q%qa!mLj)ofNT`K(SZ-KB2#1}qagBx)5Q%|Vn3d9e;HF;+Rt!`b7HZT
zF8U=+7pLi%79ZlJ;!WI@!!CvpGk~}}{z?0cqd>XW8;HtHaMm70<bGjxFItJvNb{o9
znNTrA8<k`r-uwK|XR*ORC2SfPymR+N8%qf*sZ$nFdvvY~6EMXv92OiR`?q*_P^MV;
zXq0fHOE5eJ@UlS8fA^@#Wq@keJgZa&;#q^38q0wQ=o<cy$alju!;Wro{4_N9)0Tcv
zJze){_RE@iu3Gj+S6X2ucu!WNB_>KiCdFfZvt%;1f>M)Kj-N!zqM|o?GSorb)Jq{S
zQ)!Ne;v%YMa?C$?Oreu4qtifCP*a_5n$CI2Ej~+2t@(6ve-Mqa5YR5FYCmFHoY6$5
zD<a~+yUI-F_K4^Jngmr-F2fI>4{!ZEZa*q+)9gydvTuz;Sl&kMmWj4359{(MBeV%R
z4{B+HwXA&|<#~7!m2OBjq%T^`k*oQ6TE=2!P6cx5*47%B8QRgv_1d#6R%f>l4_0e`
ze$#?e_}K;Ce<1!iK^M2;tO)?VXM&>_yIQWGQNwvUx-(|~QTZ#7b{K`D$UuuLuFNEE
zan^plZ{RA1`CT%6EAjtK(e$xgGz?u7UK`(!%ijrQ@Fn5+7>V}EiKg+?yfr#dvI{Rb
z?IbC9PPYguuE2)RJbBt7E7}WbbbB==>5i79<b}uWe~UpFt{^@DxjTb|E&G_0LPUSU
zlBHh(lPJH8$AxS4#l*$EqoA+xw=1DEnShBz2UO**q^ZogYhA=bxfQBQcRb<-rH=bK
zp(0^k@XfFb5Q|_z0eDMh&?L4R63Nn5>acuOR>M3o7xrX;4l91FZp36gvFtM42Y#kM
zSIOWne?p;?Lk*{R5m7=T5F?2f0oUnGglB_M62bmu6c(YwQqS^90RQCHZy26wX8VGt
zF8O7{M{@ndZ{*pUl&Z%^vr2ka)!<X9XndiHqZMe<I4y=aBa}MCC%!xRv>5_B3uB7B
z(^CW{MbcPvF{t9_HH{(6YK-4x;~9b3R>s{!e}^vHTmgYEz-#87rPax&w%P#KDP9>y
z4-E~*hK3_se;1!xvni6^8tNfkRPJ&MZqycWC4kgdhHEznRB@qsWWIgn7J6lHJ)YuY
zH3b*&AP#CtkIkg-AgLkiWtu%R%?^@LIxqN;TqWsk(n6xS86|2sz#P*w$s^e-?bdrx
ze?(v(PpHLVi<2ZaGCZk_p-{XIs{RFhM<9SJW&PYmBXEug%x#xXG`#TS#RUjm%ELsw
zN=FeQhR_2~f>ELh27C5mzhSX{fuUTA_x8)R?#B8Sd_4@7g!nO5`yWaWDzN5o*YfJQ
zU%yyeLzf@Z#l2A4fAOXiLV+G77m=YOfBI7^ELwta_`IvkrTM0+cnND>w;z9&^w-v6
zuLw|)$}SKnDmsaEI4z<1eOnt1^TLwnL{oZ#Z$$0qWwU`s#nZF+)?>n619du30Tm`+
zob#Ry(C(kV!nlpE(rFy!a&KsZ#3O<#>YYY9psQqbz=kg9p{;wh_hUlnji2_+fBuhU
z|Cjs_4EM%?TX8?At-CSbmL1BNPqFevi-c)?0e|tRS6Z(pMz4s#2MIHreQ_}2Q<mXY
z+v}&86=*^nYglW^av3`7?oFEQ@ged&s31r^ex9~09a2LPuKc2MiCxcQ!)-HNKUXTl
zhjYXg=xx;#>p>)RmyU@SaIYfifB8)j_sB82T2VL}VS~`YqYS7}m=2Y&{m#f5Ae<mJ
zvZ=<J-jqP~K3amsv<c@6eI@zt&HMZhWU4_$7)gF=@{gT{cNq1sT4c#94$qwU6z=O<
z1TPlv+Xra#ZL|iJQS;fV4r=STsEutx^b!i(#X<#Q^R(L!KL>I3^r>RcfA}OkWqA<i
z`{BO3mU@HxIl5QnCn+!w$hLf*D8Z6Qj~1%un@<p$Um2~(a9u29Y2UOEyG9FWoYX@7
zke3-{RG?fRKeJ0VW#{agU9cN=$8Omf+hs@WihX3qY>yqVol^OKx)kNB65lC@@^|e?
zcpgo-M|rE`t0QU<aL2$Yf3IQwjxeB-xm+3_)K*_$<Wrcz%cvD4H*uCG+z@cem(BQ^
zqS1w|X*#(Z$CC-HmVGV=jS^jFR*auMcQDMDygtC?;F1>o+`K<X<n>H~bIIj)j!E&9
zu6QvPnRAYw4q<i|IBXIKD4?0lHEWAQtK1!W-k|msO=Y>axh*F*e~5&PYeTuW0%<p$
zgfQ`+ojh?)pItD=G2VUOciVsPo?TqiYbY4B8Q*#8uyNpgpM9S^eX33lDCU{tu*-mS
zEH*_gR16g?do)&E9IKV7&}vTB*}9bQCmZZiY&lPP+MbUy<T`NAgLmy5qa=8qI4Qaa
z&I!_o-2^o!qU*u6f1kHUG%oJ7$L`d<*i(5Ow$?@BF4$--xM8>OU3Scv-Ff}n&tcZl
zs&OW-=*|N7AUGLG3CV7usp8>wO_u7hQ}lU&PB=iQyWQYSl}lZP|G@yeSAlyJ6koe%
zs<>SbWPh0v@S1`g4X@fo`YyeVvRBY2ph>DCab*(GN1pwVe-nmfMLkq5#4U>T))Ezv
zuIRU_`SH|8C|U>tf-B?4K+*^l;*ryFP@sF@M+F%}%kHtKK>r>dlz2Yo=c}fG$5*s3
z%jJ_HdyfYoqK{!k-@}{7(iaf3du8yQ<F@z?Ym8ZBC1okko`+FslofSDD$@uVO57Xl
z8P?W5w;Xrfe;o`<a#HNKzy0DgIOY~;Iot8b7g!1ajID<pZO;De;X&e40YRQG)5eyx
z@xwzb(;j<1a)Y(oVGT2uNa%x=<F<H#+cZ%Fx*JM-B(s+A;UQFrS>gck73>JVb6?@=
zQJNmosuw11SIp9N69oh7NgL`(A0AR!4?{TEc?ppOe<p<95gHzy+?dh9snhJA9q6F8
zj?Z~Ffmy5#pyf<Uqzo(1Dq4DZnq;jj)AS1jyo%?Q4Ww|8mD`%ngY`}a*8A6{r6&gf
zH9c;5G{3?K@v5|aG&OV%#qLQs{||>zo{wh}zjYW5qxc3UF|V$La?OMm5>WuX{*oH?
z{f>1TfA?OU**<bFhucnE0ckg9bkBDs&7tq?oJ&L}?i9$+|J_Jz2JtS1{}Qvvc!8qC
z;NZkEN0NsJ3B}K3zRDEj)}jq_5FM;F?SGLwt>RD6aTrXcc2dHRR<phiw~*9`!YCyo
z_BJZVnwZ2oGc-MkK6J4es(wd?-KAOcr^Vqge~Y#_Q?Io{Cisy$VO~v9f@7`lIa(I~
zTz)MSzq0ZU1P#`UZ)C6WRiyk%h<SV|XyBZy&M_#E({-E^@D-kgaHk@Tre)dlG<q_Y
z{8Z*%&8x<Ff>%Kd(VDq-{pX-^6}W<%6&;63DJbIz#<$TU1@r`mQhe{UE=6Ff^C*JR
ze<i>y9#(pC*9sGi%*YFaKER}uOd_V?rOq*Yk3Z6R0gs~$Ini|r^R)0}CA^4Q?j*j7
z$TKkapFO+1y=^Dc>mPFR2^49b4YM@QpK`)QNl6i7^dwZ91r3a7;=!>ncvg|}2w7i3
z(eL8qs%6F*YQ3T0&mqnRAKIJ<J)6^pe_kK0Cq}JL`YOeJi-+%e#iMEI;^!jUAGs&v
zGk#NyIjLe9sVkt<bh8Zi{`;gw4hBAblO?+MtyvcPttax1=?N3`&Asn26a!{!wMvHU
z>v#~;wFgw&UVqUux56EB9^%==JvYxN*5y@yFL)07%XMK%Zsk+%Y^&|IEe^E5f5*t#
z<hiRY(QTq&v+QKakQWm~n)@E(_StOJZIR)$AFKrK!XU#hT*q}7RbjENW)6dHBmfLp
zia8<5T7)_HEyT6QFtRpo2tiK*5h^^)c#NA(_oTquPGAW-^>F)oO2zo$+-4<jYlkG0
znn7VwgrBCez$LArX4TRv)*K90f1a#iqk-MfHHH7C4v2{mV3U$zy=^?UT%*Ydm&*;h
zZN!oRzS-fX=|P#yT2Hc+h6jjaNVvC_uslfD^pIu7@W@6gYssRAHeoV7a0)A)yF3#z
zkB5Ie{EMTJ>kg13GS^-JwTAUee&xJd6~|Xx1e!8C?RH!8zcC6m1_MGWfBpovelGa{
zu(DMX^}3BkvE@Vt!}?+7I~b)4-X^>!GT9Rrp9C8bG{i}bnk=x-ttG=R`$;)F>$O_l
z_}h7bs9vK6DH|wyXJ#{ap7--wIM?nGi$t2?H?b(0=}=)eE-2$jwa+K%@Cr>zif;Se
zcOGdQQOW<g7&x$vAjw`af3X1VtL(DTOxeJJwJw5k#^EH7K!9r3j(V&TR1qPGcKBG-
zV(kfH5%wp}nvk++M9oKQ%{fH@Zup8=GTw`f+=^OeoU4ot!e`+ewOfjnrsp3^lT)q{
zT6k%8n;Whvjo=e=?W|(&96oD!kC<L8))INr6-Zk1Z7DWf+uSrJe_CQLhGgMi5(qh!
zNbN27^Z<dMctRF<jqWfDMnKgjhXLuI+x=#2^jGM^T#kfDvdK(MtIgS>p@)?8(k=#k
zWz}V)#NupNqKG@e6eLBJBVo?vISQWDmRM&p)t|AZvFf$6jJ&ex9w`7#>%E&G&hntL
z0w(1Z(AWH(7+me~f3eCe8iHqc5n4w0C+RAvC<%Rq`jx9InhMo@P3}d%`Y5XmKYyrg
zj!VnvtgPcjZNAPDa``FDg`4|hNF0Iz_THKx>Y+to&59<AGt?)N#3g!(CWPcJlLQ@+
zd8JAp!#-xAkD2ey9#)^&ChPb^*^3%w^UM0Q$(%*gD5Q|5f5e2!V@s|{+9niMr(Zg~
z-E82rbd3%|Wvn^q;7+^}3toYSRlUW2+4@4K)}z+qWyb1pws>7o<vw<Ku==X~x-vu1
z^h*|qCXcw^gwS6s<801%zf8Od%6^fQvv~OZQUS-QS}f<9{RDrZC{m-fP$HSG6dOy9
zV{y4{8@mmLe+TrZT#}fF=$ob$Z#}k_)kCpsdMI{JVOaXc)yxV%tEQvqNL~p?&9G~T
zp4a{%jqxbhbeX~c!j2K2w%9U{EP$2owTO%i5ji&lq(Zu1?txitAL6m`;~&^dtR-bC
zpI4}a%^lqr$ZPHdFTU|S&naC9Y#Z60cIo~?-{~f1f0L5PNXiK!kC8mRhB4me2YLw%
zXTp+<C2??1U~Ko|Hvi8A(zMcH;(1r!Ij(fk&y6Cdeo5v8cxQzcnoL+1`1j#(7)@bZ
z{_yM%5;;j;B>VM?Vg!uh!3FMlWP0Cue{gi{%;zi#8yttwmPYe=QVW-Uatf2E*U##P
zT_SQ!f7!50g(AC0=RJ-&ZgZ%y-sP6=Yh$wD<?Zp<z3h^v)XE}*Y2%DJg_6mlQG|!u
z6GXg@&F7%>6^|ktN~bVFIILKts)~vezk?*#4=ilg2UhrYra|?>0m;xe(QIa%_T&h*
z$`QHPB)Bibfu&4?ip|u;YS^wZ8X7ViH3Znwf40e<lz?gp3U|ng4$SO($x1Q93qjuu
zgplM4wq-?4b_)_)B}NWiZi`4&&>dD=e1vr`-Qb>*OQo`P%B=N#LIqj9g8MX!FXAMe
zP`An$%2e%K`cpl!b(z<Id7Yg^r){&I(|}$HNKF=VF)|Cv@sn)VOmy#xPBmFNnMBf;
zfAoH+-k@MXQ1Nhr!h{FbA-kqZPKK){PuQ;)63H?Ob0JKIrhq5mP?jqRcQJ5GOzgnG
z#7^+q@WbKTSLyXMP4JS25R42gL$ujiUCrbplaO?*f@4Q%DyVanB$!7{66rf7Jh>^5
zXMo|5jOnI)zVg;}ICW}K`0lj_lpoILe?Wi%b0^Rejj1M0`;016UZpYN9X(S^mFBie
zbE?$D(@XgZG(!t5kQN{(jHT>%j@PH<Z31(ACSp7m8Jctr^;3sUgmfAQWScb9B@7&I
z0RQ;Ts$7-tft6qY{o&epE#aC3eDv04ri7T7izXsf9hY5hbTmM*fQ|!lzPtU_f3qOR
z(d8V<fKfS|W7+umey$NiXITsimcF<jXn!)l;A$b3$xSmeP}@QHYx|r*5`x@IsV6JK
zl*Dyix|7(R<<S?r$8XZ?&m7yB`dF0kA%U+W#a;>}0>);zx;kWIvG$xDdl(1Xfd(M*
z1riB=i9{V@VAsS`tP=w-tEA|>e-%QUQ?IX3+=@RF6yBKk<EWy_7^+KZ(_C_`e~fwe
z9`HwItg`UQcv70qSgxIO6Wy%{EhZW;X>ZA1f(FQRFodzWCrOgF`JM32ZJ0$#l#7Wt
z3~C>s--mqXa0x$dfB*zm9ply4iNo)k1>Xn&-KQKnDHwa~azQFl5+uCje+)it(k);$
zPPOuKF8Vwrbwl-M+T5S1wLhnGb{&v57lKa85JiGr1lLlbVmI&`*LCcz8!Z4=S63#y
zukMt)xVgR=NzpI~X1UN#?k)G!+~Niy5b8IxsLv+?fBMeqU5?gScjP(_-E7obwih%B
zg5<WvmlxhLQc~~<64omhe_{cYXeY@G*yt>{ZR?eg?ZTs2CSj*_hQ{GCTd>PV_lR8u
zpANiT!s|8E!a4hhrlbfgEZ4rKqK;%yRjA)1U7W{`19Gt+A;1AT){9bc@MkdO;<*IG
zOxv3)-d4Vu2po_outh$8c=+huUntF2{X$<E5*&L0v}{tuux=I4f3D+?(WvkAKd!DG
zudZ4EBb_~&_Nm#3yfsSAfH|!{a`HX)aj>^$7*mUx*EcgCO`~DZZFg90kK~gnDdeZp
zC|$49>vf*@HtLCC&dA2K`Bp60qaX{|6VS=BYdH5D1fU(o?8aj|!9km^lI$J))ay6)
z_&XJPWdgtZaj?Vje^^jExS&aiD#8tO-U~}v!+2BYe5He%RF+p|;f1n%`Jzhl9>~6^
zT8eQ~NG)FPr8yR8gd#2v$YRqV&tepx$rFjpW)xpJ$B0)~pZ$~KobNg7Jd4`};%Ua-
zp!kaX9R1=iXxqjfX;fD--bDY6@SH-Kh)ANzWh2tAp<xu{e@G}bjHCp;n~d;AT{zxX
zV0aTLaf3p|AE_hp7O=rgra=)(G*_0K2hMtXyWQP(SaNMQJL+{2BOQcWE4c_<FZkRB
zhJ7zYqMzI_GKBS$ySZ=@Qtl$Ky)OBS_{r_O=2OxiPS6A_IlDLPy+G|+>A*%Jxj?AU
zIB(xZ;T0~df70#jI=qTrhea3^^GTXs&8BX<-L7DC@(<E@Z(e@9#|Da^-Lg|}q|;Xv
zd=8&T3Al_WqhnBY$UP~!m3E-Q;Bdf=PJR9-D3RtSccMI46sA#hWg!t?D+0|2lRP{%
zq2UnN@6!Kpbv5}cqcFgfIu1%b1z&f`-w%nzmp=KIf2PSrzrZOG)6Ag+a>^4MV?*YZ
zmK)Sm%J&B9B|?JB-?Ykq13&h{DNHPU&Fhwl_!A|=BrM_GZA4*6&?q*K2%MPGC1-Al
zfHEVHZKbhOAj}5g|D&R?^N^AvV4|<$W(Sb~xuVYsK0;WkuXIHJz^+%9e`IwJ8*u-w
zEAN+jf5`a}-@jZn_-Kl0K_0!>I|wR~-wm+K(L4<PlTLPNI#Jzs*1pcP^Ia|+G{rda
z_o$D(yhAe<IXL`1N9CrU;pjRp5F*d!)*0tt5lu^64K?+`$*}Cah}2c>V~zX@BjU(l
z7^7LlH$n=k<LOcb)P|sb-cJ+GRvC9mmE{Xoe?<;b%Wl7PkW?GhzF@{oxS>^KC30h}
zQv_S`0|st<tVe*xg^<SOIF}?|EIVc;<j&#}bDdX!9+%=n5UX$;DkPb}L5w{-)T30~
zeFG<qPrs^id|3n1#-2eawG;sdxnv+0q^|^Ozkqw2wNY{6tK?7v8qP%Ox`GZeQDiLy
zf4`EX^X3vV$lhr=jVbgPml1sECxLvfoY$r3;a=)dSQ(pXqJyjn#;MCshHG^C*wF10
zHML~T^9DZFy=7tMas&jHG&Gvy6|7Kzyc`cvjKF(Y6*LGEyF6u3kry;6GEZnK<_DaO
z856ngImv#(a7ZyCxY9T&fxyyEJ~o9ie@x2KfP#e@CpO8kB3(>##N&^}`jRPep^s&7
z)#D__)z%_NyaFV$*!H3F3gR|7Ht|A{f_r{6np~k0!^QJ;HV~55$0g5LOZF-b`&HH3
z40ee)`v_V|2VD$-ETxMG<3ZL|x@;KSqt0!!QM03bnD;g=P7?EMc2b7^ADG$Jf7WuL
zxmxfz(3hw`42FCIkdQM~)ve^|)0~kqLYh*BB724?nX*wBK%fLXf^HC)DY7c*;p%Fr
zi<+0v_H`q1z;&WIKcVEXBB<Np6%n0^q8kaQ(2^F@4s(Y3=?W-8Dg0j)21T)vIR1nk
z<2m%O;<kGCjM}qAr=)Fz=7<9We+OwtuW{OY+)QkMCaDCG@Qy+)g#XgYh{mWR*LTAy
zJ*qgRM@ya3Bjts~QOX1W0y<X-0u(e^^3J;7c(J{{`2yzqtAIx*Pu{gJ+i%|PzI$!P
zET^~oJA1q08pVuiSh`4fYjW#K^zcx&UN#KmEzprlpTRoOTa0Kq-1%Z}e|P`*?CAaB
z?#^qFFmK&TKyw~eRuf@{>PCusJQ&0lg>QT3Qdl$LjBSQ+N%oCl=f`9$F(CyTh5#uU
z6dXi>9?<;=cefaYh~rn$V`<lF%m=<$o2O*xB}Yd!b{RnuLX-WzOg2cj8rvs^kWMH>
zaHPVnlVH~IH!`XCqlvl^f8j{>$hc(4uiiu3Ouxe9uzKYTWMb5zO#Y~Z!cpi7h|er<
zRzA}Zj&4j>h8}FV3Qr>QlByqbNZYu?H3#o^4|k5=9_+&k|K{!fTl}e1MFneU;u+E^
z9NSs1UPk7Y^3JW1Q}}I&^D3Q9Ms(;k#z@lY1P}2FWp6s%?+~xoe>>>mVF{o1wA)WP
zxJ2rezJvC*wC$^_Yik@D7B(Ho=XAAE=CN}8BE;{S<AsvtJFF4fS^`~NCTh1b#uacB
z+!JJN6>)S}vN}^}Nn--Q!sgErj(|{0x&8X6>g6%A`2$reQ}U-fH(af1B=K17Oha|J
zq1UGcMRC0`snr2?f7O*`LAj4;a=%)4WqvKBU_l?KNc0n$%r(UdmtMvl*eZEq%?7|x
z6A}-V>@ej9ksp5EAtv~R@*UTj)zwOz+;VKnft!{4K=9`Xdr@_zfWzy|O;3jVY8z=(
zXmeEOzByOL$2v3~zvQud8)RXU$5;ulSpM+fR$pmoUh_Ibf6lEDu8q~fw%ImJq49<1
zRSLHztx`bDBVw*2xX-yHsef6H=4oBmmdTXC)J<IJAzm6DZ+XL@hI4^CMDDs+*-EqA
zeRv@2vWJHTMtFEQx6Bleom*?hF8y>W#pd<e!VW7d?#j8?bQ6t=FqmZ*4bt$sOs!|e
zvDO!+umAtvPTqt)ZsS-R{VT({xiavnH732q!5n0cti_QnS+YdOP8ePta0Vn{4FMX!
zXfZke{npY;b)zw)5}z;6<A?(^dhhC5-%5ZWo&!Pjsm@uqZo(0jX9!-4y_`HoKLDKM
B`1=3=

diff --git a/core/web/jobs_controller_test.go b/core/web/jobs_controller_test.go
index 2e3f3a83693..1ce4fd08a36 100644
--- a/core/web/jobs_controller_test.go
+++ b/core/web/jobs_controller_test.go
@@ -17,6 +17,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/google/uuid"
+	"github.com/hashicorp/consul/sdk/freeport"
 	p2ppeer "github.com/libp2p/go-libp2p-core/peer"
 	"github.com/pelletier/go-toml"
 	"github.com/stretchr/testify/assert"
@@ -173,7 +174,7 @@ func TestJobController_Create_HappyPath(t *testing.T) {
 				require.NotNil(t, resource.OffChainReportingSpec)
 
 				assert.Equal(t, nameAndExternalJobID, jb.Name.ValueOrZero())
-				assert.Equal(t, jb.OCROracleSpec.P2PBootstrapPeers, resource.OffChainReportingSpec.P2PBootstrapPeers)
+				assert.Equal(t, jb.OCROracleSpec.P2PV2Bootstrappers, resource.OffChainReportingSpec.P2PV2Bootstrappers)
 				assert.Equal(t, jb.OCROracleSpec.IsBootstrapPeer, resource.OffChainReportingSpec.IsBootstrapPeer)
 				assert.Equal(t, jb.OCROracleSpec.EncryptedOCRKeyBundleID, resource.OffChainReportingSpec.EncryptedOCRKeyBundleID)
 				assert.Equal(t, jb.OCROracleSpec.TransmitterAddress, resource.OffChainReportingSpec.TransmitterAddress)
@@ -511,7 +512,8 @@ func TestJobsController_Show_NonExistentID(t *testing.T) {
 func TestJobsController_Update_HappyPath(t *testing.T) {
 	cfg := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
 		c.OCR.Enabled = ptr(true)
-		c.P2P.V1.Enabled = ptr(true)
+		c.P2P.V2.Enabled = ptr(true)
+		c.P2P.V2.ListenAddresses = &[]string{fmt.Sprintf("127.0.0.1:%d", freeport.GetOne(t))}
 		c.P2P.PeerID = &cltest.DefaultP2PPeerID
 	})
 	app := cltest.NewApplicationWithConfigAndKey(t, cfg, cltest.DefaultP2PKey)
@@ -573,7 +575,8 @@ func TestJobsController_Update_HappyPath(t *testing.T) {
 func TestJobsController_Update_NonExistentID(t *testing.T) {
 	cfg := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
 		c.OCR.Enabled = ptr(true)
-		c.P2P.V1.Enabled = ptr(true)
+		c.P2P.V2.Enabled = ptr(true)
+		c.P2P.V2.ListenAddresses = &[]string{fmt.Sprintf("127.0.0.1:%d", freeport.GetOne(t))}
 		c.P2P.PeerID = &cltest.DefaultP2PPeerID
 	})
 	app := cltest.NewApplicationWithConfigAndKey(t, cfg, cltest.DefaultP2PKey)
@@ -621,7 +624,7 @@ func TestJobsController_Update_NonExistentID(t *testing.T) {
 func runOCRJobSpecAssertions(t *testing.T, ocrJobSpecFromFileDB job.Job, ocrJobSpecFromServer presenters.JobResource) {
 	ocrJobSpecFromFile := ocrJobSpecFromFileDB.OCROracleSpec
 	assert.Equal(t, ocrJobSpecFromFile.ContractAddress, ocrJobSpecFromServer.OffChainReportingSpec.ContractAddress)
-	assert.Equal(t, ocrJobSpecFromFile.P2PBootstrapPeers, ocrJobSpecFromServer.OffChainReportingSpec.P2PBootstrapPeers)
+	assert.Equal(t, ocrJobSpecFromFile.P2PV2Bootstrappers, ocrJobSpecFromServer.OffChainReportingSpec.P2PV2Bootstrappers)
 	assert.Equal(t, ocrJobSpecFromFile.IsBootstrapPeer, ocrJobSpecFromServer.OffChainReportingSpec.IsBootstrapPeer)
 	assert.Equal(t, ocrJobSpecFromFile.EncryptedOCRKeyBundleID, ocrJobSpecFromServer.OffChainReportingSpec.EncryptedOCRKeyBundleID)
 	assert.Equal(t, ocrJobSpecFromFile.TransmitterAddress, ocrJobSpecFromServer.OffChainReportingSpec.TransmitterAddress)
@@ -658,7 +661,8 @@ func setupBridges(t *testing.T, db *sqlx.DB, cfg pg.QConfig) (b1, b2 string) {
 func setupJobsControllerTests(t *testing.T) (ta *cltest.TestApplication, cc cltest.HTTPClientCleaner) {
 	cfg := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
 		c.OCR.Enabled = ptr(true)
-		c.P2P.V1.Enabled = ptr(true)
+		c.P2P.V2.Enabled = ptr(true)
+		c.P2P.V2.ListenAddresses = &[]string{fmt.Sprintf("127.0.0.1:%d", freeport.GetOne(t))}
 		c.P2P.PeerID = &cltest.DefaultP2PPeerID
 	})
 	ec := setupEthClientForControllerTests(t)
@@ -683,7 +687,8 @@ func setupEthClientForControllerTests(t *testing.T) *evmclimocks.Client {
 func setupJobSpecsControllerTestsWithJobs(t *testing.T) (*cltest.TestApplication, cltest.HTTPClientCleaner, job.Job, int32, job.Job, int32) {
 	cfg := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
 		c.OCR.Enabled = ptr(true)
-		c.P2P.V1.Enabled = ptr(true)
+		c.P2P.V2.Enabled = ptr(true)
+		c.P2P.V2.ListenAddresses = &[]string{fmt.Sprintf("127.0.0.1:%d", freeport.GetOne(t))}
 		c.P2P.PeerID = &cltest.DefaultP2PPeerID
 	})
 	app := cltest.NewApplicationWithConfigAndKey(t, cfg, cltest.DefaultP2PKey)
diff --git a/core/web/loop_registry_test.go b/core/web/loop_registry_test.go
index 94e2bc856d6..93eda32d0e8 100644
--- a/core/web/loop_registry_test.go
+++ b/core/web/loop_registry_test.go
@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"testing"
 
+	"github.com/hashicorp/consul/sdk/freeport"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/prometheus/common/model"
@@ -61,10 +62,10 @@ func (m *mockLoopImpl) run() {
 }
 
 func TestLoopRegistry(t *testing.T) {
-
 	cfg := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
 		c.OCR.Enabled = ptr(true)
-		c.P2P.V1.Enabled = ptr(true)
+		c.P2P.V2.Enabled = ptr(true)
+		c.P2P.V2.ListenAddresses = &[]string{fmt.Sprintf("127.0.0.1:%d", freeport.GetOne(t))}
 		c.P2P.PeerID = &cltest.DefaultP2PPeerID
 	})
 	app := cltest.NewApplicationWithConfigAndKey(t, cfg, cltest.DefaultP2PKey)
diff --git a/core/web/pipeline_runs_controller_test.go b/core/web/pipeline_runs_controller_test.go
index c44ee9ae8da..6c45c1eb319 100644
--- a/core/web/pipeline_runs_controller_test.go
+++ b/core/web/pipeline_runs_controller_test.go
@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"github.com/google/uuid"
+	"github.com/hashicorp/consul/sdk/freeport"
 	"github.com/pelletier/go-toml"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
@@ -253,7 +254,8 @@ func setupPipelineRunsControllerTests(t *testing.T) (cltest.HTTPClientCleaner, i
 	ethClient.On("PendingNonceAt", mock.Anything, mock.Anything).Return(uint64(0), nil)
 	cfg := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
 		c.OCR.Enabled = ptr(true)
-		c.P2P.V1.Enabled = ptr(true)
+		c.P2P.V2.Enabled = ptr(true)
+		c.P2P.V2.ListenAddresses = &[]string{fmt.Sprintf("127.0.0.1:%d", freeport.GetOne(t))}
 		c.P2P.PeerID = &cltest.DefaultP2PPeerID
 		c.EVM[0].NonceAutoSync = ptr(false)
 		c.EVM[0].BalanceMonitor.Enabled = ptr(false)
@@ -273,10 +275,7 @@ func setupPipelineRunsControllerTests(t *testing.T) (cltest.HTTPClientCleaner, i
 	name               = "%s"
 	contractAddress    = "%s"
 	evmChainID		   = "0"
-	p2pBootstrapPeers  = [
-		"/dns4/chain.link/tcp/1234/p2p/16Uiu2HAm58SP7UL8zsnpeuwHfytLocaqgnyaYKP8wu7qRdrixLju",
-	]
-	p2pv2Bootstrappers = []
+	p2pv2Bootstrappers = ["12D3KooWHfYFQ8hGttAYbMCevQVESEQhzJAqFZokMVtom8bNxwGq@127.0.0.1:5001"]
 	keyBundleID        = "%s"
 	transmitterAddress = "%s"
 	observationSource = """
diff --git a/core/web/presenters/job.go b/core/web/presenters/job.go
index dc5bf623330..9b0a3cb3425 100644
--- a/core/web/presenters/job.go
+++ b/core/web/presenters/job.go
@@ -120,7 +120,6 @@ func NewFluxMonitorSpec(spec *job.FluxMonitorSpec) *FluxMonitorSpec {
 // OffChainReportingSpec defines the spec details of a OffChainReporting Job
 type OffChainReportingSpec struct {
 	ContractAddress                        ethkey.EIP55Address  `json:"contractAddress"`
-	P2PBootstrapPeers                      pq.StringArray       `json:"p2pBootstrapPeers"`
 	P2PV2Bootstrappers                     pq.StringArray       `json:"p2pv2Bootstrappers"`
 	IsBootstrapPeer                        bool                 `json:"isBootstrapPeer"`
 	EncryptedOCRKeyBundleID                *models.Sha256Hash   `json:"keyBundleID"`
@@ -144,7 +143,6 @@ type OffChainReportingSpec struct {
 func NewOffChainReportingSpec(spec *job.OCROracleSpec) *OffChainReportingSpec {
 	return &OffChainReportingSpec{
 		ContractAddress:                        spec.ContractAddress,
-		P2PBootstrapPeers:                      spec.P2PBootstrapPeers,
 		P2PV2Bootstrappers:                     spec.P2PV2Bootstrappers,
 		IsBootstrapPeer:                        spec.IsBootstrapPeer,
 		EncryptedOCRKeyBundleID:                spec.EncryptedOCRKeyBundleID,
diff --git a/core/web/presenters/job_test.go b/core/web/presenters/job_test.go
index 7e997c899c5..260cce0caf6 100644
--- a/core/web/presenters/job_test.go
+++ b/core/web/presenters/job_test.go
@@ -212,7 +212,6 @@ func TestJob(t *testing.T) {
 				ID: 1,
 				OCROracleSpec: &job.OCROracleSpec{
 					ContractAddress:                        contractAddress,
-					P2PBootstrapPeers:                      pq.StringArray{"/dns4/chain.link/tcp/1234/p2p/xxx"},
 					P2PV2Bootstrappers:                     pq.StringArray{"xxx:5001"},
 					IsBootstrapPeer:                        true,
 					EncryptedOCRKeyBundleID:                &ocrKeyID,
@@ -259,7 +258,6 @@ func TestJob(t *testing.T) {
 						},
 						"offChainReportingOracleSpec": {
 							"contractAddress": "%s",
-							"p2pBootstrapPeers": ["/dns4/chain.link/tcp/1234/p2p/xxx"],
 							"p2pv2Bootstrappers": ["xxx:5001"],
 							"isBootstrapPeer": true,
 							"keyBundleID": "%s",
diff --git a/core/web/resolver/spec.go b/core/web/resolver/spec.go
index c9ee5199229..3e93ea38eab 100644
--- a/core/web/resolver/spec.go
+++ b/core/web/resolver/spec.go
@@ -421,17 +421,6 @@ func (r *OCRSpecResolver) ObservationTimeout() *string {
 	return &timeout
 }
 
-// P2PBootstrapPeers resolves the spec's p2p bootstrap peers
-func (r *OCRSpecResolver) P2PBootstrapPeers() *[]string {
-	if len(r.spec.P2PBootstrapPeers) == 0 {
-		return nil
-	}
-
-	peers := []string(r.spec.P2PBootstrapPeers)
-
-	return &peers
-}
-
 // P2PV2Bootstrappers resolves the OCR1 spec's p2pv2 bootstrappers
 func (r *OCRSpecResolver) P2PV2Bootstrappers() *[]string {
 	if len(r.spec.P2PV2Bootstrappers) == 0 {
diff --git a/core/web/resolver/spec_test.go b/core/web/resolver/spec_test.go
index 4de66f1dcb1..ef89dafa048 100644
--- a/core/web/resolver/spec_test.go
+++ b/core/web/resolver/spec_test.go
@@ -385,7 +385,6 @@ func TestResolver_OCRSpec(t *testing.T) {
 						IsBootstrapPeer:                        false,
 						EncryptedOCRKeyBundleID:                &keyBundleID,
 						ObservationTimeout:                     models.Interval(2 * time.Minute),
-						P2PBootstrapPeers:                      pq.StringArray{"/dns4/test.com/tcp/2001/p2pkey"},
 						P2PV2Bootstrappers:                     pq.StringArray{"12D3KooWL3XJ9EMCyZvmmGXL2LMiVBtrVa2BuESsJiXkSj7333Jw@localhost:5001"},
 						TransmitterAddress:                     &transmitterAddress,
 					},
@@ -411,7 +410,6 @@ func TestResolver_OCRSpec(t *testing.T) {
 									isBootstrapPeer
 									keyBundleID
 									observationTimeout
-									p2pBootstrapPeers
 									p2pv2Bootstrappers
 									transmitterAddress
 								}
@@ -438,7 +436,6 @@ func TestResolver_OCRSpec(t *testing.T) {
 							"isBootstrapPeer": false,
 							"keyBundleID": "f5bf259689b26f1374efb3c9a9868796953a0f814bb2d39b968d0e61b58620a5",
 							"observationTimeout": "2m0s",
-							"p2pBootstrapPeers": ["/dns4/test.com/tcp/2001/p2pkey"],
 							"p2pv2Bootstrappers": ["12D3KooWL3XJ9EMCyZvmmGXL2LMiVBtrVa2BuESsJiXkSj7333Jw@localhost:5001"],
 							"transmitterAddress": "0x3cCad4715152693fE3BC4460591e3D3Fbd071b42"
 						}
diff --git a/core/web/resolver/testdata/config-empty-effective.toml b/core/web/resolver/testdata/config-empty-effective.toml
index 2531e7c281d..9efad05c03a 100644
--- a/core/web/resolver/testdata/config-empty-effective.toml
+++ b/core/web/resolver/testdata/config-empty-effective.toml
@@ -161,19 +161,6 @@ OutgoingMessageBufferSize = 10
 PeerID = ''
 TraceLogging = false
 
-[P2P.V1]
-Enabled = false
-AnnounceIP = ''
-AnnouncePort = 0
-BootstrapCheckInterval = '20s'
-DefaultBootstrapPeers = []
-DHTAnnouncementCounterUserPrefix = 0
-DHTLookupInterval = 10
-ListenIP = '0.0.0.0'
-ListenPort = 0
-NewStreamTimeout = '10s'
-PeerstoreWriteInterval = '5m0s'
-
 [P2P.V2]
 Enabled = true
 AnnounceAddresses = []
diff --git a/core/web/resolver/testdata/config-full.toml b/core/web/resolver/testdata/config-full.toml
index e98f8602a0c..45504d62596 100644
--- a/core/web/resolver/testdata/config-full.toml
+++ b/core/web/resolver/testdata/config-full.toml
@@ -167,19 +167,6 @@ OutgoingMessageBufferSize = 17
 PeerID = '12D3KooWMoejJznyDuEk5aX6GvbjaG12UzeornPCBNzMRqdwrFJw'
 TraceLogging = true
 
-[P2P.V1]
-Enabled = true
-AnnounceIP = '1.2.3.4'
-AnnouncePort = 1234
-BootstrapCheckInterval = '1m0s'
-DefaultBootstrapPeers = ['foo', 'bar', 'should', 'these', 'be', 'typed']
-DHTAnnouncementCounterUserPrefix = 4321
-DHTLookupInterval = 9
-ListenIP = '4.3.2.1'
-ListenPort = 9
-NewStreamTimeout = '1s'
-PeerstoreWriteInterval = '1m0s'
-
 [P2P.V2]
 Enabled = false
 AnnounceAddresses = ['a', 'b', 'c']
diff --git a/core/web/resolver/testdata/config-multi-chain-effective.toml b/core/web/resolver/testdata/config-multi-chain-effective.toml
index 74d83035cd5..40c18f28eb9 100644
--- a/core/web/resolver/testdata/config-multi-chain-effective.toml
+++ b/core/web/resolver/testdata/config-multi-chain-effective.toml
@@ -161,19 +161,6 @@ OutgoingMessageBufferSize = 10
 PeerID = ''
 TraceLogging = false
 
-[P2P.V1]
-Enabled = false
-AnnounceIP = ''
-AnnouncePort = 0
-BootstrapCheckInterval = '20s'
-DefaultBootstrapPeers = []
-DHTAnnouncementCounterUserPrefix = 0
-DHTLookupInterval = 10
-ListenIP = '0.0.0.0'
-ListenPort = 0
-NewStreamTimeout = '10s'
-PeerstoreWriteInterval = '5m0s'
-
 [P2P.V2]
 Enabled = true
 AnnounceAddresses = []
diff --git a/core/web/schema/type/spec.graphql b/core/web/schema/type/spec.graphql
index 98203a1870e..81244478637 100644
--- a/core/web/schema/type/spec.graphql
+++ b/core/web/schema/type/spec.graphql
@@ -60,7 +60,6 @@ type OCRSpec {
     isBootstrapPeer: Boolean!
     keyBundleID: String
     observationTimeout: String
-    p2pBootstrapPeers: [String!]
     p2pv2Bootstrappers: [String!]
     transmitterAddress: String
     databaseTimeout: String!
diff --git a/docs/CONFIG.md b/docs/CONFIG.md
index 3568abe7a0e..2bb32b58252 100644
--- a/docs/CONFIG.md
+++ b/docs/CONFIG.md
@@ -1109,13 +1109,7 @@ OutgoingMessageBufferSize = 10 # Default
 PeerID = '12D3KooWMoejJznyDuEk5aX6GvbjaG12UzeornPCBNzMRqdwrFJw' # Example
 TraceLogging = false # Default
 ```
-P2P supports multiple networking stack versions. You may configure `[P2P.V1]`, `[P2P.V2]`, or both to run simultaneously.
-If both are configured, then for each link with another peer, V2 networking will be preferred. If V2 does not work, the link will
-automatically fall back to V1. If V2 starts working again later, it will automatically be preferred again. This is useful
-for migrating networks without downtime. Note that the two networking stacks _must not_ be configured to bind to the same IP/port.
-
-Note: P2P.V1 is deprecated will be removed in the future.
-
+P2P has a versioned networking stack. Currenly only `[P2P.V2]` is supported.
 All nodes in the OCR network should share the same networking stack.
 
 ### IncomingMessageBufferSize
@@ -1149,108 +1143,6 @@ TraceLogging = false # Default
 ```
 TraceLogging enables trace level logging.
 
-## P2P.V1
-```toml
-[P2P.V1]
-Enabled = false # Default
-AnnounceIP = '1.2.3.4' # Example
-AnnouncePort = 1337 # Example
-BootstrapCheckInterval = '20s' # Default
-DefaultBootstrapPeers = ['/dns4/example.com/tcp/1337/p2p/12D3KooWMHMRLQkgPbFSYHwD3NBuwtS1AmxhvKVUrcfyaGDASR4U', '/ip4/1.2.3.4/tcp/9999/p2p/12D3KooWLZ9uTC3MrvKfDpGju6RAQubiMDL7CuJcAgDRTYP7fh7R'] # Example
-DHTAnnouncementCounterUserPrefix = 0 # Default
-DHTLookupInterval = 10 # Default
-ListenIP = '0.0.0.0' # Default
-ListenPort = 1337 # Example
-NewStreamTimeout = '10s' # Default
-PeerstoreWriteInterval = '5m' # Default
-```
-P2P.V1 is deprecated and will be removed in a future version.
-
-### Enabled
-```toml
-Enabled = false # Default
-```
-Enabled enables P2P V1.
-
-### AnnounceIP
-```toml
-AnnounceIP = '1.2.3.4' # Example
-```
-AnnounceIP should be set as the externally reachable IP address of the Chainlink node.
-
-### AnnouncePort
-```toml
-AnnouncePort = 1337 # Example
-```
-AnnouncePort should be set as the externally reachable port of the Chainlink node.
-
-### BootstrapCheckInterval
-```toml
-BootstrapCheckInterval = '20s' # Default
-```
-BootstrapCheckInterval is the interval at which nodes check connections to bootstrap nodes and reconnect if any of them is lost.
-Setting this to a small value would allow newly joined bootstrap nodes to get more connectivity
-more quickly, which helps to make bootstrap process faster. The cost of this operation is relatively
-cheap. We set this to 1 minute during our test.
-
-### DefaultBootstrapPeers
-```toml
-DefaultBootstrapPeers = ['/dns4/example.com/tcp/1337/p2p/12D3KooWMHMRLQkgPbFSYHwD3NBuwtS1AmxhvKVUrcfyaGDASR4U', '/ip4/1.2.3.4/tcp/9999/p2p/12D3KooWLZ9uTC3MrvKfDpGju6RAQubiMDL7CuJcAgDRTYP7fh7R'] # Example
-```
-DefaultBootstrapPeers is the default set of bootstrap peers.
-
-### DHTAnnouncementCounterUserPrefix
-```toml
-DHTAnnouncementCounterUserPrefix = 0 # Default
-```
-DHTAnnouncementCounterUserPrefix can be used to restore the node's
-ability to announce its IP/port on the P2P network after a database
-rollback. Make sure to only increase this value, and *never* decrease it.
-Don't use this variable unless you really know what you're doing, since you
-could semi-permanently exclude your node from the P2P network by
-misconfiguring it.
-
-### DHTLookupInterval
-:warning: **_ADVANCED_**: _Do not change this setting unless you know what you are doing._
-```toml
-DHTLookupInterval = 10 # Default
-```
-DHTLookupInterval is the interval between which we do the expensive peer
-lookup using DHT.
-
-Every DHTLookupInterval failures to open a stream to a peer, we will
-attempt to lookup its IP from DHT
-
-### ListenIP
-```toml
-ListenIP = '0.0.0.0' # Default
-```
-ListenIP is the default IP address to bind to.
-
-### ListenPort
-```toml
-ListenPort = 1337 # Example
-```
-ListenPort is the port to listen on. If left blank, the node randomly selects a different port each time it boots. It is highly recommended to set this to a static value to avoid network instability.
-
-### NewStreamTimeout
-:warning: **_ADVANCED_**: _Do not change this setting unless you know what you are doing._
-```toml
-NewStreamTimeout = '10s' # Default
-```
-NewStreamTimeout is the maximum length of time to wait to open a
-stream before we give up.
-We shouldn't hit this in practice since libp2p will give up fast if
-it can't get a connection, but it is here anyway as a failsafe.
-Set to 0 to disable any timeout on top of what libp2p gives us by default.
-
-### PeerstoreWriteInterval
-:warning: **_ADVANCED_**: _Do not change this setting unless you know what you are doing._
-```toml
-PeerstoreWriteInterval = '5m' # Default
-```
-PeerstoreWriteInterval controls how often the peerstore for the OCR V1 networking stack is persisted to the database.
-
 ## P2P.V2
 ```toml
 [P2P.V2]
diff --git a/go.mod b/go.mod
index c209cbca43f..0cbd2f16d1c 100644
--- a/go.mod
+++ b/go.mod
@@ -73,7 +73,7 @@ require (
 	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3
 	github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664
 	github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
-	github.com/smartcontractkit/libocr v0.0.0-20231107151413-13e0202ae8d7
+	github.com/smartcontractkit/libocr v0.0.0-20231130143053-c5102a9c0fb7
 	github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1
 	github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1
 	github.com/smartcontractkit/wsrpc v0.7.2
@@ -139,7 +139,7 @@ require (
 	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
 	github.com/cockroachdb/errors v1.9.1 // indirect
 	github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
-	github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811 // indirect
+	github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06 // indirect
 	github.com/cockroachdb/redact v1.1.3 // indirect
 	github.com/cometbft/cometbft-db v0.7.0 // indirect
 	github.com/confio/ics23/go v0.9.0 // indirect
@@ -154,7 +154,6 @@ require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/danieljoos/wincred v1.1.2 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
 	github.com/deckarep/golang-set/v2 v2.3.0 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
 	github.com/dfuse-io/logging v0.0.0-20210109005628-b97a57253f70 // indirect
@@ -164,7 +163,6 @@ require (
 	github.com/docker/distribution v2.8.2+incompatible // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
-	github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
 	github.com/gagliardetto/binary v0.7.1 // indirect
@@ -200,7 +198,6 @@ require (
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/go-tpm v0.9.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/gopacket v1.1.19 // indirect
 	github.com/gorilla/context v1.1.1 // indirect
 	github.com/grafana/pyroscope-go/godeltaprof v0.1.4 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
@@ -211,24 +208,19 @@ require (
 	github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
 	github.com/gtank/merlin v0.1.1 // indirect
 	github.com/gtank/ristretto255 v0.1.2 // indirect
-	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-hclog v1.5.0 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
-	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/golang-lru v0.6.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce // indirect
 	github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
-	github.com/holiman/uint256 v1.2.2 // indirect
+	github.com/holiman/uint256 v1.2.3 // indirect
 	github.com/huandu/skiplist v1.2.0 // indirect
 	github.com/huandu/xstrings v1.4.0 // indirect
-	github.com/huin/goupnp v1.0.3 // indirect
+	github.com/huin/goupnp v1.3.0 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/ipfs/go-cid v0.0.7 // indirect
-	github.com/ipfs/go-datastore v0.4.5 // indirect
-	github.com/ipfs/go-ipfs-util v0.0.2 // indirect
-	github.com/ipfs/go-ipns v0.0.2 // indirect
 	github.com/ipfs/go-log v1.0.4 // indirect
 	github.com/ipfs/go-log/v2 v2.1.1 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
@@ -237,53 +229,16 @@ require (
 	github.com/jackc/pgproto3/v2 v2.3.2 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
 	github.com/jackpal/go-nat-pmp v1.0.2 // indirect
-	github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
-	github.com/jbenet/goprocess v0.1.4 // indirect
 	github.com/jmhodges/levigo v1.0.0 // indirect
 	github.com/jmoiron/sqlx v1.3.5
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/compress v1.17.2 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
-	github.com/koron/go-ssdp v0.0.2 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
-	github.com/libp2p/go-addr-util v0.0.2 // indirect
 	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
-	github.com/libp2p/go-cidranger v1.1.0 // indirect
-	github.com/libp2p/go-conn-security-multistream v0.2.0 // indirect
-	github.com/libp2p/go-eventbus v0.2.1 // indirect
-	github.com/libp2p/go-flow-metrics v0.0.3 // indirect
-	github.com/libp2p/go-libp2p v0.13.0 // indirect
-	github.com/libp2p/go-libp2p-asn-util v0.0.0-20201026210036-4f868c957324 // indirect
-	github.com/libp2p/go-libp2p-autonat v0.4.0 // indirect
-	github.com/libp2p/go-libp2p-blankhost v0.2.0 // indirect
-	github.com/libp2p/go-libp2p-circuit v0.4.0 // indirect
-	github.com/libp2p/go-libp2p-discovery v0.5.0 // indirect
-	github.com/libp2p/go-libp2p-kad-dht v0.11.1 // indirect
-	github.com/libp2p/go-libp2p-kbucket v0.4.7 // indirect
-	github.com/libp2p/go-libp2p-loggables v0.1.0 // indirect
-	github.com/libp2p/go-libp2p-mplex v0.4.1 // indirect
-	github.com/libp2p/go-libp2p-nat v0.0.6 // indirect
-	github.com/libp2p/go-libp2p-noise v0.1.2 // indirect
-	github.com/libp2p/go-libp2p-pnet v0.2.0 // indirect
-	github.com/libp2p/go-libp2p-record v0.1.3 // indirect
-	github.com/libp2p/go-libp2p-swarm v0.4.0 // indirect
-	github.com/libp2p/go-libp2p-tls v0.1.3 // indirect
-	github.com/libp2p/go-libp2p-transport-upgrader v0.4.0 // indirect
-	github.com/libp2p/go-libp2p-yamux v0.5.1 // indirect
-	github.com/libp2p/go-mplex v0.3.0 // indirect
-	github.com/libp2p/go-msgio v0.0.6 // indirect
-	github.com/libp2p/go-nat v0.0.5 // indirect
-	github.com/libp2p/go-netroute v0.1.4 // indirect
 	github.com/libp2p/go-openssl v0.0.7 // indirect
-	github.com/libp2p/go-reuseport v0.0.2 // indirect
-	github.com/libp2p/go-reuseport-transport v0.0.4 // indirect
-	github.com/libp2p/go-sockaddr v0.1.0 // indirect
-	github.com/libp2p/go-stream-muxer-multistream v0.3.0 // indirect
-	github.com/libp2p/go-tcp-transport v0.2.1 // indirect
-	github.com/libp2p/go-ws-transport v0.4.0 // indirect
-	github.com/libp2p/go-yamux/v2 v2.0.0 // indirect
 	github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
@@ -302,12 +257,10 @@ require (
 	github.com/mtibben/percent v0.2.1 // indirect
 	github.com/multiformats/go-base32 v0.0.3 // indirect
 	github.com/multiformats/go-base36 v0.1.0 // indirect
-	github.com/multiformats/go-multiaddr-dns v0.2.0 // indirect
 	github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
 	github.com/multiformats/go-multiaddr-net v0.2.0 // indirect
 	github.com/multiformats/go-multibase v0.0.3 // indirect
 	github.com/multiformats/go-multihash v0.0.14 // indirect
-	github.com/multiformats/go-multistream v0.2.0 // indirect
 	github.com/multiformats/go-varint v0.0.6 // indirect
 	github.com/mwitkow/grpc-proxy v0.0.0-20230212185441-f345521cb9c9 // indirect
 	github.com/oklog/run v1.1.0 // indirect
@@ -347,8 +300,6 @@ require (
 	github.com/tyler-smith/go-bip39 v1.1.0 // indirect
 	github.com/umbracle/fastrlp v0.0.0-20220527094140-59d5dd30e722 // indirect
 	github.com/valyala/fastjson v1.4.1 // indirect
-	github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
-	github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/yusufpapurcu/wmi v1.2.3 // indirect
 	github.com/zondax/hid v0.9.1 // indirect
diff --git a/go.sum b/go.sum
index 08743596538..96e5c069454 100644
--- a/go.sum
+++ b/go.sum
@@ -75,7 +75,6 @@ github.com/99designs/keyring v1.2.1 h1:tYLp1ULvO7i3fI5vE21ReQuj99QFSs7lGm0xWyJo8
 github.com/99designs/keyring v1.2.1/go.mod h1:fc+wB5KTk9wQ9sDx0kFXB3A0MaeGHM9AwRStKOQ5vOA=
 github.com/AlekSi/pointer v1.1.0 h1:SSDMPcXD9jSl8FPy9cRzoRaMJtm9g9ggGTxecRUbQoI=
 github.com/AlekSi/pointer v1.1.0/go.mod h1:y7BvfRI3wXPWKXEBhU71nbnIEEZX0QTSB2Bj48UJIZE=
-github.com/AndreasBriese/bbloom v0.0.0-20180913140656-343706a395b7/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
@@ -105,7 +104,6 @@ github.com/Depado/ginprom v1.7.11/go.mod h1:49mxL3NTQwDrhpDbY4V1mAIB3us9B+b2hP1+
 github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0=
 github.com/GeertJohan/go.rice v1.0.0/go.mod h1:eH6gbSOAUv07dQuZVnBmoDP8mgsM1rtixis4Tib9if0=
 github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
-github.com/Kubuxu/go-os-helper v0.0.1/go.mod h1:N8B+I7vPCT80IcP58r50u4+gEEcsZETFUpAzWW2ep1Y=
 github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
 github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
@@ -231,15 +229,16 @@ github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b80
 github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw=
 github.com/cockroachdb/apd/v3 v3.1.0 h1:MK3Ow7LH0W8zkd5GMKA1PvS9qG3bWFI95WaVNfyZJ/w=
 github.com/cockroachdb/apd/v3 v3.1.0/go.mod h1:6qgPBMXjATAdD/VefbRP9NoSLKjbB4LCoA7gN4LpHs4=
-github.com/cockroachdb/datadriven v1.0.2 h1:H9MtNqVoVhvd9nCBwOyDjUEdZCREqbIdCJD93PBm/jA=
 github.com/cockroachdb/datadriven v1.0.2/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU=
+github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877 h1:1MLK4YpFtIEo3ZtMA5C795Wtv5VuUnrXX7mQG+aHg6o=
+github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU=
 github.com/cockroachdb/errors v1.9.1 h1:yFVvsI0VxmRShfawbt/laCIDy/mtTqqnvoNgiy5bEV8=
 github.com/cockroachdb/errors v1.9.1/go.mod h1:2sxOtL2WIc096WSZqZ5h8fa17rdDq9HZOZLBCor4mBk=
 github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
 github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE=
 github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
-github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811 h1:ytcWPaNPhNoGMWEhDvS3zToKcDpRsLuRolQJBVGdozk=
-github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811/go.mod h1:Nb5lgvnQ2+oGlE/EyZy4+2/CxRh9KfvCXnag1vtpxVM=
+github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06 h1:T+Np/xtzIjYM/P5NAw0e2Rf1FGvzDau1h54MKvx8G7w=
+github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06/go.mod h1:bynZ3gvVyhlvjLI7PT6dmZ7g76xzJ7HpxfjgkzCGz6s=
 github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ=
 github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
 github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM=
@@ -258,7 +257,6 @@ github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc
 github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
@@ -307,9 +305,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davidlazar/go-crypto v0.0.0-20170701192655-dcfb0a7ac018/go.mod h1:rQYf4tfk5sSwFsnDg3qYaBxSjsD9S8+59vW0dKUgme4=
-github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c h1:pFUpOrbxDR6AkioZ1ySsx5yxlDQZ8stG2b88gTPxgJU=
-github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c/go.mod h1:6UhI8N9EjYm1c2odKpFpAYeR8dsBeM7PtzQhRgxRr9U=
 github.com/deckarep/golang-set/v2 v2.3.0 h1:qs18EKUfHm2X9fA50Mr/M5hccg2tNnVqsiBImnyDs0g=
 github.com/deckarep/golang-set/v2 v2.3.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4=
 github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y=
@@ -322,8 +317,6 @@ github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFM
 github.com/dfuse-io/logging v0.0.0-20201110202154-26697de88c79/go.mod h1:V+ED4kT/t/lKtH99JQmKIb0v9WL3VaYkJ36CfHlVECI=
 github.com/dfuse-io/logging v0.0.0-20210109005628-b97a57253f70 h1:CuJS05R9jmNlUK8GOxrEELPbfXm0EuGh/30LjkjN5vo=
 github.com/dfuse-io/logging v0.0.0-20210109005628-b97a57253f70/go.mod h1:EoK/8RFbMEteaCaz89uessDTnCWjbbcr+DXcBh4el5o=
-github.com/dgraph-io/badger v1.5.5-0.20190226225317-8115aed38f8f/go.mod h1:VZxzAIRPHRVNRKRo6AXrX9BJegn6il06VMTZVJYCIjQ=
-github.com/dgraph-io/badger v1.6.0-rc1/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
 github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
 github.com/dgraph-io/badger v1.6.1/go.mod h1:FRmFw3uxvcpa8zG3Rxs0th+hCLIuaQg8HlNV5bjgnuU=
 github.com/dgraph-io/badger/v2 v2.2007.4 h1:TRWBQg8UrlUhaFdco01nO2uXwzKS7zd+HVdwV/GHc4o=
@@ -333,7 +326,6 @@ github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KP
 github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8=
 github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/dgryski/go-farm v0.0.0-20190104051053-3adb47b1fb0f/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y=
 github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
@@ -389,8 +381,6 @@ github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBd
 github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c=
 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
-github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6 h1:u/UEqS66A5ckRmS4yNpjmVH56sVtS/RfclBAYocb4as=
-github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6/go.mod h1:1i71OnUq3iUe1ma7Lr6yG6/rjvM3emb6yoL7xLFzcVQ=
 github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
 github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
 github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
@@ -592,10 +582,6 @@ github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSN
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/gopacket v1.1.17/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM=
-github.com/google/gopacket v1.1.18/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM=
-github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
-github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -675,15 +661,11 @@ github.com/gtank/merlin v0.1.1 h1:eQ90iG7K9pOhtereWsmyRJ6RAwcP4tHTDBHXNg+u5is=
 github.com/gtank/merlin v0.1.1/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s=
 github.com/gtank/ristretto255 v0.1.2 h1:JEqUCPA1NvLq5DwYtuzigd7ss8fwbYay9fi4/5uMzcc=
 github.com/gtank/ristretto255 v0.1.2/go.mod h1:Ph5OpO6c7xKUGROZfWVLiJf9icMDwUeIvY4OmlYW69o=
-github.com/gxed/hashland/keccakpg v0.0.1/go.mod h1:kRzw3HkwxFU1mpmPP8v1WyQzwdGfmKFJ6tItnhQ67kU=
-github.com/gxed/hashland/murmur3 v0.0.1/go.mod h1:KjXop02n4/ckmZSnY2+HKcLud/tcmvhST0bie/0lS48=
 github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
 github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
 github.com/hashicorp/consul/sdk v0.14.1 h1:ZiwE2bKb+zro68sWzZ1SgHF3kRMBZ94TwOCFRF4ylPs=
 github.com/hashicorp/consul/sdk v0.14.1/go.mod h1:vFt03juSzocLRFo59NkeQHHmQa6+g7oU0pfzdI1mUhg=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
-github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpxn4uE=
 github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0=
 github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
@@ -699,9 +681,6 @@ github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJ
 github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
-github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
-github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
-github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
 github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
 github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo=
@@ -734,8 +713,8 @@ github.com/hdevalence/ed25519consensus v0.1.0 h1:jtBwzzcHuTmFrQN6xQZn6CQEO/V9f7H
 github.com/hdevalence/ed25519consensus v0.1.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo=
 github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao=
 github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA=
-github.com/holiman/uint256 v1.2.2 h1:TXKcSGc2WaxPD2+bmzAsVthL4+pEN0YwXcL5qED83vk=
-github.com/holiman/uint256 v1.2.2/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw=
+github.com/holiman/uint256 v1.2.3 h1:K8UWO1HUJpRMXBxbmaY1Y8IAMZC/RsKB+ArEnnK4l5o=
+github.com/holiman/uint256 v1.2.3/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huandu/go-assert v1.1.5 h1:fjemmA7sSfYHJD7CUqs9qTwwfdNAx7/j2/ZlHXzNB3c=
 github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0JrPVhn/06U=
@@ -744,10 +723,8 @@ github.com/huandu/skiplist v1.2.0/go.mod h1:7v3iFjLcSAzO4fN5B8dvebvo/qsfumiLiDXM
 github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU=
 github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
-github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc=
-github.com/huin/goupnp v1.0.3 h1:N8No57ls+MnjlB+JPiCVSOyy/ot7MJTqlo7rn+NYSqQ=
-github.com/huin/goupnp v1.0.3/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y=
-github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o=
+github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc=
+github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8=
 github.com/hydrogen18/memlistener v0.0.0-20200120041712-dcc25e7acd91/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
@@ -761,45 +738,18 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
 github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/ipfs/go-cid v0.0.1/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
-github.com/ipfs/go-cid v0.0.2/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
-github.com/ipfs/go-cid v0.0.3/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
-github.com/ipfs/go-cid v0.0.4/go.mod h1:4LLaPOQwmk5z9LBgQnpkivrx8BJjUyGwTXCd5Xfj6+M=
 github.com/ipfs/go-cid v0.0.5/go.mod h1:plgt+Y5MnOey4vO4UlUazGqdbEXuFYitED67FexhXog=
-github.com/ipfs/go-cid v0.0.6/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I=
 github.com/ipfs/go-cid v0.0.7 h1:ysQJVJA3fNDF1qigJbsSQOdjhVLsOEoPdh0+R97k3jY=
 github.com/ipfs/go-cid v0.0.7/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I=
-github.com/ipfs/go-datastore v0.0.1/go.mod h1:d4KVXhMt913cLBEI/PXAy6ko+W7e9AhyAKBGh803qeE=
-github.com/ipfs/go-datastore v0.1.0/go.mod h1:d4KVXhMt913cLBEI/PXAy6ko+W7e9AhyAKBGh803qeE=
-github.com/ipfs/go-datastore v0.1.1/go.mod h1:w38XXW9kVFNp57Zj5knbKWM2T+KOZCGDRVNdgPHtbHw=
-github.com/ipfs/go-datastore v0.4.0/go.mod h1:SX/xMIKoCszPqp+z9JhPYCmoOoXTvaa13XEbGtsFUhA=
 github.com/ipfs/go-datastore v0.4.1/go.mod h1:SX/xMIKoCszPqp+z9JhPYCmoOoXTvaa13XEbGtsFUhA=
 github.com/ipfs/go-datastore v0.4.4/go.mod h1:SX/xMIKoCszPqp+z9JhPYCmoOoXTvaa13XEbGtsFUhA=
-github.com/ipfs/go-datastore v0.4.5 h1:cwOUcGMLdLPWgu3SlrCckCMznaGADbPqE0r8h768/Dg=
-github.com/ipfs/go-datastore v0.4.5/go.mod h1:eXTcaaiN6uOlVCLS9GjJUJtlvJfM3xk23w3fyfrmmJs=
-github.com/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk=
-github.com/ipfs/go-detect-race v0.0.1/go.mod h1:8BNT7shDZPo99Q74BpGMK+4D8Mn4j46UU0LZ723meps=
-github.com/ipfs/go-ds-badger v0.0.2/go.mod h1:Y3QpeSFWQf6MopLTiZD+VT6IC1yZqaGmjvRcKeSGij8=
-github.com/ipfs/go-ds-badger v0.0.5/go.mod h1:g5AuuCGmr7efyzQhLL8MzwqcauPojGPUaHzfGTzuE3s=
-github.com/ipfs/go-ds-badger v0.0.7/go.mod h1:qt0/fWzZDoPW6jpQeqUjR5kBfhDNB65jd9YlmAvpQBk=
-github.com/ipfs/go-ds-badger v0.2.1/go.mod h1:Tx7l3aTph3FMFrRS838dcSJh+jjA7cX9DrGVwx/NOwE=
 github.com/ipfs/go-ds-badger v0.2.3/go.mod h1:pEYw0rgg3FIrywKKnL+Snr+w/LjJZVMTBRn4FS6UHUk=
-github.com/ipfs/go-ds-leveldb v0.0.1/go.mod h1:feO8V3kubwsEF22n0YRQCffeb79OOYIykR4L04tMOYc=
-github.com/ipfs/go-ds-leveldb v0.1.0/go.mod h1:hqAW8y4bwX5LWcCtku2rFNX3vjDZCy5LZCg+cSZvYb8=
-github.com/ipfs/go-ds-leveldb v0.4.1/go.mod h1:jpbku/YqBSsBc1qgME8BkWS4AxzF2cEu1Ii2r79Hh9s=
 github.com/ipfs/go-ds-leveldb v0.4.2/go.mod h1:jpbku/YqBSsBc1qgME8BkWS4AxzF2cEu1Ii2r79Hh9s=
 github.com/ipfs/go-ipfs-delay v0.0.0-20181109222059-70721b86a9a8/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw=
-github.com/ipfs/go-ipfs-util v0.0.1/go.mod h1:spsl5z8KUnrve+73pOhSVZND1SIxPW5RyBCNzQxlJBc=
-github.com/ipfs/go-ipfs-util v0.0.2 h1:59Sswnk1MFaiq+VcaknX7aYEyGyGDAA73ilhEK2POp8=
-github.com/ipfs/go-ipfs-util v0.0.2/go.mod h1:CbPtkWJzjLdEcezDns2XYaehFVNXG9zrdrtMecczcsQ=
-github.com/ipfs/go-ipns v0.0.2 h1:oq4ErrV4hNQ2Eim257RTYRgfOSV/s8BDaf9iIl4NwFs=
-github.com/ipfs/go-ipns v0.0.2/go.mod h1:WChil4e0/m9cIINWLxZe1Jtf77oz5L05rO2ei/uKJ5U=
 github.com/ipfs/go-log v0.0.1/go.mod h1:kL1d2/hzSpI0thNYjiKfjanbVNU+IIGA/WnNESY9leM=
-github.com/ipfs/go-log v1.0.2/go.mod h1:1MNjMxe0u6xvJZgeqbJ8vdo2TKaGwZ1a0Bpza+sr2Sk=
 github.com/ipfs/go-log v1.0.3/go.mod h1:OsLySYkwIbiSUR/yBTdv1qPtcE4FW3WPWk/ewz9Ru+A=
 github.com/ipfs/go-log v1.0.4 h1:6nLQdX4W8P9yZZFH7mO+X/PzjN8Laozm/lMJ6esdgzY=
 github.com/ipfs/go-log v1.0.4/go.mod h1:oDCg2FkjogeFOhqqb+N39l2RpTNPL6F/StPkB3kPgcs=
-github.com/ipfs/go-log/v2 v2.0.2/go.mod h1:O7P1lJt27vWHhOwQmcFEvlmo49ry2VY2+JfBWFaa9+0=
 github.com/ipfs/go-log/v2 v2.0.3/go.mod h1:O7P1lJt27vWHhOwQmcFEvlmo49ry2VY2+JfBWFaa9+0=
 github.com/ipfs/go-log/v2 v2.0.5/go.mod h1:eZs4Xt4ZUJQFM3DlanGhy7TkwwawCZcSByscwkWG+dw=
 github.com/ipfs/go-log/v2 v2.1.1 h1:G4TtqN+V9y9HY9TA6BwbCVyyBZ2B9MbCjR2MtGx8FR0=
@@ -863,19 +813,10 @@ github.com/jackc/puddle v1.3.0 h1:eHK/5clGOatcjX3oWGBO/MpxpbHzSwud5EWTSCI+MX0=
 github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk=
 github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
-github.com/jackpal/gateway v1.0.5/go.mod h1:lTpwd4ACLXmpyiCTRtfiNyVnUmqT9RivzCDQetPfnjA=
-github.com/jackpal/go-nat-pmp v1.0.1/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
 github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
 github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
-github.com/jbenet/go-cienv v0.0.0-20150120210510-1bb1476777ec/go.mod h1:rGaEvXB4uRSZMmzKNLoXvTu1sfx+1kv/DojUlPrSZGs=
-github.com/jbenet/go-cienv v0.1.0 h1:Vc/s0QbQtoxX8MwwSLWWh+xNNZvM3Lw7NsTcHrvvhMc=
 github.com/jbenet/go-cienv v0.1.0/go.mod h1:TqNnHUmJgXau0nCzC7kXWeotg3J9W34CUv5Djy1+FlA=
-github.com/jbenet/go-temp-err-catcher v0.0.0-20150120210811-aac704a3f4f2/go.mod h1:8GXXJV31xl8whumTzdZsTt3RnUIiPqzkyf7mxToRCMs=
-github.com/jbenet/go-temp-err-catcher v0.1.0 h1:zpb3ZH6wIE8Shj2sKS+khgRvf7T7RABoLk/+KKHggpk=
-github.com/jbenet/go-temp-err-catcher v0.1.0/go.mod h1:0kJRvmDZXNMIiJirNPEYfhpPwbGVtZVWC34vc5WLsDk=
 github.com/jbenet/goprocess v0.0.0-20160826012719-b497e2f366b8/go.mod h1:Ly/wlsjFq/qrU3Rar62tu1gASgGw6chQbSh/XgIIXCY=
-github.com/jbenet/goprocess v0.1.3/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZlqdZVfqY4=
-github.com/jbenet/goprocess v0.1.4 h1:DRGOFReOMqqDNXwW70QkacFW0YN9QnwLV0Vqk+3oU0o=
 github.com/jbenet/goprocess v0.1.4/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZlqdZVfqY4=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=
@@ -906,7 +847,6 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
-github.com/kami-zh/go-capturer v0.0.0-20171211120116-e492ea43421d/go.mod h1:P2viExyCEfeWGU259JnaQ34Inuec4R38JCyBx2edgD0=
 github.com/kataras/golog v0.0.10/go.mod h1:yJ8YKCmyL+nWjERB90Qwn+bdyBZsaQwU3bTVFgkFIp8=
 github.com/kataras/iris/v12 v12.1.8/go.mod h1:LMYy4VlP67TQ3Zgriz8RE2h2kMZV2SgMYbq3UhfoFmE=
 github.com/kataras/neffos v0.0.14/go.mod h1:8lqADm8PnbeFfL7CLXh1WHw53dG27MC3pgi2R1rmoTE=
@@ -930,9 +870,6 @@ github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZX
 github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/koron/go-ssdp v0.0.0-20191105050749-2e1c40ed0b5d/go.mod h1:5Ky9EC2xfoUKUor0Hjgi2BJhCSXJfMOFlmyYrVKGQMk=
-github.com/koron/go-ssdp v0.0.2 h1:fL3wAoyT6hXHQlORyXUW4Q23kkQpJRgEAYcZB5BR71o=
-github.com/koron/go-ssdp v0.0.2/go.mod h1:XoLfkAiA2KeZsYh4DbHxD7h3nR2AZNqVQOa+LJuqPYs=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -961,211 +898,22 @@ github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/libp2p/go-addr-util v0.0.1/go.mod h1:4ac6O7n9rIAKB1dnd+s8IbbMXkt+oBpzX4/+RACcnlQ=
-github.com/libp2p/go-addr-util v0.0.2 h1:7cWK5cdA5x72jX0g8iLrQWm5TRJZ6CzGdPEhWj7plWU=
-github.com/libp2p/go-addr-util v0.0.2/go.mod h1:Ecd6Fb3yIuLzq4bD7VcywcVSBtefcAwnUISBM3WG15E=
 github.com/libp2p/go-buffer-pool v0.0.1/go.mod h1:xtyIz9PMobb13WaxR6Zo1Pd1zXJKYg0a8KiIvDp3TzQ=
 github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM=
 github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8=
 github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg=
-github.com/libp2p/go-cidranger v1.1.0 h1:ewPN8EZ0dd1LSnrtuwd4709PXVcITVeuwbag38yPW7c=
-github.com/libp2p/go-cidranger v1.1.0/go.mod h1:KWZTfSr+r9qEo9OkI9/SIEeAtw+NNoU0dXIXt15Okic=
-github.com/libp2p/go-conn-security-multistream v0.1.0/go.mod h1:aw6eD7LOsHEX7+2hJkDxw1MteijaVcI+/eP2/x3J1xc=
-github.com/libp2p/go-conn-security-multistream v0.2.0 h1:uNiDjS58vrvJTg9jO6bySd1rMKejieG7v45ekqHbZ1M=
-github.com/libp2p/go-conn-security-multistream v0.2.0/go.mod h1:hZN4MjlNetKD3Rq5Jb/P5ohUnFLNzEAR4DLSzpn2QLU=
-github.com/libp2p/go-eventbus v0.1.0/go.mod h1:vROgu5cs5T7cv7POWlWxBaVLxfSegC5UGQf8A2eEmx4=
-github.com/libp2p/go-eventbus v0.2.1 h1:VanAdErQnpTioN2TowqNcOijf6YwhuODe4pPKSDpxGc=
-github.com/libp2p/go-eventbus v0.2.1/go.mod h1:jc2S4SoEVPP48H9Wpzm5aiGwUCBMfGhVhhBjyhhCJs8=
-github.com/libp2p/go-flow-metrics v0.0.1/go.mod h1:Iv1GH0sG8DtYN3SVJ2eG221wMiNpZxBdp967ls1g+k8=
-github.com/libp2p/go-flow-metrics v0.0.2/go.mod h1:HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs=
-github.com/libp2p/go-flow-metrics v0.0.3 h1:8tAs/hSdNvUiLgtlSy3mxwxWP4I9y/jlkPFT7epKdeM=
 github.com/libp2p/go-flow-metrics v0.0.3/go.mod h1:HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs=
-github.com/libp2p/go-libp2p v0.6.1/go.mod h1:CTFnWXogryAHjXAKEbOf1OWY+VeAP3lDMZkfEI5sT54=
-github.com/libp2p/go-libp2p v0.7.0/go.mod h1:hZJf8txWeCduQRDC/WSqBGMxaTHCOYHt2xSU1ivxn0k=
-github.com/libp2p/go-libp2p v0.7.4/go.mod h1:oXsBlTLF1q7pxr+9w6lqzS1ILpyHsaBPniVO7zIHGMw=
-github.com/libp2p/go-libp2p v0.8.1/go.mod h1:QRNH9pwdbEBpx5DTJYg+qxcVaDMAz3Ee/qDKwXujH5o=
-github.com/libp2p/go-libp2p v0.12.0/go.mod h1:FpHZrfC1q7nA8jitvdjKBDF31hguaC676g/nT9PgQM0=
-github.com/libp2p/go-libp2p v0.13.0 h1:tDdrXARSghmusdm0nf1U/4M8aj8Rr0V2IzQOXmbzQ3s=
-github.com/libp2p/go-libp2p v0.13.0/go.mod h1:pM0beYdACRfHO1WcJlp65WXyG2A6NqYM+t2DTVAJxMo=
-github.com/libp2p/go-libp2p-asn-util v0.0.0-20200825225859-85005c6cf052/go.mod h1:nRMRTab+kZuk0LnKZpxhOVH/ndsdr2Nr//Zltc/vwgo=
-github.com/libp2p/go-libp2p-asn-util v0.0.0-20201026210036-4f868c957324 h1:2H/P+forDWBHije1WULwPfGduByUmC4fthndHVRpYNU=
-github.com/libp2p/go-libp2p-asn-util v0.0.0-20201026210036-4f868c957324/go.mod h1:nRMRTab+kZuk0LnKZpxhOVH/ndsdr2Nr//Zltc/vwgo=
-github.com/libp2p/go-libp2p-autonat v0.1.1/go.mod h1:OXqkeGOY2xJVWKAGV2inNF5aKN/djNA3fdpCWloIudE=
-github.com/libp2p/go-libp2p-autonat v0.2.0/go.mod h1:DX+9teU4pEEoZUqR1PiMlqliONQdNbfzE1C718tcViI=
-github.com/libp2p/go-libp2p-autonat v0.2.1/go.mod h1:MWtAhV5Ko1l6QBsHQNSuM6b1sRkXrpk0/LqCr+vCVxI=
-github.com/libp2p/go-libp2p-autonat v0.2.2/go.mod h1:HsM62HkqZmHR2k1xgX34WuWDzk/nBwNHoeyyT4IWV6A=
-github.com/libp2p/go-libp2p-autonat v0.4.0 h1:3y8XQbpr+ssX8QfZUHekjHCYK64sj6/4hnf/awD4+Ug=
-github.com/libp2p/go-libp2p-autonat v0.4.0/go.mod h1:YxaJlpr81FhdOv3W3BTconZPfhaYivRdf53g+S2wobk=
-github.com/libp2p/go-libp2p-blankhost v0.1.1/go.mod h1:pf2fvdLJPsC1FsVrNP3DUUvMzUts2dsLLBEpo1vW1ro=
-github.com/libp2p/go-libp2p-blankhost v0.1.4/go.mod h1:oJF0saYsAXQCSfDq254GMNmLNz6ZTHTOvtF4ZydUvwU=
-github.com/libp2p/go-libp2p-blankhost v0.2.0 h1:3EsGAi0CBGcZ33GwRuXEYJLLPoVWyXJ1bcJzAJjINkk=
-github.com/libp2p/go-libp2p-blankhost v0.2.0/go.mod h1:eduNKXGTioTuQAUcZ5epXi9vMl+t4d8ugUBRQ4SqaNQ=
-github.com/libp2p/go-libp2p-circuit v0.1.4/go.mod h1:CY67BrEjKNDhdTk8UgBX1Y/H5c3xkAcs3gnksxY7osU=
-github.com/libp2p/go-libp2p-circuit v0.2.1/go.mod h1:BXPwYDN5A8z4OEY9sOfr2DUQMLQvKt/6oku45YUmjIo=
-github.com/libp2p/go-libp2p-circuit v0.4.0 h1:eqQ3sEYkGTtybWgr6JLqJY6QLtPWRErvFjFDfAOO1wc=
-github.com/libp2p/go-libp2p-circuit v0.4.0/go.mod h1:t/ktoFIUzM6uLQ+o1G6NuBl2ANhBKN9Bc8jRIk31MoA=
-github.com/libp2p/go-libp2p-core v0.0.1/go.mod h1:g/VxnTZ/1ygHxH3dKok7Vno1VfpvGcGip57wjTU4fco=
-github.com/libp2p/go-libp2p-core v0.0.4/go.mod h1:jyuCQP356gzfCFtRKyvAbNkyeuxb7OlyhWZ3nls5d2I=
-github.com/libp2p/go-libp2p-core v0.2.0/go.mod h1:X0eyB0Gy93v0DZtSYbEM7RnMChm9Uv3j7yRXjO77xSI=
-github.com/libp2p/go-libp2p-core v0.2.2/go.mod h1:8fcwTbsG2B+lTgRJ1ICZtiM5GWCWZVoVrLaDRvIRng0=
-github.com/libp2p/go-libp2p-core v0.2.4/go.mod h1:STh4fdfa5vDYr0/SzYYeqnt+E6KfEV5VxfIrm0bcI0g=
-github.com/libp2p/go-libp2p-core v0.2.5/go.mod h1:6+5zJmKhsf7yHn1RbmYDu08qDUpIUxGdqHuEZckmZOA=
-github.com/libp2p/go-libp2p-core v0.3.0/go.mod h1:ACp3DmS3/N64c2jDzcV429ukDpicbL6+TrrxANBjPGw=
-github.com/libp2p/go-libp2p-core v0.3.1/go.mod h1:thvWy0hvaSBhnVBaW37BvzgVV68OUhgJJLAa6almrII=
-github.com/libp2p/go-libp2p-core v0.4.0/go.mod h1:49XGI+kc38oGVwqSBhDEwytaAxgZasHhFfQKibzTls0=
-github.com/libp2p/go-libp2p-core v0.5.0/go.mod h1:49XGI+kc38oGVwqSBhDEwytaAxgZasHhFfQKibzTls0=
-github.com/libp2p/go-libp2p-core v0.5.1/go.mod h1:uN7L2D4EvPCvzSH5SrhR72UWbnSGpt5/a35Sm4upn4Y=
-github.com/libp2p/go-libp2p-core v0.5.3/go.mod h1:uN7L2D4EvPCvzSH5SrhR72UWbnSGpt5/a35Sm4upn4Y=
 github.com/libp2p/go-libp2p-core v0.5.4/go.mod h1:uN7L2D4EvPCvzSH5SrhR72UWbnSGpt5/a35Sm4upn4Y=
-github.com/libp2p/go-libp2p-core v0.5.5/go.mod h1:vj3awlOr9+GMZJFH9s4mpt9RHHgGqeHCopzbYKZdRjM=
-github.com/libp2p/go-libp2p-core v0.5.6/go.mod h1:txwbVEhHEXikXn9gfC7/UDDw7rkxuX0bJvM49Ykaswo=
-github.com/libp2p/go-libp2p-core v0.5.7/go.mod h1:txwbVEhHEXikXn9gfC7/UDDw7rkxuX0bJvM49Ykaswo=
-github.com/libp2p/go-libp2p-core v0.6.0/go.mod h1:txwbVEhHEXikXn9gfC7/UDDw7rkxuX0bJvM49Ykaswo=
-github.com/libp2p/go-libp2p-core v0.6.1/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8=
-github.com/libp2p/go-libp2p-core v0.7.0/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8=
-github.com/libp2p/go-libp2p-core v0.8.0/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8=
 github.com/libp2p/go-libp2p-core v0.8.5 h1:aEgbIcPGsKy6zYcC+5AJivYFedhYa4sW7mIpWpUaLKw=
 github.com/libp2p/go-libp2p-core v0.8.5/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8=
-github.com/libp2p/go-libp2p-crypto v0.1.0/go.mod h1:sPUokVISZiy+nNuTTH/TY+leRSxnFj/2GLjtOTW90hI=
-github.com/libp2p/go-libp2p-discovery v0.2.0/go.mod h1:s4VGaxYMbw4+4+tsoQTqh7wfxg97AEdo4GYBt6BadWg=
-github.com/libp2p/go-libp2p-discovery v0.3.0/go.mod h1:o03drFnz9BVAZdzC/QUQ+NeQOu38Fu7LJGEOK2gQltw=
-github.com/libp2p/go-libp2p-discovery v0.5.0 h1:Qfl+e5+lfDgwdrXdu4YNCWyEo3fWuP+WgN9mN0iWviQ=
-github.com/libp2p/go-libp2p-discovery v0.5.0/go.mod h1:+srtPIU9gDaBNu//UHvcdliKBIcr4SfDcm0/PfPJLug=
-github.com/libp2p/go-libp2p-kad-dht v0.11.1 h1:FsriVQhOUZpCotWIjyFSjEDNJmUzuMma/RyyTDZanwc=
-github.com/libp2p/go-libp2p-kad-dht v0.11.1/go.mod h1:5ojtR2acDPqh/jXf5orWy8YGb8bHQDS+qeDcoscL/PI=
-github.com/libp2p/go-libp2p-kbucket v0.4.7 h1:spZAcgxifvFZHBD8tErvppbnNiKA5uokDu3CV7axu70=
-github.com/libp2p/go-libp2p-kbucket v0.4.7/go.mod h1:XyVo99AfQH0foSf176k4jY1xUJ2+jUJIZCSDm7r2YKk=
-github.com/libp2p/go-libp2p-loggables v0.1.0 h1:h3w8QFfCt2UJl/0/NW4K829HX/0S4KD31PQ7m8UXXO8=
-github.com/libp2p/go-libp2p-loggables v0.1.0/go.mod h1:EyumB2Y6PrYjr55Q3/tiJ/o3xoDasoRYM7nOzEpoa90=
-github.com/libp2p/go-libp2p-mplex v0.2.0/go.mod h1:Ejl9IyjvXJ0T9iqUTE1jpYATQ9NM3g+OtR+EMMODbKo=
-github.com/libp2p/go-libp2p-mplex v0.2.1/go.mod h1:SC99Rxs8Vuzrf/6WhmH41kNn13TiYdAWNYHrwImKLnE=
-github.com/libp2p/go-libp2p-mplex v0.2.2/go.mod h1:74S9eum0tVQdAfFiKxAyKzNdSuLqw5oadDq7+L/FELo=
-github.com/libp2p/go-libp2p-mplex v0.2.3/go.mod h1:CK3p2+9qH9x+7ER/gWWDYJ3QW5ZxWDkm+dVvjfuG3ek=
-github.com/libp2p/go-libp2p-mplex v0.3.0/go.mod h1:l9QWxRbbb5/hQMECEb908GbS9Sm2UAR2KFZKUJEynEs=
-github.com/libp2p/go-libp2p-mplex v0.4.0/go.mod h1:yCyWJE2sc6TBTnFpjvLuEJgTSw/u+MamvzILKdX7asw=
-github.com/libp2p/go-libp2p-mplex v0.4.1 h1:/pyhkP1nLwjG3OM+VuaNJkQT/Pqq73WzB3aDN3Fx1sc=
-github.com/libp2p/go-libp2p-mplex v0.4.1/go.mod h1:cmy+3GfqfM1PceHTLL7zQzAAYaryDu6iPSC+CIb094g=
-github.com/libp2p/go-libp2p-nat v0.0.5/go.mod h1:1qubaE5bTZMJE+E/uu2URroMbzdubFz1ChgiN79yKPE=
-github.com/libp2p/go-libp2p-nat v0.0.6 h1:wMWis3kYynCbHoyKLPBEMu4YRLltbm8Mk08HGSfvTkU=
-github.com/libp2p/go-libp2p-nat v0.0.6/go.mod h1:iV59LVhB3IkFvS6S6sauVTSOrNEANnINbI/fkaLimiw=
-github.com/libp2p/go-libp2p-netutil v0.1.0 h1:zscYDNVEcGxyUpMd0JReUZTrpMfia8PmLKcKF72EAMQ=
-github.com/libp2p/go-libp2p-netutil v0.1.0/go.mod h1:3Qv/aDqtMLTUyQeundkKsA+YCThNdbQD54k3TqjpbFU=
-github.com/libp2p/go-libp2p-noise v0.1.1/go.mod h1:QDFLdKX7nluB7DEnlVPbz7xlLHdwHFA9HiohJRr3vwM=
-github.com/libp2p/go-libp2p-noise v0.1.2 h1:IH9GRihQJTx56obm+GnpdPX4KeVIlvpXrP6xnJ0wxWk=
-github.com/libp2p/go-libp2p-noise v0.1.2/go.mod h1:9B10b7ueo7TIxZHHcjcDCo5Hd6kfKT2m77by82SFRfE=
-github.com/libp2p/go-libp2p-peer v0.2.0/go.mod h1:RCffaCvUyW2CJmG2gAWVqwePwW7JMgxjsHm7+J5kjWY=
-github.com/libp2p/go-libp2p-peerstore v0.1.0/go.mod h1:2CeHkQsr8svp4fZ+Oi9ykN1HBb6u0MOvdJ7YIsmcwtY=
-github.com/libp2p/go-libp2p-peerstore v0.1.3/go.mod h1:BJ9sHlm59/80oSkpWgr1MyY1ciXAXV397W6h1GH/uKI=
-github.com/libp2p/go-libp2p-peerstore v0.1.4/go.mod h1:+4BDbDiiKf4PzpANZDAT+knVdLxvqh7hXOujessqdzs=
-github.com/libp2p/go-libp2p-peerstore v0.2.0/go.mod h1:N2l3eVIeAitSg3Pi2ipSrJYnqhVnMNQZo9nkSCuAbnQ=
-github.com/libp2p/go-libp2p-peerstore v0.2.1/go.mod h1:NQxhNjWxf1d4w6PihR8btWIRjwRLBr4TYKfNgrUkOPA=
-github.com/libp2p/go-libp2p-peerstore v0.2.2/go.mod h1:NQxhNjWxf1d4w6PihR8btWIRjwRLBr4TYKfNgrUkOPA=
-github.com/libp2p/go-libp2p-peerstore v0.2.6/go.mod h1:ss/TWTgHZTMpsU/oKVVPQCGuDHItOpf2W8RxAi50P2s=
 github.com/libp2p/go-libp2p-peerstore v0.2.7 h1:83JoLxyR9OYTnNfB5vvFqvMUv/xDNa6NoPHnENhBsGw=
 github.com/libp2p/go-libp2p-peerstore v0.2.7/go.mod h1:ss/TWTgHZTMpsU/oKVVPQCGuDHItOpf2W8RxAi50P2s=
-github.com/libp2p/go-libp2p-pnet v0.2.0 h1:J6htxttBipJujEjz1y0a5+eYoiPcFHhSYHH6na5f0/k=
-github.com/libp2p/go-libp2p-pnet v0.2.0/go.mod h1:Qqvq6JH/oMZGwqs3N1Fqhv8NVhrdYcO0BW4wssv21LA=
-github.com/libp2p/go-libp2p-record v0.1.2/go.mod h1:pal0eNcT5nqZaTV7UGhqeGqxFgGdsU/9W//C8dqjQDk=
-github.com/libp2p/go-libp2p-record v0.1.3 h1:R27hoScIhQf/A8XJZ8lYpnqh9LatJ5YbHs28kCIfql0=
-github.com/libp2p/go-libp2p-record v0.1.3/go.mod h1:yNUff/adKIfPnYQXgp6FQmNu3gLJ6EMg7+/vv2+9pY4=
-github.com/libp2p/go-libp2p-routing-helpers v0.2.3/go.mod h1:795bh+9YeoFl99rMASoiVgHdi5bjack0N1+AFAdbvBw=
-github.com/libp2p/go-libp2p-secio v0.1.0/go.mod h1:tMJo2w7h3+wN4pgU2LSYeiKPrfqBgkOsdiKK77hE7c8=
-github.com/libp2p/go-libp2p-secio v0.2.0/go.mod h1:2JdZepB8J5V9mBp79BmwsaPQhRPNN2NrnB2lKQcdy6g=
-github.com/libp2p/go-libp2p-secio v0.2.1/go.mod h1:cWtZpILJqkqrSkiYcDBh5lA3wbT2Q+hz3rJQq3iftD8=
-github.com/libp2p/go-libp2p-secio v0.2.2/go.mod h1:wP3bS+m5AUnFA+OFO7Er03uO1mncHG0uVwGrwvjYlNY=
-github.com/libp2p/go-libp2p-swarm v0.1.0/go.mod h1:wQVsCdjsuZoc730CgOvh5ox6K8evllckjebkdiY5ta4=
-github.com/libp2p/go-libp2p-swarm v0.2.2/go.mod h1:fvmtQ0T1nErXym1/aa1uJEyN7JzaTNyBcHImCxRpPKU=
-github.com/libp2p/go-libp2p-swarm v0.2.3/go.mod h1:P2VO/EpxRyDxtChXz/VPVXyTnszHvokHKRhfkEgFKNM=
-github.com/libp2p/go-libp2p-swarm v0.2.8/go.mod h1:JQKMGSth4SMqonruY0a8yjlPVIkb0mdNSwckW7OYziM=
-github.com/libp2p/go-libp2p-swarm v0.3.0/go.mod h1:hdv95GWCTmzkgeJpP+GK/9D9puJegb7H57B5hWQR5Kk=
-github.com/libp2p/go-libp2p-swarm v0.3.1/go.mod h1:hdv95GWCTmzkgeJpP+GK/9D9puJegb7H57B5hWQR5Kk=
-github.com/libp2p/go-libp2p-swarm v0.4.0 h1:hahq/ijRoeH6dgROOM8x7SeaKK5VgjjIr96vdrT+NUA=
-github.com/libp2p/go-libp2p-swarm v0.4.0/go.mod h1:XVFcO52VoLoo0eitSxNQWYq4D6sydGOweTOAjJNraCw=
-github.com/libp2p/go-libp2p-testing v0.0.2/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
-github.com/libp2p/go-libp2p-testing v0.0.3/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
-github.com/libp2p/go-libp2p-testing v0.0.4/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
-github.com/libp2p/go-libp2p-testing v0.1.0/go.mod h1:xaZWMJrPUM5GlDBxCeGUi7kI4eqnjVyavGroI2nxEM0=
-github.com/libp2p/go-libp2p-testing v0.1.1/go.mod h1:xaZWMJrPUM5GlDBxCeGUi7kI4eqnjVyavGroI2nxEM0=
-github.com/libp2p/go-libp2p-testing v0.1.2-0.20200422005655-8775583591d8/go.mod h1:Qy8sAncLKpwXtS2dSnDOP8ktexIAHKu+J+pnZOFZLTc=
-github.com/libp2p/go-libp2p-testing v0.3.0/go.mod h1:efZkql4UZ7OVsEfaxNHZPzIehtsBXMrXnCfJIgDti5g=
-github.com/libp2p/go-libp2p-testing v0.4.0 h1:PrwHRi0IGqOwVQWR3xzgigSlhlLfxgfXgkHxr77EghQ=
-github.com/libp2p/go-libp2p-testing v0.4.0/go.mod h1:Q+PFXYoiYFN5CAEG2w3gLPEzotlKsNSbKQ/lImlOWF0=
-github.com/libp2p/go-libp2p-tls v0.1.3 h1:twKMhMu44jQO+HgQK9X8NHO5HkeJu2QbhLzLJpa8oNM=
-github.com/libp2p/go-libp2p-tls v0.1.3/go.mod h1:wZfuewxOndz5RTnCAxFliGjvYSDA40sKitV4c50uI1M=
-github.com/libp2p/go-libp2p-transport-upgrader v0.1.1/go.mod h1:IEtA6or8JUbsV07qPW4r01GnTenLW4oi3lOPbUMGJJA=
-github.com/libp2p/go-libp2p-transport-upgrader v0.2.0/go.mod h1:mQcrHj4asu6ArfSoMuyojOdjx73Q47cYD7s5+gZOlns=
-github.com/libp2p/go-libp2p-transport-upgrader v0.3.0/go.mod h1:i+SKzbRnvXdVbU3D1dwydnTmKRPXiAR/fyvi1dXuL4o=
-github.com/libp2p/go-libp2p-transport-upgrader v0.4.0 h1:xwj4h3hJdBrxqMOyMUjwscjoVst0AASTsKtZiTChoHI=
-github.com/libp2p/go-libp2p-transport-upgrader v0.4.0/go.mod h1:J4ko0ObtZSmgn5BX5AmegP+dK3CSnU2lMCKsSq/EY0s=
-github.com/libp2p/go-libp2p-yamux v0.2.0/go.mod h1:Db2gU+XfLpm6E4rG5uGCFX6uXA8MEXOxFcRoXUODaK8=
-github.com/libp2p/go-libp2p-yamux v0.2.2/go.mod h1:lIohaR0pT6mOt0AZ0L2dFze9hds9Req3OfS+B+dv4qw=
-github.com/libp2p/go-libp2p-yamux v0.2.5/go.mod h1:Zpgj6arbyQrmZ3wxSZxfBmbdnWtbZ48OpsfmQVTErwA=
-github.com/libp2p/go-libp2p-yamux v0.2.7/go.mod h1:X28ENrBMU/nm4I3Nx4sZ4dgjZ6VhLEn0XhIoZ5viCwU=
-github.com/libp2p/go-libp2p-yamux v0.2.8/go.mod h1:/t6tDqeuZf0INZMTgd0WxIRbtK2EzI2h7HbFm9eAKI4=
-github.com/libp2p/go-libp2p-yamux v0.4.0/go.mod h1:+DWDjtFMzoAwYLVkNZftoucn7PelNoy5nm3tZ3/Zw30=
-github.com/libp2p/go-libp2p-yamux v0.5.0/go.mod h1:AyR8k5EzyM2QN9Bbdg6X1SkVVuqLwTGf0L4DFq9g6po=
-github.com/libp2p/go-libp2p-yamux v0.5.1 h1:sX4WQPHMhRxJE5UZTfjEuBvlQWXB5Bo3A2JK9ZJ9EM0=
-github.com/libp2p/go-libp2p-yamux v0.5.1/go.mod h1:dowuvDu8CRWmr0iqySMiSxK+W0iL5cMVO9S94Y6gkv4=
-github.com/libp2p/go-maddr-filter v0.0.4/go.mod h1:6eT12kSQMA9x2pvFQa+xesMKUBlj9VImZbj3B9FBH/Q=
-github.com/libp2p/go-maddr-filter v0.0.5/go.mod h1:Jk+36PMfIqCJhAnaASRH83bdAvfDRp/w6ENFaC9bG+M=
 github.com/libp2p/go-maddr-filter v0.1.0/go.mod h1:VzZhTXkMucEGGEOSKddrwGiOv0tUhgnKqNEmIAz/bPU=
-github.com/libp2p/go-mplex v0.0.3/go.mod h1:pK5yMLmOoBR1pNCqDlA2GQrdAVTMkqFalaTWe7l4Yd0=
-github.com/libp2p/go-mplex v0.1.0/go.mod h1:SXgmdki2kwCUlCCbfGLEgHjC4pFqhTp0ZoV6aiKgxDU=
-github.com/libp2p/go-mplex v0.1.1/go.mod h1:Xgz2RDCi3co0LeZfgjm4OgUF15+sVR8SRcu3SFXI1lk=
-github.com/libp2p/go-mplex v0.1.2/go.mod h1:Xgz2RDCi3co0LeZfgjm4OgUF15+sVR8SRcu3SFXI1lk=
-github.com/libp2p/go-mplex v0.2.0/go.mod h1:0Oy/A9PQlwBytDRp4wSkFnzHYDKcpLot35JQ6msjvYQ=
-github.com/libp2p/go-mplex v0.3.0 h1:U1T+vmCYJaEoDJPV1aq31N56hS+lJgb397GsylNSgrU=
-github.com/libp2p/go-mplex v0.3.0/go.mod h1:0Oy/A9PQlwBytDRp4wSkFnzHYDKcpLot35JQ6msjvYQ=
-github.com/libp2p/go-msgio v0.0.2/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
 github.com/libp2p/go-msgio v0.0.4/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
-github.com/libp2p/go-msgio v0.0.6 h1:lQ7Uc0kS1wb1EfRxO2Eir/RJoHkHn7t6o+EiwsYIKJA=
 github.com/libp2p/go-msgio v0.0.6/go.mod h1:4ecVB6d9f4BDSL5fqvPiC4A3KivjWn+Venn/1ALLMWA=
-github.com/libp2p/go-nat v0.0.4/go.mod h1:Nmw50VAvKuk38jUBcmNh6p9lUJLoODbJRvYAa/+KSDo=
-github.com/libp2p/go-nat v0.0.5 h1:qxnwkco8RLKqVh1NmjQ+tJ8p8khNLFxuElYG/TwqW4Q=
-github.com/libp2p/go-nat v0.0.5/go.mod h1:B7NxsVNPZmRLvMOwiEO1scOSyjA56zxYAGv1yQgRkEU=
-github.com/libp2p/go-netroute v0.1.2/go.mod h1:jZLDV+1PE8y5XxBySEBgbuVAXbhtuHSdmLPL2n9MKbk=
-github.com/libp2p/go-netroute v0.1.3/go.mod h1:jZLDV+1PE8y5XxBySEBgbuVAXbhtuHSdmLPL2n9MKbk=
-github.com/libp2p/go-netroute v0.1.4 h1:47V0+hJfYaqj1WO0A+cDkRc9xr9qKiK7i8zaoGv8Mmo=
-github.com/libp2p/go-netroute v0.1.4/go.mod h1:jZLDV+1PE8y5XxBySEBgbuVAXbhtuHSdmLPL2n9MKbk=
-github.com/libp2p/go-openssl v0.0.2/go.mod h1:v8Zw2ijCSWBQi8Pq5GAixw6DbFfa9u6VIYDXnvOXkc0=
-github.com/libp2p/go-openssl v0.0.3/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
 github.com/libp2p/go-openssl v0.0.4/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
-github.com/libp2p/go-openssl v0.0.5/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
 github.com/libp2p/go-openssl v0.0.7 h1:eCAzdLejcNVBzP/iZM9vqHnQm+XyCEbSSIheIPRGNsw=
 github.com/libp2p/go-openssl v0.0.7/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
-github.com/libp2p/go-reuseport v0.0.1/go.mod h1:jn6RmB1ufnQwl0Q1f+YxAj8isJgDCQzaaxIFYDhcYEA=
-github.com/libp2p/go-reuseport v0.0.2 h1:XSG94b1FJfGA01BUrT82imejHQyTxO4jEWqheyCXYvU=
-github.com/libp2p/go-reuseport v0.0.2/go.mod h1:SPD+5RwGC7rcnzngoYC86GjPzjSywuQyMVAheVBD9nQ=
-github.com/libp2p/go-reuseport-transport v0.0.2/go.mod h1:YkbSDrvjUVDL6b8XqriyA20obEtsW9BLkuOUyQAOCbs=
-github.com/libp2p/go-reuseport-transport v0.0.3/go.mod h1:Spv+MPft1exxARzP2Sruj2Wb5JSyHNncjf1Oi2dEbzM=
-github.com/libp2p/go-reuseport-transport v0.0.4 h1:OZGz0RB620QDGpv300n1zaOcKGGAoGVf8h9txtt/1uM=
-github.com/libp2p/go-reuseport-transport v0.0.4/go.mod h1:trPa7r/7TJK/d+0hdBLOCGvpQQVOU74OXbNCIMkufGw=
-github.com/libp2p/go-sockaddr v0.0.2/go.mod h1:syPvOmNs24S3dFVGJA1/mrqdeijPxLV2Le3BRLKd68k=
-github.com/libp2p/go-sockaddr v0.1.0 h1:Y4s3/jNoryVRKEBrkJ576F17CPOaMIzUeCsg7dlTDj0=
-github.com/libp2p/go-sockaddr v0.1.0/go.mod h1:syPvOmNs24S3dFVGJA1/mrqdeijPxLV2Le3BRLKd68k=
-github.com/libp2p/go-stream-muxer v0.0.1/go.mod h1:bAo8x7YkSpadMTbtTaxGVHWUQsR/l5MEaHbKaliuT14=
-github.com/libp2p/go-stream-muxer-multistream v0.2.0/go.mod h1:j9eyPol/LLRqT+GPLSxvimPhNph4sfYfMoDPd7HkzIc=
-github.com/libp2p/go-stream-muxer-multistream v0.3.0 h1:TqnSHPJEIqDEO7h1wZZ0p3DXdvDSiLHQidKKUGZtiOY=
-github.com/libp2p/go-stream-muxer-multistream v0.3.0/go.mod h1:yDh8abSIzmZtqtOt64gFJUXEryejzNb0lisTt+fAMJA=
-github.com/libp2p/go-tcp-transport v0.1.0/go.mod h1:oJ8I5VXryj493DEJ7OsBieu8fcg2nHGctwtInJVpipc=
-github.com/libp2p/go-tcp-transport v0.1.1/go.mod h1:3HzGvLbx6etZjnFlERyakbaYPdfjg2pWP97dFZworkY=
-github.com/libp2p/go-tcp-transport v0.2.0/go.mod h1:vX2U0CnWimU4h0SGSEsg++AzvBcroCGYw28kh94oLe0=
-github.com/libp2p/go-tcp-transport v0.2.1 h1:ExZiVQV+h+qL16fzCWtd1HSzPsqWottJ8KXwWaVi8Ns=
-github.com/libp2p/go-tcp-transport v0.2.1/go.mod h1:zskiJ70MEfWz2MKxvFB/Pv+tPIB1PpPUrHIWQ8aFw7M=
-github.com/libp2p/go-ws-transport v0.2.0/go.mod h1:9BHJz/4Q5A9ludYWKoGCFC5gUElzlHoKzu0yY9p/klM=
-github.com/libp2p/go-ws-transport v0.3.0/go.mod h1:bpgTJmRZAvVHrgHybCVyqoBmyLQ1fiZuEaBYusP5zsk=
-github.com/libp2p/go-ws-transport v0.3.1/go.mod h1:bpgTJmRZAvVHrgHybCVyqoBmyLQ1fiZuEaBYusP5zsk=
-github.com/libp2p/go-ws-transport v0.4.0 h1:9tvtQ9xbws6cA5LvqdE6Ne3vcmGB4f1z9SByggk4s0k=
-github.com/libp2p/go-ws-transport v0.4.0/go.mod h1:EcIEKqf/7GDjth6ksuS/6p7R49V4CBY6/E7R/iyhYUA=
-github.com/libp2p/go-yamux v1.2.2/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow=
-github.com/libp2p/go-yamux v1.3.0/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow=
-github.com/libp2p/go-yamux v1.3.3/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow=
-github.com/libp2p/go-yamux v1.3.5/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow=
-github.com/libp2p/go-yamux v1.3.7/go.mod h1:fr7aVgmdNGJK+N1g+b6DW6VxzbRCjCOejR/hkmpooHE=
-github.com/libp2p/go-yamux v1.4.0/go.mod h1:fr7aVgmdNGJK+N1g+b6DW6VxzbRCjCOejR/hkmpooHE=
-github.com/libp2p/go-yamux v1.4.1/go.mod h1:fr7aVgmdNGJK+N1g+b6DW6VxzbRCjCOejR/hkmpooHE=
-github.com/libp2p/go-yamux/v2 v2.0.0 h1:vSGhAy5u6iHBq11ZDcyHH4Blcf9xlBhT4WQDoOE90LU=
-github.com/libp2p/go-yamux/v2 v2.0.0/go.mod h1:NVWira5+sVUIU6tu1JWvaRn1dRnG+cawOJiflsAM+7U=
 github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8=
 github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
@@ -1173,7 +921,6 @@ github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czP
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
-github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA=
 github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg=
 github.com/manyminds/api2go v0.0.0-20171030193247-e7b693844a6f h1:tVvGiZQFjOXP+9YyGqSA6jE55x1XVxmoPYudncxrZ8U=
@@ -1190,7 +937,6 @@ github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
@@ -1212,12 +958,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5
 github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg=
 github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k=
 github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8=
-github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
 github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
-github.com/miekg/dns v1.1.12/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
-github.com/miekg/dns v1.1.28/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
-github.com/miekg/dns v1.1.31/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
 github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM=
 github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 h1:QRUSJEgZn2Snx0EmT/QLXibWjSUDjKWvXIT19NBVp94=
 github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM=
@@ -1225,9 +967,6 @@ github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 h1:lYpkrQH5ajf0
 github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ=
 github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g=
 github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY=
-github.com/minio/sha256-simd v0.0.0-20190131020904-2d45a736cd16/go.mod h1:2FMWW+8GMoPweT6+pI63m9YE3Lmw4J71hV56Chs1E/U=
-github.com/minio/sha256-simd v0.0.0-20190328051042-05b4dd3047e5/go.mod h1:2FMWW+8GMoPweT6+pI63m9YE3Lmw4J71hV56Chs1E/U=
-github.com/minio/sha256-simd v0.1.0/go.mod h1:2FMWW+8GMoPweT6+pI63m9YE3Lmw4J71hV56Chs1E/U=
 github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
 github.com/minio/sha256-simd v0.1.1 h1:5QHSlgo3nt5yKOJrC7W8w7X+NFl8cMPZm96iu8kKUJU=
 github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
@@ -1265,7 +1004,6 @@ github.com/mostynb/zstdpool-freelist v0.0.0-20201229113212-927304c0c3b1 h1:mPMvm
 github.com/mostynb/zstdpool-freelist v0.0.0-20201229113212-927304c0c3b1/go.mod h1:ye2e/VUEtE2BHE+G/QcKkcLQVAEJoYRFj5VUOQatCRE=
 github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ=
 github.com/mr-tron/base58 v1.1.0/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8=
-github.com/mr-tron/base58 v1.1.1/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8=
 github.com/mr-tron/base58 v1.1.2/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/mr-tron/base58 v1.1.3/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
@@ -1276,50 +1014,24 @@ github.com/multiformats/go-base32 v0.0.3 h1:tw5+NhuwaOjJCC5Pp82QuXbrmLzWg7uxlMFp
 github.com/multiformats/go-base32 v0.0.3/go.mod h1:pLiuGC8y0QR3Ue4Zug5UzK9LjgbkL8NSQj0zQ5Nz/AA=
 github.com/multiformats/go-base36 v0.1.0 h1:JR6TyF7JjGd3m6FbLU2cOxhC0Li8z8dLNGQ89tUg4F4=
 github.com/multiformats/go-base36 v0.1.0/go.mod h1:kFGE83c6s80PklsHO9sRn2NCoffoRdUUOENyW/Vv6sM=
-github.com/multiformats/go-multiaddr v0.0.1/go.mod h1:xKVEak1K9cS1VdmPZW3LSIb6lgmoS58qz/pzqmAxV44=
-github.com/multiformats/go-multiaddr v0.0.2/go.mod h1:xKVEak1K9cS1VdmPZW3LSIb6lgmoS58qz/pzqmAxV44=
-github.com/multiformats/go-multiaddr v0.0.4/go.mod h1:xKVEak1K9cS1VdmPZW3LSIb6lgmoS58qz/pzqmAxV44=
-github.com/multiformats/go-multiaddr v0.1.0/go.mod h1:xKVEak1K9cS1VdmPZW3LSIb6lgmoS58qz/pzqmAxV44=
 github.com/multiformats/go-multiaddr v0.1.1/go.mod h1:aMKBKNEYmzmDmxfX88/vz+J5IU55txyt0p4aiWVohjo=
-github.com/multiformats/go-multiaddr v0.2.0/go.mod h1:0nO36NvPpyV4QzvTLi/lafl2y95ncPj0vFwVF6k6wJ4=
 github.com/multiformats/go-multiaddr v0.2.1/go.mod h1:s/Apk6IyxfvMjDafnhJgJ3/46z7tZ04iMk5wP4QMGGE=
 github.com/multiformats/go-multiaddr v0.2.2/go.mod h1:NtfXiOtHvghW9KojvtySjH5y0u0xW5UouOmQQrn6a3Y=
 github.com/multiformats/go-multiaddr v0.3.0/go.mod h1:dF9kph9wfJ+3VLAaeBqo9Of8x4fJxp6ggJGteB8HQTI=
-github.com/multiformats/go-multiaddr v0.3.1/go.mod h1:uPbspcUPd5AfaP6ql3ujFY+QWzmBD8uLLL4bXW0XfGc=
 github.com/multiformats/go-multiaddr v0.3.3 h1:vo2OTSAqnENB2rLk79pLtr+uhj+VAzSe3uef5q0lRSs=
 github.com/multiformats/go-multiaddr v0.3.3/go.mod h1:lCKNGP1EQ1eZ35Za2wlqnabm9xQkib3fyB+nZXHLag0=
-github.com/multiformats/go-multiaddr-dns v0.0.1/go.mod h1:9kWcqw/Pj6FwxAwW38n/9403szc57zJPs45fmnznu3Q=
-github.com/multiformats/go-multiaddr-dns v0.0.2/go.mod h1:9kWcqw/Pj6FwxAwW38n/9403szc57zJPs45fmnznu3Q=
-github.com/multiformats/go-multiaddr-dns v0.2.0 h1:YWJoIDwLePniH7OU5hBnDZV6SWuvJqJ0YtN6pLeH9zA=
-github.com/multiformats/go-multiaddr-dns v0.2.0/go.mod h1:TJ5pr5bBO7Y1B18djPuRsVkduhQH2YqYSbxWJzYGdK0=
-github.com/multiformats/go-multiaddr-fmt v0.0.1/go.mod h1:aBYjqL4T/7j4Qx+R73XSv/8JsgnRFlf0w2KGLCmXl3Q=
 github.com/multiformats/go-multiaddr-fmt v0.1.0 h1:WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E=
 github.com/multiformats/go-multiaddr-fmt v0.1.0/go.mod h1:hGtDIW4PU4BqJ50gW2quDuPVjyWNZxToGUh/HwTZYJo=
-github.com/multiformats/go-multiaddr-net v0.0.1/go.mod h1:nw6HSxNmCIQH27XPGBuX+d1tnvM7ihcFwHMSstNAVUU=
-github.com/multiformats/go-multiaddr-net v0.1.0/go.mod h1:5JNbcfBOP4dnhoZOv10JJVkJO0pCCEf8mTnipAo2UZQ=
-github.com/multiformats/go-multiaddr-net v0.1.1/go.mod h1:5JNbcfBOP4dnhoZOv10JJVkJO0pCCEf8mTnipAo2UZQ=
-github.com/multiformats/go-multiaddr-net v0.1.2/go.mod h1:QsWt3XK/3hwvNxZJp92iMQKME1qHfpYmyIjFVsSOY6Y=
-github.com/multiformats/go-multiaddr-net v0.1.3/go.mod h1:ilNnaM9HbmVFqsb/qcNysjCu4PVONlrBZpHIrw/qQuA=
 github.com/multiformats/go-multiaddr-net v0.1.4/go.mod h1:ilNnaM9HbmVFqsb/qcNysjCu4PVONlrBZpHIrw/qQuA=
-github.com/multiformats/go-multiaddr-net v0.1.5/go.mod h1:ilNnaM9HbmVFqsb/qcNysjCu4PVONlrBZpHIrw/qQuA=
 github.com/multiformats/go-multiaddr-net v0.2.0 h1:MSXRGN0mFymt6B1yo/6BPnIRpLPEnKgQNvVfCX5VDJk=
 github.com/multiformats/go-multiaddr-net v0.2.0/go.mod h1:gGdH3UXny6U3cKKYCvpXI5rnK7YaOIEOPVDI9tsJbEA=
 github.com/multiformats/go-multibase v0.0.1/go.mod h1:bja2MqRZ3ggyXtZSEDKpl0uO/gviWFaSteVbWT51qgs=
 github.com/multiformats/go-multibase v0.0.3 h1:l/B6bJDQjvQ5G52jw4QGSYeOTZoAwIO77RblWplfIqk=
 github.com/multiformats/go-multibase v0.0.3/go.mod h1:5+1R4eQrT3PkYZ24C3W2Ue2tPwIdYQD509ZjSb5y9Oc=
-github.com/multiformats/go-multihash v0.0.1/go.mod h1:w/5tugSrLEbWqlcgJabL3oHFKTwfvkofsjW2Qa1ct4U=
-github.com/multiformats/go-multihash v0.0.5/go.mod h1:lt/HCbqlQwlPBz7lv0sQCdtfcMtlJvakRUn/0Ual8po=
 github.com/multiformats/go-multihash v0.0.8/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=
-github.com/multiformats/go-multihash v0.0.9/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=
-github.com/multiformats/go-multihash v0.0.10/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=
 github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
 github.com/multiformats/go-multihash v0.0.14 h1:QoBceQYQQtNUuf6s7wHxnE2c8bhbMqhfGzNI032se/I=
 github.com/multiformats/go-multihash v0.0.14/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
-github.com/multiformats/go-multistream v0.1.0/go.mod h1:fJTiDfXJVmItycydCnNx4+wSzZ5NwG2FEVAI30fiovg=
-github.com/multiformats/go-multistream v0.1.1/go.mod h1:KmHZ40hzVxiaiwlj3MEbYgK9JFk2/9UktWZAF54Du38=
-github.com/multiformats/go-multistream v0.2.0 h1:6AuNmQVKUkRnddw2YiDjt5Elit40SFxMJkVnhmETXtU=
-github.com/multiformats/go-multistream v0.2.0/go.mod h1:5GZPQZbkWOLOn3J2y4Y99vVW7vOfsAflxARk3x14o6k=
-github.com/multiformats/go-varint v0.0.1/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
 github.com/multiformats/go-varint v0.0.2/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
 github.com/multiformats/go-varint v0.0.5/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
 github.com/multiformats/go-varint v0.0.6 h1:gk85QWKxh3TazbLxED/NlDVv8+q+ReFJk7Y2W/KhfNY=
@@ -1343,9 +1055,7 @@ github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
@@ -1355,9 +1065,7 @@ github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4
 github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
 github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
-github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
@@ -1525,8 +1233,8 @@ github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306 h1:ko88
 github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306/go.mod h1:w1sAEES3g3PuV/RzUrgow20W2uErMly84hhD3um1WL4=
 github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f h1:hgJif132UCdjo8u43i7iPN1/MFnu49hv7lFGFftCHKU=
 github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f/go.mod h1:MvMXoufZAtqExNexqi4cjrNYE9MefKddKylxjS+//n0=
-github.com/smartcontractkit/libocr v0.0.0-20231107151413-13e0202ae8d7 h1:21V61XOYSxpFmFqlhr5IaEh1uQ1F6CewJ30D/U/P34c=
-github.com/smartcontractkit/libocr v0.0.0-20231107151413-13e0202ae8d7/go.mod h1:2lyRkw/qLQgUWlrWWmq5nj0y90rWeO6Y+v+fCakRgb0=
+github.com/smartcontractkit/libocr v0.0.0-20231130143053-c5102a9c0fb7 h1:AA7vf29c6lFsZm+MtIEtXtg6VUOQV6waJo5MUuHfRjQ=
+github.com/smartcontractkit/libocr v0.0.0-20231130143053-c5102a9c0fb7/go.mod h1:WcuWFMskcGK0MYZuH5hEhGJOzdJRUFeNEM4PAKlejI4=
 github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 h1:yiKnypAqP8l0OX0P3klzZ7SCcBUxy5KqTAKZmQOvSQE=
 github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1/go.mod h1:q6f4fe39oZPdsh1i57WznEZgxd8siidMaSFq3wdPmVg=
 github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1 h1:Dai1bn+Q5cpeGMQwRdjOdVjG8mmFFROVkSKuUgBErRQ=
@@ -1535,9 +1243,7 @@ github.com/smartcontractkit/wsrpc v0.7.2 h1:iBXzMeg7vc5YoezIQBq896y25BARw7OKbhrb
 github.com/smartcontractkit/wsrpc v0.7.2/go.mod h1:sj7QX2NQibhkhxTfs3KOhAj/5xwgqMipTvJVSssT9i0=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-github.com/smola/gocompat v0.2.0/go.mod h1:1B0MlxbmoZNo3h8guHp8HztB3BSYR5itql9qtVc0ypY=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
-github.com/spacemonkeygo/openssl v0.0.0-20181017203307-c2dcc5cca94a/go.mod h1:7AyxJNCJ7SBZ1MfVQCWD6Uqo2oubI2Eq2y2eqf+A5r0=
 github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 h1:RC6RW7j+1+HkWaX/Yh71Ee5ZHaHYt7ZP4sQgUrm6cDU=
 github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572/go.mod h1:w0SWMsp6j9O/dk4/ZpIhL+3CkG8ofA2vuv7k+ltqUMc=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
@@ -1565,7 +1271,6 @@ github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5q
 github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
 github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU=
 github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA=
-github.com/src-d/envconfig v1.0.0/go.mod h1:Q9YQZ7BKITldTBnoxsE5gOeB5y66RyPXeue/R4aaNBc=
 github.com/status-im/keycard-go v0.2.0 h1:QDLFswOQu1r5jsycloeQh3bVU8n/NatHHaZobtDnDzA=
 github.com/status-im/keycard-go v0.2.0/go.mod h1:wlp8ZLbsmrF6g6WjugPAx+IzoLrkdf9+mHxBEeo3Hbg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -1643,8 +1348,8 @@ github.com/unrolled/secure v1.13.0 h1:sdr3Phw2+f8Px8HE5sd1EHdj1aV3yUwed/uZXChLFs
 github.com/unrolled/secure v1.13.0/go.mod h1:BmF5hyM6tXczk3MpQkFf1hpKSRqCyhqcbiQtiAF7+40=
 github.com/urfave/cli v1.22.14 h1:ebbhrRiGK2i4naQJr+1Xj92HXZCrK7MsyTS/ob3HnAk=
 github.com/urfave/cli v1.22.14/go.mod h1:X0eDS6pD6Exaclxm99NJ3FiCDRED7vIHpx2mDOHLvkA=
-github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa h1:5SqCsI/2Qya2bCzK15ozrqo2sZxkh0FHynJZOTVoV6Q=
-github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa/go.mod h1:1CNUng3PtjQMtRzJO4FMXBQvkGtuYRxxiR9xMa7jMwI=
+github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs=
+github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
 github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w=
@@ -1655,15 +1360,8 @@ github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+
 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
 github.com/vertica/vertica-sql-go v1.3.3 h1:fL+FKEAEy5ONmsvya2WH5T8bhkvY27y/Ik3ReR2T+Qw=
 github.com/vertica/vertica-sql-go v1.3.3/go.mod h1:jnn2GFuv+O2Jcjktb7zyc4Utlbu9YVqpHH/lx63+1M4=
-github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 h1:EKhdznlJHPMoKr0XTrX+IlJs1LH3lyx2nfr1dOlZ79k=
 github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1/go.mod h1:8UvriyWtv5Q5EOgjHaSseUEdkQfvwFv1I/In/O2M9gc=
 github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc/go.mod h1:bopw91TMyo8J3tvftk8xmU2kPmlrt4nScJQZU2hE5EM=
-github.com/whyrusleeping/go-logging v0.0.1/go.mod h1:lDPYj54zutzG1XYfHAhcc7oNXEburHQBn+Iqd4yS4vE=
-github.com/whyrusleeping/mafmt v1.2.8/go.mod h1:faQJFPbLSxzD9xpA02ttW/tS9vZykNvXwGvqIpk20FA=
-github.com/whyrusleeping/mdns v0.0.0-20190826153040-b9b60ed33aa9/go.mod h1:j4l84WPFclQPj320J9gp0XwNKBb3U0zt5CBqjPp22G4=
-github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7 h1:E9S12nwJwEOXe2d6gT6qxdvqMnNq+VnSsKPgm2ZZNds=
-github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7/go.mod h1:X2c0RVCI1eSUFI8eLcY3c0423ykwiUdxLJtkDvruhjI=
-github.com/x-cray/logrus-prefixed-formatter v0.5.2/go.mod h1:2duySbKsL6M18s5GU7VPsoEPHyzalCE06qoARUCeBBE=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
@@ -1761,7 +1459,6 @@ go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
 go.uber.org/zap v1.14.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
 go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
-go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
 go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ=
 go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
 go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
@@ -1773,26 +1470,18 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190225124518-7f87c0fbb88b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
-golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190618222545-ea8f1a30c443/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200602180216-279210d13fed/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
@@ -1854,7 +1543,6 @@ golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1890,7 +1578,6 @@ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
@@ -1949,17 +1636,13 @@ golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190124100055-b90733256f2e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190219092855-153ac476189d/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190526052359-791d8a0f4d09/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -1968,7 +1651,6 @@ golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -1988,7 +1670,6 @@ golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -2065,7 +1746,6 @@ golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181130052023-1c3d964395ce/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -2240,7 +1920,6 @@ google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
-google.golang.org/grpc v1.28.1/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
 google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
@@ -2296,8 +1975,6 @@ gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24
 gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU=
 gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
-gopkg.in/src-d/go-cli.v0 v0.0.0-20181105080154-d492247bbc0d/go.mod h1:z+K8VcOYVYcSwSjGebuDL6176A1XskgbtNl64NSg+n8=
-gopkg.in/src-d/go-log.v1 v1.0.1/go.mod h1:GN34hKP0g305ysm2/hctJ0Y8nWP3zxXXJ8GFabTyABE=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index 4249cb0e9b7..a161e67941d 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -28,7 +28,7 @@ require (
 	github.com/smartcontractkit/chainlink-testing-framework v1.20.0
 	github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
 	github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000
-	github.com/smartcontractkit/libocr v0.0.0-20231107151413-13e0202ae8d7
+	github.com/smartcontractkit/libocr v0.0.0-20231130143053-c5102a9c0fb7
 	github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1
 	github.com/smartcontractkit/wasp v0.3.6
 	github.com/spf13/cobra v1.6.1
@@ -104,7 +104,7 @@ require (
 	github.com/cli/safeexec v1.0.0 // indirect
 	github.com/cockroachdb/errors v1.9.1 // indirect
 	github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
-	github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811 // indirect
+	github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06 // indirect
 	github.com/cockroachdb/redact v1.1.3 // indirect
 	github.com/cometbft/cometbft v0.37.2 // indirect
 	github.com/cometbft/cometbft-db v0.7.0 // indirect
@@ -124,7 +124,6 @@ require (
 	github.com/cpuguy83/dockercfg v0.3.1 // indirect
 	github.com/danieljoos/wincred v1.1.2 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
 	github.com/deckarep/golang-set/v2 v2.3.0 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
 	github.com/dennwc/varint v1.0.0 // indirect
@@ -147,7 +146,6 @@ require (
 	github.com/fatih/camelcase v1.0.0 // indirect
 	github.com/fatih/color v1.16.0 // indirect
 	github.com/felixge/httpsnoop v1.0.3 // indirect
-	github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/fvbommel/sortorder v1.0.2 // indirect
 	github.com/fxamacker/cbor/v2 v2.5.0 // indirect
@@ -200,7 +198,6 @@ require (
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/go-tpm v0.9.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/gopacket v1.1.19 // indirect
 	github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/gorilla/context v1.1.1 // indirect
@@ -244,13 +241,10 @@ require (
 	github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
 	github.com/holiman/uint256 v1.2.3 // indirect
 	github.com/huandu/skiplist v1.2.0 // indirect
-	github.com/huin/goupnp v1.0.3 // indirect
+	github.com/huin/goupnp v1.3.0 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/ipfs/go-cid v0.0.7 // indirect
-	github.com/ipfs/go-datastore v0.4.5 // indirect
-	github.com/ipfs/go-ipfs-util v0.0.2 // indirect
-	github.com/ipfs/go-ipns v0.0.2 // indirect
 	github.com/ipfs/go-log v1.0.4 // indirect
 	github.com/ipfs/go-log/v2 v2.1.1 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
@@ -262,8 +256,6 @@ require (
 	github.com/jackc/pgtype v1.14.0 // indirect
 	github.com/jackc/pgx/v4 v4.18.1 // indirect
 	github.com/jackpal/go-nat-pmp v1.0.2 // indirect
-	github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
-	github.com/jbenet/goprocess v0.1.4 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/jmhodges/levigo v1.0.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
@@ -272,50 +264,15 @@ require (
 	github.com/julienschmidt/httprouter v1.3.0 // indirect
 	github.com/klauspost/compress v1.17.2 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
-	github.com/koron/go-ssdp v0.0.2 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/leanovate/gopter v0.2.10-0.20210127095200-9abe2343507a // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
-	github.com/libp2p/go-addr-util v0.0.2 // indirect
 	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
-	github.com/libp2p/go-cidranger v1.1.0 // indirect
-	github.com/libp2p/go-conn-security-multistream v0.2.0 // indirect
-	github.com/libp2p/go-eventbus v0.2.1 // indirect
-	github.com/libp2p/go-flow-metrics v0.0.3 // indirect
-	github.com/libp2p/go-libp2p v0.13.0 // indirect
-	github.com/libp2p/go-libp2p-asn-util v0.0.0-20201026210036-4f868c957324 // indirect
-	github.com/libp2p/go-libp2p-autonat v0.4.0 // indirect
-	github.com/libp2p/go-libp2p-blankhost v0.2.0 // indirect
-	github.com/libp2p/go-libp2p-circuit v0.4.0 // indirect
 	github.com/libp2p/go-libp2p-core v0.8.5 // indirect
-	github.com/libp2p/go-libp2p-discovery v0.5.0 // indirect
-	github.com/libp2p/go-libp2p-kad-dht v0.11.1 // indirect
-	github.com/libp2p/go-libp2p-kbucket v0.4.7 // indirect
-	github.com/libp2p/go-libp2p-loggables v0.1.0 // indirect
-	github.com/libp2p/go-libp2p-mplex v0.4.1 // indirect
-	github.com/libp2p/go-libp2p-nat v0.0.6 // indirect
-	github.com/libp2p/go-libp2p-noise v0.1.2 // indirect
 	github.com/libp2p/go-libp2p-peerstore v0.2.7 // indirect
-	github.com/libp2p/go-libp2p-pnet v0.2.0 // indirect
-	github.com/libp2p/go-libp2p-record v0.1.3 // indirect
-	github.com/libp2p/go-libp2p-swarm v0.4.0 // indirect
-	github.com/libp2p/go-libp2p-tls v0.1.3 // indirect
-	github.com/libp2p/go-libp2p-transport-upgrader v0.4.0 // indirect
-	github.com/libp2p/go-libp2p-yamux v0.5.1 // indirect
-	github.com/libp2p/go-mplex v0.3.0 // indirect
-	github.com/libp2p/go-msgio v0.0.6 // indirect
-	github.com/libp2p/go-nat v0.0.5 // indirect
-	github.com/libp2p/go-netroute v0.1.4 // indirect
 	github.com/libp2p/go-openssl v0.0.7 // indirect
-	github.com/libp2p/go-reuseport v0.0.2 // indirect
-	github.com/libp2p/go-reuseport-transport v0.0.4 // indirect
-	github.com/libp2p/go-sockaddr v0.1.0 // indirect
-	github.com/libp2p/go-stream-muxer-multistream v0.3.0 // indirect
-	github.com/libp2p/go-tcp-transport v0.2.1 // indirect
-	github.com/libp2p/go-ws-transport v0.4.0 // indirect
-	github.com/libp2p/go-yamux/v2 v2.0.0 // indirect
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
 	github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
@@ -346,12 +303,10 @@ require (
 	github.com/multiformats/go-base32 v0.0.3 // indirect
 	github.com/multiformats/go-base36 v0.1.0 // indirect
 	github.com/multiformats/go-multiaddr v0.3.3 // indirect
-	github.com/multiformats/go-multiaddr-dns v0.2.0 // indirect
 	github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
 	github.com/multiformats/go-multiaddr-net v0.2.0 // indirect
 	github.com/multiformats/go-multibase v0.0.3 // indirect
 	github.com/multiformats/go-multihash v0.0.14 // indirect
-	github.com/multiformats/go-multistream v0.2.2 // indirect
 	github.com/multiformats/go-varint v0.0.6 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
@@ -432,8 +387,6 @@ require (
 	github.com/ugorji/go/codec v1.2.11 // indirect
 	github.com/umbracle/fastrlp v0.0.0-20220527094140-59d5dd30e722 // indirect
 	github.com/valyala/fastjson v1.4.1 // indirect
-	github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
-	github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xlab/treeprint v1.1.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.3 // indirect
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index d4b804101da..0392afe287a 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -79,7 +79,6 @@ github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
 github.com/AlekSi/pointer v1.1.0 h1:SSDMPcXD9jSl8FPy9cRzoRaMJtm9g9ggGTxecRUbQoI=
 github.com/AlekSi/pointer v1.1.0/go.mod h1:y7BvfRI3wXPWKXEBhU71nbnIEEZX0QTSB2Bj48UJIZE=
-github.com/AndreasBriese/bbloom v0.0.0-20180913140656-343706a395b7/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/Azure/azure-sdk-for-go v65.0.0+incompatible h1:HzKLt3kIwMm4KeJYTdx9EbjRYTySD/t8i1Ee/W5EGXw=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.8.0 h1:9kDVnTz3vbfweTqAUmk/a/pH5pWFCHtvRpHYC0G/dcA=
@@ -125,7 +124,6 @@ github.com/K-Phoen/grabana v0.21.17 h1:mO/9DvJWC/qpTF/X5jQDm5eKgCBaCGypP/tEfXAvK
 github.com/K-Phoen/grabana v0.21.17/go.mod h1:vbASQt9UiQhX4lC3/opLpJMJ8m+hsTUU2FwkQMytHK4=
 github.com/K-Phoen/sdk v0.12.2 h1:0QofDlKE+lloyBOzhjEEMW21061zts/WIpfpQ5NLLAs=
 github.com/K-Phoen/sdk v0.12.2/go.mod h1:qmM0wO23CtoDux528MXPpYvS4XkRWkWX6rvX9Za8EVU=
-github.com/Kubuxu/go-os-helper v0.0.1/go.mod h1:N8B+I7vPCT80IcP58r50u4+gEEcsZETFUpAzWW2ep1Y=
 github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
 github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
 github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
@@ -285,15 +283,16 @@ github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b80
 github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw=
 github.com/cockroachdb/apd/v3 v3.1.0 h1:MK3Ow7LH0W8zkd5GMKA1PvS9qG3bWFI95WaVNfyZJ/w=
 github.com/cockroachdb/apd/v3 v3.1.0/go.mod h1:6qgPBMXjATAdD/VefbRP9NoSLKjbB4LCoA7gN4LpHs4=
-github.com/cockroachdb/datadriven v1.0.2 h1:H9MtNqVoVhvd9nCBwOyDjUEdZCREqbIdCJD93PBm/jA=
 github.com/cockroachdb/datadriven v1.0.2/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU=
+github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877 h1:1MLK4YpFtIEo3ZtMA5C795Wtv5VuUnrXX7mQG+aHg6o=
+github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU=
 github.com/cockroachdb/errors v1.9.1 h1:yFVvsI0VxmRShfawbt/laCIDy/mtTqqnvoNgiy5bEV8=
 github.com/cockroachdb/errors v1.9.1/go.mod h1:2sxOtL2WIc096WSZqZ5h8fa17rdDq9HZOZLBCor4mBk=
 github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
 github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE=
 github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
-github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811 h1:ytcWPaNPhNoGMWEhDvS3zToKcDpRsLuRolQJBVGdozk=
-github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811/go.mod h1:Nb5lgvnQ2+oGlE/EyZy4+2/CxRh9KfvCXnag1vtpxVM=
+github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06 h1:T+Np/xtzIjYM/P5NAw0e2Rf1FGvzDau1h54MKvx8G7w=
+github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06/go.mod h1:bynZ3gvVyhlvjLI7PT6dmZ7g76xzJ7HpxfjgkzCGz6s=
 github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ=
 github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
 github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM=
@@ -370,9 +369,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davidlazar/go-crypto v0.0.0-20170701192655-dcfb0a7ac018/go.mod h1:rQYf4tfk5sSwFsnDg3qYaBxSjsD9S8+59vW0dKUgme4=
-github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c h1:pFUpOrbxDR6AkioZ1ySsx5yxlDQZ8stG2b88gTPxgJU=
-github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c/go.mod h1:6UhI8N9EjYm1c2odKpFpAYeR8dsBeM7PtzQhRgxRr9U=
 github.com/deckarep/golang-set/v2 v2.3.0 h1:qs18EKUfHm2X9fA50Mr/M5hccg2tNnVqsiBImnyDs0g=
 github.com/deckarep/golang-set/v2 v2.3.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4=
 github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y=
@@ -387,8 +383,6 @@ github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFM
 github.com/dfuse-io/logging v0.0.0-20201110202154-26697de88c79/go.mod h1:V+ED4kT/t/lKtH99JQmKIb0v9WL3VaYkJ36CfHlVECI=
 github.com/dfuse-io/logging v0.0.0-20210109005628-b97a57253f70 h1:CuJS05R9jmNlUK8GOxrEELPbfXm0EuGh/30LjkjN5vo=
 github.com/dfuse-io/logging v0.0.0-20210109005628-b97a57253f70/go.mod h1:EoK/8RFbMEteaCaz89uessDTnCWjbbcr+DXcBh4el5o=
-github.com/dgraph-io/badger v1.5.5-0.20190226225317-8115aed38f8f/go.mod h1:VZxzAIRPHRVNRKRo6AXrX9BJegn6il06VMTZVJYCIjQ=
-github.com/dgraph-io/badger v1.6.0-rc1/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
 github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
 github.com/dgraph-io/badger v1.6.1/go.mod h1:FRmFw3uxvcpa8zG3Rxs0th+hCLIuaQg8HlNV5bjgnuU=
 github.com/dgraph-io/badger/v2 v2.2007.4 h1:TRWBQg8UrlUhaFdco01nO2uXwzKS7zd+HVdwV/GHc4o=
@@ -398,7 +392,6 @@ github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KP
 github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8=
 github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/dgryski/go-farm v0.0.0-20190104051053-3adb47b1fb0f/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y=
 github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
@@ -470,8 +463,6 @@ github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw
 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c=
 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
 github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0=
-github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6 h1:u/UEqS66A5ckRmS4yNpjmVH56sVtS/RfclBAYocb4as=
-github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6/go.mod h1:1i71OnUq3iUe1ma7Lr6yG6/rjvM3emb6yoL7xLFzcVQ=
 github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
 github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
 github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
@@ -753,10 +744,6 @@ github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSN
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/gopacket v1.1.17/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM=
-github.com/google/gopacket v1.1.18/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM=
-github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
-github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -853,8 +840,6 @@ github.com/gtank/merlin v0.1.1 h1:eQ90iG7K9pOhtereWsmyRJ6RAwcP4tHTDBHXNg+u5is=
 github.com/gtank/merlin v0.1.1/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s=
 github.com/gtank/ristretto255 v0.1.2 h1:JEqUCPA1NvLq5DwYtuzigd7ss8fwbYay9fi4/5uMzcc=
 github.com/gtank/ristretto255 v0.1.2/go.mod h1:Ph5OpO6c7xKUGROZfWVLiJf9icMDwUeIvY4OmlYW69o=
-github.com/gxed/hashland/keccakpg v0.0.1/go.mod h1:kRzw3HkwxFU1mpmPP8v1WyQzwdGfmKFJ6tItnhQ67kU=
-github.com/gxed/hashland/murmur3 v0.0.1/go.mod h1:KjXop02n4/ckmZSnY2+HKcLud/tcmvhST0bie/0lS48=
 github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
 github.com/hashicorp/consul/api v1.25.1 h1:CqrdhYzc8XZuPnhIYZWH45toM0LB9ZeYr/gvpLVI3PE=
 github.com/hashicorp/consul/api v1.25.1/go.mod h1:iiLVwR/htV7mas/sy0O+XSuEnrdBUUydemjxcUrAt4g=
@@ -942,10 +927,8 @@ github.com/huandu/go-assert v1.1.5 h1:fjemmA7sSfYHJD7CUqs9qTwwfdNAx7/j2/ZlHXzNB3
 github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0JrPVhn/06U=
 github.com/huandu/skiplist v1.2.0 h1:gox56QD77HzSC0w+Ws3MH3iie755GBJU1OER3h5VsYw=
 github.com/huandu/skiplist v1.2.0/go.mod h1:7v3iFjLcSAzO4fN5B8dvebvo/qsfumiLiDXMrPiHF9w=
-github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc=
-github.com/huin/goupnp v1.0.3 h1:N8No57ls+MnjlB+JPiCVSOyy/ot7MJTqlo7rn+NYSqQ=
-github.com/huin/goupnp v1.0.3/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y=
-github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o=
+github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc=
+github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8=
 github.com/hydrogen18/memlistener v0.0.0-20200120041712-dcc25e7acd91/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
@@ -960,45 +943,18 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/ionos-cloud/sdk-go/v6 v6.1.9 h1:Iq3VIXzeEbc8EbButuACgfLMiY5TPVWUPNrF+Vsddo4=
 github.com/ionos-cloud/sdk-go/v6 v6.1.9/go.mod h1:EzEgRIDxBELvfoa/uBN0kOQaqovLjUWEB7iW4/Q+t4k=
-github.com/ipfs/go-cid v0.0.1/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
-github.com/ipfs/go-cid v0.0.2/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
-github.com/ipfs/go-cid v0.0.3/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
-github.com/ipfs/go-cid v0.0.4/go.mod h1:4LLaPOQwmk5z9LBgQnpkivrx8BJjUyGwTXCd5Xfj6+M=
 github.com/ipfs/go-cid v0.0.5/go.mod h1:plgt+Y5MnOey4vO4UlUazGqdbEXuFYitED67FexhXog=
-github.com/ipfs/go-cid v0.0.6/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I=
 github.com/ipfs/go-cid v0.0.7 h1:ysQJVJA3fNDF1qigJbsSQOdjhVLsOEoPdh0+R97k3jY=
 github.com/ipfs/go-cid v0.0.7/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I=
-github.com/ipfs/go-datastore v0.0.1/go.mod h1:d4KVXhMt913cLBEI/PXAy6ko+W7e9AhyAKBGh803qeE=
-github.com/ipfs/go-datastore v0.1.0/go.mod h1:d4KVXhMt913cLBEI/PXAy6ko+W7e9AhyAKBGh803qeE=
-github.com/ipfs/go-datastore v0.1.1/go.mod h1:w38XXW9kVFNp57Zj5knbKWM2T+KOZCGDRVNdgPHtbHw=
-github.com/ipfs/go-datastore v0.4.0/go.mod h1:SX/xMIKoCszPqp+z9JhPYCmoOoXTvaa13XEbGtsFUhA=
 github.com/ipfs/go-datastore v0.4.1/go.mod h1:SX/xMIKoCszPqp+z9JhPYCmoOoXTvaa13XEbGtsFUhA=
 github.com/ipfs/go-datastore v0.4.4/go.mod h1:SX/xMIKoCszPqp+z9JhPYCmoOoXTvaa13XEbGtsFUhA=
-github.com/ipfs/go-datastore v0.4.5 h1:cwOUcGMLdLPWgu3SlrCckCMznaGADbPqE0r8h768/Dg=
-github.com/ipfs/go-datastore v0.4.5/go.mod h1:eXTcaaiN6uOlVCLS9GjJUJtlvJfM3xk23w3fyfrmmJs=
-github.com/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk=
-github.com/ipfs/go-detect-race v0.0.1/go.mod h1:8BNT7shDZPo99Q74BpGMK+4D8Mn4j46UU0LZ723meps=
-github.com/ipfs/go-ds-badger v0.0.2/go.mod h1:Y3QpeSFWQf6MopLTiZD+VT6IC1yZqaGmjvRcKeSGij8=
-github.com/ipfs/go-ds-badger v0.0.5/go.mod h1:g5AuuCGmr7efyzQhLL8MzwqcauPojGPUaHzfGTzuE3s=
-github.com/ipfs/go-ds-badger v0.0.7/go.mod h1:qt0/fWzZDoPW6jpQeqUjR5kBfhDNB65jd9YlmAvpQBk=
-github.com/ipfs/go-ds-badger v0.2.1/go.mod h1:Tx7l3aTph3FMFrRS838dcSJh+jjA7cX9DrGVwx/NOwE=
 github.com/ipfs/go-ds-badger v0.2.3/go.mod h1:pEYw0rgg3FIrywKKnL+Snr+w/LjJZVMTBRn4FS6UHUk=
-github.com/ipfs/go-ds-leveldb v0.0.1/go.mod h1:feO8V3kubwsEF22n0YRQCffeb79OOYIykR4L04tMOYc=
-github.com/ipfs/go-ds-leveldb v0.1.0/go.mod h1:hqAW8y4bwX5LWcCtku2rFNX3vjDZCy5LZCg+cSZvYb8=
-github.com/ipfs/go-ds-leveldb v0.4.1/go.mod h1:jpbku/YqBSsBc1qgME8BkWS4AxzF2cEu1Ii2r79Hh9s=
 github.com/ipfs/go-ds-leveldb v0.4.2/go.mod h1:jpbku/YqBSsBc1qgME8BkWS4AxzF2cEu1Ii2r79Hh9s=
 github.com/ipfs/go-ipfs-delay v0.0.0-20181109222059-70721b86a9a8/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw=
-github.com/ipfs/go-ipfs-util v0.0.1/go.mod h1:spsl5z8KUnrve+73pOhSVZND1SIxPW5RyBCNzQxlJBc=
-github.com/ipfs/go-ipfs-util v0.0.2 h1:59Sswnk1MFaiq+VcaknX7aYEyGyGDAA73ilhEK2POp8=
-github.com/ipfs/go-ipfs-util v0.0.2/go.mod h1:CbPtkWJzjLdEcezDns2XYaehFVNXG9zrdrtMecczcsQ=
-github.com/ipfs/go-ipns v0.0.2 h1:oq4ErrV4hNQ2Eim257RTYRgfOSV/s8BDaf9iIl4NwFs=
-github.com/ipfs/go-ipns v0.0.2/go.mod h1:WChil4e0/m9cIINWLxZe1Jtf77oz5L05rO2ei/uKJ5U=
 github.com/ipfs/go-log v0.0.1/go.mod h1:kL1d2/hzSpI0thNYjiKfjanbVNU+IIGA/WnNESY9leM=
-github.com/ipfs/go-log v1.0.2/go.mod h1:1MNjMxe0u6xvJZgeqbJ8vdo2TKaGwZ1a0Bpza+sr2Sk=
 github.com/ipfs/go-log v1.0.3/go.mod h1:OsLySYkwIbiSUR/yBTdv1qPtcE4FW3WPWk/ewz9Ru+A=
 github.com/ipfs/go-log v1.0.4 h1:6nLQdX4W8P9yZZFH7mO+X/PzjN8Laozm/lMJ6esdgzY=
 github.com/ipfs/go-log v1.0.4/go.mod h1:oDCg2FkjogeFOhqqb+N39l2RpTNPL6F/StPkB3kPgcs=
-github.com/ipfs/go-log/v2 v2.0.2/go.mod h1:O7P1lJt27vWHhOwQmcFEvlmo49ry2VY2+JfBWFaa9+0=
 github.com/ipfs/go-log/v2 v2.0.3/go.mod h1:O7P1lJt27vWHhOwQmcFEvlmo49ry2VY2+JfBWFaa9+0=
 github.com/ipfs/go-log/v2 v2.0.5/go.mod h1:eZs4Xt4ZUJQFM3DlanGhy7TkwwawCZcSByscwkWG+dw=
 github.com/ipfs/go-log/v2 v2.1.1 h1:G4TtqN+V9y9HY9TA6BwbCVyyBZ2B9MbCjR2MtGx8FR0=
@@ -1057,19 +1013,10 @@ github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0f
 github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jackpal/gateway v1.0.5/go.mod h1:lTpwd4ACLXmpyiCTRtfiNyVnUmqT9RivzCDQetPfnjA=
-github.com/jackpal/go-nat-pmp v1.0.1/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
 github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
 github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
-github.com/jbenet/go-cienv v0.0.0-20150120210510-1bb1476777ec/go.mod h1:rGaEvXB4uRSZMmzKNLoXvTu1sfx+1kv/DojUlPrSZGs=
-github.com/jbenet/go-cienv v0.1.0 h1:Vc/s0QbQtoxX8MwwSLWWh+xNNZvM3Lw7NsTcHrvvhMc=
 github.com/jbenet/go-cienv v0.1.0/go.mod h1:TqNnHUmJgXau0nCzC7kXWeotg3J9W34CUv5Djy1+FlA=
-github.com/jbenet/go-temp-err-catcher v0.0.0-20150120210811-aac704a3f4f2/go.mod h1:8GXXJV31xl8whumTzdZsTt3RnUIiPqzkyf7mxToRCMs=
-github.com/jbenet/go-temp-err-catcher v0.1.0 h1:zpb3ZH6wIE8Shj2sKS+khgRvf7T7RABoLk/+KKHggpk=
-github.com/jbenet/go-temp-err-catcher v0.1.0/go.mod h1:0kJRvmDZXNMIiJirNPEYfhpPwbGVtZVWC34vc5WLsDk=
 github.com/jbenet/goprocess v0.0.0-20160826012719-b497e2f366b8/go.mod h1:Ly/wlsjFq/qrU3Rar62tu1gASgGw6chQbSh/XgIIXCY=
-github.com/jbenet/goprocess v0.1.3/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZlqdZVfqY4=
-github.com/jbenet/goprocess v0.1.4 h1:DRGOFReOMqqDNXwW70QkacFW0YN9QnwLV0Vqk+3oU0o=
 github.com/jbenet/goprocess v0.1.4/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZlqdZVfqY4=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=
@@ -1105,7 +1052,6 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V
 github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
-github.com/kami-zh/go-capturer v0.0.0-20171211120116-e492ea43421d/go.mod h1:P2viExyCEfeWGU259JnaQ34Inuec4R38JCyBx2edgD0=
 github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
 github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
 github.com/kataras/golog v0.0.10/go.mod h1:yJ8YKCmyL+nWjERB90Qwn+bdyBZsaQwU3bTVFgkFIp8=
@@ -1135,9 +1081,6 @@ github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b/go.mod h1:pcaDhQK0/NJZ
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/koron/go-ssdp v0.0.0-20191105050749-2e1c40ed0b5d/go.mod h1:5Ky9EC2xfoUKUor0Hjgi2BJhCSXJfMOFlmyYrVKGQMk=
-github.com/koron/go-ssdp v0.0.2 h1:fL3wAoyT6hXHQlORyXUW4Q23kkQpJRgEAYcZB5BR71o=
-github.com/koron/go-ssdp v0.0.2/go.mod h1:XoLfkAiA2KeZsYh4DbHxD7h3nR2AZNqVQOa+LJuqPYs=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -1166,211 +1109,22 @@ github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/libp2p/go-addr-util v0.0.1/go.mod h1:4ac6O7n9rIAKB1dnd+s8IbbMXkt+oBpzX4/+RACcnlQ=
-github.com/libp2p/go-addr-util v0.0.2 h1:7cWK5cdA5x72jX0g8iLrQWm5TRJZ6CzGdPEhWj7plWU=
-github.com/libp2p/go-addr-util v0.0.2/go.mod h1:Ecd6Fb3yIuLzq4bD7VcywcVSBtefcAwnUISBM3WG15E=
 github.com/libp2p/go-buffer-pool v0.0.1/go.mod h1:xtyIz9PMobb13WaxR6Zo1Pd1zXJKYg0a8KiIvDp3TzQ=
 github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM=
 github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8=
 github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg=
-github.com/libp2p/go-cidranger v1.1.0 h1:ewPN8EZ0dd1LSnrtuwd4709PXVcITVeuwbag38yPW7c=
-github.com/libp2p/go-cidranger v1.1.0/go.mod h1:KWZTfSr+r9qEo9OkI9/SIEeAtw+NNoU0dXIXt15Okic=
-github.com/libp2p/go-conn-security-multistream v0.1.0/go.mod h1:aw6eD7LOsHEX7+2hJkDxw1MteijaVcI+/eP2/x3J1xc=
-github.com/libp2p/go-conn-security-multistream v0.2.0 h1:uNiDjS58vrvJTg9jO6bySd1rMKejieG7v45ekqHbZ1M=
-github.com/libp2p/go-conn-security-multistream v0.2.0/go.mod h1:hZN4MjlNetKD3Rq5Jb/P5ohUnFLNzEAR4DLSzpn2QLU=
-github.com/libp2p/go-eventbus v0.1.0/go.mod h1:vROgu5cs5T7cv7POWlWxBaVLxfSegC5UGQf8A2eEmx4=
-github.com/libp2p/go-eventbus v0.2.1 h1:VanAdErQnpTioN2TowqNcOijf6YwhuODe4pPKSDpxGc=
-github.com/libp2p/go-eventbus v0.2.1/go.mod h1:jc2S4SoEVPP48H9Wpzm5aiGwUCBMfGhVhhBjyhhCJs8=
-github.com/libp2p/go-flow-metrics v0.0.1/go.mod h1:Iv1GH0sG8DtYN3SVJ2eG221wMiNpZxBdp967ls1g+k8=
-github.com/libp2p/go-flow-metrics v0.0.2/go.mod h1:HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs=
-github.com/libp2p/go-flow-metrics v0.0.3 h1:8tAs/hSdNvUiLgtlSy3mxwxWP4I9y/jlkPFT7epKdeM=
 github.com/libp2p/go-flow-metrics v0.0.3/go.mod h1:HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs=
-github.com/libp2p/go-libp2p v0.6.1/go.mod h1:CTFnWXogryAHjXAKEbOf1OWY+VeAP3lDMZkfEI5sT54=
-github.com/libp2p/go-libp2p v0.7.0/go.mod h1:hZJf8txWeCduQRDC/WSqBGMxaTHCOYHt2xSU1ivxn0k=
-github.com/libp2p/go-libp2p v0.7.4/go.mod h1:oXsBlTLF1q7pxr+9w6lqzS1ILpyHsaBPniVO7zIHGMw=
-github.com/libp2p/go-libp2p v0.8.1/go.mod h1:QRNH9pwdbEBpx5DTJYg+qxcVaDMAz3Ee/qDKwXujH5o=
-github.com/libp2p/go-libp2p v0.12.0/go.mod h1:FpHZrfC1q7nA8jitvdjKBDF31hguaC676g/nT9PgQM0=
-github.com/libp2p/go-libp2p v0.13.0 h1:tDdrXARSghmusdm0nf1U/4M8aj8Rr0V2IzQOXmbzQ3s=
-github.com/libp2p/go-libp2p v0.13.0/go.mod h1:pM0beYdACRfHO1WcJlp65WXyG2A6NqYM+t2DTVAJxMo=
-github.com/libp2p/go-libp2p-asn-util v0.0.0-20200825225859-85005c6cf052/go.mod h1:nRMRTab+kZuk0LnKZpxhOVH/ndsdr2Nr//Zltc/vwgo=
-github.com/libp2p/go-libp2p-asn-util v0.0.0-20201026210036-4f868c957324 h1:2H/P+forDWBHije1WULwPfGduByUmC4fthndHVRpYNU=
-github.com/libp2p/go-libp2p-asn-util v0.0.0-20201026210036-4f868c957324/go.mod h1:nRMRTab+kZuk0LnKZpxhOVH/ndsdr2Nr//Zltc/vwgo=
-github.com/libp2p/go-libp2p-autonat v0.1.1/go.mod h1:OXqkeGOY2xJVWKAGV2inNF5aKN/djNA3fdpCWloIudE=
-github.com/libp2p/go-libp2p-autonat v0.2.0/go.mod h1:DX+9teU4pEEoZUqR1PiMlqliONQdNbfzE1C718tcViI=
-github.com/libp2p/go-libp2p-autonat v0.2.1/go.mod h1:MWtAhV5Ko1l6QBsHQNSuM6b1sRkXrpk0/LqCr+vCVxI=
-github.com/libp2p/go-libp2p-autonat v0.2.2/go.mod h1:HsM62HkqZmHR2k1xgX34WuWDzk/nBwNHoeyyT4IWV6A=
-github.com/libp2p/go-libp2p-autonat v0.4.0 h1:3y8XQbpr+ssX8QfZUHekjHCYK64sj6/4hnf/awD4+Ug=
-github.com/libp2p/go-libp2p-autonat v0.4.0/go.mod h1:YxaJlpr81FhdOv3W3BTconZPfhaYivRdf53g+S2wobk=
-github.com/libp2p/go-libp2p-blankhost v0.1.1/go.mod h1:pf2fvdLJPsC1FsVrNP3DUUvMzUts2dsLLBEpo1vW1ro=
-github.com/libp2p/go-libp2p-blankhost v0.1.4/go.mod h1:oJF0saYsAXQCSfDq254GMNmLNz6ZTHTOvtF4ZydUvwU=
-github.com/libp2p/go-libp2p-blankhost v0.2.0 h1:3EsGAi0CBGcZ33GwRuXEYJLLPoVWyXJ1bcJzAJjINkk=
-github.com/libp2p/go-libp2p-blankhost v0.2.0/go.mod h1:eduNKXGTioTuQAUcZ5epXi9vMl+t4d8ugUBRQ4SqaNQ=
-github.com/libp2p/go-libp2p-circuit v0.1.4/go.mod h1:CY67BrEjKNDhdTk8UgBX1Y/H5c3xkAcs3gnksxY7osU=
-github.com/libp2p/go-libp2p-circuit v0.2.1/go.mod h1:BXPwYDN5A8z4OEY9sOfr2DUQMLQvKt/6oku45YUmjIo=
-github.com/libp2p/go-libp2p-circuit v0.4.0 h1:eqQ3sEYkGTtybWgr6JLqJY6QLtPWRErvFjFDfAOO1wc=
-github.com/libp2p/go-libp2p-circuit v0.4.0/go.mod h1:t/ktoFIUzM6uLQ+o1G6NuBl2ANhBKN9Bc8jRIk31MoA=
-github.com/libp2p/go-libp2p-core v0.0.1/go.mod h1:g/VxnTZ/1ygHxH3dKok7Vno1VfpvGcGip57wjTU4fco=
-github.com/libp2p/go-libp2p-core v0.0.4/go.mod h1:jyuCQP356gzfCFtRKyvAbNkyeuxb7OlyhWZ3nls5d2I=
-github.com/libp2p/go-libp2p-core v0.2.0/go.mod h1:X0eyB0Gy93v0DZtSYbEM7RnMChm9Uv3j7yRXjO77xSI=
-github.com/libp2p/go-libp2p-core v0.2.2/go.mod h1:8fcwTbsG2B+lTgRJ1ICZtiM5GWCWZVoVrLaDRvIRng0=
-github.com/libp2p/go-libp2p-core v0.2.4/go.mod h1:STh4fdfa5vDYr0/SzYYeqnt+E6KfEV5VxfIrm0bcI0g=
-github.com/libp2p/go-libp2p-core v0.2.5/go.mod h1:6+5zJmKhsf7yHn1RbmYDu08qDUpIUxGdqHuEZckmZOA=
-github.com/libp2p/go-libp2p-core v0.3.0/go.mod h1:ACp3DmS3/N64c2jDzcV429ukDpicbL6+TrrxANBjPGw=
-github.com/libp2p/go-libp2p-core v0.3.1/go.mod h1:thvWy0hvaSBhnVBaW37BvzgVV68OUhgJJLAa6almrII=
-github.com/libp2p/go-libp2p-core v0.4.0/go.mod h1:49XGI+kc38oGVwqSBhDEwytaAxgZasHhFfQKibzTls0=
-github.com/libp2p/go-libp2p-core v0.5.0/go.mod h1:49XGI+kc38oGVwqSBhDEwytaAxgZasHhFfQKibzTls0=
-github.com/libp2p/go-libp2p-core v0.5.1/go.mod h1:uN7L2D4EvPCvzSH5SrhR72UWbnSGpt5/a35Sm4upn4Y=
-github.com/libp2p/go-libp2p-core v0.5.3/go.mod h1:uN7L2D4EvPCvzSH5SrhR72UWbnSGpt5/a35Sm4upn4Y=
 github.com/libp2p/go-libp2p-core v0.5.4/go.mod h1:uN7L2D4EvPCvzSH5SrhR72UWbnSGpt5/a35Sm4upn4Y=
-github.com/libp2p/go-libp2p-core v0.5.5/go.mod h1:vj3awlOr9+GMZJFH9s4mpt9RHHgGqeHCopzbYKZdRjM=
-github.com/libp2p/go-libp2p-core v0.5.6/go.mod h1:txwbVEhHEXikXn9gfC7/UDDw7rkxuX0bJvM49Ykaswo=
-github.com/libp2p/go-libp2p-core v0.5.7/go.mod h1:txwbVEhHEXikXn9gfC7/UDDw7rkxuX0bJvM49Ykaswo=
-github.com/libp2p/go-libp2p-core v0.6.0/go.mod h1:txwbVEhHEXikXn9gfC7/UDDw7rkxuX0bJvM49Ykaswo=
-github.com/libp2p/go-libp2p-core v0.6.1/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8=
-github.com/libp2p/go-libp2p-core v0.7.0/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8=
-github.com/libp2p/go-libp2p-core v0.8.0/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8=
 github.com/libp2p/go-libp2p-core v0.8.5 h1:aEgbIcPGsKy6zYcC+5AJivYFedhYa4sW7mIpWpUaLKw=
 github.com/libp2p/go-libp2p-core v0.8.5/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8=
-github.com/libp2p/go-libp2p-crypto v0.1.0/go.mod h1:sPUokVISZiy+nNuTTH/TY+leRSxnFj/2GLjtOTW90hI=
-github.com/libp2p/go-libp2p-discovery v0.2.0/go.mod h1:s4VGaxYMbw4+4+tsoQTqh7wfxg97AEdo4GYBt6BadWg=
-github.com/libp2p/go-libp2p-discovery v0.3.0/go.mod h1:o03drFnz9BVAZdzC/QUQ+NeQOu38Fu7LJGEOK2gQltw=
-github.com/libp2p/go-libp2p-discovery v0.5.0 h1:Qfl+e5+lfDgwdrXdu4YNCWyEo3fWuP+WgN9mN0iWviQ=
-github.com/libp2p/go-libp2p-discovery v0.5.0/go.mod h1:+srtPIU9gDaBNu//UHvcdliKBIcr4SfDcm0/PfPJLug=
-github.com/libp2p/go-libp2p-kad-dht v0.11.1 h1:FsriVQhOUZpCotWIjyFSjEDNJmUzuMma/RyyTDZanwc=
-github.com/libp2p/go-libp2p-kad-dht v0.11.1/go.mod h1:5ojtR2acDPqh/jXf5orWy8YGb8bHQDS+qeDcoscL/PI=
-github.com/libp2p/go-libp2p-kbucket v0.4.7 h1:spZAcgxifvFZHBD8tErvppbnNiKA5uokDu3CV7axu70=
-github.com/libp2p/go-libp2p-kbucket v0.4.7/go.mod h1:XyVo99AfQH0foSf176k4jY1xUJ2+jUJIZCSDm7r2YKk=
-github.com/libp2p/go-libp2p-loggables v0.1.0 h1:h3w8QFfCt2UJl/0/NW4K829HX/0S4KD31PQ7m8UXXO8=
-github.com/libp2p/go-libp2p-loggables v0.1.0/go.mod h1:EyumB2Y6PrYjr55Q3/tiJ/o3xoDasoRYM7nOzEpoa90=
-github.com/libp2p/go-libp2p-mplex v0.2.0/go.mod h1:Ejl9IyjvXJ0T9iqUTE1jpYATQ9NM3g+OtR+EMMODbKo=
-github.com/libp2p/go-libp2p-mplex v0.2.1/go.mod h1:SC99Rxs8Vuzrf/6WhmH41kNn13TiYdAWNYHrwImKLnE=
-github.com/libp2p/go-libp2p-mplex v0.2.2/go.mod h1:74S9eum0tVQdAfFiKxAyKzNdSuLqw5oadDq7+L/FELo=
-github.com/libp2p/go-libp2p-mplex v0.2.3/go.mod h1:CK3p2+9qH9x+7ER/gWWDYJ3QW5ZxWDkm+dVvjfuG3ek=
-github.com/libp2p/go-libp2p-mplex v0.3.0/go.mod h1:l9QWxRbbb5/hQMECEb908GbS9Sm2UAR2KFZKUJEynEs=
-github.com/libp2p/go-libp2p-mplex v0.4.0/go.mod h1:yCyWJE2sc6TBTnFpjvLuEJgTSw/u+MamvzILKdX7asw=
-github.com/libp2p/go-libp2p-mplex v0.4.1 h1:/pyhkP1nLwjG3OM+VuaNJkQT/Pqq73WzB3aDN3Fx1sc=
-github.com/libp2p/go-libp2p-mplex v0.4.1/go.mod h1:cmy+3GfqfM1PceHTLL7zQzAAYaryDu6iPSC+CIb094g=
-github.com/libp2p/go-libp2p-nat v0.0.5/go.mod h1:1qubaE5bTZMJE+E/uu2URroMbzdubFz1ChgiN79yKPE=
-github.com/libp2p/go-libp2p-nat v0.0.6 h1:wMWis3kYynCbHoyKLPBEMu4YRLltbm8Mk08HGSfvTkU=
-github.com/libp2p/go-libp2p-nat v0.0.6/go.mod h1:iV59LVhB3IkFvS6S6sauVTSOrNEANnINbI/fkaLimiw=
-github.com/libp2p/go-libp2p-netutil v0.1.0 h1:zscYDNVEcGxyUpMd0JReUZTrpMfia8PmLKcKF72EAMQ=
-github.com/libp2p/go-libp2p-netutil v0.1.0/go.mod h1:3Qv/aDqtMLTUyQeundkKsA+YCThNdbQD54k3TqjpbFU=
-github.com/libp2p/go-libp2p-noise v0.1.1/go.mod h1:QDFLdKX7nluB7DEnlVPbz7xlLHdwHFA9HiohJRr3vwM=
-github.com/libp2p/go-libp2p-noise v0.1.2 h1:IH9GRihQJTx56obm+GnpdPX4KeVIlvpXrP6xnJ0wxWk=
-github.com/libp2p/go-libp2p-noise v0.1.2/go.mod h1:9B10b7ueo7TIxZHHcjcDCo5Hd6kfKT2m77by82SFRfE=
-github.com/libp2p/go-libp2p-peer v0.2.0/go.mod h1:RCffaCvUyW2CJmG2gAWVqwePwW7JMgxjsHm7+J5kjWY=
-github.com/libp2p/go-libp2p-peerstore v0.1.0/go.mod h1:2CeHkQsr8svp4fZ+Oi9ykN1HBb6u0MOvdJ7YIsmcwtY=
-github.com/libp2p/go-libp2p-peerstore v0.1.3/go.mod h1:BJ9sHlm59/80oSkpWgr1MyY1ciXAXV397W6h1GH/uKI=
-github.com/libp2p/go-libp2p-peerstore v0.1.4/go.mod h1:+4BDbDiiKf4PzpANZDAT+knVdLxvqh7hXOujessqdzs=
-github.com/libp2p/go-libp2p-peerstore v0.2.0/go.mod h1:N2l3eVIeAitSg3Pi2ipSrJYnqhVnMNQZo9nkSCuAbnQ=
-github.com/libp2p/go-libp2p-peerstore v0.2.1/go.mod h1:NQxhNjWxf1d4w6PihR8btWIRjwRLBr4TYKfNgrUkOPA=
-github.com/libp2p/go-libp2p-peerstore v0.2.2/go.mod h1:NQxhNjWxf1d4w6PihR8btWIRjwRLBr4TYKfNgrUkOPA=
-github.com/libp2p/go-libp2p-peerstore v0.2.6/go.mod h1:ss/TWTgHZTMpsU/oKVVPQCGuDHItOpf2W8RxAi50P2s=
 github.com/libp2p/go-libp2p-peerstore v0.2.7 h1:83JoLxyR9OYTnNfB5vvFqvMUv/xDNa6NoPHnENhBsGw=
 github.com/libp2p/go-libp2p-peerstore v0.2.7/go.mod h1:ss/TWTgHZTMpsU/oKVVPQCGuDHItOpf2W8RxAi50P2s=
-github.com/libp2p/go-libp2p-pnet v0.2.0 h1:J6htxttBipJujEjz1y0a5+eYoiPcFHhSYHH6na5f0/k=
-github.com/libp2p/go-libp2p-pnet v0.2.0/go.mod h1:Qqvq6JH/oMZGwqs3N1Fqhv8NVhrdYcO0BW4wssv21LA=
-github.com/libp2p/go-libp2p-record v0.1.2/go.mod h1:pal0eNcT5nqZaTV7UGhqeGqxFgGdsU/9W//C8dqjQDk=
-github.com/libp2p/go-libp2p-record v0.1.3 h1:R27hoScIhQf/A8XJZ8lYpnqh9LatJ5YbHs28kCIfql0=
-github.com/libp2p/go-libp2p-record v0.1.3/go.mod h1:yNUff/adKIfPnYQXgp6FQmNu3gLJ6EMg7+/vv2+9pY4=
-github.com/libp2p/go-libp2p-routing-helpers v0.2.3/go.mod h1:795bh+9YeoFl99rMASoiVgHdi5bjack0N1+AFAdbvBw=
-github.com/libp2p/go-libp2p-secio v0.1.0/go.mod h1:tMJo2w7h3+wN4pgU2LSYeiKPrfqBgkOsdiKK77hE7c8=
-github.com/libp2p/go-libp2p-secio v0.2.0/go.mod h1:2JdZepB8J5V9mBp79BmwsaPQhRPNN2NrnB2lKQcdy6g=
-github.com/libp2p/go-libp2p-secio v0.2.1/go.mod h1:cWtZpILJqkqrSkiYcDBh5lA3wbT2Q+hz3rJQq3iftD8=
-github.com/libp2p/go-libp2p-secio v0.2.2/go.mod h1:wP3bS+m5AUnFA+OFO7Er03uO1mncHG0uVwGrwvjYlNY=
-github.com/libp2p/go-libp2p-swarm v0.1.0/go.mod h1:wQVsCdjsuZoc730CgOvh5ox6K8evllckjebkdiY5ta4=
-github.com/libp2p/go-libp2p-swarm v0.2.2/go.mod h1:fvmtQ0T1nErXym1/aa1uJEyN7JzaTNyBcHImCxRpPKU=
-github.com/libp2p/go-libp2p-swarm v0.2.3/go.mod h1:P2VO/EpxRyDxtChXz/VPVXyTnszHvokHKRhfkEgFKNM=
-github.com/libp2p/go-libp2p-swarm v0.2.8/go.mod h1:JQKMGSth4SMqonruY0a8yjlPVIkb0mdNSwckW7OYziM=
-github.com/libp2p/go-libp2p-swarm v0.3.0/go.mod h1:hdv95GWCTmzkgeJpP+GK/9D9puJegb7H57B5hWQR5Kk=
-github.com/libp2p/go-libp2p-swarm v0.3.1/go.mod h1:hdv95GWCTmzkgeJpP+GK/9D9puJegb7H57B5hWQR5Kk=
-github.com/libp2p/go-libp2p-swarm v0.4.0 h1:hahq/ijRoeH6dgROOM8x7SeaKK5VgjjIr96vdrT+NUA=
-github.com/libp2p/go-libp2p-swarm v0.4.0/go.mod h1:XVFcO52VoLoo0eitSxNQWYq4D6sydGOweTOAjJNraCw=
-github.com/libp2p/go-libp2p-testing v0.0.2/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
-github.com/libp2p/go-libp2p-testing v0.0.3/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
-github.com/libp2p/go-libp2p-testing v0.0.4/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
-github.com/libp2p/go-libp2p-testing v0.1.0/go.mod h1:xaZWMJrPUM5GlDBxCeGUi7kI4eqnjVyavGroI2nxEM0=
-github.com/libp2p/go-libp2p-testing v0.1.1/go.mod h1:xaZWMJrPUM5GlDBxCeGUi7kI4eqnjVyavGroI2nxEM0=
-github.com/libp2p/go-libp2p-testing v0.1.2-0.20200422005655-8775583591d8/go.mod h1:Qy8sAncLKpwXtS2dSnDOP8ktexIAHKu+J+pnZOFZLTc=
-github.com/libp2p/go-libp2p-testing v0.3.0/go.mod h1:efZkql4UZ7OVsEfaxNHZPzIehtsBXMrXnCfJIgDti5g=
-github.com/libp2p/go-libp2p-testing v0.4.0 h1:PrwHRi0IGqOwVQWR3xzgigSlhlLfxgfXgkHxr77EghQ=
-github.com/libp2p/go-libp2p-testing v0.4.0/go.mod h1:Q+PFXYoiYFN5CAEG2w3gLPEzotlKsNSbKQ/lImlOWF0=
-github.com/libp2p/go-libp2p-tls v0.1.3 h1:twKMhMu44jQO+HgQK9X8NHO5HkeJu2QbhLzLJpa8oNM=
-github.com/libp2p/go-libp2p-tls v0.1.3/go.mod h1:wZfuewxOndz5RTnCAxFliGjvYSDA40sKitV4c50uI1M=
-github.com/libp2p/go-libp2p-transport-upgrader v0.1.1/go.mod h1:IEtA6or8JUbsV07qPW4r01GnTenLW4oi3lOPbUMGJJA=
-github.com/libp2p/go-libp2p-transport-upgrader v0.2.0/go.mod h1:mQcrHj4asu6ArfSoMuyojOdjx73Q47cYD7s5+gZOlns=
-github.com/libp2p/go-libp2p-transport-upgrader v0.3.0/go.mod h1:i+SKzbRnvXdVbU3D1dwydnTmKRPXiAR/fyvi1dXuL4o=
-github.com/libp2p/go-libp2p-transport-upgrader v0.4.0 h1:xwj4h3hJdBrxqMOyMUjwscjoVst0AASTsKtZiTChoHI=
-github.com/libp2p/go-libp2p-transport-upgrader v0.4.0/go.mod h1:J4ko0ObtZSmgn5BX5AmegP+dK3CSnU2lMCKsSq/EY0s=
-github.com/libp2p/go-libp2p-yamux v0.2.0/go.mod h1:Db2gU+XfLpm6E4rG5uGCFX6uXA8MEXOxFcRoXUODaK8=
-github.com/libp2p/go-libp2p-yamux v0.2.2/go.mod h1:lIohaR0pT6mOt0AZ0L2dFze9hds9Req3OfS+B+dv4qw=
-github.com/libp2p/go-libp2p-yamux v0.2.5/go.mod h1:Zpgj6arbyQrmZ3wxSZxfBmbdnWtbZ48OpsfmQVTErwA=
-github.com/libp2p/go-libp2p-yamux v0.2.7/go.mod h1:X28ENrBMU/nm4I3Nx4sZ4dgjZ6VhLEn0XhIoZ5viCwU=
-github.com/libp2p/go-libp2p-yamux v0.2.8/go.mod h1:/t6tDqeuZf0INZMTgd0WxIRbtK2EzI2h7HbFm9eAKI4=
-github.com/libp2p/go-libp2p-yamux v0.4.0/go.mod h1:+DWDjtFMzoAwYLVkNZftoucn7PelNoy5nm3tZ3/Zw30=
-github.com/libp2p/go-libp2p-yamux v0.5.0/go.mod h1:AyR8k5EzyM2QN9Bbdg6X1SkVVuqLwTGf0L4DFq9g6po=
-github.com/libp2p/go-libp2p-yamux v0.5.1 h1:sX4WQPHMhRxJE5UZTfjEuBvlQWXB5Bo3A2JK9ZJ9EM0=
-github.com/libp2p/go-libp2p-yamux v0.5.1/go.mod h1:dowuvDu8CRWmr0iqySMiSxK+W0iL5cMVO9S94Y6gkv4=
-github.com/libp2p/go-maddr-filter v0.0.4/go.mod h1:6eT12kSQMA9x2pvFQa+xesMKUBlj9VImZbj3B9FBH/Q=
-github.com/libp2p/go-maddr-filter v0.0.5/go.mod h1:Jk+36PMfIqCJhAnaASRH83bdAvfDRp/w6ENFaC9bG+M=
 github.com/libp2p/go-maddr-filter v0.1.0/go.mod h1:VzZhTXkMucEGGEOSKddrwGiOv0tUhgnKqNEmIAz/bPU=
-github.com/libp2p/go-mplex v0.0.3/go.mod h1:pK5yMLmOoBR1pNCqDlA2GQrdAVTMkqFalaTWe7l4Yd0=
-github.com/libp2p/go-mplex v0.1.0/go.mod h1:SXgmdki2kwCUlCCbfGLEgHjC4pFqhTp0ZoV6aiKgxDU=
-github.com/libp2p/go-mplex v0.1.1/go.mod h1:Xgz2RDCi3co0LeZfgjm4OgUF15+sVR8SRcu3SFXI1lk=
-github.com/libp2p/go-mplex v0.1.2/go.mod h1:Xgz2RDCi3co0LeZfgjm4OgUF15+sVR8SRcu3SFXI1lk=
-github.com/libp2p/go-mplex v0.2.0/go.mod h1:0Oy/A9PQlwBytDRp4wSkFnzHYDKcpLot35JQ6msjvYQ=
-github.com/libp2p/go-mplex v0.3.0 h1:U1T+vmCYJaEoDJPV1aq31N56hS+lJgb397GsylNSgrU=
-github.com/libp2p/go-mplex v0.3.0/go.mod h1:0Oy/A9PQlwBytDRp4wSkFnzHYDKcpLot35JQ6msjvYQ=
-github.com/libp2p/go-msgio v0.0.2/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
 github.com/libp2p/go-msgio v0.0.4/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
-github.com/libp2p/go-msgio v0.0.6 h1:lQ7Uc0kS1wb1EfRxO2Eir/RJoHkHn7t6o+EiwsYIKJA=
 github.com/libp2p/go-msgio v0.0.6/go.mod h1:4ecVB6d9f4BDSL5fqvPiC4A3KivjWn+Venn/1ALLMWA=
-github.com/libp2p/go-nat v0.0.4/go.mod h1:Nmw50VAvKuk38jUBcmNh6p9lUJLoODbJRvYAa/+KSDo=
-github.com/libp2p/go-nat v0.0.5 h1:qxnwkco8RLKqVh1NmjQ+tJ8p8khNLFxuElYG/TwqW4Q=
-github.com/libp2p/go-nat v0.0.5/go.mod h1:B7NxsVNPZmRLvMOwiEO1scOSyjA56zxYAGv1yQgRkEU=
-github.com/libp2p/go-netroute v0.1.2/go.mod h1:jZLDV+1PE8y5XxBySEBgbuVAXbhtuHSdmLPL2n9MKbk=
-github.com/libp2p/go-netroute v0.1.3/go.mod h1:jZLDV+1PE8y5XxBySEBgbuVAXbhtuHSdmLPL2n9MKbk=
-github.com/libp2p/go-netroute v0.1.4 h1:47V0+hJfYaqj1WO0A+cDkRc9xr9qKiK7i8zaoGv8Mmo=
-github.com/libp2p/go-netroute v0.1.4/go.mod h1:jZLDV+1PE8y5XxBySEBgbuVAXbhtuHSdmLPL2n9MKbk=
-github.com/libp2p/go-openssl v0.0.2/go.mod h1:v8Zw2ijCSWBQi8Pq5GAixw6DbFfa9u6VIYDXnvOXkc0=
-github.com/libp2p/go-openssl v0.0.3/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
 github.com/libp2p/go-openssl v0.0.4/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
-github.com/libp2p/go-openssl v0.0.5/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
 github.com/libp2p/go-openssl v0.0.7 h1:eCAzdLejcNVBzP/iZM9vqHnQm+XyCEbSSIheIPRGNsw=
 github.com/libp2p/go-openssl v0.0.7/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
-github.com/libp2p/go-reuseport v0.0.1/go.mod h1:jn6RmB1ufnQwl0Q1f+YxAj8isJgDCQzaaxIFYDhcYEA=
-github.com/libp2p/go-reuseport v0.0.2 h1:XSG94b1FJfGA01BUrT82imejHQyTxO4jEWqheyCXYvU=
-github.com/libp2p/go-reuseport v0.0.2/go.mod h1:SPD+5RwGC7rcnzngoYC86GjPzjSywuQyMVAheVBD9nQ=
-github.com/libp2p/go-reuseport-transport v0.0.2/go.mod h1:YkbSDrvjUVDL6b8XqriyA20obEtsW9BLkuOUyQAOCbs=
-github.com/libp2p/go-reuseport-transport v0.0.3/go.mod h1:Spv+MPft1exxARzP2Sruj2Wb5JSyHNncjf1Oi2dEbzM=
-github.com/libp2p/go-reuseport-transport v0.0.4 h1:OZGz0RB620QDGpv300n1zaOcKGGAoGVf8h9txtt/1uM=
-github.com/libp2p/go-reuseport-transport v0.0.4/go.mod h1:trPa7r/7TJK/d+0hdBLOCGvpQQVOU74OXbNCIMkufGw=
-github.com/libp2p/go-sockaddr v0.0.2/go.mod h1:syPvOmNs24S3dFVGJA1/mrqdeijPxLV2Le3BRLKd68k=
-github.com/libp2p/go-sockaddr v0.1.0 h1:Y4s3/jNoryVRKEBrkJ576F17CPOaMIzUeCsg7dlTDj0=
-github.com/libp2p/go-sockaddr v0.1.0/go.mod h1:syPvOmNs24S3dFVGJA1/mrqdeijPxLV2Le3BRLKd68k=
-github.com/libp2p/go-stream-muxer v0.0.1/go.mod h1:bAo8x7YkSpadMTbtTaxGVHWUQsR/l5MEaHbKaliuT14=
-github.com/libp2p/go-stream-muxer-multistream v0.2.0/go.mod h1:j9eyPol/LLRqT+GPLSxvimPhNph4sfYfMoDPd7HkzIc=
-github.com/libp2p/go-stream-muxer-multistream v0.3.0 h1:TqnSHPJEIqDEO7h1wZZ0p3DXdvDSiLHQidKKUGZtiOY=
-github.com/libp2p/go-stream-muxer-multistream v0.3.0/go.mod h1:yDh8abSIzmZtqtOt64gFJUXEryejzNb0lisTt+fAMJA=
-github.com/libp2p/go-tcp-transport v0.1.0/go.mod h1:oJ8I5VXryj493DEJ7OsBieu8fcg2nHGctwtInJVpipc=
-github.com/libp2p/go-tcp-transport v0.1.1/go.mod h1:3HzGvLbx6etZjnFlERyakbaYPdfjg2pWP97dFZworkY=
-github.com/libp2p/go-tcp-transport v0.2.0/go.mod h1:vX2U0CnWimU4h0SGSEsg++AzvBcroCGYw28kh94oLe0=
-github.com/libp2p/go-tcp-transport v0.2.1 h1:ExZiVQV+h+qL16fzCWtd1HSzPsqWottJ8KXwWaVi8Ns=
-github.com/libp2p/go-tcp-transport v0.2.1/go.mod h1:zskiJ70MEfWz2MKxvFB/Pv+tPIB1PpPUrHIWQ8aFw7M=
-github.com/libp2p/go-ws-transport v0.2.0/go.mod h1:9BHJz/4Q5A9ludYWKoGCFC5gUElzlHoKzu0yY9p/klM=
-github.com/libp2p/go-ws-transport v0.3.0/go.mod h1:bpgTJmRZAvVHrgHybCVyqoBmyLQ1fiZuEaBYusP5zsk=
-github.com/libp2p/go-ws-transport v0.3.1/go.mod h1:bpgTJmRZAvVHrgHybCVyqoBmyLQ1fiZuEaBYusP5zsk=
-github.com/libp2p/go-ws-transport v0.4.0 h1:9tvtQ9xbws6cA5LvqdE6Ne3vcmGB4f1z9SByggk4s0k=
-github.com/libp2p/go-ws-transport v0.4.0/go.mod h1:EcIEKqf/7GDjth6ksuS/6p7R49V4CBY6/E7R/iyhYUA=
-github.com/libp2p/go-yamux v1.2.2/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow=
-github.com/libp2p/go-yamux v1.3.0/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow=
-github.com/libp2p/go-yamux v1.3.3/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow=
-github.com/libp2p/go-yamux v1.3.5/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow=
-github.com/libp2p/go-yamux v1.3.7/go.mod h1:fr7aVgmdNGJK+N1g+b6DW6VxzbRCjCOejR/hkmpooHE=
-github.com/libp2p/go-yamux v1.4.0/go.mod h1:fr7aVgmdNGJK+N1g+b6DW6VxzbRCjCOejR/hkmpooHE=
-github.com/libp2p/go-yamux v1.4.1/go.mod h1:fr7aVgmdNGJK+N1g+b6DW6VxzbRCjCOejR/hkmpooHE=
-github.com/libp2p/go-yamux/v2 v2.0.0 h1:vSGhAy5u6iHBq11ZDcyHH4Blcf9xlBhT4WQDoOE90LU=
-github.com/libp2p/go-yamux/v2 v2.0.0/go.mod h1:NVWira5+sVUIU6tu1JWvaRn1dRnG+cawOJiflsAM+7U=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
 github.com/linode/linodego v1.23.0 h1:s0ReCZtuN9Z1IoUN9w1RLeYO1dMZUGPwOQ/IBFsBHtU=
@@ -1384,7 +1138,6 @@ github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czP
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
-github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
@@ -1408,7 +1161,6 @@ github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
@@ -1430,13 +1182,9 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5
 github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg=
 github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k=
 github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8=
-github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
 github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
-github.com/miekg/dns v1.1.12/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
-github.com/miekg/dns v1.1.28/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
-github.com/miekg/dns v1.1.31/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
 github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
 github.com/miekg/dns v1.1.56 h1:5imZaSeoRNvpM9SzWNhEcP9QliKiz20/dA2QabIGVnE=
 github.com/miekg/dns v1.1.56/go.mod h1:cRm6Oo2C8TY9ZS/TqsSrseAcncm74lfK5G+ikN2SWWY=
@@ -1447,9 +1195,6 @@ github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 h1:lYpkrQH5ajf0
 github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ=
 github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g=
 github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY=
-github.com/minio/sha256-simd v0.0.0-20190131020904-2d45a736cd16/go.mod h1:2FMWW+8GMoPweT6+pI63m9YE3Lmw4J71hV56Chs1E/U=
-github.com/minio/sha256-simd v0.0.0-20190328051042-05b4dd3047e5/go.mod h1:2FMWW+8GMoPweT6+pI63m9YE3Lmw4J71hV56Chs1E/U=
-github.com/minio/sha256-simd v0.1.0/go.mod h1:2FMWW+8GMoPweT6+pI63m9YE3Lmw4J71hV56Chs1E/U=
 github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
 github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
 github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
@@ -1499,7 +1244,6 @@ github.com/mostynb/zstdpool-freelist v0.0.0-20201229113212-927304c0c3b1 h1:mPMvm
 github.com/mostynb/zstdpool-freelist v0.0.0-20201229113212-927304c0c3b1/go.mod h1:ye2e/VUEtE2BHE+G/QcKkcLQVAEJoYRFj5VUOQatCRE=
 github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ=
 github.com/mr-tron/base58 v1.1.0/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8=
-github.com/mr-tron/base58 v1.1.1/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8=
 github.com/mr-tron/base58 v1.1.2/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/mr-tron/base58 v1.1.3/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
@@ -1514,51 +1258,24 @@ github.com/multiformats/go-base32 v0.0.3 h1:tw5+NhuwaOjJCC5Pp82QuXbrmLzWg7uxlMFp
 github.com/multiformats/go-base32 v0.0.3/go.mod h1:pLiuGC8y0QR3Ue4Zug5UzK9LjgbkL8NSQj0zQ5Nz/AA=
 github.com/multiformats/go-base36 v0.1.0 h1:JR6TyF7JjGd3m6FbLU2cOxhC0Li8z8dLNGQ89tUg4F4=
 github.com/multiformats/go-base36 v0.1.0/go.mod h1:kFGE83c6s80PklsHO9sRn2NCoffoRdUUOENyW/Vv6sM=
-github.com/multiformats/go-multiaddr v0.0.1/go.mod h1:xKVEak1K9cS1VdmPZW3LSIb6lgmoS58qz/pzqmAxV44=
-github.com/multiformats/go-multiaddr v0.0.2/go.mod h1:xKVEak1K9cS1VdmPZW3LSIb6lgmoS58qz/pzqmAxV44=
-github.com/multiformats/go-multiaddr v0.0.4/go.mod h1:xKVEak1K9cS1VdmPZW3LSIb6lgmoS58qz/pzqmAxV44=
-github.com/multiformats/go-multiaddr v0.1.0/go.mod h1:xKVEak1K9cS1VdmPZW3LSIb6lgmoS58qz/pzqmAxV44=
 github.com/multiformats/go-multiaddr v0.1.1/go.mod h1:aMKBKNEYmzmDmxfX88/vz+J5IU55txyt0p4aiWVohjo=
-github.com/multiformats/go-multiaddr v0.2.0/go.mod h1:0nO36NvPpyV4QzvTLi/lafl2y95ncPj0vFwVF6k6wJ4=
 github.com/multiformats/go-multiaddr v0.2.1/go.mod h1:s/Apk6IyxfvMjDafnhJgJ3/46z7tZ04iMk5wP4QMGGE=
 github.com/multiformats/go-multiaddr v0.2.2/go.mod h1:NtfXiOtHvghW9KojvtySjH5y0u0xW5UouOmQQrn6a3Y=
 github.com/multiformats/go-multiaddr v0.3.0/go.mod h1:dF9kph9wfJ+3VLAaeBqo9Of8x4fJxp6ggJGteB8HQTI=
-github.com/multiformats/go-multiaddr v0.3.1/go.mod h1:uPbspcUPd5AfaP6ql3ujFY+QWzmBD8uLLL4bXW0XfGc=
 github.com/multiformats/go-multiaddr v0.3.3 h1:vo2OTSAqnENB2rLk79pLtr+uhj+VAzSe3uef5q0lRSs=
 github.com/multiformats/go-multiaddr v0.3.3/go.mod h1:lCKNGP1EQ1eZ35Za2wlqnabm9xQkib3fyB+nZXHLag0=
-github.com/multiformats/go-multiaddr-dns v0.0.1/go.mod h1:9kWcqw/Pj6FwxAwW38n/9403szc57zJPs45fmnznu3Q=
-github.com/multiformats/go-multiaddr-dns v0.0.2/go.mod h1:9kWcqw/Pj6FwxAwW38n/9403szc57zJPs45fmnznu3Q=
-github.com/multiformats/go-multiaddr-dns v0.2.0 h1:YWJoIDwLePniH7OU5hBnDZV6SWuvJqJ0YtN6pLeH9zA=
-github.com/multiformats/go-multiaddr-dns v0.2.0/go.mod h1:TJ5pr5bBO7Y1B18djPuRsVkduhQH2YqYSbxWJzYGdK0=
-github.com/multiformats/go-multiaddr-fmt v0.0.1/go.mod h1:aBYjqL4T/7j4Qx+R73XSv/8JsgnRFlf0w2KGLCmXl3Q=
 github.com/multiformats/go-multiaddr-fmt v0.1.0 h1:WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E=
 github.com/multiformats/go-multiaddr-fmt v0.1.0/go.mod h1:hGtDIW4PU4BqJ50gW2quDuPVjyWNZxToGUh/HwTZYJo=
-github.com/multiformats/go-multiaddr-net v0.0.1/go.mod h1:nw6HSxNmCIQH27XPGBuX+d1tnvM7ihcFwHMSstNAVUU=
-github.com/multiformats/go-multiaddr-net v0.1.0/go.mod h1:5JNbcfBOP4dnhoZOv10JJVkJO0pCCEf8mTnipAo2UZQ=
-github.com/multiformats/go-multiaddr-net v0.1.1/go.mod h1:5JNbcfBOP4dnhoZOv10JJVkJO0pCCEf8mTnipAo2UZQ=
-github.com/multiformats/go-multiaddr-net v0.1.2/go.mod h1:QsWt3XK/3hwvNxZJp92iMQKME1qHfpYmyIjFVsSOY6Y=
-github.com/multiformats/go-multiaddr-net v0.1.3/go.mod h1:ilNnaM9HbmVFqsb/qcNysjCu4PVONlrBZpHIrw/qQuA=
 github.com/multiformats/go-multiaddr-net v0.1.4/go.mod h1:ilNnaM9HbmVFqsb/qcNysjCu4PVONlrBZpHIrw/qQuA=
-github.com/multiformats/go-multiaddr-net v0.1.5/go.mod h1:ilNnaM9HbmVFqsb/qcNysjCu4PVONlrBZpHIrw/qQuA=
 github.com/multiformats/go-multiaddr-net v0.2.0 h1:MSXRGN0mFymt6B1yo/6BPnIRpLPEnKgQNvVfCX5VDJk=
 github.com/multiformats/go-multiaddr-net v0.2.0/go.mod h1:gGdH3UXny6U3cKKYCvpXI5rnK7YaOIEOPVDI9tsJbEA=
 github.com/multiformats/go-multibase v0.0.1/go.mod h1:bja2MqRZ3ggyXtZSEDKpl0uO/gviWFaSteVbWT51qgs=
 github.com/multiformats/go-multibase v0.0.3 h1:l/B6bJDQjvQ5G52jw4QGSYeOTZoAwIO77RblWplfIqk=
 github.com/multiformats/go-multibase v0.0.3/go.mod h1:5+1R4eQrT3PkYZ24C3W2Ue2tPwIdYQD509ZjSb5y9Oc=
-github.com/multiformats/go-multihash v0.0.1/go.mod h1:w/5tugSrLEbWqlcgJabL3oHFKTwfvkofsjW2Qa1ct4U=
-github.com/multiformats/go-multihash v0.0.5/go.mod h1:lt/HCbqlQwlPBz7lv0sQCdtfcMtlJvakRUn/0Ual8po=
 github.com/multiformats/go-multihash v0.0.8/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=
-github.com/multiformats/go-multihash v0.0.9/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=
-github.com/multiformats/go-multihash v0.0.10/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=
 github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
 github.com/multiformats/go-multihash v0.0.14 h1:QoBceQYQQtNUuf6s7wHxnE2c8bhbMqhfGzNI032se/I=
 github.com/multiformats/go-multihash v0.0.14/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
-github.com/multiformats/go-multistream v0.1.0/go.mod h1:fJTiDfXJVmItycydCnNx4+wSzZ5NwG2FEVAI30fiovg=
-github.com/multiformats/go-multistream v0.1.1/go.mod h1:KmHZ40hzVxiaiwlj3MEbYgK9JFk2/9UktWZAF54Du38=
-github.com/multiformats/go-multistream v0.2.0/go.mod h1:5GZPQZbkWOLOn3J2y4Y99vVW7vOfsAflxARk3x14o6k=
-github.com/multiformats/go-multistream v0.2.2 h1:TCYu1BHTDr1F/Qm75qwYISQdzGcRdC21nFgQW7l7GBo=
-github.com/multiformats/go-multistream v0.2.2/go.mod h1:UIcnm7Zuo8HKG+HkWgfQsGL+/MIEhyTqbODbIUwSXKs=
-github.com/multiformats/go-varint v0.0.1/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
 github.com/multiformats/go-varint v0.0.2/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
 github.com/multiformats/go-varint v0.0.5/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
 github.com/multiformats/go-varint v0.0.6 h1:gk85QWKxh3TazbLxED/NlDVv8+q+ReFJk7Y2W/KhfNY=
@@ -1587,9 +1304,7 @@ github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
@@ -1599,9 +1314,7 @@ github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4
 github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
 github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
-github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
@@ -1812,8 +1525,8 @@ github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306 h1:ko88
 github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306/go.mod h1:w1sAEES3g3PuV/RzUrgow20W2uErMly84hhD3um1WL4=
 github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f h1:hgJif132UCdjo8u43i7iPN1/MFnu49hv7lFGFftCHKU=
 github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f/go.mod h1:MvMXoufZAtqExNexqi4cjrNYE9MefKddKylxjS+//n0=
-github.com/smartcontractkit/libocr v0.0.0-20231107151413-13e0202ae8d7 h1:21V61XOYSxpFmFqlhr5IaEh1uQ1F6CewJ30D/U/P34c=
-github.com/smartcontractkit/libocr v0.0.0-20231107151413-13e0202ae8d7/go.mod h1:2lyRkw/qLQgUWlrWWmq5nj0y90rWeO6Y+v+fCakRgb0=
+github.com/smartcontractkit/libocr v0.0.0-20231130143053-c5102a9c0fb7 h1:AA7vf29c6lFsZm+MtIEtXtg6VUOQV6waJo5MUuHfRjQ=
+github.com/smartcontractkit/libocr v0.0.0-20231130143053-c5102a9c0fb7/go.mod h1:WcuWFMskcGK0MYZuH5hEhGJOzdJRUFeNEM4PAKlejI4=
 github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 h1:yiKnypAqP8l0OX0P3klzZ7SCcBUxy5KqTAKZmQOvSQE=
 github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1/go.mod h1:q6f4fe39oZPdsh1i57WznEZgxd8siidMaSFq3wdPmVg=
 github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1 h1:Dai1bn+Q5cpeGMQwRdjOdVjG8mmFFROVkSKuUgBErRQ=
@@ -1824,11 +1537,9 @@ github.com/smartcontractkit/wsrpc v0.7.2 h1:iBXzMeg7vc5YoezIQBq896y25BARw7OKbhrb
 github.com/smartcontractkit/wsrpc v0.7.2/go.mod h1:sj7QX2NQibhkhxTfs3KOhAj/5xwgqMipTvJVSssT9i0=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-github.com/smola/gocompat v0.2.0/go.mod h1:1B0MlxbmoZNo3h8guHp8HztB3BSYR5itql9qtVc0ypY=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js=
 github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0=
-github.com/spacemonkeygo/openssl v0.0.0-20181017203307-c2dcc5cca94a/go.mod h1:7AyxJNCJ7SBZ1MfVQCWD6Uqo2oubI2Eq2y2eqf+A5r0=
 github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 h1:RC6RW7j+1+HkWaX/Yh71Ee5ZHaHYt7ZP4sQgUrm6cDU=
 github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572/go.mod h1:w0SWMsp6j9O/dk4/ZpIhL+3CkG8ofA2vuv7k+ltqUMc=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
@@ -1856,7 +1567,6 @@ github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5q
 github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
 github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU=
 github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA=
-github.com/src-d/envconfig v1.0.0/go.mod h1:Q9YQZ7BKITldTBnoxsE5gOeB5y66RyPXeue/R4aaNBc=
 github.com/status-im/keycard-go v0.2.0 h1:QDLFswOQu1r5jsycloeQh3bVU8n/NatHHaZobtDnDzA=
 github.com/status-im/keycard-go v0.2.0/go.mod h1:wlp8ZLbsmrF6g6WjugPAx+IzoLrkdf9+mHxBEeo3Hbg=
 github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
@@ -1942,8 +1652,8 @@ github.com/unrolled/secure v1.13.0 h1:sdr3Phw2+f8Px8HE5sd1EHdj1aV3yUwed/uZXChLFs
 github.com/unrolled/secure v1.13.0/go.mod h1:BmF5hyM6tXczk3MpQkFf1hpKSRqCyhqcbiQtiAF7+40=
 github.com/urfave/cli v1.22.14 h1:ebbhrRiGK2i4naQJr+1Xj92HXZCrK7MsyTS/ob3HnAk=
 github.com/urfave/cli v1.22.14/go.mod h1:X0eDS6pD6Exaclxm99NJ3FiCDRED7vIHpx2mDOHLvkA=
-github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa h1:5SqCsI/2Qya2bCzK15ozrqo2sZxkh0FHynJZOTVoV6Q=
-github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa/go.mod h1:1CNUng3PtjQMtRzJO4FMXBQvkGtuYRxxiR9xMa7jMwI=
+github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs=
+github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
 github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w=
@@ -1954,15 +1664,8 @@ github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+
 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
 github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs=
 github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI=
-github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 h1:EKhdznlJHPMoKr0XTrX+IlJs1LH3lyx2nfr1dOlZ79k=
 github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1/go.mod h1:8UvriyWtv5Q5EOgjHaSseUEdkQfvwFv1I/In/O2M9gc=
 github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc/go.mod h1:bopw91TMyo8J3tvftk8xmU2kPmlrt4nScJQZU2hE5EM=
-github.com/whyrusleeping/go-logging v0.0.1/go.mod h1:lDPYj54zutzG1XYfHAhcc7oNXEburHQBn+Iqd4yS4vE=
-github.com/whyrusleeping/mafmt v1.2.8/go.mod h1:faQJFPbLSxzD9xpA02ttW/tS9vZykNvXwGvqIpk20FA=
-github.com/whyrusleeping/mdns v0.0.0-20190826153040-b9b60ed33aa9/go.mod h1:j4l84WPFclQPj320J9gp0XwNKBb3U0zt5CBqjPp22G4=
-github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7 h1:E9S12nwJwEOXe2d6gT6qxdvqMnNq+VnSsKPgm2ZZNds=
-github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7/go.mod h1:X2c0RVCI1eSUFI8eLcY3c0423ykwiUdxLJtkDvruhjI=
-github.com/x-cray/logrus-prefixed-formatter v0.5.2/go.mod h1:2duySbKsL6M18s5GU7VPsoEPHyzalCE06qoARUCeBBE=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
@@ -2082,7 +1785,6 @@ go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
 go.uber.org/zap v1.14.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
 go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
-go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
 go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ=
 go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
 go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
@@ -2094,17 +1796,12 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190225124518-7f87c0fbb88b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
-golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190618222545-ea8f1a30c443/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
@@ -2112,11 +1809,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200602180216-279210d13fed/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
@@ -2178,7 +1872,6 @@ golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -2215,7 +1908,6 @@ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
@@ -2284,18 +1976,14 @@ golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190124100055-b90733256f2e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190219092855-153ac476189d/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190526052359-791d8a0f4d09/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -2327,7 +2015,6 @@ golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -2412,7 +2099,6 @@ golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181130052023-1c3d964395ce/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -2595,7 +2281,6 @@ google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
-google.golang.org/grpc v1.28.1/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
 google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
@@ -2656,8 +2341,6 @@ gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24
 gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU=
 gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
-gopkg.in/src-d/go-cli.v0 v0.0.0-20181105080154-d492247bbc0d/go.mod h1:z+K8VcOYVYcSwSjGebuDL6176A1XskgbtNl64NSg+n8=
-gopkg.in/src-d/go-log.v1 v1.0.1/go.mod h1:GN34hKP0g305ysm2/hctJ0Y8nWP3zxXXJ8GFabTyABE=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
diff --git a/integration-tests/types/config/node/core.go b/integration-tests/types/config/node/core.go
index ccbbce87a2e..0337274bb1c 100644
--- a/integration-tests/types/config/node/core.go
+++ b/integration-tests/types/config/node/core.go
@@ -109,20 +109,6 @@ func WithOCR2() NodeConfigOpt {
 	}
 }
 
-// Deprecated: P2Pv1 is soon to be fully deprecated
-// WithP2Pv1 enables P2Pv1 and disables P2Pv2
-func WithP2Pv1() NodeConfigOpt {
-	return func(c *chainlink.Config) {
-		c.P2P.V1 = toml.P2PV1{
-			Enabled:    ptr.Ptr(true),
-			ListenIP:   it_utils.MustIP("0.0.0.0"),
-			ListenPort: ptr.Ptr[uint16](6690),
-		}
-		// disabled default
-		c.P2P.V2 = toml.P2PV2{Enabled: ptr.Ptr(false)}
-	}
-}
-
 func WithP2Pv2() NodeConfigOpt {
 	return func(c *chainlink.Config) {
 		c.P2P.V2 = toml.P2PV2{
diff --git a/operator_ui/TAG b/operator_ui/TAG
index 3b63cc3addb..584c67d8d21 100644
--- a/operator_ui/TAG
+++ b/operator_ui/TAG
@@ -1 +1 @@
-v0.8.0-2f868c3
+v0.8.0-0953c48
diff --git a/testdata/scripts/node/validate/default.txtar b/testdata/scripts/node/validate/default.txtar
index 0b841f694be..c9f86e43b29 100644
--- a/testdata/scripts/node/validate/default.txtar
+++ b/testdata/scripts/node/validate/default.txtar
@@ -173,19 +173,6 @@ OutgoingMessageBufferSize = 10
 PeerID = ''
 TraceLogging = false
 
-[P2P.V1]
-Enabled = false
-AnnounceIP = ''
-AnnouncePort = 0
-BootstrapCheckInterval = '20s'
-DefaultBootstrapPeers = []
-DHTAnnouncementCounterUserPrefix = 0
-DHTLookupInterval = 10
-ListenIP = '0.0.0.0'
-ListenPort = 0
-NewStreamTimeout = '10s'
-PeerstoreWriteInterval = '5m0s'
-
 [P2P.V2]
 Enabled = true
 AnnounceAddresses = []
diff --git a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar
index c1ac26c8d02..1ae283c8a8a 100644
--- a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar
+++ b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar
@@ -217,19 +217,6 @@ OutgoingMessageBufferSize = 10
 PeerID = ''
 TraceLogging = false
 
-[P2P.V1]
-Enabled = false
-AnnounceIP = ''
-AnnouncePort = 0
-BootstrapCheckInterval = '20s'
-DefaultBootstrapPeers = []
-DHTAnnouncementCounterUserPrefix = 0
-DHTLookupInterval = 10
-ListenIP = '0.0.0.0'
-ListenPort = 0
-NewStreamTimeout = '10s'
-PeerstoreWriteInterval = '5m0s'
-
 [P2P.V2]
 Enabled = true
 AnnounceAddresses = []
diff --git a/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar b/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar
index 5ae75ffca68..dcb2d05ce39 100644
--- a/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar
+++ b/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar
@@ -217,19 +217,6 @@ OutgoingMessageBufferSize = 10
 PeerID = ''
 TraceLogging = false
 
-[P2P.V1]
-Enabled = false
-AnnounceIP = ''
-AnnouncePort = 0
-BootstrapCheckInterval = '20s'
-DefaultBootstrapPeers = []
-DHTAnnouncementCounterUserPrefix = 0
-DHTLookupInterval = 10
-ListenIP = '0.0.0.0'
-ListenPort = 0
-NewStreamTimeout = '10s'
-PeerstoreWriteInterval = '5m0s'
-
 [P2P.V2]
 Enabled = true
 AnnounceAddresses = []
diff --git a/testdata/scripts/node/validate/disk-based-logging.txtar b/testdata/scripts/node/validate/disk-based-logging.txtar
index c8b3eb4b98b..fee173d3083 100644
--- a/testdata/scripts/node/validate/disk-based-logging.txtar
+++ b/testdata/scripts/node/validate/disk-based-logging.txtar
@@ -217,19 +217,6 @@ OutgoingMessageBufferSize = 10
 PeerID = ''
 TraceLogging = false
 
-[P2P.V1]
-Enabled = false
-AnnounceIP = ''
-AnnouncePort = 0
-BootstrapCheckInterval = '20s'
-DefaultBootstrapPeers = []
-DHTAnnouncementCounterUserPrefix = 0
-DHTLookupInterval = 10
-ListenIP = '0.0.0.0'
-ListenPort = 0
-NewStreamTimeout = '10s'
-PeerstoreWriteInterval = '5m0s'
-
 [P2P.V2]
 Enabled = true
 AnnounceAddresses = []
diff --git a/testdata/scripts/node/validate/invalid.txtar b/testdata/scripts/node/validate/invalid.txtar
index fd591212d08..5acbad83f8c 100644
--- a/testdata/scripts/node/validate/invalid.txtar
+++ b/testdata/scripts/node/validate/invalid.txtar
@@ -207,19 +207,6 @@ OutgoingMessageBufferSize = 10
 PeerID = ''
 TraceLogging = false
 
-[P2P.V1]
-Enabled = false
-AnnounceIP = ''
-AnnouncePort = 0
-BootstrapCheckInterval = '20s'
-DefaultBootstrapPeers = []
-DHTAnnouncementCounterUserPrefix = 0
-DHTLookupInterval = 10
-ListenIP = '0.0.0.0'
-ListenPort = 0
-NewStreamTimeout = '10s'
-PeerstoreWriteInterval = '5m0s'
-
 [P2P.V2]
 Enabled = true
 AnnounceAddresses = []
diff --git a/testdata/scripts/node/validate/valid.txtar b/testdata/scripts/node/validate/valid.txtar
index 020e66da527..b54fc899bbd 100644
--- a/testdata/scripts/node/validate/valid.txtar
+++ b/testdata/scripts/node/validate/valid.txtar
@@ -214,19 +214,6 @@ OutgoingMessageBufferSize = 10
 PeerID = ''
 TraceLogging = false
 
-[P2P.V1]
-Enabled = false
-AnnounceIP = ''
-AnnouncePort = 0
-BootstrapCheckInterval = '20s'
-DefaultBootstrapPeers = []
-DHTAnnouncementCounterUserPrefix = 0
-DHTLookupInterval = 10
-ListenIP = '0.0.0.0'
-ListenPort = 0
-NewStreamTimeout = '10s'
-PeerstoreWriteInterval = '5m0s'
-
 [P2P.V2]
 Enabled = true
 AnnounceAddresses = []
diff --git a/testdata/scripts/node/validate/warnings.txtar b/testdata/scripts/node/validate/warnings.txtar
index a10d6df537c..710e29d4983 100644
--- a/testdata/scripts/node/validate/warnings.txtar
+++ b/testdata/scripts/node/validate/warnings.txtar
@@ -2,18 +2,6 @@ exec chainlink node -c config.toml -s secrets.toml validate
 cmp stdout out.txt
 
 -- config.toml --
-[P2P.V1]
-Enabled = true
-AnnounceIP = ''
-AnnouncePort = 0
-BootstrapCheckInterval = '20s'
-DefaultBootstrapPeers = []
-DHTAnnouncementCounterUserPrefix = 0
-DHTLookupInterval = 10
-ListenIP = '0.0.0.0'
-ListenPort = 0
-NewStreamTimeout = '10s'
-PeerstoreWriteInterval = '5m0s'
 
 [Tracing]
 Enabled = true
@@ -38,20 +26,6 @@ AllowSimplePasswords = false
 Keystore = 'xxxxx'
 
 # Input Configuration:
-[P2P]
-[P2P.V1]
-Enabled = true
-AnnounceIP = ''
-AnnouncePort = 0
-BootstrapCheckInterval = '20s'
-DefaultBootstrapPeers = []
-DHTAnnouncementCounterUserPrefix = 0
-DHTLookupInterval = 10
-ListenIP = '0.0.0.0'
-ListenPort = 0
-NewStreamTimeout = '10s'
-PeerstoreWriteInterval = '5m0s'
-
 [Tracing]
 Enabled = true
 CollectorTarget = 'otel-collector:4317'
@@ -222,19 +196,6 @@ OutgoingMessageBufferSize = 10
 PeerID = ''
 TraceLogging = false
 
-[P2P.V1]
-Enabled = true
-AnnounceIP = ''
-AnnouncePort = 0
-BootstrapCheckInterval = '20s'
-DefaultBootstrapPeers = []
-DHTAnnouncementCounterUserPrefix = 0
-DHTLookupInterval = 10
-ListenIP = '0.0.0.0'
-ListenPort = 0
-NewStreamTimeout = '10s'
-PeerstoreWriteInterval = '5m0s'
-
 [P2P.V2]
 Enabled = true
 AnnounceAddresses = []
@@ -303,18 +264,5 @@ MaxStaleAge = '1h0m0s'
 LatestReportDeadline = '5s'
 
 # Configuration warning:
-3 errors:
-	- P2P.V1: is deprecated and will be removed in a future version
-	- P2P.V1: 10 errors:
-		- AnnounceIP: is deprecated and will be removed in a future version
-		- AnnouncePort: is deprecated and will be removed in a future version
-		- BootstrapCheckInterval: is deprecated and will be removed in a future version
-		- DefaultBootstrapPeers: is deprecated and will be removed in a future version
-		- DHTAnnouncementCounterUserPrefix: is deprecated and will be removed in a future version
-		- DHTLookupInterval: is deprecated and will be removed in a future version
-		- ListenIP: is deprecated and will be removed in a future version
-		- ListenPort: is deprecated and will be removed in a future version
-		- NewStreamTimeout: is deprecated and will be removed in a future version
-		- PeerstoreWriteInterval: is deprecated and will be removed in a future version
-	- Tracing.TLSCertPath: invalid value (something): must be empty when Tracing.Mode is 'unencrypted'
+Tracing.TLSCertPath: invalid value (something): must be empty when Tracing.Mode is 'unencrypted'
 Valid configuration.
diff --git a/tools/benchmark/job_spec_delete_v2.sh b/tools/benchmark/job_spec_delete_v2.sh
index c422d41fd53..e0fd531a228 100644
--- a/tools/benchmark/job_spec_delete_v2.sh
+++ b/tools/benchmark/job_spec_delete_v2.sh
@@ -116,7 +116,7 @@ contractConfigConfirmations = 3
 contractConfigTrackerPollInterval = "1m"
 contractConfigTrackerSubscribeInterval = "2m"
 isBootstrapPeer = true
-p2pBootstrapPeers = []
+p2pv2Bootstrappers = []
 p2pPeerID = "p2p_12D3KooWMk13oppZXmGdRZgaJBFDF6Tc5521YYxKjwkscLSEPrVW"
 schemaVersion = 1
 type = "offchainreporting"

From a9b7ea07c77771b8f3b98bf35c22f76aee2c2750 Mon Sep 17 00:00:00 2001
From: Lei <lei.shi@smartcontract.com>
Date: Mon, 4 Dec 2023 11:27:30 -0800
Subject: [PATCH 079/130] Revert "make streams lookup modular (#11368)"
 (#11482)

This reverts commit fa0f16ad0acf417db1186728560278a049357914.
---
 core/scripts/chaincli/handler/debug.go        | 150 ++---
 .../handler/mercury_lookup_handler.go         | 534 ++++++++++++++++++
 core/scripts/go.mod                           |   3 +-
 core/scripts/go.sum                           |   2 +
 .../v21/mercury/streams/streams.go            | 143 +++--
 .../v21/mercury/streams/streams_test.go       |  20 +-
 6 files changed, 666 insertions(+), 186 deletions(-)
 create mode 100644 core/scripts/chaincli/handler/mercury_lookup_handler.go

diff --git a/core/scripts/chaincli/handler/debug.go b/core/scripts/chaincli/handler/debug.go
index 0075862d95d..fec8c6cd414 100644
--- a/core/scripts/chaincli/handler/debug.go
+++ b/core/scripts/chaincli/handler/debug.go
@@ -22,17 +22,12 @@ import (
 
 	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"
 
-	evm21 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21"
-
 	"github.com/smartcontractkit/chainlink/core/scripts/chaincli/config"
 	"github.com/smartcontractkit/chainlink/core/scripts/common"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_utils_2_1"
 	iregistry21 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/i_keeper_registry_master_wrapper_2_1"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/models"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 	bigmath "github.com/smartcontractkit/chainlink/v2/core/utils/big_math"
@@ -41,7 +36,12 @@ import (
 const (
 	ConditionTrigger uint8 = iota
 	LogTrigger
+
+	blockNumber            = "blockNumber"
 	expectedTypeAndVersion = "KeeperRegistry 2.1.0"
+	feedIdHex              = "feedIdHex"
+	feedIDs                = "feedIDs"
+	timestamp              = "timestamp"
 )
 
 var packer = encoding.NewAbiPacker()
@@ -125,8 +125,6 @@ func (k *Keeper) Debug(ctx context.Context, args []string) {
 	var checkResult iregistry21.CheckUpkeep
 	var blockNum uint64
 	var performData []byte
-	var workID [32]byte
-	var trigger ocr2keepers.Trigger
 	upkeepNeeded := false
 	// check upkeep
 	if triggerType == ConditionTrigger {
@@ -179,8 +177,7 @@ func (k *Keeper) Debug(ctx context.Context, args []string) {
 		}
 		// check that tx for this upkeep / tx was not already performed
 		message(fmt.Sprintf("LogTrigger{blockNum: %d, blockHash: %s, txHash: %s, logIndex: %d}", blockNum, receipt.BlockHash.Hex(), txHash, logIndex))
-		trigger = mustAutomationTrigger(txHash, logIndex, blockNum, receipt.BlockHash)
-		workID = mustUpkeepWorkID(upkeepID, trigger)
+		workID := mustUpkeepWorkID(upkeepID, blockNum, receipt.BlockHash, txHash, logIndex)
 		message(fmt.Sprintf("workID computed: %s", hex.EncodeToString(workID[:])))
 		hasKey, err := keeperRegistry21.HasDedupKey(latestCallOpts, workID)
 		if err != nil {
@@ -232,82 +229,73 @@ func (k *Keeper) Debug(ctx context.Context, args []string) {
 	if checkResult.UpkeepFailureReason != 0 {
 		message(fmt.Sprintf("checkUpkeep failed with UpkeepFailureReason %d", checkResult.UpkeepFailureReason))
 	}
-
 	if checkResult.UpkeepFailureReason == uint8(encoding.UpkeepFailureReasonTargetCheckReverted) {
-		mc := &models.MercuryCredentials{k.cfg.MercuryLegacyURL, k.cfg.MercuryURL, k.cfg.MercuryID, k.cfg.MercuryKey}
-		mercuryConfig := evm21.NewMercuryConfig(mc, core.StreamsCompatibleABI)
-		lggr, _ := logger.NewLogger()
-		blockSub := &blockSubscriber{k.client}
-		streams := streams.NewStreamsLookup(packer, mercuryConfig, blockSub, k.rpcClient, keeperRegistry21, lggr)
+		// TODO use the new streams lookup lib
+		//mc := &models.MercuryCredentials{k.cfg.MercuryLegacyURL, k.cfg.MercuryURL, k.cfg.MercuryID, k.cfg.MercuryKey}
+		//mercuryConfig := evm.NewMercuryConfig(mc, core.StreamsCompatibleABI)
+		//lggr, _ := logger.NewLogger()
+		//blockSub := &blockSubscriber{k.client}
+		//_ = streams.NewStreamsLookup(packer, mercuryConfig, blockSub, keeperRegistry21, k.rpcClient, lggr)
 
 		streamsLookupErr, err := packer.DecodeStreamsLookupRequest(checkResult.PerformData)
 		if err == nil {
 			message("upkeep reverted with StreamsLookup")
 			message(fmt.Sprintf("StreamsLookup data: {FeedParamKey: %s, Feeds: %v, TimeParamKey: %s, Time: %d, ExtraData: %s}", streamsLookupErr.FeedParamKey, streamsLookupErr.Feeds, streamsLookupErr.TimeParamKey, streamsLookupErr.Time.Uint64(), hexutil.Encode(streamsLookupErr.ExtraData)))
-
-			streamsLookup := &mercury.StreamsLookup{
-				StreamsLookupError: &mercury.StreamsLookupError{
-					FeedParamKey: streamsLookupErr.FeedParamKey,
-					Feeds:        streamsLookupErr.Feeds,
-					TimeParamKey: streamsLookupErr.TimeParamKey,
-					Time:         streamsLookupErr.Time,
-					ExtraData:    streamsLookupErr.ExtraData,
-				},
-				UpkeepId: upkeepID,
-				Block:    blockNum,
-			}
-
-			if streamsLookup.IsMercuryV02() {
+			if streamsLookupErr.FeedParamKey == feedIdHex && streamsLookupErr.TimeParamKey == blockNumber {
 				message("using mercury lookup v0.2")
-				// check if upkeep is allowed to use mercury v0.2
-				_, _, _, allowed, err := streams.AllowedToUseMercury(latestCallOpts, upkeepID)
+				// handle v0.2
+				cfg, err := keeperRegistry21.GetUpkeepPrivilegeConfig(triggerCallOpts, upkeepID)
 				if err != nil {
-					failUnknown("failed to check if upkeep is allowed to use mercury", err)
+					failUnknown("failed to get upkeep privilege config ", err)
+				}
+				allowed := false
+				if len(cfg) > 0 {
+					var privilegeConfig streams.UpkeepPrivilegeConfig
+					if err := json.Unmarshal(cfg, &privilegeConfig); err != nil {
+						failUnknown("failed to unmarshal privilege config ", err)
+					}
+					allowed = privilegeConfig.MercuryEnabled
 				}
 				if !allowed {
 					resolveIneligible("upkeep reverted with StreamsLookup but is not allowed to access streams")
 				}
-			} else if streamsLookup.IsMercuryV03() {
+			} else if streamsLookupErr.FeedParamKey != feedIDs || streamsLookupErr.TimeParamKey != timestamp {
 				// handle v0.3
-				message("using mercury lookup v0.3")
-			} else {
 				resolveIneligible("upkeep reverted with StreamsLookup but the configuration is invalid")
+			} else {
+				message("using mercury lookup v0.3")
 			}
+			streamsLookup := &StreamsLookup{streamsLookupErr.FeedParamKey, streamsLookupErr.Feeds, streamsLookupErr.TimeParamKey, streamsLookupErr.Time, streamsLookupErr.ExtraData, upkeepID, blockNum}
 
 			if k.cfg.MercuryLegacyURL == "" || k.cfg.MercuryURL == "" || k.cfg.MercuryID == "" || k.cfg.MercuryKey == "" {
 				failCheckConfig("Mercury configs not set properly, check your MERCURY_LEGACY_URL, MERCURY_URL, MERCURY_ID and MERCURY_KEY", nil)
 			}
-
-			// do mercury request
-			automationCheckResult := mustAutomationCheckResult(upkeepID, checkResult, trigger)
-			values, err := streams.DoMercuryRequest(ctx, streamsLookup, &automationCheckResult)
-
-			if automationCheckResult.IneligibilityReason == uint8(mercury.MercuryUpkeepFailureReasonInvalidRevertDataInput) {
+			handler := NewMercuryLookupHandler(&MercuryCredentials{k.cfg.MercuryLegacyURL, k.cfg.MercuryURL, k.cfg.MercuryID, k.cfg.MercuryKey}, k.rpcClient)
+			state, failureReason, values, _, err := handler.doMercuryRequest(ctx, streamsLookup)
+			if failureReason == UpkeepFailureReasonInvalidRevertDataInput {
 				resolveIneligible("upkeep used invalid revert data")
 			}
-			if automationCheckResult.PipelineExecutionState == uint8(mercury.InvalidMercuryRequest) {
+			if state == InvalidMercuryRequest {
 				resolveIneligible("the mercury request data is invalid")
 			}
 			if err != nil {
-				resolveIneligible("failed to DoMercuryRequest")
+				failCheckConfig("failed to do mercury request ", err)
 			}
-
-			// do checkCallback
-			err = streams.CheckCallback(ctx, values, streamsLookup, &automationCheckResult)
+			callbackResult, err := keeperRegistry21.CheckCallback(triggerCallOpts, upkeepID, values, streamsLookup.extraData)
 			if err != nil {
 				failUnknown("failed to execute mercury callback ", err)
 			}
-			if automationCheckResult.IneligibilityReason != 0 {
-				message(fmt.Sprintf("checkCallback failed with UpkeepFailureReason %d", automationCheckResult.IneligibilityReason))
+			if callbackResult.UpkeepFailureReason != 0 {
+				message(fmt.Sprintf("checkCallback failed with UpkeepFailureReason %d", checkResult.UpkeepFailureReason))
 			}
-			upkeepNeeded, performData = automationCheckResult.Eligible, automationCheckResult.PerformData
-			// do tenderly simulations for checkCallback
-			rawCall, err := core.RegistryABI.Pack("checkCallback", upkeepID, values, streamsLookup.ExtraData)
+			upkeepNeeded, performData = callbackResult.UpkeepNeeded, callbackResult.PerformData
+			// do tenderly simulations
+			rawCall, err := core.RegistryABI.Pack("checkCallback", upkeepID, values, streamsLookup.extraData)
 			if err != nil {
 				failUnknown("failed to pack raw checkCallback call", err)
 			}
 			addLink("checkCallback simulation", tenderlySimLink(k.cfg, chainID, blockNum, rawCall, registryAddress))
-			rawCall, err = core.StreamsCompatibleABI.Pack("checkCallback", values, streamsLookup.ExtraData)
+			rawCall, err = core.StreamsCompatibleABI.Pack("checkCallback", values, streamsLookup.extraData)
 			if err != nil {
 				failUnknown("failed to pack raw checkCallback (direct) call", err)
 			}
@@ -329,23 +317,6 @@ func (k *Keeper) Debug(ctx context.Context, args []string) {
 	}
 }
 
-func mustAutomationCheckResult(upkeepID *big.Int, checkResult iregistry21.CheckUpkeep, trigger ocr2keepers.Trigger) ocr2keepers.CheckResult {
-	upkeepIdentifier := mustUpkeepIdentifier(upkeepID)
-	checkResult2 := ocr2keepers.CheckResult{
-		Eligible:            checkResult.UpkeepNeeded,
-		IneligibilityReason: checkResult.UpkeepFailureReason,
-		UpkeepID:            upkeepIdentifier,
-		Trigger:             trigger,
-		WorkID:              core.UpkeepWorkID(upkeepIdentifier, trigger),
-		GasAllocated:        0,
-		PerformData:         checkResult.PerformData,
-		FastGasWei:          checkResult.FastGasWei,
-		LinkNative:          checkResult.LinkNative,
-	}
-
-	return checkResult2
-}
-
 type blockSubscriber struct {
 	ethClient *ethclient.Client
 }
@@ -399,27 +370,9 @@ func packTriggerData(log *types.Log, blockTime uint64) ([]byte, error) {
 	return b, nil
 }
 
-func mustUpkeepWorkID(upkeepID *big.Int, trigger ocr2keepers.Trigger) [32]byte {
-	upkeepIdentifier := mustUpkeepIdentifier(upkeepID)
-
-	workID := core.UpkeepWorkID(upkeepIdentifier, trigger)
-	workIDBytes, err := hex.DecodeString(workID)
-	if err != nil {
-		failUnknown("failed to decode workID", err)
-	}
-
-	var result [32]byte
-	copy(result[:], workIDBytes[:])
-	return result
-}
-
-func mustUpkeepIdentifier(upkeepID *big.Int) ocr2keepers.UpkeepIdentifier {
-	upkeepIdentifier := &ocr2keepers.UpkeepIdentifier{}
-	upkeepIdentifier.FromBigInt(upkeepID)
-	return *upkeepIdentifier
-}
-
-func mustAutomationTrigger(txHash [32]byte, logIndex int64, blockNum uint64, blockHash [32]byte) ocr2keepers.Trigger {
+func mustUpkeepWorkID(upkeepID *big.Int, blockNum uint64, blockHash [32]byte, txHash [32]byte, logIndex int64) [32]byte {
+	// TODO - this is a copy of the code in core.UpkeepWorkID
+	// We should refactor that code to be more easily exported ex not rely on Trigger structs
 	trigger := ocr2keepers.Trigger{
 		LogTriggerExtension: &ocr2keepers.LogTriggerExtension{
 			TxHash:      txHash,
@@ -428,7 +381,16 @@ func mustAutomationTrigger(txHash [32]byte, logIndex int64, blockNum uint64, blo
 			BlockHash:   blockHash,
 		},
 	}
-	return trigger
+	upkeepIdentifier := &ocr2keepers.UpkeepIdentifier{}
+	upkeepIdentifier.FromBigInt(upkeepID)
+	workID := core.UpkeepWorkID(*upkeepIdentifier, trigger)
+	workIDBytes, err := hex.DecodeString(workID)
+	if err != nil {
+		failUnknown("failed to decode workID", err)
+	}
+	var result [32]byte
+	copy(result[:], workIDBytes[:])
+	return result
 }
 
 func message(msg string) {
@@ -440,11 +402,11 @@ func warning(msg string) {
 }
 
 func resolveIneligible(msg string) {
-	exit(fmt.Sprintf("✅ %s: this upkeep is not currently eligible", msg), nil, 0)
+	exit(fmt.Sprintf("✅ %s: this upkeep is not currently elligible", msg), nil, 0)
 }
 
 func resolveEligible() {
-	exit("❌ this upkeep is currently eligible", nil, 0)
+	exit("❌ this upkeep is currently elligible", nil, 0)
 }
 
 func rerun(msg string, err error) {
@@ -545,3 +507,5 @@ func tenderlySimLink(cfg *config.Config, chainID int64, blockNumber uint64, inpu
 	}
 	return common.TenderlySimLink(responseJSON.Simulation.Id)
 }
+
+// TODO - link to performUpkeep tx if exists
diff --git a/core/scripts/chaincli/handler/mercury_lookup_handler.go b/core/scripts/chaincli/handler/mercury_lookup_handler.go
new file mode 100644
index 00000000000..1bd4b2e183c
--- /dev/null
+++ b/core/scripts/chaincli/handler/mercury_lookup_handler.go
@@ -0,0 +1,534 @@
+package handler
+
+import (
+	"context"
+	"crypto/hmac"
+	"crypto/sha256"
+	"encoding/hex"
+	"encoding/json"
+	"fmt"
+	"io"
+	"math/big"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/avast/retry-go"
+	ethabi "github.com/ethereum/go-ethereum/accounts/abi"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/pkg/errors"
+)
+
+// MercuryLookupHandler is responsible for initiating the calls to the Mercury server
+// to determine whether the upkeeps are eligible
+type MercuryLookupHandler struct {
+	credentials *MercuryCredentials
+	httpClient  HttpClient
+	rpcClient   *rpc.Client
+}
+
+func NewMercuryLookupHandler(
+	credentials *MercuryCredentials,
+	rpcClient *rpc.Client,
+) *MercuryLookupHandler {
+	return &MercuryLookupHandler{
+		credentials: credentials,
+		httpClient:  http.DefaultClient,
+		rpcClient:   rpcClient,
+	}
+}
+
+type MercuryVersion string
+
+type StreamsLookup struct {
+	feedParamKey string
+	feeds        []string
+	timeParamKey string
+	time         *big.Int
+	extraData    []byte
+	upkeepId     *big.Int
+	block        uint64
+}
+
+//go:generate mockery --quiet --name HttpClient --output ./mocks/ --case=underscore
+type HttpClient interface {
+	Do(req *http.Request) (*http.Response, error)
+}
+
+type MercuryCredentials struct {
+	LegacyURL string
+	URL       string
+	ClientID  string
+	ClientKey string
+}
+
+func (mc *MercuryCredentials) Validate() bool {
+	return mc.URL != "" && mc.ClientID != "" && mc.ClientKey != ""
+}
+
+type MercuryData struct {
+	Index     int
+	Error     error
+	Retryable bool
+	Bytes     [][]byte
+	State     PipelineExecutionState
+}
+
+// MercuryV02Response represents a JSON structure used by Mercury v0.2
+type MercuryV02Response struct {
+	ChainlinkBlob string `json:"chainlinkBlob"`
+}
+
+// MercuryV03Response represents a JSON structure used by Mercury v0.3
+type MercuryV03Response struct {
+	Reports []MercuryV03Report `json:"reports"`
+}
+
+type MercuryV03Report struct {
+	FeedID                string `json:"feedID"` // feed id in hex encoded
+	ValidFromTimestamp    uint32 `json:"validFromTimestamp"`
+	ObservationsTimestamp uint32 `json:"observationsTimestamp"`
+	FullReport            string `json:"fullReport"` // the actual hex encoded mercury report of this feed, can be sent to verifier
+}
+
+const (
+	// DefaultAllowListExpiration decides how long an upkeep's allow list info will be valid for.
+	DefaultAllowListExpiration = 20 * time.Minute
+	// CleanupInterval decides when the expired items in cache will be deleted.
+	CleanupInterval = 25 * time.Minute
+)
+
+const (
+	ApplicationJson     = "application/json"
+	BlockNumber         = "blockNumber" // valid for v0.2
+	FeedIDs             = "feedIDs"     // valid for v0.3
+	FeedIdHex           = "feedIdHex"   // valid for v0.2
+	HeaderAuthorization = "Authorization"
+	HeaderContentType   = "Content-Type"
+	HeaderTimestamp     = "X-Authorization-Timestamp"
+	HeaderSignature     = "X-Authorization-Signature-SHA256"
+	HeaderUpkeepId      = "X-Authorization-Upkeep-Id"
+	MercuryPathV2       = "/client?"              // only used to access mercury v0.2 server
+	MercuryBatchPathV3  = "/api/v1/reports/bulk?" // only used to access mercury v0.3 server
+	RetryDelay          = 500 * time.Millisecond
+	Timestamp           = "timestamp" // valid for v0.3
+	TotalAttempt        = 3
+	UserId              = "userId"
+)
+
+type UpkeepFailureReason uint8
+type PipelineExecutionState uint8
+
+const (
+	// upkeep failure onchain reasons
+	UpkeepFailureReasonNone                    UpkeepFailureReason = 0
+	UpkeepFailureReasonUpkeepCancelled         UpkeepFailureReason = 1
+	UpkeepFailureReasonUpkeepPaused            UpkeepFailureReason = 2
+	UpkeepFailureReasonTargetCheckReverted     UpkeepFailureReason = 3
+	UpkeepFailureReasonUpkeepNotNeeded         UpkeepFailureReason = 4
+	UpkeepFailureReasonPerformDataExceedsLimit UpkeepFailureReason = 5
+	UpkeepFailureReasonInsufficientBalance     UpkeepFailureReason = 6
+	UpkeepFailureReasonMercuryCallbackReverted UpkeepFailureReason = 7
+	UpkeepFailureReasonRevertDataExceedsLimit  UpkeepFailureReason = 8
+	UpkeepFailureReasonRegistryPaused          UpkeepFailureReason = 9
+	// leaving a gap here for more onchain failure reasons in the future
+	// upkeep failure offchain reasons
+	UpkeepFailureReasonMercuryAccessNotAllowed UpkeepFailureReason = 32
+	UpkeepFailureReasonTxHashNoLongerExists    UpkeepFailureReason = 33
+	UpkeepFailureReasonInvalidRevertDataInput  UpkeepFailureReason = 34
+	UpkeepFailureReasonSimulationFailed        UpkeepFailureReason = 35
+	UpkeepFailureReasonTxHashReorged           UpkeepFailureReason = 36
+
+	// pipeline execution error
+	NoPipelineError        PipelineExecutionState = 0
+	CheckBlockTooOld       PipelineExecutionState = 1
+	CheckBlockInvalid      PipelineExecutionState = 2
+	RpcFlakyFailure        PipelineExecutionState = 3
+	MercuryFlakyFailure    PipelineExecutionState = 4
+	PackUnpackDecodeFailed PipelineExecutionState = 5
+	MercuryUnmarshalError  PipelineExecutionState = 6
+	InvalidMercuryRequest  PipelineExecutionState = 7
+	InvalidMercuryResponse PipelineExecutionState = 8 // this will only happen if Mercury server sends bad responses
+	UpkeepNotAuthorized    PipelineExecutionState = 9
+)
+
+// UpkeepPrivilegeConfig represents the administrative offchain config for each upkeep. It can be set by s_upkeepPrivilegeManager
+// role on the registry. Upkeeps allowed to use Mercury server will have this set to true.
+type UpkeepPrivilegeConfig struct {
+	MercuryEnabled bool `json:"mercuryEnabled"`
+}
+
+// generateHMAC calculates a user HMAC for Mercury server authentication.
+func (mlh *MercuryLookupHandler) generateHMAC(method string, path string, body []byte, clientId string, secret string, ts int64) string {
+	bodyHash := sha256.New()
+	bodyHash.Write(body)
+	hashString := fmt.Sprintf("%s %s %s %s %d",
+		method,
+		path,
+		hex.EncodeToString(bodyHash.Sum(nil)),
+		clientId,
+		ts)
+	signedMessage := hmac.New(sha256.New, []byte(secret))
+	signedMessage.Write([]byte(hashString))
+	userHmac := hex.EncodeToString(signedMessage.Sum(nil))
+	return userHmac
+}
+
+// singleFeedRequest sends a v0.2 Mercury request for a single feed report.
+func (mlh *MercuryLookupHandler) singleFeedRequest(ctx context.Context, ch chan<- MercuryData, index int, ml *StreamsLookup) {
+	q := url.Values{
+		ml.feedParamKey: {ml.feeds[index]},
+		ml.timeParamKey: {ml.time.String()},
+	}
+	mercuryURL := mlh.credentials.LegacyURL
+	reqUrl := fmt.Sprintf("%s%s%s", mercuryURL, MercuryPathV2, q.Encode())
+	// mlh.logger.Debugf("request URL for upkeep %s feed %s: %s", ml.upkeepId.String(), ml.feeds[index], reqUrl)
+
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, reqUrl, nil)
+	if err != nil {
+		ch <- MercuryData{Index: index, Error: err, Retryable: false, State: InvalidMercuryRequest}
+		return
+	}
+
+	ts := time.Now().UTC().UnixMilli()
+	signature := mlh.generateHMAC(http.MethodGet, MercuryPathV2+q.Encode(), []byte{}, mlh.credentials.ClientID, mlh.credentials.ClientKey, ts)
+	req.Header.Set(HeaderContentType, ApplicationJson)
+	req.Header.Set(HeaderAuthorization, mlh.credentials.ClientID)
+	req.Header.Set(HeaderTimestamp, strconv.FormatInt(ts, 10))
+	req.Header.Set(HeaderSignature, signature)
+
+	// in the case of multiple retries here, use the last attempt's data
+	state := NoPipelineError
+	retryable := false
+	sent := false
+	retryErr := retry.Do(
+		func() error {
+			retryable = false
+			resp, err1 := mlh.httpClient.Do(req)
+			if err1 != nil {
+				// mlh.logger.Errorw("StreamsLookup GET request failed", "upkeepID", ml.upkeepId.String(), "time", ml.time.String(), "feed", ml.feeds[index], "error", err1)
+				retryable = true
+				state = MercuryFlakyFailure
+				return err1
+			}
+			defer func(Body io.ReadCloser) {
+				err := Body.Close()
+				if err != nil {
+					// mlh.logger.Errorf("Encountered error when closing the body of the response in single feed: %s", err)
+				}
+			}(resp.Body)
+
+			body, err1 := io.ReadAll(resp.Body)
+			if err1 != nil {
+				retryable = false
+				state = InvalidMercuryResponse
+				return err1
+			}
+
+			if resp.StatusCode == http.StatusNotFound || resp.StatusCode == http.StatusInternalServerError {
+				// mlh.logger.Errorw("StreamsLookup received retryable status code", "upkeepID", ml.upkeepId.String(), "time", ml.time.String(), "statusCode", resp.StatusCode, "feed", ml.feeds[index])
+				retryable = true
+				state = MercuryFlakyFailure
+				return errors.New(strconv.FormatInt(int64(resp.StatusCode), 10))
+			} else if resp.StatusCode != http.StatusOK {
+				retryable = false
+				state = InvalidMercuryRequest
+				return fmt.Errorf("StreamsLookup upkeep %s block %s received status code %d for feed %s", ml.upkeepId.String(), ml.time.String(), resp.StatusCode, ml.feeds[index])
+			}
+
+			// mlh.logger.Debugf("at block %s upkeep %s received status code %d from mercury v0.2 with BODY=%s", ml.time.String(), ml.upkeepId.String(), resp.StatusCode, hexutil.Encode(body))
+
+			var m MercuryV02Response
+			err1 = json.Unmarshal(body, &m)
+			if err1 != nil {
+				// mlh.logger.Errorw("StreamsLookup failed to unmarshal body to MercuryResponse", "upkeepID", ml.upkeepId.String(), "time", ml.time.String(), "feed", ml.feeds[index], "error", err1)
+				retryable = false
+				state = MercuryUnmarshalError
+				return err1
+			}
+			blobBytes, err1 := hexutil.Decode(m.ChainlinkBlob)
+			if err1 != nil {
+				// mlh.logger.Errorw("StreamsLookup failed to decode chainlinkBlob for feed", "upkeepID", ml.upkeepId.String(), "time", ml.time.String(), "blob", m.ChainlinkBlob, "feed", ml.feeds[index], "error", err1)
+				retryable = false
+				state = InvalidMercuryResponse
+				return err1
+			}
+			ch <- MercuryData{
+				Index:     index,
+				Bytes:     [][]byte{blobBytes},
+				Retryable: false,
+				State:     NoPipelineError,
+			}
+			sent = true
+			return nil
+		},
+		// only retry when the error is 404 Not Found or 500 Internal Server Error
+		retry.RetryIf(func(err error) bool {
+			return err.Error() == fmt.Sprintf("%d", http.StatusNotFound) || err.Error() == fmt.Sprintf("%d", http.StatusInternalServerError)
+		}),
+		retry.Context(ctx),
+		retry.Delay(RetryDelay),
+		retry.Attempts(TotalAttempt))
+
+	if !sent {
+		md := MercuryData{
+			Index:     index,
+			Bytes:     [][]byte{},
+			Retryable: retryable,
+			Error:     fmt.Errorf("failed to request feed for %s: %w", ml.feeds[index], retryErr),
+			State:     state,
+		}
+		ch <- md
+	}
+}
+
+// multiFeedsRequest sends a Mercury v0.3 request for a multi-feed report
+func (mlh *MercuryLookupHandler) multiFeedsRequest(ctx context.Context, ch chan<- MercuryData, ml *StreamsLookup) {
+	params := fmt.Sprintf("%s=%s&%s=%s", FeedIDs, strings.Join(ml.feeds, ","), Timestamp, ml.time.String())
+	reqUrl := fmt.Sprintf("%s%s%s", mlh.credentials.URL, MercuryBatchPathV3, params)
+	// mlh.logger.Debugf("request URL for upkeep %s userId %s: %s", ml.upkeepId.String(), mlh.credentials.ClientID, reqUrl)
+
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, reqUrl, nil)
+	if err != nil {
+		ch <- MercuryData{Index: 0, Error: err, Retryable: false, State: InvalidMercuryRequest}
+		return
+	}
+
+	ts := time.Now().UTC().UnixMilli()
+	signature := mlh.generateHMAC(http.MethodGet, MercuryBatchPathV3+params, []byte{}, mlh.credentials.ClientID, mlh.credentials.ClientKey, ts)
+	req.Header.Set(HeaderContentType, ApplicationJson)
+	// username here is often referred to as user id
+	req.Header.Set(HeaderAuthorization, mlh.credentials.ClientID)
+	req.Header.Set(HeaderTimestamp, strconv.FormatInt(ts, 10))
+	req.Header.Set(HeaderSignature, signature)
+	// mercury will inspect authorization headers above to make sure this user (in automation's context, this node) is eligible to access mercury
+	// and if it has an automation role. it will then look at this upkeep id to check if it has access to all the requested feeds.
+	req.Header.Set(HeaderUpkeepId, ml.upkeepId.String())
+
+	// in the case of multiple retries here, use the last attempt's data
+	state := NoPipelineError
+	retryable := false
+	sent := false
+	retryErr := retry.Do(
+		func() error {
+			retryable = false
+			resp, err1 := mlh.httpClient.Do(req)
+			if err1 != nil {
+				// mlh.logger.Errorw("StreamsLookup GET request fails for multi feed", "upkeepID", ml.upkeepId.String(), "time", ml.time.String(), "error", err1)
+				retryable = true
+				state = MercuryFlakyFailure
+				return err1
+			}
+			defer func(Body io.ReadCloser) {
+				err := Body.Close()
+				if err != nil {
+					// mlh.logger.Errorf("Encountered error when closing the body of the response in the multi feed: %s", err)
+				}
+			}(resp.Body)
+			body, err1 := io.ReadAll(resp.Body)
+			if err1 != nil {
+				retryable = false
+				state = InvalidMercuryResponse
+				return err1
+			}
+
+			// mlh.logger.Infof("at timestamp %s upkeep %s received status code %d from mercury v0.3", ml.time.String(), ml.upkeepId.String(), resp.StatusCode)
+			if resp.StatusCode == http.StatusUnauthorized {
+				retryable = false
+				state = UpkeepNotAuthorized
+				return fmt.Errorf("at timestamp %s upkeep %s received status code %d from mercury v0.3, most likely this is caused by unauthorized upkeep", ml.time.String(), ml.upkeepId.String(), resp.StatusCode)
+			} else if resp.StatusCode == http.StatusBadRequest {
+				retryable = false
+				state = InvalidMercuryRequest
+				return fmt.Errorf("at timestamp %s upkeep %s received status code %d from mercury v0.3, most likely this is caused by invalid format of timestamp", ml.time.String(), ml.upkeepId.String(), resp.StatusCode)
+			} else if resp.StatusCode == http.StatusInternalServerError {
+				retryable = true
+				state = MercuryFlakyFailure
+				return fmt.Errorf("%d", http.StatusInternalServerError)
+			} else if resp.StatusCode == 420 {
+				// in 0.3, this will happen when missing/malformed query args, missing or bad required headers, non-existent feeds, or no permissions for feeds
+				retryable = false
+				state = InvalidMercuryRequest
+				return fmt.Errorf("at timestamp %s upkeep %s received status code %d from mercury v0.3, most likely this is caused by missing/malformed query args, missing or bad required headers, non-existent feeds, or no permissions for feeds", ml.time.String(), ml.upkeepId.String(), resp.StatusCode)
+			} else if resp.StatusCode != http.StatusOK {
+				retryable = false
+				state = InvalidMercuryRequest
+				return fmt.Errorf("at timestamp %s upkeep %s received status code %d from mercury v0.3", ml.time.String(), ml.upkeepId.String(), resp.StatusCode)
+			}
+
+			var response MercuryV03Response
+			err1 = json.Unmarshal(body, &response)
+			if err1 != nil {
+				// mlh.logger.Errorw("StreamsLookup failed to unmarshal body to MercuryResponse for multi feed", "upkeepID", ml.upkeepId.String(), "time", ml.time.String(), "error", err1)
+				retryable = false
+				state = MercuryUnmarshalError
+				return err1
+			}
+			// in v0.3, if some feeds are not available, the server will only return available feeds, but we need to make sure ALL feeds are retrieved before calling user contract
+			// hence, retry in this case. retry will help when we send a very new timestamp and reports are not yet generated
+			if len(response.Reports) != len(ml.feeds) {
+				// TODO: AUTO-5044: calculate what reports are missing and log a warning
+				retryable = true
+				state = MercuryFlakyFailure
+				return fmt.Errorf("%d", http.StatusNotFound)
+			}
+			var reportBytes [][]byte
+			for _, rsp := range response.Reports {
+				b, err := hexutil.Decode(rsp.FullReport)
+				if err != nil {
+					retryable = false
+					state = InvalidMercuryResponse
+					return err
+				}
+				reportBytes = append(reportBytes, b)
+			}
+			ch <- MercuryData{
+				Index:     0,
+				Bytes:     reportBytes,
+				Retryable: false,
+				State:     NoPipelineError,
+			}
+			sent = true
+			return nil
+		},
+		// only retry when the error is 404 Not Found or 500 Internal Server Error
+		retry.RetryIf(func(err error) bool {
+			return err.Error() == fmt.Sprintf("%d", http.StatusNotFound) || err.Error() == fmt.Sprintf("%d", http.StatusInternalServerError)
+		}),
+		retry.Context(ctx),
+		retry.Delay(RetryDelay),
+		retry.Attempts(TotalAttempt))
+
+	if !sent {
+		md := MercuryData{
+			Index:     0,
+			Bytes:     [][]byte{},
+			Retryable: retryable,
+			Error:     retryErr,
+			State:     state,
+		}
+		ch <- md
+	}
+}
+
+// doMercuryRequest sends requests to Mercury API to retrieve ChainlinkBlob.
+func (mlh *MercuryLookupHandler) doMercuryRequest(ctx context.Context, ml *StreamsLookup) (PipelineExecutionState, UpkeepFailureReason, [][]byte, bool, error) {
+	var isMercuryV03 bool
+	resultLen := len(ml.feeds)
+	ch := make(chan MercuryData, resultLen)
+	if len(ml.feeds) == 0 {
+		return NoPipelineError, UpkeepFailureReasonInvalidRevertDataInput, nil, false, fmt.Errorf("invalid revert data input: feed param key %s, time param key %s, feeds %s", ml.feedParamKey, ml.timeParamKey, ml.feeds)
+	}
+	if ml.feedParamKey == FeedIdHex && ml.timeParamKey == BlockNumber {
+		// only v0.2
+		for i := range ml.feeds {
+			go mlh.singleFeedRequest(ctx, ch, i, ml)
+		}
+	} else if ml.feedParamKey == FeedIDs && ml.timeParamKey == Timestamp {
+		// only v0.3
+		resultLen = 1
+		isMercuryV03 = true
+		ch = make(chan MercuryData, resultLen)
+		go mlh.multiFeedsRequest(ctx, ch, ml)
+	} else {
+		return NoPipelineError, UpkeepFailureReasonInvalidRevertDataInput, nil, false, fmt.Errorf("invalid revert data input: feed param key %s, time param key %s, feeds %s", ml.feedParamKey, ml.timeParamKey, ml.feeds)
+	}
+
+	var reqErr error
+	results := make([][]byte, len(ml.feeds))
+	retryable := true
+	allSuccess := true
+	// in v0.2, use the last execution error as the state, if no execution errors, state will be no error
+	state := NoPipelineError
+	for i := 0; i < resultLen; i++ {
+		m := <-ch
+		if m.Error != nil {
+			if reqErr == nil {
+				reqErr = errors.New(m.Error.Error())
+			} else {
+				reqErr = errors.New(reqErr.Error() + m.Error.Error())
+			}
+			retryable = retryable && m.Retryable
+			allSuccess = false
+			if m.State != NoPipelineError {
+				state = m.State
+			}
+			continue
+		}
+		if isMercuryV03 {
+			results = m.Bytes
+		} else {
+			results[m.Index] = m.Bytes[0]
+		}
+	}
+	// only retry when not all successful AND none are not retryable
+	return state, UpkeepFailureReasonNone, results, retryable && !allSuccess, reqErr
+}
+
+// decodeStreamsLookup decodes the revert error StreamsLookup(string feedParamKey, string[] feeds, string timeParamKey, uint256 time, byte[] extraData)
+// func (mlh *MercuryLookupHandler) decodeStreamsLookup(data []byte) (*StreamsLookup, error) {
+// 	e := mlh.mercuryConfig.Abi.Errors["StreamsLookup"]
+// 	unpack, err := e.Unpack(data)
+// 	if err != nil {
+// 		return nil, fmt.Errorf("unpack error: %w", err)
+// 	}
+// 	errorParameters := unpack.([]interface{})
+
+// 	return &StreamsLookup{
+// 		feedParamKey: *abi.ConvertType(errorParameters[0], new(string)).(*string),
+// 		feeds:        *abi.ConvertType(errorParameters[1], new([]string)).(*[]string),
+// 		timeParamKey: *abi.ConvertType(errorParameters[2], new(string)).(*string),
+// 		time:         *abi.ConvertType(errorParameters[3], new(*big.Int)).(**big.Int),
+// 		extraData:    *abi.ConvertType(errorParameters[4], new([]byte)).(*[]byte),
+// 	}, nil
+// }
+
+// allowedToUseMercury retrieves upkeep's administrative offchain config and decode a mercuryEnabled bool to indicate if
+// this upkeep is allowed to use Mercury service.
+// func (mlh *MercuryLookupHandler) allowedToUseMercury(upkeep models.Upkeep) (bool, error) {
+// 	allowed, ok := mlh.mercuryConfig.AllowListCache.Get(upkeep.Admin.Hex())
+// 	if ok {
+// 		return allowed.(bool), nil
+// 	}
+
+// 	if upkeep.UpkeepPrivilegeConfig == nil {
+// 		return false, fmt.Errorf("the upkeep privilege config was not retrieved for upkeep with ID %s", upkeep.UpkeepID)
+// 	}
+
+// 	if len(upkeep.UpkeepPrivilegeConfig) == 0 {
+// 		return false, fmt.Errorf("the upkeep privilege config is empty")
+// 	}
+
+// 	var a UpkeepPrivilegeConfig
+// 	err := json.Unmarshal(upkeep.UpkeepPrivilegeConfig, &a)
+// 	if err != nil {
+// 		return false, fmt.Errorf("failed to unmarshal privilege config for upkeep ID %s: %v", upkeep.UpkeepID, err)
+// 	}
+
+// 	mlh.mercuryConfig.AllowListCache.Set(upkeep.Admin.Hex(), a.MercuryEnabled, cache.DefaultExpiration)
+// 	return a.MercuryEnabled, nil
+// }
+
+func (mlh *MercuryLookupHandler) CheckCallback(ctx context.Context, values [][]byte, lookup *StreamsLookup, registryABI ethabi.ABI, registryAddress common.Address) (hexutil.Bytes, error) {
+	payload, err := registryABI.Pack("checkCallback", lookup.upkeepId, values, lookup.extraData)
+	if err != nil {
+		return nil, err
+	}
+
+	var theBytes hexutil.Bytes
+	args := map[string]interface{}{
+		"to":   registryAddress.Hex(),
+		"data": hexutil.Bytes(payload),
+	}
+
+	// call checkCallback function at the block which OCR3 has agreed upon
+	err = mlh.rpcClient.CallContext(ctx, &theBytes, "eth_call", args, hexutil.EncodeUint64(lookup.block))
+	if err != nil {
+		return nil, err
+	}
+	return theBytes, nil
+}
diff --git a/core/scripts/go.mod b/core/scripts/go.mod
index 89ddc54ca7e..91e26caef69 100644
--- a/core/scripts/go.mod
+++ b/core/scripts/go.mod
@@ -7,6 +7,7 @@ replace github.com/smartcontractkit/chainlink/v2 => ../../
 
 require (
 	github.com/ava-labs/coreth v0.12.1
+	github.com/avast/retry-go v3.0.0+incompatible
 	github.com/docker/docker v24.0.7+incompatible
 	github.com/docker/go-connections v0.4.0
 	github.com/ethereum/go-ethereum v1.12.0
@@ -18,6 +19,7 @@ require (
 	github.com/montanaflynn/stats v0.7.1
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/pelletier/go-toml/v2 v2.1.0
+	github.com/pkg/errors v0.9.1
 	github.com/shopspring/decimal v1.3.1
 	github.com/smartcontractkit/chainlink-automation v1.0.1
 	github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
@@ -234,7 +236,6 @@ require (
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/pressly/goose/v3 v3.16.0 // indirect
diff --git a/core/scripts/go.sum b/core/scripts/go.sum
index 5f0e22fba03..1622f1d24df 100644
--- a/core/scripts/go.sum
+++ b/core/scripts/go.sum
@@ -150,6 +150,8 @@ github.com/ava-labs/avalanchego v1.10.1 h1:lBeamJ1iNq+p2oKg2nAs+A65m8vhSDjkiTDbw
 github.com/ava-labs/avalanchego v1.10.1/go.mod h1:ZvSXWlbkUKlbk3BsWx29a+8eVHe/WBsOxh55BSGoeRk=
 github.com/ava-labs/coreth v0.12.1 h1:EWSkFGHGVUxmu1pnSK/2pdcxaAVHbGspHqO3Ag+i7sA=
 github.com/ava-labs/coreth v0.12.1/go.mod h1:/5x54QlIKjlPebkdzTA5ic9wXdejbWOnQosztkv9jxo=
+github.com/avast/retry-go v3.0.0+incompatible h1:4SOWQ7Qs+oroOTQOYnAHqelpCO0biHSxpiH9JdtuBj0=
+github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY=
 github.com/avast/retry-go/v4 v4.5.1 h1:AxIx0HGi4VZ3I02jr78j5lZ3M6x1E0Ivxa6b0pUUh7o=
 github.com/avast/retry-go/v4 v4.5.1/go.mod h1:/sipNsvNB3RRuT5iNcb6h73nw3IBmXJ/H3XrCQYSOpc=
 github.com/aws/aws-sdk-go v1.22.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams.go
index cb9e2dd6752..aec23431921 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams.go
@@ -16,6 +16,7 @@ import (
 	"github.com/patrickmn/go-cache"
 
 	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"
+
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
 	iregistry21 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/i_keeper_registry_master_wrapper_2_1"
@@ -91,9 +92,8 @@ func NewStreamsLookup(
 // Lookup looks through check upkeep results looking for any that need off chain lookup
 func (s *streams) Lookup(ctx context.Context, checkResults []ocr2keepers.CheckResult) []ocr2keepers.CheckResult {
 	lookups := map[int]*mercury.StreamsLookup{}
-	for _, checkResult := range checkResults {
-		copyCheckResult := checkResult
-		s.buildResult(ctx, &copyCheckResult, lookups)
+	for i, checkResult := range checkResults {
+		s.buildResult(ctx, i, checkResult, checkResults, lookups)
 	}
 
 	var wg sync.WaitGroup
@@ -101,7 +101,7 @@ func (s *streams) Lookup(ctx context.Context, checkResults []ocr2keepers.CheckRe
 		wg.Add(1)
 		func(i int, lookup *mercury.StreamsLookup) {
 			s.threadCtrl.Go(func(ctx context.Context) {
-				s.doLookup(ctx, &wg, lookup, &checkResults[i])
+				s.doLookup(ctx, &wg, lookup, i, checkResults)
 			})
 		}(i, lookup)
 	}
@@ -112,7 +112,7 @@ func (s *streams) Lookup(ctx context.Context, checkResults []ocr2keepers.CheckRe
 }
 
 // buildResult checks if the upkeep is allowed by Mercury and builds a streams lookup request from the check result
-func (s *streams) buildResult(ctx context.Context, checkResult *ocr2keepers.CheckResult, lookups map[int]*mercury.StreamsLookup) {
+func (s *streams) buildResult(ctx context.Context, i int, checkResult ocr2keepers.CheckResult, checkResults []ocr2keepers.CheckResult, lookups map[int]*mercury.StreamsLookup) {
 	lookupLggr := s.lggr.With("where", "StreamsLookup")
 	if checkResult.IneligibilityReason != uint8(mercury.MercuryUpkeepFailureReasonTargetCheckReverted) {
 		// Streams Lookup only works when upkeep target check reverts
@@ -129,7 +129,7 @@ func (s *streams) buildResult(ctx context.Context, checkResult *ocr2keepers.Chec
 
 	// Try to decode the revert error into streams lookup format. User upkeeps can revert with any reason, see if they
 	// tried to call mercury
-	lookupLggr.Infof("at block %d upkeep %s trying to DecodeStreamsLookupRequest performData=%s", block, upkeepId, hexutil.Encode(checkResult.PerformData))
+	lookupLggr.Infof("at block %d upkeep %s trying to DecodeStreamsLookupRequest performData=%s", block, upkeepId, hexutil.Encode(checkResults[i].PerformData))
 	streamsLookupErr, err := s.packer.DecodeStreamsLookupRequest(checkResult.PerformData)
 	if err != nil {
 		lookupLggr.Debugf("at block %d upkeep %s DecodeStreamsLookupRequest failed: %v", block, upkeepId, err)
@@ -139,7 +139,7 @@ func (s *streams) buildResult(ctx context.Context, checkResult *ocr2keepers.Chec
 	streamsLookupResponse := &mercury.StreamsLookup{StreamsLookupError: streamsLookupErr}
 
 	if len(streamsLookupResponse.Feeds) == 0 {
-		checkResult.IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonInvalidRevertDataInput)
+		checkResults[i].IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonInvalidRevertDataInput)
 		lookupLggr.Debugf("at block %s upkeep %s has empty feeds array", block, upkeepId)
 		return
 	}
@@ -148,21 +148,21 @@ func (s *streams) buildResult(ctx context.Context, checkResult *ocr2keepers.Chec
 	if streamsLookupResponse.IsMercuryV02() {
 		// check permission on the registry for mercury v0.2
 		opts := s.buildCallOpts(ctx, block)
-		if state, reason, retryable, allowed, err := s.AllowedToUseMercury(opts, upkeepId.BigInt()); err != nil {
+		if state, reason, retryable, allowed, err := s.allowedToUseMercury(opts, upkeepId.BigInt()); err != nil {
 			lookupLggr.Warnf("at block %s upkeep %s failed to query mercury allow list: %s", block, upkeepId, err)
-			checkResult.PipelineExecutionState = uint8(state)
-			checkResult.IneligibilityReason = uint8(reason)
-			checkResult.Retryable = retryable
+			checkResults[i].PipelineExecutionState = uint8(state)
+			checkResults[i].IneligibilityReason = uint8(reason)
+			checkResults[i].Retryable = retryable
 			return
 		} else if !allowed {
 			lookupLggr.Debugf("at block %d upkeep %s NOT allowed to query Mercury server", block, upkeepId)
-			checkResult.IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonMercuryAccessNotAllowed)
+			checkResults[i].IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonMercuryAccessNotAllowed)
 			return
 		}
 	} else if streamsLookupResponse.IsMercuryVersionUnkown() {
 		// if mercury version cannot be determined, set failure reason
 		lookupLggr.Debugf("at block %d upkeep %s NOT allowed to query Mercury server", block, upkeepId)
-		checkResult.IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonInvalidRevertDataInput)
+		checkResults[i].IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonInvalidRevertDataInput)
 		return
 	}
 
@@ -171,103 +171,71 @@ func (s *streams) buildResult(ctx context.Context, checkResult *ocr2keepers.Chec
 	// in the revert for mercury v0.2, which is denoted by time in the struct bc starting from v0.3, only timestamp will be supported
 	streamsLookupResponse.Block = uint64(block.Int64())
 	lookupLggr.Infof("at block %d upkeep %s DecodeStreamsLookupRequest feedKey=%s timeKey=%s feeds=%v time=%s extraData=%s", block, upkeepId, streamsLookupResponse.FeedParamKey, streamsLookupResponse.TimeParamKey, streamsLookupResponse.Feeds, streamsLookupResponse.Time, hexutil.Encode(streamsLookupResponse.ExtraData))
-	lookups[len(lookups)] = streamsLookupResponse
+	lookups[i] = streamsLookupResponse
 }
 
-func (s *streams) doLookup(ctx context.Context, wg *sync.WaitGroup, lookup *mercury.StreamsLookup, checkResult *ocr2keepers.CheckResult) {
+func (s *streams) doLookup(ctx context.Context, wg *sync.WaitGroup, lookup *mercury.StreamsLookup, i int, checkResults []ocr2keepers.CheckResult) {
 	defer wg.Done()
 
-	values, err := s.DoMercuryRequest(ctx, lookup, checkResult)
-	if err != nil {
-		s.lggr.Errorf("at block %d upkeep %s requested time %s DoMercuryRequest err: %s", lookup.Block, lookup.UpkeepId, lookup.Time, err.Error())
-	}
+	state, reason, values, retryable, retryInterval, err := mercury.NoPipelineError, mercury.MercuryUpkeepFailureReasonInvalidRevertDataInput, [][]byte{}, false, 0*time.Second, fmt.Errorf("invalid revert data input: feed param key %s, time param key %s, feeds %s", lookup.FeedParamKey, lookup.TimeParamKey, lookup.Feeds)
+	pluginRetryKey := generatePluginRetryKey(checkResults[i].WorkID, lookup.Block)
 
-	if err := s.CheckCallback(ctx, values, lookup, checkResult); err != nil {
-		s.lggr.Errorf("at block %d upkeep %s requested time %s CheckCallback err: %s", lookup.Block, lookup.UpkeepId, lookup.Time, err.Error())
+	if lookup.IsMercuryV02() {
+		state, reason, values, retryable, retryInterval, err = s.v02Client.DoRequest(ctx, lookup, pluginRetryKey)
+	} else if lookup.IsMercuryV03() {
+		state, reason, values, retryable, retryInterval, err = s.v03Client.DoRequest(ctx, lookup, pluginRetryKey)
 	}
-}
 
-func (s *streams) CheckCallback(ctx context.Context, values [][]byte, lookup *mercury.StreamsLookup, checkResult *ocr2keepers.CheckResult) error {
-	payload, err := s.abi.Pack("checkCallback", lookup.UpkeepId, values, lookup.ExtraData)
 	if err != nil {
-		s.lggr.Errorf("at block %d upkeep %s checkCallback packing err: %s", lookup.Block, lookup.UpkeepId, err.Error())
-		checkResult.Retryable = false
-		checkResult.PipelineExecutionState = uint8(mercury.PackUnpackDecodeFailed)
-		return err
+		s.lggr.Errorf("at block %d upkeep %s requested time %s retryable %v retryInterval %s doMercuryRequest: %s", lookup.Block, lookup.UpkeepId, lookup.Time, retryable, retryInterval, err.Error())
+		checkResults[i].Retryable = retryable
+		checkResults[i].RetryInterval = retryInterval
+		checkResults[i].PipelineExecutionState = uint8(state)
+		checkResults[i].IneligibilityReason = uint8(reason)
+		return
 	}
 
-	var mercuryBytes hexutil.Bytes
-	args := map[string]interface{}{
-		"to":   s.registry.Address().Hex(),
-		"data": hexutil.Bytes(payload),
+	for j, v := range values {
+		s.lggr.Infof("at block %d upkeep %s requested time %s doMercuryRequest values[%d]: %s", lookup.Block, lookup.UpkeepId, lookup.Time, j, hexutil.Encode(v))
 	}
 
-	// call checkCallback function at the block which OCR3 has agreed upon
-	if err = s.client.CallContext(ctx, &mercuryBytes, "eth_call", args, hexutil.EncodeUint64(lookup.Block)); err != nil {
+	state, retryable, mercuryBytes, err := s.checkCallback(ctx, values, lookup)
+	if err != nil {
 		s.lggr.Errorf("at block %d upkeep %s checkCallback err: %s", lookup.Block, lookup.UpkeepId, err.Error())
-		checkResult.Retryable = true
-		checkResult.PipelineExecutionState = uint8(mercury.RpcFlakyFailure)
-		return err
+		checkResults[i].Retryable = retryable
+		checkResults[i].PipelineExecutionState = uint8(state)
+		return
 	}
-
 	s.lggr.Infof("at block %d upkeep %s requested time %s checkCallback mercuryBytes: %s", lookup.Block, lookup.UpkeepId, lookup.Time, hexutil.Encode(mercuryBytes))
 
 	unpackCallBackState, needed, performData, failureReason, _, err := s.packer.UnpackCheckCallbackResult(mercuryBytes)
 	if err != nil {
 		s.lggr.Errorf("at block %d upkeep %s requested time %s UnpackCheckCallbackResult err: %s", lookup.Block, lookup.UpkeepId, lookup.Time, err.Error())
-		checkResult.PipelineExecutionState = unpackCallBackState
-		return err
+		checkResults[i].PipelineExecutionState = unpackCallBackState
+		return
 	}
 
 	if failureReason == uint8(mercury.MercuryUpkeepFailureReasonMercuryCallbackReverted) {
-		checkResult.IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonMercuryCallbackReverted)
+		checkResults[i].IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonMercuryCallbackReverted)
 		s.lggr.Debugf("at block %d upkeep %s requested time %s mercury callback reverts", lookup.Block, lookup.UpkeepId, lookup.Time)
-		return fmt.Errorf("at block %d upkeep %s requested time %s mercury callback reverts", lookup.Block, lookup.UpkeepId, lookup.Time)
-
+		return
 	}
 
 	if !needed {
-		checkResult.IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonUpkeepNotNeeded)
+		checkResults[i].IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonUpkeepNotNeeded)
 		s.lggr.Debugf("at block %d upkeep %s requested time %s callback reports upkeep not needed", lookup.Block, lookup.UpkeepId, lookup.Time)
-		return fmt.Errorf("at block %d upkeep %s requested time %s callback reports upkeep not needed", lookup.Block, lookup.UpkeepId, lookup.Time)
+		return
 	}
 
-	checkResult.IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonNone)
-	checkResult.Eligible = true
-	checkResult.PerformData = performData
+	checkResults[i].IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonNone)
+	checkResults[i].Eligible = true
+	checkResults[i].PerformData = performData
 	s.lggr.Infof("at block %d upkeep %s requested time %s successful with perform data: %s", lookup.Block, lookup.UpkeepId, lookup.Time, hexutil.Encode(performData))
-
-	return nil
-}
-
-func (s *streams) DoMercuryRequest(ctx context.Context, lookup *mercury.StreamsLookup, checkResult *ocr2keepers.CheckResult) ([][]byte, error) {
-	state, reason, values, retryable, retryInterval, err := mercury.NoPipelineError, mercury.MercuryUpkeepFailureReasonInvalidRevertDataInput, [][]byte{}, false, 0*time.Second, fmt.Errorf("invalid revert data input: feed param key %s, time param key %s, feeds %s", lookup.FeedParamKey, lookup.TimeParamKey, lookup.Feeds)
-	pluginRetryKey := generatePluginRetryKey(checkResult.WorkID, lookup.Block)
-
-	if lookup.IsMercuryV02() {
-		state, reason, values, retryable, retryInterval, err = s.v02Client.DoRequest(ctx, lookup, pluginRetryKey)
-	} else if lookup.IsMercuryV03() {
-		state, reason, values, retryable, retryInterval, err = s.v03Client.DoRequest(ctx, lookup, pluginRetryKey)
-	}
-
-	if err != nil {
-		s.lggr.Errorf("at block %d upkeep %s requested time %s retryable %v retryInterval %s doMercuryRequest: %s", lookup.Block, lookup.UpkeepId, lookup.Time, retryable, retryInterval, err.Error())
-		checkResult.Retryable = retryable
-		checkResult.RetryInterval = retryInterval
-		checkResult.PipelineExecutionState = uint8(state)
-		checkResult.IneligibilityReason = uint8(reason)
-		return nil, err
-	}
-
-	for j, v := range values {
-		s.lggr.Infof("at block %d upkeep %s requested time %s doMercuryRequest values[%d]: %s", lookup.Block, lookup.UpkeepId, lookup.Time, j, hexutil.Encode(v))
-	}
-	return values, nil
 }
 
-// AllowedToUseMercury retrieves upkeep's administrative offchain config and decode a mercuryEnabled bool to indicate if
+// allowedToUseMercury retrieves upkeep's administrative offchain config and decode a mercuryEnabled bool to indicate if
 // this upkeep is allowed to use Mercury service.
-func (s *streams) AllowedToUseMercury(opts *bind.CallOpts, upkeepId *big.Int) (state mercury.MercuryUpkeepState, reason mercury.MercuryUpkeepFailureReason, retryable bool, allow bool, err error) {
+func (s *streams) allowedToUseMercury(opts *bind.CallOpts, upkeepId *big.Int) (state mercury.MercuryUpkeepState, reason mercury.MercuryUpkeepFailureReason, retryable bool, allow bool, err error) {
 	allowed, ok := s.mercuryConfig.IsUpkeepAllowed(upkeepId.String())
 	if ok {
 		return mercury.NoPipelineError, mercury.MercuryUpkeepFailureReasonNone, false, allowed.(bool), nil
@@ -287,6 +255,7 @@ func (s *streams) AllowedToUseMercury(opts *bind.CallOpts, upkeepId *big.Int) (s
 		"data": hexutil.Bytes(payload),
 	}
 
+	// call checkCallback function at the block which OCR3 has agreed upon
 	if err = s.client.CallContext(opts.Context, &resultBytes, "eth_call", args, hexutil.EncodeBig(opts.BlockNumber)); err != nil {
 		return mercury.RpcFlakyFailure, mercury.MercuryUpkeepFailureReasonNone, true, false, fmt.Errorf("failed to get upkeep privilege config: %v", err)
 	}
@@ -312,6 +281,26 @@ func (s *streams) AllowedToUseMercury(opts *bind.CallOpts, upkeepId *big.Int) (s
 	return mercury.NoPipelineError, mercury.MercuryUpkeepFailureReasonNone, false, privilegeConfig.MercuryEnabled, nil
 }
 
+func (s *streams) checkCallback(ctx context.Context, values [][]byte, lookup *mercury.StreamsLookup) (mercury.MercuryUpkeepState, bool, hexutil.Bytes, error) {
+	payload, err := s.abi.Pack("checkCallback", lookup.UpkeepId, values, lookup.ExtraData)
+	if err != nil {
+		return mercury.PackUnpackDecodeFailed, false, nil, err
+	}
+
+	var b hexutil.Bytes
+	args := map[string]interface{}{
+		"to":   s.registry.Address().Hex(),
+		"data": hexutil.Bytes(payload),
+	}
+
+	// call checkCallback function at the block which OCR3 has agreed upon
+	if err := s.client.CallContext(ctx, &b, "eth_call", args, hexutil.EncodeUint64(lookup.Block)); err != nil {
+		return mercury.RpcFlakyFailure, true, nil, err
+	}
+
+	return mercury.NoPipelineError, false, b, nil
+}
+
 func (s *streams) buildCallOpts(ctx context.Context, block *big.Int) *bind.CallOpts {
 	opts := bind.CallOpts{
 		Context: ctx,
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams_test.go
index 2475244b4d0..abcc37dca18 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams_test.go
@@ -126,7 +126,6 @@ func TestStreams_CheckCallback(t *testing.T) {
 	tests := []struct {
 		name       string
 		lookup     *mercury.StreamsLookup
-		input      []ocr2keepers.CheckResult
 		values     [][]byte
 		statusCode int
 
@@ -154,9 +153,6 @@ func TestStreams_CheckCallback(t *testing.T) {
 				UpkeepId: upkeepId,
 				Block:    bn,
 			},
-			input: []ocr2keepers.CheckResult{
-				{},
-			},
 			values:       values,
 			statusCode:   http.StatusOK,
 			callbackResp: []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 48, 120, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
@@ -189,9 +185,6 @@ func TestStreams_CheckCallback(t *testing.T) {
 				UpkeepId: upkeepId,
 				Block:    bn,
 			},
-			input: []ocr2keepers.CheckResult{
-				{},
-			},
 			values:       values,
 			statusCode:   http.StatusOK,
 			callbackResp: []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
@@ -223,9 +216,6 @@ func TestStreams_CheckCallback(t *testing.T) {
 				UpkeepId: upkeepId,
 				Block:    bn,
 			},
-			input: []ocr2keepers.CheckResult{
-				{},
-			},
 			values:       values,
 			statusCode:   http.StatusOK,
 			callbackResp: []byte{},
@@ -265,10 +255,10 @@ func TestStreams_CheckCallback(t *testing.T) {
 				}).Once()
 			s.client = client
 
-			err = s.CheckCallback(testutils.Context(t), tt.values, tt.lookup, &tt.input[0])
-			tt.wantErr(t, err, fmt.Sprintf("Error assertion failed: %v", tt.name))
-			assert.Equal(t, uint8(tt.state), tt.input[0].PipelineExecutionState)
-			assert.Equal(t, tt.retryable, tt.input[0].Retryable)
+			state, retryable, _, err := s.checkCallback(testutils.Context(t), tt.values, tt.lookup)
+			tt.wantErr(t, err, fmt.Sprintf("Error asserion failed: %v", tt.name))
+			assert.Equal(t, tt.state, state)
+			assert.Equal(t, tt.retryable, retryable)
 		})
 	}
 }
@@ -444,7 +434,7 @@ func TestStreams_AllowedToUseMercury(t *testing.T) {
 				BlockNumber: big.NewInt(10),
 			}
 
-			state, reason, retryable, allowed, err := s.AllowedToUseMercury(opts, upkeepId)
+			state, reason, retryable, allowed, err := s.allowedToUseMercury(opts, upkeepId)
 			assert.Equal(t, tt.err, err)
 			assert.Equal(t, tt.allowed, allowed)
 			assert.Equal(t, tt.state, state)

From 03a8fedb91cc4331ee68870f58b992cee7809a58 Mon Sep 17 00:00:00 2001
From: Sri Kidambi <1702865+kidambisrinivas@users.noreply.github.com>
Date: Mon, 4 Dec 2023 22:51:16 +0000
Subject: [PATCH 080/130] Update Loki auth in Github test workflow (#11488)

---
 .github/workflows/on-demand-vrfv2-performance-test.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/on-demand-vrfv2-performance-test.yml b/.github/workflows/on-demand-vrfv2-performance-test.yml
index 100fdf73e61..56a5c8eee84 100644
--- a/.github/workflows/on-demand-vrfv2-performance-test.yml
+++ b/.github/workflows/on-demand-vrfv2-performance-test.yml
@@ -71,7 +71,8 @@ jobs:
       contents: read
     env:
       LOKI_URL: ${{ secrets.LOKI_URL }}
-      LOKI_TOKEN: ${{ secrets.LOKI_TOKEN }}
+      LOKI_TENANT_ID: ${{ secrets.LOKI_TENANT_ID }}
+      LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
       SELECTED_NETWORKS: ${{ inputs.network }}
       TEST_TYPE: ${{ inputs.performanceTestType }}
       VRFV2_TEST_DURATION: ${{ inputs.testDuration }}

From 1ea49088e6e0e7c0c7c7e03c504a2641619b4922 Mon Sep 17 00:00:00 2001
From: Jim W <poopoothegorilla@users.noreply.github.com>
Date: Mon, 4 Dec 2023 20:05:11 -0500
Subject: [PATCH 081/130] remove pkgerrors dependency from common pkg (#11479)

* remove pkgerrors dependency from common pkg

* fix naming inconsistencies

* clean up error return

* clean up error return and remove use of Unwrap
---
 common/client/multi_node.go          |  7 +--
 common/client/multi_node_test.go     |  2 +-
 common/client/node.go                | 10 ++--
 common/client/node_lifecycle.go      |  2 +-
 common/client/node_lifecycle_test.go |  2 +-
 common/client/send_only_node_test.go |  2 +-
 common/fee/models.go                 | 12 ++--
 common/fee/utils.go                  |  4 +-
 common/headtracker/head_listener.go  |  5 +-
 common/headtracker/head_tracker.go   | 12 ++--
 common/txmgr/broadcaster.go          | 50 ++++++++---------
 common/txmgr/confirmer.go            | 83 ++++++++++++++--------------
 common/txmgr/strategies.go           |  4 +-
 common/txmgr/types/tx.go             | 14 ++++-
 14 files changed, 110 insertions(+), 99 deletions(-)

diff --git a/common/client/multi_node.go b/common/client/multi_node.go
index db5380e91f5..dfd6585b642 100644
--- a/common/client/multi_node.go
+++ b/common/client/multi_node.go
@@ -7,7 +7,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
@@ -166,12 +165,12 @@ func NewMultiNode[
 func (c *multiNode[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD, RPC_CLIENT]) Dial(ctx context.Context) error {
 	return c.StartOnce("MultiNode", func() (merr error) {
 		if len(c.nodes) == 0 {
-			return errors.Errorf("no available nodes for chain %s", c.chainID.String())
+			return fmt.Errorf("no available nodes for chain %s", c.chainID.String())
 		}
 		var ms services.MultiStart
 		for _, n := range c.nodes {
 			if n.ConfiguredChainID().String() != c.chainID.String() {
-				return ms.CloseBecause(errors.Errorf("node %s has configured chain ID %s which does not match multinode configured chain ID of %s", n.String(), n.ConfiguredChainID().String(), c.chainID.String()))
+				return ms.CloseBecause(fmt.Errorf("node %s has configured chain ID %s which does not match multinode configured chain ID of %s", n.String(), n.ConfiguredChainID().String(), c.chainID.String()))
 			}
 			rawNode, ok := n.(*node[CHAIN_ID, HEAD, RPC_CLIENT])
 			if ok {
@@ -188,7 +187,7 @@ func (c *multiNode[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OP
 		}
 		for _, s := range c.sendonlys {
 			if s.ConfiguredChainID().String() != c.chainID.String() {
-				return ms.CloseBecause(errors.Errorf("sendonly node %s has configured chain ID %s which does not match multinode configured chain ID of %s", s.String(), s.ConfiguredChainID().String(), c.chainID.String()))
+				return ms.CloseBecause(fmt.Errorf("sendonly node %s has configured chain ID %s which does not match multinode configured chain ID of %s", s.String(), s.ConfiguredChainID().String(), c.chainID.String()))
 			}
 			if err := ms.Start(ctx, s); err != nil {
 				return err
diff --git a/common/client/multi_node_test.go b/common/client/multi_node_test.go
index 229f1320a14..82af7411080 100644
--- a/common/client/multi_node_test.go
+++ b/common/client/multi_node_test.go
@@ -1,13 +1,13 @@
 package client
 
 import (
+	"errors"
 	"fmt"
 	big "math/big"
 	"math/rand"
 	"testing"
 	"time"
 
-	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
diff --git a/common/client/node.go b/common/client/node.go
index 4fad18b42cf..ce144bbca86 100644
--- a/common/client/node.go
+++ b/common/client/node.go
@@ -2,13 +2,13 @@ package client
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"math/big"
 	"net/url"
 	"sync"
 	"time"
 
-	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
@@ -256,15 +256,15 @@ func (n *node[CHAIN_ID, HEAD, RPC]) verify(callerCtx context.Context) (err error
 	var chainID CHAIN_ID
 	if chainID, err = n.rpc.ChainID(callerCtx); err != nil {
 		promFailed()
-		return errors.Wrapf(err, "failed to verify chain ID for node %s", n.name)
+		return fmt.Errorf("failed to verify chain ID for node %s: %w", n.name, err)
 	} else if chainID.String() != n.chainID.String() {
 		promFailed()
-		return errors.Wrapf(
-			errInvalidChainID,
-			"rpc ChainID doesn't match local chain ID: RPC ID=%s, local ID=%s, node name=%s",
+		return fmt.Errorf(
+			"rpc ChainID doesn't match local chain ID: RPC ID=%s, local ID=%s, node name=%s: %w",
 			chainID.String(),
 			n.chainID.String(),
 			n.name,
+			errInvalidChainID,
 		)
 	}
 
diff --git a/common/client/node_lifecycle.go b/common/client/node_lifecycle.go
index 59a59691c83..5ba0bff3238 100644
--- a/common/client/node_lifecycle.go
+++ b/common/client/node_lifecycle.go
@@ -2,12 +2,12 @@ package client
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"math"
 	"math/big"
 	"time"
 
-	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
diff --git a/common/client/node_lifecycle_test.go b/common/client/node_lifecycle_test.go
index 224b79d8378..bf94e6bd063 100644
--- a/common/client/node_lifecycle_test.go
+++ b/common/client/node_lifecycle_test.go
@@ -1,13 +1,13 @@
 package client
 
 import (
+	"errors"
 	"fmt"
 	big "math/big"
 	"sync/atomic"
 	"testing"
 
 	"github.com/cometbft/cometbft/libs/rand"
-	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"go.uber.org/zap"
diff --git a/common/client/send_only_node_test.go b/common/client/send_only_node_test.go
index 459f923cba8..79f4bfd60e3 100644
--- a/common/client/send_only_node_test.go
+++ b/common/client/send_only_node_test.go
@@ -1,11 +1,11 @@
 package client
 
 import (
+	"errors"
 	"fmt"
 	"net/url"
 	"testing"
 
-	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
diff --git a/common/fee/models.go b/common/fee/models.go
index b843cc3f055..1fe4d2b053b 100644
--- a/common/fee/models.go
+++ b/common/fee/models.go
@@ -1,10 +1,10 @@
 package fee
 
 import (
+	"errors"
+	"fmt"
 	"math/big"
 
-	"github.com/pkg/errors"
-
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	bigmath "github.com/smartcontractkit/chainlink-common/pkg/utils/big_math"
 	"github.com/smartcontractkit/chainlink/v2/common/chains/label"
@@ -47,15 +47,15 @@ func CalculateBumpedFee(
 	bumpedFeePrice = maxFee(lggr, currentfeePrice, bumpedFeePrice, maxFeePrice, "fee price", toChainUnit)
 
 	if bumpedFeePrice.Cmp(maxFeePrice) > 0 {
-		return maxFeePrice, errors.Wrapf(ErrBumpFeeExceedsLimit, "bumped fee price of %s would exceed configured max fee price of %s (original price was %s). %s",
-			toChainUnit(bumpedFeePrice), toChainUnit(maxFeePrice), toChainUnit(originalfeePrice), label.NodeConnectivityProblemWarning)
+		return maxFeePrice, fmt.Errorf("bumped fee price of %s would exceed configured max fee price of %s (original price was %s). %s: %w",
+			toChainUnit(bumpedFeePrice), toChainUnit(maxFeePrice), toChainUnit(originalfeePrice), label.NodeConnectivityProblemWarning, ErrBumpFeeExceedsLimit)
 	} else if bumpedFeePrice.Cmp(originalfeePrice) == 0 {
 		// NOTE: This really shouldn't happen since we enforce minimums for
 		// FeeEstimator.BumpPercent and FeeEstimator.BumpMin in the config validation,
 		// but it's here anyway for a "belts and braces" approach
-		return bumpedFeePrice, errors.Wrapf(ErrBump, "bumped fee price of %s is equal to original fee price of %s."+
+		return bumpedFeePrice, fmt.Errorf("bumped fee price of %s is equal to original fee price of %s."+
 			" ACTION REQUIRED: This is a configuration error, you must increase either "+
-			"FeeEstimator.BumpPercent or FeeEstimator.BumpMin", toChainUnit(bumpedFeePrice), toChainUnit(bumpedFeePrice))
+			"FeeEstimator.BumpPercent or FeeEstimator.BumpMin: %w", toChainUnit(bumpedFeePrice), toChainUnit(bumpedFeePrice), ErrBump)
 	}
 	return bumpedFeePrice, nil
 }
diff --git a/common/fee/utils.go b/common/fee/utils.go
index 71ababddbe3..eeb2c966719 100644
--- a/common/fee/utils.go
+++ b/common/fee/utils.go
@@ -1,10 +1,10 @@
 package fee
 
 import (
+	"fmt"
 	"math"
 	"math/big"
 
-	"github.com/pkg/errors"
 	"github.com/shopspring/decimal"
 )
 
@@ -12,7 +12,7 @@ func ApplyMultiplier(feeLimit uint32, multiplier float32) (uint32, error) {
 	result := decimal.NewFromBigInt(big.NewInt(0).SetUint64(uint64(feeLimit)), 0).Mul(decimal.NewFromFloat32(multiplier)).IntPart()
 
 	if result > math.MaxUint32 {
-		return 0, errors.Errorf("integer overflow when applying multiplier of %f to fee limit of %d", multiplier, feeLimit)
+		return 0, fmt.Errorf("integer overflow when applying multiplier of %f to fee limit of %d", multiplier, feeLimit)
 	}
 	return uint32(result), nil
 }
diff --git a/common/headtracker/head_listener.go b/common/headtracker/head_listener.go
index 2013895d0b8..0aebf606634 100644
--- a/common/headtracker/head_listener.go
+++ b/common/headtracker/head_listener.go
@@ -2,10 +2,11 @@ package headtracker
 
 import (
 	"context"
+	"errors"
+	"fmt"
 	"sync/atomic"
 	"time"
 
-	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
@@ -202,7 +203,7 @@ func (hl *HeadListener[HTH, S, ID, BLOCK_HASH]) subscribeToHead(ctx context.Cont
 	hl.headSubscription, err = hl.client.SubscribeNewHead(ctx, hl.chHeaders)
 	if err != nil {
 		close(hl.chHeaders)
-		return errors.Wrap(err, "Client#SubscribeNewHead")
+		return fmt.Errorf("Client#SubscribeNewHead: %w", err)
 	}
 
 	hl.connected.Store(true)
diff --git a/common/headtracker/head_tracker.go b/common/headtracker/head_tracker.go
index 6e379776c0f..c977eb023cc 100644
--- a/common/headtracker/head_tracker.go
+++ b/common/headtracker/head_tracker.go
@@ -2,11 +2,11 @@ package headtracker
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"sync"
 	"time"
 
-	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
@@ -123,7 +123,7 @@ func (ht *HeadTracker[HTH, S, ID, BLOCK_HASH]) Start(ctx context.Context) error
 			ht.log.Errorw("Error getting initial head", "err", err)
 		} else if initialHead.IsValid() {
 			if err := ht.handleNewHead(ctx, initialHead); err != nil {
-				return errors.Wrap(err, "error handling initial head")
+				return fmt.Errorf("error handling initial head: %w", err)
 			}
 		} else {
 			ht.log.Debug("Got nil initial head")
@@ -179,7 +179,7 @@ func (ht *HeadTracker[HTH, S, ID, BLOCK_HASH]) LatestChain() HTH {
 func (ht *HeadTracker[HTH, S, ID, BLOCK_HASH]) getInitialHead(ctx context.Context) (HTH, error) {
 	head, err := ht.client.HeadByNumber(ctx, nil)
 	if err != nil {
-		return ht.getNilHead(), errors.Wrap(err, "failed to fetch initial head")
+		return ht.getNilHead(), fmt.Errorf("failed to fetch initial head: %w", err)
 	}
 	loggerFields := []interface{}{"head", head}
 	if head.IsValid() {
@@ -204,7 +204,7 @@ func (ht *HeadTracker[HTH, S, ID, BLOCK_HASH]) handleNewHead(ctx context.Context
 	if ctx.Err() != nil {
 		return nil
 	} else if err != nil {
-		return errors.Wrapf(err, "failed to save head: %#v", head)
+		return fmt.Errorf("failed to save head: %#v: %w", head, err)
 	}
 
 	if !prevHead.IsValid() || head.BlockNumber() > prevHead.BlockNumber() {
@@ -212,7 +212,7 @@ func (ht *HeadTracker[HTH, S, ID, BLOCK_HASH]) handleNewHead(ctx context.Context
 
 		headWithChain := ht.headSaver.Chain(head.BlockHash())
 		if !headWithChain.IsValid() {
-			return errors.Errorf("HeadTracker#handleNewHighestHead headWithChain was unexpectedly nil")
+			return fmt.Errorf("HeadTracker#handleNewHighestHead headWithChain was unexpectedly nil")
 		}
 		ht.backfillMB.Deliver(headWithChain)
 		ht.broadcastMB.Deliver(headWithChain)
@@ -339,7 +339,7 @@ func (ht *HeadTracker[HTH, S, ID, BLOCK_HASH]) backfill(ctx context.Context, hea
 			ht.log.Debugw("context canceled, aborting backfill", "err", err, "ctx.Err", ctx.Err())
 			break
 		} else if err != nil {
-			return errors.Wrap(err, "fetchAndSaveHead failed")
+			return fmt.Errorf("fetchAndSaveHead failed: %w", err)
 		}
 	}
 	return
diff --git a/common/txmgr/broadcaster.go b/common/txmgr/broadcaster.go
index 54ae653f662..f10ecafc670 100644
--- a/common/txmgr/broadcaster.go
+++ b/common/txmgr/broadcaster.go
@@ -3,13 +3,13 @@ package txmgr
 import (
 	"context"
 	"database/sql"
+	"errors"
 	"fmt"
 	"slices"
 	"sync"
 	"time"
 
 	"github.com/jpillora/backoff"
-	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"go.uber.org/multierr"
@@ -210,7 +210,7 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) star
 	var err error
 	eb.enabledAddresses, err = eb.ks.EnabledAddressesForChain(eb.chainID)
 	if err != nil {
-		return errors.Wrap(err, "Broadcaster: failed to load EnabledAddressesForChain")
+		return fmt.Errorf("Broadcaster: failed to load EnabledAddressesForChain: %w", err)
 	}
 
 	if len(eb.enabledAddresses) > 0 {
@@ -246,7 +246,7 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) clos
 	eb.initSync.Lock()
 	defer eb.initSync.Unlock()
 	if !eb.isStarted {
-		return errors.Wrap(services.ErrAlreadyStopped, "Broadcaster is not started")
+		return fmt.Errorf("Broadcaster is not started: %w", services.ErrAlreadyStopped)
 	}
 	close(eb.chStop)
 	eb.wg.Wait()
@@ -454,19 +454,19 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) proc
 
 	err, retryable = eb.handleAnyInProgressTx(ctx, fromAddress)
 	if err != nil {
-		return retryable, errors.Wrap(err, "processUnstartedTxs failed on handleAnyInProgressTx")
+		return retryable, fmt.Errorf("processUnstartedTxs failed on handleAnyInProgressTx: %w", err)
 	}
 	for {
 		maxInFlightTransactions := eb.txConfig.MaxInFlight()
 		if maxInFlightTransactions > 0 {
 			nUnconfirmed, err := eb.txStore.CountUnconfirmedTransactions(ctx, fromAddress, eb.chainID)
 			if err != nil {
-				return true, errors.Wrap(err, "CountUnconfirmedTransactions failed")
+				return true, fmt.Errorf("CountUnconfirmedTransactions failed: %w", err)
 			}
 			if nUnconfirmed >= maxInFlightTransactions {
 				nUnstarted, err := eb.txStore.CountUnstartedTransactions(ctx, fromAddress, eb.chainID)
 				if err != nil {
-					return true, errors.Wrap(err, "CountUnstartedTransactions failed")
+					return true, fmt.Errorf("CountUnstartedTransactions failed: %w", err)
 				}
 				eb.lggr.Warnw(fmt.Sprintf(`Transaction throttling; %d transactions in-flight and %d unstarted transactions pending (maximum number of in-flight transactions is %d per key). %s`, nUnconfirmed, nUnstarted, maxInFlightTransactions, label.MaxInFlightTransactionsWarning), "maxInFlightTransactions", maxInFlightTransactions, "nUnconfirmed", nUnconfirmed, "nUnstarted", nUnstarted)
 				select {
@@ -479,7 +479,7 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) proc
 		}
 		etx, err := eb.nextUnstartedTransactionWithSequence(fromAddress)
 		if err != nil {
-			return true, errors.Wrap(err, "processUnstartedTxs failed on nextUnstartedTransactionWithSequence")
+			return true, fmt.Errorf("processUnstartedTxs failed on nextUnstartedTransactionWithSequence: %w", err)
 		}
 		if etx == nil {
 			return false, nil
@@ -489,18 +489,18 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) proc
 		var retryable bool
 		a, _, _, retryable, err = eb.NewTxAttempt(ctx, *etx, eb.lggr)
 		if err != nil {
-			return retryable, errors.Wrap(err, "processUnstartedTxs failed on NewAttempt")
+			return retryable, fmt.Errorf("processUnstartedTxs failed on NewAttempt: %w", err)
 		}
 
 		if err := eb.txStore.UpdateTxUnstartedToInProgress(ctx, etx, &a); errors.Is(err, ErrTxRemoved) {
 			eb.lggr.Debugw("tx removed", "txID", etx.ID, "subject", etx.Subject)
 			continue
 		} else if err != nil {
-			return true, errors.Wrap(err, "processUnstartedTxs failed on UpdateTxUnstartedToInProgress")
+			return true, fmt.Errorf("processUnstartedTxs failed on UpdateTxUnstartedToInProgress: %w", err)
 		}
 
 		if err, retryable := eb.handleInProgressTx(ctx, *etx, a, time.Now()); err != nil {
-			return retryable, errors.Wrap(err, "processUnstartedTxs failed on handleAnyInProgressTx")
+			return retryable, fmt.Errorf("processUnstartedTxs failed on handleInProgressTx: %w", err)
 		}
 	}
 }
@@ -510,11 +510,11 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) proc
 func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) handleAnyInProgressTx(ctx context.Context, fromAddress ADDR) (err error, retryable bool) {
 	etx, err := eb.txStore.GetTxInProgress(ctx, fromAddress)
 	if err != nil {
-		return errors.Wrap(err, "handleAnyInProgressTx failed"), true
+		return fmt.Errorf("handleAnyInProgressTx failed: %w", err), true
 	}
 	if etx != nil {
 		if err, retryable := eb.handleInProgressTx(ctx, *etx, etx.TxAttempts[0], etx.CreatedAt); err != nil {
-			return errors.Wrap(err, "handleAnyInProgressTx failed"), retryable
+			return fmt.Errorf("handleAnyInProgressTx failed: %w", err), retryable
 		}
 	}
 	return nil, false
@@ -524,17 +524,17 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) hand
 // Here we complete the job that we didn't finish last time.
 func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) handleInProgressTx(ctx context.Context, etx txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], attempt txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], initialBroadcastAt time.Time) (error, bool) {
 	if etx.State != TxInProgress {
-		return errors.Errorf("invariant violation: expected transaction %v to be in_progress, it was %s", etx.ID, etx.State), false
+		return fmt.Errorf("invariant violation: expected transaction %v to be in_progress, it was %s", etx.ID, etx.State), false
 	}
 
 	checkerSpec, err := etx.GetChecker()
 	if err != nil {
-		return errors.Wrap(err, "parsing transmit checker"), false
+		return fmt.Errorf("parsing transmit checker: %w", err), false
 	}
 
 	checker, err := eb.checkerFactory.BuildChecker(checkerSpec)
 	if err != nil {
-		return errors.Wrap(err, "building transmit checker"), false
+		return fmt.Errorf("building transmit checker: %w", err), false
 	}
 
 	lgr := etx.GetLogger(logger.With(eb.lggr, "fee", attempt.TxFee))
@@ -659,7 +659,7 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) hand
 		nextSequence, e := eb.client.PendingSequenceAt(ctx, etx.FromAddress)
 		if e != nil {
 			err = multierr.Combine(e, err)
-			return errors.Wrapf(err, "failed to fetch latest pending sequence after encountering unknown RPC error while sending transaction"), true
+			return fmt.Errorf("failed to fetch latest pending sequence after encountering unknown RPC error while sending transaction: %w", err), true
 		}
 		if nextSequence.Int64() > (*etx.Sequence).Int64() {
 			// Despite the error, the RPC node considers the previously sent
@@ -686,7 +686,7 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) hand
 		//
 		// In all cases, the best thing we can do is go into a retry loop and keep
 		// trying to send the transaction over again.
-		return errors.Wrapf(err, "retryable error while sending transaction %s (tx ID %d)", attempt.Hash.String(), etx.ID), true
+		return fmt.Errorf("retryable error while sending transaction %s (tx ID %d): %w", attempt.Hash.String(), etx.ID, err), true
 	}
 
 }
@@ -702,7 +702,7 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) next
 			// Finish. No more transactions left to process. Hoorah!
 			return nil, nil
 		}
-		return nil, errors.Wrap(err, "findNextUnstartedTransactionFromAddress failed")
+		return nil, fmt.Errorf("findNextUnstartedTransactionFromAddress failed: %w", err)
 	}
 
 	sequence, err := eb.GetNextSequence(ctx, etx.FromAddress)
@@ -726,7 +726,7 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) tryA
 
 	replacementAttempt, bumpedFee, bumpedFeeLimit, retryable, err := eb.NewBumpTxAttempt(ctx, etx, attempt, nil, lgr)
 	if err != nil {
-		return errors.Wrap(err, "tryAgainBumpFee failed"), retryable
+		return fmt.Errorf("tryAgainBumpFee failed: %w", err), retryable
 	}
 
 	return eb.saveTryAgainAttempt(ctx, lgr, etx, attempt, replacementAttempt, initialBroadcastAt, bumpedFee, bumpedFeeLimit)
@@ -734,14 +734,14 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) tryA
 
 func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) tryAgainWithNewEstimation(ctx context.Context, lgr logger.Logger, txError error, etx txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], attempt txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], initialBroadcastAt time.Time) (err error, retryable bool) {
 	if attempt.TxType == 0x2 {
-		err = errors.Errorf("re-estimation is not supported for EIP-1559 transactions. Node returned error: %v. This is a bug", txError.Error())
+		err = fmt.Errorf("re-estimation is not supported for EIP-1559 transactions. Node returned error: %v. This is a bug", txError.Error())
 		logger.Sugared(eb.lggr).AssumptionViolation(err.Error())
 		return err, false
 	}
 
 	replacementAttempt, fee, feeLimit, retryable, err := eb.NewTxAttemptWithType(ctx, etx, lgr, attempt.TxType, feetypes.OptForceRefetch)
 	if err != nil {
-		return errors.Wrap(err, "tryAgainWithNewEstimation failed to build new attempt"), retryable
+		return fmt.Errorf("tryAgainWithNewEstimation failed to build new attempt: %w", err), retryable
 	}
 	lgr.Warnw("L2 rejected transaction due to incorrect fee, re-estimated and will try again",
 		"etxID", etx.ID, "err", err, "newGasPrice", fee, "newGasLimit", feeLimit)
@@ -751,7 +751,7 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) tryA
 
 func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) saveTryAgainAttempt(ctx context.Context, lgr logger.Logger, etx txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], attempt txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], replacementAttempt txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], initialBroadcastAt time.Time, newFee FEE, newFeeLimit uint32) (err error, retyrable bool) {
 	if err = eb.txStore.SaveReplacementInProgressAttempt(ctx, attempt, &replacementAttempt); err != nil {
-		return errors.Wrap(err, "tryAgainWithNewFee failed"), true
+		return fmt.Errorf("tryAgainWithNewFee failed: %w", err), true
 	}
 	lgr.Debugw("Bumped fee on initial send", "oldFee", attempt.TxFee.String(), "newFee", newFee.String(), "newFeeLimit", newFeeLimit)
 	return eb.handleInProgressTx(ctx, etx, replacementAttempt, initialBroadcastAt)
@@ -761,7 +761,7 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) save
 	ctx, cancel := eb.chStop.NewCtx()
 	defer cancel()
 	if etx.State != TxInProgress {
-		return errors.Errorf("can only transition to fatal_error from in_progress, transaction is currently %s", etx.State)
+		return fmt.Errorf("can only transition to fatal_error from in_progress, transaction is currently %s", etx.State)
 	}
 	if !etx.Error.Valid {
 		return errors.New("expected error field to be set")
@@ -779,11 +779,11 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) save
 	// is relatively benign and probably nobody will ever run into it in
 	// practice, but something to be aware of.
 	if etx.PipelineTaskRunID.Valid && eb.resumeCallback != nil && etx.SignalCallback {
-		err := eb.resumeCallback(etx.PipelineTaskRunID.UUID, nil, errors.Errorf("fatal error while sending transaction: %s", etx.Error.String))
+		err := eb.resumeCallback(etx.PipelineTaskRunID.UUID, nil, fmt.Errorf("fatal error while sending transaction: %s", etx.Error.String))
 		if errors.Is(err, sql.ErrNoRows) {
 			lgr.Debugw("callback missing or already resumed", "etxID", etx.ID)
 		} else if err != nil {
-			return errors.Wrap(err, "failed to resume pipeline")
+			return fmt.Errorf("failed to resume pipeline: %w", err)
 		} else {
 			// Mark tx as having completed callback
 			if err := eb.txStore.UpdateTxCallbackCompleted(ctx, etx.PipelineTaskRunID.UUID, eb.chainID); err != nil {
diff --git a/common/txmgr/confirmer.go b/common/txmgr/confirmer.go
index a56768ce206..95be9ad23e6 100644
--- a/common/txmgr/confirmer.go
+++ b/common/txmgr/confirmer.go
@@ -3,13 +3,13 @@ package txmgr
 import (
 	"context"
 	"encoding/hex"
+	"errors"
 	"fmt"
 	"sort"
 	"strconv"
 	"sync"
 	"time"
 
-	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"go.uber.org/multierr"
@@ -201,7 +201,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) sta
 	var err error
 	ec.enabledAddresses, err = ec.ks.EnabledAddressesForChain(ec.chainID)
 	if err != nil {
-		return errors.Wrap(err, "Confirmer: failed to load EnabledAddressesForChain")
+		return fmt.Errorf("Confirmer: failed to load EnabledAddressesForChain: %w", err)
 	}
 
 	ec.ctx, ec.ctxCancel = context.WithCancel(context.Background())
@@ -223,7 +223,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) clo
 	ec.initSync.Lock()
 	defer ec.initSync.Unlock()
 	if !ec.isStarted {
-		return errors.Wrap(utils.ErrAlreadyStopped, "Confirmer is not started")
+		return fmt.Errorf("Confirmer is not started: %w", utils.ErrAlreadyStopped)
 	}
 	ec.ctxCancel()
 	ec.wg.Wait()
@@ -281,28 +281,28 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) pro
 	ec.lggr.Debugw("processHead start", "headNum", head.BlockNumber(), "id", "confirmer")
 
 	if err := ec.txStore.SetBroadcastBeforeBlockNum(ctx, head.BlockNumber(), ec.chainID); err != nil {
-		return errors.Wrap(err, "SetBroadcastBeforeBlockNum failed")
+		return fmt.Errorf("SetBroadcastBeforeBlockNum failed: %w", err)
 	}
 	if err := ec.CheckConfirmedMissingReceipt(ctx); err != nil {
-		return errors.Wrap(err, "CheckConfirmedMissingReceipt failed")
+		return fmt.Errorf("CheckConfirmedMissingReceipt failed: %w", err)
 	}
 
 	if err := ec.CheckForReceipts(ctx, head.BlockNumber()); err != nil {
-		return errors.Wrap(err, "CheckForReceipts failed")
+		return fmt.Errorf("CheckForReceipts failed: %w", err)
 	}
 
 	ec.lggr.Debugw("Finished CheckForReceipts", "headNum", head.BlockNumber(), "time", time.Since(mark), "id", "confirmer")
 	mark = time.Now()
 
 	if err := ec.RebroadcastWhereNecessary(ctx, head.BlockNumber()); err != nil {
-		return errors.Wrap(err, "RebroadcastWhereNecessary failed")
+		return fmt.Errorf("RebroadcastWhereNecessary failed: %w", err)
 	}
 
 	ec.lggr.Debugw("Finished RebroadcastWhereNecessary", "headNum", head.BlockNumber(), "time", time.Since(mark), "id", "confirmer")
 	mark = time.Now()
 
 	if err := ec.EnsureConfirmedTransactionsInLongestChain(ctx, head); err != nil {
-		return errors.Wrap(err, "EnsureConfirmedTransactionsInLongestChain failed")
+		return fmt.Errorf("EnsureConfirmedTransactionsInLongestChain failed: %w", err)
 	}
 
 	ec.lggr.Debugw("Finished EnsureConfirmedTransactionsInLongestChain", "headNum", head.BlockNumber(), "time", time.Since(mark), "id", "confirmer")
@@ -310,7 +310,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) pro
 	if ec.resumeCallback != nil {
 		mark = time.Now()
 		if err := ec.ResumePendingTaskRuns(ctx, head); err != nil {
-			return errors.Wrap(err, "ResumePendingTaskRuns failed")
+			return fmt.Errorf("ResumePendingTaskRuns failed: %w", err)
 		}
 
 		ec.lggr.Debugw("Finished ResumePendingTaskRuns", "headNum", head.BlockNumber(), "time", time.Since(mark), "id", "confirmer")
@@ -382,7 +382,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) Che
 func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) CheckForReceipts(ctx context.Context, blockNum int64) error {
 	attempts, err := ec.txStore.FindTxAttemptsRequiringReceiptFetch(ctx, ec.chainID)
 	if err != nil {
-		return errors.Wrap(err, "FindTxAttemptsRequiringReceiptFetch failed")
+		return fmt.Errorf("FindTxAttemptsRequiringReceiptFetch failed: %w", err)
 	}
 	if len(attempts) == 0 {
 		return nil
@@ -398,7 +398,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) Che
 	for from, attempts := range attemptsByAddress {
 		minedSequence, err := ec.getMinedSequenceForAddress(ctx, from)
 		if err != nil {
-			return errors.Wrapf(err, "unable to fetch pending sequence for address: %v", from)
+			return fmt.Errorf("unable to fetch pending sequence for address: %v: %w", from, err)
 		}
 
 		// separateLikelyConfirmedAttempts is used as an optimisation: there is
@@ -415,7 +415,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) Che
 			start := time.Now()
 			err = ec.fetchAndSaveReceipts(ctx, likelyConfirmed, blockNum)
 			if err != nil {
-				return errors.Wrapf(err, "unable to fetch and save receipts for likely confirmed txs, for address: %v", from)
+				return fmt.Errorf("unable to fetch and save receipts for likely confirmed txs, for address: %v: %w", from, err)
 			}
 			ec.lggr.Debugw(fmt.Sprintf("Fetching and saving %v likely confirmed receipts done", likelyConfirmedCount),
 				"time", time.Since(start))
@@ -423,11 +423,11 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) Che
 	}
 
 	if err := ec.txStore.MarkAllConfirmedMissingReceipt(ctx, ec.chainID); err != nil {
-		return errors.Wrap(err, "unable to mark txes as 'confirmed_missing_receipt'")
+		return fmt.Errorf("unable to mark txes as 'confirmed_missing_receipt': %w", err)
 	}
 
 	if err := ec.txStore.MarkOldTxesMissingReceiptAsErrored(ctx, blockNum, ec.chainConfig.FinalityDepth(), ec.chainID); err != nil {
-		return errors.Wrap(err, "unable to confirm buried unconfirmed txes")
+		return fmt.Errorf("unable to confirm buried unconfirmed txes': %w", err)
 	}
 	return nil
 }
@@ -488,10 +488,10 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) fet
 
 		receipts, err := ec.batchFetchReceipts(ctx, batch, blockNum)
 		if err != nil {
-			return errors.Wrap(err, "batchFetchReceipts failed")
+			return fmt.Errorf("batchFetchReceipts failed: %w", err)
 		}
 		if err := ec.txStore.SaveFetchedReceipts(ctx, receipts, ec.chainID); err != nil {
-			return errors.Wrap(err, "saveFetchedReceipts failed")
+			return fmt.Errorf("saveFetchedReceipts failed: %w", err)
 		}
 		promNumConfirmedTxs.WithLabelValues(ec.chainID.String()).Add(float64(len(receipts)))
 
@@ -514,7 +514,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) bat
 	if ec.txConfig.ForwardersEnabled() {
 		err = ec.txStore.PreloadTxes(ctx, attempts)
 		if err != nil {
-			return nil, errors.Wrap(err, "Confirmer#batchFetchReceipts error loading txs for attempts")
+			return nil, fmt.Errorf("Confirmer#batchFetchReceipts error loading txs for attempts: %w", err)
 		}
 	}
 
@@ -629,7 +629,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) Reb
 
 func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) rebroadcastWhereNecessary(ctx context.Context, address ADDR, blockHeight int64) error {
 	if err := ec.handleAnyInProgressAttempts(ctx, address, blockHeight); err != nil {
-		return errors.Wrap(err, "handleAnyInProgressAttempts failed")
+		return fmt.Errorf("handleAnyInProgressAttempts failed: %w", err)
 	}
 
 	threshold := int64(ec.feeConfig.BumpThreshold())
@@ -637,24 +637,24 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) reb
 	maxInFlightTransactions := ec.txConfig.MaxInFlight()
 	etxs, err := ec.FindTxsRequiringRebroadcast(ctx, ec.lggr, address, blockHeight, threshold, bumpDepth, maxInFlightTransactions, ec.chainID)
 	if err != nil {
-		return errors.Wrap(err, "FindTxsRequiringRebroadcast failed")
+		return fmt.Errorf("FindTxsRequiringRebroadcast failed: %w", err)
 	}
 	for _, etx := range etxs {
 		lggr := etx.GetLogger(ec.lggr)
 
 		attempt, err := ec.attemptForRebroadcast(ctx, lggr, *etx)
 		if err != nil {
-			return errors.Wrap(err, "attemptForRebroadcast failed")
+			return fmt.Errorf("attemptForRebroadcast failed: %w", err)
 		}
 
 		lggr.Debugw("Rebroadcasting transaction", "nPreviousAttempts", len(etx.TxAttempts), "fee", attempt.TxFee)
 
 		if err := ec.txStore.SaveInProgressAttempt(ctx, &attempt); err != nil {
-			return errors.Wrap(err, "saveInProgressAttempt failed")
+			return fmt.Errorf("saveInProgressAttempt failed: %w", err)
 		}
 
 		if err := ec.handleInProgressAttempt(ctx, lggr, *etx, attempt, blockHeight); err != nil {
-			return errors.Wrap(err, "handleInProgressAttempt failed")
+			return fmt.Errorf("handleInProgressAttempt failed: %w", err)
 		}
 	}
 	return nil
@@ -670,14 +670,14 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) han
 	if ctx.Err() != nil {
 		return nil
 	} else if err != nil {
-		return errors.Wrap(err, "GetInProgressTxAttempts failed")
+		return fmt.Errorf("GetInProgressTxAttempts failed: %w", err)
 	}
 	for _, a := range attempts {
 		err := ec.handleInProgressAttempt(ctx, a.Tx.GetLogger(ec.lggr), a.Tx, a, blockHeight)
 		if ctx.Err() != nil {
 			break
 		} else if err != nil {
-			return errors.Wrap(err, "handleInProgressAttempt failed")
+			return fmt.Errorf("handleInProgressAttempt failed: %w", err)
 		}
 	}
 	return nil
@@ -769,7 +769,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) att
 		}
 		return attempt, err
 	}
-	return attempt, errors.Errorf("invariant violation: Tx %v was unconfirmed but didn't have any attempts. "+
+	return attempt, fmt.Errorf("invariant violation: Tx %v was unconfirmed but didn't have any attempts. "+
 		"Falling back to default gas price instead."+
 		"This is a bug! Please report to https://github.com/smartcontractkit/chainlink/issues", etx.ID)
 }
@@ -802,17 +802,17 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) bum
 		return bumpedAttempt, err
 	}
 
-	if errors.Is(errors.Cause(err), commonfee.ErrBumpFeeExceedsLimit) {
+	if errors.Is(err, commonfee.ErrBumpFeeExceedsLimit) {
 		promGasBumpExceedsLimit.WithLabelValues(ec.chainID.String()).Inc()
 	}
 
-	return bumpedAttempt, errors.Wrap(err, "error bumping gas")
+	return bumpedAttempt, fmt.Errorf("error bumping gas: %w", err)
 }
 
 func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) handleInProgressAttempt(ctx context.Context, lggr logger.Logger, etx txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], attempt txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], blockHeight int64) error {
 	if attempt.State != txmgrtypes.TxAttemptInProgress {
 
-		return errors.Errorf("invariant violation: expected tx_attempt %v to be in_progress, it was %s", attempt.ID, attempt.State)
+		return fmt.Errorf("invariant violation: expected tx_attempt %v to be in_progress, it was %s", attempt.ID, attempt.State)
 	}
 
 	now := time.Now()
@@ -827,7 +827,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) han
 		// "Lazily" load attempts here since the overwhelmingly common case is
 		// that we don't need them unless we enter this path
 		if err := ec.txStore.LoadTxAttempts(ctx, &etx); err != nil {
-			return errors.Wrap(err, "failed to load TxAttempts while bumping on terminally underpriced error")
+			return fmt.Errorf("failed to load TxAttempts while bumping on terminally underpriced error: %w", err)
 		}
 		if len(etx.TxAttempts) == 0 {
 			err := errors.New("expected to find at least 1 attempt")
@@ -841,7 +841,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) han
 		}
 		replacementAttempt, err := ec.bumpGas(ctx, etx, etx.TxAttempts)
 		if err != nil {
-			return errors.Wrap(err, "could not bump gas for terminally underpriced transaction")
+			return fmt.Errorf("could not bump gas for terminally underpriced transaction: %w", err)
 		}
 		promNumGasBumps.WithLabelValues(ec.chainID.String()).Inc()
 		logger.With(lggr,
@@ -852,7 +852,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) han
 		).Errorf("gas price was rejected by the node for being too low. Node returned: '%s'", sendError.Error())
 
 		if err := ec.txStore.SaveReplacementInProgressAttempt(ctx, attempt, &replacementAttempt); err != nil {
-			return errors.Wrap(err, "saveReplacementInProgressAttempt failed")
+			return fmt.Errorf("saveReplacementInProgressAttempt failed: %w", err)
 		}
 		return ec.handleInProgressAttempt(ctx, lggr, etx, replacementAttempt, blockHeight)
 	case client.ExceedsMaxFee:
@@ -896,7 +896,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) han
 		// node operator. The node may have it in the mempool so we must keep the
 		// attempt (leave it in_progress). Safest thing to do is bail out and wait
 		// for the next head.
-		return errors.Wrapf(sendError, "unexpected error sending tx %v with hash %s", etx.ID, attempt.Hash.String())
+		return fmt.Errorf("unexpected error sending tx %v with hash %s: %w", etx.ID, attempt.Hash.String(), sendError)
 	}
 }
 
@@ -924,13 +924,13 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) Ens
 	}
 	etxs, err := ec.txStore.FindTransactionsConfirmedInBlockRange(ctx, head.BlockNumber(), head.EarliestHeadInChain().BlockNumber(), ec.chainID)
 	if err != nil {
-		return errors.Wrap(err, "findTransactionsConfirmedInBlockRange failed")
+		return fmt.Errorf("findTransactionsConfirmedInBlockRange failed: %w", err)
 	}
 
 	for _, etx := range etxs {
 		if !hasReceiptInLongestChain(*etx, head) {
 			if err := ec.markForRebroadcast(*etx, head); err != nil {
-				return errors.Wrapf(err, "markForRebroadcast failed for etx %v", etx.ID)
+				return fmt.Errorf("markForRebroadcast failed for etx %v: %w", etx.ID, err)
 			}
 		}
 	}
@@ -983,7 +983,7 @@ func hasReceiptInLongestChain[
 
 func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) markForRebroadcast(etx txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], head types.Head[BLOCK_HASH]) error {
 	if len(etx.TxAttempts) == 0 {
-		return errors.Errorf("invariant violation: expected tx %v to have at least one attempt", etx.ID)
+		return fmt.Errorf("invariant violation: expected tx %v to have at least one attempt", etx.ID)
 	}
 
 	// Rebroadcast the one with the highest gas price
@@ -1016,8 +1016,11 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) mar
 	ec.lggr.Infow(fmt.Sprintf("Re-org detected. Rebroadcasting transaction %s which may have been re-org'd out of the main chain", attempt.Hash.String()), logValues...)
 
 	// Put it back in progress and delete all receipts (they do not apply to the new chain)
-	err := ec.txStore.UpdateTxForRebroadcast(ec.ctx, etx, attempt)
-	return errors.Wrap(err, "markForRebroadcast failed")
+	if err := ec.txStore.UpdateTxForRebroadcast(ec.ctx, etx, attempt); err != nil {
+		return fmt.Errorf("markForRebroadcast failed: %w", err)
+	}
+
+	return nil
 }
 
 // ForceRebroadcast sends a transaction for every sequence in the given sequence range at the given gas price.
@@ -1037,7 +1040,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) For
 
 		etx, err := ec.txStore.FindTxWithSequence(ctx, address, seq)
 		if err != nil {
-			return errors.Wrap(err, "ForceRebroadcast failed")
+			return fmt.Errorf("ForceRebroadcast failed: %w", err)
 		}
 		if etx == nil {
 			ec.lggr.Debugf("ForceRebroadcast: no tx found with sequence %s, will rebroadcast empty transaction", seq)
@@ -1076,7 +1079,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) sen
 	}
 	txhash, err := ec.client.SendEmptyTransaction(ctx, ec.TxAttemptBuilder.NewEmptyTxAttempt, seq, gasLimit, fee, fromAddress)
 	if err != nil {
-		return "", errors.Wrap(err, "(Confirmer).sendEmptyTransaction failed")
+		return "", fmt.Errorf("(Confirmer).sendEmptyTransaction failed: %w", err)
 	}
 	return txhash, nil
 }
@@ -1099,7 +1102,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) Res
 		var taskErr error
 		var output interface{}
 		if data.FailOnRevert && data.Receipt.GetStatus() == 0 {
-			taskErr = errors.Errorf("transaction %s reverted on-chain", data.Receipt.GetTxHash())
+			taskErr = fmt.Errorf("transaction %s reverted on-chain", data.Receipt.GetTxHash())
 		} else {
 			output = data.Receipt
 		}
diff --git a/common/txmgr/strategies.go b/common/txmgr/strategies.go
index b986d0d9b80..faba2ba97bc 100644
--- a/common/txmgr/strategies.go
+++ b/common/txmgr/strategies.go
@@ -2,10 +2,10 @@ package txmgr
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/google/uuid"
-	"github.com/pkg/errors"
 
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
 )
@@ -63,7 +63,7 @@ func (s DropOldestStrategy) PruneQueue(ctx context.Context, pruneService txmgrty
 
 	n, err = pruneService.PruneUnstartedTxQueue(ctx, s.queueSize, s.subject)
 	if err != nil {
-		return 0, errors.Wrap(err, "DropOldestStrategy#PruneQueue failed")
+		return 0, fmt.Errorf("DropOldestStrategy#PruneQueue failed: %w", err)
 	}
 	return
 }
diff --git a/common/txmgr/types/tx.go b/common/txmgr/types/tx.go
index b8a16561d88..3af43b19617 100644
--- a/common/txmgr/types/tx.go
+++ b/common/txmgr/types/tx.go
@@ -3,6 +3,7 @@ package types
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"math/big"
 	"slices"
@@ -10,7 +11,6 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	"github.com/pkg/errors"
 	"gopkg.in/guregu/null.v4"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
@@ -245,7 +245,11 @@ func (e *Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) GetMeta() (*TxMeta[A
 		return nil, nil
 	}
 	var m TxMeta[ADDR, TX_HASH]
-	return &m, errors.Wrap(json.Unmarshal(*e.Meta, &m), "unmarshalling meta")
+	if err := json.Unmarshal(*e.Meta, &m); err != nil {
+		return nil, fmt.Errorf("unmarshalling meta: %w", err)
+	}
+
+	return &m, nil
 }
 
 // GetLogger returns a new logger with metadata fields.
@@ -320,5 +324,9 @@ func (e *Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) GetChecker() (Transm
 		return TransmitCheckerSpec[ADDR]{}, nil
 	}
 	var t TransmitCheckerSpec[ADDR]
-	return t, errors.Wrap(json.Unmarshal(*e.TransmitChecker, &t), "unmarshalling transmit checker")
+	if err := json.Unmarshal(*e.TransmitChecker, &t); err != nil {
+		return t, fmt.Errorf("unmarshalling transmit checker: %w", err)
+	}
+
+	return t, nil
 }

From 8f65343deeac390ee2b6c501488fddc2a33f950e Mon Sep 17 00:00:00 2001
From: Dimitris Grigoriou <dimitris.grigoriou@smartcontract.com>
Date: Tue, 5 Dec 2023 14:15:09 +0200
Subject: [PATCH 082/130] Extract mathutil (#11446)

* Extract mathutil

* Fix dependencies
---
 .../chains/evm/gas/block_history_estimator.go |  2 +-
 core/chains/evm/logpoller/log_poller.go       |  2 +-
 core/services/blockhashstore/feeder_test.go   |  3 +-
 .../ocr2vrf/coordinator/coordinator.go        |  3 +-
 .../ocr2vrf/coordinator/coordinator_test.go   |  2 +-
 core/services/vrf/v1/listener_v1.go           |  3 +-
 .../vrf/v2/listener_v2_log_listener.go        |  2 +-
 core/sessions/ldapauth/ldap.go                |  2 +-
 core/sessions/localauth/orm.go                |  2 +-
 core/utils/mathutil/mathutil.go               | 23 -------------
 core/utils/mathutil/mathutil_test.go          | 33 -------------------
 11 files changed, 12 insertions(+), 65 deletions(-)
 delete mode 100644 core/utils/mathutil/mathutil.go
 delete mode 100644 core/utils/mathutil/mathutil_test.go

diff --git a/core/chains/evm/gas/block_history_estimator.go b/core/chains/evm/gas/block_history_estimator.go
index 64dc331f657..0ec4721b797 100644
--- a/core/chains/evm/gas/block_history_estimator.go
+++ b/core/chains/evm/gas/block_history_estimator.go
@@ -17,6 +17,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mathutil"
 
 	"github.com/smartcontractkit/chainlink/v2/common/config"
 	commonfee "github.com/smartcontractkit/chainlink/v2/common/fee"
@@ -25,7 +26,6 @@ import (
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
-	"github.com/smartcontractkit/chainlink/v2/core/utils/mathutil"
 )
 
 // MaxStartTime is the maximum amount of time we are allowed to spend
diff --git a/core/chains/evm/logpoller/log_poller.go b/core/chains/evm/logpoller/log_poller.go
index de1999da260..fb380f84b2c 100644
--- a/core/chains/evm/logpoller/log_poller.go
+++ b/core/chains/evm/logpoller/log_poller.go
@@ -22,12 +22,12 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mathutil"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
-	"github.com/smartcontractkit/chainlink/v2/core/utils/mathutil"
 )
 
 //go:generate mockery --quiet --name LogPoller --output ./mocks/ --case=underscore --structname LogPoller --filename log_poller.go
diff --git a/core/services/blockhashstore/feeder_test.go b/core/services/blockhashstore/feeder_test.go
index 8d9ed48c4bf..ad039798408 100644
--- a/core/services/blockhashstore/feeder_test.go
+++ b/core/services/blockhashstore/feeder_test.go
@@ -14,9 +14,10 @@ import (
 	"github.com/stretchr/testify/require"
 	"golang.org/x/exp/maps"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mathutil"
+
 	mocklp "github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller/mocks"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/utils/mathutil"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	bhsmocks "github.com/smartcontractkit/chainlink/v2/core/services/blockhashstore/mocks"
diff --git a/core/services/ocr2/plugins/ocr2vrf/coordinator/coordinator.go b/core/services/ocr2/plugins/ocr2vrf/coordinator/coordinator.go
index 63538941532..a25fcca9fec 100644
--- a/core/services/ocr2/plugins/ocr2vrf/coordinator/coordinator.go
+++ b/core/services/ocr2/plugins/ocr2vrf/coordinator/coordinator.go
@@ -23,6 +23,8 @@ import (
 	"github.com/smartcontractkit/libocr/commontypes"
 	ocr2Types "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mathutil"
+
 	"github.com/smartcontractkit/chainlink-vrf/dkg"
 	ocr2vrftypes "github.com/smartcontractkit/chainlink-vrf/types"
 
@@ -38,7 +40,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
 	ocr2vrfconfig "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2vrf/config"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
-	"github.com/smartcontractkit/chainlink/v2/core/utils/mathutil"
 )
 
 var _ ocr2vrftypes.CoordinatorInterface = &coordinator{}
diff --git a/core/services/ocr2/plugins/ocr2vrf/coordinator/coordinator_test.go b/core/services/ocr2/plugins/ocr2vrf/coordinator/coordinator_test.go
index 418e4356c68..9c3eb087985 100644
--- a/core/services/ocr2/plugins/ocr2vrf/coordinator/coordinator_test.go
+++ b/core/services/ocr2/plugins/ocr2vrf/coordinator/coordinator_test.go
@@ -27,6 +27,7 @@ import (
 	ocr2vrftypes "github.com/smartcontractkit/chainlink-vrf/types"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mathutil"
 
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
@@ -38,7 +39,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2vrf/coordinator/mocks"
-	"github.com/smartcontractkit/chainlink/v2/core/utils/mathutil"
 )
 
 func TestCoordinator_BeaconPeriod(t *testing.T) {
diff --git a/core/services/vrf/v1/listener_v1.go b/core/services/vrf/v1/listener_v1.go
index 494847797fa..66a8ddcd58c 100644
--- a/core/services/vrf/v1/listener_v1.go
+++ b/core/services/vrf/v1/listener_v1.go
@@ -17,6 +17,8 @@ import (
 	"github.com/theodesp/go-heaps/pairing"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mathutil"
+
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
@@ -28,7 +30,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
 	"github.com/smartcontractkit/chainlink/v2/core/services/vrf/vrfcommon"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
-	"github.com/smartcontractkit/chainlink/v2/core/utils/mathutil"
 )
 
 var (
diff --git a/core/services/vrf/v2/listener_v2_log_listener.go b/core/services/vrf/v2/listener_v2_log_listener.go
index b35593bd1ca..07b4c2c3800 100644
--- a/core/services/vrf/v2/listener_v2_log_listener.go
+++ b/core/services/vrf/v2/listener_v2_log_listener.go
@@ -10,12 +10,12 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"go.uber.org/multierr"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mathutil"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/services/vrf/vrfcommon"
-	"github.com/smartcontractkit/chainlink/v2/core/utils/mathutil"
 )
 
 func (lsn *listenerV2) runLogListener(
diff --git a/core/sessions/ldapauth/ldap.go b/core/sessions/ldapauth/ldap.go
index 04f6fbfbbb6..147f8bd2aed 100644
--- a/core/sessions/ldapauth/ldap.go
+++ b/core/sessions/ldapauth/ldap.go
@@ -34,6 +34,7 @@ import (
 	"github.com/go-ldap/ldap/v3"
 	"github.com/jmoiron/sqlx"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mathutil"
 	"github.com/smartcontractkit/chainlink/v2/core/auth"
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
 	"github.com/smartcontractkit/chainlink/v2/core/config"
@@ -42,7 +43,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/sessions"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
-	"github.com/smartcontractkit/chainlink/v2/core/utils/mathutil"
 )
 
 const (
diff --git a/core/sessions/localauth/orm.go b/core/sessions/localauth/orm.go
index 090dc468a62..013f719ad34 100644
--- a/core/sessions/localauth/orm.go
+++ b/core/sessions/localauth/orm.go
@@ -9,6 +9,7 @@ import (
 	"github.com/jmoiron/sqlx"
 	"github.com/pkg/errors"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mathutil"
 	"github.com/smartcontractkit/chainlink/v2/core/auth"
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
@@ -16,7 +17,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/sessions"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
-	"github.com/smartcontractkit/chainlink/v2/core/utils/mathutil"
 )
 
 type orm struct {
diff --git a/core/utils/mathutil/mathutil.go b/core/utils/mathutil/mathutil.go
deleted file mode 100644
index e9659a1f151..00000000000
--- a/core/utils/mathutil/mathutil.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package mathutil
-
-import "golang.org/x/exp/constraints"
-
-func Max[V constraints.Ordered](first V, vals ...V) V {
-	max := first
-	for _, v := range vals {
-		if v > max {
-			max = v
-		}
-	}
-	return max
-}
-
-func Min[V constraints.Ordered](first V, vals ...V) V {
-	min := first
-	for _, v := range vals {
-		if v < min {
-			min = v
-		}
-	}
-	return min
-}
diff --git a/core/utils/mathutil/mathutil_test.go b/core/utils/mathutil/mathutil_test.go
deleted file mode 100644
index 24a464bb398..00000000000
--- a/core/utils/mathutil/mathutil_test.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package mathutil
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestMax(t *testing.T) {
-	// Happy path
-	assert.Equal(t, 3, Max(3, 2, 1))
-	// Single element
-	assert.Equal(t, 3, Max(3))
-	// Signed
-	assert.Equal(t, -1, Max(-2, -1))
-	// Uint64
-	assert.Equal(t, uint64(2), Max(uint64(0), uint64(2)))
-	// String
-	assert.Equal(t, "c", Max("a", []string{"b", "c"}...))
-}
-
-func TestMin(t *testing.T) {
-	// Happy path
-	assert.Equal(t, 1, Min(3, 2, 1))
-	// Single element
-	assert.Equal(t, 3, Min(3))
-	// Signed
-	assert.Equal(t, -2, Min(-2, -1))
-	// Uint64
-	assert.Equal(t, uint64(0), Min(uint64(0), uint64(2)))
-	// String
-	assert.Equal(t, "a", Min("a", []string{"b", "c"}...))
-}

From 4848878fa9c0b4441068d1ec83447f90df9fc157 Mon Sep 17 00:00:00 2001
From: Ilja Pavlovs <ilja.pavlovs@gmail.com>
Date: Tue, 5 Dec 2023 14:17:19 +0200
Subject: [PATCH 083/130] VRF-784: add contract loader client for BSC to run
 CTF tests there (#11494)

---
 integration-tests/contracts/contract_loader.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/integration-tests/contracts/contract_loader.go b/integration-tests/contracts/contract_loader.go
index 6136e78b367..e66c95138b9 100644
--- a/integration-tests/contracts/contract_loader.go
+++ b/integration-tests/contracts/contract_loader.go
@@ -71,6 +71,8 @@ func NewContractLoader(bcClient blockchain.EVMClient, logger zerolog.Logger) (Co
 		return &PolygonZkEvmContractLoader{NewEthereumContractLoader(clientImpl, logger)}, nil
 	case *blockchain.WeMixClient:
 		return &WeMixContractLoader{NewEthereumContractLoader(clientImpl, logger)}, nil
+	case *blockchain.BSCClient:
+		return &BSCContractLoader{NewEthereumContractLoader(clientImpl, logger)}, nil
 	}
 	return nil, errors.New("unknown blockchain client implementation for contract Loader, register blockchain client in NewContractLoader")
 }
@@ -119,6 +121,11 @@ type WeMixContractLoader struct {
 	*EthereumContractLoader
 }
 
+// BSCContractLoader wraps ethereum contract deployments for BSC
+type BSCContractLoader struct {
+	*EthereumContractLoader
+}
+
 // NewEthereumContractLoader returns an instantiated instance of the ETH contract Loader
 func NewEthereumContractLoader(ethClient blockchain.EVMClient, logger zerolog.Logger) *EthereumContractLoader {
 	return &EthereumContractLoader{

From b4d8dc36e1b9b3456f6ed67776cbb5f2f336f71c Mon Sep 17 00:00:00 2001
From: chainchad <96362174+chainchad@users.noreply.github.com>
Date: Tue, 5 Dec 2023 11:09:22 -0500
Subject: [PATCH 084/130] Check if ECR image exists before trying to publish
 (#11495)

* Check if ECR image exists before trying to publish

* Fix role to use correct secret
---
 .github/workflows/build-publish-pr.yml | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-publish-pr.yml b/.github/workflows/build-publish-pr.yml
index a7186ee5a11..cdc9cf3f11c 100644
--- a/.github/workflows/build-publish-pr.yml
+++ b/.github/workflows/build-publish-pr.yml
@@ -16,11 +16,31 @@ jobs:
     permissions:
       id-token: write
       contents: read
+    env:
+      ECR_IMAGE_NAME: crib-chainlink-untrusted
     steps:
+      - name: Git Short SHA
+        shell: bash
+        env:
+          GIT_PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+        run: |
+          echo "GIT_SHORT_SHA=${GIT_PR_HEAD_SHA:0:7}" | tee -a "$GITHUB_ENV"
+
+      - name: Check if image exists
+        id: check-image
+        uses: smartcontractkit/chainlink-github-actions/docker/image-exists@912bed7e07a1df4d06ea53a031e9773bb65dc7bd # v2.3.0
+        with:
+          repository: ${{ env.ECR_IMAGE_NAME}}
+          tag: sha-${{ env.GIT_SHORT_SHA }}
+          AWS_REGION: ${{ secrets.AWS_REGION }}
+          AWS_ROLE_TO_ASSUME: ${{ secrets.AWS_OIDC_IAM_ROLE_PUBLISH_PR_ARN }}
+
       - name: Checkout repository
+        if: steps.check-image.outputs.exists == 'false'
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: Build and publish chainlink image
+        if: steps.check-image.outputs.exists == 'false'
         uses: ./.github/actions/build-sign-publish-chainlink
         with:
           publish: true
@@ -29,7 +49,7 @@ jobs:
           aws-region: ${{ secrets.AWS_REGION }}
           sign-images: false
           ecr-hostname: ${{ secrets.AWS_SDLC_ECR_HOSTNAME }}
-          ecr-image-name: crib-chainlink-untrusted
+          ecr-image-name: ${{ env.ECR_IMAGE_NAME }}
           dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }}
           dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }}
 

From c12f27c470cdadaa20a550a0fb32098b744bd1e4 Mon Sep 17 00:00:00 2001
From: Ilja Pavlovs <ilja.pavlovs@gmail.com>
Date: Tue, 5 Dec 2023 18:34:10 +0200
Subject: [PATCH 085/130] =?UTF-8?q?VRF-782:=20Fix=20setup-env=20script=20i?=
 =?UTF-8?q?n=20order=20to=20include=20flag=20for=20deploying=20=E2=80=A6?=
 =?UTF-8?q?=20(#11445)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* VRF-782: Fix setup-env script in order to include flag for deploying VRFOwner contract

* Update main.go

* VRF-782: Fix setup-env script to create ETH key

---------

Co-authored-by: Sri Kidambi <1702865+kidambisrinivas@users.noreply.github.com>
---
 core/scripts/common/vrf/setup-envs/README.md | 6 ++++--
 core/scripts/common/vrf/setup-envs/main.go   | 6 +++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/core/scripts/common/vrf/setup-envs/README.md b/core/scripts/common/vrf/setup-envs/README.md
index 9aa76ffbbb7..5aa6aa4754f 100644
--- a/core/scripts/common/vrf/setup-envs/README.md
+++ b/core/scripts/common/vrf/setup-envs/README.md
@@ -38,7 +38,8 @@ go run . \
 --batch-fulfillment-enabled="true" \
 --min-confs=3 \
 --register-vrf-key-against-address=<vrf key will be registered against this address 
-in order to call oracleWithdraw from this address>
+in order to call oracleWithdraw from this address> \
+--deploy-vrfv2-owner="true"
 ```
 
 Optional parameters - will not be deployed if specified 
@@ -71,7 +72,7 @@ go run . \
 --sending-key-funding-amount="1e17" \
 --deploy-contracts-and-create-jobs="false" 
 ```
-Then update corresponding deployment scripts with the new ETH addresses, specifying max gas price for each key
+Then update corresponding deployment scripts in infra-k8s repo with the new ETH addresses, specifying max gas price for each key
 
 e.g.:
 ```
@@ -98,6 +99,7 @@ go run . \
 --batch-fulfillment-enabled="true" \
 --min-confs=3 \
 --register-vrf-key-against-address="<eoa address>" \
+--deploy-vrfv2-owner="true" \
 --link-address "<link address>" \
 --link-eth-feed "<link eth feed address>" 
 ``` 
diff --git a/core/scripts/common/vrf/setup-envs/main.go b/core/scripts/common/vrf/setup-envs/main.go
index 94662aa1831..e9ea252e4c4 100644
--- a/core/scripts/common/vrf/setup-envs/main.go
+++ b/core/scripts/common/vrf/setup-envs/main.go
@@ -12,6 +12,8 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/shopspring/decimal"
+	"github.com/urfave/cli"
+
 	helpers "github.com/smartcontractkit/chainlink/core/scripts/common"
 	"github.com/smartcontractkit/chainlink/core/scripts/common/vrf/constants"
 	"github.com/smartcontractkit/chainlink/core/scripts/common/vrf/model"
@@ -21,7 +23,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/vrf_coordinator_v2"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/vrf_coordinator_v2_5"
 	"github.com/smartcontractkit/chainlink/v2/core/web/presenters"
-	"github.com/urfave/cli"
 )
 
 func newApp(remoteNodeURL string, writer io.Writer) (*clcmd.Shell, *cli.App) {
@@ -87,6 +88,7 @@ func main() {
 	batchCoordinatorAddressString := flag.String("batch-coordinator-address", "", "address Batch VRF Coordinator contract")
 	registerVRFKeyAgainstAddress := flag.String("register-vrf-key-against-address", "", "VRF Key registration against address - "+
 		"from this address you can perform `coordinator.oracleWithdraw` to withdraw earned funds from rand request fulfilments")
+	deployVRFOwner := flag.Bool("deploy-vrfv2-owner", true, "whether to deploy VRF owner contracts")
 
 	e := helpers.SetupEnv(false)
 	flag.Parse()
@@ -211,6 +213,7 @@ func main() {
 				coordinatorConfigV2,
 				*batchFulfillmentEnabled,
 				nodesMap,
+				*deployVRFOwner,
 			)
 		case "v2plus":
 			feeConfigV2Plus := vrf_coordinator_v2_5.VRFCoordinatorV25FeeConfig{
@@ -503,6 +506,7 @@ func createETHKeysIfNeeded(client *clcmd.Shell, app *cli.App, output *bytes.Buff
 			var newKey presenters.ETHKeyResource
 
 			flagSet := flag.NewFlagSet("blah", flag.ExitOnError)
+			flagSet.String("evm-chain-id", os.Getenv("ETH_CHAIN_ID"), "chain id")
 			if *maxGasPriceGwei > 0 {
 				helpers.PanicErr(flagSet.Set("max-gas-price-gwei", fmt.Sprintf("%d", *maxGasPriceGwei)))
 			}

From 40422d01e8fcec96d3a599ea9d495e03504d4725 Mon Sep 17 00:00:00 2001
From: ilija42 <57732589+ilija42@users.noreply.github.com>
Date: Wed, 6 Dec 2023 16:26:19 +0100
Subject: [PATCH 086/130] BCF-2823 Minor changes to distributeFunds (#11476)

* Improve OperatorFactory deployNewOperatorAndForwarder natspec

* Change to fwds distributeFunds to use call
---
 contracts/src/v0.8/operatorforwarder/dev/Operator.sol         | 3 ++-
 contracts/src/v0.8/operatorforwarder/dev/OperatorFactory.sol  | 2 +-
 .../generated/operator_factory/operator_factory.go            | 2 +-
 .../generated/operator_wrapper/operator_wrapper.go            | 2 +-
 .../generated-wrapper-dependency-versions-do-not-edit.txt     | 4 ++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/contracts/src/v0.8/operatorforwarder/dev/Operator.sol b/contracts/src/v0.8/operatorforwarder/dev/Operator.sol
index c8451bf03ce..26295b27d16 100644
--- a/contracts/src/v0.8/operatorforwarder/dev/Operator.sol
+++ b/contracts/src/v0.8/operatorforwarder/dev/Operator.sol
@@ -318,7 +318,8 @@ contract Operator is AuthorizedReceiver, ConfirmedOwner, LinkTokenReceiver, Oper
     for (uint256 i = 0; i < receivers.length; ++i) {
       uint256 sendAmount = amounts[i];
       valueRemaining = valueRemaining - sendAmount;
-      receivers[i].transfer(sendAmount);
+      (bool success, ) = receivers[i].call{value: sendAmount}("");
+      require(success, "Address: unable to send value, recipient may have reverted");
     }
     require(valueRemaining == 0, "Too much ETH sent");
   }
diff --git a/contracts/src/v0.8/operatorforwarder/dev/OperatorFactory.sol b/contracts/src/v0.8/operatorforwarder/dev/OperatorFactory.sol
index 62ace2451c5..0ff4bb6562e 100644
--- a/contracts/src/v0.8/operatorforwarder/dev/OperatorFactory.sol
+++ b/contracts/src/v0.8/operatorforwarder/dev/OperatorFactory.sol
@@ -34,7 +34,7 @@ contract OperatorFactory {
   }
 
   // @notice creates a new Operator contract with the msg.sender as owner and a
-  // new Operator Forwarder with the Operator as the owner
+  // new Operator Forwarder with the OperatorFactory as the owner
   function deployNewOperatorAndForwarder() external returns (address, address) {
     Operator operator = new Operator(linkToken, msg.sender);
     s_created[address(operator)] = true;
diff --git a/core/gethwrappers/generated/operator_factory/operator_factory.go b/core/gethwrappers/generated/operator_factory/operator_factory.go
index c9a6c57ce21..c14ef439368 100644
--- a/core/gethwrappers/generated/operator_factory/operator_factory.go
+++ b/core/gethwrappers/generated/operator_factory/operator_factory.go
@@ -32,7 +32,7 @@ var (
 
 var OperatorFactoryMetaData = &bind.MetaData{
 	ABI: "[{\"inputs\":[{\"internalType\":\"address\",\"name\":\"linkAddress\",\"type\":\"address\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"forwarder\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"owner\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"}],\"name\":\"AuthorizedForwarderCreated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"operator\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"owner\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"}],\"name\":\"OperatorCreated\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"query\",\"type\":\"address\"}],\"name\":\"created\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"deployNewForwarder\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"message\",\"type\":\"bytes\"}],\"name\":\"deployNewForwarderAndTransferOwnership\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"deployNewOperator\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"deployNewOperatorAndForwarder\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"linkToken\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"typeAndVersion\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]",
-	Bin: "0x60a060405234801561001057600080fd5b50604051615caf380380615caf83398101604081905261002f91610040565b6001600160a01b0316608052610070565b60006020828403121561005257600080fd5b81516001600160a01b038116811461006957600080fd5b9392505050565b608051615c016100ae6000396000818161014f015281816101e6015281816102e3015281816103da015281816104be01526105a50152615c016000f3fe60806040523480156200001157600080fd5b5060043610620000875760003560e01c806357970e93116200006257806357970e931462000149578063d42efd831462000171578063d689d09514620001be578063f4adb6e114620001d557600080fd5b8063181f5a77146200008c57806332f01eae14620000e15780633babafdb1462000119575b600080fd5b620000c96040518060400160405280601581526020017f4f70657261746f72466163746f727920312e302e30000000000000000000000081525081565b604051620000d8919062000717565b60405180910390f35b620000eb620001df565b6040805173ffffffffffffffffffffffffffffffffffffffff938416815292909116602083015201620000d8565b62000123620003c6565b60405173ffffffffffffffffffffffffffffffffffffffff9091168152602001620000d8565b620001237f000000000000000000000000000000000000000000000000000000000000000081565b620001ad620001823660046200075d565b73ffffffffffffffffffffffffffffffffffffffff1660009081526020819052604090205460ff1690565b6040519015158152602001620000d8565b62000123620001cf3660046200077b565b620004b9565b62000123620005a0565b60008060007f000000000000000000000000000000000000000000000000000000000000000033604051620002149062000695565b73ffffffffffffffffffffffffffffffffffffffff928316815291166020820152604001604051809103906000f08015801562000255573d6000803e3d6000fd5b5073ffffffffffffffffffffffffffffffffffffffff811660008181526020819052604080822080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660011790555192935033928392917fd3bb727b2e716a1f142bc9c63c66fe0ae4c5fbc89234f8aa77d0c864a7b63bab91a4604080516000808252602082019092527f000000000000000000000000000000000000000000000000000000000000000090309084906040516200031590620006a3565b62000324949392919062000805565b604051809103906000f08015801562000341573d6000803e3d6000fd5b5073ffffffffffffffffffffffffffffffffffffffff811660008181526020819052604080822080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660011790555192935033923092917f1c9576ab03e40fdf23673f82d904a0f029c8a6629272a4edad4be877e83af64b91a490939092509050565b6040805160008082526020820190925281907f000000000000000000000000000000000000000000000000000000000000000090339083906040516200040c90620006a3565b6200041b949392919062000805565b604051809103906000f08015801562000438573d6000803e3d6000fd5b5073ffffffffffffffffffffffffffffffffffffffff811660008181526020819052604080822080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660011790555192935033928392917f1c9576ab03e40fdf23673f82d904a0f029c8a6629272a4edad4be877e83af64b91a4919050565b6000807f000000000000000000000000000000000000000000000000000000000000000033868686604051620004ef90620006a3565b620004ff95949392919062000852565b604051809103906000f0801580156200051c573d6000803e3d6000fd5b5073ffffffffffffffffffffffffffffffffffffffff811660008181526020819052604080822080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660011790555192935033928392917f1c9576ab03e40fdf23673f82d904a0f029c8a6629272a4edad4be877e83af64b91a4949350505050565b6000807f000000000000000000000000000000000000000000000000000000000000000033604051620005d39062000695565b73ffffffffffffffffffffffffffffffffffffffff928316815291166020820152604001604051809103906000f08015801562000614573d6000803e3d6000fd5b5073ffffffffffffffffffffffffffffffffffffffff811660008181526020819052604080822080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660011790555192935033928392917fd3bb727b2e716a1f142bc9c63c66fe0ae4c5fbc89234f8aa77d0c864a7b63bab91a4919050565b613c8880620008d483390190565b611699806200455c83390190565b6000815180845260005b81811015620006d957602081850181015186830182015201620006bb565b5060006020828601015260207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f83011685010191505092915050565b6020815260006200072c6020830184620006b1565b9392505050565b803573ffffffffffffffffffffffffffffffffffffffff811681146200075857600080fd5b919050565b6000602082840312156200077057600080fd5b6200072c8262000733565b6000806000604084860312156200079157600080fd5b6200079c8462000733565b9250602084013567ffffffffffffffff80821115620007ba57600080fd5b818601915086601f830112620007cf57600080fd5b813581811115620007df57600080fd5b876020828501011115620007f257600080fd5b6020830194508093505050509250925092565b600073ffffffffffffffffffffffffffffffffffffffff8087168352808616602084015280851660408401525060806060830152620008486080830184620006b1565b9695505050505050565b600073ffffffffffffffffffffffffffffffffffffffff8088168352808716602084015280861660408401525060806060830152826080830152828460a0840137600060a0848401015260a07fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f8501168301019050969550505050505056fe60a060405260016006553480156200001657600080fd5b5060405162003c8838038062003c888339810160408190526200003991620001ab565b808060006001600160a01b038216620000995760405162461bcd60e51b815260206004820152601860248201527f43616e6e6f7420736574206f776e657220746f207a65726f000000000000000060448201526064015b60405180910390fd5b600280546001600160a01b0319166001600160a01b0384811691909117909155811615620000cc57620000cc81620000e2565b505050506001600160a01b0316608052620001e3565b336001600160a01b038216036200013c5760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640162000090565b600380546001600160a01b0319166001600160a01b03838116918217909255600254604051919216907fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae127890600090a350565b80516001600160a01b0381168114620001a657600080fd5b919050565b60008060408385031215620001bf57600080fd5b620001ca836200018e565b9150620001da602084016200018e565b90509250929050565b608051613a4362000245600039600081816101ec0152818161075e015281816109f301528181610c4f015281816117d201528181611a3c01528181611adc01528181611e7701528181612310015281816125c30152612b4b0152613a436000f3fe6080604052600436106101965760003560e01c80636ae0bc76116100e1578063a4c0ed361161008a578063f2fde38b11610064578063f2fde38b146104aa578063f3fef3a3146104ca578063fa00763a146104ea578063fc4a03ed1461053057600080fd5b8063a4c0ed361461044a578063eb007d991461046a578063ee56997b1461048a57600080fd5b806379ba5097116100bb57806379ba5097146103ea5780638da5cb5b146103ff578063902fc3701461042a57600080fd5b80636ae0bc76146103975780636bd59ec0146103b75780636ee4d553146103ca57600080fd5b80633ec5bc1411610143578063501883011161011d578063501883011461033e57806352043783146103615780635ffa62881461037757600080fd5b80633ec5bc14146102ce57806340429946146102ee5780634ab0d1901461030e57600080fd5b8063181f5a7711610174578063181f5a77146102365780632408afaa1461028c5780633c6d41b9146102ae57600080fd5b806301994b991461019b578063033f49f7146101bd578063165d35e1146101dd575b600080fd5b3480156101a757600080fd5b506101bb6101b6366004612fbe565b610550565b005b3480156101c957600080fd5b506101bb6101d8366004613064565b610753565b3480156101e957600080fd5b507f00000000000000000000000000000000000000000000000000000000000000005b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020015b60405180910390f35b34801561024257600080fd5b5061027f6040518060400160405280600e81526020017f4f70657261746f7220312e302e3000000000000000000000000000000000000081525081565b60405161022d91906130dd565b34801561029857600080fd5b506102a161096c565b60405161022d919061312e565b3480156102ba57600080fd5b506101bb6102c93660046131bd565b6109db565b3480156102da57600080fd5b506101bb6102e936600461324a565b610ae3565b3480156102fa57600080fd5b506101bb6103093660046132a1565b610c37565b34801561031a57600080fd5b5061032e610329366004613344565b610d40565b604051901515815260200161022d565b34801561034a57600080fd5b50610353611036565b60405190815260200161022d565b34801561036d57600080fd5b5061035361012c81565b34801561038357600080fd5b506101bb61039236600461339e565b611045565b3480156103a357600080fd5b5061032e6103b236600461340a565b6110c9565b6101bb6103c536600461339e565b611445565b3480156103d657600080fd5b506101bb6103e536600461348e565b6115d8565b3480156103f657600080fd5b506101bb61185c565b34801561040b57600080fd5b5060025473ffffffffffffffffffffffffffffffffffffffff1661020c565b34801561043657600080fd5b5061032e6104453660046134cb565b61195d565b34801561045657600080fd5b506101bb61046536600461354a565b611ac4565b34801561047657600080fd5b506101bb61048536600461348e565b611c52565b34801561049657600080fd5b506101bb6104a5366004612fbe565b611f02565b3480156104b657600080fd5b506101bb6104c5366004613635565b612210565b3480156104d657600080fd5b506101bb6104e5366004613659565b612224565b3480156104f657600080fd5b5061032e610505366004613635565b73ffffffffffffffffffffffffffffffffffffffff1660009081526020819052604090205460ff1690565b34801561053c57600080fd5b506101bb61054b36600461339e565b612389565b6105586124e5565b6105c3576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f43616e6e6f742073657420617574686f72697a65642073656e6465727300000060448201526064015b60405180910390fd5b60005b8181101561074e576001600560008585858181106105e6576105e6613685565b90506020020160208101906105fb9190613635565b73ffffffffffffffffffffffffffffffffffffffff168152602081019190915260400160002080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001691151591909117905582828281811061066057610660613685565b90506020020160208101906106759190613635565b73ffffffffffffffffffffffffffffffffffffffff167f615a0c1cb00a60d4acd77ec67acf2f17f223ef0932d591052fabc33643fe7e8260405160405180910390a28282828181106106c9576106c9613685565b90506020020160208101906106de9190613635565b73ffffffffffffffffffffffffffffffffffffffff166379ba50976040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561072557600080fd5b505af1158015610739573d6000803e3d6000fd5b5050505080610747906136e3565b90506105c6565b505050565b61075b61253a565b827f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1603610811576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f43616e6e6f742063616c6c20746f204c494e4b0000000000000000000000000060448201526064016105ba565b73ffffffffffffffffffffffffffffffffffffffff84163b61088f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f4d75737420666f727761726420746f206120636f6e747261637400000000000060448201526064016105ba565b60008473ffffffffffffffffffffffffffffffffffffffff1684846040516108b892919061371b565b6000604051808303816000865af19150503d80600081146108f5576040519150601f19603f3d011682016040523d82523d6000602084013e6108fa565b606091505b5050905080610965576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601560248201527f466f727761726465642063616c6c206661696c6564000000000000000000000060448201526064016105ba565b5050505050565b606060018054806020026020016040519081016040528092919081815260200182805480156109d157602002820191906000526020600020905b815473ffffffffffffffffffffffffffffffffffffffff1681526001909101906020018083116109a6575b5050505050905090565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614610a7a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f4d75737420757365204c494e4b20746f6b656e0000000000000000000000000060448201526064016105ba565b600080610a8b8a8a8c8a8a8a6125bd565b91509150877fd8d7ecc4800d25fa53ce0372f13a416d98907a7ef3d8d3bdd79cf4fe75529c658b848c8e8c878c8c8c604051610acf99989796959493929190613774565b60405180910390a250505050505050505050565b610aeb61253a565b60005b82811015610c3157600060056000868685818110610b0e57610b0e613685565b9050602002016020810190610b239190613635565b73ffffffffffffffffffffffffffffffffffffffff168152602081019190915260400160002080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016911515919091179055838382818110610b8857610b88613685565b9050602002016020810190610b9d9190613635565b6040517ff2fde38b00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff8481166004830152919091169063f2fde38b90602401600060405180830381600087803b158015610c0857600080fd5b505af1158015610c1c573d6000803e3d6000fd5b5050505080610c2a906136e3565b9050610aee565b50505050565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614610cd6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f4d75737420757365204c494e4b20746f6b656e0000000000000000000000000060448201526064016105ba565b600080610ce78b8b8a8a8a8a6125bd565b91509150887fd8d7ecc4800d25fa53ce0372f13a416d98907a7ef3d8d3bdd79cf4fe75529c658c848d8f8c878c8c8c604051610d2b99989796959493929190613774565b60405180910390a25050505050505050505050565b6000610d4a61289b565b600087815260046020526040812054889160089190911b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00169003610deb576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601b60248201527f4d757374206861766520612076616c696420726571756573744964000000000060448201526064016105ba565b73ffffffffffffffffffffffffffffffffffffffff8616600090815260056020526040902054869060ff1615610e7d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f43616e6e6f742063616c6c206f776e656420636f6e747261637400000000000060448201526064016105ba565b610e8c89898989896001612914565b60405189907f9e9bc7616d42c2835d05ae617e508454e63b30b934be8aa932ebc125e0e58a6490600090a262061a805a1015610f24576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f4d7573742070726f7669646520636f6e73756d657220656e6f7567682067617360448201526064016105ba565b60008773ffffffffffffffffffffffffffffffffffffffff16878b87604051602401610f5a929190918252602082015260400190565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529181526020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fffffffff00000000000000000000000000000000000000000000000000000000909416939093179092529051610fe391906137ff565b6000604051808303816000865af19150503d8060008114611020576040519150601f19603f3d011682016040523d82523d6000602084013e611025565b606091505b50909b9a5050505050505050505050565b6000611040612b0c565b905090565b61104d6124e5565b6110b3576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f43616e6e6f742073657420617574686f72697a65642073656e6465727300000060448201526064016105ba565b6110bd8484610550565b610c3184848484612389565b60006110d361289b565b600088815260046020526040812054899160089190911b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00169003611174576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601b60248201527f4d757374206861766520612076616c696420726571756573744964000000000060448201526064016105ba565b73ffffffffffffffffffffffffffffffffffffffff8716600090815260056020526040902054879060ff1615611206576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f43616e6e6f742063616c6c206f776e656420636f6e747261637400000000000060448201526064016105ba565b8985856020811015611274576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601b60248201527f526573706f6e7365206d757374206265203e203332206279746573000000000060448201526064016105ba565b81358381146112df576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601c60248201527f466972737420776f7264206d757374206265207265717565737449640000000060448201526064016105ba565b6112ee8e8e8e8e8e6002612914565b6040518e907f9e9bc7616d42c2835d05ae617e508454e63b30b934be8aa932ebc125e0e58a6490600090a262061a805a1015611386576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f4d7573742070726f7669646520636f6e73756d657220656e6f7567682067617360448201526064016105ba565b60008c73ffffffffffffffffffffffffffffffffffffffff168c8b8b6040516020016113b49392919061381b565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0818403018152908290526113ec916137ff565b6000604051808303816000865af19150503d8060008114611429576040519150601f19603f3d011682016040523d82523d6000602084013e61142e565b606091505b509098505050505050505050979650505050505050565b821580159061145357508281145b6114b9576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f496e76616c6964206172726179206c656e67746828732900000000000000000060448201526064016105ba565b3460005b8481101561156f5760008484838181106114d9576114d9613685565b90506020020135905080836114ee9190613857565b925086868381811061150257611502613685565b90506020020160208101906115179190613635565b73ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f1935050505015801561155c573d6000803e3d6000fd5b505080611568906136e3565b90506114bd565b508015610965576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601160248201527f546f6f206d756368204554482073656e7400000000000000000000000000000060448201526064016105ba565b6040805160208082018690527fffffffffffffffffffffffffffffffffffffffff0000000000000000000000003360601b16828401527fffffffff00000000000000000000000000000000000000000000000000000000851660548301526058808301859052835180840390910181526078909201909252805191012060009060008681526004602052604090205490915060081b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00908116908216146116fb576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601e60248201527f506172616d7320646f206e6f74206d617463682072657175657374204944000060448201526064016105ba565b42821115611765576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f52657175657374206973206e6f7420657870697265640000000000000000000060448201526064016105ba565b6000858152600460205260408082208290555186917fa7842b9ec549398102c0d91b1b9919b2f20558aefdadf57528a95c6cd3292e9391a26040517fa9059cbb000000000000000000000000000000000000000000000000000000008152336004820152602481018590527f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff169063a9059cbb906044016020604051808303816000875af1158015611830573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118549190613870565b505050505050565b60035473ffffffffffffffffffffffffffffffffffffffff1633146118dd576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4d7573742062652070726f706f736564206f776e65720000000000000000000060448201526064016105ba565b600280547fffffffffffffffffffffffff00000000000000000000000000000000000000008082163390811790935560038054909116905560405173ffffffffffffffffffffffffffffffffffffffff909116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a350565b600061196761253a565b8380611971612b0c565b10156119ff576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603560248201527f416d6f756e74207265717565737465642069732067726561746572207468616e60448201527f20776974686472617761626c652062616c616e6365000000000000000000000060648201526084016105ba565b6040517f4000aea000000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001690634000aea090611a77908990899089908990600401613892565b6020604051808303816000875af1158015611a96573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611aba9190613870565b9695505050505050565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614611b63576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f4d75737420757365204c494e4b20746f6b656e0000000000000000000000000060448201526064016105ba565b60208101518190611b748183612bd5565b84602484015283604484015260003073ffffffffffffffffffffffffffffffffffffffff1684604051611ba791906137ff565b600060405180830381855af49150503d8060008114611be2576040519150601f19603f3d011682016040523d82523d6000602084013e611be7565b606091505b5050905080611854576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601860248201527f556e61626c6520746f206372656174652072657175657374000000000000000060448201526064016105ba565b604080513360601b7fffffffffffffffffffffffffffffffffffffffff0000000000000000000000001660208083018290526034808401899052845180850390910181526054840185528051908201206074840188905260948401929092527fffffffff00000000000000000000000000000000000000000000000000000000861660a884015260ac8084018690528451808503909101815260cc9093019093528151919092012060009060008381526004602052604090205490915060081b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0090811690821614611da0576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601e60248201527f506172616d7320646f206e6f74206d617463682072657175657374204944000060448201526064016105ba565b42831115611e0a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f52657175657374206973206e6f7420657870697265640000000000000000000060448201526064016105ba565b6000828152600460205260408082208290555183917fa7842b9ec549398102c0d91b1b9919b2f20558aefdadf57528a95c6cd3292e9391a26040517fa9059cbb000000000000000000000000000000000000000000000000000000008152336004820152602481018690527f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff169063a9059cbb906044016020604051808303816000875af1158015611ed5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611ef99190613870565b50505050505050565b611f0a6124e5565b611f70576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f43616e6e6f742073657420617574686f72697a65642073656e6465727300000060448201526064016105ba565b80611fd7576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601b60248201527f4d7573742068617665206174206c6561737420312073656e646572000000000060448201526064016105ba565b60015460005b8181101561206c57600080600060018481548110611ffd57611ffd613685565b60009182526020808320919091015473ffffffffffffffffffffffffffffffffffffffff168352820192909252604001902080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016911515919091179055612065816136e3565b9050611fdd565b5060005b828110156121c25760008085858481811061208d5761208d613685565b90506020020160208101906120a29190613635565b73ffffffffffffffffffffffffffffffffffffffff16815260208101919091526040016000205460ff1615612133576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601f60248201527f4d757374206e6f742068617665206475706c69636174652073656e646572730060448201526064016105ba565b600160008086868581811061214a5761214a613685565b905060200201602081019061215f9190613635565b73ffffffffffffffffffffffffffffffffffffffff168152602081019190915260400160002080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00169115159190911790556121bb816136e3565b9050612070565b506121cf60018484612ede565b507ff263cfb3e4298332e776194610cf9fdc09ccb3ada8b9aa39764d882e11fbf0a08383336040516122039392919061391e565b60405180910390a1505050565b61221861253a565b61222181612d51565b50565b61222c61253a565b8080612236612b0c565b10156122c4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603560248201527f416d6f756e74207265717565737465642069732067726561746572207468616e60448201527f20776974686472617761626c652062616c616e6365000000000000000000000060648201526084016105ba565b6040517fa9059cbb00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff8481166004830152602482018490527f0000000000000000000000000000000000000000000000000000000000000000169063a9059cbb906044016020604051808303816000875af1158015612359573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061237d9190613870565b61074e5761074e613958565b6123916124e5565b6123f7576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f43616e6e6f742073657420617574686f72697a65642073656e6465727300000060448201526064016105ba565b7f1bb185903e2cb2f1b303523128b60e314dea81df4f8d9b7351cadd344f6e7727848484843360405161242e959493929190613987565b60405180910390a160005b838110156109655784848281811061245357612453613685565b90506020020160208101906124689190613635565b73ffffffffffffffffffffffffffffffffffffffff1663ee56997b84846040518363ffffffff1660e01b81526004016124a29291906139d7565b600060405180830381600087803b1580156124bc57600080fd5b505af11580156124d0573d6000803e3d6000fd5b50505050806124de906136e3565b9050612439565b3360009081526020819052604081205460ff168061104057503361251e60025473ffffffffffffffffffffffffffffffffffffffff1690565b73ffffffffffffffffffffffffffffffffffffffff1614905090565b60025473ffffffffffffffffffffffffffffffffffffffff1633146125bb576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e65720000000000000000000060448201526064016105ba565b565b600080857f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1603612676576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f43616e6e6f742063616c6c20746f204c494e4b0000000000000000000000000060448201526064016105ba565b6040517fffffffffffffffffffffffffffffffffffffffff00000000000000000000000060608b901b16602082015260348101869052605401604080518083037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe001815291815281516020928301206000818152600490935291205490935060081b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001615612781576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601460248201527f4d75737420757365206120756e6971756520494400000000000000000000000060448201526064016105ba565b61278d61012c426139f3565b6040805160208082018c90527fffffffffffffffffffffffffffffffffffffffff00000000000000000000000060608c901b16828401527fffffffff000000000000000000000000000000000000000000000000000000008a1660548301526058808301859052835180840390910181526078909201909252805191012090925060405180604001604052808260ff1916815260200161282c87612e47565b60ff9081169091526000868152600460209081526040909120835193909101519091167f01000000000000000000000000000000000000000000000000000000000000000260089290921c91909117905560065461288b908a906139f3565b6006555050965096945050505050565b3360009081526020819052604090205460ff166125bb576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601560248201527f4e6f7420617574686f72697a65642073656e646572000000000000000000000060448201526064016105ba565b6040805160208082018890527fffffffffffffffffffffffffffffffffffffffff000000000000000000000000606088901b16828401527fffffffff00000000000000000000000000000000000000000000000000000000861660548301526058808301869052835180840390910181526078909201909252805191012060009060008881526004602052604090205490915060081b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0090811690821614612a38576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601e60248201527f506172616d7320646f206e6f74206d617463682072657175657374204944000060448201526064016105ba565b612a4182612e47565b60008881526004602052604090205460ff9182167f01000000000000000000000000000000000000000000000000000000000000009091049091161115612ae4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601860248201527f446174612076657273696f6e73206d757374206d61746368000000000000000060448201526064016105ba565b85600654612af29190613857565b600655505050600093845250506004602052506040812055565b60006001600654612b1d9190613857565b6040517f70a082310000000000000000000000000000000000000000000000000000000081523060048201527f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff16906370a0823190602401602060405180830381865afa158015612ba7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612bcb9190613a06565b6110409190613857565b612be160026020613a1f565b612bec9060046139f3565b81511015612c56576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f496e76616c69642072657175657374206c656e6774680000000000000000000060448201526064016105ba565b7fffffffff0000000000000000000000000000000000000000000000000000000082167f3c6d41b9000000000000000000000000000000000000000000000000000000001480612ce757507fffffffff0000000000000000000000000000000000000000000000000000000082167f4042994600000000000000000000000000000000000000000000000000000000145b612d4d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601e60248201527f4d757374207573652077686974656c69737465642066756e6374696f6e73000060448201526064016105ba565b5050565b3373ffffffffffffffffffffffffffffffffffffffff821603612dd0576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c6600000000000000000060448201526064016105ba565b600380547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff838116918217909255600254604051919216907fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae127890600090a350565b600060ff821115612eda576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602560248201527f53616665436173743a2076616c756520646f65736e27742066697420696e203860448201527f206269747300000000000000000000000000000000000000000000000000000060648201526084016105ba565b5090565b828054828255906000526020600020908101928215612f56579160200282015b82811115612f565781547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff843516178255602090920191600190910190612efe565b50612eda9291505b80821115612eda5760008155600101612f5e565b60008083601f840112612f8457600080fd5b50813567ffffffffffffffff811115612f9c57600080fd5b6020830191508360208260051b8501011115612fb757600080fd5b9250929050565b60008060208385031215612fd157600080fd5b823567ffffffffffffffff811115612fe857600080fd5b612ff485828601612f72565b90969095509350505050565b73ffffffffffffffffffffffffffffffffffffffff8116811461222157600080fd5b60008083601f84011261303457600080fd5b50813567ffffffffffffffff81111561304c57600080fd5b602083019150836020828501011115612fb757600080fd5b60008060006040848603121561307957600080fd5b833561308481613000565b9250602084013567ffffffffffffffff8111156130a057600080fd5b6130ac86828701613022565b9497909650939450505050565b60005b838110156130d45781810151838201526020016130bc565b50506000910152565b60208152600082518060208401526130fc8160408501602087016130b9565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169190910160400192915050565b6020808252825182820181905260009190848201906040850190845b8181101561317c57835173ffffffffffffffffffffffffffffffffffffffff168352928401929184019160010161314a565b50909695505050505050565b80357fffffffff00000000000000000000000000000000000000000000000000000000811681146131b857600080fd5b919050565b60008060008060008060008060e0898b0312156131d957600080fd5b88356131e481613000565b9750602089013596506040890135955061320060608a01613188565b94506080890135935060a0890135925060c089013567ffffffffffffffff81111561322a57600080fd5b6132368b828c01613022565b999c989b5096995094979396929594505050565b60008060006040848603121561325f57600080fd5b833567ffffffffffffffff81111561327657600080fd5b61328286828701612f72565b909450925050602084013561329681613000565b809150509250925092565b60008060008060008060008060006101008a8c0312156132c057600080fd5b89356132cb81613000565b985060208a0135975060408a0135965060608a01356132e981613000565b95506132f760808b01613188565b945060a08a0135935060c08a0135925060e08a013567ffffffffffffffff81111561332157600080fd5b61332d8c828d01613022565b915080935050809150509295985092959850929598565b60008060008060008060c0878903121561335d57600080fd5b8635955060208701359450604087013561337681613000565b935061338460608801613188565b92506080870135915060a087013590509295509295509295565b600080600080604085870312156133b457600080fd5b843567ffffffffffffffff808211156133cc57600080fd5b6133d888838901612f72565b909650945060208701359150808211156133f157600080fd5b506133fe87828801612f72565b95989497509550505050565b600080600080600080600060c0888a03121561342557600080fd5b8735965060208801359550604088013561343e81613000565b945061344c60608901613188565b93506080880135925060a088013567ffffffffffffffff81111561346f57600080fd5b61347b8a828b01613022565b989b979a50959850939692959293505050565b600080600080608085870312156134a457600080fd5b84359350602085013592506134bb60408601613188565b9396929550929360600135925050565b600080600080606085870312156134e157600080fd5b84356134ec81613000565b935060208501359250604085013567ffffffffffffffff81111561350f57600080fd5b6133fe87828801613022565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b60008060006060848603121561355f57600080fd5b833561356a81613000565b925060208401359150604084013567ffffffffffffffff8082111561358e57600080fd5b818601915086601f8301126135a257600080fd5b8135818111156135b4576135b461351b565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0908116603f011681019083821181831017156135fa576135fa61351b565b8160405282815289602084870101111561361357600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b60006020828403121561364757600080fd5b813561365281613000565b9392505050565b6000806040838503121561366c57600080fd5b823561367781613000565b946020939093013593505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8203613714576137146136b4565b5060010190565b8183823760009101908152919050565b8183528181602085013750600060208284010152600060207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f840116840101905092915050565b600061010073ffffffffffffffffffffffffffffffffffffffff808d1684528b60208501528a6040850152808a166060850152507fffffffff00000000000000000000000000000000000000000000000000000000881660808401528660a08401528560c08401528060e08401526137ef818401858761372b565b9c9b505050505050505050505050565b600082516138118184602087016130b9565b9190910192915050565b7fffffffff0000000000000000000000000000000000000000000000000000000084168152818360048301376000910160040190815292915050565b8181038181111561386a5761386a6136b4565b92915050565b60006020828403121561388257600080fd5b8151801515811461365257600080fd5b73ffffffffffffffffffffffffffffffffffffffff85168152836020820152606060408201526000611aba60608301848661372b565b8183526000602080850194508260005b858110156139135781356138eb81613000565b73ffffffffffffffffffffffffffffffffffffffff16875295820195908201906001016138d8565b509495945050505050565b6040815260006139326040830185876138c8565b905073ffffffffffffffffffffffffffffffffffffffff83166020830152949350505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052600160045260246000fd5b60608152600061399b6060830187896138c8565b82810360208401526139ae8186886138c8565b91505073ffffffffffffffffffffffffffffffffffffffff831660408301529695505050505050565b6020815260006139eb6020830184866138c8565b949350505050565b8082018082111561386a5761386a6136b4565b600060208284031215613a1857600080fd5b5051919050565b808202811582820484141761386a5761386a6136b456fea164736f6c6343000813000a60a06040523480156200001157600080fd5b50604051620016993803806200169983398101604081905262000034916200029d565b82826001600160a01b038216620000925760405162461bcd60e51b815260206004820152601860248201527f43616e6e6f7420736574206f776e657220746f207a65726f000000000000000060448201526064015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0384811691909117909155811615620000c557620000c58162000199565b50506001600160a01b0384166200012b5760405162461bcd60e51b815260206004820152602360248201527f4c696e6b20746f6b656e2063616e6e6f742062652061207a65726f206164647260448201526265737360e81b606482015260840162000089565b6001600160a01b038085166080528216156200018f57816001600160a01b0316836001600160a01b03167f4e1e878dc28d5f040db5969163ff1acd75c44c3f655da2dde9c70bbd8e56dc7e836040516200018691906200038e565b60405180910390a35b50505050620003c3565b336001600160a01b03821603620001f35760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640162000089565b600180546001600160a01b0319166001600160a01b0383811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b80516001600160a01b03811681146200025c57600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60005b83811015620002945781810151838201526020016200027a565b50506000910152565b60008060008060808587031215620002b457600080fd5b620002bf8562000244565b9350620002cf6020860162000244565b9250620002df6040860162000244565b60608601519092506001600160401b0380821115620002fd57600080fd5b818701915087601f8301126200031257600080fd5b81518181111562000327576200032762000261565b604051601f8201601f19908116603f0116810190838211818310171562000352576200035262000261565b816040528281528a60208487010111156200036c57600080fd5b6200037f83602083016020880162000277565b979a9699509497505050505050565b6020815260008251806020840152620003af81604085016020870162000277565b601f01601f19169190910160400192915050565b6080516112ac620003ed6000396000818161016d0152818161037501526105d301526112ac6000f3fe608060405234801561001057600080fd5b50600436106100d45760003560e01c806379ba509711610081578063ee56997b1161005b578063ee56997b14610200578063f2fde38b14610213578063fa00763a1461022657600080fd5b806379ba5097146101c75780638da5cb5b146101cf578063b64fa9e6146101ed57600080fd5b80634d3e2323116100b25780634d3e23231461015557806357970e93146101685780636fadcf72146101b457600080fd5b8063033f49f7146100d9578063181f5a77146100ee5780632408afaa14610140575b600080fd5b6100ec6100e7366004610e72565b61026f565b005b61012a6040518060400160405280601981526020017f417574686f72697a6564466f7277617264657220312e312e300000000000000081525081565b6040516101379190610ef5565b60405180910390f35b610148610287565b6040516101379190610f61565b6100ec610163366004610e72565b6102f6565b61018f7f000000000000000000000000000000000000000000000000000000000000000081565b60405173ffffffffffffffffffffffffffffffffffffffff9091168152602001610137565b6100ec6101c2366004610e72565b61036b565b6100ec61042d565b60005473ffffffffffffffffffffffffffffffffffffffff1661018f565b6100ec6101fb366004611007565b61052a565b6100ec61020e366004611073565b6106cb565b6100ec6102213660046110b5565b6109dc565b61025f6102343660046110b5565b73ffffffffffffffffffffffffffffffffffffffff1660009081526002602052604090205460ff1690565b6040519015158152602001610137565b6102776109f0565b610282838383610a73565b505050565b606060038054806020026020016040519081016040528092919081815260200182805480156102ec57602002820191906000526020600020905b815473ffffffffffffffffffffffffffffffffffffffff1681526001909101906020018083116102c1575b5050505050905090565b6102ff836109dc565b8273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f4e1e878dc28d5f040db5969163ff1acd75c44c3f655da2dde9c70bbd8e56dc7e848460405161035e9291906110d7565b60405180910390a3505050565b610373610c00565b7f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1603610277576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601c60248201527f43616e6e6f7420666f727761726420746f204c696e6b20746f6b656e0000000060448201526064015b60405180910390fd5b60015473ffffffffffffffffffffffffffffffffffffffff1633146104ae576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4d7573742062652070726f706f736564206f776e6572000000000000000000006044820152606401610424565b60008054337fffffffffffffffffffffffff00000000000000000000000000000000000000008083168217845560018054909116905560405173ffffffffffffffffffffffffffffffffffffffff90921692909183917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a350565b610532610c00565b82811461059b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f417272617973206d7573742068617665207468652073616d65206c656e6774686044820152606401610424565b60005b838110156106c45760008585838181106105ba576105ba611124565b90506020020160208101906105cf91906110b5565b90507f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1603610686576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601c60248201527f43616e6e6f7420666f727761726420746f204c696e6b20746f6b656e000000006044820152606401610424565b6106b38185858581811061069c5761069c611124565b90506020028101906106ae9190611153565b610a73565b506106bd816111b8565b905061059e565b5050505050565b6106d3610c79565b610739576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f43616e6e6f742073657420617574686f72697a65642073656e646572730000006044820152606401610424565b806107a0576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601b60248201527f4d7573742068617665206174206c6561737420312073656e64657200000000006044820152606401610424565b60035460005b8181101561083657600060026000600384815481106107c7576107c7611124565b60009182526020808320919091015473ffffffffffffffffffffffffffffffffffffffff168352820192909252604001902080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001691151591909117905561082f816111b8565b90506107a6565b5060005b8281101561098e576002600085858481811061085857610858611124565b905060200201602081019061086d91906110b5565b73ffffffffffffffffffffffffffffffffffffffff16815260208101919091526040016000205460ff16156108fe576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601f60248201527f4d757374206e6f742068617665206475706c69636174652073656e64657273006044820152606401610424565b60016002600086868581811061091657610916611124565b905060200201602081019061092b91906110b5565b73ffffffffffffffffffffffffffffffffffffffff168152602081019190915260400160002080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016911515919091179055610987816111b8565b905061083a565b5061099b60038484610dac565b507ff263cfb3e4298332e776194610cf9fdc09ccb3ada8b9aa39764d882e11fbf0a08383336040516109cf93929190611217565b60405180910390a1505050565b6109e46109f0565b6109ed81610cb7565b50565b60005473ffffffffffffffffffffffffffffffffffffffff163314610a71576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e6572000000000000000000006044820152606401610424565b565b73ffffffffffffffffffffffffffffffffffffffff83163b610af1576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f4d75737420666f727761726420746f206120636f6e74726163740000000000006044820152606401610424565b6000808473ffffffffffffffffffffffffffffffffffffffff168484604051610b1b92919061128f565b6000604051808303816000865af19150503d8060008114610b58576040519150601f19603f3d011682016040523d82523d6000602084013e610b5d565b606091505b5091509150816106c4578051600003610bf8576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f466f727761726465642063616c6c20726576657274656420776974686f75742060448201527f726561736f6e00000000000000000000000000000000000000000000000000006064820152608401610424565b805181602001fd5b3360009081526002602052604090205460ff16610a71576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601560248201527f4e6f7420617574686f72697a65642073656e64657200000000000000000000006044820152606401610424565b600033610c9b60005473ffffffffffffffffffffffffffffffffffffffff1690565b73ffffffffffffffffffffffffffffffffffffffff1614905090565b3373ffffffffffffffffffffffffffffffffffffffff821603610d36576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c660000000000000000006044820152606401610424565b600180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff83811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b828054828255906000526020600020908101928215610e24579160200282015b82811115610e245781547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff843516178255602090920191600190910190610dcc565b50610e30929150610e34565b5090565b5b80821115610e305760008155600101610e35565b803573ffffffffffffffffffffffffffffffffffffffff81168114610e6d57600080fd5b919050565b600080600060408486031215610e8757600080fd5b610e9084610e49565b9250602084013567ffffffffffffffff80821115610ead57600080fd5b818601915086601f830112610ec157600080fd5b813581811115610ed057600080fd5b876020828501011115610ee257600080fd5b6020830194508093505050509250925092565b600060208083528351808285015260005b81811015610f2257858101830151858201604001528201610f06565b5060006040828601015260407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f8301168501019250505092915050565b6020808252825182820181905260009190848201906040850190845b81811015610faf57835173ffffffffffffffffffffffffffffffffffffffff1683529284019291840191600101610f7d565b50909695505050505050565b60008083601f840112610fcd57600080fd5b50813567ffffffffffffffff811115610fe557600080fd5b6020830191508360208260051b850101111561100057600080fd5b9250929050565b6000806000806040858703121561101d57600080fd5b843567ffffffffffffffff8082111561103557600080fd5b61104188838901610fbb565b9096509450602087013591508082111561105a57600080fd5b5061106787828801610fbb565b95989497509550505050565b6000806020838503121561108657600080fd5b823567ffffffffffffffff81111561109d57600080fd5b6110a985828601610fbb565b90969095509350505050565b6000602082840312156110c757600080fd5b6110d082610e49565b9392505050565b60208152816020820152818360408301376000818301604090810191909152601f9092017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0160101919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe184360301811261118857600080fd5b83018035915067ffffffffffffffff8211156111a357600080fd5b60200191503681900382131561100057600080fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8203611210577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b5060010190565b6040808252810183905260008460608301825b868110156112655773ffffffffffffffffffffffffffffffffffffffff61125084610e49565b1682526020928301929091019060010161122a565b50809250505073ffffffffffffffffffffffffffffffffffffffff83166020830152949350505050565b818382376000910190815291905056fea164736f6c6343000813000aa164736f6c6343000813000a",
+	Bin: "0x60a060405234801561001057600080fd5b50604051615d59380380615d5983398101604081905261002f91610040565b6001600160a01b0316608052610070565b60006020828403121561005257600080fd5b81516001600160a01b038116811461006957600080fd5b9392505050565b608051615cab6100ae6000396000818161014f015281816101e6015281816102e3015281816103da015281816104be01526105a50152615cab6000f3fe60806040523480156200001157600080fd5b5060043610620000875760003560e01c806357970e93116200006257806357970e931462000149578063d42efd831462000171578063d689d09514620001be578063f4adb6e114620001d557600080fd5b8063181f5a77146200008c57806332f01eae14620000e15780633babafdb1462000119575b600080fd5b620000c96040518060400160405280601581526020017f4f70657261746f72466163746f727920312e302e30000000000000000000000081525081565b604051620000d8919062000717565b60405180910390f35b620000eb620001df565b6040805173ffffffffffffffffffffffffffffffffffffffff938416815292909116602083015201620000d8565b62000123620003c6565b60405173ffffffffffffffffffffffffffffffffffffffff9091168152602001620000d8565b620001237f000000000000000000000000000000000000000000000000000000000000000081565b620001ad620001823660046200075d565b73ffffffffffffffffffffffffffffffffffffffff1660009081526020819052604090205460ff1690565b6040519015158152602001620000d8565b62000123620001cf3660046200077b565b620004b9565b62000123620005a0565b60008060007f000000000000000000000000000000000000000000000000000000000000000033604051620002149062000695565b73ffffffffffffffffffffffffffffffffffffffff928316815291166020820152604001604051809103906000f08015801562000255573d6000803e3d6000fd5b5073ffffffffffffffffffffffffffffffffffffffff811660008181526020819052604080822080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660011790555192935033928392917fd3bb727b2e716a1f142bc9c63c66fe0ae4c5fbc89234f8aa77d0c864a7b63bab91a4604080516000808252602082019092527f000000000000000000000000000000000000000000000000000000000000000090309084906040516200031590620006a3565b62000324949392919062000805565b604051809103906000f08015801562000341573d6000803e3d6000fd5b5073ffffffffffffffffffffffffffffffffffffffff811660008181526020819052604080822080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660011790555192935033923092917f1c9576ab03e40fdf23673f82d904a0f029c8a6629272a4edad4be877e83af64b91a490939092509050565b6040805160008082526020820190925281907f000000000000000000000000000000000000000000000000000000000000000090339083906040516200040c90620006a3565b6200041b949392919062000805565b604051809103906000f08015801562000438573d6000803e3d6000fd5b5073ffffffffffffffffffffffffffffffffffffffff811660008181526020819052604080822080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660011790555192935033928392917f1c9576ab03e40fdf23673f82d904a0f029c8a6629272a4edad4be877e83af64b91a4919050565b6000807f000000000000000000000000000000000000000000000000000000000000000033868686604051620004ef90620006a3565b620004ff95949392919062000852565b604051809103906000f0801580156200051c573d6000803e3d6000fd5b5073ffffffffffffffffffffffffffffffffffffffff811660008181526020819052604080822080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660011790555192935033928392917f1c9576ab03e40fdf23673f82d904a0f029c8a6629272a4edad4be877e83af64b91a4949350505050565b6000807f000000000000000000000000000000000000000000000000000000000000000033604051620005d39062000695565b73ffffffffffffffffffffffffffffffffffffffff928316815291166020820152604001604051809103906000f08015801562000614573d6000803e3d6000fd5b5073ffffffffffffffffffffffffffffffffffffffff811660008181526020819052604080822080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660011790555192935033928392917fd3bb727b2e716a1f142bc9c63c66fe0ae4c5fbc89234f8aa77d0c864a7b63bab91a4919050565b613d3280620008d483390190565b611699806200460683390190565b6000815180845260005b81811015620006d957602081850181015186830182015201620006bb565b5060006020828601015260207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f83011685010191505092915050565b6020815260006200072c6020830184620006b1565b9392505050565b803573ffffffffffffffffffffffffffffffffffffffff811681146200075857600080fd5b919050565b6000602082840312156200077057600080fd5b6200072c8262000733565b6000806000604084860312156200079157600080fd5b6200079c8462000733565b9250602084013567ffffffffffffffff80821115620007ba57600080fd5b818601915086601f830112620007cf57600080fd5b813581811115620007df57600080fd5b876020828501011115620007f257600080fd5b6020830194508093505050509250925092565b600073ffffffffffffffffffffffffffffffffffffffff8087168352808616602084015280851660408401525060806060830152620008486080830184620006b1565b9695505050505050565b600073ffffffffffffffffffffffffffffffffffffffff8088168352808716602084015280861660408401525060806060830152826080830152828460a0840137600060a0848401015260a07fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f8501168301019050969550505050505056fe60a060405260016006553480156200001657600080fd5b5060405162003d3238038062003d328339810160408190526200003991620001ab565b808060006001600160a01b038216620000995760405162461bcd60e51b815260206004820152601860248201527f43616e6e6f7420736574206f776e657220746f207a65726f000000000000000060448201526064015b60405180910390fd5b600280546001600160a01b0319166001600160a01b0384811691909117909155811615620000cc57620000cc81620000e2565b505050506001600160a01b0316608052620001e3565b336001600160a01b038216036200013c5760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640162000090565b600380546001600160a01b0319166001600160a01b03838116918217909255600254604051919216907fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae127890600090a350565b80516001600160a01b0381168114620001a657600080fd5b919050565b60008060408385031215620001bf57600080fd5b620001ca836200018e565b9150620001da602084016200018e565b90509250929050565b608051613aed62000245600039600081816101ec0152818161075e015281816109f301528181610c4f0152818161187c01528181611ae601528181611b8601528181611f21015281816123ba0152818161266d0152612bf50152613aed6000f3fe6080604052600436106101965760003560e01c80636ae0bc76116100e1578063a4c0ed361161008a578063f2fde38b11610064578063f2fde38b146104aa578063f3fef3a3146104ca578063fa00763a146104ea578063fc4a03ed1461053057600080fd5b8063a4c0ed361461044a578063eb007d991461046a578063ee56997b1461048a57600080fd5b806379ba5097116100bb57806379ba5097146103ea5780638da5cb5b146103ff578063902fc3701461042a57600080fd5b80636ae0bc76146103975780636bd59ec0146103b75780636ee4d553146103ca57600080fd5b80633ec5bc1411610143578063501883011161011d578063501883011461033e57806352043783146103615780635ffa62881461037757600080fd5b80633ec5bc14146102ce57806340429946146102ee5780634ab0d1901461030e57600080fd5b8063181f5a7711610174578063181f5a77146102365780632408afaa1461028c5780633c6d41b9146102ae57600080fd5b806301994b991461019b578063033f49f7146101bd578063165d35e1146101dd575b600080fd5b3480156101a757600080fd5b506101bb6101b6366004613068565b610550565b005b3480156101c957600080fd5b506101bb6101d836600461310e565b610753565b3480156101e957600080fd5b507f00000000000000000000000000000000000000000000000000000000000000005b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020015b60405180910390f35b34801561024257600080fd5b5061027f6040518060400160405280600e81526020017f4f70657261746f7220312e302e3000000000000000000000000000000000000081525081565b60405161022d9190613187565b34801561029857600080fd5b506102a161096c565b60405161022d91906131d8565b3480156102ba57600080fd5b506101bb6102c9366004613267565b6109db565b3480156102da57600080fd5b506101bb6102e93660046132f4565b610ae3565b3480156102fa57600080fd5b506101bb61030936600461334b565b610c37565b34801561031a57600080fd5b5061032e6103293660046133ee565b610d40565b604051901515815260200161022d565b34801561034a57600080fd5b50610353611036565b60405190815260200161022d565b34801561036d57600080fd5b5061035361012c81565b34801561038357600080fd5b506101bb610392366004613448565b611045565b3480156103a357600080fd5b5061032e6103b23660046134b4565b6110c9565b6101bb6103c5366004613448565b611445565b3480156103d657600080fd5b506101bb6103e5366004613538565b611682565b3480156103f657600080fd5b506101bb611906565b34801561040b57600080fd5b5060025473ffffffffffffffffffffffffffffffffffffffff1661020c565b34801561043657600080fd5b5061032e610445366004613575565b611a07565b34801561045657600080fd5b506101bb6104653660046135f4565b611b6e565b34801561047657600080fd5b506101bb610485366004613538565b611cfc565b34801561049657600080fd5b506101bb6104a5366004613068565b611fac565b3480156104b657600080fd5b506101bb6104c53660046136df565b6122ba565b3480156104d657600080fd5b506101bb6104e5366004613703565b6122ce565b3480156104f657600080fd5b5061032e6105053660046136df565b73ffffffffffffffffffffffffffffffffffffffff1660009081526020819052604090205460ff1690565b34801561053c57600080fd5b506101bb61054b366004613448565b612433565b61055861258f565b6105c3576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f43616e6e6f742073657420617574686f72697a65642073656e6465727300000060448201526064015b60405180910390fd5b60005b8181101561074e576001600560008585858181106105e6576105e661372f565b90506020020160208101906105fb91906136df565b73ffffffffffffffffffffffffffffffffffffffff168152602081019190915260400160002080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00169115159190911790558282828181106106605761066061372f565b905060200201602081019061067591906136df565b73ffffffffffffffffffffffffffffffffffffffff167f615a0c1cb00a60d4acd77ec67acf2f17f223ef0932d591052fabc33643fe7e8260405160405180910390a28282828181106106c9576106c961372f565b90506020020160208101906106de91906136df565b73ffffffffffffffffffffffffffffffffffffffff166379ba50976040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561072557600080fd5b505af1158015610739573d6000803e3d6000fd5b50505050806107479061378d565b90506105c6565b505050565b61075b6125e4565b827f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1603610811576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f43616e6e6f742063616c6c20746f204c494e4b0000000000000000000000000060448201526064016105ba565b73ffffffffffffffffffffffffffffffffffffffff84163b61088f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f4d75737420666f727761726420746f206120636f6e747261637400000000000060448201526064016105ba565b60008473ffffffffffffffffffffffffffffffffffffffff1684846040516108b89291906137c5565b6000604051808303816000865af19150503d80600081146108f5576040519150601f19603f3d011682016040523d82523d6000602084013e6108fa565b606091505b5050905080610965576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601560248201527f466f727761726465642063616c6c206661696c6564000000000000000000000060448201526064016105ba565b5050505050565b606060018054806020026020016040519081016040528092919081815260200182805480156109d157602002820191906000526020600020905b815473ffffffffffffffffffffffffffffffffffffffff1681526001909101906020018083116109a6575b5050505050905090565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614610a7a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f4d75737420757365204c494e4b20746f6b656e0000000000000000000000000060448201526064016105ba565b600080610a8b8a8a8c8a8a8a612667565b91509150877fd8d7ecc4800d25fa53ce0372f13a416d98907a7ef3d8d3bdd79cf4fe75529c658b848c8e8c878c8c8c604051610acf9998979695949392919061381e565b60405180910390a250505050505050505050565b610aeb6125e4565b60005b82811015610c3157600060056000868685818110610b0e57610b0e61372f565b9050602002016020810190610b2391906136df565b73ffffffffffffffffffffffffffffffffffffffff168152602081019190915260400160002080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016911515919091179055838382818110610b8857610b8861372f565b9050602002016020810190610b9d91906136df565b6040517ff2fde38b00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff8481166004830152919091169063f2fde38b90602401600060405180830381600087803b158015610c0857600080fd5b505af1158015610c1c573d6000803e3d6000fd5b5050505080610c2a9061378d565b9050610aee565b50505050565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614610cd6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f4d75737420757365204c494e4b20746f6b656e0000000000000000000000000060448201526064016105ba565b600080610ce78b8b8a8a8a8a612667565b91509150887fd8d7ecc4800d25fa53ce0372f13a416d98907a7ef3d8d3bdd79cf4fe75529c658c848d8f8c878c8c8c604051610d2b9998979695949392919061381e565b60405180910390a25050505050505050505050565b6000610d4a612945565b600087815260046020526040812054889160089190911b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00169003610deb576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601b60248201527f4d757374206861766520612076616c696420726571756573744964000000000060448201526064016105ba565b73ffffffffffffffffffffffffffffffffffffffff8616600090815260056020526040902054869060ff1615610e7d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f43616e6e6f742063616c6c206f776e656420636f6e747261637400000000000060448201526064016105ba565b610e8c898989898960016129be565b60405189907f9e9bc7616d42c2835d05ae617e508454e63b30b934be8aa932ebc125e0e58a6490600090a262061a805a1015610f24576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f4d7573742070726f7669646520636f6e73756d657220656e6f7567682067617360448201526064016105ba565b60008773ffffffffffffffffffffffffffffffffffffffff16878b87604051602401610f5a929190918252602082015260400190565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529181526020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fffffffff00000000000000000000000000000000000000000000000000000000909416939093179092529051610fe391906138a9565b6000604051808303816000865af19150503d8060008114611020576040519150601f19603f3d011682016040523d82523d6000602084013e611025565b606091505b50909b9a5050505050505050505050565b6000611040612bb6565b905090565b61104d61258f565b6110b3576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f43616e6e6f742073657420617574686f72697a65642073656e6465727300000060448201526064016105ba565b6110bd8484610550565b610c3184848484612433565b60006110d3612945565b600088815260046020526040812054899160089190911b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00169003611174576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601b60248201527f4d757374206861766520612076616c696420726571756573744964000000000060448201526064016105ba565b73ffffffffffffffffffffffffffffffffffffffff8716600090815260056020526040902054879060ff1615611206576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f43616e6e6f742063616c6c206f776e656420636f6e747261637400000000000060448201526064016105ba565b8985856020811015611274576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601b60248201527f526573706f6e7365206d757374206265203e203332206279746573000000000060448201526064016105ba565b81358381146112df576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601c60248201527f466972737420776f7264206d757374206265207265717565737449640000000060448201526064016105ba565b6112ee8e8e8e8e8e60026129be565b6040518e907f9e9bc7616d42c2835d05ae617e508454e63b30b934be8aa932ebc125e0e58a6490600090a262061a805a1015611386576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f4d7573742070726f7669646520636f6e73756d657220656e6f7567682067617360448201526064016105ba565b60008c73ffffffffffffffffffffffffffffffffffffffff168c8b8b6040516020016113b4939291906138c5565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0818403018152908290526113ec916138a9565b6000604051808303816000865af19150503d8060008114611429576040519150601f19603f3d011682016040523d82523d6000602084013e61142e565b606091505b509098505050505050505050979650505050505050565b821580159061145357508281145b6114b9576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f496e76616c6964206172726179206c656e67746828732900000000000000000060448201526064016105ba565b3460005b848110156116195760008484838181106114d9576114d961372f565b90506020020135905080836114ee9190613901565b925060008787848181106115045761150461372f565b905060200201602081019061151991906136df565b73ffffffffffffffffffffffffffffffffffffffff168260405160006040518083038185875af1925050503d8060008114611570576040519150601f19603f3d011682016040523d82523d6000602084013e611575565b606091505b5050905080611606576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603a60248201527f416464726573733a20756e61626c6520746f2073656e642076616c75652c207260448201527f6563697069656e74206d6179206861766520726576657274656400000000000060648201526084016105ba565b5050806116129061378d565b90506114bd565b508015610965576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601160248201527f546f6f206d756368204554482073656e7400000000000000000000000000000060448201526064016105ba565b6040805160208082018690527fffffffffffffffffffffffffffffffffffffffff0000000000000000000000003360601b16828401527fffffffff00000000000000000000000000000000000000000000000000000000851660548301526058808301859052835180840390910181526078909201909252805191012060009060008681526004602052604090205490915060081b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00908116908216146117a5576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601e60248201527f506172616d7320646f206e6f74206d617463682072657175657374204944000060448201526064016105ba565b4282111561180f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f52657175657374206973206e6f7420657870697265640000000000000000000060448201526064016105ba565b6000858152600460205260408082208290555186917fa7842b9ec549398102c0d91b1b9919b2f20558aefdadf57528a95c6cd3292e9391a26040517fa9059cbb000000000000000000000000000000000000000000000000000000008152336004820152602481018590527f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff169063a9059cbb906044016020604051808303816000875af11580156118da573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118fe919061391a565b505050505050565b60035473ffffffffffffffffffffffffffffffffffffffff163314611987576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4d7573742062652070726f706f736564206f776e65720000000000000000000060448201526064016105ba565b600280547fffffffffffffffffffffffff00000000000000000000000000000000000000008082163390811790935560038054909116905560405173ffffffffffffffffffffffffffffffffffffffff909116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a350565b6000611a116125e4565b8380611a1b612bb6565b1015611aa9576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603560248201527f416d6f756e74207265717565737465642069732067726561746572207468616e60448201527f20776974686472617761626c652062616c616e6365000000000000000000000060648201526084016105ba565b6040517f4000aea000000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001690634000aea090611b2190899089908990899060040161393c565b6020604051808303816000875af1158015611b40573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611b64919061391a565b9695505050505050565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614611c0d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f4d75737420757365204c494e4b20746f6b656e0000000000000000000000000060448201526064016105ba565b60208101518190611c1e8183612c7f565b84602484015283604484015260003073ffffffffffffffffffffffffffffffffffffffff1684604051611c5191906138a9565b600060405180830381855af49150503d8060008114611c8c576040519150601f19603f3d011682016040523d82523d6000602084013e611c91565b606091505b50509050806118fe576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601860248201527f556e61626c6520746f206372656174652072657175657374000000000000000060448201526064016105ba565b604080513360601b7fffffffffffffffffffffffffffffffffffffffff0000000000000000000000001660208083018290526034808401899052845180850390910181526054840185528051908201206074840188905260948401929092527fffffffff00000000000000000000000000000000000000000000000000000000861660a884015260ac8084018690528451808503909101815260cc9093019093528151919092012060009060008381526004602052604090205490915060081b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0090811690821614611e4a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601e60248201527f506172616d7320646f206e6f74206d617463682072657175657374204944000060448201526064016105ba565b42831115611eb4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f52657175657374206973206e6f7420657870697265640000000000000000000060448201526064016105ba565b6000828152600460205260408082208290555183917fa7842b9ec549398102c0d91b1b9919b2f20558aefdadf57528a95c6cd3292e9391a26040517fa9059cbb000000000000000000000000000000000000000000000000000000008152336004820152602481018690527f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff169063a9059cbb906044016020604051808303816000875af1158015611f7f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611fa3919061391a565b50505050505050565b611fb461258f565b61201a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f43616e6e6f742073657420617574686f72697a65642073656e6465727300000060448201526064016105ba565b80612081576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601b60248201527f4d7573742068617665206174206c6561737420312073656e646572000000000060448201526064016105ba565b60015460005b81811015612116576000806000600184815481106120a7576120a761372f565b60009182526020808320919091015473ffffffffffffffffffffffffffffffffffffffff168352820192909252604001902080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001691151591909117905561210f8161378d565b9050612087565b5060005b8281101561226c576000808585848181106121375761213761372f565b905060200201602081019061214c91906136df565b73ffffffffffffffffffffffffffffffffffffffff16815260208101919091526040016000205460ff16156121dd576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601f60248201527f4d757374206e6f742068617665206475706c69636174652073656e646572730060448201526064016105ba565b60016000808686858181106121f4576121f461372f565b905060200201602081019061220991906136df565b73ffffffffffffffffffffffffffffffffffffffff168152602081019190915260400160002080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00169115159190911790556122658161378d565b905061211a565b5061227960018484612f88565b507ff263cfb3e4298332e776194610cf9fdc09ccb3ada8b9aa39764d882e11fbf0a08383336040516122ad939291906139c8565b60405180910390a1505050565b6122c26125e4565b6122cb81612dfb565b50565b6122d66125e4565b80806122e0612bb6565b101561236e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603560248201527f416d6f756e74207265717565737465642069732067726561746572207468616e60448201527f20776974686472617761626c652062616c616e6365000000000000000000000060648201526084016105ba565b6040517fa9059cbb00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff8481166004830152602482018490527f0000000000000000000000000000000000000000000000000000000000000000169063a9059cbb906044016020604051808303816000875af1158015612403573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612427919061391a565b61074e5761074e613a02565b61243b61258f565b6124a1576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f43616e6e6f742073657420617574686f72697a65642073656e6465727300000060448201526064016105ba565b7f1bb185903e2cb2f1b303523128b60e314dea81df4f8d9b7351cadd344f6e772784848484336040516124d8959493929190613a31565b60405180910390a160005b83811015610965578484828181106124fd576124fd61372f565b905060200201602081019061251291906136df565b73ffffffffffffffffffffffffffffffffffffffff1663ee56997b84846040518363ffffffff1660e01b815260040161254c929190613a81565b600060405180830381600087803b15801561256657600080fd5b505af115801561257a573d6000803e3d6000fd5b50505050806125889061378d565b90506124e3565b3360009081526020819052604081205460ff16806110405750336125c860025473ffffffffffffffffffffffffffffffffffffffff1690565b73ffffffffffffffffffffffffffffffffffffffff1614905090565b60025473ffffffffffffffffffffffffffffffffffffffff163314612665576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e65720000000000000000000060448201526064016105ba565b565b600080857f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1603612720576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f43616e6e6f742063616c6c20746f204c494e4b0000000000000000000000000060448201526064016105ba565b6040517fffffffffffffffffffffffffffffffffffffffff00000000000000000000000060608b901b16602082015260348101869052605401604080518083037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe001815291815281516020928301206000818152600490935291205490935060081b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00161561282b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601460248201527f4d75737420757365206120756e6971756520494400000000000000000000000060448201526064016105ba565b61283761012c42613a9d565b6040805160208082018c90527fffffffffffffffffffffffffffffffffffffffff00000000000000000000000060608c901b16828401527fffffffff000000000000000000000000000000000000000000000000000000008a1660548301526058808301859052835180840390910181526078909201909252805191012090925060405180604001604052808260ff191681526020016128d687612ef1565b60ff9081169091526000868152600460209081526040909120835193909101519091167f01000000000000000000000000000000000000000000000000000000000000000260089290921c919091179055600654612935908a90613a9d565b6006555050965096945050505050565b3360009081526020819052604090205460ff16612665576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601560248201527f4e6f7420617574686f72697a65642073656e646572000000000000000000000060448201526064016105ba565b6040805160208082018890527fffffffffffffffffffffffffffffffffffffffff000000000000000000000000606088901b16828401527fffffffff00000000000000000000000000000000000000000000000000000000861660548301526058808301869052835180840390910181526078909201909252805191012060009060008881526004602052604090205490915060081b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0090811690821614612ae2576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601e60248201527f506172616d7320646f206e6f74206d617463682072657175657374204944000060448201526064016105ba565b612aeb82612ef1565b60008881526004602052604090205460ff9182167f01000000000000000000000000000000000000000000000000000000000000009091049091161115612b8e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601860248201527f446174612076657273696f6e73206d757374206d61746368000000000000000060448201526064016105ba565b85600654612b9c9190613901565b600655505050600093845250506004602052506040812055565b60006001600654612bc79190613901565b6040517f70a082310000000000000000000000000000000000000000000000000000000081523060048201527f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff16906370a0823190602401602060405180830381865afa158015612c51573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612c759190613ab0565b6110409190613901565b612c8b60026020613ac9565b612c96906004613a9d565b81511015612d00576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f496e76616c69642072657175657374206c656e6774680000000000000000000060448201526064016105ba565b7fffffffff0000000000000000000000000000000000000000000000000000000082167f3c6d41b9000000000000000000000000000000000000000000000000000000001480612d9157507fffffffff0000000000000000000000000000000000000000000000000000000082167f4042994600000000000000000000000000000000000000000000000000000000145b612df7576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601e60248201527f4d757374207573652077686974656c69737465642066756e6374696f6e73000060448201526064016105ba565b5050565b3373ffffffffffffffffffffffffffffffffffffffff821603612e7a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c6600000000000000000060448201526064016105ba565b600380547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff838116918217909255600254604051919216907fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae127890600090a350565b600060ff821115612f84576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602560248201527f53616665436173743a2076616c756520646f65736e27742066697420696e203860448201527f206269747300000000000000000000000000000000000000000000000000000060648201526084016105ba565b5090565b828054828255906000526020600020908101928215613000579160200282015b828111156130005781547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff843516178255602090920191600190910190612fa8565b50612f849291505b80821115612f845760008155600101613008565b60008083601f84011261302e57600080fd5b50813567ffffffffffffffff81111561304657600080fd5b6020830191508360208260051b850101111561306157600080fd5b9250929050565b6000806020838503121561307b57600080fd5b823567ffffffffffffffff81111561309257600080fd5b61309e8582860161301c565b90969095509350505050565b73ffffffffffffffffffffffffffffffffffffffff811681146122cb57600080fd5b60008083601f8401126130de57600080fd5b50813567ffffffffffffffff8111156130f657600080fd5b60208301915083602082850101111561306157600080fd5b60008060006040848603121561312357600080fd5b833561312e816130aa565b9250602084013567ffffffffffffffff81111561314a57600080fd5b613156868287016130cc565b9497909650939450505050565b60005b8381101561317e578181015183820152602001613166565b50506000910152565b60208152600082518060208401526131a6816040850160208701613163565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169190910160400192915050565b6020808252825182820181905260009190848201906040850190845b8181101561322657835173ffffffffffffffffffffffffffffffffffffffff16835292840192918401916001016131f4565b50909695505050505050565b80357fffffffff000000000000000000000000000000000000000000000000000000008116811461326257600080fd5b919050565b60008060008060008060008060e0898b03121561328357600080fd5b883561328e816130aa565b975060208901359650604089013595506132aa60608a01613232565b94506080890135935060a0890135925060c089013567ffffffffffffffff8111156132d457600080fd5b6132e08b828c016130cc565b999c989b5096995094979396929594505050565b60008060006040848603121561330957600080fd5b833567ffffffffffffffff81111561332057600080fd5b61332c8682870161301c565b9094509250506020840135613340816130aa565b809150509250925092565b60008060008060008060008060006101008a8c03121561336a57600080fd5b8935613375816130aa565b985060208a0135975060408a0135965060608a0135613393816130aa565b95506133a160808b01613232565b945060a08a0135935060c08a0135925060e08a013567ffffffffffffffff8111156133cb57600080fd5b6133d78c828d016130cc565b915080935050809150509295985092959850929598565b60008060008060008060c0878903121561340757600080fd5b86359550602087013594506040870135613420816130aa565b935061342e60608801613232565b92506080870135915060a087013590509295509295509295565b6000806000806040858703121561345e57600080fd5b843567ffffffffffffffff8082111561347657600080fd5b6134828883890161301c565b9096509450602087013591508082111561349b57600080fd5b506134a88782880161301c565b95989497509550505050565b600080600080600080600060c0888a0312156134cf57600080fd5b873596506020880135955060408801356134e8816130aa565b94506134f660608901613232565b93506080880135925060a088013567ffffffffffffffff81111561351957600080fd5b6135258a828b016130cc565b989b979a50959850939692959293505050565b6000806000806080858703121561354e57600080fd5b843593506020850135925061356560408601613232565b9396929550929360600135925050565b6000806000806060858703121561358b57600080fd5b8435613596816130aa565b935060208501359250604085013567ffffffffffffffff8111156135b957600080fd5b6134a8878288016130cc565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b60008060006060848603121561360957600080fd5b8335613614816130aa565b925060208401359150604084013567ffffffffffffffff8082111561363857600080fd5b818601915086601f83011261364c57600080fd5b81358181111561365e5761365e6135c5565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0908116603f011681019083821181831017156136a4576136a46135c5565b816040528281528960208487010111156136bd57600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b6000602082840312156136f157600080fd5b81356136fc816130aa565b9392505050565b6000806040838503121561371657600080fd5b8235613721816130aa565b946020939093013593505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82036137be576137be61375e565b5060010190565b8183823760009101908152919050565b8183528181602085013750600060208284010152600060207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f840116840101905092915050565b600061010073ffffffffffffffffffffffffffffffffffffffff808d1684528b60208501528a6040850152808a166060850152507fffffffff00000000000000000000000000000000000000000000000000000000881660808401528660a08401528560c08401528060e084015261389981840185876137d5565b9c9b505050505050505050505050565b600082516138bb818460208701613163565b9190910192915050565b7fffffffff0000000000000000000000000000000000000000000000000000000084168152818360048301376000910160040190815292915050565b818103818111156139145761391461375e565b92915050565b60006020828403121561392c57600080fd5b815180151581146136fc57600080fd5b73ffffffffffffffffffffffffffffffffffffffff85168152836020820152606060408201526000611b646060830184866137d5565b8183526000602080850194508260005b858110156139bd578135613995816130aa565b73ffffffffffffffffffffffffffffffffffffffff1687529582019590820190600101613982565b509495945050505050565b6040815260006139dc604083018587613972565b905073ffffffffffffffffffffffffffffffffffffffff83166020830152949350505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052600160045260246000fd5b606081526000613a45606083018789613972565b8281036020840152613a58818688613972565b91505073ffffffffffffffffffffffffffffffffffffffff831660408301529695505050505050565b602081526000613a95602083018486613972565b949350505050565b808201808211156139145761391461375e565b600060208284031215613ac257600080fd5b5051919050565b80820281158282048414176139145761391461375e56fea164736f6c6343000813000a60a06040523480156200001157600080fd5b50604051620016993803806200169983398101604081905262000034916200029d565b82826001600160a01b038216620000925760405162461bcd60e51b815260206004820152601860248201527f43616e6e6f7420736574206f776e657220746f207a65726f000000000000000060448201526064015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0384811691909117909155811615620000c557620000c58162000199565b50506001600160a01b0384166200012b5760405162461bcd60e51b815260206004820152602360248201527f4c696e6b20746f6b656e2063616e6e6f742062652061207a65726f206164647260448201526265737360e81b606482015260840162000089565b6001600160a01b038085166080528216156200018f57816001600160a01b0316836001600160a01b03167f4e1e878dc28d5f040db5969163ff1acd75c44c3f655da2dde9c70bbd8e56dc7e836040516200018691906200038e565b60405180910390a35b50505050620003c3565b336001600160a01b03821603620001f35760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640162000089565b600180546001600160a01b0319166001600160a01b0383811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b80516001600160a01b03811681146200025c57600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60005b83811015620002945781810151838201526020016200027a565b50506000910152565b60008060008060808587031215620002b457600080fd5b620002bf8562000244565b9350620002cf6020860162000244565b9250620002df6040860162000244565b60608601519092506001600160401b0380821115620002fd57600080fd5b818701915087601f8301126200031257600080fd5b81518181111562000327576200032762000261565b604051601f8201601f19908116603f0116810190838211818310171562000352576200035262000261565b816040528281528a60208487010111156200036c57600080fd5b6200037f83602083016020880162000277565b979a9699509497505050505050565b6020815260008251806020840152620003af81604085016020870162000277565b601f01601f19169190910160400192915050565b6080516112ac620003ed6000396000818161016d0152818161037501526105d301526112ac6000f3fe608060405234801561001057600080fd5b50600436106100d45760003560e01c806379ba509711610081578063ee56997b1161005b578063ee56997b14610200578063f2fde38b14610213578063fa00763a1461022657600080fd5b806379ba5097146101c75780638da5cb5b146101cf578063b64fa9e6146101ed57600080fd5b80634d3e2323116100b25780634d3e23231461015557806357970e93146101685780636fadcf72146101b457600080fd5b8063033f49f7146100d9578063181f5a77146100ee5780632408afaa14610140575b600080fd5b6100ec6100e7366004610e72565b61026f565b005b61012a6040518060400160405280601981526020017f417574686f72697a6564466f7277617264657220312e312e300000000000000081525081565b6040516101379190610ef5565b60405180910390f35b610148610287565b6040516101379190610f61565b6100ec610163366004610e72565b6102f6565b61018f7f000000000000000000000000000000000000000000000000000000000000000081565b60405173ffffffffffffffffffffffffffffffffffffffff9091168152602001610137565b6100ec6101c2366004610e72565b61036b565b6100ec61042d565b60005473ffffffffffffffffffffffffffffffffffffffff1661018f565b6100ec6101fb366004611007565b61052a565b6100ec61020e366004611073565b6106cb565b6100ec6102213660046110b5565b6109dc565b61025f6102343660046110b5565b73ffffffffffffffffffffffffffffffffffffffff1660009081526002602052604090205460ff1690565b6040519015158152602001610137565b6102776109f0565b610282838383610a73565b505050565b606060038054806020026020016040519081016040528092919081815260200182805480156102ec57602002820191906000526020600020905b815473ffffffffffffffffffffffffffffffffffffffff1681526001909101906020018083116102c1575b5050505050905090565b6102ff836109dc565b8273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f4e1e878dc28d5f040db5969163ff1acd75c44c3f655da2dde9c70bbd8e56dc7e848460405161035e9291906110d7565b60405180910390a3505050565b610373610c00565b7f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1603610277576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601c60248201527f43616e6e6f7420666f727761726420746f204c696e6b20746f6b656e0000000060448201526064015b60405180910390fd5b60015473ffffffffffffffffffffffffffffffffffffffff1633146104ae576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4d7573742062652070726f706f736564206f776e6572000000000000000000006044820152606401610424565b60008054337fffffffffffffffffffffffff00000000000000000000000000000000000000008083168217845560018054909116905560405173ffffffffffffffffffffffffffffffffffffffff90921692909183917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a350565b610532610c00565b82811461059b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f417272617973206d7573742068617665207468652073616d65206c656e6774686044820152606401610424565b60005b838110156106c45760008585838181106105ba576105ba611124565b90506020020160208101906105cf91906110b5565b90507f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1603610686576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601c60248201527f43616e6e6f7420666f727761726420746f204c696e6b20746f6b656e000000006044820152606401610424565b6106b38185858581811061069c5761069c611124565b90506020028101906106ae9190611153565b610a73565b506106bd816111b8565b905061059e565b5050505050565b6106d3610c79565b610739576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f43616e6e6f742073657420617574686f72697a65642073656e646572730000006044820152606401610424565b806107a0576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601b60248201527f4d7573742068617665206174206c6561737420312073656e64657200000000006044820152606401610424565b60035460005b8181101561083657600060026000600384815481106107c7576107c7611124565b60009182526020808320919091015473ffffffffffffffffffffffffffffffffffffffff168352820192909252604001902080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001691151591909117905561082f816111b8565b90506107a6565b5060005b8281101561098e576002600085858481811061085857610858611124565b905060200201602081019061086d91906110b5565b73ffffffffffffffffffffffffffffffffffffffff16815260208101919091526040016000205460ff16156108fe576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601f60248201527f4d757374206e6f742068617665206475706c69636174652073656e64657273006044820152606401610424565b60016002600086868581811061091657610916611124565b905060200201602081019061092b91906110b5565b73ffffffffffffffffffffffffffffffffffffffff168152602081019190915260400160002080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016911515919091179055610987816111b8565b905061083a565b5061099b60038484610dac565b507ff263cfb3e4298332e776194610cf9fdc09ccb3ada8b9aa39764d882e11fbf0a08383336040516109cf93929190611217565b60405180910390a1505050565b6109e46109f0565b6109ed81610cb7565b50565b60005473ffffffffffffffffffffffffffffffffffffffff163314610a71576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e6572000000000000000000006044820152606401610424565b565b73ffffffffffffffffffffffffffffffffffffffff83163b610af1576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f4d75737420666f727761726420746f206120636f6e74726163740000000000006044820152606401610424565b6000808473ffffffffffffffffffffffffffffffffffffffff168484604051610b1b92919061128f565b6000604051808303816000865af19150503d8060008114610b58576040519150601f19603f3d011682016040523d82523d6000602084013e610b5d565b606091505b5091509150816106c4578051600003610bf8576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f466f727761726465642063616c6c20726576657274656420776974686f75742060448201527f726561736f6e00000000000000000000000000000000000000000000000000006064820152608401610424565b805181602001fd5b3360009081526002602052604090205460ff16610a71576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601560248201527f4e6f7420617574686f72697a65642073656e64657200000000000000000000006044820152606401610424565b600033610c9b60005473ffffffffffffffffffffffffffffffffffffffff1690565b73ffffffffffffffffffffffffffffffffffffffff1614905090565b3373ffffffffffffffffffffffffffffffffffffffff821603610d36576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c660000000000000000006044820152606401610424565b600180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff83811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b828054828255906000526020600020908101928215610e24579160200282015b82811115610e245781547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff843516178255602090920191600190910190610dcc565b50610e30929150610e34565b5090565b5b80821115610e305760008155600101610e35565b803573ffffffffffffffffffffffffffffffffffffffff81168114610e6d57600080fd5b919050565b600080600060408486031215610e8757600080fd5b610e9084610e49565b9250602084013567ffffffffffffffff80821115610ead57600080fd5b818601915086601f830112610ec157600080fd5b813581811115610ed057600080fd5b876020828501011115610ee257600080fd5b6020830194508093505050509250925092565b600060208083528351808285015260005b81811015610f2257858101830151858201604001528201610f06565b5060006040828601015260407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f8301168501019250505092915050565b6020808252825182820181905260009190848201906040850190845b81811015610faf57835173ffffffffffffffffffffffffffffffffffffffff1683529284019291840191600101610f7d565b50909695505050505050565b60008083601f840112610fcd57600080fd5b50813567ffffffffffffffff811115610fe557600080fd5b6020830191508360208260051b850101111561100057600080fd5b9250929050565b6000806000806040858703121561101d57600080fd5b843567ffffffffffffffff8082111561103557600080fd5b61104188838901610fbb565b9096509450602087013591508082111561105a57600080fd5b5061106787828801610fbb565b95989497509550505050565b6000806020838503121561108657600080fd5b823567ffffffffffffffff81111561109d57600080fd5b6110a985828601610fbb565b90969095509350505050565b6000602082840312156110c757600080fd5b6110d082610e49565b9392505050565b60208152816020820152818360408301376000818301604090810191909152601f9092017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0160101919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe184360301811261118857600080fd5b83018035915067ffffffffffffffff8211156111a357600080fd5b60200191503681900382131561100057600080fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8203611210577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b5060010190565b6040808252810183905260008460608301825b868110156112655773ffffffffffffffffffffffffffffffffffffffff61125084610e49565b1682526020928301929091019060010161122a565b50809250505073ffffffffffffffffffffffffffffffffffffffff83166020830152949350505050565b818382376000910190815291905056fea164736f6c6343000813000aa164736f6c6343000813000a",
 }
 
 var OperatorFactoryABI = OperatorFactoryMetaData.ABI
diff --git a/core/gethwrappers/generated/operator_wrapper/operator_wrapper.go b/core/gethwrappers/generated/operator_wrapper/operator_wrapper.go
index 4b7f6347639..db0ca418b2c 100644
--- a/core/gethwrappers/generated/operator_wrapper/operator_wrapper.go
+++ b/core/gethwrappers/generated/operator_wrapper/operator_wrapper.go
@@ -32,7 +32,7 @@ var (
 
 var OperatorMetaData = &bind.MetaData{
 	ABI: "[{\"inputs\":[{\"internalType\":\"address\",\"name\":\"link\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"owner\",\"type\":\"address\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address[]\",\"name\":\"senders\",\"type\":\"address[]\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"changedBy\",\"type\":\"address\"}],\"name\":\"AuthorizedSendersChanged\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"}],\"name\":\"CancelOracleRequest\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"specId\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"requester\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"payment\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"callbackAddr\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"bytes4\",\"name\":\"callbackFunctionId\",\"type\":\"bytes4\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"cancelExpiration\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"dataVersion\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"name\":\"OracleRequest\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"}],\"name\":\"OracleResponse\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"acceptedContract\",\"type\":\"address\"}],\"name\":\"OwnableContractAccepted\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"OwnershipTransferRequested\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"OwnershipTransferred\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address[]\",\"name\":\"targets\",\"type\":\"address[]\"},{\"indexed\":false,\"internalType\":\"address[]\",\"name\":\"senders\",\"type\":\"address[]\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"changedBy\",\"type\":\"address\"}],\"name\":\"TargetsUpdatedAuthorizedSenders\",\"type\":\"event\"},{\"inputs\":[],\"name\":\"EXPIRYTIME\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"targets\",\"type\":\"address[]\"},{\"internalType\":\"address[]\",\"name\":\"senders\",\"type\":\"address[]\"}],\"name\":\"acceptAuthorizedReceivers\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"ownable\",\"type\":\"address[]\"}],\"name\":\"acceptOwnableContracts\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"acceptOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"},{\"internalType\":\"uint256\",\"name\":\"payment\",\"type\":\"uint256\"},{\"internalType\":\"bytes4\",\"name\":\"callbackFunc\",\"type\":\"bytes4\"},{\"internalType\":\"uint256\",\"name\":\"expiration\",\"type\":\"uint256\"}],\"name\":\"cancelOracleRequest\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"nonce\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"payment\",\"type\":\"uint256\"},{\"internalType\":\"bytes4\",\"name\":\"callbackFunc\",\"type\":\"bytes4\"},{\"internalType\":\"uint256\",\"name\":\"expiration\",\"type\":\"uint256\"}],\"name\":\"cancelOracleRequestByRequester\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"addresspayable[]\",\"name\":\"receivers\",\"type\":\"address[]\"},{\"internalType\":\"uint256[]\",\"name\":\"amounts\",\"type\":\"uint256[]\"}],\"name\":\"distributeFunds\",\"outputs\":[],\"stateMutability\":\"payable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"},{\"internalType\":\"uint256\",\"name\":\"payment\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"callbackAddress\",\"type\":\"address\"},{\"internalType\":\"bytes4\",\"name\":\"callbackFunctionId\",\"type\":\"bytes4\"},{\"internalType\":\"uint256\",\"name\":\"expiration\",\"type\":\"uint256\"},{\"internalType\":\"bytes32\",\"name\":\"data\",\"type\":\"bytes32\"}],\"name\":\"fulfillOracleRequest\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"},{\"internalType\":\"uint256\",\"name\":\"payment\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"callbackAddress\",\"type\":\"address\"},{\"internalType\":\"bytes4\",\"name\":\"callbackFunctionId\",\"type\":\"bytes4\"},{\"internalType\":\"uint256\",\"name\":\"expiration\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"name\":\"fulfillOracleRequest2\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getAuthorizedSenders\",\"outputs\":[{\"internalType\":\"address[]\",\"name\":\"\",\"type\":\"address[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getChainlinkToken\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"}],\"name\":\"isAuthorizedSender\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"name\":\"onTokenTransfer\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"payment\",\"type\":\"uint256\"},{\"internalType\":\"bytes32\",\"name\":\"specId\",\"type\":\"bytes32\"},{\"internalType\":\"bytes4\",\"name\":\"callbackFunctionId\",\"type\":\"bytes4\"},{\"internalType\":\"uint256\",\"name\":\"nonce\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"dataVersion\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"name\":\"operatorRequest\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"payment\",\"type\":\"uint256\"},{\"internalType\":\"bytes32\",\"name\":\"specId\",\"type\":\"bytes32\"},{\"internalType\":\"address\",\"name\":\"callbackAddress\",\"type\":\"address\"},{\"internalType\":\"bytes4\",\"name\":\"callbackFunctionId\",\"type\":\"bytes4\"},{\"internalType\":\"uint256\",\"name\":\"nonce\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"dataVersion\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"name\":\"oracleRequest\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"name\":\"ownerForward\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"name\":\"ownerTransferAndCall\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"success\",\"type\":\"bool\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"senders\",\"type\":\"address[]\"}],\"name\":\"setAuthorizedSenders\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"targets\",\"type\":\"address[]\"},{\"internalType\":\"address[]\",\"name\":\"senders\",\"type\":\"address[]\"}],\"name\":\"setAuthorizedSendersOn\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"ownable\",\"type\":\"address[]\"},{\"internalType\":\"address\",\"name\":\"newOwner\",\"type\":\"address\"}],\"name\":\"transferOwnableContracts\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"transferOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"typeAndVersion\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"recipient\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"withdraw\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"withdrawable\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]",
-	Bin: "0x60a060405260016006553480156200001657600080fd5b5060405162003c8838038062003c888339810160408190526200003991620001ab565b808060006001600160a01b038216620000995760405162461bcd60e51b815260206004820152601860248201527f43616e6e6f7420736574206f776e657220746f207a65726f000000000000000060448201526064015b60405180910390fd5b600280546001600160a01b0319166001600160a01b0384811691909117909155811615620000cc57620000cc81620000e2565b505050506001600160a01b0316608052620001e3565b336001600160a01b038216036200013c5760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640162000090565b600380546001600160a01b0319166001600160a01b03838116918217909255600254604051919216907fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae127890600090a350565b80516001600160a01b0381168114620001a657600080fd5b919050565b60008060408385031215620001bf57600080fd5b620001ca836200018e565b9150620001da602084016200018e565b90509250929050565b608051613a4362000245600039600081816101ec0152818161075e015281816109f301528181610c4f015281816117d201528181611a3c01528181611adc01528181611e7701528181612310015281816125c30152612b4b0152613a436000f3fe6080604052600436106101965760003560e01c80636ae0bc76116100e1578063a4c0ed361161008a578063f2fde38b11610064578063f2fde38b146104aa578063f3fef3a3146104ca578063fa00763a146104ea578063fc4a03ed1461053057600080fd5b8063a4c0ed361461044a578063eb007d991461046a578063ee56997b1461048a57600080fd5b806379ba5097116100bb57806379ba5097146103ea5780638da5cb5b146103ff578063902fc3701461042a57600080fd5b80636ae0bc76146103975780636bd59ec0146103b75780636ee4d553146103ca57600080fd5b80633ec5bc1411610143578063501883011161011d578063501883011461033e57806352043783146103615780635ffa62881461037757600080fd5b80633ec5bc14146102ce57806340429946146102ee5780634ab0d1901461030e57600080fd5b8063181f5a7711610174578063181f5a77146102365780632408afaa1461028c5780633c6d41b9146102ae57600080fd5b806301994b991461019b578063033f49f7146101bd578063165d35e1146101dd575b600080fd5b3480156101a757600080fd5b506101bb6101b6366004612fbe565b610550565b005b3480156101c957600080fd5b506101bb6101d8366004613064565b610753565b3480156101e957600080fd5b507f00000000000000000000000000000000000000000000000000000000000000005b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020015b60405180910390f35b34801561024257600080fd5b5061027f6040518060400160405280600e81526020017f4f70657261746f7220312e302e3000000000000000000000000000000000000081525081565b60405161022d91906130dd565b34801561029857600080fd5b506102a161096c565b60405161022d919061312e565b3480156102ba57600080fd5b506101bb6102c93660046131bd565b6109db565b3480156102da57600080fd5b506101bb6102e936600461324a565b610ae3565b3480156102fa57600080fd5b506101bb6103093660046132a1565b610c37565b34801561031a57600080fd5b5061032e610329366004613344565b610d40565b604051901515815260200161022d565b34801561034a57600080fd5b50610353611036565b60405190815260200161022d565b34801561036d57600080fd5b5061035361012c81565b34801561038357600080fd5b506101bb61039236600461339e565b611045565b3480156103a357600080fd5b5061032e6103b236600461340a565b6110c9565b6101bb6103c536600461339e565b611445565b3480156103d657600080fd5b506101bb6103e536600461348e565b6115d8565b3480156103f657600080fd5b506101bb61185c565b34801561040b57600080fd5b5060025473ffffffffffffffffffffffffffffffffffffffff1661020c565b34801561043657600080fd5b5061032e6104453660046134cb565b61195d565b34801561045657600080fd5b506101bb61046536600461354a565b611ac4565b34801561047657600080fd5b506101bb61048536600461348e565b611c52565b34801561049657600080fd5b506101bb6104a5366004612fbe565b611f02565b3480156104b657600080fd5b506101bb6104c5366004613635565b612210565b3480156104d657600080fd5b506101bb6104e5366004613659565b612224565b3480156104f657600080fd5b5061032e610505366004613635565b73ffffffffffffffffffffffffffffffffffffffff1660009081526020819052604090205460ff1690565b34801561053c57600080fd5b506101bb61054b36600461339e565b612389565b6105586124e5565b6105c3576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f43616e6e6f742073657420617574686f72697a65642073656e6465727300000060448201526064015b60405180910390fd5b60005b8181101561074e576001600560008585858181106105e6576105e6613685565b90506020020160208101906105fb9190613635565b73ffffffffffffffffffffffffffffffffffffffff168152602081019190915260400160002080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001691151591909117905582828281811061066057610660613685565b90506020020160208101906106759190613635565b73ffffffffffffffffffffffffffffffffffffffff167f615a0c1cb00a60d4acd77ec67acf2f17f223ef0932d591052fabc33643fe7e8260405160405180910390a28282828181106106c9576106c9613685565b90506020020160208101906106de9190613635565b73ffffffffffffffffffffffffffffffffffffffff166379ba50976040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561072557600080fd5b505af1158015610739573d6000803e3d6000fd5b5050505080610747906136e3565b90506105c6565b505050565b61075b61253a565b827f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1603610811576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f43616e6e6f742063616c6c20746f204c494e4b0000000000000000000000000060448201526064016105ba565b73ffffffffffffffffffffffffffffffffffffffff84163b61088f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f4d75737420666f727761726420746f206120636f6e747261637400000000000060448201526064016105ba565b60008473ffffffffffffffffffffffffffffffffffffffff1684846040516108b892919061371b565b6000604051808303816000865af19150503d80600081146108f5576040519150601f19603f3d011682016040523d82523d6000602084013e6108fa565b606091505b5050905080610965576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601560248201527f466f727761726465642063616c6c206661696c6564000000000000000000000060448201526064016105ba565b5050505050565b606060018054806020026020016040519081016040528092919081815260200182805480156109d157602002820191906000526020600020905b815473ffffffffffffffffffffffffffffffffffffffff1681526001909101906020018083116109a6575b5050505050905090565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614610a7a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f4d75737420757365204c494e4b20746f6b656e0000000000000000000000000060448201526064016105ba565b600080610a8b8a8a8c8a8a8a6125bd565b91509150877fd8d7ecc4800d25fa53ce0372f13a416d98907a7ef3d8d3bdd79cf4fe75529c658b848c8e8c878c8c8c604051610acf99989796959493929190613774565b60405180910390a250505050505050505050565b610aeb61253a565b60005b82811015610c3157600060056000868685818110610b0e57610b0e613685565b9050602002016020810190610b239190613635565b73ffffffffffffffffffffffffffffffffffffffff168152602081019190915260400160002080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016911515919091179055838382818110610b8857610b88613685565b9050602002016020810190610b9d9190613635565b6040517ff2fde38b00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff8481166004830152919091169063f2fde38b90602401600060405180830381600087803b158015610c0857600080fd5b505af1158015610c1c573d6000803e3d6000fd5b5050505080610c2a906136e3565b9050610aee565b50505050565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614610cd6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f4d75737420757365204c494e4b20746f6b656e0000000000000000000000000060448201526064016105ba565b600080610ce78b8b8a8a8a8a6125bd565b91509150887fd8d7ecc4800d25fa53ce0372f13a416d98907a7ef3d8d3bdd79cf4fe75529c658c848d8f8c878c8c8c604051610d2b99989796959493929190613774565b60405180910390a25050505050505050505050565b6000610d4a61289b565b600087815260046020526040812054889160089190911b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00169003610deb576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601b60248201527f4d757374206861766520612076616c696420726571756573744964000000000060448201526064016105ba565b73ffffffffffffffffffffffffffffffffffffffff8616600090815260056020526040902054869060ff1615610e7d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f43616e6e6f742063616c6c206f776e656420636f6e747261637400000000000060448201526064016105ba565b610e8c89898989896001612914565b60405189907f9e9bc7616d42c2835d05ae617e508454e63b30b934be8aa932ebc125e0e58a6490600090a262061a805a1015610f24576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f4d7573742070726f7669646520636f6e73756d657220656e6f7567682067617360448201526064016105ba565b60008773ffffffffffffffffffffffffffffffffffffffff16878b87604051602401610f5a929190918252602082015260400190565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529181526020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fffffffff00000000000000000000000000000000000000000000000000000000909416939093179092529051610fe391906137ff565b6000604051808303816000865af19150503d8060008114611020576040519150601f19603f3d011682016040523d82523d6000602084013e611025565b606091505b50909b9a5050505050505050505050565b6000611040612b0c565b905090565b61104d6124e5565b6110b3576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f43616e6e6f742073657420617574686f72697a65642073656e6465727300000060448201526064016105ba565b6110bd8484610550565b610c3184848484612389565b60006110d361289b565b600088815260046020526040812054899160089190911b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00169003611174576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601b60248201527f4d757374206861766520612076616c696420726571756573744964000000000060448201526064016105ba565b73ffffffffffffffffffffffffffffffffffffffff8716600090815260056020526040902054879060ff1615611206576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f43616e6e6f742063616c6c206f776e656420636f6e747261637400000000000060448201526064016105ba565b8985856020811015611274576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601b60248201527f526573706f6e7365206d757374206265203e203332206279746573000000000060448201526064016105ba565b81358381146112df576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601c60248201527f466972737420776f7264206d757374206265207265717565737449640000000060448201526064016105ba565b6112ee8e8e8e8e8e6002612914565b6040518e907f9e9bc7616d42c2835d05ae617e508454e63b30b934be8aa932ebc125e0e58a6490600090a262061a805a1015611386576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f4d7573742070726f7669646520636f6e73756d657220656e6f7567682067617360448201526064016105ba565b60008c73ffffffffffffffffffffffffffffffffffffffff168c8b8b6040516020016113b49392919061381b565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0818403018152908290526113ec916137ff565b6000604051808303816000865af19150503d8060008114611429576040519150601f19603f3d011682016040523d82523d6000602084013e61142e565b606091505b509098505050505050505050979650505050505050565b821580159061145357508281145b6114b9576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f496e76616c6964206172726179206c656e67746828732900000000000000000060448201526064016105ba565b3460005b8481101561156f5760008484838181106114d9576114d9613685565b90506020020135905080836114ee9190613857565b925086868381811061150257611502613685565b90506020020160208101906115179190613635565b73ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f1935050505015801561155c573d6000803e3d6000fd5b505080611568906136e3565b90506114bd565b508015610965576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601160248201527f546f6f206d756368204554482073656e7400000000000000000000000000000060448201526064016105ba565b6040805160208082018690527fffffffffffffffffffffffffffffffffffffffff0000000000000000000000003360601b16828401527fffffffff00000000000000000000000000000000000000000000000000000000851660548301526058808301859052835180840390910181526078909201909252805191012060009060008681526004602052604090205490915060081b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00908116908216146116fb576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601e60248201527f506172616d7320646f206e6f74206d617463682072657175657374204944000060448201526064016105ba565b42821115611765576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f52657175657374206973206e6f7420657870697265640000000000000000000060448201526064016105ba565b6000858152600460205260408082208290555186917fa7842b9ec549398102c0d91b1b9919b2f20558aefdadf57528a95c6cd3292e9391a26040517fa9059cbb000000000000000000000000000000000000000000000000000000008152336004820152602481018590527f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff169063a9059cbb906044016020604051808303816000875af1158015611830573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118549190613870565b505050505050565b60035473ffffffffffffffffffffffffffffffffffffffff1633146118dd576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4d7573742062652070726f706f736564206f776e65720000000000000000000060448201526064016105ba565b600280547fffffffffffffffffffffffff00000000000000000000000000000000000000008082163390811790935560038054909116905560405173ffffffffffffffffffffffffffffffffffffffff909116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a350565b600061196761253a565b8380611971612b0c565b10156119ff576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603560248201527f416d6f756e74207265717565737465642069732067726561746572207468616e60448201527f20776974686472617761626c652062616c616e6365000000000000000000000060648201526084016105ba565b6040517f4000aea000000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001690634000aea090611a77908990899089908990600401613892565b6020604051808303816000875af1158015611a96573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611aba9190613870565b9695505050505050565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614611b63576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f4d75737420757365204c494e4b20746f6b656e0000000000000000000000000060448201526064016105ba565b60208101518190611b748183612bd5565b84602484015283604484015260003073ffffffffffffffffffffffffffffffffffffffff1684604051611ba791906137ff565b600060405180830381855af49150503d8060008114611be2576040519150601f19603f3d011682016040523d82523d6000602084013e611be7565b606091505b5050905080611854576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601860248201527f556e61626c6520746f206372656174652072657175657374000000000000000060448201526064016105ba565b604080513360601b7fffffffffffffffffffffffffffffffffffffffff0000000000000000000000001660208083018290526034808401899052845180850390910181526054840185528051908201206074840188905260948401929092527fffffffff00000000000000000000000000000000000000000000000000000000861660a884015260ac8084018690528451808503909101815260cc9093019093528151919092012060009060008381526004602052604090205490915060081b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0090811690821614611da0576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601e60248201527f506172616d7320646f206e6f74206d617463682072657175657374204944000060448201526064016105ba565b42831115611e0a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f52657175657374206973206e6f7420657870697265640000000000000000000060448201526064016105ba565b6000828152600460205260408082208290555183917fa7842b9ec549398102c0d91b1b9919b2f20558aefdadf57528a95c6cd3292e9391a26040517fa9059cbb000000000000000000000000000000000000000000000000000000008152336004820152602481018690527f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff169063a9059cbb906044016020604051808303816000875af1158015611ed5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611ef99190613870565b50505050505050565b611f0a6124e5565b611f70576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f43616e6e6f742073657420617574686f72697a65642073656e6465727300000060448201526064016105ba565b80611fd7576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601b60248201527f4d7573742068617665206174206c6561737420312073656e646572000000000060448201526064016105ba565b60015460005b8181101561206c57600080600060018481548110611ffd57611ffd613685565b60009182526020808320919091015473ffffffffffffffffffffffffffffffffffffffff168352820192909252604001902080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016911515919091179055612065816136e3565b9050611fdd565b5060005b828110156121c25760008085858481811061208d5761208d613685565b90506020020160208101906120a29190613635565b73ffffffffffffffffffffffffffffffffffffffff16815260208101919091526040016000205460ff1615612133576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601f60248201527f4d757374206e6f742068617665206475706c69636174652073656e646572730060448201526064016105ba565b600160008086868581811061214a5761214a613685565b905060200201602081019061215f9190613635565b73ffffffffffffffffffffffffffffffffffffffff168152602081019190915260400160002080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00169115159190911790556121bb816136e3565b9050612070565b506121cf60018484612ede565b507ff263cfb3e4298332e776194610cf9fdc09ccb3ada8b9aa39764d882e11fbf0a08383336040516122039392919061391e565b60405180910390a1505050565b61221861253a565b61222181612d51565b50565b61222c61253a565b8080612236612b0c565b10156122c4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603560248201527f416d6f756e74207265717565737465642069732067726561746572207468616e60448201527f20776974686472617761626c652062616c616e6365000000000000000000000060648201526084016105ba565b6040517fa9059cbb00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff8481166004830152602482018490527f0000000000000000000000000000000000000000000000000000000000000000169063a9059cbb906044016020604051808303816000875af1158015612359573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061237d9190613870565b61074e5761074e613958565b6123916124e5565b6123f7576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f43616e6e6f742073657420617574686f72697a65642073656e6465727300000060448201526064016105ba565b7f1bb185903e2cb2f1b303523128b60e314dea81df4f8d9b7351cadd344f6e7727848484843360405161242e959493929190613987565b60405180910390a160005b838110156109655784848281811061245357612453613685565b90506020020160208101906124689190613635565b73ffffffffffffffffffffffffffffffffffffffff1663ee56997b84846040518363ffffffff1660e01b81526004016124a29291906139d7565b600060405180830381600087803b1580156124bc57600080fd5b505af11580156124d0573d6000803e3d6000fd5b50505050806124de906136e3565b9050612439565b3360009081526020819052604081205460ff168061104057503361251e60025473ffffffffffffffffffffffffffffffffffffffff1690565b73ffffffffffffffffffffffffffffffffffffffff1614905090565b60025473ffffffffffffffffffffffffffffffffffffffff1633146125bb576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e65720000000000000000000060448201526064016105ba565b565b600080857f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1603612676576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f43616e6e6f742063616c6c20746f204c494e4b0000000000000000000000000060448201526064016105ba565b6040517fffffffffffffffffffffffffffffffffffffffff00000000000000000000000060608b901b16602082015260348101869052605401604080518083037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe001815291815281516020928301206000818152600490935291205490935060081b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001615612781576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601460248201527f4d75737420757365206120756e6971756520494400000000000000000000000060448201526064016105ba565b61278d61012c426139f3565b6040805160208082018c90527fffffffffffffffffffffffffffffffffffffffff00000000000000000000000060608c901b16828401527fffffffff000000000000000000000000000000000000000000000000000000008a1660548301526058808301859052835180840390910181526078909201909252805191012090925060405180604001604052808260ff1916815260200161282c87612e47565b60ff9081169091526000868152600460209081526040909120835193909101519091167f01000000000000000000000000000000000000000000000000000000000000000260089290921c91909117905560065461288b908a906139f3565b6006555050965096945050505050565b3360009081526020819052604090205460ff166125bb576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601560248201527f4e6f7420617574686f72697a65642073656e646572000000000000000000000060448201526064016105ba565b6040805160208082018890527fffffffffffffffffffffffffffffffffffffffff000000000000000000000000606088901b16828401527fffffffff00000000000000000000000000000000000000000000000000000000861660548301526058808301869052835180840390910181526078909201909252805191012060009060008881526004602052604090205490915060081b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0090811690821614612a38576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601e60248201527f506172616d7320646f206e6f74206d617463682072657175657374204944000060448201526064016105ba565b612a4182612e47565b60008881526004602052604090205460ff9182167f01000000000000000000000000000000000000000000000000000000000000009091049091161115612ae4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601860248201527f446174612076657273696f6e73206d757374206d61746368000000000000000060448201526064016105ba565b85600654612af29190613857565b600655505050600093845250506004602052506040812055565b60006001600654612b1d9190613857565b6040517f70a082310000000000000000000000000000000000000000000000000000000081523060048201527f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff16906370a0823190602401602060405180830381865afa158015612ba7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612bcb9190613a06565b6110409190613857565b612be160026020613a1f565b612bec9060046139f3565b81511015612c56576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f496e76616c69642072657175657374206c656e6774680000000000000000000060448201526064016105ba565b7fffffffff0000000000000000000000000000000000000000000000000000000082167f3c6d41b9000000000000000000000000000000000000000000000000000000001480612ce757507fffffffff0000000000000000000000000000000000000000000000000000000082167f4042994600000000000000000000000000000000000000000000000000000000145b612d4d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601e60248201527f4d757374207573652077686974656c69737465642066756e6374696f6e73000060448201526064016105ba565b5050565b3373ffffffffffffffffffffffffffffffffffffffff821603612dd0576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c6600000000000000000060448201526064016105ba565b600380547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff838116918217909255600254604051919216907fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae127890600090a350565b600060ff821115612eda576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602560248201527f53616665436173743a2076616c756520646f65736e27742066697420696e203860448201527f206269747300000000000000000000000000000000000000000000000000000060648201526084016105ba565b5090565b828054828255906000526020600020908101928215612f56579160200282015b82811115612f565781547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff843516178255602090920191600190910190612efe565b50612eda9291505b80821115612eda5760008155600101612f5e565b60008083601f840112612f8457600080fd5b50813567ffffffffffffffff811115612f9c57600080fd5b6020830191508360208260051b8501011115612fb757600080fd5b9250929050565b60008060208385031215612fd157600080fd5b823567ffffffffffffffff811115612fe857600080fd5b612ff485828601612f72565b90969095509350505050565b73ffffffffffffffffffffffffffffffffffffffff8116811461222157600080fd5b60008083601f84011261303457600080fd5b50813567ffffffffffffffff81111561304c57600080fd5b602083019150836020828501011115612fb757600080fd5b60008060006040848603121561307957600080fd5b833561308481613000565b9250602084013567ffffffffffffffff8111156130a057600080fd5b6130ac86828701613022565b9497909650939450505050565b60005b838110156130d45781810151838201526020016130bc565b50506000910152565b60208152600082518060208401526130fc8160408501602087016130b9565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169190910160400192915050565b6020808252825182820181905260009190848201906040850190845b8181101561317c57835173ffffffffffffffffffffffffffffffffffffffff168352928401929184019160010161314a565b50909695505050505050565b80357fffffffff00000000000000000000000000000000000000000000000000000000811681146131b857600080fd5b919050565b60008060008060008060008060e0898b0312156131d957600080fd5b88356131e481613000565b9750602089013596506040890135955061320060608a01613188565b94506080890135935060a0890135925060c089013567ffffffffffffffff81111561322a57600080fd5b6132368b828c01613022565b999c989b5096995094979396929594505050565b60008060006040848603121561325f57600080fd5b833567ffffffffffffffff81111561327657600080fd5b61328286828701612f72565b909450925050602084013561329681613000565b809150509250925092565b60008060008060008060008060006101008a8c0312156132c057600080fd5b89356132cb81613000565b985060208a0135975060408a0135965060608a01356132e981613000565b95506132f760808b01613188565b945060a08a0135935060c08a0135925060e08a013567ffffffffffffffff81111561332157600080fd5b61332d8c828d01613022565b915080935050809150509295985092959850929598565b60008060008060008060c0878903121561335d57600080fd5b8635955060208701359450604087013561337681613000565b935061338460608801613188565b92506080870135915060a087013590509295509295509295565b600080600080604085870312156133b457600080fd5b843567ffffffffffffffff808211156133cc57600080fd5b6133d888838901612f72565b909650945060208701359150808211156133f157600080fd5b506133fe87828801612f72565b95989497509550505050565b600080600080600080600060c0888a03121561342557600080fd5b8735965060208801359550604088013561343e81613000565b945061344c60608901613188565b93506080880135925060a088013567ffffffffffffffff81111561346f57600080fd5b61347b8a828b01613022565b989b979a50959850939692959293505050565b600080600080608085870312156134a457600080fd5b84359350602085013592506134bb60408601613188565b9396929550929360600135925050565b600080600080606085870312156134e157600080fd5b84356134ec81613000565b935060208501359250604085013567ffffffffffffffff81111561350f57600080fd5b6133fe87828801613022565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b60008060006060848603121561355f57600080fd5b833561356a81613000565b925060208401359150604084013567ffffffffffffffff8082111561358e57600080fd5b818601915086601f8301126135a257600080fd5b8135818111156135b4576135b461351b565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0908116603f011681019083821181831017156135fa576135fa61351b565b8160405282815289602084870101111561361357600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b60006020828403121561364757600080fd5b813561365281613000565b9392505050565b6000806040838503121561366c57600080fd5b823561367781613000565b946020939093013593505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8203613714576137146136b4565b5060010190565b8183823760009101908152919050565b8183528181602085013750600060208284010152600060207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f840116840101905092915050565b600061010073ffffffffffffffffffffffffffffffffffffffff808d1684528b60208501528a6040850152808a166060850152507fffffffff00000000000000000000000000000000000000000000000000000000881660808401528660a08401528560c08401528060e08401526137ef818401858761372b565b9c9b505050505050505050505050565b600082516138118184602087016130b9565b9190910192915050565b7fffffffff0000000000000000000000000000000000000000000000000000000084168152818360048301376000910160040190815292915050565b8181038181111561386a5761386a6136b4565b92915050565b60006020828403121561388257600080fd5b8151801515811461365257600080fd5b73ffffffffffffffffffffffffffffffffffffffff85168152836020820152606060408201526000611aba60608301848661372b565b8183526000602080850194508260005b858110156139135781356138eb81613000565b73ffffffffffffffffffffffffffffffffffffffff16875295820195908201906001016138d8565b509495945050505050565b6040815260006139326040830185876138c8565b905073ffffffffffffffffffffffffffffffffffffffff83166020830152949350505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052600160045260246000fd5b60608152600061399b6060830187896138c8565b82810360208401526139ae8186886138c8565b91505073ffffffffffffffffffffffffffffffffffffffff831660408301529695505050505050565b6020815260006139eb6020830184866138c8565b949350505050565b8082018082111561386a5761386a6136b4565b600060208284031215613a1857600080fd5b5051919050565b808202811582820484141761386a5761386a6136b456fea164736f6c6343000813000a",
+	Bin: "0x60a060405260016006553480156200001657600080fd5b5060405162003d3238038062003d328339810160408190526200003991620001ab565b808060006001600160a01b038216620000995760405162461bcd60e51b815260206004820152601860248201527f43616e6e6f7420736574206f776e657220746f207a65726f000000000000000060448201526064015b60405180910390fd5b600280546001600160a01b0319166001600160a01b0384811691909117909155811615620000cc57620000cc81620000e2565b505050506001600160a01b0316608052620001e3565b336001600160a01b038216036200013c5760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640162000090565b600380546001600160a01b0319166001600160a01b03838116918217909255600254604051919216907fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae127890600090a350565b80516001600160a01b0381168114620001a657600080fd5b919050565b60008060408385031215620001bf57600080fd5b620001ca836200018e565b9150620001da602084016200018e565b90509250929050565b608051613aed62000245600039600081816101ec0152818161075e015281816109f301528181610c4f0152818161187c01528181611ae601528181611b8601528181611f21015281816123ba0152818161266d0152612bf50152613aed6000f3fe6080604052600436106101965760003560e01c80636ae0bc76116100e1578063a4c0ed361161008a578063f2fde38b11610064578063f2fde38b146104aa578063f3fef3a3146104ca578063fa00763a146104ea578063fc4a03ed1461053057600080fd5b8063a4c0ed361461044a578063eb007d991461046a578063ee56997b1461048a57600080fd5b806379ba5097116100bb57806379ba5097146103ea5780638da5cb5b146103ff578063902fc3701461042a57600080fd5b80636ae0bc76146103975780636bd59ec0146103b75780636ee4d553146103ca57600080fd5b80633ec5bc1411610143578063501883011161011d578063501883011461033e57806352043783146103615780635ffa62881461037757600080fd5b80633ec5bc14146102ce57806340429946146102ee5780634ab0d1901461030e57600080fd5b8063181f5a7711610174578063181f5a77146102365780632408afaa1461028c5780633c6d41b9146102ae57600080fd5b806301994b991461019b578063033f49f7146101bd578063165d35e1146101dd575b600080fd5b3480156101a757600080fd5b506101bb6101b6366004613068565b610550565b005b3480156101c957600080fd5b506101bb6101d836600461310e565b610753565b3480156101e957600080fd5b507f00000000000000000000000000000000000000000000000000000000000000005b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020015b60405180910390f35b34801561024257600080fd5b5061027f6040518060400160405280600e81526020017f4f70657261746f7220312e302e3000000000000000000000000000000000000081525081565b60405161022d9190613187565b34801561029857600080fd5b506102a161096c565b60405161022d91906131d8565b3480156102ba57600080fd5b506101bb6102c9366004613267565b6109db565b3480156102da57600080fd5b506101bb6102e93660046132f4565b610ae3565b3480156102fa57600080fd5b506101bb61030936600461334b565b610c37565b34801561031a57600080fd5b5061032e6103293660046133ee565b610d40565b604051901515815260200161022d565b34801561034a57600080fd5b50610353611036565b60405190815260200161022d565b34801561036d57600080fd5b5061035361012c81565b34801561038357600080fd5b506101bb610392366004613448565b611045565b3480156103a357600080fd5b5061032e6103b23660046134b4565b6110c9565b6101bb6103c5366004613448565b611445565b3480156103d657600080fd5b506101bb6103e5366004613538565b611682565b3480156103f657600080fd5b506101bb611906565b34801561040b57600080fd5b5060025473ffffffffffffffffffffffffffffffffffffffff1661020c565b34801561043657600080fd5b5061032e610445366004613575565b611a07565b34801561045657600080fd5b506101bb6104653660046135f4565b611b6e565b34801561047657600080fd5b506101bb610485366004613538565b611cfc565b34801561049657600080fd5b506101bb6104a5366004613068565b611fac565b3480156104b657600080fd5b506101bb6104c53660046136df565b6122ba565b3480156104d657600080fd5b506101bb6104e5366004613703565b6122ce565b3480156104f657600080fd5b5061032e6105053660046136df565b73ffffffffffffffffffffffffffffffffffffffff1660009081526020819052604090205460ff1690565b34801561053c57600080fd5b506101bb61054b366004613448565b612433565b61055861258f565b6105c3576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f43616e6e6f742073657420617574686f72697a65642073656e6465727300000060448201526064015b60405180910390fd5b60005b8181101561074e576001600560008585858181106105e6576105e661372f565b90506020020160208101906105fb91906136df565b73ffffffffffffffffffffffffffffffffffffffff168152602081019190915260400160002080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00169115159190911790558282828181106106605761066061372f565b905060200201602081019061067591906136df565b73ffffffffffffffffffffffffffffffffffffffff167f615a0c1cb00a60d4acd77ec67acf2f17f223ef0932d591052fabc33643fe7e8260405160405180910390a28282828181106106c9576106c961372f565b90506020020160208101906106de91906136df565b73ffffffffffffffffffffffffffffffffffffffff166379ba50976040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561072557600080fd5b505af1158015610739573d6000803e3d6000fd5b50505050806107479061378d565b90506105c6565b505050565b61075b6125e4565b827f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1603610811576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f43616e6e6f742063616c6c20746f204c494e4b0000000000000000000000000060448201526064016105ba565b73ffffffffffffffffffffffffffffffffffffffff84163b61088f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f4d75737420666f727761726420746f206120636f6e747261637400000000000060448201526064016105ba565b60008473ffffffffffffffffffffffffffffffffffffffff1684846040516108b89291906137c5565b6000604051808303816000865af19150503d80600081146108f5576040519150601f19603f3d011682016040523d82523d6000602084013e6108fa565b606091505b5050905080610965576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601560248201527f466f727761726465642063616c6c206661696c6564000000000000000000000060448201526064016105ba565b5050505050565b606060018054806020026020016040519081016040528092919081815260200182805480156109d157602002820191906000526020600020905b815473ffffffffffffffffffffffffffffffffffffffff1681526001909101906020018083116109a6575b5050505050905090565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614610a7a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f4d75737420757365204c494e4b20746f6b656e0000000000000000000000000060448201526064016105ba565b600080610a8b8a8a8c8a8a8a612667565b91509150877fd8d7ecc4800d25fa53ce0372f13a416d98907a7ef3d8d3bdd79cf4fe75529c658b848c8e8c878c8c8c604051610acf9998979695949392919061381e565b60405180910390a250505050505050505050565b610aeb6125e4565b60005b82811015610c3157600060056000868685818110610b0e57610b0e61372f565b9050602002016020810190610b2391906136df565b73ffffffffffffffffffffffffffffffffffffffff168152602081019190915260400160002080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016911515919091179055838382818110610b8857610b8861372f565b9050602002016020810190610b9d91906136df565b6040517ff2fde38b00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff8481166004830152919091169063f2fde38b90602401600060405180830381600087803b158015610c0857600080fd5b505af1158015610c1c573d6000803e3d6000fd5b5050505080610c2a9061378d565b9050610aee565b50505050565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614610cd6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f4d75737420757365204c494e4b20746f6b656e0000000000000000000000000060448201526064016105ba565b600080610ce78b8b8a8a8a8a612667565b91509150887fd8d7ecc4800d25fa53ce0372f13a416d98907a7ef3d8d3bdd79cf4fe75529c658c848d8f8c878c8c8c604051610d2b9998979695949392919061381e565b60405180910390a25050505050505050505050565b6000610d4a612945565b600087815260046020526040812054889160089190911b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00169003610deb576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601b60248201527f4d757374206861766520612076616c696420726571756573744964000000000060448201526064016105ba565b73ffffffffffffffffffffffffffffffffffffffff8616600090815260056020526040902054869060ff1615610e7d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f43616e6e6f742063616c6c206f776e656420636f6e747261637400000000000060448201526064016105ba565b610e8c898989898960016129be565b60405189907f9e9bc7616d42c2835d05ae617e508454e63b30b934be8aa932ebc125e0e58a6490600090a262061a805a1015610f24576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f4d7573742070726f7669646520636f6e73756d657220656e6f7567682067617360448201526064016105ba565b60008773ffffffffffffffffffffffffffffffffffffffff16878b87604051602401610f5a929190918252602082015260400190565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529181526020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fffffffff00000000000000000000000000000000000000000000000000000000909416939093179092529051610fe391906138a9565b6000604051808303816000865af19150503d8060008114611020576040519150601f19603f3d011682016040523d82523d6000602084013e611025565b606091505b50909b9a5050505050505050505050565b6000611040612bb6565b905090565b61104d61258f565b6110b3576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f43616e6e6f742073657420617574686f72697a65642073656e6465727300000060448201526064016105ba565b6110bd8484610550565b610c3184848484612433565b60006110d3612945565b600088815260046020526040812054899160089190911b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00169003611174576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601b60248201527f4d757374206861766520612076616c696420726571756573744964000000000060448201526064016105ba565b73ffffffffffffffffffffffffffffffffffffffff8716600090815260056020526040902054879060ff1615611206576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f43616e6e6f742063616c6c206f776e656420636f6e747261637400000000000060448201526064016105ba565b8985856020811015611274576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601b60248201527f526573706f6e7365206d757374206265203e203332206279746573000000000060448201526064016105ba565b81358381146112df576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601c60248201527f466972737420776f7264206d757374206265207265717565737449640000000060448201526064016105ba565b6112ee8e8e8e8e8e60026129be565b6040518e907f9e9bc7616d42c2835d05ae617e508454e63b30b934be8aa932ebc125e0e58a6490600090a262061a805a1015611386576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f4d7573742070726f7669646520636f6e73756d657220656e6f7567682067617360448201526064016105ba565b60008c73ffffffffffffffffffffffffffffffffffffffff168c8b8b6040516020016113b4939291906138c5565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0818403018152908290526113ec916138a9565b6000604051808303816000865af19150503d8060008114611429576040519150601f19603f3d011682016040523d82523d6000602084013e61142e565b606091505b509098505050505050505050979650505050505050565b821580159061145357508281145b6114b9576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f496e76616c6964206172726179206c656e67746828732900000000000000000060448201526064016105ba565b3460005b848110156116195760008484838181106114d9576114d961372f565b90506020020135905080836114ee9190613901565b925060008787848181106115045761150461372f565b905060200201602081019061151991906136df565b73ffffffffffffffffffffffffffffffffffffffff168260405160006040518083038185875af1925050503d8060008114611570576040519150601f19603f3d011682016040523d82523d6000602084013e611575565b606091505b5050905080611606576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603a60248201527f416464726573733a20756e61626c6520746f2073656e642076616c75652c207260448201527f6563697069656e74206d6179206861766520726576657274656400000000000060648201526084016105ba565b5050806116129061378d565b90506114bd565b508015610965576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601160248201527f546f6f206d756368204554482073656e7400000000000000000000000000000060448201526064016105ba565b6040805160208082018690527fffffffffffffffffffffffffffffffffffffffff0000000000000000000000003360601b16828401527fffffffff00000000000000000000000000000000000000000000000000000000851660548301526058808301859052835180840390910181526078909201909252805191012060009060008681526004602052604090205490915060081b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00908116908216146117a5576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601e60248201527f506172616d7320646f206e6f74206d617463682072657175657374204944000060448201526064016105ba565b4282111561180f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f52657175657374206973206e6f7420657870697265640000000000000000000060448201526064016105ba565b6000858152600460205260408082208290555186917fa7842b9ec549398102c0d91b1b9919b2f20558aefdadf57528a95c6cd3292e9391a26040517fa9059cbb000000000000000000000000000000000000000000000000000000008152336004820152602481018590527f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff169063a9059cbb906044016020604051808303816000875af11580156118da573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118fe919061391a565b505050505050565b60035473ffffffffffffffffffffffffffffffffffffffff163314611987576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4d7573742062652070726f706f736564206f776e65720000000000000000000060448201526064016105ba565b600280547fffffffffffffffffffffffff00000000000000000000000000000000000000008082163390811790935560038054909116905560405173ffffffffffffffffffffffffffffffffffffffff909116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a350565b6000611a116125e4565b8380611a1b612bb6565b1015611aa9576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603560248201527f416d6f756e74207265717565737465642069732067726561746572207468616e60448201527f20776974686472617761626c652062616c616e6365000000000000000000000060648201526084016105ba565b6040517f4000aea000000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001690634000aea090611b2190899089908990899060040161393c565b6020604051808303816000875af1158015611b40573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611b64919061391a565b9695505050505050565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614611c0d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f4d75737420757365204c494e4b20746f6b656e0000000000000000000000000060448201526064016105ba565b60208101518190611c1e8183612c7f565b84602484015283604484015260003073ffffffffffffffffffffffffffffffffffffffff1684604051611c5191906138a9565b600060405180830381855af49150503d8060008114611c8c576040519150601f19603f3d011682016040523d82523d6000602084013e611c91565b606091505b50509050806118fe576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601860248201527f556e61626c6520746f206372656174652072657175657374000000000000000060448201526064016105ba565b604080513360601b7fffffffffffffffffffffffffffffffffffffffff0000000000000000000000001660208083018290526034808401899052845180850390910181526054840185528051908201206074840188905260948401929092527fffffffff00000000000000000000000000000000000000000000000000000000861660a884015260ac8084018690528451808503909101815260cc9093019093528151919092012060009060008381526004602052604090205490915060081b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0090811690821614611e4a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601e60248201527f506172616d7320646f206e6f74206d617463682072657175657374204944000060448201526064016105ba565b42831115611eb4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f52657175657374206973206e6f7420657870697265640000000000000000000060448201526064016105ba565b6000828152600460205260408082208290555183917fa7842b9ec549398102c0d91b1b9919b2f20558aefdadf57528a95c6cd3292e9391a26040517fa9059cbb000000000000000000000000000000000000000000000000000000008152336004820152602481018690527f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff169063a9059cbb906044016020604051808303816000875af1158015611f7f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611fa3919061391a565b50505050505050565b611fb461258f565b61201a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f43616e6e6f742073657420617574686f72697a65642073656e6465727300000060448201526064016105ba565b80612081576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601b60248201527f4d7573742068617665206174206c6561737420312073656e646572000000000060448201526064016105ba565b60015460005b81811015612116576000806000600184815481106120a7576120a761372f565b60009182526020808320919091015473ffffffffffffffffffffffffffffffffffffffff168352820192909252604001902080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001691151591909117905561210f8161378d565b9050612087565b5060005b8281101561226c576000808585848181106121375761213761372f565b905060200201602081019061214c91906136df565b73ffffffffffffffffffffffffffffffffffffffff16815260208101919091526040016000205460ff16156121dd576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601f60248201527f4d757374206e6f742068617665206475706c69636174652073656e646572730060448201526064016105ba565b60016000808686858181106121f4576121f461372f565b905060200201602081019061220991906136df565b73ffffffffffffffffffffffffffffffffffffffff168152602081019190915260400160002080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00169115159190911790556122658161378d565b905061211a565b5061227960018484612f88565b507ff263cfb3e4298332e776194610cf9fdc09ccb3ada8b9aa39764d882e11fbf0a08383336040516122ad939291906139c8565b60405180910390a1505050565b6122c26125e4565b6122cb81612dfb565b50565b6122d66125e4565b80806122e0612bb6565b101561236e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603560248201527f416d6f756e74207265717565737465642069732067726561746572207468616e60448201527f20776974686472617761626c652062616c616e6365000000000000000000000060648201526084016105ba565b6040517fa9059cbb00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff8481166004830152602482018490527f0000000000000000000000000000000000000000000000000000000000000000169063a9059cbb906044016020604051808303816000875af1158015612403573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612427919061391a565b61074e5761074e613a02565b61243b61258f565b6124a1576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f43616e6e6f742073657420617574686f72697a65642073656e6465727300000060448201526064016105ba565b7f1bb185903e2cb2f1b303523128b60e314dea81df4f8d9b7351cadd344f6e772784848484336040516124d8959493929190613a31565b60405180910390a160005b83811015610965578484828181106124fd576124fd61372f565b905060200201602081019061251291906136df565b73ffffffffffffffffffffffffffffffffffffffff1663ee56997b84846040518363ffffffff1660e01b815260040161254c929190613a81565b600060405180830381600087803b15801561256657600080fd5b505af115801561257a573d6000803e3d6000fd5b50505050806125889061378d565b90506124e3565b3360009081526020819052604081205460ff16806110405750336125c860025473ffffffffffffffffffffffffffffffffffffffff1690565b73ffffffffffffffffffffffffffffffffffffffff1614905090565b60025473ffffffffffffffffffffffffffffffffffffffff163314612665576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e65720000000000000000000060448201526064016105ba565b565b600080857f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1603612720576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f43616e6e6f742063616c6c20746f204c494e4b0000000000000000000000000060448201526064016105ba565b6040517fffffffffffffffffffffffffffffffffffffffff00000000000000000000000060608b901b16602082015260348101869052605401604080518083037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe001815291815281516020928301206000818152600490935291205490935060081b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00161561282b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601460248201527f4d75737420757365206120756e6971756520494400000000000000000000000060448201526064016105ba565b61283761012c42613a9d565b6040805160208082018c90527fffffffffffffffffffffffffffffffffffffffff00000000000000000000000060608c901b16828401527fffffffff000000000000000000000000000000000000000000000000000000008a1660548301526058808301859052835180840390910181526078909201909252805191012090925060405180604001604052808260ff191681526020016128d687612ef1565b60ff9081169091526000868152600460209081526040909120835193909101519091167f01000000000000000000000000000000000000000000000000000000000000000260089290921c919091179055600654612935908a90613a9d565b6006555050965096945050505050565b3360009081526020819052604090205460ff16612665576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601560248201527f4e6f7420617574686f72697a65642073656e646572000000000000000000000060448201526064016105ba565b6040805160208082018890527fffffffffffffffffffffffffffffffffffffffff000000000000000000000000606088901b16828401527fffffffff00000000000000000000000000000000000000000000000000000000861660548301526058808301869052835180840390910181526078909201909252805191012060009060008881526004602052604090205490915060081b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0090811690821614612ae2576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601e60248201527f506172616d7320646f206e6f74206d617463682072657175657374204944000060448201526064016105ba565b612aeb82612ef1565b60008881526004602052604090205460ff9182167f01000000000000000000000000000000000000000000000000000000000000009091049091161115612b8e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601860248201527f446174612076657273696f6e73206d757374206d61746368000000000000000060448201526064016105ba565b85600654612b9c9190613901565b600655505050600093845250506004602052506040812055565b60006001600654612bc79190613901565b6040517f70a082310000000000000000000000000000000000000000000000000000000081523060048201527f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff16906370a0823190602401602060405180830381865afa158015612c51573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612c759190613ab0565b6110409190613901565b612c8b60026020613ac9565b612c96906004613a9d565b81511015612d00576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f496e76616c69642072657175657374206c656e6774680000000000000000000060448201526064016105ba565b7fffffffff0000000000000000000000000000000000000000000000000000000082167f3c6d41b9000000000000000000000000000000000000000000000000000000001480612d9157507fffffffff0000000000000000000000000000000000000000000000000000000082167f4042994600000000000000000000000000000000000000000000000000000000145b612df7576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601e60248201527f4d757374207573652077686974656c69737465642066756e6374696f6e73000060448201526064016105ba565b5050565b3373ffffffffffffffffffffffffffffffffffffffff821603612e7a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c6600000000000000000060448201526064016105ba565b600380547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff838116918217909255600254604051919216907fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae127890600090a350565b600060ff821115612f84576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602560248201527f53616665436173743a2076616c756520646f65736e27742066697420696e203860448201527f206269747300000000000000000000000000000000000000000000000000000060648201526084016105ba565b5090565b828054828255906000526020600020908101928215613000579160200282015b828111156130005781547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff843516178255602090920191600190910190612fa8565b50612f849291505b80821115612f845760008155600101613008565b60008083601f84011261302e57600080fd5b50813567ffffffffffffffff81111561304657600080fd5b6020830191508360208260051b850101111561306157600080fd5b9250929050565b6000806020838503121561307b57600080fd5b823567ffffffffffffffff81111561309257600080fd5b61309e8582860161301c565b90969095509350505050565b73ffffffffffffffffffffffffffffffffffffffff811681146122cb57600080fd5b60008083601f8401126130de57600080fd5b50813567ffffffffffffffff8111156130f657600080fd5b60208301915083602082850101111561306157600080fd5b60008060006040848603121561312357600080fd5b833561312e816130aa565b9250602084013567ffffffffffffffff81111561314a57600080fd5b613156868287016130cc565b9497909650939450505050565b60005b8381101561317e578181015183820152602001613166565b50506000910152565b60208152600082518060208401526131a6816040850160208701613163565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169190910160400192915050565b6020808252825182820181905260009190848201906040850190845b8181101561322657835173ffffffffffffffffffffffffffffffffffffffff16835292840192918401916001016131f4565b50909695505050505050565b80357fffffffff000000000000000000000000000000000000000000000000000000008116811461326257600080fd5b919050565b60008060008060008060008060e0898b03121561328357600080fd5b883561328e816130aa565b975060208901359650604089013595506132aa60608a01613232565b94506080890135935060a0890135925060c089013567ffffffffffffffff8111156132d457600080fd5b6132e08b828c016130cc565b999c989b5096995094979396929594505050565b60008060006040848603121561330957600080fd5b833567ffffffffffffffff81111561332057600080fd5b61332c8682870161301c565b9094509250506020840135613340816130aa565b809150509250925092565b60008060008060008060008060006101008a8c03121561336a57600080fd5b8935613375816130aa565b985060208a0135975060408a0135965060608a0135613393816130aa565b95506133a160808b01613232565b945060a08a0135935060c08a0135925060e08a013567ffffffffffffffff8111156133cb57600080fd5b6133d78c828d016130cc565b915080935050809150509295985092959850929598565b60008060008060008060c0878903121561340757600080fd5b86359550602087013594506040870135613420816130aa565b935061342e60608801613232565b92506080870135915060a087013590509295509295509295565b6000806000806040858703121561345e57600080fd5b843567ffffffffffffffff8082111561347657600080fd5b6134828883890161301c565b9096509450602087013591508082111561349b57600080fd5b506134a88782880161301c565b95989497509550505050565b600080600080600080600060c0888a0312156134cf57600080fd5b873596506020880135955060408801356134e8816130aa565b94506134f660608901613232565b93506080880135925060a088013567ffffffffffffffff81111561351957600080fd5b6135258a828b016130cc565b989b979a50959850939692959293505050565b6000806000806080858703121561354e57600080fd5b843593506020850135925061356560408601613232565b9396929550929360600135925050565b6000806000806060858703121561358b57600080fd5b8435613596816130aa565b935060208501359250604085013567ffffffffffffffff8111156135b957600080fd5b6134a8878288016130cc565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b60008060006060848603121561360957600080fd5b8335613614816130aa565b925060208401359150604084013567ffffffffffffffff8082111561363857600080fd5b818601915086601f83011261364c57600080fd5b81358181111561365e5761365e6135c5565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0908116603f011681019083821181831017156136a4576136a46135c5565b816040528281528960208487010111156136bd57600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b6000602082840312156136f157600080fd5b81356136fc816130aa565b9392505050565b6000806040838503121561371657600080fd5b8235613721816130aa565b946020939093013593505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82036137be576137be61375e565b5060010190565b8183823760009101908152919050565b8183528181602085013750600060208284010152600060207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f840116840101905092915050565b600061010073ffffffffffffffffffffffffffffffffffffffff808d1684528b60208501528a6040850152808a166060850152507fffffffff00000000000000000000000000000000000000000000000000000000881660808401528660a08401528560c08401528060e084015261389981840185876137d5565b9c9b505050505050505050505050565b600082516138bb818460208701613163565b9190910192915050565b7fffffffff0000000000000000000000000000000000000000000000000000000084168152818360048301376000910160040190815292915050565b818103818111156139145761391461375e565b92915050565b60006020828403121561392c57600080fd5b815180151581146136fc57600080fd5b73ffffffffffffffffffffffffffffffffffffffff85168152836020820152606060408201526000611b646060830184866137d5565b8183526000602080850194508260005b858110156139bd578135613995816130aa565b73ffffffffffffffffffffffffffffffffffffffff1687529582019590820190600101613982565b509495945050505050565b6040815260006139dc604083018587613972565b905073ffffffffffffffffffffffffffffffffffffffff83166020830152949350505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052600160045260246000fd5b606081526000613a45606083018789613972565b8281036020840152613a58818688613972565b91505073ffffffffffffffffffffffffffffffffffffffff831660408301529695505050505050565b602081526000613a95602083018486613972565b949350505050565b808201808211156139145761391461375e565b600060208284031215613ac257600080fd5b5051919050565b80820281158282048414176139145761391461375e56fea164736f6c6343000813000a",
 }
 
 var OperatorABI = OperatorMetaData.ABI
diff --git a/core/gethwrappers/generation/generated-wrapper-dependency-versions-do-not-edit.txt b/core/gethwrappers/generation/generated-wrapper-dependency-versions-do-not-edit.txt
index 6efc75fce98..1db18d8366d 100644
--- a/core/gethwrappers/generation/generated-wrapper-dependency-versions-do-not-edit.txt
+++ b/core/gethwrappers/generation/generated-wrapper-dependency-versions-do-not-edit.txt
@@ -46,8 +46,8 @@ mock_ethlink_aggregator_wrapper: ../../contracts/solc/v0.6/MockETHLINKAggregator
 mock_gas_aggregator_wrapper: ../../contracts/solc/v0.6/MockGASAggregator/MockGASAggregator.abi ../../contracts/solc/v0.6/MockGASAggregator/MockGASAggregator.bin bacbb1ea4dc6beac0db8a13ca5c75e2fd61b903d70feea9b3b1c8b10fe8df4f3
 multiwordconsumer_wrapper: ../../contracts/solc/v0.7/MultiWordConsumer/MultiWordConsumer.abi ../../contracts/solc/v0.7/MultiWordConsumer/MultiWordConsumer.bin 6e68abdf614e3ed0f5066c1b5f9d7c1199f1e7c5c5251fe8a471344a59afc6ba
 offchain_aggregator_wrapper: OffchainAggregator/OffchainAggregator.abi - 5c8d6562e94166d4790f1ee6e4321d359d9f7262e6c5452a712b1f1c896f45cf
-operator_factory: ../../contracts/solc/v0.8.19/OperatorFactory/OperatorFactory.abi ../../contracts/solc/v0.8.19/OperatorFactory/OperatorFactory.bin 0fdfacf8879537b854875608dfca41c6221c342174417112acaa67dfcadafddc
-operator_wrapper: ../../contracts/solc/v0.8.19/Operator/Operator.abi ../../contracts/solc/v0.8.19/Operator/Operator.bin d7abd0e67f30a3a4c9c04c896124391306fa364fcf579fa6df04dbf912b48568
+operator_factory: ../../contracts/solc/v0.8.19/OperatorFactory/OperatorFactory.abi ../../contracts/solc/v0.8.19/OperatorFactory/OperatorFactory.bin 357203fabe3df436eb015e2d5094374c6967a9fc922ac8edc265b27aac4d67cf
+operator_wrapper: ../../contracts/solc/v0.8.19/Operator/Operator.abi ../../contracts/solc/v0.8.19/Operator/Operator.bin c5e1db81070d940a82ef100b0bce38e055593cbeebbc73abf9d45c30d6020cd2
 oracle_wrapper: ../../contracts/solc/v0.6/Oracle/Oracle.abi ../../contracts/solc/v0.6/Oracle/Oracle.bin 7af2fbac22a6e8c2847e8e685a5400cac5101d72ddf5365213beb79e4dede43a
 perform_data_checker_wrapper: ../../contracts/solc/v0.8.16/PerformDataChecker/PerformDataChecker.abi ../../contracts/solc/v0.8.16/PerformDataChecker/PerformDataChecker.bin 48d8309c2117c29a24e1155917ab0b780956b2cd6a8a39ef06ae66a7f6d94f73
 simple_log_upkeep_counter_wrapper: ../../contracts/solc/v0.8.6/SimpleLogUpkeepCounter/SimpleLogUpkeepCounter.abi ../../contracts/solc/v0.8.6/SimpleLogUpkeepCounter/SimpleLogUpkeepCounter.bin 0a7a0cc4da7dc2a3d0a0c36c746b1adc044af5cad1838367356a0604f3255a01

From 2ae33d94bf1f744c84745156534f57ef70785c07 Mon Sep 17 00:00:00 2001
From: Dylan Tinianov <dylantinianov@gmail.com>
Date: Wed, 6 Dec 2023 10:55:57 -0500
Subject: [PATCH 087/130] Create auto update workflow (#11483)

* Create auto-update.yml

* Ignore merge conflicts
---
 .github/workflows/auto-update.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .github/workflows/auto-update.yml

diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml
new file mode 100644
index 00000000000..963145c4049
--- /dev/null
+++ b/.github/workflows/auto-update.yml
@@ -0,0 +1,17 @@
+name: Auto Update
+on:
+  push:
+    branches:
+      - develop
+jobs:
+  autoupdate:
+    name: Auto Update
+    runs-on: ubuntu-latest
+    steps:
+      - uses: docker://chinthakagodawita/autoupdate-action:v1
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          PR_FILTER: "labelled"
+          PR_LABELS: "auto-update"
+          MERGE_MSG: "Branch was auto-updated."
+          MERGE_CONFLICT_ACTION: "ignore"

From 624c6d65e12b243c1c13a4340773fe7a9da5b904 Mon Sep 17 00:00:00 2001
From: Tate <tate.exon@smartcontract.com>
Date: Wed, 6 Dec 2023 09:20:53 -0700
Subject: [PATCH 088/130] [TT-744] Bump core results output filter (#11486)

* [TT-755] Bump core results output filter

* bump to merged action version
---
 .github/workflows/ci-core.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-core.yml b/.github/workflows/ci-core.yml
index fd8dfed88ab..bac6f763892 100644
--- a/.github/workflows/ci-core.yml
+++ b/.github/workflows/ci-core.yml
@@ -84,7 +84,7 @@ jobs:
         run: ./tools/bin/${{ matrix.cmd }} ./...
       - name: Print Filtered Test Results
         if: ${{ failure() && matrix.cmd == 'go_core_tests' }}
-        uses: smartcontractkit/chainlink-github-actions/go/go-test-results-parsing@e865e376b8c2d594028c8d645dd6c47169b72974 # v2.2.16
+        uses: smartcontractkit/chainlink-github-actions/go/go-test-results-parsing@a052942591aaa12716eb9835b490d812a77d0831 # v2.3.1
         with:
           results-file: ./output.txt
           output-file: ./output-short.txt

From 7f5ce410c66f9e28ac9080b9e729daa465b009ab Mon Sep 17 00:00:00 2001
From: Domino Valdano <2644901+reductionista@users.noreply.github.com>
Date: Wed, 6 Dec 2023 09:20:41 -0800
Subject: [PATCH 089/130] Interfaces and skeleton methods for ChainReader EVM
 POC (#10990)

* Implement skeleton interfaces, structs, & methods for ChainReader EVM POC

- Read ChainReader config in from RelayConfig
- Add some initialization and validation relay skeletons

- Use medianProviderWrapper instead of passing medianContract separately

This avoids us having to modify the signature of NewMedianFactory, which
would require further modifications to all non-evm repos and chainlink-relay

- Add chain_reader_test.go with some basic relay tests

Co-authored-by: Jordan Krage <jmank88@gmail.com>

- Add chain reader config validation
- Add chain reader config validation tests
- Add config for chain reader median contract to cr validation testcases
- Add unimplemented Encode(), Decode(), GetMaxEncodingSize(), GetMaxDecodingSize()
- Add ChainReader() method to mock provider for plugin test
- Rename relaymercury.ChainReader to MercuryChainReader, resolve name collisions
- Add tests for errors during ChainReader construction
- Propagate InvalidConfig & any other errors back to client

We should ignore Unimplemented until node ops have been given ample time to migrate to the new job spec
(including a section for ChainReader config) so that we can remove the old product-specific
MedianContract component from MedianProvider. All other errors we can immediately start passing back
to the client, letting the core node decide how to handle them (eg. displaying an "invalid job spec"
message to the UI if the RelayConfig was invalid or the ContractID missing)

* Update relay versions

* Simplify chain reader config validation

* Update commit hashes one final time now that all relays are merged.

---------

Co-authored-by: ilija <pavlovicilija42@gmail.com>
---
 core/scripts/go.mod                           |   9 +-
 core/scripts/go.sum                           |  18 +-
 core/services/chainlink/relayer_factory.go    |   3 +-
 core/services/functions/listener.go           |   1 +
 .../services/ocr2/plugins/functions/plugin.go |   1 +
 core/services/ocr2/plugins/median/plugin.go   |  68 +++++
 core/services/ocr2/plugins/median/services.go |  83 +++++-
 core/services/ocr2/plugins/mercury/plugin.go  |   2 +-
 .../plugins/ocr2keeper/integration_21_test.go |   1 -
 core/services/ocr2/plugins/ocr2keeper/util.go |   1 -
 core/services/relay/evm/chain_reader.go       | 154 ++++++++++
 core/services/relay/evm/chain_reader_test.go  | 272 ++++++++++++++++++
 core/services/relay/evm/config_poller.go      |   1 +
 core/services/relay/evm/evm.go                |  34 ++-
 core/services/relay/evm/functions.go          |   5 +
 .../relay/evm/functions/logpoller_wrapper.go  |   1 +
 .../evm/functions/offchain_config_digester.go |   8 +-
 core/services/relay/evm/median_test.go        |  47 +++
 .../relay/evm/mercury/v1/data_source.go       |   9 +-
 .../relay/evm/mercury/v1/data_source_test.go  |  26 +-
 core/services/relay/evm/mercury_provider.go   |  54 ++--
 core/services/relay/evm/ocr2keeper.go         |   4 +
 core/services/relay/evm/ocr2vrf.go            |   8 +
 core/services/relay/evm/types/types.go        |  35 ++-
 .../relay/grpc_provider_server_test.go        |   3 +-
 core/services/relay/relay_test.go             |   1 +
 go.mod                                        |   9 +-
 go.sum                                        |  18 +-
 integration-tests/docker/test_env/test_env.go |  18 +-
 integration-tests/go.mod                      |   9 +-
 integration-tests/go.sum                      |  18 +-
 plugins/medianpoc/plugin_test.go              |   7 +-
 32 files changed, 828 insertions(+), 100 deletions(-)
 create mode 100644 core/services/ocr2/plugins/median/plugin.go
 create mode 100644 core/services/relay/evm/chain_reader.go
 create mode 100644 core/services/relay/evm/chain_reader_test.go
 create mode 100644 core/services/relay/evm/median_test.go

diff --git a/core/scripts/go.mod b/core/scripts/go.mod
index 91e26caef69..b0b5f801ed5 100644
--- a/core/scripts/go.mod
+++ b/core/scripts/go.mod
@@ -119,6 +119,7 @@ require (
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/gin-gonic/gin v1.9.1 // indirect
 	github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
+	github.com/go-json-experiment/json v0.0.0-20231102232822-2e55bd4e08b0 // indirect
 	github.com/go-kit/kit v0.12.0 // indirect
 	github.com/go-kit/log v0.2.1 // indirect
 	github.com/go-ldap/ldap/v3 v3.4.5 // indirect
@@ -257,12 +258,12 @@ require (
 	github.com/shirou/gopsutil/v3 v3.23.10 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231204152334-1f32103bbb4c // indirect
-	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 // indirect
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231205033838-dfac15e672d4 // indirect
+	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231206164210-03f8b219402e // indirect
 	github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 // indirect
 	github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d // indirect
-	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3 // indirect
-	github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664 // indirect
+	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231206154215-ec1718b7df3e // indirect
+	github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231205180940-ea2e3e916725 // indirect
 	github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 // indirect
 	github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1 // indirect
 	github.com/smartcontractkit/wsrpc v0.7.2 // indirect
diff --git a/core/scripts/go.sum b/core/scripts/go.sum
index 1622f1d24df..dd69053b405 100644
--- a/core/scripts/go.sum
+++ b/core/scripts/go.sum
@@ -443,6 +443,8 @@ github.com/go-faster/errors v0.6.1/go.mod h1:5MGV2/2T9yvlrbhe9pD9LO5Z/2zCSq2T8j+
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-json-experiment/json v0.0.0-20231102232822-2e55bd4e08b0 h1:ymLjT4f35nQbASLnvxEde4XOBL+Sn7rFuV+FOJqkljg=
+github.com/go-json-experiment/json v0.0.0-20231102232822-2e55bd4e08b0/go.mod h1:6daplAwHHGbUGib4990V3Il26O0OC4aRyvewaaAihaA=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.12.0 h1:e4o3o3IsBfAKQh5Qbbiqyfu97Ku7jrO/JbohvztANh4=
@@ -1212,18 +1214,18 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
 github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
 github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231204152334-1f32103bbb4c h1:YFyo0pCmKkpB4EOSykCZFueRXNxQ7OhKiCnhoVIzydo=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231204152334-1f32103bbb4c/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
-github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 h1:oewYJtdRkJKUHCNDCj5C2LQe6Oq6qy975g931nfG0cc=
-github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542/go.mod h1:EpvRoycRD+kniYlz+pCpRT5e+fmPm0mSD/vmND+0oMg=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231205033838-dfac15e672d4 h1:2LC5HtHkAm7I1h5j4Uz0KTX+h4fo4z/5NoAARSF4ZVA=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231205033838-dfac15e672d4/go.mod h1:IdlfCN9rUs8Q/hrOYe8McNBIwEOHEsi0jilb3Cw77xs=
+github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231206164210-03f8b219402e h1:xvqffqFec2HkEcUKrCkm4FDJRnn/+gHmvrE/dz3Zlw8=
+github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231206164210-03f8b219402e/go.mod h1:soVgcl4CbfR6hC9UptjuCQhz19HJaFEjwnOpiySkxg0=
 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ=
 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1/go.mod h1:GuPvyXryvbiUZIHmPeLBz4L+yJKeyGUjrDfd1KNne+o=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d h1:w4MsbOtNk6nD/mcXLstHWk9hB6g7QLtcAfhPjhwvOaQ=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d/go.mod h1:YPAfLNowdBwiKiYOwgwtbJHi8AJWbcxkbOY0ItAvkfc=
-github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3 h1:DudPr8ZNMEVgDwHBvnrpvK96JrGcGCG+LLBnlqaPGnE=
-github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3/go.mod h1:UfW7/PZKon+iDEHtrHOfvMnS5GfYOW/SdMZ6P97rPEk=
-github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664 h1:yxaHuDTtj2xxtsR8b+LJw8xDvyr6v/F6GP3InsP4wPI=
-github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664/go.mod h1:3Fa+HQTZ3R3fPC0hUqugvoo+NEeo8Y4J2WOnQfi7O34=
+github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231206154215-ec1718b7df3e h1:/tCHhoAJM+ittEHPZTtJsAgXmYujKiDW0ub9HXW9qtY=
+github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231206154215-ec1718b7df3e/go.mod h1:9YIi413QRRytafTzpWm+Z+5NWBNxSqokhKyeEZ3ynlA=
+github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231205180940-ea2e3e916725 h1:NbhPVwxx+53WN/Uld1V6c4iLgoGvUYFOsVd2kfcexe8=
+github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231205180940-ea2e3e916725/go.mod h1:vHrPBipRL52NdPp77KXNU2k1IoCUa1B33N9otZQPYko=
 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 h1:FFdvEzlYwcuVHkdZ8YnZR/XomeMGbz5E2F2HZI3I3w8=
 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868/go.mod h1:Kn1Hape05UzFZ7bOUnm3GVsHzP0TNrVmpfXYNHdqGGs=
 github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306 h1:ko88+ZznniNJZbZPWAvHQU8SwKAdHngdDZ+pvVgB5ss=
diff --git a/core/services/chainlink/relayer_factory.go b/core/services/chainlink/relayer_factory.go
index 8b8749013fc..4ed73d8e53b 100644
--- a/core/services/chainlink/relayer_factory.go
+++ b/core/services/chainlink/relayer_factory.go
@@ -5,9 +5,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/pelletier/go-toml/v2"
-
 	"github.com/jmoiron/sqlx"
+	"github.com/pelletier/go-toml/v2"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/loop"
 	"github.com/smartcontractkit/chainlink-cosmos/pkg/cosmos"
diff --git a/core/services/functions/listener.go b/core/services/functions/listener.go
index 65c364adb7c..f9d74f1bae9 100644
--- a/core/services/functions/listener.go
+++ b/core/services/functions/listener.go
@@ -16,6 +16,7 @@ import (
 	"github.com/smartcontractkit/libocr/commontypes"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+
 	"github.com/smartcontractkit/chainlink/v2/core/cbor"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
diff --git a/core/services/ocr2/plugins/functions/plugin.go b/core/services/ocr2/plugins/functions/plugin.go
index 2ebd7e30805..61fa7f5d825 100644
--- a/core/services/ocr2/plugins/functions/plugin.go
+++ b/core/services/ocr2/plugins/functions/plugin.go
@@ -14,6 +14,7 @@ import (
 	libocr2 "github.com/smartcontractkit/libocr/offchainreporting2plus"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/assets"
+
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
diff --git a/core/services/ocr2/plugins/median/plugin.go b/core/services/ocr2/plugins/median/plugin.go
new file mode 100644
index 00000000000..cad2099832d
--- /dev/null
+++ b/core/services/ocr2/plugins/median/plugin.go
@@ -0,0 +1,68 @@
+package median
+
+import (
+	"context"
+
+	"github.com/smartcontractkit/libocr/offchainreporting2/reportingplugin/median"
+	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
+
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/loop"
+	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/types"
+)
+
+type Plugin struct {
+	loop.Plugin
+	stop services.StopChan
+}
+
+func NewPlugin(lggr logger.Logger) *Plugin {
+	return &Plugin{Plugin: loop.Plugin{Logger: lggr}, stop: make(services.StopChan)}
+}
+
+func (p *Plugin) NewMedianFactory(ctx context.Context, provider types.MedianProvider, dataSource, juelsPerFeeCoin median.DataSource, errorLog loop.ErrorLog) (loop.ReportingPluginFactory, error) {
+	var ctxVals loop.ContextValues
+	ctxVals.SetValues(ctx)
+	lggr := logger.With(p.Logger, ctxVals.Args()...)
+
+	factory := median.NumericalMedianFactory{
+		ContractTransmitter:       provider.MedianContract(),
+		DataSource:                dataSource,
+		JuelsPerFeeCoinDataSource: juelsPerFeeCoin,
+		Logger: logger.NewOCRWrapper(lggr, true, func(msg string) {
+			ctx, cancelFn := p.stop.NewCtx()
+			defer cancelFn()
+			if err := errorLog.SaveError(ctx, msg); err != nil {
+				lggr.Errorw("Unable to save error", "err", msg)
+			}
+		}),
+		OnchainConfigCodec: provider.OnchainConfigCodec(),
+		ReportCodec:        provider.ReportCodec(),
+	}
+	s := &reportingPluginFactoryService{lggr: logger.Named(lggr, "ReportingPluginFactory"), ReportingPluginFactory: factory}
+
+	p.SubService(s)
+
+	return s, nil
+}
+
+type reportingPluginFactoryService struct {
+	services.StateMachine
+	lggr logger.Logger
+	ocrtypes.ReportingPluginFactory
+}
+
+func (r *reportingPluginFactoryService) Name() string { return r.lggr.Name() }
+
+func (r *reportingPluginFactoryService) Start(ctx context.Context) error {
+	return r.StartOnce("ReportingPluginFactory", func() error { return nil })
+}
+
+func (r *reportingPluginFactoryService) Close() error {
+	return r.StopOnce("ReportingPluginFactory", func() error { return nil })
+}
+
+func (r *reportingPluginFactoryService) HealthReport() map[string]error {
+	return map[string]error{r.Name(): r.Healthy()}
+}
diff --git a/core/services/ocr2/plugins/median/services.go b/core/services/ocr2/plugins/median/services.go
index 2d1ef720545..4adfc306d64 100644
--- a/core/services/ocr2/plugins/median/services.go
+++ b/core/services/ocr2/plugins/median/services.go
@@ -5,9 +5,14 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"math/big"
 	"time"
 
+	"github.com/ethereum/go-ethereum/common"
 	libocr "github.com/smartcontractkit/libocr/offchainreporting2plus"
+	ocr2types "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
+
+	mediantypes "github.com/smartcontractkit/libocr/offchainreporting2/reportingplugin/median"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/loop"
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
@@ -52,6 +57,21 @@ func (m *medianConfig) JobPipelineResultWriteQueueDepth() uint64 {
 	return m.jobPipelineResultWriteQueueDepth
 }
 
+// This wrapper avoids the need to modify the signature of NewMedianFactory in all of the non-evm
+// relay repos as well as its primary definition in chainlink-common. Once ChainReader is implemented
+// and working on all 4 blockchain families, we can remove the original MedianContract() method from
+// MedianProvider and pass medianContract as a separate param to NewMedianFactory
+type medianProviderWrapper struct {
+	types.MedianProvider
+	contract mediantypes.MedianContract
+}
+
+// Override relay's implementation of MedianContract with product plugin's implementation of
+// MedianContract, making use of product-agnostic ChainReader to read the contract instead of relay MedianContract
+func (m medianProviderWrapper) MedianContract() mediantypes.MedianContract {
+	return m.contract
+}
+
 func NewMedianServices(ctx context.Context,
 	jb job.Job,
 	isNewlyCreatedJob bool,
@@ -125,11 +145,24 @@ func NewMedianServices(ctx context.Context,
 		CreatedAt:    time.Now(),
 	}, lggr)
 
-	if cmdName := env.MedianPluginCmd.Get(); cmdName != "" {
+	medianPluginCmd := env.MedianPluginCmd.Get()
+	medianLoopEnabled := medianPluginCmd != ""
+
+	// TODO BCF-2821 handle this properly as this blocks Solana chain reader dev
+	if !medianLoopEnabled && medianProvider.ChainReader() != nil {
+		lggr.Info("Chain Reader enabled")
+		medianProvider = medianProviderWrapper{
+			medianProvider, // attach newer MedianContract which uses ChainReader
+			newMedianContract(provider.ChainReader(), common.HexToAddress(spec.ContractID)),
+		}
+	} else {
+		lggr.Info("Chain Reader disabled")
+	}
 
+	if medianLoopEnabled {
 		// use unique logger names so we can use it to register a loop
 		medianLggr := lggr.Named("Median").Named(spec.ContractID).Named(spec.GetID())
-		cmdFn, telem, err2 := cfg.RegisterLOOP(medianLggr.Name(), cmdName)
+		cmdFn, telem, err2 := cfg.RegisterLOOP(medianLggr.Name(), medianPluginCmd)
 		if err2 != nil {
 			err = fmt.Errorf("failed to register loop: %w", err2)
 			abort()
@@ -159,3 +192,49 @@ func NewMedianServices(ctx context.Context,
 	}
 	return
 }
+
+type medianContract struct {
+	chainReader types.ChainReader
+	contract    types.BoundContract
+}
+
+type latestTransmissionDetailsResponse struct {
+	configDigest    ocr2types.ConfigDigest
+	epoch           uint32
+	round           uint8
+	latestAnswer    *big.Int
+	latestTimestamp time.Time
+}
+
+type latestRoundRequested struct {
+	configDigest ocr2types.ConfigDigest
+	epoch        uint32
+	round        uint8
+}
+
+func (m *medianContract) LatestTransmissionDetails(ctx context.Context) (configDigest ocr2types.ConfigDigest, epoch uint32, round uint8, latestAnswer *big.Int, latestTimestamp time.Time, err error) {
+	var resp latestTransmissionDetailsResponse
+
+	err = m.chainReader.GetLatestValue(ctx, m.contract, "LatestTransmissionDetails", nil, &resp)
+	if err != nil {
+		return
+	}
+
+	return resp.configDigest, resp.epoch, resp.round, resp.latestAnswer, resp.latestTimestamp, err
+}
+
+func (m *medianContract) LatestRoundRequested(ctx context.Context, lookback time.Duration) (configDigest ocr2types.ConfigDigest, epoch uint32, round uint8, err error) {
+	var resp latestRoundRequested
+
+	err = m.chainReader.GetLatestValue(ctx, m.contract, "LatestRoundReported", map[string]string{}, &resp)
+	if err != nil {
+		return
+	}
+
+	return resp.configDigest, resp.epoch, resp.round, err
+}
+
+func newMedianContract(chainReader types.ChainReader, address common.Address) *medianContract {
+	contract := types.BoundContract{Address: address.String(), Name: "median", Pending: true}
+	return &medianContract{chainReader, contract}
+}
diff --git a/core/services/ocr2/plugins/mercury/plugin.go b/core/services/ocr2/plugins/mercury/plugin.go
index f5c11dc7313..b2767d6bcf5 100644
--- a/core/services/ocr2/plugins/mercury/plugin.go
+++ b/core/services/ocr2/plugins/mercury/plugin.go
@@ -67,7 +67,7 @@ func NewServices(
 			lggr,
 			saver,
 			chEnhancedTelem,
-			ocr2Provider.ChainReader(),
+			ocr2Provider.MercuryChainReader(),
 			ocr2Provider.MercuryServerFetcher(),
 			pluginConfig.InitialBlockNumber.Ptr(),
 			feedID,
diff --git a/core/services/ocr2/plugins/ocr2keeper/integration_21_test.go b/core/services/ocr2/plugins/ocr2keeper/integration_21_test.go
index 7ccd785a668..c2b6612f664 100644
--- a/core/services/ocr2/plugins/ocr2keeper/integration_21_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/integration_21_test.go
@@ -32,7 +32,6 @@ import (
 	ocrTypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
 	"github.com/smartcontractkit/chainlink-automation/pkg/v3/config"
-
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
diff --git a/core/services/ocr2/plugins/ocr2keeper/util.go b/core/services/ocr2/plugins/ocr2keeper/util.go
index 02a0d033bc1..76e5bb6e00e 100644
--- a/core/services/ocr2/plugins/ocr2keeper/util.go
+++ b/core/services/ocr2/plugins/ocr2keeper/util.go
@@ -12,7 +12,6 @@ import (
 	ocr2keepers20polling "github.com/smartcontractkit/chainlink-automation/pkg/v2/observer/polling"
 	ocr2keepers20runner "github.com/smartcontractkit/chainlink-automation/pkg/v2/runner"
 	ocr2keepers21 "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"
-
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
diff --git a/core/services/relay/evm/chain_reader.go b/core/services/relay/evm/chain_reader.go
new file mode 100644
index 00000000000..e4da4cc1a49
--- /dev/null
+++ b/core/services/relay/evm/chain_reader.go
@@ -0,0 +1,154 @@
+package evm
+
+import (
+	"context"
+	"fmt"
+	"slices"
+	"strings"
+
+	"github.com/ethereum/go-ethereum/accounts/abi"
+	"github.com/ethereum/go-ethereum/common"
+
+	commontypes "github.com/smartcontractkit/chainlink-common/pkg/types"
+
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
+	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	"github.com/smartcontractkit/chainlink/v2/core/services"
+	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types"
+)
+
+type ChainReaderService interface {
+	services.ServiceCtx
+	commontypes.ChainReader
+}
+
+type chainReader struct {
+	lggr       logger.Logger
+	contractID common.Address
+	lp         logpoller.LogPoller
+}
+
+// NewChainReaderService constructor for ChainReader
+func NewChainReaderService(lggr logger.Logger, lp logpoller.LogPoller, contractID common.Address, config types.ChainReaderConfig) (*chainReader, error) {
+	if err := validateChainReaderConfig(config); err != nil {
+		return nil, fmt.Errorf("%w: %w", commontypes.ErrInvalidConfig, err)
+	}
+
+	// TODO BCF-2814 implement initialisation of chain reading definitions and pass them into chainReader
+	return &chainReader{lggr.Named("ChainReader"), contractID, lp}, nil
+}
+
+func (cr *chainReader) Name() string { return cr.lggr.Name() }
+
+func (cr *chainReader) initialize() error {
+	// Initialize chain reader, start cache polling loop, etc.
+	return nil
+}
+
+func (cr *chainReader) Start(ctx context.Context) error {
+	if err := cr.initialize(); err != nil {
+		return fmt.Errorf("Failed to initialize ChainReader: %w", err)
+	}
+	return nil
+}
+
+func (cr *chainReader) Close() error { return nil }
+
+func (cr *chainReader) Ready() error { return nil }
+
+func (cr *chainReader) HealthReport() map[string]error {
+	return map[string]error{cr.Name(): nil}
+}
+
+func (cr *chainReader) GetLatestValue(ctx context.Context, bc commontypes.BoundContract, method string, params any, returnVal any) error {
+	return commontypes.UnimplementedError("Unimplemented method GetLatestValue called")
+}
+
+func validateChainReaderConfig(cfg types.ChainReaderConfig) error {
+	if len(cfg.ChainContractReaders) == 0 {
+		return fmt.Errorf("%w: no contract readers defined", commontypes.ErrInvalidConfig)
+	}
+
+	for contractName, chainContractReader := range cfg.ChainContractReaders {
+		abi, err := abi.JSON(strings.NewReader(chainContractReader.ContractABI))
+		if err != nil {
+			return fmt.Errorf("invalid abi: %w", err)
+		}
+
+		for chainReadingDefinitionName, chainReaderDefinition := range chainContractReader.ChainReaderDefinitions {
+			switch chainReaderDefinition.ReadType {
+			case types.Method:
+				err = validateMethods(abi, chainReaderDefinition)
+			case types.Event:
+				err = validateEvents(abi, chainReaderDefinition)
+			default:
+				return fmt.Errorf("%w: invalid chainreading definition read type: %d for contract: %q", commontypes.ErrInvalidConfig, chainReaderDefinition.ReadType, contractName)
+			}
+			if err != nil {
+				return fmt.Errorf("%w: invalid chainreading definition: %q for contract: %q, err: %w", commontypes.ErrInvalidConfig, chainReadingDefinitionName, contractName, err)
+			}
+		}
+	}
+
+	return nil
+}
+
+func validateEvents(contractABI abi.ABI, chainReaderDefinition types.ChainReaderDefinition) error {
+	event, methodExists := contractABI.Events[chainReaderDefinition.ChainSpecificName]
+	if !methodExists {
+		return fmt.Errorf("event: %s doesn't exist", chainReaderDefinition.ChainSpecificName)
+	}
+
+	var abiEventIndexedInputs []abi.Argument
+	for _, eventInput := range event.Inputs {
+		if eventInput.Indexed {
+			abiEventIndexedInputs = append(abiEventIndexedInputs, eventInput)
+		}
+	}
+
+	var chainReaderEventParams []string
+	for chainReaderEventParam := range chainReaderDefinition.Params {
+		chainReaderEventParams = append(chainReaderEventParams, chainReaderEventParam)
+	}
+
+	if !areChainReaderArgumentsValid(abiEventIndexedInputs, chainReaderEventParams) {
+		var abiEventIndexedInputsNames []string
+		for _, abiEventIndexedInput := range abiEventIndexedInputs {
+			abiEventIndexedInputsNames = append(abiEventIndexedInputsNames, abiEventIndexedInput.Name)
+		}
+		return fmt.Errorf("params: [%s] don't match abi event indexed inputs: [%s]", strings.Join(chainReaderEventParams, ","), strings.Join(abiEventIndexedInputsNames, ","))
+	}
+	return nil
+}
+
+func validateMethods(abi abi.ABI, chainReaderDefinition types.ChainReaderDefinition) error {
+	method, methodExists := abi.Methods[chainReaderDefinition.ChainSpecificName]
+	if !methodExists {
+		return fmt.Errorf("method: %q doesn't exist", chainReaderDefinition.ChainSpecificName)
+	}
+
+	var methodNames []string
+	for methodName := range chainReaderDefinition.Params {
+		methodNames = append(methodNames, methodName)
+	}
+
+	if !areChainReaderArgumentsValid(method.Inputs, methodNames) {
+		var abiMethodInputs []string
+		for _, input := range method.Inputs {
+			abiMethodInputs = append(abiMethodInputs, input.Name)
+		}
+		return fmt.Errorf("params: [%s] don't match abi method inputs: [%s]", strings.Join(methodNames, ","), strings.Join(abiMethodInputs, ","))
+	}
+
+	return nil
+}
+
+func areChainReaderArgumentsValid(contractArgs []abi.Argument, chainReaderArgs []string) bool {
+	for _, contractArg := range contractArgs {
+		if !slices.Contains(chainReaderArgs, contractArg.Name) {
+			return false
+		}
+	}
+
+	return true
+}
diff --git a/core/services/relay/evm/chain_reader_test.go b/core/services/relay/evm/chain_reader_test.go
new file mode 100644
index 00000000000..ece2234ab55
--- /dev/null
+++ b/core/services/relay/evm/chain_reader_test.go
@@ -0,0 +1,272 @@
+package evm
+
+import (
+	"encoding/json"
+	"fmt"
+	"strings"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	commontypes "github.com/smartcontractkit/chainlink-common/pkg/types"
+
+	mocklogpoller "github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller/mocks"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm/mocks"
+	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
+	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	evmtypes "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types"
+)
+
+type chainReaderTestHelper struct {
+}
+
+func (crTestHelper chainReaderTestHelper) makeChainReaderConfig(abi string, params map[string]any) evmtypes.ChainReaderConfig {
+	return evmtypes.ChainReaderConfig{
+		ChainContractReaders: map[string]evmtypes.ChainContractReader{
+			"MyContract": {
+				ContractABI: abi,
+				ChainReaderDefinitions: map[string]evmtypes.ChainReaderDefinition{
+					"MyGenericMethod": {
+						ChainSpecificName: "name",
+						Params:            params,
+						CacheEnabled:      false,
+						ReadType:          evmtypes.Method,
+					},
+				},
+			},
+		},
+	}
+}
+
+func (crTestHelper chainReaderTestHelper) makeChainReaderConfigFromStrings(abi string, chainReadingDefinitions string) (evmtypes.ChainReaderConfig, error) {
+	chainReaderConfigTemplate := `{
+	   "chainContractReaders": {
+	     "testContract": {
+			   "contractName": "testContract",
+			   "contractABI":  "[%s]",
+			   "chainReaderDefinitions": {
+					%s
+				}
+	     }
+	   }
+	}`
+
+	abi = strings.Replace(abi, `"`, `\"`, -1)
+	formattedCfgJsonString := fmt.Sprintf(chainReaderConfigTemplate, abi, chainReadingDefinitions)
+	var chainReaderConfig evmtypes.ChainReaderConfig
+	err := json.Unmarshal([]byte(formattedCfgJsonString), &chainReaderConfig)
+	return chainReaderConfig, err
+}
+
+func TestNewChainReader(t *testing.T) {
+	lggr := logger.TestLogger(t)
+	lp := mocklogpoller.NewLogPoller(t)
+	chain := mocks.NewChain(t)
+	contractID := testutils.NewAddress()
+	contractABI := `[{"inputs":[{"internalType":"string","name":"param","type":"string"}],"name":"name","stateMutability":"view","type":"function"}]`
+
+	t.Run("happy path", func(t *testing.T) {
+		params := make(map[string]any)
+		params["param"] = ""
+		chainReaderConfig := chainReaderTestHelper{}.makeChainReaderConfig(contractABI, params)
+		chain.On("LogPoller").Return(lp)
+		_, err := NewChainReaderService(lggr, chain.LogPoller(), contractID, chainReaderConfig)
+		assert.NoError(t, err)
+	})
+
+	t.Run("invalid config", func(t *testing.T) {
+		invalidChainReaderConfig := chainReaderTestHelper{}.makeChainReaderConfig(contractABI, map[string]any{}) // missing param
+		_, err := NewChainReaderService(lggr, chain.LogPoller(), contractID, invalidChainReaderConfig)
+		assert.ErrorIs(t, err, commontypes.ErrInvalidConfig)
+	})
+
+	t.Run("ChainReader config is empty", func(t *testing.T) {
+		emptyChainReaderConfig := evmtypes.ChainReaderConfig{}
+		_, err := NewChainReaderService(lggr, chain.LogPoller(), contractID, emptyChainReaderConfig)
+		assert.ErrorIs(t, err, commontypes.ErrInvalidConfig)
+		assert.ErrorContains(t, err, "no contract readers defined")
+	})
+}
+
+func TestChainReaderStartClose(t *testing.T) {
+	lggr := logger.TestLogger(t)
+	lp := mocklogpoller.NewLogPoller(t)
+	cr := chainReader{
+		lggr: lggr,
+		lp:   lp,
+	}
+	err := cr.Start(testutils.Context(t))
+	assert.NoError(t, err)
+	err = cr.Close()
+	assert.NoError(t, err)
+}
+
+// TODO Chain Reading Definitions return values are WIP, waiting on codec work and BCF-2789
+func TestValidateChainReaderConfig_HappyPath(t *testing.T) {
+	type testCase struct {
+		name                    string
+		abiInput                string
+		chainReadingDefinitions string
+	}
+
+	var testCases []testCase
+	testCases = append(testCases,
+		testCase{
+			name:     "eventWithMultipleIndexedTopics",
+			abiInput: `{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"sender","type":"address"},{"indexed":true,"internalType":"address","name":"to","type":"address"}],"name":"Swap","type":"event"}`,
+			chainReadingDefinitions: `"Swap":{
+											"chainSpecificName": "Swap",
+											"params":{
+												"sender": "0x0",
+												"to": "0x0"
+											},
+											"readType": 1
+										}`,
+		})
+
+	testCases = append(testCases,
+		testCase{
+			name:     "methodWithOneParamAndMultipleResponses",
+			abiInput: `{"constant":true,"inputs":[{"internalType":"address","name":"_user","type":"address"}],"name":"getUserAccountData","payable":false,"stateMutability":"view","type":"function"}`,
+			chainReadingDefinitions: `"getUserAccountData":{
+											"chainSpecificName": "getUserAccountData",
+											"params":{
+												"_user": "0x0"
+											},
+											"readType": 0
+										}`,
+		})
+
+	testCases = append(testCases,
+		testCase{
+			name:     "methodWithMultipleParamsAndOneResult",
+			abiInput: `{"inputs":[{"internalType":"address","name":"_input","type":"address"},{"internalType":"address","name":"_output","type":"address"},{"internalType":"uint256","name":"_inputQuantity","type":"uint256"}],"name":"getSwapOutput","stateMutability":"view","type":"function"}`,
+			chainReadingDefinitions: `"getSwapOutput":{
+											"chainSpecificName": "getSwapOutput",
+											"params":{
+												"_input":"0x0",
+												"_output":"0x0",
+												"_inputQuantity":"0x0"
+											},
+											"readType": 0
+										}`,
+		})
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			cfg, err := chainReaderTestHelper{}.makeChainReaderConfigFromStrings(tc.abiInput, tc.chainReadingDefinitions)
+			assert.NoError(t, err)
+			assert.NoError(t, validateChainReaderConfig(cfg))
+		})
+	}
+
+	t.Run("large config with all test cases", func(t *testing.T) {
+		var largeABI string
+		var manyChainReadingDefinitions string
+		for _, tc := range testCases {
+			largeABI += tc.abiInput + ","
+			manyChainReadingDefinitions += tc.chainReadingDefinitions + ","
+		}
+
+		largeABI = largeABI[:len(largeABI)-1]
+		manyChainReadingDefinitions = manyChainReadingDefinitions[:len(manyChainReadingDefinitions)-1]
+		cfg, err := chainReaderTestHelper{}.makeChainReaderConfigFromStrings(largeABI, manyChainReadingDefinitions)
+		assert.NoError(t, err)
+		assert.NoError(t, validateChainReaderConfig(cfg))
+	})
+}
+
+// TODO Chain Reading Definitions return values are WIP, waiting on codec work and BCF-2789
+func TestValidateChainReaderConfig_BadPath(t *testing.T) {
+	type testCase struct {
+		name                    string
+		abiInput                string
+		chainReadingDefinitions string
+		expected                error
+	}
+
+	var testCases []testCase
+	mismatchedEventArgumentsTestABI := `{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"sender","type":"address"}],"name":"Swap","type":"event"}`
+	testCases = append(testCases,
+		testCase{
+			name:     "mismatched abi and event chain reading param values",
+			abiInput: mismatchedEventArgumentsTestABI,
+			chainReadingDefinitions: `"Swap":{
+													"chainSpecificName": "Swap",
+													"params":{
+														"malformedParam": "0x0"
+													},
+													"readType": 1
+												}`,
+			expected: fmt.Errorf("invalid chainreading definition: \"Swap\" for contract: \"testContract\", err: params: [malformedParam] don't match abi event indexed inputs: [sender]"),
+		})
+
+	mismatchedFunctionArgumentsTestABI := `{"constant":true,"inputs":[{"internalType":"address","name":"from","type":"address"}],"name":"Swap","payable":false,"stateMutability":"view","type":"function"}`
+	testCases = append(testCases,
+		testCase{
+			name:     "mismatched abi and method chain reading param values",
+			abiInput: mismatchedFunctionArgumentsTestABI,
+			chainReadingDefinitions: `"Swap":{
+											"chainSpecificName": "Swap",
+											"params":{
+												"malformedParam": "0x0"
+											},
+											"readType": 0
+										}`,
+			expected: fmt.Errorf("invalid chainreading definition: \"Swap\" for contract: \"testContract\", err: params: [malformedParam] don't match abi method inputs: [from]"),
+		},
+	)
+
+	testCases = append(testCases,
+		testCase{
+			name:     "event doesn't exist",
+			abiInput: `{"constant":true,"inputs":[],"name":"someName","payable":false,"stateMutability":"view","type":"function"}`,
+			chainReadingDefinitions: `"TestMethod":{
+											"chainSpecificName": "Swap",
+											"readType": 1
+										}`,
+			expected: fmt.Errorf("invalid chainreading definition: \"TestMethod\" for contract: \"testContract\", err: event: Swap doesn't exist"),
+		},
+	)
+
+	testCases = append(testCases,
+		testCase{
+			name:     "method doesn't exist",
+			abiInput: `{"constant":true,"inputs":[],"name":"someName","payable":false,"stateMutability":"view","type":"function"}`,
+			chainReadingDefinitions: `"TestMethod":{
+											"chainSpecificName": "Swap",
+											"readType": 0
+										}`,
+			expected: fmt.Errorf("invalid chainreading definition: \"TestMethod\" for contract: \"testContract\", err: method: \"Swap\" doesn't exist"),
+		},
+	)
+
+	testCases = append(testCases, testCase{
+		name:     "invalid abi",
+		abiInput: `broken abi`,
+		chainReadingDefinitions: `"TestMethod":{
+											"chainSpecificName": "Swap",
+											"readType": 0
+										}`,
+		expected: fmt.Errorf("invalid abi"),
+	})
+
+	testCases = append(testCases, testCase{
+		name:                    "invalid read type",
+		abiInput:                `{"constant":true,"inputs":[],"name":"someName","payable":false,"stateMutability":"view","type":"function"}`,
+		chainReadingDefinitions: `"TestMethod":{"readType": 59}`,
+		expected:                fmt.Errorf("invalid chainreading definition read type: 59"),
+	})
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			cfg, err := chainReaderTestHelper{}.makeChainReaderConfigFromStrings(tc.abiInput, tc.chainReadingDefinitions)
+			assert.NoError(t, err)
+			if tc.expected == nil {
+				assert.NoError(t, validateChainReaderConfig(cfg))
+			} else {
+				assert.ErrorContains(t, validateChainReaderConfig(cfg), tc.expected.Error())
+			}
+		})
+	}
+}
diff --git a/core/services/relay/evm/config_poller.go b/core/services/relay/evm/config_poller.go
index fe39ed0e343..dc75fe037fe 100644
--- a/core/services/relay/evm/config_poller.go
+++ b/core/services/relay/evm/config_poller.go
@@ -17,6 +17,7 @@ import (
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
diff --git a/core/services/relay/evm/evm.go b/core/services/relay/evm/evm.go
index 088a69a2582..aea704adacf 100644
--- a/core/services/relay/evm/evm.go
+++ b/core/services/relay/evm/evm.go
@@ -54,6 +54,7 @@ type Relayer struct {
 	mercuryPool      wsrpc.Pool
 	eventBroadcaster pg.EventBroadcaster
 	pgCfg            pg.QConfig
+	chainReader      commontypes.ChainReader
 }
 
 type CSAETHKeystore interface {
@@ -189,8 +190,7 @@ func (r *Relayer) NewMercuryProvider(rargs commontypes.RelayArgs, pargs commonty
 	}
 	transmitter := mercury.NewTransmitter(lggr, cw.ContractConfigTracker(), client, privKey.PublicKey, rargs.JobID, *relayConfig.FeedID, r.db, r.pgCfg, transmitterCodec)
 
-	chainReader := NewChainReader(r.chain.HeadTracker())
-	return NewMercuryProvider(cw, transmitter, reportCodecV1, reportCodecV2, reportCodecV3, chainReader, lggr), nil
+	return NewMercuryProvider(cw, r.chainReader, NewMercuryChainReader(r.chain.HeadTracker()), transmitter, reportCodecV1, reportCodecV2, reportCodecV3, lggr), nil
 }
 
 func (r *Relayer) NewFunctionsProvider(rargs commontypes.RelayArgs, pargs commontypes.PluginArgs) (commontypes.FunctionsProvider, error) {
@@ -502,6 +502,10 @@ func (r *Relayer) NewMedianProvider(rargs commontypes.RelayArgs, pargs commontyp
 	if expectedChainID != r.chain.ID().String() {
 		return nil, fmt.Errorf("internal error: chain id in spec does not match this relayer's chain: have %s expected %s", relayConfig.ChainID.String(), r.chain.ID().String())
 	}
+	if !common.IsHexAddress(relayOpts.ContractID) {
+		return nil, fmt.Errorf("invalid contractID %s, expected hex address", relayOpts.ContractID)
+	}
+	contractID := common.HexToAddress(relayOpts.ContractID)
 
 	configWatcher, err := newConfigProvider(lggr, r.chain, relayOpts, r.eventBroadcaster)
 	if err != nil {
@@ -518,12 +522,26 @@ func (r *Relayer) NewMedianProvider(rargs commontypes.RelayArgs, pargs commontyp
 	if err != nil {
 		return nil, err
 	}
-	return &medianProvider{
+
+	medianProvider := medianProvider{
 		configWatcher:       configWatcher,
 		reportCodec:         reportCodec,
 		contractTransmitter: contractTransmitter,
 		medianContract:      medianContract,
-	}, nil
+	}
+
+	// allow fallback until chain reader is default and median contract is removed, but still log just in case
+	var chainReaderService commontypes.ChainReader
+	if relayConfig.ChainReader != nil {
+		if chainReaderService, err = NewChainReaderService(lggr, r.chain.LogPoller(), contractID, *relayConfig.ChainReader); err != nil {
+			return nil, err
+		}
+	} else {
+		lggr.Info("ChainReader missing from RelayConfig; falling back to internal MedianContract")
+	}
+	medianProvider.chainReader = chainReaderService
+
+	return &medianProvider, nil
 }
 
 var _ commontypes.MedianProvider = (*medianProvider)(nil)
@@ -533,8 +551,8 @@ type medianProvider struct {
 	contractTransmitter ContractTransmitter
 	reportCodec         median.ReportCodec
 	medianContract      *medianContract
-
-	ms services.MultiStart
+	chainReader         commontypes.ChainReader
+	ms                  services.MultiStart
 }
 
 func (p *medianProvider) Name() string {
@@ -582,3 +600,7 @@ func (p *medianProvider) OffchainConfigDigester() ocrtypes.OffchainConfigDigeste
 func (p *medianProvider) ContractConfigTracker() ocrtypes.ContractConfigTracker {
 	return p.configWatcher.ContractConfigTracker()
 }
+
+func (p *medianProvider) ChainReader() commontypes.ChainReader {
+	return p.chainReader
+}
diff --git a/core/services/relay/evm/functions.go b/core/services/relay/evm/functions.go
index 10e5d543b1a..f1d652fd6f8 100644
--- a/core/services/relay/evm/functions.go
+++ b/core/services/relay/evm/functions.go
@@ -18,6 +18,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 	commontypes "github.com/smartcontractkit/chainlink-common/pkg/types"
+
 	txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr"
 	txm "github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
@@ -85,6 +86,10 @@ func (p *functionsProvider) Name() string {
 	return p.configWatcher.Name()
 }
 
+func (p *functionsProvider) ChainReader() commontypes.ChainReader {
+	return nil
+}
+
 func NewFunctionsProvider(chain legacyevm.Chain, rargs commontypes.RelayArgs, pargs commontypes.PluginArgs, lggr logger.Logger, ethKeystore keystore.Eth, pluginType functionsRelay.FunctionsPluginType) (evmRelayTypes.FunctionsProvider, error) {
 	relayOpts := evmRelayTypes.NewRelayOpts(rargs)
 	relayConfig, err := relayOpts.RelayConfig()
diff --git a/core/services/relay/evm/functions/logpoller_wrapper.go b/core/services/relay/evm/functions/logpoller_wrapper.go
index 95f45022ab3..e7f3a1a96af 100644
--- a/core/services/relay/evm/functions/logpoller_wrapper.go
+++ b/core/services/relay/evm/functions/logpoller_wrapper.go
@@ -11,6 +11,7 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/functions/generated/functions_coordinator"
diff --git a/core/services/relay/evm/functions/offchain_config_digester.go b/core/services/relay/evm/functions/offchain_config_digester.go
index b4467543d98..29547e794ce 100644
--- a/core/services/relay/evm/functions/offchain_config_digester.go
+++ b/core/services/relay/evm/functions/offchain_config_digester.go
@@ -10,13 +10,13 @@ import (
 	"github.com/smartcontractkit/libocr/offchainreporting2/chains/evmutil"
 	"github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
-	relaytypes "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types"
+	evmRelayTypes "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types"
 )
 
 var (
-	_                     types.OffchainConfigDigester     = &functionsOffchainConfigDigester{}
-	_                     relaytypes.RouteUpdateSubscriber = &functionsOffchainConfigDigester{}
-	FunctionsDigestPrefix                                  = types.ConfigDigestPrefixEVM
+	_                     types.OffchainConfigDigester        = &functionsOffchainConfigDigester{}
+	_                     evmRelayTypes.RouteUpdateSubscriber = &functionsOffchainConfigDigester{}
+	FunctionsDigestPrefix                                     = types.ConfigDigestPrefixEVM
 	// In order to support multiple OCR plugins with a single jobspec & OCR2Base contract, each plugin must have a unique config digest.
 	// This is accomplished by overriding the single config digest from the contract with a unique prefix for each plugin via this custom offchain digester & config poller.
 	ThresholdDigestPrefix = types.ConfigDigestPrefix(7)
diff --git a/core/services/relay/evm/median_test.go b/core/services/relay/evm/median_test.go
new file mode 100644
index 00000000000..4286290d289
--- /dev/null
+++ b/core/services/relay/evm/median_test.go
@@ -0,0 +1,47 @@
+package evm
+
+import (
+	"encoding/json"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	commontypes "github.com/smartcontractkit/chainlink-common/pkg/types"
+
+	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm/mocks"
+	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
+	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	evmtypes "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types"
+	"github.com/smartcontractkit/chainlink/v2/core/utils"
+)
+
+func TestNewMedianProvider(t *testing.T) {
+	lggr := logger.TestLogger(t)
+
+	chain := mocks.NewChain(t)
+	chainID := testutils.NewRandomEVMChainID()
+	chain.On("ID").Return(chainID)
+	contractID := testutils.NewAddress()
+	relayer := Relayer{lggr: lggr, chain: chain}
+
+	pargs := commontypes.PluginArgs{}
+
+	t.Run("wrong chainID", func(t *testing.T) {
+		relayConfigBadChainID := evmtypes.RelayConfig{}
+		rc, err2 := json.Marshal(&relayConfigBadChainID)
+		rargs2 := commontypes.RelayArgs{ContractID: contractID.String(), RelayConfig: rc}
+		require.NoError(t, err2)
+		_, err2 = relayer.NewMedianProvider(rargs2, pargs)
+		assert.ErrorContains(t, err2, "chain id in spec does not match")
+	})
+
+	t.Run("invalid contractID", func(t *testing.T) {
+		relayConfig := evmtypes.RelayConfig{ChainID: utils.NewBig(chainID)}
+		rc, err2 := json.Marshal(&relayConfig)
+		require.NoError(t, err2)
+		rargsBadContractID := commontypes.RelayArgs{ContractID: "NotAContractID", RelayConfig: rc}
+		_, err2 = relayer.NewMedianProvider(rargsBadContractID, pargs)
+		assert.ErrorContains(t, err2, "invalid contractID")
+	})
+}
diff --git a/core/services/relay/evm/mercury/v1/data_source.go b/core/services/relay/evm/mercury/v1/data_source.go
index 429780ef2eb..ce48ec6cf94 100644
--- a/core/services/relay/evm/mercury/v1/data_source.go
+++ b/core/services/relay/evm/mercury/v1/data_source.go
@@ -67,7 +67,7 @@ type datasource struct {
 	mu sync.RWMutex
 
 	chEnhancedTelem    chan<- ocrcommon.EnhancedTelemetryMercuryData
-	chainReader        mercury.ChainReader
+	mercuryChainReader mercury.ChainReader
 	fetcher            Fetcher
 	initialBlockNumber *int64
 
@@ -77,8 +77,8 @@ type datasource struct {
 
 var _ v1.DataSource = &datasource{}
 
-func NewDataSource(orm types.DataSourceORM, pr pipeline.Runner, jb job.Job, spec pipeline.Spec, lggr logger.Logger, s ocrcommon.Saver, enhancedTelemChan chan ocrcommon.EnhancedTelemetryMercuryData, chainReader mercury.ChainReader, fetcher Fetcher, initialBlockNumber *int64, feedID mercuryutils.FeedID) *datasource {
-	return &datasource{pr, jb, spec, lggr, s, orm, reportcodec.ReportCodec{}, feedID, sync.RWMutex{}, enhancedTelemChan, chainReader, fetcher, initialBlockNumber, insufficientBlocksCount.WithLabelValues(feedID.String()), zeroBlocksCount.WithLabelValues(feedID.String())}
+func NewDataSource(orm types.DataSourceORM, pr pipeline.Runner, jb job.Job, spec pipeline.Spec, lggr logger.Logger, s ocrcommon.Saver, enhancedTelemChan chan ocrcommon.EnhancedTelemetryMercuryData, mercuryChainReader mercury.ChainReader, fetcher Fetcher, initialBlockNumber *int64, feedID mercuryutils.FeedID) *datasource {
+	return &datasource{pr, jb, spec, lggr, s, orm, reportcodec.ReportCodec{}, feedID, sync.RWMutex{}, enhancedTelemChan, mercuryChainReader, fetcher, initialBlockNumber, insufficientBlocksCount.WithLabelValues(feedID.String()), zeroBlocksCount.WithLabelValues(feedID.String())}
 }
 
 type ErrEmptyLatestReport struct {
@@ -292,7 +292,8 @@ func (ds *datasource) executeRun(ctx context.Context) (*pipeline.Run, pipeline.T
 }
 
 func (ds *datasource) setLatestBlocks(ctx context.Context, obs *v1types.Observation) error {
-	latestBlocks, err := ds.chainReader.LatestHeads(ctx, nBlocksObservation)
+	latestBlocks, err := ds.mercuryChainReader.LatestHeads(ctx, nBlocksObservation)
+
 	if err != nil {
 		ds.lggr.Errorw("failed to read latest blocks", "error", err)
 		return err
diff --git a/core/services/relay/evm/mercury/v1/data_source_test.go b/core/services/relay/evm/mercury/v1/data_source_test.go
index 72dc4327f19..ce0d71acc6f 100644
--- a/core/services/relay/evm/mercury/v1/data_source_test.go
+++ b/core/services/relay/evm/mercury/v1/data_source_test.go
@@ -15,7 +15,7 @@ import (
 
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
-	"github.com/smartcontractkit/chainlink-common/pkg/types/mercury"
+	mercurytypes "github.com/smartcontractkit/chainlink-common/pkg/types/mercury"
 	v1 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v1"
 
 	commonmocks "github.com/smartcontractkit/chainlink/v2/common/mocks"
@@ -33,7 +33,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
-var _ mercury.ServerFetcher = &mockFetcher{}
+var _ mercurytypes.ServerFetcher = &mockFetcher{}
 
 type mockFetcher struct {
 	num *int64
@@ -71,10 +71,10 @@ func (m *mockORM) LatestReport(ctx context.Context, feedID [32]byte, qopts ...pg
 
 type mockChainReader struct {
 	err error
-	obs []mercury.Head
+	obs []mercurytypes.Head
 }
 
-func (m *mockChainReader) LatestHeads(context.Context, int) ([]mercury.Head, error) {
+func (m *mockChainReader) LatestHeads(context.Context, int) ([]mercurytypes.Head, error) {
 	return m.obs, m.err
 }
 
@@ -118,7 +118,7 @@ func TestMercury_Observe(t *testing.T) {
 	ds.spec = spec
 
 	h := commonmocks.NewHeadTracker[*evmtypes.Head, common.Hash](t)
-	ds.chainReader = evm.NewChainReader(h)
+	ds.mercuryChainReader = evm.NewMercuryChainReader(h)
 
 	head := &evmtypes.Head{
 		Number:    int64(rand.Int31()),
@@ -210,7 +210,7 @@ func TestMercury_Observe(t *testing.T) {
 				t.Run("if no current block available", func(t *testing.T) {
 					h2 := commonmocks.NewHeadTracker[*evmtypes.Head, common.Hash](t)
 					h2.On("LatestChain").Return((*evmtypes.Head)(nil))
-					ds.chainReader = evm.NewChainReader(h2)
+					ds.mercuryChainReader = evm.NewMercuryChainReader(h2)
 
 					obs, err := ds.Observe(ctx, repts, true)
 					assert.NoError(t, err)
@@ -221,7 +221,7 @@ func TestMercury_Observe(t *testing.T) {
 		})
 	})
 
-	ds.chainReader = evm.NewChainReader(h)
+	ds.mercuryChainReader = evm.NewMercuryChainReader(h)
 
 	t.Run("when fetchMaxFinalizedBlockNum=false", func(t *testing.T) {
 		t.Run("when run execution fails, returns error", func(t *testing.T) {
@@ -321,7 +321,7 @@ func TestMercury_Observe(t *testing.T) {
 		t.Run("when chain length is zero", func(t *testing.T) {
 			ht2 := commonmocks.NewHeadTracker[*evmtypes.Head, common.Hash](t)
 			ht2.On("LatestChain").Return((*evmtypes.Head)(nil))
-			ds.chainReader = evm.NewChainReader(ht2)
+			ds.mercuryChainReader = evm.NewMercuryChainReader(ht2)
 
 			obs, err := ds.Observe(ctx, repts, true)
 			assert.NoError(t, err)
@@ -346,7 +346,7 @@ func TestMercury_Observe(t *testing.T) {
 
 			ht2 := commonmocks.NewHeadTracker[*evmtypes.Head, common.Hash](t)
 			ht2.On("LatestChain").Return(h6)
-			ds.chainReader = evm.NewChainReader(ht2)
+			ds.mercuryChainReader = evm.NewMercuryChainReader(ht2)
 
 			obs, err := ds.Observe(ctx, repts, true)
 			assert.NoError(t, err)
@@ -369,7 +369,7 @@ func TestMercury_Observe(t *testing.T) {
 
 			ht2 := commonmocks.NewHeadTracker[*evmtypes.Head, common.Hash](t)
 			ht2.On("LatestChain").Return(heads[len(heads)-1])
-			ds.chainReader = evm.NewChainReader(ht2)
+			ds.mercuryChainReader = evm.NewMercuryChainReader(ht2)
 
 			obs, err := ds.Observe(ctx, repts, true)
 			assert.NoError(t, err)
@@ -384,7 +384,7 @@ func TestMercury_Observe(t *testing.T) {
 		})
 
 		t.Run("when chain reader returns an error", func(t *testing.T) {
-			ds.chainReader = &mockChainReader{
+			ds.mercuryChainReader = &mockChainReader{
 				err: io.EOF,
 				obs: nil,
 			}
@@ -414,7 +414,7 @@ func TestMercury_SetLatestBlocks(t *testing.T) {
 	t.Run("returns head from headtracker if present", func(t *testing.T) {
 		headTracker := commonmocks.NewHeadTracker[*evmtypes.Head, common.Hash](t)
 		headTracker.On("LatestChain").Return(&h, nil)
-		ds.chainReader = evm.NewChainReader(headTracker)
+		ds.mercuryChainReader = evm.NewMercuryChainReader(headTracker)
 
 		obs := v1.Observation{}
 		err := ds.setLatestBlocks(testutils.Context(t), &obs)
@@ -433,7 +433,7 @@ func TestMercury_SetLatestBlocks(t *testing.T) {
 		// This can happen in some cases e.g. RPC node is offline
 		headTracker.On("LatestChain").Return((*evmtypes.Head)(nil))
 
-		ds.chainReader = evm.NewChainReader(headTracker)
+		ds.mercuryChainReader = evm.NewChainReader(headTracker)
 		obs := v1.Observation{}
 		err := ds.setLatestBlocks(testutils.Context(t), &obs)
 
diff --git a/core/services/relay/evm/mercury_provider.go b/core/services/relay/evm/mercury_provider.go
index b6a2232da3f..2ff882efa6b 100644
--- a/core/services/relay/evm/mercury_provider.go
+++ b/core/services/relay/evm/mercury_provider.go
@@ -7,48 +7,50 @@ import (
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
-	"github.com/smartcontractkit/chainlink-common/pkg/types"
+	commontypes "github.com/smartcontractkit/chainlink-common/pkg/types"
 	mercurytypes "github.com/smartcontractkit/chainlink-common/pkg/types/mercury"
 	v1 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v1"
 	v2 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v2"
 	v3 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v3"
-	relaymercury "github.com/smartcontractkit/chainlink-data-streams/mercury"
+	"github.com/smartcontractkit/chainlink-data-streams/mercury"
 
 	httypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker/types"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury"
+	evmmercury "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury"
 )
 
-var _ types.MercuryProvider = (*mercuryProvider)(nil)
+var _ commontypes.MercuryProvider = (*mercuryProvider)(nil)
 
 type mercuryProvider struct {
-	configWatcher *configWatcher
-	transmitter   mercury.Transmitter
-	reportCodecV1 v1.ReportCodec
-	reportCodecV2 v2.ReportCodec
-	reportCodecV3 v3.ReportCodec
-	chainReader   mercurytypes.ChainReader
-	logger        logger.Logger
-
-	ms services.MultiStart
+	configWatcher      *configWatcher
+	chainReader        commontypes.ChainReader
+	transmitter        evmmercury.Transmitter
+	reportCodecV1      v1.ReportCodec
+	reportCodecV2      v2.ReportCodec
+	reportCodecV3      v3.ReportCodec
+	mercuryChainReader mercurytypes.ChainReader
+	logger             logger.Logger
+	ms                 services.MultiStart
 }
 
 func NewMercuryProvider(
 	configWatcher *configWatcher,
-	transmitter mercury.Transmitter,
+	chainReader commontypes.ChainReader,
+	mercuryChainReader mercurytypes.ChainReader,
+	transmitter evmmercury.Transmitter,
 	reportCodecV1 v1.ReportCodec,
 	reportCodecV2 v2.ReportCodec,
 	reportCodecV3 v3.ReportCodec,
-	chainReader mercurytypes.ChainReader,
 	lggr logger.Logger,
 ) *mercuryProvider {
 	return &mercuryProvider{
 		configWatcher,
+		chainReader,
 		transmitter,
 		reportCodecV1,
 		reportCodecV2,
 		reportCodecV3,
-		chainReader,
+		mercuryChainReader,
 		lggr,
 		services.MultiStart{},
 	}
@@ -77,6 +79,10 @@ func (p *mercuryProvider) HealthReport() map[string]error {
 	return report
 }
 
+func (p *mercuryProvider) MercuryChainReader() mercurytypes.ChainReader {
+	return p.mercuryChainReader
+}
+
 func (p *mercuryProvider) ContractConfigTracker() ocrtypes.ContractConfigTracker {
 	return p.configWatcher.ContractConfigTracker()
 }
@@ -86,7 +92,7 @@ func (p *mercuryProvider) OffchainConfigDigester() ocrtypes.OffchainConfigDigest
 }
 
 func (p *mercuryProvider) OnchainConfigCodec() mercurytypes.OnchainConfigCodec {
-	return relaymercury.StandardOnchainConfigCodec{}
+	return mercury.StandardOnchainConfigCodec{}
 }
 
 func (p *mercuryProvider) ReportCodecV1() v1.ReportCodec {
@@ -109,23 +115,27 @@ func (p *mercuryProvider) MercuryServerFetcher() mercurytypes.ServerFetcher {
 	return p.transmitter
 }
 
-func (p *mercuryProvider) ChainReader() mercurytypes.ChainReader {
+func (p *mercuryProvider) ChainReader() commontypes.ChainReader {
 	return p.chainReader
 }
 
-var _ mercurytypes.ChainReader = (*chainReader)(nil)
+var _ mercurytypes.ChainReader = (*mercuryChainReader)(nil)
 
-type chainReader struct {
+type mercuryChainReader struct {
 	tracker httypes.HeadTracker
 }
 
 func NewChainReader(h httypes.HeadTracker) mercurytypes.ChainReader {
-	return &chainReader{
+	return &mercuryChainReader{h}
+}
+
+func NewMercuryChainReader(h httypes.HeadTracker) mercurytypes.ChainReader {
+	return &mercuryChainReader{
 		tracker: h,
 	}
 }
 
-func (r *chainReader) LatestHeads(ctx context.Context, k int) ([]mercurytypes.Head, error) {
+func (r *mercuryChainReader) LatestHeads(ctx context.Context, k int) ([]mercurytypes.Head, error) {
 	evmBlocks := r.tracker.LatestChain().AsSlice(k)
 	if len(evmBlocks) == 0 {
 		return nil, nil
diff --git a/core/services/relay/evm/ocr2keeper.go b/core/services/relay/evm/ocr2keeper.go
index 3b3bfeb652d..abc03c7abb1 100644
--- a/core/services/relay/evm/ocr2keeper.go
+++ b/core/services/relay/evm/ocr2keeper.go
@@ -130,6 +130,10 @@ func (c *ocr2keeperProvider) ContractTransmitter() ocrtypes.ContractTransmitter
 	return c.contractTransmitter
 }
 
+func (c *ocr2keeperProvider) ChainReader() commontypes.ChainReader {
+	return nil
+}
+
 func newOCR2KeeperConfigProvider(lggr logger.Logger, chain legacyevm.Chain, rargs commontypes.RelayArgs) (*configWatcher, error) {
 	var relayConfig types.RelayConfig
 	err := json.Unmarshal(rargs.RelayConfig, &relayConfig)
diff --git a/core/services/relay/evm/ocr2vrf.go b/core/services/relay/evm/ocr2vrf.go
index b7a2220588b..39d0503b8b1 100644
--- a/core/services/relay/evm/ocr2vrf.go
+++ b/core/services/relay/evm/ocr2vrf.go
@@ -110,6 +110,10 @@ func (c *dkgProvider) ContractTransmitter() ocrtypes.ContractTransmitter {
 	return c.contractTransmitter
 }
 
+func (c *dkgProvider) ChainReader() commontypes.ChainReader {
+	return nil
+}
+
 type ocr2vrfProvider struct {
 	*configWatcher
 	contractTransmitter ContractTransmitter
@@ -119,6 +123,10 @@ func (c *ocr2vrfProvider) ContractTransmitter() ocrtypes.ContractTransmitter {
 	return c.contractTransmitter
 }
 
+func (c *ocr2vrfProvider) ChainReader() commontypes.ChainReader {
+	return nil
+}
+
 func newOCR2VRFConfigProvider(lggr logger.Logger, chain legacyevm.Chain, rargs commontypes.RelayArgs) (*configWatcher, error) {
 	var relayConfig types.RelayConfig
 	err := json.Unmarshal(rargs.RelayConfig, &relayConfig)
diff --git a/core/services/relay/evm/types/types.go b/core/services/relay/evm/types/types.go
index d2edef8b118..24afb65c55a 100644
--- a/core/services/relay/evm/types/types.go
+++ b/core/services/relay/evm/types/types.go
@@ -20,11 +20,38 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
+type ChainReaderConfig struct {
+	// ChainContractReaders key is contract name
+	ChainContractReaders map[string]ChainContractReader `json:"chainContractReaders"`
+}
+
+type ChainContractReader struct {
+	ContractABI string `json:"contractABI"`
+	// ChainReaderDefinitions key is chainAgnostic read name.
+	ChainReaderDefinitions map[string]ChainReaderDefinition `json:"chainReaderDefinitions"`
+}
+
+type ChainReaderDefinition struct {
+	ChainSpecificName string         `json:"chainSpecificName"` // chain specific contract method name or event type.
+	Params            map[string]any `json:"params"`
+	ReturnValues      []string       `json:"returnValues"`
+	CacheEnabled      bool           `json:"cacheEnabled"`
+	ReadType          ReadType       `json:"readType"`
+}
+
+type ReadType int64
+
+const (
+	Method ReadType = 0
+	Event  ReadType = 1
+)
+
 type RelayConfig struct {
-	ChainID                *utils.Big      `json:"chainID"`
-	FromBlock              uint64          `json:"fromBlock"`
-	EffectiveTransmitterID null.String     `json:"effectiveTransmitterID"`
-	ConfigContractAddress  *common.Address `json:"configContractAddress"`
+	ChainID                *utils.Big         `json:"chainID"`
+	FromBlock              uint64             `json:"fromBlock"`
+	EffectiveTransmitterID null.String        `json:"effectiveTransmitterID"`
+	ConfigContractAddress  *common.Address    `json:"configContractAddress"`
+	ChainReader            *ChainReaderConfig `json:"chainReader"`
 
 	// Contract-specific
 	SendingKeys pq.StringArray `json:"sendingKeys"`
diff --git a/core/services/relay/grpc_provider_server_test.go b/core/services/relay/grpc_provider_server_test.go
index 6aff32f5e32..72bbbca0f44 100644
--- a/core/services/relay/grpc_provider_server_test.go
+++ b/core/services/relay/grpc_provider_server_test.go
@@ -6,6 +6,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
+
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
@@ -17,7 +18,7 @@ func TestProviderServer(t *testing.T) {
 
 	lggr := logger.TestLogger(t)
 	_, err := NewProviderServer(mp, "unsupported-type", lggr)
-	require.Error(t, err)
+	require.ErrorContains(t, err, "unsupported-type")
 
 	ps, err := NewProviderServer(staticMedianProvider{}, types.Median, lggr)
 	require.NoError(t, err)
diff --git a/core/services/relay/relay_test.go b/core/services/relay/relay_test.go
index 18a7b1b44ea..d23895699df 100644
--- a/core/services/relay/relay_test.go
+++ b/core/services/relay/relay_test.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/loop"
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
+
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 )
 
diff --git a/go.mod b/go.mod
index 0cbd2f16d1c..2ac067959ef 100644
--- a/go.mod
+++ b/go.mod
@@ -66,12 +66,12 @@ require (
 	github.com/shopspring/decimal v1.3.1
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704
 	github.com/smartcontractkit/chainlink-automation v1.0.1
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231204152334-1f32103bbb4c
-	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231205033838-dfac15e672d4
+	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231206164210-03f8b219402e
 	github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1
 	github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d
-	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3
-	github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664
+	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231206154215-ec1718b7df3e
+	github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231205180940-ea2e3e916725
 	github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
 	github.com/smartcontractkit/libocr v0.0.0-20231130143053-c5102a9c0fb7
 	github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1
@@ -171,6 +171,7 @@ require (
 	github.com/gedex/inflector v0.0.0-20170307190818-16278e9db813 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
+	github.com/go-json-experiment/json v0.0.0-20231102232822-2e55bd4e08b0 // indirect
 	github.com/go-kit/kit v0.12.0 // indirect
 	github.com/go-kit/log v0.2.1 // indirect
 	github.com/go-ldap/ldap/v3 v3.4.5
diff --git a/go.sum b/go.sum
index 96e5c069454..b7305210e05 100644
--- a/go.sum
+++ b/go.sum
@@ -440,6 +440,8 @@ github.com/go-faster/errors v0.6.1/go.mod h1:5MGV2/2T9yvlrbhe9pD9LO5Z/2zCSq2T8j+
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-json-experiment/json v0.0.0-20231102232822-2e55bd4e08b0 h1:ymLjT4f35nQbASLnvxEde4XOBL+Sn7rFuV+FOJqkljg=
+github.com/go-json-experiment/json v0.0.0-20231102232822-2e55bd4e08b0/go.mod h1:6daplAwHHGbUGib4990V3Il26O0OC4aRyvewaaAihaA=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.12.0 h1:e4o3o3IsBfAKQh5Qbbiqyfu97Ku7jrO/JbohvztANh4=
@@ -1215,18 +1217,18 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
 github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
 github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231204152334-1f32103bbb4c h1:YFyo0pCmKkpB4EOSykCZFueRXNxQ7OhKiCnhoVIzydo=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231204152334-1f32103bbb4c/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
-github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 h1:oewYJtdRkJKUHCNDCj5C2LQe6Oq6qy975g931nfG0cc=
-github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542/go.mod h1:EpvRoycRD+kniYlz+pCpRT5e+fmPm0mSD/vmND+0oMg=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231205033838-dfac15e672d4 h1:2LC5HtHkAm7I1h5j4Uz0KTX+h4fo4z/5NoAARSF4ZVA=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231205033838-dfac15e672d4/go.mod h1:IdlfCN9rUs8Q/hrOYe8McNBIwEOHEsi0jilb3Cw77xs=
+github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231206164210-03f8b219402e h1:xvqffqFec2HkEcUKrCkm4FDJRnn/+gHmvrE/dz3Zlw8=
+github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231206164210-03f8b219402e/go.mod h1:soVgcl4CbfR6hC9UptjuCQhz19HJaFEjwnOpiySkxg0=
 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ=
 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1/go.mod h1:GuPvyXryvbiUZIHmPeLBz4L+yJKeyGUjrDfd1KNne+o=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d h1:w4MsbOtNk6nD/mcXLstHWk9hB6g7QLtcAfhPjhwvOaQ=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d/go.mod h1:YPAfLNowdBwiKiYOwgwtbJHi8AJWbcxkbOY0ItAvkfc=
-github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3 h1:DudPr8ZNMEVgDwHBvnrpvK96JrGcGCG+LLBnlqaPGnE=
-github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3/go.mod h1:UfW7/PZKon+iDEHtrHOfvMnS5GfYOW/SdMZ6P97rPEk=
-github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664 h1:yxaHuDTtj2xxtsR8b+LJw8xDvyr6v/F6GP3InsP4wPI=
-github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664/go.mod h1:3Fa+HQTZ3R3fPC0hUqugvoo+NEeo8Y4J2WOnQfi7O34=
+github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231206154215-ec1718b7df3e h1:/tCHhoAJM+ittEHPZTtJsAgXmYujKiDW0ub9HXW9qtY=
+github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231206154215-ec1718b7df3e/go.mod h1:9YIi413QRRytafTzpWm+Z+5NWBNxSqokhKyeEZ3ynlA=
+github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231205180940-ea2e3e916725 h1:NbhPVwxx+53WN/Uld1V6c4iLgoGvUYFOsVd2kfcexe8=
+github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231205180940-ea2e3e916725/go.mod h1:vHrPBipRL52NdPp77KXNU2k1IoCUa1B33N9otZQPYko=
 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 h1:FFdvEzlYwcuVHkdZ8YnZR/XomeMGbz5E2F2HZI3I3w8=
 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868/go.mod h1:Kn1Hape05UzFZ7bOUnm3GVsHzP0TNrVmpfXYNHdqGGs=
 github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306 h1:ko88+ZznniNJZbZPWAvHQU8SwKAdHngdDZ+pvVgB5ss=
diff --git a/integration-tests/docker/test_env/test_env.go b/integration-tests/docker/test_env/test_env.go
index 030a3ae9622..b1b179badc5 100644
--- a/integration-tests/docker/test_env/test_env.go
+++ b/integration-tests/docker/test_env/test_env.go
@@ -206,6 +206,15 @@ func (te *CLClusterTestEnv) Cleanup() error {
 
 	te.logWhetherAllContainersAreRunning()
 
+	// Getting the absolute path
+	wd, err := os.Getwd()
+	if err != nil {
+		return err
+	}
+
+	wd = filepath.Join(wd, "logs")
+	te.l.Info().Str("Working dir", wd).Msg("Would write test logs here")
+
 	// TODO: This is an imperfect and temporary solution, see TT-590 for a more sustainable solution
 	// Collect logs if the test fails, or if we just want them
 	if te.t.Failed() || os.Getenv("TEST_LOG_COLLECT") == "true" {
@@ -285,7 +294,14 @@ func (te *CLClusterTestEnv) collectTestLogs() error {
 		return err
 	}
 
-	te.l.Info().Str("Logs Location", folder).Msg("Wrote test logs")
+	// Getting the absolute path
+	wd, err := os.Getwd()
+	if err != nil {
+		return err
+	}
+	absolutePath := filepath.Join(wd, folder)
+
+	te.l.Info().Str("Logs absolute Location", absolutePath).Msg("Wrote test logs")
 	return nil
 }
 
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index a161e67941d..01d7c4dbef9 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/segmentio/ksuid v1.0.4
 	github.com/slack-go/slack v0.12.2
 	github.com/smartcontractkit/chainlink-automation v1.0.1
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231204152334-1f32103bbb4c
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231205033838-dfac15e672d4
 	github.com/smartcontractkit/chainlink-testing-framework v1.20.0
 	github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
 	github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000
@@ -160,6 +160,7 @@ require (
 	github.com/gin-gonic/gin v1.9.1 // indirect
 	github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
 	github.com/go-errors/errors v1.4.2 // indirect
+	github.com/go-json-experiment/json v0.0.0-20231102232822-2e55bd4e08b0 // indirect
 	github.com/go-kit/kit v0.12.0 // indirect
 	github.com/go-kit/log v0.2.1 // indirect
 	github.com/go-ldap/ldap/v3 v3.4.5 // indirect
@@ -351,11 +352,11 @@ require (
 	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect
-	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 // indirect
+	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231206164210-03f8b219402e // indirect
 	github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 // indirect
 	github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d // indirect
-	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3 // indirect
-	github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664 // indirect
+	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231206154215-ec1718b7df3e // indirect
+	github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231205180940-ea2e3e916725 // indirect
 	github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 // indirect
 	github.com/smartcontractkit/wsrpc v0.7.2 // indirect
 	github.com/soheilhy/cmux v0.1.5 // indirect
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index 0392afe287a..f3d707d18ec 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -520,6 +520,8 @@ github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3Bop
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-json-experiment/json v0.0.0-20231102232822-2e55bd4e08b0 h1:ymLjT4f35nQbASLnvxEde4XOBL+Sn7rFuV+FOJqkljg=
+github.com/go-json-experiment/json v0.0.0-20231102232822-2e55bd4e08b0/go.mod h1:6daplAwHHGbUGib4990V3Il26O0OC4aRyvewaaAihaA=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.12.0 h1:e4o3o3IsBfAKQh5Qbbiqyfu97Ku7jrO/JbohvztANh4=
@@ -1505,18 +1507,18 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
 github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
 github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231204152334-1f32103bbb4c h1:YFyo0pCmKkpB4EOSykCZFueRXNxQ7OhKiCnhoVIzydo=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231204152334-1f32103bbb4c/go.mod h1:Hrru9i7n+WEYyW2aIt3/YGPhxLX+HEGWnhk3yVXeDF8=
-github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542 h1:oewYJtdRkJKUHCNDCj5C2LQe6Oq6qy975g931nfG0cc=
-github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231117191236-12eab01a4542/go.mod h1:EpvRoycRD+kniYlz+pCpRT5e+fmPm0mSD/vmND+0oMg=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231205033838-dfac15e672d4 h1:2LC5HtHkAm7I1h5j4Uz0KTX+h4fo4z/5NoAARSF4ZVA=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231205033838-dfac15e672d4/go.mod h1:IdlfCN9rUs8Q/hrOYe8McNBIwEOHEsi0jilb3Cw77xs=
+github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231206164210-03f8b219402e h1:xvqffqFec2HkEcUKrCkm4FDJRnn/+gHmvrE/dz3Zlw8=
+github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231206164210-03f8b219402e/go.mod h1:soVgcl4CbfR6hC9UptjuCQhz19HJaFEjwnOpiySkxg0=
 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ=
 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1/go.mod h1:GuPvyXryvbiUZIHmPeLBz4L+yJKeyGUjrDfd1KNne+o=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d h1:w4MsbOtNk6nD/mcXLstHWk9hB6g7QLtcAfhPjhwvOaQ=
 github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d/go.mod h1:YPAfLNowdBwiKiYOwgwtbJHi8AJWbcxkbOY0ItAvkfc=
-github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3 h1:DudPr8ZNMEVgDwHBvnrpvK96JrGcGCG+LLBnlqaPGnE=
-github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231129183458-faee879168b3/go.mod h1:UfW7/PZKon+iDEHtrHOfvMnS5GfYOW/SdMZ6P97rPEk=
-github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664 h1:yxaHuDTtj2xxtsR8b+LJw8xDvyr6v/F6GP3InsP4wPI=
-github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231117204155-b253a2f56664/go.mod h1:3Fa+HQTZ3R3fPC0hUqugvoo+NEeo8Y4J2WOnQfi7O34=
+github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231206154215-ec1718b7df3e h1:/tCHhoAJM+ittEHPZTtJsAgXmYujKiDW0ub9HXW9qtY=
+github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231206154215-ec1718b7df3e/go.mod h1:9YIi413QRRytafTzpWm+Z+5NWBNxSqokhKyeEZ3ynlA=
+github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231205180940-ea2e3e916725 h1:NbhPVwxx+53WN/Uld1V6c4iLgoGvUYFOsVd2kfcexe8=
+github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231205180940-ea2e3e916725/go.mod h1:vHrPBipRL52NdPp77KXNU2k1IoCUa1B33N9otZQPYko=
 github.com/smartcontractkit/chainlink-testing-framework v1.20.0 h1:gQPQRKJuMh6QTAIMkqZ7v5WkjEmbcoMIX/V6WPVrvuI=
 github.com/smartcontractkit/chainlink-testing-framework v1.20.0/go.mod h1:+FVgkz6phTc+piVT57AcQfr3I8xvZgZ1lOpRPOu/dLQ=
 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 h1:FFdvEzlYwcuVHkdZ8YnZR/XomeMGbz5E2F2HZI3I3w8=
diff --git a/plugins/medianpoc/plugin_test.go b/plugins/medianpoc/plugin_test.go
index 0d6c0360e43..ba06d5ea462 100644
--- a/plugins/medianpoc/plugin_test.go
+++ b/plugins/medianpoc/plugin_test.go
@@ -7,9 +7,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
-
 	"github.com/smartcontractkit/libocr/offchainreporting2/reportingplugin/median"
+	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
 	"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
@@ -72,6 +71,10 @@ func (p provider) OnchainConfigCodec() median.OnchainConfigCodec {
 	return mockOnchainConfigCodec{}
 }
 
+func (p provider) ChainReader() types.ChainReader {
+	return nil
+}
+
 func TestNewPlugin(t *testing.T) {
 	lggr := logger.TestLogger(t)
 	p := NewPlugin(lggr)

From c121be1a6afc4e985ea698716d1501fd06ae2913 Mon Sep 17 00:00:00 2001
From: Sam <samsondav@protonmail.com>
Date: Wed, 6 Dec 2023 13:12:28 -0500
Subject: [PATCH 090/130] Improve logging for cache (#11453)

* Include ServerURL in cache logging

* Add additional cache tracing

* TEMP - DO NOT MERGE THIS - promote Trace=>Debug cache logging

* Log if call was cached or not

* Revert "TEMP - DO NOT MERGE THIS - promote Trace=>Debug cache logging"

This reverts commit f0f3f07a59c8d310ac74849519d46ea9b53495c1.
---
 core/services/relay/evm/mercury/wsrpc/cache/cache.go |  7 ++++++-
 core/services/relay/evm/mercury/wsrpc/client.go      | 10 +++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/core/services/relay/evm/mercury/wsrpc/cache/cache.go b/core/services/relay/evm/mercury/wsrpc/cache/cache.go
index cab5654081b..181900bc15c 100644
--- a/core/services/relay/evm/mercury/wsrpc/cache/cache.go
+++ b/core/services/relay/evm/mercury/wsrpc/cache/cache.go
@@ -213,12 +213,14 @@ func (m *memCache) LatestReport(ctx context.Context, req *pb.LatestReportRequest
 	if time.Now().Before(v.expiresAt) {
 		// CACHE HIT
 		promCacheHitCount.WithLabelValues(m.client.ServerURL(), feedIDHex).Inc()
+		m.lggr.Tracew("LatestReport CACHE HIT (hot path)", "feedID", feedIDHex)
 
 		defer v.RUnlock()
 		return v.val, nil
 	} else if v.fetching {
 		// CACHE WAIT
 		promCacheWaitCount.WithLabelValues(m.client.ServerURL(), feedIDHex).Inc()
+		m.lggr.Tracew("LatestReport CACHE WAIT (hot path)", "feedID", feedIDHex)
 		// if someone else is fetching then wait for the fetch to complete
 		ch := v.fetchCh
 		v.RUnlock()
@@ -234,11 +236,13 @@ func (m *memCache) LatestReport(ctx context.Context, req *pb.LatestReportRequest
 	if time.Now().Before(v.expiresAt) {
 		// CACHE HIT
 		promCacheHitCount.WithLabelValues(m.client.ServerURL(), feedIDHex).Inc()
+		m.lggr.Tracew("LatestReport CACHE HIT (cold path)", "feedID", feedIDHex)
 		defer v.RUnlock()
 		return v.val, nil
 	} else if v.fetching {
 		// CACHE WAIT
 		promCacheWaitCount.WithLabelValues(m.client.ServerURL(), feedIDHex).Inc()
+		m.lggr.Tracew("LatestReport CACHE WAIT (cold path)", "feedID", feedIDHex)
 		// if someone else is fetching then wait for the fetch to complete
 		ch := v.fetchCh
 		v.Unlock()
@@ -246,6 +250,7 @@ func (m *memCache) LatestReport(ctx context.Context, req *pb.LatestReportRequest
 	}
 	// CACHE MISS
 	promCacheMissCount.WithLabelValues(m.client.ServerURL(), feedIDHex).Inc()
+	m.lggr.Tracew("LatestReport CACHE MISS (cold path)", "feedID", feedIDHex)
 	// initiate the fetch and wait for result
 	ch := v.initiateFetch()
 	v.Unlock()
@@ -328,7 +333,7 @@ func (m *memCache) fetch(req *pb.LatestReportRequest, v *cacheVal) {
 
 func (m *memCache) Start(context.Context) error {
 	return m.StartOnce(m.Name(), func() error {
-		m.lggr.Debugw("MemCache starting", "config", m.cfg)
+		m.lggr.Debugw("MemCache starting", "config", m.cfg, "serverURL", m.client.ServerURL())
 		m.wg.Add(1)
 		go m.runloop()
 		return nil
diff --git a/core/services/relay/evm/mercury/wsrpc/client.go b/core/services/relay/evm/mercury/wsrpc/client.go
index 5cdf1f44e96..5b6bfa1a9b0 100644
--- a/core/services/relay/evm/mercury/wsrpc/client.go
+++ b/core/services/relay/evm/mercury/wsrpc/client.go
@@ -303,17 +303,21 @@ func (w *client) LatestReport(ctx context.Context, req *pb.LatestReportRequest)
 	if err = w.waitForReady(ctx); err != nil {
 		return nil, errors.Wrap(err, "LatestReport failed")
 	}
+	var cached bool
 	if w.cache == nil {
 		resp, err = w.rawClient.LatestReport(ctx, req)
 	} else {
+		cached = true
 		resp, err = w.cache.LatestReport(ctx, req)
 	}
 	if err != nil {
-		lggr.Errorw("LatestReport failed", "err", err, "resp", resp)
+		lggr.Errorw("LatestReport failed", "err", err, "resp", resp, "cached", cached)
 	} else if resp.Error != "" {
-		lggr.Errorw("LatestReport failed; mercury server returned error", "err", resp.Error, "resp", resp)
+		lggr.Errorw("LatestReport failed; mercury server returned error", "err", resp.Error, "resp", resp, "cached", cached)
+	} else if !cached {
+		lggr.Debugw("LatestReport succeeded", "resp", resp, "cached", cached)
 	} else {
-		lggr.Debugw("LatestReport succeeded", "resp", resp)
+		lggr.Tracew("LatestReport succeeded", "resp", resp, "cached", cached)
 	}
 	return
 }

From 0ee838de16d695ea6fcabc3a81ef5c6cf9ce28d6 Mon Sep 17 00:00:00 2001
From: Tate <tate.exon@smartcontract.com>
Date: Wed, 6 Dec 2023 11:46:07 -0700
Subject: [PATCH 091/130] Only run keepers tests in the merge_group for PRs to
 develop (#11506)

---
 .github/workflows/integration-tests.yml | 33 ++++++++++++++++++-------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 9e2cce02122..5e3cf02a7c0 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -144,7 +144,7 @@ jobs:
       - name: Build Chainlink Image
         if: needs.changes.outputs.src == 'true'
         uses: ./.github/actions/build-chainlink-image
-        with: 
+        with:
           tag_suffix: ${{ matrix.image.tag-suffix }}
           dockerfile: ${{ matrix.image.dockerfile }}
           git_commit_sha: ${{ github.sha }}
@@ -210,17 +210,33 @@ jobs:
           MATRIX_JSON_AUTOMATION=$(./scripts/buildTestMatrixList.sh ./smoke/automation_test.go automation ubuntu20.04-8cores-32GB 1)
           MATRIX_JSON_KEEPER=$(./scripts/buildTestMatrixList.sh ./smoke/keeper_test.go keeper ubuntu20.04-8cores-32GB 1)
           COMBINED_ARRAY=$(jq -c -n "$MATRIX_JSON_AUTOMATION + $MATRIX_JSON_KEEPER")
-          echo "MATRIX_JSON=${COMBINED_ARRAY}" >> $GITHUB_ENV
+
+          # if we running a PR against the develop branch we should only run the automation tests unless we are in the merge group event
+          if [[ "$GITHUB_EVENT_NAME" == "merge_group" ]]; then
+            echo "We are in a merge_group event, run both automation and keepers tests"
+            echo "MATRIX_JSON=${COMBINED_ARRAY}" >> $GITHUB_ENV
+          else
+            echo "we are not in a merge_group event, if this is a PR to develop run only automation tests, otherwise run everything because we could be running against a release branch"
+            target_branch=$(cat $GITHUB_EVENT_PATH | jq -r .pull_request.base.ref)
+            if [[ "$target_branch" == "develop" ]]; then
+              echo "only run automation tests"
+              echo "MATRIX_JSON=${MATRIX_JSON_AUTOMATION}" >> $GITHUB_ENV
+            else
+              echo "run both automation and keepers tests"
+              echo "MATRIX_JSON=${COMBINED_ARRAY}" >> $GITHUB_ENV
+            fi
+          fi
 
   eth-smoke-tests-matrix-automation:
-    if: ${{ !(contains(join(github.event.pull_request.labels.*.name, ' '), 'skip-smoke-tests') || (github.event_name == 'workflow_dispatch' && !inputs.simulatedNetwork)) }}
+    if: ${{ !(contains(join(github.event.pull_request.labels.*.name, ' '), 'skip-smoke-tests') || github.event_name == 'workflow_dispatch') }}
     environment: integration
     permissions:
       checks: write
       pull-requests: write
       id-token: write
       contents: read
-    needs: [build-chainlink, changes, compare-tests, build-lint-integration-tests]
+    needs:
+      [build-chainlink, changes, compare-tests, build-lint-integration-tests]
     env:
       SELECTED_NETWORKS: SIMULATED,SIMULATED_1,SIMULATED_2
       CHAINLINK_COMMIT_SHA: ${{ github.sha }}
@@ -281,7 +297,7 @@ jobs:
         continue-on-error: true
 
   eth-smoke-tests-matrix:
-    if: ${{ !(contains(join(github.event.pull_request.labels.*.name, ' '), 'skip-smoke-tests') || (github.event_name == 'workflow_dispatch' && !inputs.simulatedNetwork)) }}
+    if: ${{ !(contains(join(github.event.pull_request.labels.*.name, ' '), 'skip-smoke-tests') || github.event_name == 'workflow_dispatch') }}
     environment: integration
     permissions:
       checks: write
@@ -410,7 +426,7 @@ jobs:
       - name: Show Otel-Collector Logs
         if: steps.check-label.outputs.trace == 'true' && matrix.product.name == 'ocr2' && matrix.product.tag_suffix == '-plugins'
         run: |
-            docker logs otel-collector
+          docker logs otel-collector
       ## Run this step when changes that require tests to be run are made
       - name: Run Tests
         if: needs.changes.outputs.src == 'true'
@@ -450,7 +466,7 @@ jobs:
       - name: Show Otel-Collector Logs
         if: steps.check-label.outputs.trace == 'true' && matrix.product.name == 'ocr2' && matrix.product.tag_suffix == '-plugins'
         run: |
-            docker logs otel-collector
+          docker logs otel-collector
       - name: Collect Metrics
         if: always()
         id: collect-gha-metrics
@@ -464,7 +480,7 @@ jobs:
       - name: Permissions on traces
         if: steps.check-label.outputs.trace == 'true' && matrix.product.name == 'ocr2' && matrix.product.tag_suffix == '-plugins'
         run: |
-            ls -l ./integration-tests/smoke/traces
+          ls -l ./integration-tests/smoke/traces
       - name: Upload Trace Data
         if: steps.check-label.outputs.trace == 'true' && matrix.product.name == 'ocr2' && matrix.product.tag_suffix == '-plugins'
         uses: actions/upload-artifact@v3
@@ -472,7 +488,6 @@ jobs:
           name: trace-data
           path: ./integration-tests/smoke/traces/trace-data.json
 
-
   ### Used to check the required checks box when the matrix completes
   eth-smoke-tests:
     if: always()

From d095984ce395e84e660b67e05d5e9318588fac0b Mon Sep 17 00:00:00 2001
From: Gabriel Paradiso <gaboparadiso@gmail.com>
Date: Wed, 6 Dec 2023 20:43:17 +0100
Subject: [PATCH 092/130] [FUN-1094] Minor fixes (#11434)

* fix: do not emit AddedAccess if the recipient already had access & minor doc improvements

* chore: save gas by avoiding declaring a new var
---
 .../gas-snapshots/functions.gas-snapshot      | 40 +++++++++----------
 .../functions/dev/v1_X/FunctionsBilling.sol   | 34 +++++-----------
 .../dev/v1_X/FunctionsCoordinator.sol         |  6 +--
 .../functions/dev/v1_X/FunctionsRouter.sol    | 10 ++---
 .../accessControl/TermsOfServiceAllowList.sol | 29 +++++---------
 .../interfaces/ITermsOfServiceAllowList.sol   |  8 ++++
 .../dev/v1_X/interfaces/IFunctionsBilling.sol | 17 ++++++++
 .../tests/v1_X/FunctionsBilling.t.sol         | 12 +++---
 .../tests/v1_X/FunctionsCoordinator.t.sol     |  2 +-
 .../tests/v1_X/FunctionsRouter.t.sol          |  2 +-
 .../FunctionsTermsOfServiceAllowList.t.sol    | 27 +++++++------
 .../src/v0.8/functions/tests/v1_X/Setup.t.sol | 10 +++--
 .../FunctionsCoordinatorHarness.sol           |  3 +-
 .../FunctionsCoordinatorTestHelper.sol        |  3 +-
 .../v0.8/functions/v1/FunctionsRouter.test.ts |  2 +-
 .../functions_allow_list.go                   |  4 +-
 .../functions_coordinator.go                  |  4 +-
 .../functions_router/functions_router.go      | 18 ++++-----
 ...rapper-dependency-versions-do-not-edit.txt |  6 +--
 19 files changed, 124 insertions(+), 113 deletions(-)

diff --git a/contracts/gas-snapshots/functions.gas-snapshot b/contracts/gas-snapshots/functions.gas-snapshot
index 4e6cf83cd1a..8275d9afafe 100644
--- a/contracts/gas-snapshots/functions.gas-snapshot
+++ b/contracts/gas-snapshots/functions.gas-snapshot
@@ -1,12 +1,12 @@
-ChainSpecificUtil__getCurrentTxL1GasFees_Arbitrum:test__getCurrentTxL1GasFees_SuccessWhenArbitrumGoerli() (gas: 14578318)
-ChainSpecificUtil__getCurrentTxL1GasFees_Arbitrum:test__getCurrentTxL1GasFees_SuccessWhenArbitrumMainnet() (gas: 14578296)
-ChainSpecificUtil__getCurrentTxL1GasFees_Arbitrum:test__getCurrentTxL1GasFees_SuccessWhenArbitrumSepolia() (gas: 14578312)
-ChainSpecificUtil__getCurrentTxL1GasFees_Base:test__getCurrentTxL1GasFees_SuccessWhenBaseGoerli() (gas: 14589732)
-ChainSpecificUtil__getCurrentTxL1GasFees_Base:test__getCurrentTxL1GasFees_SuccessWhenBaseMainnet() (gas: 14589709)
-ChainSpecificUtil__getCurrentTxL1GasFees_Base:test__getCurrentTxL1GasFees_SuccessWhenBaseSepolia() (gas: 14589681)
-ChainSpecificUtil__getCurrentTxL1GasFees_Optimism:test__getCurrentTxL1GasFees_SuccessWhenOptimismGoerli() (gas: 14589632)
-ChainSpecificUtil__getCurrentTxL1GasFees_Optimism:test__getCurrentTxL1GasFees_SuccessWhenOptimismMainnet() (gas: 14589621)
-ChainSpecificUtil__getCurrentTxL1GasFees_Optimism:test__getCurrentTxL1GasFees_SuccessWhenOptimismSepolia() (gas: 14589665)
+ChainSpecificUtil__getCurrentTxL1GasFees_Arbitrum:test__getCurrentTxL1GasFees_SuccessWhenArbitrumGoerli() (gas: 14579333)
+ChainSpecificUtil__getCurrentTxL1GasFees_Arbitrum:test__getCurrentTxL1GasFees_SuccessWhenArbitrumMainnet() (gas: 14579311)
+ChainSpecificUtil__getCurrentTxL1GasFees_Arbitrum:test__getCurrentTxL1GasFees_SuccessWhenArbitrumSepolia() (gas: 14579327)
+ChainSpecificUtil__getCurrentTxL1GasFees_Base:test__getCurrentTxL1GasFees_SuccessWhenBaseGoerli() (gas: 14590747)
+ChainSpecificUtil__getCurrentTxL1GasFees_Base:test__getCurrentTxL1GasFees_SuccessWhenBaseMainnet() (gas: 14590724)
+ChainSpecificUtil__getCurrentTxL1GasFees_Base:test__getCurrentTxL1GasFees_SuccessWhenBaseSepolia() (gas: 14590696)
+ChainSpecificUtil__getCurrentTxL1GasFees_Optimism:test__getCurrentTxL1GasFees_SuccessWhenOptimismGoerli() (gas: 14590647)
+ChainSpecificUtil__getCurrentTxL1GasFees_Optimism:test__getCurrentTxL1GasFees_SuccessWhenOptimismMainnet() (gas: 14590636)
+ChainSpecificUtil__getCurrentTxL1GasFees_Optimism:test__getCurrentTxL1GasFees_SuccessWhenOptimismSepolia() (gas: 14590680)
 FunctionsBilling_Constructor:test_Constructor_Success() (gas: 14812)
 FunctionsBilling_DeleteCommitment:test_DeleteCommitment_RevertIfNotRouter() (gas: 13282)
 FunctionsBilling_DeleteCommitment:test_DeleteCommitment_Success() (gas: 15897)
@@ -118,12 +118,12 @@ FunctionsSubscriptions_AddConsumer:test_AddConsumer_RevertIfMaximumConsumers() (
 FunctionsSubscriptions_AddConsumer:test_AddConsumer_RevertIfMaximumConsumersAfterConfigUpdate() (gas: 164837)
 FunctionsSubscriptions_AddConsumer:test_AddConsumer_RevertIfNoSubscription() (gas: 12946)
 FunctionsSubscriptions_AddConsumer:test_AddConsumer_RevertIfNotAllowedSender() (gas: 57809)
-FunctionsSubscriptions_AddConsumer:test_AddConsumer_RevertIfNotSubscriptionOwner() (gas: 87162)
+FunctionsSubscriptions_AddConsumer:test_AddConsumer_RevertIfNotSubscriptionOwner() (gas: 87177)
 FunctionsSubscriptions_AddConsumer:test_AddConsumer_RevertIfPaused() (gas: 18094)
 FunctionsSubscriptions_AddConsumer:test_AddConsumer_Success() (gas: 95480)
 FunctionsSubscriptions_CancelSubscription:test_CancelSubscription_RevertIfNoSubscription() (gas: 15041)
 FunctionsSubscriptions_CancelSubscription:test_CancelSubscription_RevertIfNotAllowedSender() (gas: 57885)
-FunctionsSubscriptions_CancelSubscription:test_CancelSubscription_RevertIfNotSubscriptionOwner() (gas: 89272)
+FunctionsSubscriptions_CancelSubscription:test_CancelSubscription_RevertIfNotSubscriptionOwner() (gas: 89287)
 FunctionsSubscriptions_CancelSubscription:test_CancelSubscription_RevertIfPaused() (gas: 20148)
 FunctionsSubscriptions_CancelSubscription:test_CancelSubscription_RevertIfPendingRequests() (gas: 194325)
 FunctionsSubscriptions_CancelSubscription:test_CancelSubscription_SuccessForfeitAllBalanceAsDeposit() (gas: 114506)
@@ -142,10 +142,10 @@ FunctionsSubscriptions_GetSubscriptionsInRange:test_GetSubscriptionsInRange_Reve
 FunctionsSubscriptions_GetSubscriptionsInRange:test_GetSubscriptionsInRange_RevertIfStartIsAfterEnd() (gas: 13459)
 FunctionsSubscriptions_GetSubscriptionsInRange:test_GetSubscriptionsInRange_Success() (gas: 59592)
 FunctionsSubscriptions_GetTotalBalance:test_GetTotalBalance_Success() (gas: 15010)
-FunctionsSubscriptions_OnTokenTransfer:test_OnTokenTransfer_RevertIfCallerIsNoCalldata(uint96) (runs: 256, μ: 43508, ~: 45548)
-FunctionsSubscriptions_OnTokenTransfer:test_OnTokenTransfer_RevertIfCallerIsNoSubscription(uint96) (runs: 256, μ: 46020, ~: 48060)
+FunctionsSubscriptions_OnTokenTransfer:test_OnTokenTransfer_RevertIfCallerIsNoCalldata(uint96) (runs: 256, μ: 43774, ~: 45548)
+FunctionsSubscriptions_OnTokenTransfer:test_OnTokenTransfer_RevertIfCallerIsNoSubscription(uint96) (runs: 256, μ: 46286, ~: 48060)
 FunctionsSubscriptions_OnTokenTransfer:test_OnTokenTransfer_RevertIfCallerIsNotLink(uint96) (runs: 256, μ: 14295, ~: 14295)
-FunctionsSubscriptions_OnTokenTransfer:test_OnTokenTransfer_RevertIfPaused(uint96) (runs: 256, μ: 51089, ~: 53040)
+FunctionsSubscriptions_OnTokenTransfer:test_OnTokenTransfer_RevertIfPaused(uint96) (runs: 256, μ: 51443, ~: 53040)
 FunctionsSubscriptions_OnTokenTransfer:test_OnTokenTransfer_Success(uint96) (runs: 256, μ: 86057, ~: 89604)
 FunctionsSubscriptions_OracleWithdraw:test_OracleWithdraw_RevertIfAmountMoreThanBalance() (gas: 20745)
 FunctionsSubscriptions_OracleWithdraw:test_OracleWithdraw_RevertIfBalanceInvariant() (gas: 189)
@@ -181,7 +181,7 @@ FunctionsSubscriptions_RecoverFunds:test_RecoverFunds_Success(uint64) (runs: 256
 FunctionsSubscriptions_RemoveConsumer:test_RemoveConsumer_RevertIfInvalidConsumer() (gas: 30260)
 FunctionsSubscriptions_RemoveConsumer:test_RemoveConsumer_RevertIfNoSubscription() (gas: 15019)
 FunctionsSubscriptions_RemoveConsumer:test_RemoveConsumer_RevertIfNotAllowedSender() (gas: 57800)
-FunctionsSubscriptions_RemoveConsumer:test_RemoveConsumer_RevertIfNotSubscriptionOwner() (gas: 87208)
+FunctionsSubscriptions_RemoveConsumer:test_RemoveConsumer_RevertIfNotSubscriptionOwner() (gas: 87223)
 FunctionsSubscriptions_RemoveConsumer:test_RemoveConsumer_RevertIfPaused() (gas: 18049)
 FunctionsSubscriptions_RemoveConsumer:test_RemoveConsumer_RevertIfPendingRequests() (gas: 191858)
 FunctionsSubscriptions_RemoveConsumer:test_RemoveConsumer_Success() (gas: 41979)
@@ -195,14 +195,14 @@ FunctionsSubscriptions_TimeoutRequests:test_TimeoutRequests_Success() (gas: 5775
 FunctionsSubscriptions_createSubscription:test_CreateSubscription_RevertIfNotAllowedSender() (gas: 26390)
 FunctionsSubscriptions_createSubscription:test_CreateSubscription_RevertIfPaused() (gas: 15759)
 FunctionsSubscriptions_createSubscription:test_CreateSubscription_Success() (gas: 152576)
-FunctionsTermsOfServiceAllowList_AcceptTermsOfService:testAcceptTermsOfService_InvalidSigner_vuln() (gas: 94815)
+FunctionsTermsOfServiceAllowList_AcceptTermsOfService:testAcceptTermsOfService_InvalidSigner_vuln() (gas: 94830)
 FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_RevertIfAcceptorIsNotSender() (gas: 25837)
 FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_RevertIfBlockedSender() (gas: 44348)
 FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_RevertIfInvalidSigner() (gas: 23597)
 FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_RevertIfRecipientContractIsNotSender() (gas: 1866530)
 FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_RevertIfRecipientIsNotSender() (gas: 26003)
-FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_SuccessIfAcceptingForContract() (gas: 1946547)
-FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_SuccessIfAcceptingForSelf() (gas: 104851)
+FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_SuccessIfAcceptingForContract() (gas: 1946562)
+FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_SuccessIfAcceptingForSelf() (gas: 103411)
 FunctionsTermsOfServiceAllowList_BlockSender:test_BlockSender_RevertIfNotOwner() (gas: 15469)
 FunctionsTermsOfServiceAllowList_BlockSender:test_BlockSender_Success() (gas: 51794)
 FunctionsTermsOfServiceAllowList_Constructor:test_Constructor_Success() (gas: 12187)
@@ -214,10 +214,10 @@ FunctionsTermsOfServiceAllowList_HasAccess:test_HasAccess_TrueWhenDisabled() (ga
 FunctionsTermsOfServiceAllowList_IsBlockedSender:test_IsBlockedSender_SuccessFalse() (gas: 15354)
 FunctionsTermsOfServiceAllowList_IsBlockedSender:test_IsBlockedSender_SuccessTrue() (gas: 41957)
 FunctionsTermsOfServiceAllowList_UnblockSender:test_UnblockSender_RevertIfNotOwner() (gas: 13525)
-FunctionsTermsOfServiceAllowList_UnblockSender:test_UnblockSender_Success() (gas: 95184)
+FunctionsTermsOfServiceAllowList_UnblockSender:test_UnblockSender_Success() (gas: 95199)
 FunctionsTermsOfServiceAllowList_UpdateConfig:test_UpdateConfig_RevertIfNotOwner() (gas: 13727)
 FunctionsTermsOfServiceAllowList_UpdateConfig:test_UpdateConfig_Success() (gas: 22073)
-Gas_AcceptTermsOfService:test_AcceptTermsOfService_Gas() (gas: 84675)
+Gas_AcceptTermsOfService:test_AcceptTermsOfService_Gas() (gas: 84690)
 Gas_AddConsumer:test_AddConsumer_Gas() (gas: 79087)
 Gas_CreateSubscription:test_CreateSubscription_Gas() (gas: 73375)
 Gas_FundSubscription:test_FundSubscription_Gas() (gas: 38546)
diff --git a/contracts/src/v0.8/functions/dev/v1_X/FunctionsBilling.sol b/contracts/src/v0.8/functions/dev/v1_X/FunctionsBilling.sol
index cb4f2f45677..c3f351e6c76 100644
--- a/contracts/src/v0.8/functions/dev/v1_X/FunctionsBilling.sol
+++ b/contracts/src/v0.8/functions/dev/v1_X/FunctionsBilling.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.19;
 
 import {IFunctionsSubscriptions} from "./interfaces/IFunctionsSubscriptions.sol";
 import {AggregatorV3Interface} from "../../../shared/interfaces/AggregatorV3Interface.sol";
-import {IFunctionsBilling} from "./interfaces/IFunctionsBilling.sol";
+import {IFunctionsBilling, FunctionsBillingConfig} from "./interfaces/IFunctionsBilling.sol";
 
 import {Routable} from "./Routable.sol";
 import {FunctionsResponse} from "./libraries/FunctionsResponse.sol";
@@ -37,25 +37,9 @@ abstract contract FunctionsBilling is Routable, IFunctionsBilling {
 
   event CommitmentDeleted(bytes32 requestId);
 
-  // ================================================================
-  // |                     Configuration state                      |
-  // ================================================================
-
-  struct Config {
-    uint32 fulfillmentGasPriceOverEstimationBP; // ══╗ Percentage of gas price overestimation to account for changes in gas price between request and response. Held as basis points (one hundredth of 1 percentage point)
-    uint32 feedStalenessSeconds; //                  ║ How long before we consider the feed price to be stale and fallback to fallbackNativePerUnitLink.
-    uint32 gasOverheadBeforeCallback; //             ║ Represents the average gas execution cost before the fulfillment callback. This amount is always billed for every request.
-    uint32 gasOverheadAfterCallback; //              ║ Represents the average gas execution cost after the fulfillment callback. This amount is always billed for every request.
-    uint72 donFee; //                                ║ Additional flat fee (in Juels of LINK) that will be split between Node Operators. Max value is 2^80 - 1 == 1.2m LINK.
-    uint40 minimumEstimateGasPriceWei; //            ║ The lowest amount of wei that will be used as the tx.gasprice when estimating the cost to fulfill the request
-    uint16 maxSupportedRequestDataVersion; // ═══════╝ The highest support request data version supported by the node. All lower versions should also be supported.
-    uint224 fallbackNativePerUnitLink; // ═══════════╗ Fallback NATIVE CURRENCY / LINK conversion rate if the data feed is stale
-    uint32 requestTimeoutSeconds; // ════════════════╝ How many seconds it takes before we consider a request to be timed out
-  }
-
-  Config private s_config;
+  FunctionsBillingConfig private s_config;
 
-  event ConfigUpdated(Config config);
+  event ConfigUpdated(FunctionsBillingConfig config);
 
   error UnsupportedRequestDataVersion();
   error InsufficientBalance();
@@ -81,7 +65,7 @@ abstract contract FunctionsBilling is Routable, IFunctionsBilling {
   // ================================================================
   // |                       Initialization                         |
   // ================================================================
-  constructor(address router, Config memory config, address linkToNativeFeed) Routable(router) {
+  constructor(address router, FunctionsBillingConfig memory config, address linkToNativeFeed) Routable(router) {
     s_linkToNativeFeed = AggregatorV3Interface(linkToNativeFeed);
 
     updateConfig(config);
@@ -93,13 +77,13 @@ abstract contract FunctionsBilling is Routable, IFunctionsBilling {
 
   /// @notice Gets the Chainlink Coordinator's billing configuration
   /// @return config
-  function getConfig() external view returns (Config memory) {
+  function getConfig() external view returns (FunctionsBillingConfig memory) {
     return s_config;
   }
 
   /// @notice Sets the Chainlink Coordinator's billing configuration
-  /// @param config - See the contents of the Config struct in IFunctionsBilling.Config for more information
-  function updateConfig(Config memory config) public {
+  /// @param config - See the contents of the FunctionsBillingConfig struct in IFunctionsBilling.sol for more information
+  function updateConfig(FunctionsBillingConfig memory config) public {
     _onlyOwner();
 
     s_config = config;
@@ -122,7 +106,7 @@ abstract contract FunctionsBilling is Routable, IFunctionsBilling {
 
   /// @inheritdoc IFunctionsBilling
   function getWeiPerUnitLink() public view returns (uint256) {
-    Config memory config = s_config;
+    FunctionsBillingConfig memory config = s_config;
     (, int256 weiPerUnitLink, , uint256 timestamp, ) = s_linkToNativeFeed.latestRoundData();
     // solhint-disable-next-line not-rely-on-time
     if (config.feedStalenessSeconds < block.timestamp - timestamp && config.feedStalenessSeconds > 0) {
@@ -199,7 +183,7 @@ abstract contract FunctionsBilling is Routable, IFunctionsBilling {
   function _startBilling(
     FunctionsResponse.RequestMeta memory request
   ) internal returns (FunctionsResponse.Commitment memory commitment) {
-    Config memory config = s_config;
+    FunctionsBillingConfig memory config = s_config;
 
     // Nodes should support all past versions of the structure
     if (request.dataVersion > config.maxSupportedRequestDataVersion) {
diff --git a/contracts/src/v0.8/functions/dev/v1_X/FunctionsCoordinator.sol b/contracts/src/v0.8/functions/dev/v1_X/FunctionsCoordinator.sol
index 16e9029ce3f..33c45c218d4 100644
--- a/contracts/src/v0.8/functions/dev/v1_X/FunctionsCoordinator.sol
+++ b/contracts/src/v0.8/functions/dev/v1_X/FunctionsCoordinator.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.19;
 import {IFunctionsCoordinator} from "./interfaces/IFunctionsCoordinator.sol";
 import {ITypeAndVersion} from "../../../shared/interfaces/ITypeAndVersion.sol";
 
-import {FunctionsBilling} from "./FunctionsBilling.sol";
+import {FunctionsBilling, FunctionsBillingConfig} from "./FunctionsBilling.sol";
 import {OCR2Base} from "./ocr/OCR2Base.sol";
 import {FunctionsResponse} from "./libraries/FunctionsResponse.sol";
 
@@ -17,7 +17,7 @@ contract FunctionsCoordinator is OCR2Base, IFunctionsCoordinator, FunctionsBilli
 
   /// @inheritdoc ITypeAndVersion
   // solhint-disable-next-line chainlink-solidity/all-caps-constant-storage-variables
-  string public constant override typeAndVersion = "Functions Coordinator v1.1.0";
+  string public constant override typeAndVersion = "Functions Coordinator v1.2.0";
 
   event OracleRequest(
     bytes32 indexed requestId,
@@ -42,7 +42,7 @@ contract FunctionsCoordinator is OCR2Base, IFunctionsCoordinator, FunctionsBilli
 
   constructor(
     address router,
-    Config memory config,
+    FunctionsBillingConfig memory config,
     address linkToNativeFeed
   ) OCR2Base() FunctionsBilling(router, config, linkToNativeFeed) {}
 
diff --git a/contracts/src/v0.8/functions/dev/v1_X/FunctionsRouter.sol b/contracts/src/v0.8/functions/dev/v1_X/FunctionsRouter.sol
index 2e12a75679a..d86d881151c 100644
--- a/contracts/src/v0.8/functions/dev/v1_X/FunctionsRouter.sol
+++ b/contracts/src/v0.8/functions/dev/v1_X/FunctionsRouter.sol
@@ -19,7 +19,7 @@ contract FunctionsRouter is IFunctionsRouter, FunctionsSubscriptions, Pausable,
   using FunctionsResponse for FunctionsResponse.FulfillResult;
 
   // solhint-disable-next-line chainlink-solidity/all-caps-constant-storage-variables
-  string public constant override typeAndVersion = "Functions Router v1.0.0";
+  string public constant override typeAndVersion = "Functions Router v2.0.0";
 
   // We limit return data to a selector plus 4 words. This is to avoid
   // malicious contracts from returning large amounts of data and causing
@@ -90,7 +90,7 @@ contract FunctionsRouter is IFunctionsRouter, FunctionsSubscriptions, Pausable,
     uint72 adminFee; //                             ║ Flat fee (in Juels of LINK) that will be paid to the Router owner for operation of the network
     bytes4 handleOracleFulfillmentSelector; //      ║ The function selector that is used when calling back to the Client contract
     uint16 gasForCallExactCheck; // ════════════════╝ Used during calling back to the client. Ensures we have at least enough gas to be able to revert if gasAmount >  63//64*gas available.
-    uint32[] maxCallbackGasLimits; // ══════════════╸ List of max callback gas limits used by flag with GAS_FLAG_INDEX
+    uint32[] maxCallbackGasLimits; // ══════════════╸ List of max callback gas limits used by flag with MAX_CALLBACK_GAS_LIMIT_FLAGS_INDEX
     uint16 subscriptionDepositMinimumRequests; //═══╗ Amount of requests that must be completed before the full subscription balance will be released when closing a subscription account.
     uint72 subscriptionDepositJuels; // ════════════╝ Amount of subscription funds that are held as a deposit until Config.subscriptionDepositMinimumRequests are made using the subscription.
   }
@@ -306,7 +306,7 @@ contract FunctionsRouter is IFunctionsRouter, FunctionsSubscriptions, Pausable,
     bytes memory response,
     bytes memory err,
     uint96 juelsPerGas,
-    uint96 costWithoutCallback,
+    uint96 costWithoutFulfillment,
     address transmitter,
     FunctionsResponse.Commitment memory commitment
   ) external override returns (FunctionsResponse.FulfillResult resultCode, uint96) {
@@ -341,7 +341,7 @@ contract FunctionsRouter is IFunctionsRouter, FunctionsSubscriptions, Pausable,
 
     {
       uint96 callbackCost = juelsPerGas * SafeCast.toUint96(commitment.callbackGasLimit);
-      uint96 totalCostJuels = commitment.adminFee + costWithoutCallback + callbackCost;
+      uint96 totalCostJuels = commitment.adminFee + costWithoutFulfillment + callbackCost;
 
       // Check that the subscription can still afford to fulfill the request
       if (totalCostJuels > getSubscription(commitment.subscriptionId).balance) {
@@ -379,7 +379,7 @@ contract FunctionsRouter is IFunctionsRouter, FunctionsSubscriptions, Pausable,
       commitment.adminFee,
       juelsPerGas,
       SafeCast.toUint96(result.gasUsed),
-      costWithoutCallback
+      costWithoutFulfillment
     );
 
     emit RequestProcessed({
diff --git a/contracts/src/v0.8/functions/dev/v1_X/accessControl/TermsOfServiceAllowList.sol b/contracts/src/v0.8/functions/dev/v1_X/accessControl/TermsOfServiceAllowList.sol
index b36d063ad7d..3bb7c7b04cc 100644
--- a/contracts/src/v0.8/functions/dev/v1_X/accessControl/TermsOfServiceAllowList.sol
+++ b/contracts/src/v0.8/functions/dev/v1_X/accessControl/TermsOfServiceAllowList.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.19;
 
-import {ITermsOfServiceAllowList} from "./interfaces/ITermsOfServiceAllowList.sol";
+import {ITermsOfServiceAllowList, TermsOfServiceAllowListConfig} from "./interfaces/ITermsOfServiceAllowList.sol";
 import {IAccessController} from "../../../../shared/interfaces/IAccessController.sol";
 import {ITypeAndVersion} from "../../../../shared/interfaces/ITypeAndVersion.sol";
 
@@ -17,7 +17,7 @@ contract TermsOfServiceAllowList is ITermsOfServiceAllowList, IAccessController,
 
   /// @inheritdoc ITypeAndVersion
   // solhint-disable-next-line chainlink-solidity/all-caps-constant-storage-variables
-  string public constant override typeAndVersion = "Functions Terms of Service Allow List v1.0.0";
+  string public constant override typeAndVersion = "Functions Terms of Service Allow List v1.1.0";
 
   EnumerableSet.AddressSet private s_allowedSenders;
   mapping(address => bool) private s_blockedSenders;
@@ -30,23 +30,15 @@ contract TermsOfServiceAllowList is ITermsOfServiceAllowList, IAccessController,
   error InvalidUsage();
   error RecipientIsBlocked();
 
-  // ================================================================
-  // |                     Configuration state                      |
-  // ================================================================
-  struct Config {
-    bool enabled; // ═════════════╗ When enabled, access will be checked against s_allowedSenders. When disabled, all access will be allowed.
-    address signerPublicKey; // ══╝ The key pair that needs to sign the acceptance data
-  }
+  TermsOfServiceAllowListConfig private s_config;
 
-  Config private s_config;
-
-  event ConfigUpdated(Config config);
+  event ConfigUpdated(TermsOfServiceAllowListConfig config);
 
   // ================================================================
   // |                       Initialization                         |
   // ================================================================
 
-  constructor(Config memory config) ConfirmedOwner(msg.sender) {
+  constructor(TermsOfServiceAllowListConfig memory config) ConfirmedOwner(msg.sender) {
     updateConfig(config);
   }
 
@@ -56,13 +48,13 @@ contract TermsOfServiceAllowList is ITermsOfServiceAllowList, IAccessController,
 
   /// @notice Gets the contracts's configuration
   /// @return config
-  function getConfig() external view returns (Config memory) {
+  function getConfig() external view returns (TermsOfServiceAllowListConfig memory) {
     return s_config;
   }
 
   /// @notice Sets the contracts's configuration
-  /// @param config - See the contents of the TermsOfServiceAllowList.Config struct for more information
-  function updateConfig(Config memory config) public onlyOwner {
+  /// @param config - See the contents of the TermsOfServiceAllowListConfig struct in ITermsOfServiceAllowList.sol for more information
+  function updateConfig(TermsOfServiceAllowListConfig memory config) public onlyOwner {
     s_config = config;
     emit ConfigUpdated(config);
   }
@@ -99,8 +91,9 @@ contract TermsOfServiceAllowList is ITermsOfServiceAllowList, IAccessController,
     }
 
     // Add recipient to the allow list
-    s_allowedSenders.add(recipient);
-    emit AddedAccess(recipient);
+    if (s_allowedSenders.add(recipient)) {
+      emit AddedAccess(recipient);
+    }
   }
 
   /// @inheritdoc ITermsOfServiceAllowList
diff --git a/contracts/src/v0.8/functions/dev/v1_X/accessControl/interfaces/ITermsOfServiceAllowList.sol b/contracts/src/v0.8/functions/dev/v1_X/accessControl/interfaces/ITermsOfServiceAllowList.sol
index af4daa18bc3..209d25c0ab3 100644
--- a/contracts/src/v0.8/functions/dev/v1_X/accessControl/interfaces/ITermsOfServiceAllowList.sol
+++ b/contracts/src/v0.8/functions/dev/v1_X/accessControl/interfaces/ITermsOfServiceAllowList.sol
@@ -38,3 +38,11 @@ interface ITermsOfServiceAllowList {
   /// @param sender - Address of the sender to unblock
   function unblockSender(address sender) external;
 }
+
+// ================================================================
+// |                     Configuration state                      |
+// ================================================================
+struct TermsOfServiceAllowListConfig {
+  bool enabled; // ═════════════╗ When enabled, access will be checked against s_allowedSenders. When disabled, all access will be allowed.
+  address signerPublicKey; // ══╝ The key pair that needs to sign the acceptance data
+}
diff --git a/contracts/src/v0.8/functions/dev/v1_X/interfaces/IFunctionsBilling.sol b/contracts/src/v0.8/functions/dev/v1_X/interfaces/IFunctionsBilling.sol
index 6291d05e57c..0bd7817f779 100644
--- a/contracts/src/v0.8/functions/dev/v1_X/interfaces/IFunctionsBilling.sol
+++ b/contracts/src/v0.8/functions/dev/v1_X/interfaces/IFunctionsBilling.sol
@@ -40,5 +40,22 @@ interface IFunctionsBilling {
   function oracleWithdraw(address recipient, uint96 amount) external;
 
   /// @notice Withdraw all LINK earned by Oracles through fulfilling requests
+  /// @dev transmitter addresses must support LINK tokens to avoid tokens from getting stuck as oracleWithdrawAll() calls will forward tokens directly to transmitters
   function oracleWithdrawAll() external;
 }
+
+// ================================================================
+// |                     Configuration state                      |
+// ================================================================
+
+struct FunctionsBillingConfig {
+  uint32 fulfillmentGasPriceOverEstimationBP; // ══╗ Percentage of gas price overestimation to account for changes in gas price between request and response. Held as basis points (one hundredth of 1 percentage point)
+  uint32 feedStalenessSeconds; //                  ║ How long before we consider the feed price to be stale and fallback to fallbackNativePerUnitLink.
+  uint32 gasOverheadBeforeCallback; //             ║ Represents the average gas execution cost before the fulfillment callback. This amount is always billed for every request.
+  uint32 gasOverheadAfterCallback; //              ║ Represents the average gas execution cost after the fulfillment callback. This amount is always billed for every request.
+  uint72 donFee; //                                ║ Additional flat fee (in Juels of LINK) that will be split between Node Operators. Max value is 2^80 - 1 == 1.2m LINK.
+  uint40 minimumEstimateGasPriceWei; //            ║ The lowest amount of wei that will be used as the tx.gasprice when estimating the cost to fulfill the request
+  uint16 maxSupportedRequestDataVersion; // ═══════╝ The highest support request data version supported by the node. All lower versions should also be supported.
+  uint224 fallbackNativePerUnitLink; // ═══════════╗ Fallback NATIVE CURRENCY / LINK conversion rate if the data feed is stale
+  uint32 requestTimeoutSeconds; // ════════════════╝ How many seconds it takes before we consider a request to be timed out
+}
diff --git a/contracts/src/v0.8/functions/tests/v1_X/FunctionsBilling.t.sol b/contracts/src/v0.8/functions/tests/v1_X/FunctionsBilling.t.sol
index 739521c5305..66640003427 100644
--- a/contracts/src/v0.8/functions/tests/v1_X/FunctionsBilling.t.sol
+++ b/contracts/src/v0.8/functions/tests/v1_X/FunctionsBilling.t.sol
@@ -10,6 +10,8 @@ import {Routable} from "../../dev/v1_X/Routable.sol";
 
 import {FunctionsRouterSetup, FunctionsSubscriptionSetup, FunctionsClientRequestSetup, FunctionsFulfillmentSetup, FunctionsMultipleFulfillmentsSetup} from "./Setup.t.sol";
 
+import {FunctionsBillingConfig} from "../../dev/v1_X/interfaces/IFunctionsBilling.sol";
+
 /// @notice #constructor
 contract FunctionsBilling_Constructor is FunctionsSubscriptionSetup {
   function test_Constructor_Success() public {
@@ -25,7 +27,7 @@ contract FunctionsBilling_GetConfig is FunctionsRouterSetup {
     vm.stopPrank();
     vm.startPrank(STRANGER_ADDRESS);
 
-    FunctionsBilling.Config memory config = s_functionsCoordinator.getConfig();
+    FunctionsBillingConfig memory config = s_functionsCoordinator.getConfig();
     assertEq(config.feedStalenessSeconds, getCoordinatorConfig().feedStalenessSeconds);
     assertEq(config.gasOverheadBeforeCallback, getCoordinatorConfig().gasOverheadBeforeCallback);
     assertEq(config.gasOverheadAfterCallback, getCoordinatorConfig().gasOverheadAfterCallback);
@@ -39,12 +41,12 @@ contract FunctionsBilling_GetConfig is FunctionsRouterSetup {
 
 /// @notice #updateConfig
 contract FunctionsBilling_UpdateConfig is FunctionsRouterSetup {
-  FunctionsBilling.Config internal configToSet;
+  FunctionsBillingConfig internal configToSet;
 
   function setUp() public virtual override {
     FunctionsRouterSetup.setUp();
 
-    configToSet = FunctionsBilling.Config({
+    configToSet = FunctionsBillingConfig({
       feedStalenessSeconds: getCoordinatorConfig().feedStalenessSeconds * 2,
       gasOverheadAfterCallback: getCoordinatorConfig().gasOverheadAfterCallback * 2,
       gasOverheadBeforeCallback: getCoordinatorConfig().gasOverheadBeforeCallback * 2,
@@ -66,7 +68,7 @@ contract FunctionsBilling_UpdateConfig is FunctionsRouterSetup {
     s_functionsCoordinator.updateConfig(configToSet);
   }
 
-  event ConfigUpdated(FunctionsBilling.Config config);
+  event ConfigUpdated(FunctionsBillingConfig config);
 
   function test_UpdateConfig_Success() public {
     // topic0 (function signature, always checked), NOT topic1 (false), NOT topic2 (false), NOT topic3 (false), and data (true).
@@ -79,7 +81,7 @@ contract FunctionsBilling_UpdateConfig is FunctionsRouterSetup {
 
     s_functionsCoordinator.updateConfig(configToSet);
 
-    FunctionsBilling.Config memory config = s_functionsCoordinator.getConfig();
+    FunctionsBillingConfig memory config = s_functionsCoordinator.getConfig();
     assertEq(config.feedStalenessSeconds, configToSet.feedStalenessSeconds);
     assertEq(config.gasOverheadAfterCallback, configToSet.gasOverheadAfterCallback);
     assertEq(config.gasOverheadBeforeCallback, configToSet.gasOverheadBeforeCallback);
diff --git a/contracts/src/v0.8/functions/tests/v1_X/FunctionsCoordinator.t.sol b/contracts/src/v0.8/functions/tests/v1_X/FunctionsCoordinator.t.sol
index f6d3d41e632..c21a2c090f7 100644
--- a/contracts/src/v0.8/functions/tests/v1_X/FunctionsCoordinator.t.sol
+++ b/contracts/src/v0.8/functions/tests/v1_X/FunctionsCoordinator.t.sol
@@ -14,7 +14,7 @@ import {FunctionsRouterSetup, FunctionsDONSetup, FunctionsSubscriptionSetup} fro
 /// @notice #constructor
 contract FunctionsCoordinator_Constructor is FunctionsRouterSetup {
   function test_Constructor_Success() public {
-    assertEq(s_functionsCoordinator.typeAndVersion(), "Functions Coordinator v1.1.0");
+    assertEq(s_functionsCoordinator.typeAndVersion(), "Functions Coordinator v1.2.0");
     assertEq(s_functionsCoordinator.owner(), OWNER_ADDRESS);
   }
 }
diff --git a/contracts/src/v0.8/functions/tests/v1_X/FunctionsRouter.t.sol b/contracts/src/v0.8/functions/tests/v1_X/FunctionsRouter.t.sol
index 081fe2f6649..43540ba02b8 100644
--- a/contracts/src/v0.8/functions/tests/v1_X/FunctionsRouter.t.sol
+++ b/contracts/src/v0.8/functions/tests/v1_X/FunctionsRouter.t.sol
@@ -21,7 +21,7 @@ import "forge-std/Vm.sol";
 /// @notice #constructor
 contract FunctionsRouter_Constructor is FunctionsRouterSetup {
   function test_Constructor_Success() public {
-    assertEq(s_functionsRouter.typeAndVersion(), "Functions Router v1.0.0");
+    assertEq(s_functionsRouter.typeAndVersion(), "Functions Router v2.0.0");
     assertEq(s_functionsRouter.owner(), OWNER_ADDRESS);
   }
 }
diff --git a/contracts/src/v0.8/functions/tests/v1_X/FunctionsTermsOfServiceAllowList.t.sol b/contracts/src/v0.8/functions/tests/v1_X/FunctionsTermsOfServiceAllowList.t.sol
index 450ec48d504..08c981dd4f9 100644
--- a/contracts/src/v0.8/functions/tests/v1_X/FunctionsTermsOfServiceAllowList.t.sol
+++ b/contracts/src/v0.8/functions/tests/v1_X/FunctionsTermsOfServiceAllowList.t.sol
@@ -2,14 +2,16 @@
 pragma solidity ^0.8.19;
 
 import {TermsOfServiceAllowList} from "../../dev/v1_X/accessControl/TermsOfServiceAllowList.sol";
+import {TermsOfServiceAllowListConfig} from "../../dev/v1_X/accessControl/interfaces/ITermsOfServiceAllowList.sol";
 import {FunctionsClientTestHelper} from "./testhelpers/FunctionsClientTestHelper.sol";
 
 import {FunctionsRoutesSetup, FunctionsOwnerAcceptTermsOfServiceSetup} from "./Setup.t.sol";
+import "forge-std/Vm.sol";
 
 /// @notice #constructor
 contract FunctionsTermsOfServiceAllowList_Constructor is FunctionsRoutesSetup {
   function test_Constructor_Success() public {
-    assertEq(s_termsOfServiceAllowList.typeAndVersion(), "Functions Terms of Service Allow List v1.0.0");
+    assertEq(s_termsOfServiceAllowList.typeAndVersion(), "Functions Terms of Service Allow List v1.1.0");
     assertEq(s_termsOfServiceAllowList.owner(), OWNER_ADDRESS);
   }
 }
@@ -21,7 +23,7 @@ contract FunctionsTermsOfServiceAllowList_GetConfig is FunctionsRoutesSetup {
     vm.stopPrank();
     vm.startPrank(STRANGER_ADDRESS);
 
-    TermsOfServiceAllowList.Config memory config = s_termsOfServiceAllowList.getConfig();
+    TermsOfServiceAllowListConfig memory config = s_termsOfServiceAllowList.getConfig();
     assertEq(config.enabled, getTermsOfServiceConfig().enabled);
     assertEq(config.signerPublicKey, getTermsOfServiceConfig().signerPublicKey);
   }
@@ -36,14 +38,14 @@ contract FunctionsTermsOfServiceAllowList_UpdateConfig is FunctionsRoutesSetup {
 
     vm.expectRevert("Only callable by owner");
     s_termsOfServiceAllowList.updateConfig(
-      TermsOfServiceAllowList.Config({enabled: true, signerPublicKey: STRANGER_ADDRESS})
+      TermsOfServiceAllowListConfig({enabled: true, signerPublicKey: STRANGER_ADDRESS})
     );
   }
 
-  event ConfigUpdated(TermsOfServiceAllowList.Config config);
+  event ConfigUpdated(TermsOfServiceAllowListConfig config);
 
   function test_UpdateConfig_Success() public {
-    TermsOfServiceAllowList.Config memory configToSet = TermsOfServiceAllowList.Config({
+    TermsOfServiceAllowListConfig memory configToSet = TermsOfServiceAllowListConfig({
       enabled: false,
       signerPublicKey: TOS_SIGNER
     });
@@ -58,7 +60,7 @@ contract FunctionsTermsOfServiceAllowList_UpdateConfig is FunctionsRoutesSetup {
 
     s_termsOfServiceAllowList.updateConfig(configToSet);
 
-    TermsOfServiceAllowList.Config memory config = s_termsOfServiceAllowList.getConfig();
+    TermsOfServiceAllowListConfig memory config = s_termsOfServiceAllowList.getConfig();
     assertEq(config.enabled, configToSet.enabled);
     assertEq(config.signerPublicKey, configToSet.signerPublicKey);
   }
@@ -156,7 +158,7 @@ contract FunctionsTermsOfServiceAllowList_AcceptTermsOfService is FunctionsRoute
 
   function testAcceptTermsOfService_InvalidSigner_vuln() public {
     // Set the signer as the zero address
-    TermsOfServiceAllowList.Config memory allowListConfig;
+    TermsOfServiceAllowListConfig memory allowListConfig;
     allowListConfig.enabled = true;
     allowListConfig.signerPublicKey = address(0);
     s_termsOfServiceAllowList.updateConfig(allowListConfig);
@@ -197,11 +199,12 @@ contract FunctionsTermsOfServiceAllowList_AcceptTermsOfService is FunctionsRoute
 
     assertTrue(s_termsOfServiceAllowList.hasAccess(STRANGER_ADDRESS, new bytes(0)));
 
-    // Event emitted even though adding existing item into EnumerableSet set does nothing
-    // TODO: handle differently in contract
-    vm.expectEmit(checkTopic1, checkTopic2, checkTopic3, checkData);
-    emit AddedAccess(STRANGER_ADDRESS);
+    // Check the addedAccess is not emitted, given the recipient was already in the list
+    vm.recordLogs();
     s_termsOfServiceAllowList.acceptTermsOfService(STRANGER_ADDRESS, STRANGER_ADDRESS, r, s, v);
+    Vm.Log[] memory entries = vm.getRecordedLogs();
+    assertEq(entries.length, 0);
+
     assertTrue(s_termsOfServiceAllowList.hasAccess(STRANGER_ADDRESS, new bytes(0)));
   }
 
@@ -258,7 +261,7 @@ contract FunctionsTermsOfServiceAllowList_HasAccess is FunctionsRoutesSetup {
   function test_HasAccess_TrueWhenDisabled() public {
     // Disable allow list, which opens all access
     s_termsOfServiceAllowList.updateConfig(
-      TermsOfServiceAllowList.Config({enabled: false, signerPublicKey: TOS_SIGNER})
+      TermsOfServiceAllowListConfig({enabled: false, signerPublicKey: TOS_SIGNER})
     );
 
     // Send as stranger
diff --git a/contracts/src/v0.8/functions/tests/v1_X/Setup.t.sol b/contracts/src/v0.8/functions/tests/v1_X/Setup.t.sol
index 41ee663e8b0..0e131f9b89c 100644
--- a/contracts/src/v0.8/functions/tests/v1_X/Setup.t.sol
+++ b/contracts/src/v0.8/functions/tests/v1_X/Setup.t.sol
@@ -9,7 +9,9 @@ import {FunctionsBilling} from "../../dev/v1_X/FunctionsBilling.sol";
 import {FunctionsResponse} from "../../dev/v1_X/libraries/FunctionsResponse.sol";
 import {MockV3Aggregator} from "../../../tests/MockV3Aggregator.sol";
 import {TermsOfServiceAllowList} from "../../dev/v1_X/accessControl/TermsOfServiceAllowList.sol";
+import {TermsOfServiceAllowListConfig} from "../../dev/v1_X/accessControl/interfaces/ITermsOfServiceAllowList.sol";
 import {MockLinkToken} from "../../../mocks/MockLinkToken.sol";
+import {FunctionsBillingConfig} from "../../dev/v1_X/interfaces/IFunctionsBilling.sol";
 
 import "forge-std/Vm.sol";
 
@@ -64,9 +66,9 @@ contract FunctionsRouterSetup is BaseTest {
       });
   }
 
-  function getCoordinatorConfig() public view returns (FunctionsBilling.Config memory) {
+  function getCoordinatorConfig() public view returns (FunctionsBillingConfig memory) {
     return
-      FunctionsBilling.Config({
+      FunctionsBillingConfig({
         feedStalenessSeconds: 24 * 60 * 60, // 1 day
         gasOverheadAfterCallback: 93_942,
         gasOverheadBeforeCallback: 105_000,
@@ -79,8 +81,8 @@ contract FunctionsRouterSetup is BaseTest {
       });
   }
 
-  function getTermsOfServiceConfig() public view returns (TermsOfServiceAllowList.Config memory) {
-    return TermsOfServiceAllowList.Config({enabled: true, signerPublicKey: TOS_SIGNER});
+  function getTermsOfServiceConfig() public view returns (TermsOfServiceAllowListConfig memory) {
+    return TermsOfServiceAllowListConfig({enabled: true, signerPublicKey: TOS_SIGNER});
   }
 }
 
diff --git a/contracts/src/v0.8/functions/tests/v1_X/testhelpers/FunctionsCoordinatorHarness.sol b/contracts/src/v0.8/functions/tests/v1_X/testhelpers/FunctionsCoordinatorHarness.sol
index c1b6d5d0b14..15d9790f617 100644
--- a/contracts/src/v0.8/functions/tests/v1_X/testhelpers/FunctionsCoordinatorHarness.sol
+++ b/contracts/src/v0.8/functions/tests/v1_X/testhelpers/FunctionsCoordinatorHarness.sol
@@ -4,6 +4,7 @@ pragma solidity ^0.8.19;
 import {FunctionsCoordinator} from "../../../dev/v1_X/FunctionsCoordinator.sol";
 import {FunctionsBilling} from "../../../dev/v1_X/FunctionsBilling.sol";
 import {FunctionsResponse} from "../../../dev/v1_X/libraries/FunctionsResponse.sol";
+import {FunctionsBillingConfig} from "../../../dev/v1_X/interfaces/IFunctionsBilling.sol";
 
 /// @title Functions Coordinator Test Harness
 /// @notice Contract to expose internal functions for testing purposes
@@ -13,7 +14,7 @@ contract FunctionsCoordinatorHarness is FunctionsCoordinator {
 
   constructor(
     address router,
-    FunctionsBilling.Config memory config,
+    FunctionsBillingConfig memory config,
     address linkToNativeFeed
   ) FunctionsCoordinator(router, config, linkToNativeFeed) {
     s_linkToNativeFeed_HARNESS = linkToNativeFeed;
diff --git a/contracts/src/v0.8/functions/tests/v1_X/testhelpers/FunctionsCoordinatorTestHelper.sol b/contracts/src/v0.8/functions/tests/v1_X/testhelpers/FunctionsCoordinatorTestHelper.sol
index 5e57e62e599..1a7d721d63a 100644
--- a/contracts/src/v0.8/functions/tests/v1_X/testhelpers/FunctionsCoordinatorTestHelper.sol
+++ b/contracts/src/v0.8/functions/tests/v1_X/testhelpers/FunctionsCoordinatorTestHelper.sol
@@ -3,11 +3,12 @@ pragma solidity ^0.8.19;
 
 import {FunctionsCoordinator} from "../../../dev/v1_X/FunctionsCoordinator.sol";
 import {FunctionsBilling} from "../../../dev/v1_X/FunctionsBilling.sol";
+import {FunctionsBillingConfig} from "../../../dev/v1_X/interfaces/IFunctionsBilling.sol";
 
 contract FunctionsCoordinatorTestHelper is FunctionsCoordinator {
   constructor(
     address router,
-    FunctionsBilling.Config memory config,
+    FunctionsBillingConfig memory config,
     address linkToNativeFeed
   ) FunctionsCoordinator(router, config, linkToNativeFeed) {}
 
diff --git a/contracts/test/v0.8/functions/v1/FunctionsRouter.test.ts b/contracts/test/v0.8/functions/v1/FunctionsRouter.test.ts
index aecad5466bb..e484283e80b 100644
--- a/contracts/test/v0.8/functions/v1/FunctionsRouter.test.ts
+++ b/contracts/test/v0.8/functions/v1/FunctionsRouter.test.ts
@@ -20,7 +20,7 @@ describe('Functions Router - Request lifecycle', () => {
   describe('Config', () => {
     it('#typeAndVersion', async () => {
       expect(await contracts.router.typeAndVersion()).to.be.equal(
-        'Functions Router v1.0.0',
+        'Functions Router v2.0.0',
       )
     })
     it('non-owner is unable to update config', async () => {
diff --git a/core/gethwrappers/functions/generated/functions_allow_list/functions_allow_list.go b/core/gethwrappers/functions/generated/functions_allow_list/functions_allow_list.go
index 0ccb08cdaa9..b0c4894f14c 100644
--- a/core/gethwrappers/functions/generated/functions_allow_list/functions_allow_list.go
+++ b/core/gethwrappers/functions/generated/functions_allow_list/functions_allow_list.go
@@ -36,8 +36,8 @@ type TermsOfServiceAllowListConfig struct {
 }
 
 var TermsOfServiceAllowListMetaData = &bind.MetaData{
-	ABI: "[{\"inputs\":[{\"components\":[{\"internalType\":\"bool\",\"name\":\"enabled\",\"type\":\"bool\"},{\"internalType\":\"address\",\"name\":\"signerPublicKey\",\"type\":\"address\"}],\"internalType\":\"structTermsOfServiceAllowList.Config\",\"name\":\"config\",\"type\":\"tuple\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"inputs\":[],\"name\":\"InvalidSignature\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidUsage\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"RecipientIsBlocked\",\"type\":\"error\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"user\",\"type\":\"address\"}],\"name\":\"AddedAccess\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"user\",\"type\":\"address\"}],\"name\":\"BlockedAccess\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"components\":[{\"internalType\":\"bool\",\"name\":\"enabled\",\"type\":\"bool\"},{\"internalType\":\"address\",\"name\":\"signerPublicKey\",\"type\":\"address\"}],\"indexed\":false,\"internalType\":\"structTermsOfServiceAllowList.Config\",\"name\":\"config\",\"type\":\"tuple\"}],\"name\":\"ConfigUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"OwnershipTransferRequested\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"OwnershipTransferred\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"user\",\"type\":\"address\"}],\"name\":\"UnblockedAccess\",\"type\":\"event\"},{\"inputs\":[],\"name\":\"acceptOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"acceptor\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"recipient\",\"type\":\"address\"},{\"internalType\":\"bytes32\",\"name\":\"r\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"s\",\"type\":\"bytes32\"},{\"internalType\":\"uint8\",\"name\":\"v\",\"type\":\"uint8\"}],\"name\":\"acceptTermsOfService\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"}],\"name\":\"blockSender\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getAllAllowedSenders\",\"outputs\":[{\"internalType\":\"address[]\",\"name\":\"\",\"type\":\"address[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getConfig\",\"outputs\":[{\"components\":[{\"internalType\":\"bool\",\"name\":\"enabled\",\"type\":\"bool\"},{\"internalType\":\"address\",\"name\":\"signerPublicKey\",\"type\":\"address\"}],\"internalType\":\"structTermsOfServiceAllowList.Config\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"acceptor\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"recipient\",\"type\":\"address\"}],\"name\":\"getMessage\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"user\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"\",\"type\":\"bytes\"}],\"name\":\"hasAccess\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"}],\"name\":\"isBlockedSender\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"transferOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"typeAndVersion\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"}],\"name\":\"unblockSender\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"bool\",\"name\":\"enabled\",\"type\":\"bool\"},{\"internalType\":\"address\",\"name\":\"signerPublicKey\",\"type\":\"address\"}],\"internalType\":\"structTermsOfServiceAllowList.Config\",\"name\":\"config\",\"type\":\"tuple\"}],\"name\":\"updateConfig\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]",
-	Bin: "0x60806040523480156200001157600080fd5b50604051620012c4380380620012c4833981016040819052620000349162000269565b33806000816200008b5760405162461bcd60e51b815260206004820152601860248201527f43616e6e6f7420736574206f776e657220746f207a65726f000000000000000060448201526064015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0384811691909117909155811615620000be57620000be81620000d9565b505050620000d2816200018460201b60201c565b50620002ea565b336001600160a01b03821603620001335760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640162000082565b600180546001600160a01b0319166001600160a01b0383811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b6200018e6200020b565b805160058054602080850180516001600160a81b0319909316941515610100600160a81b03198116959095176101006001600160a01b039485160217909355604080519485529251909116908301527f0d22b8a99f411b3dd338c961284f608489ca0dab9cdad17366a343c361bcf80a910160405180910390a150565b6000546001600160a01b03163314620002675760405162461bcd60e51b815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e657200000000000000000000604482015260640162000082565b565b6000604082840312156200027c57600080fd5b604080519081016001600160401b0381118282101715620002ad57634e487b7160e01b600052604160045260246000fd5b60405282518015158114620002c157600080fd5b815260208301516001600160a01b0381168114620002de57600080fd5b60208201529392505050565b610fca80620002fa6000396000f3fe608060405234801561001057600080fd5b50600436106100df5760003560e01c806382184c7b1161008c578063a39b06e311610066578063a39b06e3146101b8578063a5e1d61d146101d9578063c3f909d4146101ec578063f2fde38b1461024b57600080fd5b806382184c7b1461016a57806389f9a2c41461017d5780638da5cb5b1461019057600080fd5b80636b14daf8116100bd5780636b14daf81461012a57806379ba50971461014d578063817ef62e1461015557600080fd5b8063181f5a77146100e45780633908c4d41461010257806347663acb14610117575b600080fd5b6100ec61025e565b6040516100f99190610c4f565b60405180910390f35b610115610110366004610ce4565b61027a565b005b610115610125366004610d45565b6104f0565b61013d610138366004610d60565b61057b565b60405190151581526020016100f9565b6101156105a5565b61015d6106a7565b6040516100f99190610de3565b610115610178366004610d45565b6106b8565b61011561018b366004610e3d565b61074b565b60005460405173ffffffffffffffffffffffffffffffffffffffff90911681526020016100f9565b6101cb6101c6366004610ec6565b610806565b6040519081526020016100f9565b61013d6101e7366004610d45565b610864565b60408051808201825260008082526020918201528151808301835260055460ff8116151580835273ffffffffffffffffffffffffffffffffffffffff6101009092048216928401928352845190815291511691810191909152016100f9565b610115610259366004610d45565b6108a5565b6040518060600160405280602c8152602001610f92602c913981565b73ffffffffffffffffffffffffffffffffffffffff841660009081526004602052604090205460ff16156102da576040517f62b7a34d00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60006102e68686610806565b6040517f19457468657265756d205369676e6564204d6573736167653a0a3332000000006020820152603c810191909152605c01604080518083037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe001815282825280516020918201206005546000855291840180845281905260ff8616928401929092526060830187905260808301869052909250610100900473ffffffffffffffffffffffffffffffffffffffff169060019060a0016020604051602081039080840390855afa1580156103c0573d6000803e3d6000fd5b5050506020604051035173ffffffffffffffffffffffffffffffffffffffff1614610417576040517f8baa579f00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b3373ffffffffffffffffffffffffffffffffffffffff861614158061045c57503373ffffffffffffffffffffffffffffffffffffffff87161480159061045c5750333b155b15610493576040517f381cfcbd00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b61049e6002866108b9565b5060405173ffffffffffffffffffffffffffffffffffffffff861681527f87286ad1f399c8e82bf0c4ef4fcdc570ea2e1e92176e5c848b6413545b885db49060200160405180910390a1505050505050565b6104f86108db565b73ffffffffffffffffffffffffffffffffffffffff811660008181526004602090815260409182902080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016905590519182527f28bbd0761309a99e8fb5e5d02ada0b7b2db2e5357531ff5dbfc205c3f5b6592b91015b60405180910390a150565b60055460009060ff166105905750600161059e565b61059b60028561095e565b90505b9392505050565b60015473ffffffffffffffffffffffffffffffffffffffff16331461062b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4d7573742062652070726f706f736564206f776e65720000000000000000000060448201526064015b60405180910390fd5b60008054337fffffffffffffffffffffffff00000000000000000000000000000000000000008083168217845560018054909116905560405173ffffffffffffffffffffffffffffffffffffffff90921692909183917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a350565b60606106b3600261098d565b905090565b6106c06108db565b6106cb60028261099a565b5073ffffffffffffffffffffffffffffffffffffffff811660008181526004602090815260409182902080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016600117905590519182527f337cd0f3f594112b6d830afb510072d3b08556b446514f73b8109162fd1151e19101610570565b6107536108db565b805160058054602080850180517fffffffffffffffffffffff0000000000000000000000000000000000000000009093169415157fffffffffffffffffffffff0000000000000000000000000000000000000000ff81169590951761010073ffffffffffffffffffffffffffffffffffffffff9485160217909355604080519485529251909116908301527f0d22b8a99f411b3dd338c961284f608489ca0dab9cdad17366a343c361bcf80a9101610570565b6040517fffffffffffffffffffffffffffffffffffffffff000000000000000000000000606084811b8216602084015283901b1660348201526000906048016040516020818303038152906040528051906020012090505b92915050565b60055460009060ff1661087957506000919050565b5073ffffffffffffffffffffffffffffffffffffffff1660009081526004602052604090205460ff1690565b6108ad6108db565b6108b6816109bc565b50565b600061059e8373ffffffffffffffffffffffffffffffffffffffff8416610ab1565b60005473ffffffffffffffffffffffffffffffffffffffff16331461095c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e6572000000000000000000006044820152606401610622565b565b73ffffffffffffffffffffffffffffffffffffffff81166000908152600183016020526040812054151561059e565b6060600061059e83610b00565b600061059e8373ffffffffffffffffffffffffffffffffffffffff8416610b5c565b3373ffffffffffffffffffffffffffffffffffffffff821603610a3b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c660000000000000000006044820152606401610622565b600180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff83811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b6000818152600183016020526040812054610af85750815460018181018455600084815260208082209093018490558454848252828601909352604090209190915561085e565b50600061085e565b606081600001805480602002602001604051908101604052809291908181526020018280548015610b5057602002820191906000526020600020905b815481526020019060010190808311610b3c575b50505050509050919050565b60008181526001830160205260408120548015610c45576000610b80600183610ef9565b8554909150600090610b9490600190610ef9565b9050818114610bf9576000866000018281548110610bb457610bb4610f33565b9060005260206000200154905080876000018481548110610bd757610bd7610f33565b6000918252602080832090910192909255918252600188019052604090208390555b8554869080610c0a57610c0a610f62565b60019003818190600052602060002001600090559055856001016000868152602001908152602001600020600090556001935050505061085e565b600091505061085e565b600060208083528351808285015260005b81811015610c7c57858101830151858201604001528201610c60565b5060006040828601015260407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f8301168501019250505092915050565b803573ffffffffffffffffffffffffffffffffffffffff81168114610cdf57600080fd5b919050565b600080600080600060a08688031215610cfc57600080fd5b610d0586610cbb565b9450610d1360208701610cbb565b93506040860135925060608601359150608086013560ff81168114610d3757600080fd5b809150509295509295909350565b600060208284031215610d5757600080fd5b61059e82610cbb565b600080600060408486031215610d7557600080fd5b610d7e84610cbb565b9250602084013567ffffffffffffffff80821115610d9b57600080fd5b818601915086601f830112610daf57600080fd5b813581811115610dbe57600080fd5b876020828501011115610dd057600080fd5b6020830194508093505050509250925092565b6020808252825182820181905260009190848201906040850190845b81811015610e3157835173ffffffffffffffffffffffffffffffffffffffff1683529284019291840191600101610dff565b50909695505050505050565b600060408284031215610e4f57600080fd5b6040516040810181811067ffffffffffffffff82111715610e99577f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b60405282358015158114610eac57600080fd5b8152610eba60208401610cbb565b60208201529392505050565b60008060408385031215610ed957600080fd5b610ee283610cbb565b9150610ef060208401610cbb565b90509250929050565b8181038181111561085e577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603160045260246000fdfe46756e6374696f6e73205465726d73206f66205365727669636520416c6c6f77204c6973742076312e302e30a164736f6c6343000813000a",
+	ABI: "[{\"inputs\":[{\"components\":[{\"internalType\":\"bool\",\"name\":\"enabled\",\"type\":\"bool\"},{\"internalType\":\"address\",\"name\":\"signerPublicKey\",\"type\":\"address\"}],\"internalType\":\"structTermsOfServiceAllowListConfig\",\"name\":\"config\",\"type\":\"tuple\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"inputs\":[],\"name\":\"InvalidSignature\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidUsage\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"RecipientIsBlocked\",\"type\":\"error\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"user\",\"type\":\"address\"}],\"name\":\"AddedAccess\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"user\",\"type\":\"address\"}],\"name\":\"BlockedAccess\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"components\":[{\"internalType\":\"bool\",\"name\":\"enabled\",\"type\":\"bool\"},{\"internalType\":\"address\",\"name\":\"signerPublicKey\",\"type\":\"address\"}],\"indexed\":false,\"internalType\":\"structTermsOfServiceAllowListConfig\",\"name\":\"config\",\"type\":\"tuple\"}],\"name\":\"ConfigUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"OwnershipTransferRequested\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"OwnershipTransferred\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"user\",\"type\":\"address\"}],\"name\":\"UnblockedAccess\",\"type\":\"event\"},{\"inputs\":[],\"name\":\"acceptOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"acceptor\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"recipient\",\"type\":\"address\"},{\"internalType\":\"bytes32\",\"name\":\"r\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"s\",\"type\":\"bytes32\"},{\"internalType\":\"uint8\",\"name\":\"v\",\"type\":\"uint8\"}],\"name\":\"acceptTermsOfService\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"}],\"name\":\"blockSender\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getAllAllowedSenders\",\"outputs\":[{\"internalType\":\"address[]\",\"name\":\"\",\"type\":\"address[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getConfig\",\"outputs\":[{\"components\":[{\"internalType\":\"bool\",\"name\":\"enabled\",\"type\":\"bool\"},{\"internalType\":\"address\",\"name\":\"signerPublicKey\",\"type\":\"address\"}],\"internalType\":\"structTermsOfServiceAllowListConfig\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"acceptor\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"recipient\",\"type\":\"address\"}],\"name\":\"getMessage\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"user\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"\",\"type\":\"bytes\"}],\"name\":\"hasAccess\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"}],\"name\":\"isBlockedSender\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"transferOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"typeAndVersion\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"}],\"name\":\"unblockSender\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"bool\",\"name\":\"enabled\",\"type\":\"bool\"},{\"internalType\":\"address\",\"name\":\"signerPublicKey\",\"type\":\"address\"}],\"internalType\":\"structTermsOfServiceAllowListConfig\",\"name\":\"config\",\"type\":\"tuple\"}],\"name\":\"updateConfig\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]",
+	Bin: "0x60806040523480156200001157600080fd5b50604051620012c9380380620012c9833981016040819052620000349162000269565b33806000816200008b5760405162461bcd60e51b815260206004820152601860248201527f43616e6e6f7420736574206f776e657220746f207a65726f000000000000000060448201526064015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0384811691909117909155811615620000be57620000be81620000d9565b505050620000d2816200018460201b60201c565b50620002ea565b336001600160a01b03821603620001335760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640162000082565b600180546001600160a01b0319166001600160a01b0383811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b6200018e6200020b565b805160058054602080850180516001600160a81b0319909316941515610100600160a81b03198116959095176101006001600160a01b039485160217909355604080519485529251909116908301527f0d22b8a99f411b3dd338c961284f608489ca0dab9cdad17366a343c361bcf80a910160405180910390a150565b6000546001600160a01b03163314620002675760405162461bcd60e51b815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e657200000000000000000000604482015260640162000082565b565b6000604082840312156200027c57600080fd5b604080519081016001600160401b0381118282101715620002ad57634e487b7160e01b600052604160045260246000fd5b60405282518015158114620002c157600080fd5b815260208301516001600160a01b0381168114620002de57600080fd5b60208201529392505050565b610fcf80620002fa6000396000f3fe608060405234801561001057600080fd5b50600436106100df5760003560e01c806382184c7b1161008c578063a39b06e311610066578063a39b06e3146101b8578063a5e1d61d146101d9578063c3f909d4146101ec578063f2fde38b1461024b57600080fd5b806382184c7b1461016a57806389f9a2c41461017d5780638da5cb5b1461019057600080fd5b80636b14daf8116100bd5780636b14daf81461012a57806379ba50971461014d578063817ef62e1461015557600080fd5b8063181f5a77146100e45780633908c4d41461010257806347663acb14610117575b600080fd5b6100ec61025e565b6040516100f99190610c54565b60405180910390f35b610115610110366004610ce9565b61027a565b005b610115610125366004610d4a565b6104f5565b61013d610138366004610d65565b610580565b60405190151581526020016100f9565b6101156105aa565b61015d6106ac565b6040516100f99190610de8565b610115610178366004610d4a565b6106bd565b61011561018b366004610e42565b610750565b60005460405173ffffffffffffffffffffffffffffffffffffffff90911681526020016100f9565b6101cb6101c6366004610ecb565b61080b565b6040519081526020016100f9565b61013d6101e7366004610d4a565b610869565b60408051808201825260008082526020918201528151808301835260055460ff8116151580835273ffffffffffffffffffffffffffffffffffffffff6101009092048216928401928352845190815291511691810191909152016100f9565b610115610259366004610d4a565b6108aa565b6040518060600160405280602c8152602001610f97602c913981565b73ffffffffffffffffffffffffffffffffffffffff841660009081526004602052604090205460ff16156102da576040517f62b7a34d00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60006102e6868661080b565b6040517f19457468657265756d205369676e6564204d6573736167653a0a3332000000006020820152603c810191909152605c01604080518083037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe001815282825280516020918201206005546000855291840180845281905260ff8616928401929092526060830187905260808301869052909250610100900473ffffffffffffffffffffffffffffffffffffffff169060019060a0016020604051602081039080840390855afa1580156103c0573d6000803e3d6000fd5b5050506020604051035173ffffffffffffffffffffffffffffffffffffffff1614610417576040517f8baa579f00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b3373ffffffffffffffffffffffffffffffffffffffff861614158061045c57503373ffffffffffffffffffffffffffffffffffffffff87161480159061045c5750333b155b15610493576040517f381cfcbd00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b61049e6002866108be565b156104ed5760405173ffffffffffffffffffffffffffffffffffffffff861681527f87286ad1f399c8e82bf0c4ef4fcdc570ea2e1e92176e5c848b6413545b885db49060200160405180910390a15b505050505050565b6104fd6108e0565b73ffffffffffffffffffffffffffffffffffffffff811660008181526004602090815260409182902080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016905590519182527f28bbd0761309a99e8fb5e5d02ada0b7b2db2e5357531ff5dbfc205c3f5b6592b91015b60405180910390a150565b60055460009060ff16610595575060016105a3565b6105a0600285610963565b90505b9392505050565b60015473ffffffffffffffffffffffffffffffffffffffff163314610630576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4d7573742062652070726f706f736564206f776e65720000000000000000000060448201526064015b60405180910390fd5b60008054337fffffffffffffffffffffffff00000000000000000000000000000000000000008083168217845560018054909116905560405173ffffffffffffffffffffffffffffffffffffffff90921692909183917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a350565b60606106b86002610992565b905090565b6106c56108e0565b6106d060028261099f565b5073ffffffffffffffffffffffffffffffffffffffff811660008181526004602090815260409182902080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016600117905590519182527f337cd0f3f594112b6d830afb510072d3b08556b446514f73b8109162fd1151e19101610575565b6107586108e0565b805160058054602080850180517fffffffffffffffffffffff0000000000000000000000000000000000000000009093169415157fffffffffffffffffffffff0000000000000000000000000000000000000000ff81169590951761010073ffffffffffffffffffffffffffffffffffffffff9485160217909355604080519485529251909116908301527f0d22b8a99f411b3dd338c961284f608489ca0dab9cdad17366a343c361bcf80a9101610575565b6040517fffffffffffffffffffffffffffffffffffffffff000000000000000000000000606084811b8216602084015283901b1660348201526000906048016040516020818303038152906040528051906020012090505b92915050565b60055460009060ff1661087e57506000919050565b5073ffffffffffffffffffffffffffffffffffffffff1660009081526004602052604090205460ff1690565b6108b26108e0565b6108bb816109c1565b50565b60006105a38373ffffffffffffffffffffffffffffffffffffffff8416610ab6565b60005473ffffffffffffffffffffffffffffffffffffffff163314610961576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e6572000000000000000000006044820152606401610627565b565b73ffffffffffffffffffffffffffffffffffffffff8116600090815260018301602052604081205415156105a3565b606060006105a383610b05565b60006105a38373ffffffffffffffffffffffffffffffffffffffff8416610b61565b3373ffffffffffffffffffffffffffffffffffffffff821603610a40576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c660000000000000000006044820152606401610627565b600180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff83811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b6000818152600183016020526040812054610afd57508154600181810184556000848152602080822090930184905584548482528286019093526040902091909155610863565b506000610863565b606081600001805480602002602001604051908101604052809291908181526020018280548015610b5557602002820191906000526020600020905b815481526020019060010190808311610b41575b50505050509050919050565b60008181526001830160205260408120548015610c4a576000610b85600183610efe565b8554909150600090610b9990600190610efe565b9050818114610bfe576000866000018281548110610bb957610bb9610f38565b9060005260206000200154905080876000018481548110610bdc57610bdc610f38565b6000918252602080832090910192909255918252600188019052604090208390555b8554869080610c0f57610c0f610f67565b600190038181906000526020600020016000905590558560010160008681526020019081526020016000206000905560019350505050610863565b6000915050610863565b600060208083528351808285015260005b81811015610c8157858101830151858201604001528201610c65565b5060006040828601015260407fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f8301168501019250505092915050565b803573ffffffffffffffffffffffffffffffffffffffff81168114610ce457600080fd5b919050565b600080600080600060a08688031215610d0157600080fd5b610d0a86610cc0565b9450610d1860208701610cc0565b93506040860135925060608601359150608086013560ff81168114610d3c57600080fd5b809150509295509295909350565b600060208284031215610d5c57600080fd5b6105a382610cc0565b600080600060408486031215610d7a57600080fd5b610d8384610cc0565b9250602084013567ffffffffffffffff80821115610da057600080fd5b818601915086601f830112610db457600080fd5b813581811115610dc357600080fd5b876020828501011115610dd557600080fd5b6020830194508093505050509250925092565b6020808252825182820181905260009190848201906040850190845b81811015610e3657835173ffffffffffffffffffffffffffffffffffffffff1683529284019291840191600101610e04565b50909695505050505050565b600060408284031215610e5457600080fd5b6040516040810181811067ffffffffffffffff82111715610e9e577f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b60405282358015158114610eb157600080fd5b8152610ebf60208401610cc0565b60208201529392505050565b60008060408385031215610ede57600080fd5b610ee783610cc0565b9150610ef560208401610cc0565b90509250929050565b81810381811115610863577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603160045260246000fdfe46756e6374696f6e73205465726d73206f66205365727669636520416c6c6f77204c6973742076312e312e30a164736f6c6343000813000a",
 }
 
 var TermsOfServiceAllowListABI = TermsOfServiceAllowListMetaData.ABI
diff --git a/core/gethwrappers/functions/generated/functions_coordinator/functions_coordinator.go b/core/gethwrappers/functions/generated/functions_coordinator/functions_coordinator.go
index 5f0d2d45f2d..a280297782e 100644
--- a/core/gethwrappers/functions/generated/functions_coordinator/functions_coordinator.go
+++ b/core/gethwrappers/functions/generated/functions_coordinator/functions_coordinator.go
@@ -71,8 +71,8 @@ type FunctionsResponseRequestMeta struct {
 }
 
 var FunctionsCoordinatorMetaData = &bind.MetaData{
-	ABI: "[{\"inputs\":[{\"internalType\":\"address\",\"name\":\"router\",\"type\":\"address\"},{\"components\":[{\"internalType\":\"uint32\",\"name\":\"fulfillmentGasPriceOverEstimationBP\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"feedStalenessSeconds\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"gasOverheadBeforeCallback\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"gasOverheadAfterCallback\",\"type\":\"uint32\"},{\"internalType\":\"uint72\",\"name\":\"donFee\",\"type\":\"uint72\"},{\"internalType\":\"uint40\",\"name\":\"minimumEstimateGasPriceWei\",\"type\":\"uint40\"},{\"internalType\":\"uint16\",\"name\":\"maxSupportedRequestDataVersion\",\"type\":\"uint16\"},{\"internalType\":\"uint224\",\"name\":\"fallbackNativePerUnitLink\",\"type\":\"uint224\"},{\"internalType\":\"uint32\",\"name\":\"requestTimeoutSeconds\",\"type\":\"uint32\"}],\"internalType\":\"structFunctionsBilling.Config\",\"name\":\"config\",\"type\":\"tuple\"},{\"internalType\":\"address\",\"name\":\"linkToNativeFeed\",\"type\":\"address\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"inputs\":[],\"name\":\"EmptyPublicKey\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InconsistentReportData\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InsufficientBalance\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidCalldata\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"message\",\"type\":\"string\"}],\"name\":\"InvalidConfig\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"int256\",\"name\":\"linkWei\",\"type\":\"int256\"}],\"name\":\"InvalidLinkWeiPrice\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidSubscription\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"owner\",\"type\":\"address\"}],\"name\":\"MustBeSubOwner\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"NoTransmittersSet\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"OnlyCallableByRouter\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"OnlyCallableByRouterOwner\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"PaymentTooLarge\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"message\",\"type\":\"string\"}],\"name\":\"ReportInvalid\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"RouterMustBeSet\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"UnauthorizedPublicKeyChange\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"UnauthorizedSender\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"UnsupportedRequestDataVersion\",\"type\":\"error\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"}],\"name\":\"CommitmentDeleted\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint32\",\"name\":\"previousConfigBlockNumber\",\"type\":\"uint32\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"configDigest\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"configCount\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"address[]\",\"name\":\"signers\",\"type\":\"address[]\"},{\"indexed\":false,\"internalType\":\"address[]\",\"name\":\"transmitters\",\"type\":\"address[]\"},{\"indexed\":false,\"internalType\":\"uint8\",\"name\":\"f\",\"type\":\"uint8\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"onchainConfig\",\"type\":\"bytes\"},{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"offchainConfigVersion\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"offchainConfig\",\"type\":\"bytes\"}],\"name\":\"ConfigSet\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"components\":[{\"internalType\":\"uint32\",\"name\":\"fulfillmentGasPriceOverEstimationBP\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"feedStalenessSeconds\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"gasOverheadBeforeCallback\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"gasOverheadAfterCallback\",\"type\":\"uint32\"},{\"internalType\":\"uint72\",\"name\":\"donFee\",\"type\":\"uint72\"},{\"internalType\":\"uint40\",\"name\":\"minimumEstimateGasPriceWei\",\"type\":\"uint40\"},{\"internalType\":\"uint16\",\"name\":\"maxSupportedRequestDataVersion\",\"type\":\"uint16\"},{\"internalType\":\"uint224\",\"name\":\"fallbackNativePerUnitLink\",\"type\":\"uint224\"},{\"internalType\":\"uint32\",\"name\":\"requestTimeoutSeconds\",\"type\":\"uint32\"}],\"indexed\":false,\"internalType\":\"structFunctionsBilling.Config\",\"name\":\"config\",\"type\":\"tuple\"}],\"name\":\"ConfigUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"requestingContract\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"requestInitiator\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"subscriptionOwner\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"indexed\":false,\"internalType\":\"uint16\",\"name\":\"dataVersion\",\"type\":\"uint16\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"flags\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"callbackGasLimit\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"},{\"internalType\":\"address\",\"name\":\"coordinator\",\"type\":\"address\"},{\"internalType\":\"uint96\",\"name\":\"estimatedTotalCostJuels\",\"type\":\"uint96\"},{\"internalType\":\"address\",\"name\":\"client\",\"type\":\"address\"},{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"internalType\":\"uint32\",\"name\":\"callbackGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint72\",\"name\":\"adminFee\",\"type\":\"uint72\"},{\"internalType\":\"uint72\",\"name\":\"donFee\",\"type\":\"uint72\"},{\"internalType\":\"uint40\",\"name\":\"gasOverheadBeforeCallback\",\"type\":\"uint40\"},{\"internalType\":\"uint40\",\"name\":\"gasOverheadAfterCallback\",\"type\":\"uint40\"},{\"internalType\":\"uint32\",\"name\":\"timeoutTimestamp\",\"type\":\"uint32\"}],\"indexed\":false,\"internalType\":\"structFunctionsResponse.Commitment\",\"name\":\"commitment\",\"type\":\"tuple\"}],\"name\":\"OracleRequest\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"transmitter\",\"type\":\"address\"}],\"name\":\"OracleResponse\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"OwnershipTransferRequested\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"OwnershipTransferred\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"uint96\",\"name\":\"juelsPerGas\",\"type\":\"uint96\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"l1FeeShareWei\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint96\",\"name\":\"callbackCostJuels\",\"type\":\"uint96\"},{\"indexed\":false,\"internalType\":\"uint96\",\"name\":\"totalCostJuels\",\"type\":\"uint96\"}],\"name\":\"RequestBilled\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"configDigest\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"uint32\",\"name\":\"epoch\",\"type\":\"uint32\"}],\"name\":\"Transmitted\",\"type\":\"event\"},{\"inputs\":[],\"name\":\"acceptOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"}],\"name\":\"deleteCommitment\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"internalType\":\"uint32\",\"name\":\"callbackGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint256\",\"name\":\"gasPriceWei\",\"type\":\"uint256\"}],\"name\":\"estimateCost\",\"outputs\":[{\"internalType\":\"uint96\",\"name\":\"\",\"type\":\"uint96\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getAdminFee\",\"outputs\":[{\"internalType\":\"uint72\",\"name\":\"\",\"type\":\"uint72\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getConfig\",\"outputs\":[{\"components\":[{\"internalType\":\"uint32\",\"name\":\"fulfillmentGasPriceOverEstimationBP\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"feedStalenessSeconds\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"gasOverheadBeforeCallback\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"gasOverheadAfterCallback\",\"type\":\"uint32\"},{\"internalType\":\"uint72\",\"name\":\"donFee\",\"type\":\"uint72\"},{\"internalType\":\"uint40\",\"name\":\"minimumEstimateGasPriceWei\",\"type\":\"uint40\"},{\"internalType\":\"uint16\",\"name\":\"maxSupportedRequestDataVersion\",\"type\":\"uint16\"},{\"internalType\":\"uint224\",\"name\":\"fallbackNativePerUnitLink\",\"type\":\"uint224\"},{\"internalType\":\"uint32\",\"name\":\"requestTimeoutSeconds\",\"type\":\"uint32\"}],\"internalType\":\"structFunctionsBilling.Config\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"\",\"type\":\"bytes\"}],\"name\":\"getDONFee\",\"outputs\":[{\"internalType\":\"uint72\",\"name\":\"\",\"type\":\"uint72\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getDONPublicKey\",\"outputs\":[{\"internalType\":\"bytes\",\"name\":\"\",\"type\":\"bytes\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getThresholdPublicKey\",\"outputs\":[{\"internalType\":\"bytes\",\"name\":\"\",\"type\":\"bytes\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getWeiPerUnitLink\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"latestConfigDetails\",\"outputs\":[{\"internalType\":\"uint32\",\"name\":\"configCount\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"blockNumber\",\"type\":\"uint32\"},{\"internalType\":\"bytes32\",\"name\":\"configDigest\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"latestConfigDigestAndEpoch\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"scanLogs\",\"type\":\"bool\"},{\"internalType\":\"bytes32\",\"name\":\"configDigest\",\"type\":\"bytes32\"},{\"internalType\":\"uint32\",\"name\":\"epoch\",\"type\":\"uint32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"recipient\",\"type\":\"address\"},{\"internalType\":\"uint96\",\"name\":\"amount\",\"type\":\"uint96\"}],\"name\":\"oracleWithdraw\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"oracleWithdrawAll\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"_signers\",\"type\":\"address[]\"},{\"internalType\":\"address[]\",\"name\":\"_transmitters\",\"type\":\"address[]\"},{\"internalType\":\"uint8\",\"name\":\"_f\",\"type\":\"uint8\"},{\"internalType\":\"bytes\",\"name\":\"_onchainConfig\",\"type\":\"bytes\"},{\"internalType\":\"uint64\",\"name\":\"_offchainConfigVersion\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"_offchainConfig\",\"type\":\"bytes\"}],\"name\":\"setConfig\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"donPublicKey\",\"type\":\"bytes\"}],\"name\":\"setDONPublicKey\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"thresholdPublicKey\",\"type\":\"bytes\"}],\"name\":\"setThresholdPublicKey\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"internalType\":\"bytes32\",\"name\":\"flags\",\"type\":\"bytes32\"},{\"internalType\":\"address\",\"name\":\"requestingContract\",\"type\":\"address\"},{\"internalType\":\"uint96\",\"name\":\"availableBalance\",\"type\":\"uint96\"},{\"internalType\":\"uint72\",\"name\":\"adminFee\",\"type\":\"uint72\"},{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"initiatedRequests\",\"type\":\"uint64\"},{\"internalType\":\"uint32\",\"name\":\"callbackGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"dataVersion\",\"type\":\"uint16\"},{\"internalType\":\"uint64\",\"name\":\"completedRequests\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"subscriptionOwner\",\"type\":\"address\"}],\"internalType\":\"structFunctionsResponse.RequestMeta\",\"name\":\"request\",\"type\":\"tuple\"}],\"name\":\"startRequest\",\"outputs\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"},{\"internalType\":\"address\",\"name\":\"coordinator\",\"type\":\"address\"},{\"internalType\":\"uint96\",\"name\":\"estimatedTotalCostJuels\",\"type\":\"uint96\"},{\"internalType\":\"address\",\"name\":\"client\",\"type\":\"address\"},{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"internalType\":\"uint32\",\"name\":\"callbackGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint72\",\"name\":\"adminFee\",\"type\":\"uint72\"},{\"internalType\":\"uint72\",\"name\":\"donFee\",\"type\":\"uint72\"},{\"internalType\":\"uint40\",\"name\":\"gasOverheadBeforeCallback\",\"type\":\"uint40\"},{\"internalType\":\"uint40\",\"name\":\"gasOverheadAfterCallback\",\"type\":\"uint40\"},{\"internalType\":\"uint32\",\"name\":\"timeoutTimestamp\",\"type\":\"uint32\"}],\"internalType\":\"structFunctionsResponse.Commitment\",\"name\":\"commitment\",\"type\":\"tuple\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"transferOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32[3]\",\"name\":\"reportContext\",\"type\":\"bytes32[3]\"},{\"internalType\":\"bytes\",\"name\":\"report\",\"type\":\"bytes\"},{\"internalType\":\"bytes32[]\",\"name\":\"rs\",\"type\":\"bytes32[]\"},{\"internalType\":\"bytes32[]\",\"name\":\"ss\",\"type\":\"bytes32[]\"},{\"internalType\":\"bytes32\",\"name\":\"rawVs\",\"type\":\"bytes32\"}],\"name\":\"transmit\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"transmitters\",\"outputs\":[{\"internalType\":\"address[]\",\"name\":\"\",\"type\":\"address[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"typeAndVersion\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"uint32\",\"name\":\"fulfillmentGasPriceOverEstimationBP\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"feedStalenessSeconds\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"gasOverheadBeforeCallback\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"gasOverheadAfterCallback\",\"type\":\"uint32\"},{\"internalType\":\"uint72\",\"name\":\"donFee\",\"type\":\"uint72\"},{\"internalType\":\"uint40\",\"name\":\"minimumEstimateGasPriceWei\",\"type\":\"uint40\"},{\"internalType\":\"uint16\",\"name\":\"maxSupportedRequestDataVersion\",\"type\":\"uint16\"},{\"internalType\":\"uint224\",\"name\":\"fallbackNativePerUnitLink\",\"type\":\"uint224\"},{\"internalType\":\"uint32\",\"name\":\"requestTimeoutSeconds\",\"type\":\"uint32\"}],\"internalType\":\"structFunctionsBilling.Config\",\"name\":\"config\",\"type\":\"tuple\"}],\"name\":\"updateConfig\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]",
-	Bin: "0x60a06040523480156200001157600080fd5b50604051620056d0380380620056d083398101604081905262000034916200046d565b8282828233806000816200008f5760405162461bcd60e51b815260206004820152601860248201527f43616e6e6f7420736574206f776e657220746f207a65726f000000000000000060448201526064015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0384811691909117909155811615620000c257620000c28162000139565b5050506001600160a01b038116620000ed57604051632530e88560e11b815260040160405180910390fd5b6001600160a01b03908116608052600b80549183166c01000000000000000000000000026001600160601b039092169190911790556200012d82620001e4565b5050505050506200062c565b336001600160a01b03821603620001935760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640162000086565b600180546001600160a01b0319166001600160a01b0383811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b620001ee62000342565b80516008805460208401516040808601516060870151608088015160a089015160c08a015161ffff16600160f01b026001600160f01b0364ffffffffff909216600160c81b0264ffffffffff60c81b196001600160481b03909416600160801b0293909316600160801b600160f01b031963ffffffff9586166c010000000000000000000000000263ffffffff60601b19978716680100000000000000000297909716600160401b600160801b0319998716640100000000026001600160401b0319909b169c87169c909c1799909917979097169990991793909317959095169390931793909317929092169390931790915560e0830151610100840151909216600160e01b026001600160e01b0390921691909117600955517f5f32d06f5e83eda3a68e0e964ef2e6af5cb613e8117aa103c2d6bca5f5184862906200033790839062000576565b60405180910390a150565b6200034c6200034e565b565b6000546001600160a01b031633146200034c5760405162461bcd60e51b815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e657200000000000000000000604482015260640162000086565b80516001600160a01b0381168114620003c257600080fd5b919050565b60405161012081016001600160401b0381118282101715620003f957634e487b7160e01b600052604160045260246000fd5b60405290565b805163ffffffff81168114620003c257600080fd5b80516001600160481b0381168114620003c257600080fd5b805164ffffffffff81168114620003c257600080fd5b805161ffff81168114620003c257600080fd5b80516001600160e01b0381168114620003c257600080fd5b60008060008385036101608112156200048557600080fd5b6200049085620003aa565b935061012080601f1983011215620004a757600080fd5b620004b1620003c7565b9150620004c160208701620003ff565b8252620004d160408701620003ff565b6020830152620004e460608701620003ff565b6040830152620004f760808701620003ff565b60608301526200050a60a0870162000414565b60808301526200051d60c087016200042c565b60a08301526200053060e0870162000442565b60c08301526101006200054581880162000455565b60e084015262000557828801620003ff565b908301525091506200056d6101408501620003aa565b90509250925092565b815163ffffffff908116825260208084015182169083015260408084015182169083015260608084015191821690830152610120820190506080830151620005c960808401826001600160481b03169052565b5060a0830151620005e360a084018264ffffffffff169052565b5060c0830151620005fa60c084018261ffff169052565b5060e08301516200061660e08401826001600160e01b03169052565b506101009283015163ffffffff16919092015290565b60805161505e6200067260003960008181610845015281816109d301528181610ca601528181610f3a01528181611045015281816117890152613490015261505e6000f3fe608060405234801561001057600080fd5b506004361061018d5760003560e01c806381ff7048116100e3578063c3f909d41161008c578063e3d0e71211610066578063e3d0e71214610560578063e4ddcea614610573578063f2fde38b1461058957600080fd5b8063c3f909d4146103b0578063d227d24514610528578063d328a91e1461055857600080fd5b8063a631571e116100bd578063a631571e1461035d578063afcb95d71461037d578063b1dc65a41461039d57600080fd5b806381ff7048146102b557806385b214cf146103225780638da5cb5b1461033557600080fd5b806366316d8d116101455780637f15e1661161011f5780637f15e16614610285578063814118341461029857806381f1b938146102ad57600080fd5b806366316d8d1461026257806379ba5097146102755780637d4807871461027d57600080fd5b8063181f5a7711610176578063181f5a77146101ba5780632a905ccc1461020c57806359b5b7ac1461022e57600080fd5b8063083a5466146101925780631112dadc146101a7575b600080fd5b6101a56101a03660046139d4565b61059c565b005b6101a56101b5366004613b7d565b6105f1565b6101f66040518060400160405280601c81526020017f46756e6374696f6e7320436f6f7264696e61746f722076312e312e300000000081525081565b6040516102039190613ca1565b60405180910390f35b610214610841565b60405168ffffffffffffffffff9091168152602001610203565b61021461023c366004613d42565b50600854700100000000000000000000000000000000900468ffffffffffffffffff1690565b6101a5610270366004613dd1565b6108d7565b6101a5610a90565b6101a5610b92565b6101a56102933660046139d4565b610d92565b6102a0610de2565b6040516102039190613e5b565b6101f6610e51565b6102ff60015460025463ffffffff74010000000000000000000000000000000000000000830481169378010000000000000000000000000000000000000000000000009093041691565b6040805163ffffffff948516815293909216602084015290820152606001610203565b6101a5610330366004613e6e565b610f22565b60005460405173ffffffffffffffffffffffffffffffffffffffff9091168152602001610203565b61037061036b366004613e87565b610fd4565b6040516102039190613fdc565b604080516001815260006020820181905291810191909152606001610203565b6101a56103ab366004614030565b611175565b61051b6040805161012081018252600080825260208201819052918101829052606081018290526080810182905260a0810182905260c0810182905260e0810182905261010081019190915250604080516101208101825260085463ffffffff80821683526401000000008204811660208401526801000000000000000082048116938301939093526c01000000000000000000000000810483166060830152700100000000000000000000000000000000810468ffffffffffffffffff166080830152790100000000000000000000000000000000000000000000000000810464ffffffffff1660a08301527e01000000000000000000000000000000000000000000000000000000000000900461ffff1660c08201526009547bffffffffffffffffffffffffffffffffffffffffffffffffffffffff811660e08301527c0100000000000000000000000000000000000000000000000000000000900490911661010082015290565b60405161020391906140e7565b61053b6105363660046141d7565b611785565b6040516bffffffffffffffffffffffff9091168152602001610203565b6101f66118e5565b6101a561056e3660046142f0565b61193c565b61057b6124b8565b604051908152602001610203565b6101a56105973660046143bd565b612711565b6105a4612725565b60008190036105df576040517f4f42be3d00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600d6105ec828483614473565b505050565b6105f96127a8565b80516008805460208401516040808601516060870151608088015160a089015160c08a015161ffff167e01000000000000000000000000000000000000000000000000000000000000027dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff64ffffffffff909216790100000000000000000000000000000000000000000000000000027fffff0000000000ffffffffffffffffffffffffffffffffffffffffffffffffff68ffffffffffffffffff90941670010000000000000000000000000000000002939093167fffff0000000000000000000000000000ffffffffffffffffffffffffffffffff63ffffffff9586166c01000000000000000000000000027fffffffffffffffffffffffffffffffff00000000ffffffffffffffffffffffff9787166801000000000000000002979097167fffffffffffffffffffffffffffffffff0000000000000000ffffffffffffffff998716640100000000027fffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000909b169c87169c909c1799909917979097169990991793909317959095169390931793909317929092169390931790915560e08301516101008401519092167c0100000000000000000000000000000000000000000000000000000000027bffffffffffffffffffffffffffffffffffffffffffffffffffffffff90921691909117600955517f5f32d06f5e83eda3a68e0e964ef2e6af5cb613e8117aa103c2d6bca5f5184862906108369083906140e7565b60405180910390a150565b60007f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff16632a905ccc6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156108ae573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108d29190614599565b905090565b6108df6127b0565b806bffffffffffffffffffffffff166000036109195750336000908152600a60205260409020546bffffffffffffffffffffffff16610973565b336000908152600a60205260409020546bffffffffffffffffffffffff80831691161015610973576040517ff4d678b800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b336000908152600a6020526040812080548392906109a09084906bffffffffffffffffffffffff166145e5565b92506101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff1602179055506109f57f000000000000000000000000000000000000000000000000000000000000000090565b6040517f66316d8d00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff84811660048301526bffffffffffffffffffffffff8416602483015291909116906366316d8d90604401600060405180830381600087803b158015610a7457600080fd5b505af1158015610a88573d6000803e3d6000fd5b505050505050565b60015473ffffffffffffffffffffffffffffffffffffffff163314610b16576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4d7573742062652070726f706f736564206f776e65720000000000000000000060448201526064015b60405180910390fd5b60008054337fffffffffffffffffffffffff00000000000000000000000000000000000000008083168217845560018054909116905560405173ffffffffffffffffffffffffffffffffffffffff90921692909183917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a350565b610b9a6127a8565b610ba26127b0565b6000610bac610de2565b905060005b8151811015610d8e576000600a6000848481518110610bd257610bd261460a565b60209081029190910181015173ffffffffffffffffffffffffffffffffffffffff168252810191909152604001600020546bffffffffffffffffffffffff1690508015610d7d576000600a6000858581518110610c3157610c3161460a565b602002602001015173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff160217905550610cc87f000000000000000000000000000000000000000000000000000000000000000090565b73ffffffffffffffffffffffffffffffffffffffff166366316d8d848481518110610cf557610cf561460a565b6020026020010151836040518363ffffffff1660e01b8152600401610d4a92919073ffffffffffffffffffffffffffffffffffffffff9290921682526bffffffffffffffffffffffff16602082015260400190565b600060405180830381600087803b158015610d6457600080fd5b505af1158015610d78573d6000803e3d6000fd5b505050505b50610d8781614639565b9050610bb1565b5050565b610d9a612725565b6000819003610dd5576040517f4f42be3d00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600c6105ec828483614473565b60606006805480602002602001604051908101604052809291908181526020018280548015610e4757602002820191906000526020600020905b815473ffffffffffffffffffffffffffffffffffffffff168152600190910190602001808311610e1c575b5050505050905090565b6060600d8054610e60906143da565b9050600003610e9b576040517f4f42be3d00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600d8054610ea8906143da565b80601f0160208091040260200160405190810160405280929190818152602001828054610ed4906143da565b8015610e475780601f10610ef657610100808354040283529160200191610e47565b820191906000526020600020905b815481529060010190602001808311610f0457509395945050505050565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614610f91576040517fc41a5b0900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60008181526007602052604080822091909155517f8a4b97add3359bd6bcf5e82874363670eb5ad0f7615abddbd0ed0a3a98f0f416906108369083815260200190565b6040805161016081018252600080825260208201819052918101829052606081018290526080810182905260a0810182905260c0810182905260e08101829052610100810182905261012081018290526101408101919091523373ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000161461109c576040517fc41a5b0900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6110ad6110a883614671565b61295c565b90506110bf60608301604084016143bd565b815173ffffffffffffffffffffffffffffffffffffffff91909116907fbf50768ccf13bd0110ca6d53a9c4f1f3271abdd4c24a56878863ed25b20598ff3261110d60c0870160a0880161475e565b61111f610160880161014089016143bd565b611129888061477b565b61113b6101208b016101008c016147e0565b60208b01356111516101008d0160e08e016147fb565b8b60405161116799989796959493929190614818565b60405180910390a35b919050565b60005a604080518b3580825262ffffff6020808f0135600881901c929092169084015293945092917fb04e63db38c49950639fa09d29872f21f5d49d614f3a969d8adf3d4b52e41a62910160405180910390a16111d68a8a8a8a8a8a612dfa565b6003546000906002906111f49060ff808216916101009004166148c0565b6111fe9190614908565b6112099060016148c0565b60ff169050878114611277576040517f660bd4ba00000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f77726f6e67206e756d626572206f66207369676e6174757265730000000000006044820152606401610b0d565b878614611306576040517f660bd4ba00000000000000000000000000000000000000000000000000000000815260206004820152602860248201527f7265706f727420727320616e64207373206d757374206265206f66206571756160448201527f6c206c656e6774680000000000000000000000000000000000000000000000006064820152608401610b0d565b3360009081526004602090815260408083208151808301909252805460ff808216845292939192918401916101009091041660028111156113495761134961492a565b600281111561135a5761135a61492a565b90525090506002816020015160028111156113775761137761492a565b141580156113c057506006816000015160ff168154811061139a5761139a61460a565b60009182526020909120015473ffffffffffffffffffffffffffffffffffffffff163314155b15611427576040517f660bd4ba00000000000000000000000000000000000000000000000000000000815260206004820152601860248201527f756e617574686f72697a6564207472616e736d697474657200000000000000006044820152606401610b0d565b5050505061143361396c565b6000808a8a604051611446929190614959565b60405190819003812061145d918e90602001614969565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181528282528051602091820120838301909252600080845290830152915060005b898110156117675760006001848984602081106114c6576114c661460a565b6114d391901a601b6148c0565b8e8e868181106114e5576114e561460a565b905060200201358d8d878181106114fe576114fe61460a565b905060200201356040516000815260200160405260405161153b949392919093845260ff9290921660208401526040830152606082015260800190565b6020604051602081039080840390855afa15801561155d573d6000803e3d6000fd5b5050604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081015173ffffffffffffffffffffffffffffffffffffffff811660009081526004602090815290849020838501909452835460ff808216855292965092945084019161010090041660028111156115dd576115dd61492a565b60028111156115ee576115ee61492a565b905250925060018360200151600281111561160b5761160b61492a565b14611672576040517f660bd4ba00000000000000000000000000000000000000000000000000000000815260206004820152601e60248201527f61646472657373206e6f7420617574686f72697a656420746f207369676e00006044820152606401610b0d565b8251600090879060ff16601f811061168c5761168c61460a565b602002015173ffffffffffffffffffffffffffffffffffffffff161461170e576040517f660bd4ba00000000000000000000000000000000000000000000000000000000815260206004820152601460248201527f6e6f6e2d756e69717565207369676e61747572650000000000000000000000006044820152606401610b0d565b8086846000015160ff16601f81106117285761172861460a565b73ffffffffffffffffffffffffffffffffffffffff90921660209290920201526117536001866148c0565b9450508061176090614639565b90506114a7565b505050611778833383858e8e612eb1565b5050505050505050505050565b60007f00000000000000000000000000000000000000000000000000000000000000006040517f10fc49c100000000000000000000000000000000000000000000000000000000815267ffffffffffffffff8816600482015263ffffffff8516602482015273ffffffffffffffffffffffffffffffffffffffff91909116906310fc49c19060440160006040518083038186803b15801561182557600080fd5b505afa158015611839573d6000803e3d6000fd5b5050505066038d7ea4c6800082111561187e576040517f8129bbcd00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6000611888610841565b905060006118cb87878080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061023c92505050565b90506118d9858583856130b0565b98975050505050505050565b6060600c80546118f4906143da565b905060000361192f576040517f4f42be3d00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600c8054610ea8906143da565b855185518560ff16601f8311156119af576040517f89a6198900000000000000000000000000000000000000000000000000000000815260206004820152601060248201527f746f6f206d616e79207369676e657273000000000000000000000000000000006044820152606401610b0d565b80600003611a19576040517f89a6198900000000000000000000000000000000000000000000000000000000815260206004820152601260248201527f66206d75737420626520706f73697469766500000000000000000000000000006044820152606401610b0d565b818314611aa7576040517f89a61989000000000000000000000000000000000000000000000000000000008152602060048201526024808201527f6f7261636c6520616464726573736573206f7574206f6620726567697374726160448201527f74696f6e000000000000000000000000000000000000000000000000000000006064820152608401610b0d565b611ab281600361497d565b8311611b1a576040517f89a6198900000000000000000000000000000000000000000000000000000000815260206004820152601860248201527f6661756c74792d6f7261636c65206620746f6f206869676800000000000000006044820152606401610b0d565b611b22612725565b6040805160c0810182528a8152602081018a905260ff89169181018290526060810188905267ffffffffffffffff8716608082015260a0810186905290611b69908861321d565b60055415611d1e57600554600090611b8390600190614994565b9050600060058281548110611b9a57611b9a61460a565b60009182526020822001546006805473ffffffffffffffffffffffffffffffffffffffff90921693509084908110611bd457611bd461460a565b600091825260208083209091015473ffffffffffffffffffffffffffffffffffffffff85811684526004909252604080842080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000090811690915592909116808452922080549091169055600580549192509080611c5457611c546149a7565b60008281526020902081017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff90810180547fffffffffffffffffffffffff00000000000000000000000000000000000000001690550190556006805480611cbd57611cbd6149a7565b60008281526020902081017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff90810180547fffffffffffffffffffffffff000000000000000000000000000000000000000016905501905550611b69915050565b60005b8151518110156122d557815180516000919083908110611d4357611d4361460a565b602002602001015173ffffffffffffffffffffffffffffffffffffffff1603611dc8576040517f89a6198900000000000000000000000000000000000000000000000000000000815260206004820152601860248201527f7369676e6572206d757374206e6f7420626520656d70747900000000000000006044820152606401610b0d565b600073ffffffffffffffffffffffffffffffffffffffff1682602001518281518110611df657611df661460a565b602002602001015173ffffffffffffffffffffffffffffffffffffffff1603611e7b576040517f89a6198900000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f7472616e736d6974746572206d757374206e6f7420626520656d7074790000006044820152606401610b0d565b60006004600084600001518481518110611e9757611e9761460a565b60209081029190910181015173ffffffffffffffffffffffffffffffffffffffff16825281019190915260400160002054610100900460ff166002811115611ee157611ee161492a565b14611f48576040517f89a6198900000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f7265706561746564207369676e657220616464726573730000000000000000006044820152606401610b0d565b6040805180820190915260ff82168152600160208201528251805160049160009185908110611f7957611f7961460a565b60209081029190910181015173ffffffffffffffffffffffffffffffffffffffff168252818101929092526040016000208251815460ff9091167fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0082168117835592840151919283917fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000161761010083600281111561201a5761201a61492a565b02179055506000915061202a9050565b60046000846020015184815181106120445761204461460a565b60209081029190910181015173ffffffffffffffffffffffffffffffffffffffff16825281019190915260400160002054610100900460ff16600281111561208e5761208e61492a565b146120f5576040517f89a6198900000000000000000000000000000000000000000000000000000000815260206004820152601c60248201527f7265706561746564207472616e736d69747465722061646472657373000000006044820152606401610b0d565b6040805180820190915260ff8216815260208101600281525060046000846020015184815181106121285761212861460a565b60209081029190910181015173ffffffffffffffffffffffffffffffffffffffff168252818101929092526040016000208251815460ff9091167fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0082168117835592840151919283917fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000016176101008360028111156121c9576121c961492a565b0217905550508251805160059250839081106121e7576121e761460a565b602090810291909101810151825460018101845560009384529282902090920180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff90931692909217909155820151805160069190839081106122635761226361460a565b60209081029190910181015182546001810184556000938452919092200180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff909216919091179055806122cd81614639565b915050611d21565b506040810151600380547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660ff909216919091179055600180547fffffffff00000000ffffffffffffffffffffffffffffffffffffffffffffffff8116780100000000000000000000000000000000000000000000000063ffffffff438116820292909217808555920481169291829160149161238d918491740100000000000000000000000000000000000000009004166149d6565b92506101000a81548163ffffffff021916908363ffffffff1602179055506123ec4630600160149054906101000a900463ffffffff1663ffffffff16856000015186602001518760400151886060015189608001518a60a00151613236565b600281905582518051600380547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff1661010060ff9093169290920291909117905560015460208501516040808701516060880151608089015160a08a015193517f1591690b8638f5fb2dbec82ac741805ac5da8b45dc5263f4875b0496fdce4e05986124a3988b9891977401000000000000000000000000000000000000000090920463ffffffff169690959194919391926149f3565b60405180910390a15050505050505050505050565b604080516101208101825260085463ffffffff80821683526401000000008204811660208401526801000000000000000082048116838501526c0100000000000000000000000080830482166060850152700100000000000000000000000000000000830468ffffffffffffffffff166080850152790100000000000000000000000000000000000000000000000000830464ffffffffff1660a0808601919091527e0100000000000000000000000000000000000000000000000000000000000090930461ffff1660c08501526009547bffffffffffffffffffffffffffffffffffffffffffffffffffffffff811660e08601527c01000000000000000000000000000000000000000000000000000000009004909116610100840152600b5484517ffeaf968c00000000000000000000000000000000000000000000000000000000815294516000958694859490930473ffffffffffffffffffffffffffffffffffffffff169263feaf968c926004808401938290030181865afa158015612646573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061266a9190614aa3565b50935050925050804261267d9190614994565b836020015163ffffffff1610801561269f57506000836020015163ffffffff16115b156126cd57505060e001517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16919050565b6000821361270a576040517f43d4cf6600000000000000000000000000000000000000000000000000000000815260048101839052602401610b0d565b5092915050565b612719612725565b612722816132e1565b50565b60005473ffffffffffffffffffffffffffffffffffffffff1633146127a6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e6572000000000000000000006044820152606401610b0d565b565b6127a6612725565b600b546bffffffffffffffffffffffff166000036127ca57565b60006127d4610de2565b80519091506000819003612814576040517f30274b3a00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600b546000906128339083906bffffffffffffffffffffffff16614af3565b905060005b828110156128fe5781600a60008684815181106128575761285761460a565b602002602001015173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282829054906101000a90046bffffffffffffffffffffffff166128bf9190614b1e565b92506101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff160217905550806128f790614639565b9050612838565b506129098282614b43565b600b80546000906129299084906bffffffffffffffffffffffff166145e5565b92506101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff160217905550505050565b6040805161016081018252600080825260208201819052918101829052606081018290526080810182905260a0810182905260c0810182905260e0810182905261010081018290526101208101829052610140810191909152604080516101208101825260085463ffffffff80821683526401000000008204811660208401526801000000000000000082048116938301939093526c0100000000000000000000000081048316606083015268ffffffffffffffffff700100000000000000000000000000000000820416608083015264ffffffffff79010000000000000000000000000000000000000000000000000082041660a083015261ffff7e01000000000000000000000000000000000000000000000000000000000000909104811660c083018190526009547bffffffffffffffffffffffffffffffffffffffffffffffffffffffff811660e08501527c0100000000000000000000000000000000000000000000000000000000900490931661010080840191909152850151919291161115612b17576040517fdada758700000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600854600090700100000000000000000000000000000000900468ffffffffffffffffff1690506000612b548560e001513a8488608001516130b0565b9050806bffffffffffffffffffffffff1685606001516bffffffffffffffffffffffff161015612bb0576040517ff4d678b800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600083610100015163ffffffff1642612bc99190614b6b565b905060003087604001518860a001518960c001516001612be99190614b7e565b8a5180516020918201206101008d015160e08e0151604051612c9d98979695948c918c9132910173ffffffffffffffffffffffffffffffffffffffff9a8b168152988a1660208a015267ffffffffffffffff97881660408a0152959096166060880152608087019390935261ffff9190911660a086015263ffffffff90811660c08601526bffffffffffffffffffffffff9190911660e0850152919091166101008301529091166101208201526101400190565b6040516020818303038152906040528051906020012090506040518061016001604052808281526020013073ffffffffffffffffffffffffffffffffffffffff168152602001846bffffffffffffffffffffffff168152602001886040015173ffffffffffffffffffffffffffffffffffffffff1681526020018860a0015167ffffffffffffffff1681526020018860e0015163ffffffff168152602001886080015168ffffffffffffffffff1681526020018568ffffffffffffffffff168152602001866040015163ffffffff1664ffffffffff168152602001866060015163ffffffff1664ffffffffff1681526020018363ffffffff16815250955085604051602001612dac9190613fdc565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0818403018152918152815160209283012060009384526007909252909120555092949350505050565b6000612e0782602061497d565b612e1285602061497d565b612e1e88610144614b6b565b612e289190614b6b565b612e329190614b6b565b612e3d906000614b6b565b9050368114612ea8576040517f660bd4ba00000000000000000000000000000000000000000000000000000000815260206004820152601860248201527f63616c6c64617461206c656e677468206d69736d6174636800000000000000006044820152606401610b0d565b50505050505050565b600080808080612ec386880188614c7a565b84519499509297509095509350915060ff16801580612ee3575084518114155b80612eef575083518114155b80612efb575082518114155b80612f07575081518114155b15612f6e576040517f660bd4ba00000000000000000000000000000000000000000000000000000000815260206004820152601b60248201527f4669656c6473206d75737420626520657175616c206c656e67746800000000006044820152606401610b0d565b60005b818110156130a1576000613006888381518110612f9057612f9061460a565b6020026020010151888481518110612faa57612faa61460a565b6020026020010151888581518110612fc457612fc461460a565b6020026020010151888681518110612fde57612fde61460a565b6020026020010151888781518110612ff857612ff861460a565b6020026020010151886133d6565b9050600081600681111561301c5761301c61492a565b1480613039575060018160068111156130375761303761492a565b145b15613090578782815181106130505761305061460a565b60209081029190910181015160405133815290917fc708e0440951fd63499c0f7a73819b469ee5dd3ecc356c0ab4eb7f18389009d9910160405180910390a25b5061309a81614639565b9050612f71565b50505050505050505050505050565b600854600090790100000000000000000000000000000000000000000000000000900464ffffffffff1684101561310b57600854790100000000000000000000000000000000000000000000000000900464ffffffffff1693505b600854600090612710906131259063ffffffff168761497d565b61312f9190614d4c565b6131399086614b6b565b60085490915060009087906131729063ffffffff6c010000000000000000000000008204811691680100000000000000009004166149d6565b61317c91906149d6565b63ffffffff16905060006131c66000368080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152506136ea92505050565b905060006131e7826131d8858761497d565b6131e29190614b6b565b61382c565b9050600061320368ffffffffffffffffff808916908a16614b1e565b905061320f8183614b1e565b9a9950505050505050505050565b6000613227610de2565b511115610d8e57610d8e6127b0565b6000808a8a8a8a8a8a8a8a8a60405160200161325a99989796959493929190614d60565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815291905280516020909101207dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff167e01000000000000000000000000000000000000000000000000000000000000179150509998505050505050505050565b3373ffffffffffffffffffffffffffffffffffffffff821603613360576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c660000000000000000006044820152606401610b0d565b600180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff83811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b600080848060200190518101906133ed9190614e2c565b905060003a8261012001518361010001516134089190614ef4565b64ffffffffff16613419919061497d565b905060008460ff166134616000368080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152506136ea92505050565b61346b9190614d4c565b9050600061347c6131e28385614b6b565b905060006134893a61382c565b90506000807f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff1663330605298e8e868b60e0015168ffffffffffffffffff16896134e89190614b1e565b338d6040518763ffffffff1660e01b815260040161350b96959493929190614f12565b60408051808303816000875af1158015613529573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061354d9190614f8e565b909250905060008260068111156135665761356661492a565b1480613583575060018260068111156135815761358161492a565b145b156136d95760008e8152600760205260408120556135a18185614b1e565b336000908152600a6020526040812080547fffffffffffffffffffffffffffffffffffffffff000000000000000000000000166bffffffffffffffffffffffff93841617905560e0890151600b805468ffffffffffffffffff9092169390929161360d91859116614b1e565b92506101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff1602179055508d7f90815c2e624694e8010bffad2bcefaf96af282ef1bc2ebc0042d1b89a585e0468487848b60c0015168ffffffffffffffffff168c60e0015168ffffffffffffffffff16878b61368c9190614b1e565b6136969190614b1e565b6136a09190614b1e565b604080516bffffffffffffffffffffffff9586168152602081019490945291841683830152909216606082015290519081900360800190a25b509c9b505050505050505050505050565b6000466136f681613860565b1561377257606c73ffffffffffffffffffffffffffffffffffffffff1663c6f7de0e6040518163ffffffff1660e01b8152600401602060405180830381865afa158015613747573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061376b9190614fc1565b9392505050565b61377b81613883565b156138235773420000000000000000000000000000000000000f73ffffffffffffffffffffffffffffffffffffffff166349948e0e8460405180608001604052806048815260200161500a604891396040516020016137db929190614fda565b6040516020818303038152906040526040518263ffffffff1660e01b81526004016138069190613ca1565b602060405180830381865afa158015613747573d6000803e3d6000fd5b50600092915050565b600061385a6138396124b8565b61384b84670de0b6b3a764000061497d565b6138559190614d4c565b6138ca565b92915050565b600061a4b1821480613874575062066eed82145b8061385a57505062066eee1490565b6000600a82148061389557506101a482145b806138a2575062aa37dc82145b806138ae575061210582145b806138bb575062014a3382145b8061385a57505062014a341490565b60006bffffffffffffffffffffffff821115613968576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f53616665436173743a2076616c756520646f65736e27742066697420696e203960448201527f36206269747300000000000000000000000000000000000000000000000000006064820152608401610b0d565b5090565b604051806103e00160405280601f906020820280368337509192915050565b60008083601f84011261399d57600080fd5b50813567ffffffffffffffff8111156139b557600080fd5b6020830191508360208285010111156139cd57600080fd5b9250929050565b600080602083850312156139e757600080fd5b823567ffffffffffffffff8111156139fe57600080fd5b613a0a8582860161398b565b90969095509350505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b604051610120810167ffffffffffffffff81118282101715613a6957613a69613a16565b60405290565b604051610160810167ffffffffffffffff81118282101715613a6957613a69613a16565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff81118282101715613ada57613ada613a16565b604052919050565b63ffffffff8116811461272257600080fd5b803561117081613ae2565b68ffffffffffffffffff8116811461272257600080fd5b803561117081613aff565b64ffffffffff8116811461272257600080fd5b803561117081613b21565b803561ffff8116811461117057600080fd5b80357bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8116811461117057600080fd5b60006101208284031215613b9057600080fd5b613b98613a45565b613ba183613af4565b8152613baf60208401613af4565b6020820152613bc060408401613af4565b6040820152613bd160608401613af4565b6060820152613be260808401613b16565b6080820152613bf360a08401613b34565b60a0820152613c0460c08401613b3f565b60c0820152613c1560e08401613b51565b60e0820152610100613c28818501613af4565b908201529392505050565b60005b83811015613c4e578181015183820152602001613c36565b50506000910152565b60008151808452613c6f816020860160208601613c33565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b60208152600061376b6020830184613c57565b600082601f830112613cc557600080fd5b813567ffffffffffffffff811115613cdf57613cdf613a16565b613d1060207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f84011601613a93565b818152846020838601011115613d2557600080fd5b816020850160208301376000918101602001919091529392505050565b600060208284031215613d5457600080fd5b813567ffffffffffffffff811115613d6b57600080fd5b613d7784828501613cb4565b949350505050565b73ffffffffffffffffffffffffffffffffffffffff8116811461272257600080fd5b803561117081613d7f565b6bffffffffffffffffffffffff8116811461272257600080fd5b803561117081613dac565b60008060408385031215613de457600080fd5b8235613def81613d7f565b91506020830135613dff81613dac565b809150509250929050565b600081518084526020808501945080840160005b83811015613e5057815173ffffffffffffffffffffffffffffffffffffffff1687529582019590820190600101613e1e565b509495945050505050565b60208152600061376b6020830184613e0a565b600060208284031215613e8057600080fd5b5035919050565b600060208284031215613e9957600080fd5b813567ffffffffffffffff811115613eb057600080fd5b8201610160818503121561376b57600080fd5b805182526020810151613eee602084018273ffffffffffffffffffffffffffffffffffffffff169052565b506040810151613f0e60408401826bffffffffffffffffffffffff169052565b506060810151613f36606084018273ffffffffffffffffffffffffffffffffffffffff169052565b506080810151613f52608084018267ffffffffffffffff169052565b5060a0810151613f6a60a084018263ffffffff169052565b5060c0810151613f8760c084018268ffffffffffffffffff169052565b5060e0810151613fa460e084018268ffffffffffffffffff169052565b506101008181015164ffffffffff9081169184019190915261012080830151909116908301526101409081015163ffffffff16910152565b610160810161385a8284613ec3565b60008083601f840112613ffd57600080fd5b50813567ffffffffffffffff81111561401557600080fd5b6020830191508360208260051b85010111156139cd57600080fd5b60008060008060008060008060e0898b03121561404c57600080fd5b606089018a81111561405d57600080fd5b8998503567ffffffffffffffff8082111561407757600080fd5b6140838c838d0161398b565b909950975060808b013591508082111561409c57600080fd5b6140a88c838d01613feb565b909750955060a08b01359150808211156140c157600080fd5b506140ce8b828c01613feb565b999c989b50969995989497949560c00135949350505050565b815163ffffffff90811682526020808401518216908301526040808401518216908301526060808401519182169083015261012082019050608083015161413b608084018268ffffffffffffffffff169052565b5060a083015161415460a084018264ffffffffff169052565b5060c083015161416a60c084018261ffff169052565b5060e083015161419a60e08401827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff169052565b506101008381015163ffffffff8116848301525b505092915050565b67ffffffffffffffff8116811461272257600080fd5b8035611170816141b6565b6000806000806000608086880312156141ef57600080fd5b85356141fa816141b6565b9450602086013567ffffffffffffffff81111561421657600080fd5b6142228882890161398b565b909550935050604086013561423681613ae2565b949793965091946060013592915050565b600067ffffffffffffffff82111561426157614261613a16565b5060051b60200190565b600082601f83011261427c57600080fd5b8135602061429161428c83614247565b613a93565b82815260059290921b840181019181810190868411156142b057600080fd5b8286015b848110156142d45780356142c781613d7f565b83529183019183016142b4565b509695505050505050565b803560ff8116811461117057600080fd5b60008060008060008060c0878903121561430957600080fd5b863567ffffffffffffffff8082111561432157600080fd5b61432d8a838b0161426b565b9750602089013591508082111561434357600080fd5b61434f8a838b0161426b565b965061435d60408a016142df565b9550606089013591508082111561437357600080fd5b61437f8a838b01613cb4565b945061438d60808a016141cc565b935060a08901359150808211156143a357600080fd5b506143b089828a01613cb4565b9150509295509295509295565b6000602082840312156143cf57600080fd5b813561376b81613d7f565b600181811c908216806143ee57607f821691505b602082108103614427577f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b50919050565b601f8211156105ec57600081815260208120601f850160051c810160208610156144545750805b601f850160051c820191505b81811015610a8857828155600101614460565b67ffffffffffffffff83111561448b5761448b613a16565b61449f8361449983546143da565b8361442d565b6000601f8411600181146144f157600085156144bb5750838201355b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600387901b1c1916600186901b178355614587565b6000838152602090207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0861690835b828110156145405786850135825560209485019460019092019101614520565b508682101561457b577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60f88860031b161c19848701351681555b505060018560011b0183555b5050505050565b805161117081613aff565b6000602082840312156145ab57600080fd5b815161376b81613aff565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b6bffffffffffffffffffffffff82811682821603908082111561270a5761270a6145b6565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff820361466a5761466a6145b6565b5060010190565b6000610160823603121561468457600080fd5b61468c613a6f565b823567ffffffffffffffff8111156146a357600080fd5b6146af36828601613cb4565b825250602083013560208201526146c860408401613da1565b60408201526146d960608401613dc6565b60608201526146ea60808401613b16565b60808201526146fb60a084016141cc565b60a082015261470c60c084016141cc565b60c082015261471d60e08401613af4565b60e0820152610100614730818501613b3f565b908201526101206147428482016141cc565b90820152610140614754848201613da1565b9082015292915050565b60006020828403121561477057600080fd5b813561376b816141b6565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe18436030181126147b057600080fd5b83018035915067ffffffffffffffff8211156147cb57600080fd5b6020019150368190038213156139cd57600080fd5b6000602082840312156147f257600080fd5b61376b82613b3f565b60006020828403121561480d57600080fd5b813561376b81613ae2565b73ffffffffffffffffffffffffffffffffffffffff8a8116825267ffffffffffffffff8a166020830152881660408201526102406060820181905281018690526000610260878982850137600083890182015261ffff8716608084015260a0830186905263ffffffff851660c0840152601f88017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016830101905061320f60e0830184613ec3565b60ff818116838216019081111561385a5761385a6145b6565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600060ff83168061491b5761491b6148d9565b8060ff84160491505092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b8183823760009101908152919050565b828152606082602083013760800192915050565b808202811582820484141761385a5761385a6145b6565b8181038181111561385a5761385a6145b6565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603160045260246000fd5b63ffffffff81811683821601908082111561270a5761270a6145b6565b600061012063ffffffff808d1684528b6020850152808b16604085015250806060840152614a238184018a613e0a565b90508281036080840152614a378189613e0a565b905060ff871660a084015282810360c0840152614a548187613c57565b905067ffffffffffffffff851660e0840152828103610100840152614a798185613c57565b9c9b505050505050505050505050565b805169ffffffffffffffffffff8116811461117057600080fd5b600080600080600060a08688031215614abb57600080fd5b614ac486614a89565b9450602086015193506040860151925060608601519150614ae760808701614a89565b90509295509295909350565b60006bffffffffffffffffffffffff80841680614b1257614b126148d9565b92169190910492915050565b6bffffffffffffffffffffffff81811683821601908082111561270a5761270a6145b6565b6bffffffffffffffffffffffff8181168382160280821691908281146141ae576141ae6145b6565b8082018082111561385a5761385a6145b6565b67ffffffffffffffff81811683821601908082111561270a5761270a6145b6565b600082601f830112614bb057600080fd5b81356020614bc061428c83614247565b82815260059290921b84018101918181019086841115614bdf57600080fd5b8286015b848110156142d45780358352918301918301614be3565b600082601f830112614c0b57600080fd5b81356020614c1b61428c83614247565b82815260059290921b84018101918181019086841115614c3a57600080fd5b8286015b848110156142d457803567ffffffffffffffff811115614c5e5760008081fd5b614c6c8986838b0101613cb4565b845250918301918301614c3e565b600080600080600060a08688031215614c9257600080fd5b853567ffffffffffffffff80821115614caa57600080fd5b614cb689838a01614b9f565b96506020880135915080821115614ccc57600080fd5b614cd889838a01614bfa565b95506040880135915080821115614cee57600080fd5b614cfa89838a01614bfa565b94506060880135915080821115614d1057600080fd5b614d1c89838a01614bfa565b93506080880135915080821115614d3257600080fd5b50614d3f88828901614bfa565b9150509295509295909350565b600082614d5b57614d5b6148d9565b500490565b60006101208b835273ffffffffffffffffffffffffffffffffffffffff8b16602084015267ffffffffffffffff808b166040850152816060850152614da78285018b613e0a565b91508382036080850152614dbb828a613e0a565b915060ff881660a085015283820360c0850152614dd88288613c57565b90861660e08501528381036101008501529050614a798185613c57565b805161117081613d7f565b805161117081613dac565b8051611170816141b6565b805161117081613ae2565b805161117081613b21565b60006101608284031215614e3f57600080fd5b614e47613a6f565b82518152614e5760208401614df5565b6020820152614e6860408401614e00565b6040820152614e7960608401614df5565b6060820152614e8a60808401614e0b565b6080820152614e9b60a08401614e16565b60a0820152614eac60c0840161458e565b60c0820152614ebd60e0840161458e565b60e0820152610100614ed0818501614e21565b90820152610120614ee2848201614e21565b90820152610140613c28848201614e16565b64ffffffffff81811683821601908082111561270a5761270a6145b6565b6000610200808352614f268184018a613c57565b90508281036020840152614f3a8189613c57565b6bffffffffffffffffffffffff88811660408601528716606085015273ffffffffffffffffffffffffffffffffffffffff861660808501529150614f83905060a0830184613ec3565b979650505050505050565b60008060408385031215614fa157600080fd5b825160078110614fb057600080fd5b6020840151909250613dff81613dac565b600060208284031215614fd357600080fd5b5051919050565b60008351614fec818460208801613c33565b835190830190615000818360208801613c33565b0194935050505056fe307866666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666a164736f6c6343000813000a",
+	ABI: "[{\"inputs\":[{\"internalType\":\"address\",\"name\":\"router\",\"type\":\"address\"},{\"components\":[{\"internalType\":\"uint32\",\"name\":\"fulfillmentGasPriceOverEstimationBP\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"feedStalenessSeconds\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"gasOverheadBeforeCallback\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"gasOverheadAfterCallback\",\"type\":\"uint32\"},{\"internalType\":\"uint72\",\"name\":\"donFee\",\"type\":\"uint72\"},{\"internalType\":\"uint40\",\"name\":\"minimumEstimateGasPriceWei\",\"type\":\"uint40\"},{\"internalType\":\"uint16\",\"name\":\"maxSupportedRequestDataVersion\",\"type\":\"uint16\"},{\"internalType\":\"uint224\",\"name\":\"fallbackNativePerUnitLink\",\"type\":\"uint224\"},{\"internalType\":\"uint32\",\"name\":\"requestTimeoutSeconds\",\"type\":\"uint32\"}],\"internalType\":\"structFunctionsBillingConfig\",\"name\":\"config\",\"type\":\"tuple\"},{\"internalType\":\"address\",\"name\":\"linkToNativeFeed\",\"type\":\"address\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"inputs\":[],\"name\":\"EmptyPublicKey\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InconsistentReportData\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InsufficientBalance\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidCalldata\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"message\",\"type\":\"string\"}],\"name\":\"InvalidConfig\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"int256\",\"name\":\"linkWei\",\"type\":\"int256\"}],\"name\":\"InvalidLinkWeiPrice\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidSubscription\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"owner\",\"type\":\"address\"}],\"name\":\"MustBeSubOwner\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"NoTransmittersSet\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"OnlyCallableByRouter\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"OnlyCallableByRouterOwner\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"PaymentTooLarge\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"message\",\"type\":\"string\"}],\"name\":\"ReportInvalid\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"RouterMustBeSet\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"UnauthorizedPublicKeyChange\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"UnauthorizedSender\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"UnsupportedRequestDataVersion\",\"type\":\"error\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"}],\"name\":\"CommitmentDeleted\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint32\",\"name\":\"previousConfigBlockNumber\",\"type\":\"uint32\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"configDigest\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"configCount\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"address[]\",\"name\":\"signers\",\"type\":\"address[]\"},{\"indexed\":false,\"internalType\":\"address[]\",\"name\":\"transmitters\",\"type\":\"address[]\"},{\"indexed\":false,\"internalType\":\"uint8\",\"name\":\"f\",\"type\":\"uint8\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"onchainConfig\",\"type\":\"bytes\"},{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"offchainConfigVersion\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"offchainConfig\",\"type\":\"bytes\"}],\"name\":\"ConfigSet\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"components\":[{\"internalType\":\"uint32\",\"name\":\"fulfillmentGasPriceOverEstimationBP\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"feedStalenessSeconds\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"gasOverheadBeforeCallback\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"gasOverheadAfterCallback\",\"type\":\"uint32\"},{\"internalType\":\"uint72\",\"name\":\"donFee\",\"type\":\"uint72\"},{\"internalType\":\"uint40\",\"name\":\"minimumEstimateGasPriceWei\",\"type\":\"uint40\"},{\"internalType\":\"uint16\",\"name\":\"maxSupportedRequestDataVersion\",\"type\":\"uint16\"},{\"internalType\":\"uint224\",\"name\":\"fallbackNativePerUnitLink\",\"type\":\"uint224\"},{\"internalType\":\"uint32\",\"name\":\"requestTimeoutSeconds\",\"type\":\"uint32\"}],\"indexed\":false,\"internalType\":\"structFunctionsBillingConfig\",\"name\":\"config\",\"type\":\"tuple\"}],\"name\":\"ConfigUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"requestingContract\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"requestInitiator\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"subscriptionOwner\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"indexed\":false,\"internalType\":\"uint16\",\"name\":\"dataVersion\",\"type\":\"uint16\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"flags\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"uint64\",\"name\":\"callbackGasLimit\",\"type\":\"uint64\"},{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"},{\"internalType\":\"address\",\"name\":\"coordinator\",\"type\":\"address\"},{\"internalType\":\"uint96\",\"name\":\"estimatedTotalCostJuels\",\"type\":\"uint96\"},{\"internalType\":\"address\",\"name\":\"client\",\"type\":\"address\"},{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"internalType\":\"uint32\",\"name\":\"callbackGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint72\",\"name\":\"adminFee\",\"type\":\"uint72\"},{\"internalType\":\"uint72\",\"name\":\"donFee\",\"type\":\"uint72\"},{\"internalType\":\"uint40\",\"name\":\"gasOverheadBeforeCallback\",\"type\":\"uint40\"},{\"internalType\":\"uint40\",\"name\":\"gasOverheadAfterCallback\",\"type\":\"uint40\"},{\"internalType\":\"uint32\",\"name\":\"timeoutTimestamp\",\"type\":\"uint32\"}],\"indexed\":false,\"internalType\":\"structFunctionsResponse.Commitment\",\"name\":\"commitment\",\"type\":\"tuple\"}],\"name\":\"OracleRequest\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"transmitter\",\"type\":\"address\"}],\"name\":\"OracleResponse\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"OwnershipTransferRequested\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"OwnershipTransferred\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"uint96\",\"name\":\"juelsPerGas\",\"type\":\"uint96\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"l1FeeShareWei\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint96\",\"name\":\"callbackCostJuels\",\"type\":\"uint96\"},{\"indexed\":false,\"internalType\":\"uint96\",\"name\":\"totalCostJuels\",\"type\":\"uint96\"}],\"name\":\"RequestBilled\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"configDigest\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"uint32\",\"name\":\"epoch\",\"type\":\"uint32\"}],\"name\":\"Transmitted\",\"type\":\"event\"},{\"inputs\":[],\"name\":\"acceptOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"}],\"name\":\"deleteCommitment\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"internalType\":\"uint32\",\"name\":\"callbackGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint256\",\"name\":\"gasPriceWei\",\"type\":\"uint256\"}],\"name\":\"estimateCost\",\"outputs\":[{\"internalType\":\"uint96\",\"name\":\"\",\"type\":\"uint96\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getAdminFee\",\"outputs\":[{\"internalType\":\"uint72\",\"name\":\"\",\"type\":\"uint72\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getConfig\",\"outputs\":[{\"components\":[{\"internalType\":\"uint32\",\"name\":\"fulfillmentGasPriceOverEstimationBP\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"feedStalenessSeconds\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"gasOverheadBeforeCallback\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"gasOverheadAfterCallback\",\"type\":\"uint32\"},{\"internalType\":\"uint72\",\"name\":\"donFee\",\"type\":\"uint72\"},{\"internalType\":\"uint40\",\"name\":\"minimumEstimateGasPriceWei\",\"type\":\"uint40\"},{\"internalType\":\"uint16\",\"name\":\"maxSupportedRequestDataVersion\",\"type\":\"uint16\"},{\"internalType\":\"uint224\",\"name\":\"fallbackNativePerUnitLink\",\"type\":\"uint224\"},{\"internalType\":\"uint32\",\"name\":\"requestTimeoutSeconds\",\"type\":\"uint32\"}],\"internalType\":\"structFunctionsBillingConfig\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"\",\"type\":\"bytes\"}],\"name\":\"getDONFee\",\"outputs\":[{\"internalType\":\"uint72\",\"name\":\"\",\"type\":\"uint72\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getDONPublicKey\",\"outputs\":[{\"internalType\":\"bytes\",\"name\":\"\",\"type\":\"bytes\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getThresholdPublicKey\",\"outputs\":[{\"internalType\":\"bytes\",\"name\":\"\",\"type\":\"bytes\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getWeiPerUnitLink\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"latestConfigDetails\",\"outputs\":[{\"internalType\":\"uint32\",\"name\":\"configCount\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"blockNumber\",\"type\":\"uint32\"},{\"internalType\":\"bytes32\",\"name\":\"configDigest\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"latestConfigDigestAndEpoch\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"scanLogs\",\"type\":\"bool\"},{\"internalType\":\"bytes32\",\"name\":\"configDigest\",\"type\":\"bytes32\"},{\"internalType\":\"uint32\",\"name\":\"epoch\",\"type\":\"uint32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"recipient\",\"type\":\"address\"},{\"internalType\":\"uint96\",\"name\":\"amount\",\"type\":\"uint96\"}],\"name\":\"oracleWithdraw\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"oracleWithdrawAll\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"_signers\",\"type\":\"address[]\"},{\"internalType\":\"address[]\",\"name\":\"_transmitters\",\"type\":\"address[]\"},{\"internalType\":\"uint8\",\"name\":\"_f\",\"type\":\"uint8\"},{\"internalType\":\"bytes\",\"name\":\"_onchainConfig\",\"type\":\"bytes\"},{\"internalType\":\"uint64\",\"name\":\"_offchainConfigVersion\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"_offchainConfig\",\"type\":\"bytes\"}],\"name\":\"setConfig\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"donPublicKey\",\"type\":\"bytes\"}],\"name\":\"setDONPublicKey\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"thresholdPublicKey\",\"type\":\"bytes\"}],\"name\":\"setThresholdPublicKey\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"internalType\":\"bytes32\",\"name\":\"flags\",\"type\":\"bytes32\"},{\"internalType\":\"address\",\"name\":\"requestingContract\",\"type\":\"address\"},{\"internalType\":\"uint96\",\"name\":\"availableBalance\",\"type\":\"uint96\"},{\"internalType\":\"uint72\",\"name\":\"adminFee\",\"type\":\"uint72\"},{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"initiatedRequests\",\"type\":\"uint64\"},{\"internalType\":\"uint32\",\"name\":\"callbackGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint16\",\"name\":\"dataVersion\",\"type\":\"uint16\"},{\"internalType\":\"uint64\",\"name\":\"completedRequests\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"subscriptionOwner\",\"type\":\"address\"}],\"internalType\":\"structFunctionsResponse.RequestMeta\",\"name\":\"request\",\"type\":\"tuple\"}],\"name\":\"startRequest\",\"outputs\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"},{\"internalType\":\"address\",\"name\":\"coordinator\",\"type\":\"address\"},{\"internalType\":\"uint96\",\"name\":\"estimatedTotalCostJuels\",\"type\":\"uint96\"},{\"internalType\":\"address\",\"name\":\"client\",\"type\":\"address\"},{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"internalType\":\"uint32\",\"name\":\"callbackGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint72\",\"name\":\"adminFee\",\"type\":\"uint72\"},{\"internalType\":\"uint72\",\"name\":\"donFee\",\"type\":\"uint72\"},{\"internalType\":\"uint40\",\"name\":\"gasOverheadBeforeCallback\",\"type\":\"uint40\"},{\"internalType\":\"uint40\",\"name\":\"gasOverheadAfterCallback\",\"type\":\"uint40\"},{\"internalType\":\"uint32\",\"name\":\"timeoutTimestamp\",\"type\":\"uint32\"}],\"internalType\":\"structFunctionsResponse.Commitment\",\"name\":\"commitment\",\"type\":\"tuple\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"transferOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32[3]\",\"name\":\"reportContext\",\"type\":\"bytes32[3]\"},{\"internalType\":\"bytes\",\"name\":\"report\",\"type\":\"bytes\"},{\"internalType\":\"bytes32[]\",\"name\":\"rs\",\"type\":\"bytes32[]\"},{\"internalType\":\"bytes32[]\",\"name\":\"ss\",\"type\":\"bytes32[]\"},{\"internalType\":\"bytes32\",\"name\":\"rawVs\",\"type\":\"bytes32\"}],\"name\":\"transmit\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"transmitters\",\"outputs\":[{\"internalType\":\"address[]\",\"name\":\"\",\"type\":\"address[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"typeAndVersion\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"uint32\",\"name\":\"fulfillmentGasPriceOverEstimationBP\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"feedStalenessSeconds\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"gasOverheadBeforeCallback\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"gasOverheadAfterCallback\",\"type\":\"uint32\"},{\"internalType\":\"uint72\",\"name\":\"donFee\",\"type\":\"uint72\"},{\"internalType\":\"uint40\",\"name\":\"minimumEstimateGasPriceWei\",\"type\":\"uint40\"},{\"internalType\":\"uint16\",\"name\":\"maxSupportedRequestDataVersion\",\"type\":\"uint16\"},{\"internalType\":\"uint224\",\"name\":\"fallbackNativePerUnitLink\",\"type\":\"uint224\"},{\"internalType\":\"uint32\",\"name\":\"requestTimeoutSeconds\",\"type\":\"uint32\"}],\"internalType\":\"structFunctionsBillingConfig\",\"name\":\"config\",\"type\":\"tuple\"}],\"name\":\"updateConfig\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]",
+	Bin: "0x60a06040523480156200001157600080fd5b50604051620056d0380380620056d083398101604081905262000034916200046d565b8282828233806000816200008f5760405162461bcd60e51b815260206004820152601860248201527f43616e6e6f7420736574206f776e657220746f207a65726f000000000000000060448201526064015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0384811691909117909155811615620000c257620000c28162000139565b5050506001600160a01b038116620000ed57604051632530e88560e11b815260040160405180910390fd5b6001600160a01b03908116608052600b80549183166c01000000000000000000000000026001600160601b039092169190911790556200012d82620001e4565b5050505050506200062c565b336001600160a01b03821603620001935760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640162000086565b600180546001600160a01b0319166001600160a01b0383811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b620001ee62000342565b80516008805460208401516040808601516060870151608088015160a089015160c08a015161ffff16600160f01b026001600160f01b0364ffffffffff909216600160c81b0264ffffffffff60c81b196001600160481b03909416600160801b0293909316600160801b600160f01b031963ffffffff9586166c010000000000000000000000000263ffffffff60601b19978716680100000000000000000297909716600160401b600160801b0319998716640100000000026001600160401b0319909b169c87169c909c1799909917979097169990991793909317959095169390931793909317929092169390931790915560e0830151610100840151909216600160e01b026001600160e01b0390921691909117600955517f5f32d06f5e83eda3a68e0e964ef2e6af5cb613e8117aa103c2d6bca5f5184862906200033790839062000576565b60405180910390a150565b6200034c6200034e565b565b6000546001600160a01b031633146200034c5760405162461bcd60e51b815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e657200000000000000000000604482015260640162000086565b80516001600160a01b0381168114620003c257600080fd5b919050565b60405161012081016001600160401b0381118282101715620003f957634e487b7160e01b600052604160045260246000fd5b60405290565b805163ffffffff81168114620003c257600080fd5b80516001600160481b0381168114620003c257600080fd5b805164ffffffffff81168114620003c257600080fd5b805161ffff81168114620003c257600080fd5b80516001600160e01b0381168114620003c257600080fd5b60008060008385036101608112156200048557600080fd5b6200049085620003aa565b935061012080601f1983011215620004a757600080fd5b620004b1620003c7565b9150620004c160208701620003ff565b8252620004d160408701620003ff565b6020830152620004e460608701620003ff565b6040830152620004f760808701620003ff565b60608301526200050a60a0870162000414565b60808301526200051d60c087016200042c565b60a08301526200053060e0870162000442565b60c08301526101006200054581880162000455565b60e084015262000557828801620003ff565b908301525091506200056d6101408501620003aa565b90509250925092565b815163ffffffff908116825260208084015182169083015260408084015182169083015260608084015191821690830152610120820190506080830151620005c960808401826001600160481b03169052565b5060a0830151620005e360a084018264ffffffffff169052565b5060c0830151620005fa60c084018261ffff169052565b5060e08301516200061660e08401826001600160e01b03169052565b506101009283015163ffffffff16919092015290565b60805161505e6200067260003960008181610845015281816109d301528181610ca601528181610f3a01528181611045015281816117890152613490015261505e6000f3fe608060405234801561001057600080fd5b506004361061018d5760003560e01c806381ff7048116100e3578063c3f909d41161008c578063e3d0e71211610066578063e3d0e71214610560578063e4ddcea614610573578063f2fde38b1461058957600080fd5b8063c3f909d4146103b0578063d227d24514610528578063d328a91e1461055857600080fd5b8063a631571e116100bd578063a631571e1461035d578063afcb95d71461037d578063b1dc65a41461039d57600080fd5b806381ff7048146102b557806385b214cf146103225780638da5cb5b1461033557600080fd5b806366316d8d116101455780637f15e1661161011f5780637f15e16614610285578063814118341461029857806381f1b938146102ad57600080fd5b806366316d8d1461026257806379ba5097146102755780637d4807871461027d57600080fd5b8063181f5a7711610176578063181f5a77146101ba5780632a905ccc1461020c57806359b5b7ac1461022e57600080fd5b8063083a5466146101925780631112dadc146101a7575b600080fd5b6101a56101a03660046139d4565b61059c565b005b6101a56101b5366004613b7d565b6105f1565b6101f66040518060400160405280601c81526020017f46756e6374696f6e7320436f6f7264696e61746f722076312e322e300000000081525081565b6040516102039190613ca1565b60405180910390f35b610214610841565b60405168ffffffffffffffffff9091168152602001610203565b61021461023c366004613d42565b50600854700100000000000000000000000000000000900468ffffffffffffffffff1690565b6101a5610270366004613dd1565b6108d7565b6101a5610a90565b6101a5610b92565b6101a56102933660046139d4565b610d92565b6102a0610de2565b6040516102039190613e5b565b6101f6610e51565b6102ff60015460025463ffffffff74010000000000000000000000000000000000000000830481169378010000000000000000000000000000000000000000000000009093041691565b6040805163ffffffff948516815293909216602084015290820152606001610203565b6101a5610330366004613e6e565b610f22565b60005460405173ffffffffffffffffffffffffffffffffffffffff9091168152602001610203565b61037061036b366004613e87565b610fd4565b6040516102039190613fdc565b604080516001815260006020820181905291810191909152606001610203565b6101a56103ab366004614030565b611175565b61051b6040805161012081018252600080825260208201819052918101829052606081018290526080810182905260a0810182905260c0810182905260e0810182905261010081019190915250604080516101208101825260085463ffffffff80821683526401000000008204811660208401526801000000000000000082048116938301939093526c01000000000000000000000000810483166060830152700100000000000000000000000000000000810468ffffffffffffffffff166080830152790100000000000000000000000000000000000000000000000000810464ffffffffff1660a08301527e01000000000000000000000000000000000000000000000000000000000000900461ffff1660c08201526009547bffffffffffffffffffffffffffffffffffffffffffffffffffffffff811660e08301527c0100000000000000000000000000000000000000000000000000000000900490911661010082015290565b60405161020391906140e7565b61053b6105363660046141d7565b611785565b6040516bffffffffffffffffffffffff9091168152602001610203565b6101f66118e5565b6101a561056e3660046142f0565b61193c565b61057b6124b8565b604051908152602001610203565b6101a56105973660046143bd565b612711565b6105a4612725565b60008190036105df576040517f4f42be3d00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600d6105ec828483614473565b505050565b6105f96127a8565b80516008805460208401516040808601516060870151608088015160a089015160c08a015161ffff167e01000000000000000000000000000000000000000000000000000000000000027dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff64ffffffffff909216790100000000000000000000000000000000000000000000000000027fffff0000000000ffffffffffffffffffffffffffffffffffffffffffffffffff68ffffffffffffffffff90941670010000000000000000000000000000000002939093167fffff0000000000000000000000000000ffffffffffffffffffffffffffffffff63ffffffff9586166c01000000000000000000000000027fffffffffffffffffffffffffffffffff00000000ffffffffffffffffffffffff9787166801000000000000000002979097167fffffffffffffffffffffffffffffffff0000000000000000ffffffffffffffff998716640100000000027fffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000909b169c87169c909c1799909917979097169990991793909317959095169390931793909317929092169390931790915560e08301516101008401519092167c0100000000000000000000000000000000000000000000000000000000027bffffffffffffffffffffffffffffffffffffffffffffffffffffffff90921691909117600955517f5f32d06f5e83eda3a68e0e964ef2e6af5cb613e8117aa103c2d6bca5f5184862906108369083906140e7565b60405180910390a150565b60007f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff16632a905ccc6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156108ae573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108d29190614599565b905090565b6108df6127b0565b806bffffffffffffffffffffffff166000036109195750336000908152600a60205260409020546bffffffffffffffffffffffff16610973565b336000908152600a60205260409020546bffffffffffffffffffffffff80831691161015610973576040517ff4d678b800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b336000908152600a6020526040812080548392906109a09084906bffffffffffffffffffffffff166145e5565b92506101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff1602179055506109f57f000000000000000000000000000000000000000000000000000000000000000090565b6040517f66316d8d00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff84811660048301526bffffffffffffffffffffffff8416602483015291909116906366316d8d90604401600060405180830381600087803b158015610a7457600080fd5b505af1158015610a88573d6000803e3d6000fd5b505050505050565b60015473ffffffffffffffffffffffffffffffffffffffff163314610b16576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4d7573742062652070726f706f736564206f776e65720000000000000000000060448201526064015b60405180910390fd5b60008054337fffffffffffffffffffffffff00000000000000000000000000000000000000008083168217845560018054909116905560405173ffffffffffffffffffffffffffffffffffffffff90921692909183917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a350565b610b9a6127a8565b610ba26127b0565b6000610bac610de2565b905060005b8151811015610d8e576000600a6000848481518110610bd257610bd261460a565b60209081029190910181015173ffffffffffffffffffffffffffffffffffffffff168252810191909152604001600020546bffffffffffffffffffffffff1690508015610d7d576000600a6000858581518110610c3157610c3161460a565b602002602001015173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff160217905550610cc87f000000000000000000000000000000000000000000000000000000000000000090565b73ffffffffffffffffffffffffffffffffffffffff166366316d8d848481518110610cf557610cf561460a565b6020026020010151836040518363ffffffff1660e01b8152600401610d4a92919073ffffffffffffffffffffffffffffffffffffffff9290921682526bffffffffffffffffffffffff16602082015260400190565b600060405180830381600087803b158015610d6457600080fd5b505af1158015610d78573d6000803e3d6000fd5b505050505b50610d8781614639565b9050610bb1565b5050565b610d9a612725565b6000819003610dd5576040517f4f42be3d00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600c6105ec828483614473565b60606006805480602002602001604051908101604052809291908181526020018280548015610e4757602002820191906000526020600020905b815473ffffffffffffffffffffffffffffffffffffffff168152600190910190602001808311610e1c575b5050505050905090565b6060600d8054610e60906143da565b9050600003610e9b576040517f4f42be3d00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600d8054610ea8906143da565b80601f0160208091040260200160405190810160405280929190818152602001828054610ed4906143da565b8015610e475780601f10610ef657610100808354040283529160200191610e47565b820191906000526020600020905b815481529060010190602001808311610f0457509395945050505050565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614610f91576040517fc41a5b0900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60008181526007602052604080822091909155517f8a4b97add3359bd6bcf5e82874363670eb5ad0f7615abddbd0ed0a3a98f0f416906108369083815260200190565b6040805161016081018252600080825260208201819052918101829052606081018290526080810182905260a0810182905260c0810182905260e08101829052610100810182905261012081018290526101408101919091523373ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000161461109c576040517fc41a5b0900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6110ad6110a883614671565b61295c565b90506110bf60608301604084016143bd565b815173ffffffffffffffffffffffffffffffffffffffff91909116907fbf50768ccf13bd0110ca6d53a9c4f1f3271abdd4c24a56878863ed25b20598ff3261110d60c0870160a0880161475e565b61111f610160880161014089016143bd565b611129888061477b565b61113b6101208b016101008c016147e0565b60208b01356111516101008d0160e08e016147fb565b8b60405161116799989796959493929190614818565b60405180910390a35b919050565b60005a604080518b3580825262ffffff6020808f0135600881901c929092169084015293945092917fb04e63db38c49950639fa09d29872f21f5d49d614f3a969d8adf3d4b52e41a62910160405180910390a16111d68a8a8a8a8a8a612dfa565b6003546000906002906111f49060ff808216916101009004166148c0565b6111fe9190614908565b6112099060016148c0565b60ff169050878114611277576040517f660bd4ba00000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f77726f6e67206e756d626572206f66207369676e6174757265730000000000006044820152606401610b0d565b878614611306576040517f660bd4ba00000000000000000000000000000000000000000000000000000000815260206004820152602860248201527f7265706f727420727320616e64207373206d757374206265206f66206571756160448201527f6c206c656e6774680000000000000000000000000000000000000000000000006064820152608401610b0d565b3360009081526004602090815260408083208151808301909252805460ff808216845292939192918401916101009091041660028111156113495761134961492a565b600281111561135a5761135a61492a565b90525090506002816020015160028111156113775761137761492a565b141580156113c057506006816000015160ff168154811061139a5761139a61460a565b60009182526020909120015473ffffffffffffffffffffffffffffffffffffffff163314155b15611427576040517f660bd4ba00000000000000000000000000000000000000000000000000000000815260206004820152601860248201527f756e617574686f72697a6564207472616e736d697474657200000000000000006044820152606401610b0d565b5050505061143361396c565b6000808a8a604051611446929190614959565b60405190819003812061145d918e90602001614969565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181528282528051602091820120838301909252600080845290830152915060005b898110156117675760006001848984602081106114c6576114c661460a565b6114d391901a601b6148c0565b8e8e868181106114e5576114e561460a565b905060200201358d8d878181106114fe576114fe61460a565b905060200201356040516000815260200160405260405161153b949392919093845260ff9290921660208401526040830152606082015260800190565b6020604051602081039080840390855afa15801561155d573d6000803e3d6000fd5b5050604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081015173ffffffffffffffffffffffffffffffffffffffff811660009081526004602090815290849020838501909452835460ff808216855292965092945084019161010090041660028111156115dd576115dd61492a565b60028111156115ee576115ee61492a565b905250925060018360200151600281111561160b5761160b61492a565b14611672576040517f660bd4ba00000000000000000000000000000000000000000000000000000000815260206004820152601e60248201527f61646472657373206e6f7420617574686f72697a656420746f207369676e00006044820152606401610b0d565b8251600090879060ff16601f811061168c5761168c61460a565b602002015173ffffffffffffffffffffffffffffffffffffffff161461170e576040517f660bd4ba00000000000000000000000000000000000000000000000000000000815260206004820152601460248201527f6e6f6e2d756e69717565207369676e61747572650000000000000000000000006044820152606401610b0d565b8086846000015160ff16601f81106117285761172861460a565b73ffffffffffffffffffffffffffffffffffffffff90921660209290920201526117536001866148c0565b9450508061176090614639565b90506114a7565b505050611778833383858e8e612eb1565b5050505050505050505050565b60007f00000000000000000000000000000000000000000000000000000000000000006040517f10fc49c100000000000000000000000000000000000000000000000000000000815267ffffffffffffffff8816600482015263ffffffff8516602482015273ffffffffffffffffffffffffffffffffffffffff91909116906310fc49c19060440160006040518083038186803b15801561182557600080fd5b505afa158015611839573d6000803e3d6000fd5b5050505066038d7ea4c6800082111561187e576040517f8129bbcd00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6000611888610841565b905060006118cb87878080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061023c92505050565b90506118d9858583856130b0565b98975050505050505050565b6060600c80546118f4906143da565b905060000361192f576040517f4f42be3d00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600c8054610ea8906143da565b855185518560ff16601f8311156119af576040517f89a6198900000000000000000000000000000000000000000000000000000000815260206004820152601060248201527f746f6f206d616e79207369676e657273000000000000000000000000000000006044820152606401610b0d565b80600003611a19576040517f89a6198900000000000000000000000000000000000000000000000000000000815260206004820152601260248201527f66206d75737420626520706f73697469766500000000000000000000000000006044820152606401610b0d565b818314611aa7576040517f89a61989000000000000000000000000000000000000000000000000000000008152602060048201526024808201527f6f7261636c6520616464726573736573206f7574206f6620726567697374726160448201527f74696f6e000000000000000000000000000000000000000000000000000000006064820152608401610b0d565b611ab281600361497d565b8311611b1a576040517f89a6198900000000000000000000000000000000000000000000000000000000815260206004820152601860248201527f6661756c74792d6f7261636c65206620746f6f206869676800000000000000006044820152606401610b0d565b611b22612725565b6040805160c0810182528a8152602081018a905260ff89169181018290526060810188905267ffffffffffffffff8716608082015260a0810186905290611b69908861321d565b60055415611d1e57600554600090611b8390600190614994565b9050600060058281548110611b9a57611b9a61460a565b60009182526020822001546006805473ffffffffffffffffffffffffffffffffffffffff90921693509084908110611bd457611bd461460a565b600091825260208083209091015473ffffffffffffffffffffffffffffffffffffffff85811684526004909252604080842080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000090811690915592909116808452922080549091169055600580549192509080611c5457611c546149a7565b60008281526020902081017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff90810180547fffffffffffffffffffffffff00000000000000000000000000000000000000001690550190556006805480611cbd57611cbd6149a7565b60008281526020902081017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff90810180547fffffffffffffffffffffffff000000000000000000000000000000000000000016905501905550611b69915050565b60005b8151518110156122d557815180516000919083908110611d4357611d4361460a565b602002602001015173ffffffffffffffffffffffffffffffffffffffff1603611dc8576040517f89a6198900000000000000000000000000000000000000000000000000000000815260206004820152601860248201527f7369676e6572206d757374206e6f7420626520656d70747900000000000000006044820152606401610b0d565b600073ffffffffffffffffffffffffffffffffffffffff1682602001518281518110611df657611df661460a565b602002602001015173ffffffffffffffffffffffffffffffffffffffff1603611e7b576040517f89a6198900000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f7472616e736d6974746572206d757374206e6f7420626520656d7074790000006044820152606401610b0d565b60006004600084600001518481518110611e9757611e9761460a565b60209081029190910181015173ffffffffffffffffffffffffffffffffffffffff16825281019190915260400160002054610100900460ff166002811115611ee157611ee161492a565b14611f48576040517f89a6198900000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f7265706561746564207369676e657220616464726573730000000000000000006044820152606401610b0d565b6040805180820190915260ff82168152600160208201528251805160049160009185908110611f7957611f7961460a565b60209081029190910181015173ffffffffffffffffffffffffffffffffffffffff168252818101929092526040016000208251815460ff9091167fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0082168117835592840151919283917fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000161761010083600281111561201a5761201a61492a565b02179055506000915061202a9050565b60046000846020015184815181106120445761204461460a565b60209081029190910181015173ffffffffffffffffffffffffffffffffffffffff16825281019190915260400160002054610100900460ff16600281111561208e5761208e61492a565b146120f5576040517f89a6198900000000000000000000000000000000000000000000000000000000815260206004820152601c60248201527f7265706561746564207472616e736d69747465722061646472657373000000006044820152606401610b0d565b6040805180820190915260ff8216815260208101600281525060046000846020015184815181106121285761212861460a565b60209081029190910181015173ffffffffffffffffffffffffffffffffffffffff168252818101929092526040016000208251815460ff9091167fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0082168117835592840151919283917fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000016176101008360028111156121c9576121c961492a565b0217905550508251805160059250839081106121e7576121e761460a565b602090810291909101810151825460018101845560009384529282902090920180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff90931692909217909155820151805160069190839081106122635761226361460a565b60209081029190910181015182546001810184556000938452919092200180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff909216919091179055806122cd81614639565b915050611d21565b506040810151600380547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660ff909216919091179055600180547fffffffff00000000ffffffffffffffffffffffffffffffffffffffffffffffff8116780100000000000000000000000000000000000000000000000063ffffffff438116820292909217808555920481169291829160149161238d918491740100000000000000000000000000000000000000009004166149d6565b92506101000a81548163ffffffff021916908363ffffffff1602179055506123ec4630600160149054906101000a900463ffffffff1663ffffffff16856000015186602001518760400151886060015189608001518a60a00151613236565b600281905582518051600380547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff1661010060ff9093169290920291909117905560015460208501516040808701516060880151608089015160a08a015193517f1591690b8638f5fb2dbec82ac741805ac5da8b45dc5263f4875b0496fdce4e05986124a3988b9891977401000000000000000000000000000000000000000090920463ffffffff169690959194919391926149f3565b60405180910390a15050505050505050505050565b604080516101208101825260085463ffffffff80821683526401000000008204811660208401526801000000000000000082048116838501526c0100000000000000000000000080830482166060850152700100000000000000000000000000000000830468ffffffffffffffffff166080850152790100000000000000000000000000000000000000000000000000830464ffffffffff1660a0808601919091527e0100000000000000000000000000000000000000000000000000000000000090930461ffff1660c08501526009547bffffffffffffffffffffffffffffffffffffffffffffffffffffffff811660e08601527c01000000000000000000000000000000000000000000000000000000009004909116610100840152600b5484517ffeaf968c00000000000000000000000000000000000000000000000000000000815294516000958694859490930473ffffffffffffffffffffffffffffffffffffffff169263feaf968c926004808401938290030181865afa158015612646573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061266a9190614aa3565b50935050925050804261267d9190614994565b836020015163ffffffff1610801561269f57506000836020015163ffffffff16115b156126cd57505060e001517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff16919050565b6000821361270a576040517f43d4cf6600000000000000000000000000000000000000000000000000000000815260048101839052602401610b0d565b5092915050565b612719612725565b612722816132e1565b50565b60005473ffffffffffffffffffffffffffffffffffffffff1633146127a6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e6572000000000000000000006044820152606401610b0d565b565b6127a6612725565b600b546bffffffffffffffffffffffff166000036127ca57565b60006127d4610de2565b80519091506000819003612814576040517f30274b3a00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600b546000906128339083906bffffffffffffffffffffffff16614af3565b905060005b828110156128fe5781600a60008684815181106128575761285761460a565b602002602001015173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282829054906101000a90046bffffffffffffffffffffffff166128bf9190614b1e565b92506101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff160217905550806128f790614639565b9050612838565b506129098282614b43565b600b80546000906129299084906bffffffffffffffffffffffff166145e5565b92506101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff160217905550505050565b6040805161016081018252600080825260208201819052918101829052606081018290526080810182905260a0810182905260c0810182905260e0810182905261010081018290526101208101829052610140810191909152604080516101208101825260085463ffffffff80821683526401000000008204811660208401526801000000000000000082048116938301939093526c0100000000000000000000000081048316606083015268ffffffffffffffffff700100000000000000000000000000000000820416608083015264ffffffffff79010000000000000000000000000000000000000000000000000082041660a083015261ffff7e01000000000000000000000000000000000000000000000000000000000000909104811660c083018190526009547bffffffffffffffffffffffffffffffffffffffffffffffffffffffff811660e08501527c0100000000000000000000000000000000000000000000000000000000900490931661010080840191909152850151919291161115612b17576040517fdada758700000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600854600090700100000000000000000000000000000000900468ffffffffffffffffff1690506000612b548560e001513a8488608001516130b0565b9050806bffffffffffffffffffffffff1685606001516bffffffffffffffffffffffff161015612bb0576040517ff4d678b800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600083610100015163ffffffff1642612bc99190614b6b565b905060003087604001518860a001518960c001516001612be99190614b7e565b8a5180516020918201206101008d015160e08e0151604051612c9d98979695948c918c9132910173ffffffffffffffffffffffffffffffffffffffff9a8b168152988a1660208a015267ffffffffffffffff97881660408a0152959096166060880152608087019390935261ffff9190911660a086015263ffffffff90811660c08601526bffffffffffffffffffffffff9190911660e0850152919091166101008301529091166101208201526101400190565b6040516020818303038152906040528051906020012090506040518061016001604052808281526020013073ffffffffffffffffffffffffffffffffffffffff168152602001846bffffffffffffffffffffffff168152602001886040015173ffffffffffffffffffffffffffffffffffffffff1681526020018860a0015167ffffffffffffffff1681526020018860e0015163ffffffff168152602001886080015168ffffffffffffffffff1681526020018568ffffffffffffffffff168152602001866040015163ffffffff1664ffffffffff168152602001866060015163ffffffff1664ffffffffff1681526020018363ffffffff16815250955085604051602001612dac9190613fdc565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0818403018152918152815160209283012060009384526007909252909120555092949350505050565b6000612e0782602061497d565b612e1285602061497d565b612e1e88610144614b6b565b612e289190614b6b565b612e329190614b6b565b612e3d906000614b6b565b9050368114612ea8576040517f660bd4ba00000000000000000000000000000000000000000000000000000000815260206004820152601860248201527f63616c6c64617461206c656e677468206d69736d6174636800000000000000006044820152606401610b0d565b50505050505050565b600080808080612ec386880188614c7a565b84519499509297509095509350915060ff16801580612ee3575084518114155b80612eef575083518114155b80612efb575082518114155b80612f07575081518114155b15612f6e576040517f660bd4ba00000000000000000000000000000000000000000000000000000000815260206004820152601b60248201527f4669656c6473206d75737420626520657175616c206c656e67746800000000006044820152606401610b0d565b60005b818110156130a1576000613006888381518110612f9057612f9061460a565b6020026020010151888481518110612faa57612faa61460a565b6020026020010151888581518110612fc457612fc461460a565b6020026020010151888681518110612fde57612fde61460a565b6020026020010151888781518110612ff857612ff861460a565b6020026020010151886133d6565b9050600081600681111561301c5761301c61492a565b1480613039575060018160068111156130375761303761492a565b145b15613090578782815181106130505761305061460a565b60209081029190910181015160405133815290917fc708e0440951fd63499c0f7a73819b469ee5dd3ecc356c0ab4eb7f18389009d9910160405180910390a25b5061309a81614639565b9050612f71565b50505050505050505050505050565b600854600090790100000000000000000000000000000000000000000000000000900464ffffffffff1684101561310b57600854790100000000000000000000000000000000000000000000000000900464ffffffffff1693505b600854600090612710906131259063ffffffff168761497d565b61312f9190614d4c565b6131399086614b6b565b60085490915060009087906131729063ffffffff6c010000000000000000000000008204811691680100000000000000009004166149d6565b61317c91906149d6565b63ffffffff16905060006131c66000368080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152506136ea92505050565b905060006131e7826131d8858761497d565b6131e29190614b6b565b61382c565b9050600061320368ffffffffffffffffff808916908a16614b1e565b905061320f8183614b1e565b9a9950505050505050505050565b6000613227610de2565b511115610d8e57610d8e6127b0565b6000808a8a8a8a8a8a8a8a8a60405160200161325a99989796959493929190614d60565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815291905280516020909101207dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff167e01000000000000000000000000000000000000000000000000000000000000179150509998505050505050505050565b3373ffffffffffffffffffffffffffffffffffffffff821603613360576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c660000000000000000006044820152606401610b0d565b600180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff83811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b600080848060200190518101906133ed9190614e2c565b905060003a8261012001518361010001516134089190614ef4565b64ffffffffff16613419919061497d565b905060008460ff166134616000368080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152506136ea92505050565b61346b9190614d4c565b9050600061347c6131e28385614b6b565b905060006134893a61382c565b90506000807f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff1663330605298e8e868b60e0015168ffffffffffffffffff16896134e89190614b1e565b338d6040518763ffffffff1660e01b815260040161350b96959493929190614f12565b60408051808303816000875af1158015613529573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061354d9190614f8e565b909250905060008260068111156135665761356661492a565b1480613583575060018260068111156135815761358161492a565b145b156136d95760008e8152600760205260408120556135a18185614b1e565b336000908152600a6020526040812080547fffffffffffffffffffffffffffffffffffffffff000000000000000000000000166bffffffffffffffffffffffff93841617905560e0890151600b805468ffffffffffffffffff9092169390929161360d91859116614b1e565b92506101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff1602179055508d7f90815c2e624694e8010bffad2bcefaf96af282ef1bc2ebc0042d1b89a585e0468487848b60c0015168ffffffffffffffffff168c60e0015168ffffffffffffffffff16878b61368c9190614b1e565b6136969190614b1e565b6136a09190614b1e565b604080516bffffffffffffffffffffffff9586168152602081019490945291841683830152909216606082015290519081900360800190a25b509c9b505050505050505050505050565b6000466136f681613860565b1561377257606c73ffffffffffffffffffffffffffffffffffffffff1663c6f7de0e6040518163ffffffff1660e01b8152600401602060405180830381865afa158015613747573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061376b9190614fc1565b9392505050565b61377b81613883565b156138235773420000000000000000000000000000000000000f73ffffffffffffffffffffffffffffffffffffffff166349948e0e8460405180608001604052806048815260200161500a604891396040516020016137db929190614fda565b6040516020818303038152906040526040518263ffffffff1660e01b81526004016138069190613ca1565b602060405180830381865afa158015613747573d6000803e3d6000fd5b50600092915050565b600061385a6138396124b8565b61384b84670de0b6b3a764000061497d565b6138559190614d4c565b6138ca565b92915050565b600061a4b1821480613874575062066eed82145b8061385a57505062066eee1490565b6000600a82148061389557506101a482145b806138a2575062aa37dc82145b806138ae575061210582145b806138bb575062014a3382145b8061385a57505062014a341490565b60006bffffffffffffffffffffffff821115613968576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f53616665436173743a2076616c756520646f65736e27742066697420696e203960448201527f36206269747300000000000000000000000000000000000000000000000000006064820152608401610b0d565b5090565b604051806103e00160405280601f906020820280368337509192915050565b60008083601f84011261399d57600080fd5b50813567ffffffffffffffff8111156139b557600080fd5b6020830191508360208285010111156139cd57600080fd5b9250929050565b600080602083850312156139e757600080fd5b823567ffffffffffffffff8111156139fe57600080fd5b613a0a8582860161398b565b90969095509350505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b604051610120810167ffffffffffffffff81118282101715613a6957613a69613a16565b60405290565b604051610160810167ffffffffffffffff81118282101715613a6957613a69613a16565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff81118282101715613ada57613ada613a16565b604052919050565b63ffffffff8116811461272257600080fd5b803561117081613ae2565b68ffffffffffffffffff8116811461272257600080fd5b803561117081613aff565b64ffffffffff8116811461272257600080fd5b803561117081613b21565b803561ffff8116811461117057600080fd5b80357bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8116811461117057600080fd5b60006101208284031215613b9057600080fd5b613b98613a45565b613ba183613af4565b8152613baf60208401613af4565b6020820152613bc060408401613af4565b6040820152613bd160608401613af4565b6060820152613be260808401613b16565b6080820152613bf360a08401613b34565b60a0820152613c0460c08401613b3f565b60c0820152613c1560e08401613b51565b60e0820152610100613c28818501613af4565b908201529392505050565b60005b83811015613c4e578181015183820152602001613c36565b50506000910152565b60008151808452613c6f816020860160208601613c33565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b60208152600061376b6020830184613c57565b600082601f830112613cc557600080fd5b813567ffffffffffffffff811115613cdf57613cdf613a16565b613d1060207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f84011601613a93565b818152846020838601011115613d2557600080fd5b816020850160208301376000918101602001919091529392505050565b600060208284031215613d5457600080fd5b813567ffffffffffffffff811115613d6b57600080fd5b613d7784828501613cb4565b949350505050565b73ffffffffffffffffffffffffffffffffffffffff8116811461272257600080fd5b803561117081613d7f565b6bffffffffffffffffffffffff8116811461272257600080fd5b803561117081613dac565b60008060408385031215613de457600080fd5b8235613def81613d7f565b91506020830135613dff81613dac565b809150509250929050565b600081518084526020808501945080840160005b83811015613e5057815173ffffffffffffffffffffffffffffffffffffffff1687529582019590820190600101613e1e565b509495945050505050565b60208152600061376b6020830184613e0a565b600060208284031215613e8057600080fd5b5035919050565b600060208284031215613e9957600080fd5b813567ffffffffffffffff811115613eb057600080fd5b8201610160818503121561376b57600080fd5b805182526020810151613eee602084018273ffffffffffffffffffffffffffffffffffffffff169052565b506040810151613f0e60408401826bffffffffffffffffffffffff169052565b506060810151613f36606084018273ffffffffffffffffffffffffffffffffffffffff169052565b506080810151613f52608084018267ffffffffffffffff169052565b5060a0810151613f6a60a084018263ffffffff169052565b5060c0810151613f8760c084018268ffffffffffffffffff169052565b5060e0810151613fa460e084018268ffffffffffffffffff169052565b506101008181015164ffffffffff9081169184019190915261012080830151909116908301526101409081015163ffffffff16910152565b610160810161385a8284613ec3565b60008083601f840112613ffd57600080fd5b50813567ffffffffffffffff81111561401557600080fd5b6020830191508360208260051b85010111156139cd57600080fd5b60008060008060008060008060e0898b03121561404c57600080fd5b606089018a81111561405d57600080fd5b8998503567ffffffffffffffff8082111561407757600080fd5b6140838c838d0161398b565b909950975060808b013591508082111561409c57600080fd5b6140a88c838d01613feb565b909750955060a08b01359150808211156140c157600080fd5b506140ce8b828c01613feb565b999c989b50969995989497949560c00135949350505050565b815163ffffffff90811682526020808401518216908301526040808401518216908301526060808401519182169083015261012082019050608083015161413b608084018268ffffffffffffffffff169052565b5060a083015161415460a084018264ffffffffff169052565b5060c083015161416a60c084018261ffff169052565b5060e083015161419a60e08401827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff169052565b506101008381015163ffffffff8116848301525b505092915050565b67ffffffffffffffff8116811461272257600080fd5b8035611170816141b6565b6000806000806000608086880312156141ef57600080fd5b85356141fa816141b6565b9450602086013567ffffffffffffffff81111561421657600080fd5b6142228882890161398b565b909550935050604086013561423681613ae2565b949793965091946060013592915050565b600067ffffffffffffffff82111561426157614261613a16565b5060051b60200190565b600082601f83011261427c57600080fd5b8135602061429161428c83614247565b613a93565b82815260059290921b840181019181810190868411156142b057600080fd5b8286015b848110156142d45780356142c781613d7f565b83529183019183016142b4565b509695505050505050565b803560ff8116811461117057600080fd5b60008060008060008060c0878903121561430957600080fd5b863567ffffffffffffffff8082111561432157600080fd5b61432d8a838b0161426b565b9750602089013591508082111561434357600080fd5b61434f8a838b0161426b565b965061435d60408a016142df565b9550606089013591508082111561437357600080fd5b61437f8a838b01613cb4565b945061438d60808a016141cc565b935060a08901359150808211156143a357600080fd5b506143b089828a01613cb4565b9150509295509295509295565b6000602082840312156143cf57600080fd5b813561376b81613d7f565b600181811c908216806143ee57607f821691505b602082108103614427577f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b50919050565b601f8211156105ec57600081815260208120601f850160051c810160208610156144545750805b601f850160051c820191505b81811015610a8857828155600101614460565b67ffffffffffffffff83111561448b5761448b613a16565b61449f8361449983546143da565b8361442d565b6000601f8411600181146144f157600085156144bb5750838201355b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600387901b1c1916600186901b178355614587565b6000838152602090207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0861690835b828110156145405786850135825560209485019460019092019101614520565b508682101561457b577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60f88860031b161c19848701351681555b505060018560011b0183555b5050505050565b805161117081613aff565b6000602082840312156145ab57600080fd5b815161376b81613aff565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b6bffffffffffffffffffffffff82811682821603908082111561270a5761270a6145b6565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff820361466a5761466a6145b6565b5060010190565b6000610160823603121561468457600080fd5b61468c613a6f565b823567ffffffffffffffff8111156146a357600080fd5b6146af36828601613cb4565b825250602083013560208201526146c860408401613da1565b60408201526146d960608401613dc6565b60608201526146ea60808401613b16565b60808201526146fb60a084016141cc565b60a082015261470c60c084016141cc565b60c082015261471d60e08401613af4565b60e0820152610100614730818501613b3f565b908201526101206147428482016141cc565b90820152610140614754848201613da1565b9082015292915050565b60006020828403121561477057600080fd5b813561376b816141b6565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe18436030181126147b057600080fd5b83018035915067ffffffffffffffff8211156147cb57600080fd5b6020019150368190038213156139cd57600080fd5b6000602082840312156147f257600080fd5b61376b82613b3f565b60006020828403121561480d57600080fd5b813561376b81613ae2565b73ffffffffffffffffffffffffffffffffffffffff8a8116825267ffffffffffffffff8a166020830152881660408201526102406060820181905281018690526000610260878982850137600083890182015261ffff8716608084015260a0830186905263ffffffff851660c0840152601f88017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016830101905061320f60e0830184613ec3565b60ff818116838216019081111561385a5761385a6145b6565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600060ff83168061491b5761491b6148d9565b8060ff84160491505092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b8183823760009101908152919050565b828152606082602083013760800192915050565b808202811582820484141761385a5761385a6145b6565b8181038181111561385a5761385a6145b6565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603160045260246000fd5b63ffffffff81811683821601908082111561270a5761270a6145b6565b600061012063ffffffff808d1684528b6020850152808b16604085015250806060840152614a238184018a613e0a565b90508281036080840152614a378189613e0a565b905060ff871660a084015282810360c0840152614a548187613c57565b905067ffffffffffffffff851660e0840152828103610100840152614a798185613c57565b9c9b505050505050505050505050565b805169ffffffffffffffffffff8116811461117057600080fd5b600080600080600060a08688031215614abb57600080fd5b614ac486614a89565b9450602086015193506040860151925060608601519150614ae760808701614a89565b90509295509295909350565b60006bffffffffffffffffffffffff80841680614b1257614b126148d9565b92169190910492915050565b6bffffffffffffffffffffffff81811683821601908082111561270a5761270a6145b6565b6bffffffffffffffffffffffff8181168382160280821691908281146141ae576141ae6145b6565b8082018082111561385a5761385a6145b6565b67ffffffffffffffff81811683821601908082111561270a5761270a6145b6565b600082601f830112614bb057600080fd5b81356020614bc061428c83614247565b82815260059290921b84018101918181019086841115614bdf57600080fd5b8286015b848110156142d45780358352918301918301614be3565b600082601f830112614c0b57600080fd5b81356020614c1b61428c83614247565b82815260059290921b84018101918181019086841115614c3a57600080fd5b8286015b848110156142d457803567ffffffffffffffff811115614c5e5760008081fd5b614c6c8986838b0101613cb4565b845250918301918301614c3e565b600080600080600060a08688031215614c9257600080fd5b853567ffffffffffffffff80821115614caa57600080fd5b614cb689838a01614b9f565b96506020880135915080821115614ccc57600080fd5b614cd889838a01614bfa565b95506040880135915080821115614cee57600080fd5b614cfa89838a01614bfa565b94506060880135915080821115614d1057600080fd5b614d1c89838a01614bfa565b93506080880135915080821115614d3257600080fd5b50614d3f88828901614bfa565b9150509295509295909350565b600082614d5b57614d5b6148d9565b500490565b60006101208b835273ffffffffffffffffffffffffffffffffffffffff8b16602084015267ffffffffffffffff808b166040850152816060850152614da78285018b613e0a565b91508382036080850152614dbb828a613e0a565b915060ff881660a085015283820360c0850152614dd88288613c57565b90861660e08501528381036101008501529050614a798185613c57565b805161117081613d7f565b805161117081613dac565b8051611170816141b6565b805161117081613ae2565b805161117081613b21565b60006101608284031215614e3f57600080fd5b614e47613a6f565b82518152614e5760208401614df5565b6020820152614e6860408401614e00565b6040820152614e7960608401614df5565b6060820152614e8a60808401614e0b565b6080820152614e9b60a08401614e16565b60a0820152614eac60c0840161458e565b60c0820152614ebd60e0840161458e565b60e0820152610100614ed0818501614e21565b90820152610120614ee2848201614e21565b90820152610140613c28848201614e16565b64ffffffffff81811683821601908082111561270a5761270a6145b6565b6000610200808352614f268184018a613c57565b90508281036020840152614f3a8189613c57565b6bffffffffffffffffffffffff88811660408601528716606085015273ffffffffffffffffffffffffffffffffffffffff861660808501529150614f83905060a0830184613ec3565b979650505050505050565b60008060408385031215614fa157600080fd5b825160078110614fb057600080fd5b6020840151909250613dff81613dac565b600060208284031215614fd357600080fd5b5051919050565b60008351614fec818460208801613c33565b835190830190615000818360208801613c33565b0194935050505056fe307866666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666a164736f6c6343000813000a",
 }
 
 var FunctionsCoordinatorABI = FunctionsCoordinatorMetaData.ABI
diff --git a/core/gethwrappers/functions/generated/functions_router/functions_router.go b/core/gethwrappers/functions/generated/functions_router/functions_router.go
index 592f95b568f..368ef65560b 100644
--- a/core/gethwrappers/functions/generated/functions_router/functions_router.go
+++ b/core/gethwrappers/functions/generated/functions_router/functions_router.go
@@ -70,8 +70,8 @@ type IFunctionsSubscriptionsSubscription struct {
 }
 
 var FunctionsRouterMetaData = &bind.MetaData{
-	ABI: "[{\"inputs\":[{\"internalType\":\"address\",\"name\":\"linkToken\",\"type\":\"address\"},{\"components\":[{\"internalType\":\"uint16\",\"name\":\"maxConsumersPerSubscription\",\"type\":\"uint16\"},{\"internalType\":\"uint72\",\"name\":\"adminFee\",\"type\":\"uint72\"},{\"internalType\":\"bytes4\",\"name\":\"handleOracleFulfillmentSelector\",\"type\":\"bytes4\"},{\"internalType\":\"uint16\",\"name\":\"gasForCallExactCheck\",\"type\":\"uint16\"},{\"internalType\":\"uint32[]\",\"name\":\"maxCallbackGasLimits\",\"type\":\"uint32[]\"},{\"internalType\":\"uint16\",\"name\":\"subscriptionDepositMinimumRequests\",\"type\":\"uint16\"},{\"internalType\":\"uint72\",\"name\":\"subscriptionDepositJuels\",\"type\":\"uint72\"}],\"internalType\":\"structFunctionsRouter.Config\",\"name\":\"config\",\"type\":\"tuple\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"inputs\":[],\"name\":\"CannotRemoveWithPendingRequests\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"}],\"name\":\"DuplicateRequestId\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"EmptyRequestData\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint32\",\"name\":\"limit\",\"type\":\"uint32\"}],\"name\":\"GasLimitTooBig\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"id\",\"type\":\"bytes32\"}],\"name\":\"IdentifierIsReserved\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint96\",\"name\":\"currentBalanceJuels\",\"type\":\"uint96\"}],\"name\":\"InsufficientBalance\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidCalldata\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidConsumer\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint8\",\"name\":\"value\",\"type\":\"uint8\"}],\"name\":\"InvalidGasFlagValue\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidProposal\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidSubscription\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"proposedOwner\",\"type\":\"address\"}],\"name\":\"MustBeProposedOwner\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"MustBeSubscriptionOwner\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"OnlyCallableFromCoordinator\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"OnlyCallableFromLink\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"id\",\"type\":\"bytes32\"}],\"name\":\"RouteNotFound\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"}],\"name\":\"SenderMustAcceptTermsOfService\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"TimeoutNotExceeded\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint16\",\"name\":\"maximumConsumers\",\"type\":\"uint16\"}],\"name\":\"TooManyConsumers\",\"type\":\"error\"},{\"anonymous\":false,\"inputs\":[{\"components\":[{\"internalType\":\"uint16\",\"name\":\"maxConsumersPerSubscription\",\"type\":\"uint16\"},{\"internalType\":\"uint72\",\"name\":\"adminFee\",\"type\":\"uint72\"},{\"internalType\":\"bytes4\",\"name\":\"handleOracleFulfillmentSelector\",\"type\":\"bytes4\"},{\"internalType\":\"uint16\",\"name\":\"gasForCallExactCheck\",\"type\":\"uint16\"},{\"internalType\":\"uint32[]\",\"name\":\"maxCallbackGasLimits\",\"type\":\"uint32[]\"},{\"internalType\":\"uint16\",\"name\":\"subscriptionDepositMinimumRequests\",\"type\":\"uint16\"},{\"internalType\":\"uint72\",\"name\":\"subscriptionDepositJuels\",\"type\":\"uint72\"}],\"indexed\":false,\"internalType\":\"structFunctionsRouter.Config\",\"name\":\"\",\"type\":\"tuple\"}],\"name\":\"ConfigUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"proposedContractSetId\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"proposedContractSetFromAddress\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"proposedContractSetToAddress\",\"type\":\"address\"}],\"name\":\"ContractProposed\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"id\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"ContractUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"FundsRecovered\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"OwnershipTransferRequested\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"OwnershipTransferred\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"account\",\"type\":\"address\"}],\"name\":\"Paused\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"coordinator\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"transmitter\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"enumFunctionsResponse.FulfillResult\",\"name\":\"resultCode\",\"type\":\"uint8\"}],\"name\":\"RequestNotProcessed\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"},{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"uint96\",\"name\":\"totalCostJuels\",\"type\":\"uint96\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"transmitter\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"enumFunctionsResponse.FulfillResult\",\"name\":\"resultCode\",\"type\":\"uint8\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"response\",\"type\":\"bytes\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"err\",\"type\":\"bytes\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"callbackReturnData\",\"type\":\"bytes\"}],\"name\":\"RequestProcessed\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"},{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"donId\",\"type\":\"bytes32\"},{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"subscriptionOwner\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"requestingContract\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"requestInitiator\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"indexed\":false,\"internalType\":\"uint16\",\"name\":\"dataVersion\",\"type\":\"uint16\"},{\"indexed\":false,\"internalType\":\"uint32\",\"name\":\"callbackGasLimit\",\"type\":\"uint32\"},{\"indexed\":false,\"internalType\":\"uint96\",\"name\":\"estimatedTotalCostJuels\",\"type\":\"uint96\"}],\"name\":\"RequestStart\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"}],\"name\":\"RequestTimedOut\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"fundsRecipient\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"fundsAmount\",\"type\":\"uint256\"}],\"name\":\"SubscriptionCanceled\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"consumer\",\"type\":\"address\"}],\"name\":\"SubscriptionConsumerAdded\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"consumer\",\"type\":\"address\"}],\"name\":\"SubscriptionConsumerRemoved\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"owner\",\"type\":\"address\"}],\"name\":\"SubscriptionCreated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"oldBalance\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"newBalance\",\"type\":\"uint256\"}],\"name\":\"SubscriptionFunded\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"SubscriptionOwnerTransferRequested\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"SubscriptionOwnerTransferred\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"account\",\"type\":\"address\"}],\"name\":\"Unpaused\",\"type\":\"event\"},{\"inputs\":[],\"name\":\"MAX_CALLBACK_RETURN_BYTES\",\"outputs\":[{\"internalType\":\"uint16\",\"name\":\"\",\"type\":\"uint16\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"acceptOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"}],\"name\":\"acceptSubscriptionOwnerTransfer\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"consumer\",\"type\":\"address\"}],\"name\":\"addConsumer\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"cancelSubscription\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"createSubscription\",\"outputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"consumer\",\"type\":\"address\"}],\"name\":\"createSubscriptionWithConsumer\",\"outputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"response\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"err\",\"type\":\"bytes\"},{\"internalType\":\"uint96\",\"name\":\"juelsPerGas\",\"type\":\"uint96\"},{\"internalType\":\"uint96\",\"name\":\"costWithoutCallback\",\"type\":\"uint96\"},{\"internalType\":\"address\",\"name\":\"transmitter\",\"type\":\"address\"},{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"},{\"internalType\":\"address\",\"name\":\"coordinator\",\"type\":\"address\"},{\"internalType\":\"uint96\",\"name\":\"estimatedTotalCostJuels\",\"type\":\"uint96\"},{\"internalType\":\"address\",\"name\":\"client\",\"type\":\"address\"},{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"internalType\":\"uint32\",\"name\":\"callbackGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint72\",\"name\":\"adminFee\",\"type\":\"uint72\"},{\"internalType\":\"uint72\",\"name\":\"donFee\",\"type\":\"uint72\"},{\"internalType\":\"uint40\",\"name\":\"gasOverheadBeforeCallback\",\"type\":\"uint40\"},{\"internalType\":\"uint40\",\"name\":\"gasOverheadAfterCallback\",\"type\":\"uint40\"},{\"internalType\":\"uint32\",\"name\":\"timeoutTimestamp\",\"type\":\"uint32\"}],\"internalType\":\"structFunctionsResponse.Commitment\",\"name\":\"commitment\",\"type\":\"tuple\"}],\"name\":\"fulfill\",\"outputs\":[{\"internalType\":\"enumFunctionsResponse.FulfillResult\",\"name\":\"resultCode\",\"type\":\"uint8\"},{\"internalType\":\"uint96\",\"name\":\"\",\"type\":\"uint96\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getAdminFee\",\"outputs\":[{\"internalType\":\"uint72\",\"name\":\"\",\"type\":\"uint72\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getAllowListId\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getConfig\",\"outputs\":[{\"components\":[{\"internalType\":\"uint16\",\"name\":\"maxConsumersPerSubscription\",\"type\":\"uint16\"},{\"internalType\":\"uint72\",\"name\":\"adminFee\",\"type\":\"uint72\"},{\"internalType\":\"bytes4\",\"name\":\"handleOracleFulfillmentSelector\",\"type\":\"bytes4\"},{\"internalType\":\"uint16\",\"name\":\"gasForCallExactCheck\",\"type\":\"uint16\"},{\"internalType\":\"uint32[]\",\"name\":\"maxCallbackGasLimits\",\"type\":\"uint32[]\"},{\"internalType\":\"uint16\",\"name\":\"subscriptionDepositMinimumRequests\",\"type\":\"uint16\"},{\"internalType\":\"uint72\",\"name\":\"subscriptionDepositJuels\",\"type\":\"uint72\"}],\"internalType\":\"structFunctionsRouter.Config\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"client\",\"type\":\"address\"},{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"}],\"name\":\"getConsumer\",\"outputs\":[{\"components\":[{\"internalType\":\"bool\",\"name\":\"allowed\",\"type\":\"bool\"},{\"internalType\":\"uint64\",\"name\":\"initiatedRequests\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"completedRequests\",\"type\":\"uint64\"}],\"internalType\":\"structIFunctionsSubscriptions.Consumer\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"id\",\"type\":\"bytes32\"}],\"name\":\"getContractById\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"}],\"name\":\"getFlags\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"id\",\"type\":\"bytes32\"}],\"name\":\"getProposedContractById\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getProposedContractSet\",\"outputs\":[{\"internalType\":\"bytes32[]\",\"name\":\"\",\"type\":\"bytes32[]\"},{\"internalType\":\"address[]\",\"name\":\"\",\"type\":\"address[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"}],\"name\":\"getSubscription\",\"outputs\":[{\"components\":[{\"internalType\":\"uint96\",\"name\":\"balance\",\"type\":\"uint96\"},{\"internalType\":\"address\",\"name\":\"owner\",\"type\":\"address\"},{\"internalType\":\"uint96\",\"name\":\"blockedBalance\",\"type\":\"uint96\"},{\"internalType\":\"address\",\"name\":\"proposedOwner\",\"type\":\"address\"},{\"internalType\":\"address[]\",\"name\":\"consumers\",\"type\":\"address[]\"},{\"internalType\":\"bytes32\",\"name\":\"flags\",\"type\":\"bytes32\"}],\"internalType\":\"structIFunctionsSubscriptions.Subscription\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getSubscriptionCount\",\"outputs\":[{\"internalType\":\"uint64\",\"name\":\"\",\"type\":\"uint64\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionIdStart\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"subscriptionIdEnd\",\"type\":\"uint64\"}],\"name\":\"getSubscriptionsInRange\",\"outputs\":[{\"components\":[{\"internalType\":\"uint96\",\"name\":\"balance\",\"type\":\"uint96\"},{\"internalType\":\"address\",\"name\":\"owner\",\"type\":\"address\"},{\"internalType\":\"uint96\",\"name\":\"blockedBalance\",\"type\":\"uint96\"},{\"internalType\":\"address\",\"name\":\"proposedOwner\",\"type\":\"address\"},{\"internalType\":\"address[]\",\"name\":\"consumers\",\"type\":\"address[]\"},{\"internalType\":\"bytes32\",\"name\":\"flags\",\"type\":\"bytes32\"}],\"internalType\":\"structIFunctionsSubscriptions.Subscription[]\",\"name\":\"subscriptions\",\"type\":\"tuple[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getTotalBalance\",\"outputs\":[{\"internalType\":\"uint96\",\"name\":\"\",\"type\":\"uint96\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"internalType\":\"uint32\",\"name\":\"callbackGasLimit\",\"type\":\"uint32\"}],\"name\":\"isValidCallbackGasLimit\",\"outputs\":[],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"name\":\"onTokenTransfer\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"recipient\",\"type\":\"address\"},{\"internalType\":\"uint96\",\"name\":\"amount\",\"type\":\"uint96\"}],\"name\":\"oracleWithdraw\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"}],\"name\":\"ownerCancelSubscription\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"recipient\",\"type\":\"address\"},{\"internalType\":\"uint96\",\"name\":\"amount\",\"type\":\"uint96\"}],\"name\":\"ownerWithdraw\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"pause\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"paused\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"}],\"name\":\"pendingRequestExists\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32[]\",\"name\":\"proposedContractSetIds\",\"type\":\"bytes32[]\"},{\"internalType\":\"address[]\",\"name\":\"proposedContractSetAddresses\",\"type\":\"address[]\"}],\"name\":\"proposeContractsUpdate\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"newOwner\",\"type\":\"address\"}],\"name\":\"proposeSubscriptionOwnerTransfer\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"recoverFunds\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"consumer\",\"type\":\"address\"}],\"name\":\"removeConsumer\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"internalType\":\"uint16\",\"name\":\"dataVersion\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"callbackGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"bytes32\",\"name\":\"donId\",\"type\":\"bytes32\"}],\"name\":\"sendRequest\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"internalType\":\"uint16\",\"name\":\"dataVersion\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"callbackGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"bytes32\",\"name\":\"donId\",\"type\":\"bytes32\"}],\"name\":\"sendRequestToProposed\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"allowListId\",\"type\":\"bytes32\"}],\"name\":\"setAllowListId\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"internalType\":\"bytes32\",\"name\":\"flags\",\"type\":\"bytes32\"}],\"name\":\"setFlags\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"},{\"internalType\":\"address\",\"name\":\"coordinator\",\"type\":\"address\"},{\"internalType\":\"uint96\",\"name\":\"estimatedTotalCostJuels\",\"type\":\"uint96\"},{\"internalType\":\"address\",\"name\":\"client\",\"type\":\"address\"},{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"internalType\":\"uint32\",\"name\":\"callbackGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint72\",\"name\":\"adminFee\",\"type\":\"uint72\"},{\"internalType\":\"uint72\",\"name\":\"donFee\",\"type\":\"uint72\"},{\"internalType\":\"uint40\",\"name\":\"gasOverheadBeforeCallback\",\"type\":\"uint40\"},{\"internalType\":\"uint40\",\"name\":\"gasOverheadAfterCallback\",\"type\":\"uint40\"},{\"internalType\":\"uint32\",\"name\":\"timeoutTimestamp\",\"type\":\"uint32\"}],\"internalType\":\"structFunctionsResponse.Commitment[]\",\"name\":\"requestsToTimeoutByCommitment\",\"type\":\"tuple[]\"}],\"name\":\"timeoutRequests\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"transferOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"typeAndVersion\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"unpause\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"uint16\",\"name\":\"maxConsumersPerSubscription\",\"type\":\"uint16\"},{\"internalType\":\"uint72\",\"name\":\"adminFee\",\"type\":\"uint72\"},{\"internalType\":\"bytes4\",\"name\":\"handleOracleFulfillmentSelector\",\"type\":\"bytes4\"},{\"internalType\":\"uint16\",\"name\":\"gasForCallExactCheck\",\"type\":\"uint16\"},{\"internalType\":\"uint32[]\",\"name\":\"maxCallbackGasLimits\",\"type\":\"uint32[]\"},{\"internalType\":\"uint16\",\"name\":\"subscriptionDepositMinimumRequests\",\"type\":\"uint16\"},{\"internalType\":\"uint72\",\"name\":\"subscriptionDepositJuels\",\"type\":\"uint72\"}],\"internalType\":\"structFunctionsRouter.Config\",\"name\":\"config\",\"type\":\"tuple\"}],\"name\":\"updateConfig\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"updateContracts\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]",
-	Bin: "0x60a06040523480156200001157600080fd5b506040516200673c3803806200673c833981016040819052620000349162000549565b6001600160a01b0382166080526006805460ff191690553380600081620000a25760405162461bcd60e51b815260206004820152601860248201527f43616e6e6f7420736574206f776e657220746f207a65726f000000000000000060448201526064015b60405180910390fd5b600680546001600160a01b0380851661010002610100600160a81b031990921691909117909155811615620000dc57620000dc81620000f8565b505050620000f081620001aa60201b60201c565b50506200071a565b336001600160a01b03821603620001525760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640162000099565b600780546001600160a01b0319166001600160a01b03838116918217909255600654604051919261010090910416907fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae127890600090a350565b620001b4620002c0565b8051600a80546020808501516040860151606087015161ffff908116600160781b0261ffff60781b1960e09390931c6b010000000000000000000000029290921665ffffffffffff60581b196001600160481b0390941662010000026001600160581b031990961691909716179390931716939093171781556080830151805184936200024792600b9291019062000323565b5060a08201516002909101805460c0909301516001600160481b031662010000026001600160581b031990931661ffff909216919091179190911790556040517ea5832bf95f66c7814294cc4db681f20ee79608bfb8912a5321d66cfed5e98590620002b590839062000652565b60405180910390a150565b60065461010090046001600160a01b03163314620003215760405162461bcd60e51b815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e657200000000000000000000604482015260640162000099565b565b82805482825590600052602060002090600701600890048101928215620003c75791602002820160005b838211156200039357835183826101000a81548163ffffffff021916908363ffffffff16021790555092602001926004016020816003010492830192600103026200034d565b8015620003c55782816101000a81549063ffffffff021916905560040160208160030104928301926001030262000393565b505b50620003d5929150620003d9565b5090565b5b80821115620003d55760008155600101620003da565b634e487b7160e01b600052604160045260246000fd5b60405160e081016001600160401b03811182821017156200042b576200042b620003f0565b60405290565b604051601f8201601f191681016001600160401b03811182821017156200045c576200045c620003f0565b604052919050565b805161ffff811681146200047757600080fd5b919050565b80516001600160481b03811681146200047757600080fd5b80516001600160e01b0319811681146200047757600080fd5b600082601f830112620004bf57600080fd5b815160206001600160401b03821115620004dd57620004dd620003f0565b8160051b620004ee82820162000431565b92835284810182019282810190878511156200050957600080fd5b83870192505b848310156200053e57825163ffffffff811681146200052e5760008081fd5b825291830191908301906200050f565b979650505050505050565b600080604083850312156200055d57600080fd5b82516001600160a01b03811681146200057557600080fd5b60208401519092506001600160401b03808211156200059357600080fd5b9084019060e08287031215620005a857600080fd5b620005b262000406565b620005bd8362000464565b8152620005cd602084016200047c565b6020820152620005e06040840162000494565b6040820152620005f36060840162000464565b60608201526080830151828111156200060b57600080fd5b6200061988828601620004ad565b6080830152506200062d60a0840162000464565b60a08201526200064060c084016200047c565b60c08201528093505050509250929050565b6020808252825161ffff90811683830152838201516001600160481b03166040808501919091528401516001600160e01b0319166060808501919091528401511660808084019190915283015160e060a0840152805161010084018190526000929182019083906101208601905b80831015620006e857835163ffffffff168252928401926001929092019190840190620006c0565b5060a087015161ffff811660c0880152935060c08701516001600160481b03811660e088015293509695505050505050565b608051615fea62000752600039600081816111cd0152818161208c015281816129b801528181612a7c01526135d30152615fea6000f3fe608060405234801561001057600080fd5b50600436106102e95760003560e01c80637341c10c11610191578063b734c0f4116100e3578063e72f6e3011610097578063ea320e0b11610071578063ea320e0b146106dd578063ec2454e5146106f0578063f2fde38b1461071057600080fd5b8063e72f6e30146106a4578063e82622aa146106b7578063e82ad7d4146106ca57600080fd5b8063c3f909d4116100c8578063c3f909d414610669578063cc77470a1461067e578063d7ae1d301461069157600080fd5b8063b734c0f41461064b578063badc3eb61461065357600080fd5b80639f87fad711610145578063a4c0ed361161011f578063a4c0ed361461061d578063a9c9a91814610630578063aab396bd1461064357600080fd5b80639f87fad7146105e2578063a21a23e4146105f5578063a47c7696146105fd57600080fd5b8063823597401161017657806382359740146105a45780638456cb59146105b75780638da5cb5b146105bf57600080fd5b80637341c10c1461058957806379ba50971461059c57600080fd5b806341db4ca31161024a5780635ed6dfba116101fe57806366419970116101d857806366419970146104e1578063674603d0146105085780636a2215de1461055157600080fd5b80635ed6dfba146104a85780636162a323146104bb57806366316d8d146104ce57600080fd5b80634b8832d31161022f5780634b8832d31461045057806355fedefa146104635780635c975abb1461049157600080fd5b806341db4ca31461041c578063461d27621461043d57600080fd5b80631ded3b36116102a1578063330605291161028657806333060529146103e05780633e871e4d146104015780633f4ba83a1461041457600080fd5b80631ded3b361461039f5780632a905ccc146103b257600080fd5b806310fc49c1116102d257806310fc49c11461032357806312b5834914610336578063181f5a771461035657600080fd5b806302bcc5b6146102ee5780630c5d49cb14610303575b600080fd5b6103016102fc366004614ba6565b610723565b005b61030b608481565b60405161ffff90911681526020015b60405180910390f35b610301610331366004614be7565b610783565b6000546040516bffffffffffffffffffffffff909116815260200161031a565b6103926040518060400160405280601781526020017f46756e6374696f6e7320526f757465722076312e302e3000000000000000000081525081565b60405161031a9190614c8e565b6103016103ad366004614ca1565b61087f565b600a5462010000900468ffffffffffffffffff1660405168ffffffffffffffffff909116815260200161031a565b6103f36103ee366004614f8c565b6108b1565b60405161031a929190615074565b61030161040f366004615135565b610c7c565b610301610e91565b61042f61042a366004615249565b610ea3565b60405190815260200161031a565b61042f61044b366004615249565b610f03565b61030161045e3660046152cd565b610f0f565b61042f610471366004614ba6565b67ffffffffffffffff166000908152600360208190526040909120015490565b60065460ff165b604051901515815260200161031a565b6103016104b63660046152fb565b61105d565b6103016104c93660046153bd565b611216565b6103016104dc3660046152fb565b611396565b60025467ffffffffffffffff165b60405167ffffffffffffffff909116815260200161031a565b61051b610516366004615490565b61147f565b6040805182511515815260208084015167ffffffffffffffff90811691830191909152928201519092169082015260600161031a565b61056461055f3660046154be565b61150f565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200161031a565b6103016105973660046152cd565b6115ce565b610301611781565b6103016105b2366004614ba6565b6118a8565b6103016119ef565b600654610100900473ffffffffffffffffffffffffffffffffffffffff16610564565b6103016105f03660046152cd565b6119ff565b6104ef611daa565b61061061060b366004614ba6565b611f37565b60405161031a91906155a7565b61030161062b3660046155ba565b61206c565b61056461063e3660046154be565b6122b8565b60095461042f565b610301612317565b61065b612463565b60405161031a929190615616565b610671612533565b60405161031a919061566d565b6104ef61068c366004615749565b61269a565b61030161069f3660046152cd565b61291a565b6103016106b2366004615749565b61297f565b6103016106c5366004615766565b612af8565b6104986106d8366004614ba6565b612db7565b6103016106eb3660046154be565b612f06565b6107036106fe3660046157dc565b612f13565b60405161031a91906157fa565b61030161071e366004615749565b6131a8565b61072b6131b9565b610734816131c1565b67ffffffffffffffff81166000908152600360205260408120546107809183916c01000000000000000000000000900473ffffffffffffffffffffffffffffffffffffffff1690613237565b50565b67ffffffffffffffff8216600090815260036020819052604082200154600b54911a9081106107e8576040517f45c108ce00000000000000000000000000000000000000000000000000000000815260ff821660048201526024015b60405180910390fd5b6000600a6001018260ff16815481106108035761080361587a565b90600052602060002090600891828204019190066004029054906101000a900463ffffffff1690508063ffffffff168363ffffffff161115610879576040517f1d70f87a00000000000000000000000000000000000000000000000000000000815263ffffffff821660048201526024016107df565b50505050565b6108876131b9565b610890826131c1565b67ffffffffffffffff90911660009081526003602081905260409091200155565b6000806108bc613689565b826020015173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610925576040517f8bec23e700000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b82516000908152600560205260409020548061098a5783516020850151604051600295507f1a90e9a50793db2e394cf581e7c522e10c358a81e70acf6b5a0edd620c08dee19161097891899088906158a9565b60405180910390a25060009050610c71565b808460405160200161099c91906158db565b60405160208183030381529060405280519060200120146109f45783516020850151604051600695507f1a90e9a50793db2e394cf581e7c522e10c358a81e70acf6b5a0edd620c08dee19161097891899088906158a9565b8361012001518460a0015163ffffffff16610a0f9190615a37565b64ffffffffff165a1015610a5a5783516020850151604051600495507f1a90e9a50793db2e394cf581e7c522e10c358a81e70acf6b5a0edd620c08dee19161097891899088906158a9565b506000610a708460a0015163ffffffff16613691565b610a7a9088615a55565b9050600081878660c0015168ffffffffffffffffff16610a9a9190615a7d565b610aa49190615a7d565b9050610ab38560800151611f37565b600001516bffffffffffffffffffffffff16816bffffffffffffffffffffffff161115610b2b5784516020860151604051600596507f1a90e9a50793db2e394cf581e7c522e10c358a81e70acf6b5a0edd620c08dee191610b17918a9089906158a9565b60405180910390a25060009150610c719050565b84604001516bffffffffffffffffffffffff16816bffffffffffffffffffffffff161115610b905784516020860151604051600396507f1a90e9a50793db2e394cf581e7c522e10c358a81e70acf6b5a0edd620c08dee191610b17918a9089906158a9565b505082516000908152600560205260408120819055835160a08501516060860151610bc092918c918c9190613733565b8051909150610bd0576001610bd3565b60005b92506000610c0d8560800151866040015187606001518860c0015168ffffffffffffffffff168c610c078860200151613691565b8d6138f1565b9050846080015167ffffffffffffffff1685600001517f64778f26c70b60a8d7e29e2451b3844302d959448401c0535b768ed88c6b505e836020015189888f8f8960400151604051610c6496959493929190615aa2565b60405180910390a3519150505b965096945050505050565b610c84613c17565b8151815181141580610c965750600881115b15610ccd576040517fee03280800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60005b81811015610e47576000848281518110610cec57610cec61587a565b602002602001015190506000848381518110610d0a57610d0a61587a565b60200260200101519050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161480610d75575060008281526008602052604090205473ffffffffffffffffffffffffffffffffffffffff8281169116145b15610dac576040517fee03280800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600082815260086020526040908190205490517f8b052f0f4bf82fede7daffea71592b29d5ef86af1f3c7daaa0345dbb2f52f48191610e2c91859173ffffffffffffffffffffffffffffffffffffffff1690859092835273ffffffffffffffffffffffffffffffffffffffff918216602084015216604082015260600190565b60405180910390a1505080610e4090615b25565b9050610cd0565b506040805180820190915283815260208082018490528451600d91610e709183918801906149e6565b506020828101518051610e899260018501920190614a2d565b505050505050565b610e99613c17565b610ea1613c9d565b565b600080610eaf8361150f565b9050610ef783828a8a8a8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152508c92508b9150613d1a9050565b98975050505050505050565b600080610eaf836122b8565b610f17613689565b610f20826140ef565b610f286141b5565b73ffffffffffffffffffffffffffffffffffffffff81161580610f8f575067ffffffffffffffff821660009081526003602052604090206001015473ffffffffffffffffffffffffffffffffffffffff8281166c0100000000000000000000000090920416145b15610fc6576040517f8129bbcd00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b67ffffffffffffffff821660008181526003602090815260409182902060010180546bffffffffffffffffffffffff166c0100000000000000000000000073ffffffffffffffffffffffffffffffffffffffff8716908102919091179091558251338152918201527f69436ea6df009049404f564eff6622cd00522b0bd6a89efd9e52a355c4a879be910160405180910390a25050565b6110656131b9565b806bffffffffffffffffffffffff1660000361109b5750306000908152600160205260409020546bffffffffffffffffffffffff165b306000908152600160205260409020546bffffffffffffffffffffffff908116908216811015611107576040517f6b0fe56f0000000000000000000000000000000000000000000000000000000081526bffffffffffffffffffffffff821660048201526024016107df565b30600090815260016020526040812080548492906111349084906bffffffffffffffffffffffff16615b5d565b92506101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff160217905550816000808282829054906101000a90046bffffffffffffffffffffffff1661118a9190615b5d565b92506101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff16021790555061121183836bffffffffffffffffffffffff167f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff166142bf9092919063ffffffff16565b505050565b61121e613c17565b8051600a80546020808501516040860151606087015161ffff9081166f01000000000000000000000000000000027fffffffffffffffffffffffffffffff0000ffffffffffffffffffffffffffffff60e09390931c6b01000000000000000000000002929092167fffffffffffffffffffffffffffffff000000000000ffffffffffffffffffffff68ffffffffffffffffff90941662010000027fffffffffffffffffffffffffffffffffffffffffff0000000000000000000000909616919097161793909317169390931717815560808301518051849361130592600b92910190614aa7565b5060a08201516002909101805460c09093015168ffffffffffffffffff1662010000027fffffffffffffffffffffffffffffffffffffffffff000000000000000000000090931661ffff909216919091179190911790556040517ea5832bf95f66c7814294cc4db681f20ee79608bfb8912a5321d66cfed5e9859061138b90839061566d565b60405180910390a150565b61139e613689565b806bffffffffffffffffffffffff166000036113e6576040517f8129bbcd00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b336000908152600160205260409020546bffffffffffffffffffffffff908116908216811015611452576040517f6b0fe56f0000000000000000000000000000000000000000000000000000000081526bffffffffffffffffffffffff821660048201526024016107df565b33600090815260016020526040812080548492906111349084906bffffffffffffffffffffffff16615b5d565b60408051606080820183526000808352602080840182905292840181905273ffffffffffffffffffffffffffffffffffffffff861681526004835283812067ffffffffffffffff868116835290845290849020845192830185525460ff81161515835261010081048216938301939093526901000000000000000000909204909116918101919091525b92915050565b6000805b600d5460ff8216101561159857600d805460ff83169081106115375761153761587a565b9060005260206000200154830361158857600e805460ff831690811061155f5761155f61587a565b60009182526020909120015473ffffffffffffffffffffffffffffffffffffffff169392505050565b61159181615b82565b9050611513565b506040517f80833e33000000000000000000000000000000000000000000000000000000008152600481018390526024016107df565b6115d6613689565b6115df826140ef565b6115e76141b5565b60006115f6600a5461ffff1690565b67ffffffffffffffff841660009081526003602052604090206002015490915061ffff821611611658576040517fb72bc70300000000000000000000000000000000000000000000000000000000815261ffff821660048201526024016107df565b73ffffffffffffffffffffffffffffffffffffffff8216600090815260046020908152604080832067ffffffffffffffff8716845290915290205460ff16156116a057505050565b73ffffffffffffffffffffffffffffffffffffffff8216600081815260046020908152604080832067ffffffffffffffff881680855290835281842080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00166001908117909155600384528285206002018054918201815585529383902090930180547fffffffffffffffffffffffff000000000000000000000000000000000000000016851790555192835290917f43dc749a04ac8fb825cbd514f7c0e13f13bc6f2ee66043b76629d51776cff8e091015b60405180910390a2505050565b60075473ffffffffffffffffffffffffffffffffffffffff163314611802576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4d7573742062652070726f706f736564206f776e65720000000000000000000060448201526064016107df565b600680547fffffffffffffffffffffff0000000000000000000000000000000000000000ff81166101003381810292909217909355600780547fffffffffffffffffffffffff00000000000000000000000000000000000000001690556040519290910473ffffffffffffffffffffffffffffffffffffffff169182907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a350565b6118b0613689565b6118b86141b5565b67ffffffffffffffff81166000908152600360205260409020805460019091015473ffffffffffffffffffffffffffffffffffffffff6c010000000000000000000000009283900481169290910416338114611958576040517f4e1d9f1800000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff821660048201526024016107df565b67ffffffffffffffff831660008181526003602090815260409182902080546c01000000000000000000000000339081026bffffffffffffffffffffffff928316178355600190920180549091169055825173ffffffffffffffffffffffffffffffffffffffff87168152918201527f6f1dc65165ffffedfd8e507b4a0f1fcfdada045ed11f6c26ba27cedfe87802f09101611774565b6119f7613c17565b610ea161434c565b611a07613689565b611a10826140ef565b611a186141b5565b73ffffffffffffffffffffffffffffffffffffffff8116600090815260046020908152604080832067ffffffffffffffff8087168552908352928190208151606081018352905460ff8116151582526101008104851693820193909352690100000000000000000090920490921691810191909152611a9782846143a7565b806040015167ffffffffffffffff16816020015167ffffffffffffffff1614611aec576040517f06eb10c800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b67ffffffffffffffff8316600090815260036020908152604080832060020180548251818502810185019093528083529192909190830182828015611b6757602002820191906000526020600020905b815473ffffffffffffffffffffffffffffffffffffffff168152600190910190602001808311611b3c575b5050505050905060005b8151811015611d0f578373ffffffffffffffffffffffffffffffffffffffff16828281518110611ba357611ba361587a565b602002602001015173ffffffffffffffffffffffffffffffffffffffff1603611cff578160018351611bd59190615ba1565b81518110611be557611be561587a565b6020026020010151600360008767ffffffffffffffff1667ffffffffffffffff1681526020019081526020016000206002018281548110611c2857611c2861587a565b600091825260208083209190910180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff949094169390931790925567ffffffffffffffff87168152600390915260409020600201805480611ca257611ca2615bb4565b60008281526020902081017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff90810180547fffffffffffffffffffffffff0000000000000000000000000000000000000000169055019055611d0f565b611d0881615b25565b9050611b71565b5073ffffffffffffffffffffffffffffffffffffffff8316600081815260046020908152604080832067ffffffffffffffff89168085529083529281902080547fffffffffffffffffffffffffffffff00000000000000000000000000000000001690555192835290917f182bff9831466789164ca77075fffd84916d35a8180ba73c27e45634549b445b910160405180910390a250505050565b6000611db4613689565b611dbc6141b5565b60028054600090611dd69067ffffffffffffffff16615be3565b825467ffffffffffffffff8083166101009490940a93840293021916919091179091556040805160c0810182526000808252336020830152918101829052606081018290529192506080820190604051908082528060200260200182016040528015611e4c578160200160208202803683370190505b5081526000602091820181905267ffffffffffffffff841681526003825260409081902083518484015173ffffffffffffffffffffffffffffffffffffffff9081166c010000000000000000000000009081026bffffffffffffffffffffffff9384161784559386015160608701519091169093029216919091176001820155608083015180519192611ee792600285019290910190614a2d565b5060a0919091015160039091015560405133815267ffffffffffffffff8216907f464722b4166576d3dcbba877b999bc35cf911f4eaf434b7eba68fa113951d0bf9060200160405180910390a290565b6040805160c0810182526000808252602082018190529181018290526060808201839052608082015260a0810191909152611f71826131c1565b67ffffffffffffffff8216600090815260036020908152604091829020825160c08101845281546bffffffffffffffffffffffff808216835273ffffffffffffffffffffffffffffffffffffffff6c0100000000000000000000000092839004811684870152600185015491821684880152919004166060820152600282018054855181860281018601909652808652919492936080860193929083018282801561205257602002820191906000526020600020905b815473ffffffffffffffffffffffffffffffffffffffff168152600190910190602001808311612027575b505050505081526020016003820154815250509050919050565b612074613689565b3373ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000016146120e3576040517f44b0e3c300000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6020811461211d576040517f8129bbcd00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600061212b82840184614ba6565b67ffffffffffffffff81166000908152600360205260409020549091506c01000000000000000000000000900473ffffffffffffffffffffffffffffffffffffffff166121a4576040517f1f6a65b600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b67ffffffffffffffff8116600090815260036020526040812080546bffffffffffffffffffffffff16918691906121db8385615a7d565b92506101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff160217905550846000808282829054906101000a90046bffffffffffffffffffffffff166122319190615a7d565b92506101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff1602179055508167ffffffffffffffff167fd39ec07f4e209f627a4c427971473820dc129761ba28de8906bd56f57101d4f88287846122989190615c0a565b6040805192835260208301919091520160405180910390a2505050505050565b60008181526008602052604081205473ffffffffffffffffffffffffffffffffffffffff1680611509576040517f80833e33000000000000000000000000000000000000000000000000000000008152600481018490526024016107df565b61231f613c17565b60005b600d54811015612442576000600d60000182815481106123445761234461587a565b906000526020600020015490506000600d60010183815481106123695761236961587a565b6000918252602080832091909101548483526008825260409283902054835186815273ffffffffffffffffffffffffffffffffffffffff91821693810193909352169181018290529091507ff8a6175bca1ba37d682089187edc5e20a859989727f10ca6bd9a5bc0de8caf949060600160405180910390a160009182526008602052604090912080547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff90921691909117905561243b81615b25565b9050612322565b50600d60006124518282614b51565b61245f600183016000614b51565b5050565b606080600d600001600d600101818054806020026020016040519081016040528092919081815260200182805480156124bb57602002820191906000526020600020905b8154815260200190600101908083116124a7575b505050505091508080548060200260200160405190810160405280929190818152602001828054801561252457602002820191906000526020600020905b815473ffffffffffffffffffffffffffffffffffffffff1681526001909101906020018083116124f9575b50505050509050915091509091565b6040805160e0810182526000808252602082018190529181018290526060808201839052608082015260a0810182905260c08101919091526040805160e08082018352600a805461ffff808216855262010000820468ffffffffffffffffff166020808701919091526b010000000000000000000000830490941b7fffffffff0000000000000000000000000000000000000000000000000000000016858701526f01000000000000000000000000000000909104166060840152600b805485518185028101850190965280865293949193608086019383018282801561266557602002820191906000526020600020906000905b82829054906101000a900463ffffffff1663ffffffff16815260200190600401906020826003010492830192600103820291508084116126285790505b50505091835250506002919091015461ffff8116602083015262010000900468ffffffffffffffffff16604090910152919050565b60006126a4613689565b6126ac6141b5565b600280546000906126c69067ffffffffffffffff16615be3565b825467ffffffffffffffff8083166101009490940a93840293021916919091179091556040805160c081018252600080825233602083015291810182905260608101829052919250608082019060405190808252806020026020018201604052801561273c578160200160208202803683370190505b5081526000602091820181905267ffffffffffffffff841681526003825260409081902083518484015173ffffffffffffffffffffffffffffffffffffffff9081166c010000000000000000000000009081026bffffffffffffffffffffffff93841617845593860151606087015190911690930292169190911760018201556080830151805191926127d792600285019290910190614a2d565b5060a0919091015160039182015567ffffffffffffffff82166000818152602092835260408082206002018054600180820183559184528584200180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff891690811790915583526004855281832084845285529181902080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00169092179091555133815290917f464722b4166576d3dcbba877b999bc35cf911f4eaf434b7eba68fa113951d0bf910160405180910390a260405173ffffffffffffffffffffffffffffffffffffffff8316815267ffffffffffffffff8216907f43dc749a04ac8fb825cbd514f7c0e13f13bc6f2ee66043b76629d51776cff8e09060200160405180910390a2919050565b612922613689565b61292b826140ef565b6129336141b5565b61293c82612db7565b15612973576040517f06eb10c800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b61245f82826001613237565b6129876131b9565b6040517f70a082310000000000000000000000000000000000000000000000000000000081523060048201526000907f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff16906370a0823190602401602060405180830381865afa158015612a14573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612a389190615c1d565b6000549091506bffffffffffffffffffffffff1681811015611211576000612a608284615ba1565b9050612aa373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001685836142bf565b6040805173ffffffffffffffffffffffffffffffffffffffff86168152602081018390527f59bfc682b673f8cbf945f1e454df9334834abf7dfe7f92237ca29ecb9b436600910160405180910390a150505050565b612b00613689565b60005b81811015611211576000838383818110612b1f57612b1f61587a565b90506101600201803603810190612b369190615c36565b80516080820151600082815260056020908152604091829020549151949550929391929091612b67918691016158db565b6040516020818303038152906040528051906020012014612bb4576040517f8129bbcd00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b82610140015163ffffffff16421015612bf9576040517fa2376fe800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60208301516040517f85b214cf0000000000000000000000000000000000000000000000000000000081526004810184905273ffffffffffffffffffffffffffffffffffffffff909116906385b214cf90602401600060405180830381600087803b158015612c6757600080fd5b505af1158015612c7b573d6000803e3d6000fd5b50505060408085015167ffffffffffffffff84166000908152600360205291822060010180549193509190612cbf9084906bffffffffffffffffffffffff16615b5d565b82546bffffffffffffffffffffffff9182166101009390930a928302919092021990911617905550606083015173ffffffffffffffffffffffffffffffffffffffff16600090815260046020908152604080832067ffffffffffffffff808616855292529091208054600192600991612d479185916901000000000000000000900416615c53565b825467ffffffffffffffff9182166101009390930a9283029190920219909116179055506000828152600560205260408082208290555183917ff1ca1e9147be737b04a2b018a79405f687a97de8dd8a2559bbe62357343af41491a250505080612db090615b25565b9050612b03565b67ffffffffffffffff8116600090815260036020908152604080832060020180548251818502810185019093528083528493830182828015612e2f57602002820191906000526020600020905b815473ffffffffffffffffffffffffffffffffffffffff168152600190910190602001808311612e04575b5050505050905060005b8151811015612efc57600060046000848481518110612e5a57612e5a61587a565b60209081029190910181015173ffffffffffffffffffffffffffffffffffffffff168252818101929092526040908101600090812067ffffffffffffffff808a168352908452908290208251606081018452905460ff8116151582526101008104831694820185905269010000000000000000009004909116918101829052925014612eeb57506001949350505050565b50612ef581615b25565b9050612e39565b5060009392505050565b612f0e613c17565b600955565b60608167ffffffffffffffff168367ffffffffffffffff161180612f46575060025467ffffffffffffffff908116908316115b80612f5b575060025467ffffffffffffffff16155b15612f92576040517f8129bbcd00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b612f9c8383615c74565b612fa7906001615c53565b67ffffffffffffffff1667ffffffffffffffff811115612fc957612fc9614ccd565b60405190808252806020026020018201604052801561304657816020015b6040805160c081018252600080825260208083018290529282018190526060808301829052608083015260a082015282527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff909201910181612fe75790505b50905060005b6130568484615c74565b67ffffffffffffffff1681116131a1576003600061307e8367ffffffffffffffff8816615c0a565b67ffffffffffffffff1681526020808201929092526040908101600020815160c08101835281546bffffffffffffffffffffffff808216835273ffffffffffffffffffffffffffffffffffffffff6c010000000000000000000000009283900481168488015260018501549182168487015291900416606082015260028201805484518187028101870190955280855291949293608086019390929083018282801561316057602002820191906000526020600020905b815473ffffffffffffffffffffffffffffffffffffffff168152600190910190602001808311613135575b505050505081526020016003820154815250508282815181106131855761318561587a565b60200260200101819052508061319a90615b25565b905061304c565b5092915050565b6131b0613c17565b6107808161441b565b610ea1613c17565b67ffffffffffffffff81166000908152600360205260409020546c01000000000000000000000000900473ffffffffffffffffffffffffffffffffffffffff16610780576040517f1f6a65b600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b67ffffffffffffffff83166000908152600360209081526040808320815160c08101835281546bffffffffffffffffffffffff808216835273ffffffffffffffffffffffffffffffffffffffff6c010000000000000000000000009283900481168488015260018501549182168487015291900416606082015260028201805484518187028101870190955280855291949293608086019390929083018282801561331857602002820191906000526020600020905b815473ffffffffffffffffffffffffffffffffffffffff1681526001909101906020018083116132ed575b50505091835250506003919091015460209091015280519091506000805b83608001515181101561342e5760008460800151828151811061335b5761335b61587a565b60209081029190910181015173ffffffffffffffffffffffffffffffffffffffff8116600090815260048352604080822067ffffffffffffffff808e16845294529020549092506133bb9169010000000000000000009091041684615c53565b73ffffffffffffffffffffffffffffffffffffffff909116600090815260046020908152604080832067ffffffffffffffff8c168452909152902080547fffffffffffffffffffffffffffffff0000000000000000000000000000000000169055915061342781615b25565b9050613336565b5067ffffffffffffffff8616600090815260036020526040812081815560018101829055906134606002830182614b51565b50600060039190910155600c5461ffff81169062010000900468ffffffffffffffffff1685801561349e57508161ffff168367ffffffffffffffff16105b1561355a576000846bffffffffffffffffffffffff168268ffffffffffffffffff16116134d6578168ffffffffffffffffff166134d8565b845b90506bffffffffffffffffffffffff81161561355857306000908152600160205260408120805483929061351b9084906bffffffffffffffffffffffff16615a7d565b92506101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff16021790555080856135559190615b5d565b94505b505b6bffffffffffffffffffffffff841615613617576000805485919081906135909084906bffffffffffffffffffffffff16615b5d565b92506101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff16021790555061361787856bffffffffffffffffffffffff167f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff166142bf9092919063ffffffff16565b6040805173ffffffffffffffffffffffffffffffffffffffff891681526bffffffffffffffffffffffff8616602082015267ffffffffffffffff8a16917fe8ed5b475a5b5987aa9165e8731bb78043f39eee32ec5a1169a89e27fcd49815910160405180910390a25050505050505050565b610ea1614517565b60006bffffffffffffffffffffffff82111561372f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f53616665436173743a2076616c756520646f65736e27742066697420696e203960448201527f362062697473000000000000000000000000000000000000000000000000000060648201526084016107df565b5090565b60408051606080820183526000808352602083015291810191909152813b1580156137865750506040805160608101825260008082526020808301829052835191825281018352918101919091526138e8565b600a546040516000916b010000000000000000000000900460e01b906137b4908a908a908a90602401615c95565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0818403018152918152602080830180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fffffffff000000000000000000000000000000000000000000000000000000009590951694909417909352600a548151608480825260c0820190935292945061ffff6f01000000000000000000000000000000909104169260009283928392820181803683370190505090505a8481101561388257600080fd5b8490036040810481038a1061389657600080fd5b505a60008087516020890160008d8ff193505a900391503d60848111156138bb575060845b808252806000602084013e5060408051606081018252931515845260208401929092529082015293505050505b95945050505050565b604080518082019091526000808252602082015260006139118486615a55565b90506000816139208886615a7d565b61392a9190615a7d565b67ffffffffffffffff8b166000908152600360205260409020549091506bffffffffffffffffffffffff80831691161080613991575067ffffffffffffffff8a166000908152600360205260409020600101546bffffffffffffffffffffffff808b169116105b156139f45767ffffffffffffffff8a16600090815260036020526040908190205490517f6b0fe56f0000000000000000000000000000000000000000000000000000000081526bffffffffffffffffffffffff90911660048201526024016107df565b67ffffffffffffffff8a1660009081526003602052604081208054839290613a2b9084906bffffffffffffffffffffffff16615b5d565b82546101009290920a6bffffffffffffffffffffffff81810219909316918316021790915567ffffffffffffffff8c16600090815260036020526040812060010180548d94509092613a7f91859116615b5d565b92506101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff1602179055508184613ab99190615a7d565b3360009081526001602052604081208054909190613ae69084906bffffffffffffffffffffffff16615a7d565b82546101009290920a6bffffffffffffffffffffffff81810219909316918316021790915530600090815260016020526040812080548b94509092613b2d91859116615a7d565b82546bffffffffffffffffffffffff9182166101009390930a92830291909202199091161790555073ffffffffffffffffffffffffffffffffffffffff8816600090815260046020908152604080832067ffffffffffffffff808f16855292529091208054600192600991613bb19185916901000000000000000000900416615c53565b92506101000a81548167ffffffffffffffff021916908367ffffffffffffffff1602179055506040518060400160405280836bffffffffffffffffffffffff168152602001826bffffffffffffffffffffffff1681525092505050979650505050505050565b600654610100900473ffffffffffffffffffffffffffffffffffffffff163314610ea1576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e65720000000000000000000060448201526064016107df565b613ca5614584565b600680547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001690557f5db9ee0a495bf2e6ff9c91a7834c1ba4fdd244a5e8aa4e537bd38aeae4b073aa335b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390a1565b6000613d24613689565b613d2d856131c1565b613d3733866143a7565b613d418583610783565b8351600003613d7b576040517ec1cfc000000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6000613d8686611f37565b90506000613d94338861147f565b600a54604080516101608101825289815267ffffffffffffffff8b1660009081526003602081815293822001549495506201000090930468ffffffffffffffffff169373ffffffffffffffffffffffffffffffffffffffff8d169263a631571e929190820190815233602082015260408881015189519190920191613e1891615b5d565b6bffffffffffffffffffffffff1681526020018568ffffffffffffffffff1681526020018c67ffffffffffffffff168152602001866020015167ffffffffffffffff1681526020018963ffffffff1681526020018a61ffff168152602001866040015167ffffffffffffffff168152602001876020015173ffffffffffffffffffffffffffffffffffffffff168152506040518263ffffffff1660e01b8152600401613ec49190615cc0565b610160604051808303816000875af1158015613ee4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190613f089190615e25565b805160009081526005602052604090205490915015613f595780516040517f304f32e800000000000000000000000000000000000000000000000000000000815260048101919091526024016107df565b604051806101600160405280826000015181526020018b73ffffffffffffffffffffffffffffffffffffffff16815260200182604001516bffffffffffffffffffffffff1681526020013373ffffffffffffffffffffffffffffffffffffffff1681526020018a67ffffffffffffffff1681526020018763ffffffff1681526020018368ffffffffffffffffff1681526020018260e0015168ffffffffffffffffff16815260200182610100015164ffffffffff16815260200182610120015164ffffffffff16815260200182610140015163ffffffff1681525060405160200161404491906158db565b60405160208183030381529060405280519060200120600560008360000151815260200190815260200160002081905550614084338a83604001516145f0565b8867ffffffffffffffff168b82600001517ff67aec45c9a7ede407974a3e0c3a743dffeab99ee3f2d4c9a8144c2ebf2c7ec9876020015133328e8e8e8a604001516040516140d89796959493929190615ef8565b60405180910390a4519a9950505050505050505050565b67ffffffffffffffff81166000908152600360205260409020546c01000000000000000000000000900473ffffffffffffffffffffffffffffffffffffffff1680614166576040517f1f6a65b600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b3373ffffffffffffffffffffffffffffffffffffffff82161461245f576040517f5a68151d00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60095460009081526008602052604090205473ffffffffffffffffffffffffffffffffffffffff16806141e55750565b604080516000815260208101918290527f6b14daf80000000000000000000000000000000000000000000000000000000090915273ffffffffffffffffffffffffffffffffffffffff821690636b14daf89061424690339060248101615f70565b602060405180830381865afa158015614263573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906142879190615f9f565b610780576040517f229062630000000000000000000000000000000000000000000000000000000081523360048201526024016107df565b6040805173ffffffffffffffffffffffffffffffffffffffff8416602482015260448082018490528251808303909101815260649091019091526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fa9059cbb000000000000000000000000000000000000000000000000000000001790526112119084906146cb565b614354614517565b600680547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660011790557f62e78cea01bee320cd4e420270b5ea74000d11b0c9f74754ebdbfc544b05a258613cf03390565b73ffffffffffffffffffffffffffffffffffffffff8216600090815260046020908152604080832067ffffffffffffffff8516845290915290205460ff1661245f576040517f71e8313700000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b3373ffffffffffffffffffffffffffffffffffffffff82160361449a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c6600000000000000000060448201526064016107df565b600780547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff838116918217909255600654604051919261010090910416907fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae127890600090a350565b60065460ff1615610ea1576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601060248201527f5061757361626c653a207061757365640000000000000000000000000000000060448201526064016107df565b60065460ff16610ea1576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601460248201527f5061757361626c653a206e6f742070617573656400000000000000000000000060448201526064016107df565b67ffffffffffffffff82166000908152600360205260408120600101805483929061462a9084906bffffffffffffffffffffffff16615a7d565b82546bffffffffffffffffffffffff91821661010093840a908102920219161790915573ffffffffffffffffffffffffffffffffffffffff8516600090815260046020908152604080832067ffffffffffffffff80891685529252909120805460019450909284926146a0928492900416615c53565b92506101000a81548167ffffffffffffffff021916908367ffffffffffffffff160217905550505050565b600061472d826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c65648152508573ffffffffffffffffffffffffffffffffffffffff166147d79092919063ffffffff16565b805190915015611211578080602001905181019061474b9190615f9f565b611211576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e60448201527f6f7420737563636565640000000000000000000000000000000000000000000060648201526084016107df565b60606147e684846000856147ee565b949350505050565b606082471015614880576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f60448201527f722063616c6c000000000000000000000000000000000000000000000000000060648201526084016107df565b6000808673ffffffffffffffffffffffffffffffffffffffff1685876040516148a99190615fc1565b60006040518083038185875af1925050503d80600081146148e6576040519150601f19603f3d011682016040523d82523d6000602084013e6148eb565b606091505b50915091506148fc87838387614907565b979650505050505050565b6060831561499d5782516000036149965773ffffffffffffffffffffffffffffffffffffffff85163b614996576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000060448201526064016107df565b50816147e6565b6147e683838151156149b25781518083602001fd5b806040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016107df9190614c8e565b828054828255906000526020600020908101928215614a21579160200282015b82811115614a21578251825591602001919060010190614a06565b5061372f929150614b6b565b828054828255906000526020600020908101928215614a21579160200282015b82811115614a2157825182547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff909116178255602090920191600190910190614a4d565b82805482825590600052602060002090600701600890048101928215614a215791602002820160005b83821115614b1457835183826101000a81548163ffffffff021916908363ffffffff1602179055509260200192600401602081600301049283019260010302614ad0565b8015614b445782816101000a81549063ffffffff0219169055600401602081600301049283019260010302614b14565b505061372f929150614b6b565b508054600082559060005260206000209081019061078091905b5b8082111561372f5760008155600101614b6c565b67ffffffffffffffff8116811461078057600080fd5b8035614ba181614b80565b919050565b600060208284031215614bb857600080fd5b8135614bc381614b80565b9392505050565b63ffffffff8116811461078057600080fd5b8035614ba181614bca565b60008060408385031215614bfa57600080fd5b8235614c0581614b80565b91506020830135614c1581614bca565b809150509250929050565b60005b83811015614c3b578181015183820152602001614c23565b50506000910152565b60008151808452614c5c816020860160208601614c20565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b602081526000614bc36020830184614c44565b60008060408385031215614cb457600080fd5b8235614cbf81614b80565b946020939093013593505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b604051610160810167ffffffffffffffff81118282101715614d2057614d20614ccd565b60405290565b60405160e0810167ffffffffffffffff81118282101715614d2057614d20614ccd565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff81118282101715614d9057614d90614ccd565b604052919050565b600082601f830112614da957600080fd5b813567ffffffffffffffff811115614dc357614dc3614ccd565b614df460207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f84011601614d49565b818152846020838601011115614e0957600080fd5b816020850160208301376000918101602001919091529392505050565b6bffffffffffffffffffffffff8116811461078057600080fd5b8035614ba181614e26565b73ffffffffffffffffffffffffffffffffffffffff8116811461078057600080fd5b8035614ba181614e4b565b68ffffffffffffffffff8116811461078057600080fd5b8035614ba181614e78565b64ffffffffff8116811461078057600080fd5b8035614ba181614e9a565b60006101608284031215614ecb57600080fd5b614ed3614cfc565b905081358152614ee560208301614e6d565b6020820152614ef660408301614e40565b6040820152614f0760608301614e6d565b6060820152614f1860808301614b96565b6080820152614f2960a08301614bdc565b60a0820152614f3a60c08301614e8f565b60c0820152614f4b60e08301614e8f565b60e0820152610100614f5e818401614ead565b90820152610120614f70838201614ead565b90820152610140614f82838201614bdc565b9082015292915050565b6000806000806000806102008789031215614fa657600080fd5b863567ffffffffffffffff80821115614fbe57600080fd5b614fca8a838b01614d98565b97506020890135915080821115614fe057600080fd5b50614fed89828a01614d98565b9550506040870135614ffe81614e26565b9350606087013561500e81614e26565b9250608087013561501e81614e4b565b915061502d8860a08901614eb8565b90509295509295509295565b60078110615070577f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b9052565b604081016150828285615039565b6bffffffffffffffffffffffff831660208301529392505050565b600067ffffffffffffffff8211156150b7576150b7614ccd565b5060051b60200190565b600082601f8301126150d257600080fd5b813560206150e76150e28361509d565b614d49565b82815260059290921b8401810191818101908684111561510657600080fd5b8286015b8481101561512a57803561511d81614e4b565b835291830191830161510a565b509695505050505050565b6000806040838503121561514857600080fd5b823567ffffffffffffffff8082111561516057600080fd5b818501915085601f83011261517457600080fd5b813560206151846150e28361509d565b82815260059290921b840181019181810190898411156151a357600080fd5b948201945b838610156151c1578535825294820194908201906151a8565b965050860135925050808211156151d757600080fd5b506151e4858286016150c1565b9150509250929050565b60008083601f84011261520057600080fd5b50813567ffffffffffffffff81111561521857600080fd5b60208301915083602082850101111561523057600080fd5b9250929050565b803561ffff81168114614ba157600080fd5b60008060008060008060a0878903121561526257600080fd5b863561526d81614b80565b9550602087013567ffffffffffffffff81111561528957600080fd5b61529589828a016151ee565b90965094506152a8905060408801615237565b925060608701356152b881614bca565b80925050608087013590509295509295509295565b600080604083850312156152e057600080fd5b82356152eb81614b80565b91506020830135614c1581614e4b565b6000806040838503121561530e57600080fd5b823561531981614e4b565b91506020830135614c1581614e26565b80357fffffffff0000000000000000000000000000000000000000000000000000000081168114614ba157600080fd5b600082601f83011261536a57600080fd5b8135602061537a6150e28361509d565b82815260059290921b8401810191818101908684111561539957600080fd5b8286015b8481101561512a5780356153b081614bca565b835291830191830161539d565b6000602082840312156153cf57600080fd5b813567ffffffffffffffff808211156153e757600080fd5b9083019060e082860312156153fb57600080fd5b615403614d26565b61540c83615237565b815261541a60208401614e8f565b602082015261542b60408401615329565b604082015261543c60608401615237565b606082015260808301358281111561545357600080fd5b61545f87828601615359565b60808301525061547160a08401615237565b60a082015261548260c08401614e8f565b60c082015295945050505050565b600080604083850312156154a357600080fd5b82356154ae81614e4b565b91506020830135614c1581614b80565b6000602082840312156154d057600080fd5b5035919050565b600081518084526020808501945080840160005b8381101561551d57815173ffffffffffffffffffffffffffffffffffffffff16875295820195908201906001016154eb565b509495945050505050565b60006bffffffffffffffffffffffff808351168452602083015173ffffffffffffffffffffffffffffffffffffffff8082166020870152826040860151166040870152806060860151166060870152505050608082015160c0608085015261559360c08501826154d7565b60a093840151949093019390935250919050565b602081526000614bc36020830184615528565b600080600080606085870312156155d057600080fd5b84356155db81614e4b565b935060208501359250604085013567ffffffffffffffff8111156155fe57600080fd5b61560a878288016151ee565b95989497509550505050565b604080825283519082018190526000906020906060840190828701845b8281101561564f57815184529284019290840190600101615633565b5050508381038285015261566381866154d7565b9695505050505050565b60006020808352610100830161ffff808651168386015268ffffffffffffffffff838701511660408601527fffffffff00000000000000000000000000000000000000000000000000000000604087015116606086015280606087015116608086015250608085015160e060a0860152818151808452610120870191508483019350600092505b8083101561571a57835163ffffffff1682529284019260019290920191908401906156f4565b5060a087015161ffff811660c0880152935060c087015168ffffffffffffffffff811660e08801529350615663565b60006020828403121561575b57600080fd5b8135614bc381614e4b565b6000806020838503121561577957600080fd5b823567ffffffffffffffff8082111561579157600080fd5b818501915085601f8301126157a557600080fd5b8135818111156157b457600080fd5b866020610160830285010111156157ca57600080fd5b60209290920196919550909350505050565b600080604083850312156157ef57600080fd5b82356154ae81614b80565b6000602080830181845280855180835260408601915060408160051b870101925083870160005b8281101561586d577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc088860301845261585b858351615528565b94509285019290850190600101615821565b5092979650505050505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b73ffffffffffffffffffffffffffffffffffffffff848116825283166020820152606081016147e66040830184615039565b8151815260208083015161016083019161590c9084018273ffffffffffffffffffffffffffffffffffffffff169052565b50604083015161592c60408401826bffffffffffffffffffffffff169052565b506060830151615954606084018273ffffffffffffffffffffffffffffffffffffffff169052565b506080830151615970608084018267ffffffffffffffff169052565b5060a083015161598860a084018263ffffffff169052565b5060c08301516159a560c084018268ffffffffffffffffff169052565b5060e08301516159c260e084018268ffffffffffffffffff169052565b506101008381015164ffffffffff81168483015250506101208381015164ffffffffff81168483015250506101408381015163ffffffff8116848301525b505092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b64ffffffffff8181168382160190808211156131a1576131a1615a08565b6bffffffffffffffffffffffff818116838216028082169190828114615a0057615a00615a08565b6bffffffffffffffffffffffff8181168382160190808211156131a1576131a1615a08565b6bffffffffffffffffffffffff8716815273ffffffffffffffffffffffffffffffffffffffff86166020820152615adc6040820186615039565b60c060608201526000615af260c0830186614c44565b8281036080840152615b048186614c44565b905082810360a0840152615b188185614c44565b9998505050505050505050565b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8203615b5657615b56615a08565b5060010190565b6bffffffffffffffffffffffff8281168282160390808211156131a1576131a1615a08565b600060ff821660ff8103615b9857615b98615a08565b60010192915050565b8181038181111561150957611509615a08565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603160045260246000fd5b600067ffffffffffffffff808316818103615c0057615c00615a08565b6001019392505050565b8082018082111561150957611509615a08565b600060208284031215615c2f57600080fd5b5051919050565b60006101608284031215615c4957600080fd5b614bc38383614eb8565b67ffffffffffffffff8181168382160190808211156131a1576131a1615a08565b67ffffffffffffffff8281168282160390808211156131a1576131a1615a08565b838152606060208201526000615cae6060830185614c44565b82810360408401526156638185614c44565b6020815260008251610160806020850152615cdf610180850183614c44565b9150602085015160408501526040850151615d12606086018273ffffffffffffffffffffffffffffffffffffffff169052565b5060608501516bffffffffffffffffffffffff8116608086015250608085015168ffffffffffffffffff811660a08601525060a085015167ffffffffffffffff811660c08601525060c085015167ffffffffffffffff811660e08601525060e0850151610100615d898187018363ffffffff169052565b8601519050610120615da08682018361ffff169052565b8601519050610140615dbd8682018367ffffffffffffffff169052565b9095015173ffffffffffffffffffffffffffffffffffffffff1693019290925250919050565b8051614ba181614e4b565b8051614ba181614e26565b8051614ba181614b80565b8051614ba181614bca565b8051614ba181614e78565b8051614ba181614e9a565b60006101608284031215615e3857600080fd5b615e40614cfc565b82518152615e5060208401615de3565b6020820152615e6160408401615dee565b6040820152615e7260608401615de3565b6060820152615e8360808401615df9565b6080820152615e9460a08401615e04565b60a0820152615ea560c08401615e0f565b60c0820152615eb660e08401615e0f565b60e0820152610100615ec9818501615e1a565b90820152610120615edb848201615e1a565b90820152610140615eed848201615e04565b908201529392505050565b600073ffffffffffffffffffffffffffffffffffffffff808a168352808916602084015280881660408401525060e06060830152615f3960e0830187614c44565b61ffff9590951660808301525063ffffffff9290921660a08301526bffffffffffffffffffffffff1660c090910152949350505050565b73ffffffffffffffffffffffffffffffffffffffff831681526040602082015260006147e66040830184614c44565b600060208284031215615fb157600080fd5b81518015158114614bc357600080fd5b60008251615fd3818460208701614c20565b919091019291505056fea164736f6c6343000813000a",
+	ABI: "[{\"inputs\":[{\"internalType\":\"address\",\"name\":\"linkToken\",\"type\":\"address\"},{\"components\":[{\"internalType\":\"uint16\",\"name\":\"maxConsumersPerSubscription\",\"type\":\"uint16\"},{\"internalType\":\"uint72\",\"name\":\"adminFee\",\"type\":\"uint72\"},{\"internalType\":\"bytes4\",\"name\":\"handleOracleFulfillmentSelector\",\"type\":\"bytes4\"},{\"internalType\":\"uint16\",\"name\":\"gasForCallExactCheck\",\"type\":\"uint16\"},{\"internalType\":\"uint32[]\",\"name\":\"maxCallbackGasLimits\",\"type\":\"uint32[]\"},{\"internalType\":\"uint16\",\"name\":\"subscriptionDepositMinimumRequests\",\"type\":\"uint16\"},{\"internalType\":\"uint72\",\"name\":\"subscriptionDepositJuels\",\"type\":\"uint72\"}],\"internalType\":\"structFunctionsRouter.Config\",\"name\":\"config\",\"type\":\"tuple\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"inputs\":[],\"name\":\"CannotRemoveWithPendingRequests\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"}],\"name\":\"DuplicateRequestId\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"EmptyRequestData\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint32\",\"name\":\"limit\",\"type\":\"uint32\"}],\"name\":\"GasLimitTooBig\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"id\",\"type\":\"bytes32\"}],\"name\":\"IdentifierIsReserved\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint96\",\"name\":\"currentBalanceJuels\",\"type\":\"uint96\"}],\"name\":\"InsufficientBalance\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidCalldata\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidConsumer\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint8\",\"name\":\"value\",\"type\":\"uint8\"}],\"name\":\"InvalidGasFlagValue\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidProposal\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidSubscription\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"proposedOwner\",\"type\":\"address\"}],\"name\":\"MustBeProposedOwner\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"MustBeSubscriptionOwner\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"OnlyCallableFromCoordinator\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"OnlyCallableFromLink\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"id\",\"type\":\"bytes32\"}],\"name\":\"RouteNotFound\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"}],\"name\":\"SenderMustAcceptTermsOfService\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"TimeoutNotExceeded\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint16\",\"name\":\"maximumConsumers\",\"type\":\"uint16\"}],\"name\":\"TooManyConsumers\",\"type\":\"error\"},{\"anonymous\":false,\"inputs\":[{\"components\":[{\"internalType\":\"uint16\",\"name\":\"maxConsumersPerSubscription\",\"type\":\"uint16\"},{\"internalType\":\"uint72\",\"name\":\"adminFee\",\"type\":\"uint72\"},{\"internalType\":\"bytes4\",\"name\":\"handleOracleFulfillmentSelector\",\"type\":\"bytes4\"},{\"internalType\":\"uint16\",\"name\":\"gasForCallExactCheck\",\"type\":\"uint16\"},{\"internalType\":\"uint32[]\",\"name\":\"maxCallbackGasLimits\",\"type\":\"uint32[]\"},{\"internalType\":\"uint16\",\"name\":\"subscriptionDepositMinimumRequests\",\"type\":\"uint16\"},{\"internalType\":\"uint72\",\"name\":\"subscriptionDepositJuels\",\"type\":\"uint72\"}],\"indexed\":false,\"internalType\":\"structFunctionsRouter.Config\",\"name\":\"\",\"type\":\"tuple\"}],\"name\":\"ConfigUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"proposedContractSetId\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"proposedContractSetFromAddress\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"proposedContractSetToAddress\",\"type\":\"address\"}],\"name\":\"ContractProposed\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"id\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"ContractUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"FundsRecovered\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"OwnershipTransferRequested\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"OwnershipTransferred\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"account\",\"type\":\"address\"}],\"name\":\"Paused\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"coordinator\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"transmitter\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"enumFunctionsResponse.FulfillResult\",\"name\":\"resultCode\",\"type\":\"uint8\"}],\"name\":\"RequestNotProcessed\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"},{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"uint96\",\"name\":\"totalCostJuels\",\"type\":\"uint96\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"transmitter\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"enumFunctionsResponse.FulfillResult\",\"name\":\"resultCode\",\"type\":\"uint8\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"response\",\"type\":\"bytes\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"err\",\"type\":\"bytes\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"callbackReturnData\",\"type\":\"bytes\"}],\"name\":\"RequestProcessed\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"},{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"donId\",\"type\":\"bytes32\"},{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"subscriptionOwner\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"requestingContract\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"requestInitiator\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"indexed\":false,\"internalType\":\"uint16\",\"name\":\"dataVersion\",\"type\":\"uint16\"},{\"indexed\":false,\"internalType\":\"uint32\",\"name\":\"callbackGasLimit\",\"type\":\"uint32\"},{\"indexed\":false,\"internalType\":\"uint96\",\"name\":\"estimatedTotalCostJuels\",\"type\":\"uint96\"}],\"name\":\"RequestStart\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"}],\"name\":\"RequestTimedOut\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"fundsRecipient\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"fundsAmount\",\"type\":\"uint256\"}],\"name\":\"SubscriptionCanceled\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"consumer\",\"type\":\"address\"}],\"name\":\"SubscriptionConsumerAdded\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"consumer\",\"type\":\"address\"}],\"name\":\"SubscriptionConsumerRemoved\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"owner\",\"type\":\"address\"}],\"name\":\"SubscriptionCreated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"oldBalance\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"newBalance\",\"type\":\"uint256\"}],\"name\":\"SubscriptionFunded\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"SubscriptionOwnerTransferRequested\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"SubscriptionOwnerTransferred\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"account\",\"type\":\"address\"}],\"name\":\"Unpaused\",\"type\":\"event\"},{\"inputs\":[],\"name\":\"MAX_CALLBACK_RETURN_BYTES\",\"outputs\":[{\"internalType\":\"uint16\",\"name\":\"\",\"type\":\"uint16\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"acceptOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"}],\"name\":\"acceptSubscriptionOwnerTransfer\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"consumer\",\"type\":\"address\"}],\"name\":\"addConsumer\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"cancelSubscription\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"createSubscription\",\"outputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"consumer\",\"type\":\"address\"}],\"name\":\"createSubscriptionWithConsumer\",\"outputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"response\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"err\",\"type\":\"bytes\"},{\"internalType\":\"uint96\",\"name\":\"juelsPerGas\",\"type\":\"uint96\"},{\"internalType\":\"uint96\",\"name\":\"costWithoutFulfillment\",\"type\":\"uint96\"},{\"internalType\":\"address\",\"name\":\"transmitter\",\"type\":\"address\"},{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"},{\"internalType\":\"address\",\"name\":\"coordinator\",\"type\":\"address\"},{\"internalType\":\"uint96\",\"name\":\"estimatedTotalCostJuels\",\"type\":\"uint96\"},{\"internalType\":\"address\",\"name\":\"client\",\"type\":\"address\"},{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"internalType\":\"uint32\",\"name\":\"callbackGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint72\",\"name\":\"adminFee\",\"type\":\"uint72\"},{\"internalType\":\"uint72\",\"name\":\"donFee\",\"type\":\"uint72\"},{\"internalType\":\"uint40\",\"name\":\"gasOverheadBeforeCallback\",\"type\":\"uint40\"},{\"internalType\":\"uint40\",\"name\":\"gasOverheadAfterCallback\",\"type\":\"uint40\"},{\"internalType\":\"uint32\",\"name\":\"timeoutTimestamp\",\"type\":\"uint32\"}],\"internalType\":\"structFunctionsResponse.Commitment\",\"name\":\"commitment\",\"type\":\"tuple\"}],\"name\":\"fulfill\",\"outputs\":[{\"internalType\":\"enumFunctionsResponse.FulfillResult\",\"name\":\"resultCode\",\"type\":\"uint8\"},{\"internalType\":\"uint96\",\"name\":\"\",\"type\":\"uint96\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getAdminFee\",\"outputs\":[{\"internalType\":\"uint72\",\"name\":\"\",\"type\":\"uint72\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getAllowListId\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getConfig\",\"outputs\":[{\"components\":[{\"internalType\":\"uint16\",\"name\":\"maxConsumersPerSubscription\",\"type\":\"uint16\"},{\"internalType\":\"uint72\",\"name\":\"adminFee\",\"type\":\"uint72\"},{\"internalType\":\"bytes4\",\"name\":\"handleOracleFulfillmentSelector\",\"type\":\"bytes4\"},{\"internalType\":\"uint16\",\"name\":\"gasForCallExactCheck\",\"type\":\"uint16\"},{\"internalType\":\"uint32[]\",\"name\":\"maxCallbackGasLimits\",\"type\":\"uint32[]\"},{\"internalType\":\"uint16\",\"name\":\"subscriptionDepositMinimumRequests\",\"type\":\"uint16\"},{\"internalType\":\"uint72\",\"name\":\"subscriptionDepositJuels\",\"type\":\"uint72\"}],\"internalType\":\"structFunctionsRouter.Config\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"client\",\"type\":\"address\"},{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"}],\"name\":\"getConsumer\",\"outputs\":[{\"components\":[{\"internalType\":\"bool\",\"name\":\"allowed\",\"type\":\"bool\"},{\"internalType\":\"uint64\",\"name\":\"initiatedRequests\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"completedRequests\",\"type\":\"uint64\"}],\"internalType\":\"structIFunctionsSubscriptions.Consumer\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"id\",\"type\":\"bytes32\"}],\"name\":\"getContractById\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"}],\"name\":\"getFlags\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"id\",\"type\":\"bytes32\"}],\"name\":\"getProposedContractById\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getProposedContractSet\",\"outputs\":[{\"internalType\":\"bytes32[]\",\"name\":\"\",\"type\":\"bytes32[]\"},{\"internalType\":\"address[]\",\"name\":\"\",\"type\":\"address[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"}],\"name\":\"getSubscription\",\"outputs\":[{\"components\":[{\"internalType\":\"uint96\",\"name\":\"balance\",\"type\":\"uint96\"},{\"internalType\":\"address\",\"name\":\"owner\",\"type\":\"address\"},{\"internalType\":\"uint96\",\"name\":\"blockedBalance\",\"type\":\"uint96\"},{\"internalType\":\"address\",\"name\":\"proposedOwner\",\"type\":\"address\"},{\"internalType\":\"address[]\",\"name\":\"consumers\",\"type\":\"address[]\"},{\"internalType\":\"bytes32\",\"name\":\"flags\",\"type\":\"bytes32\"}],\"internalType\":\"structIFunctionsSubscriptions.Subscription\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getSubscriptionCount\",\"outputs\":[{\"internalType\":\"uint64\",\"name\":\"\",\"type\":\"uint64\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionIdStart\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"subscriptionIdEnd\",\"type\":\"uint64\"}],\"name\":\"getSubscriptionsInRange\",\"outputs\":[{\"components\":[{\"internalType\":\"uint96\",\"name\":\"balance\",\"type\":\"uint96\"},{\"internalType\":\"address\",\"name\":\"owner\",\"type\":\"address\"},{\"internalType\":\"uint96\",\"name\":\"blockedBalance\",\"type\":\"uint96\"},{\"internalType\":\"address\",\"name\":\"proposedOwner\",\"type\":\"address\"},{\"internalType\":\"address[]\",\"name\":\"consumers\",\"type\":\"address[]\"},{\"internalType\":\"bytes32\",\"name\":\"flags\",\"type\":\"bytes32\"}],\"internalType\":\"structIFunctionsSubscriptions.Subscription[]\",\"name\":\"subscriptions\",\"type\":\"tuple[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getTotalBalance\",\"outputs\":[{\"internalType\":\"uint96\",\"name\":\"\",\"type\":\"uint96\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"internalType\":\"uint32\",\"name\":\"callbackGasLimit\",\"type\":\"uint32\"}],\"name\":\"isValidCallbackGasLimit\",\"outputs\":[],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"name\":\"onTokenTransfer\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"recipient\",\"type\":\"address\"},{\"internalType\":\"uint96\",\"name\":\"amount\",\"type\":\"uint96\"}],\"name\":\"oracleWithdraw\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"}],\"name\":\"ownerCancelSubscription\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"recipient\",\"type\":\"address\"},{\"internalType\":\"uint96\",\"name\":\"amount\",\"type\":\"uint96\"}],\"name\":\"ownerWithdraw\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"pause\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"paused\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"}],\"name\":\"pendingRequestExists\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32[]\",\"name\":\"proposedContractSetIds\",\"type\":\"bytes32[]\"},{\"internalType\":\"address[]\",\"name\":\"proposedContractSetAddresses\",\"type\":\"address[]\"}],\"name\":\"proposeContractsUpdate\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"newOwner\",\"type\":\"address\"}],\"name\":\"proposeSubscriptionOwnerTransfer\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"recoverFunds\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"consumer\",\"type\":\"address\"}],\"name\":\"removeConsumer\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"internalType\":\"uint16\",\"name\":\"dataVersion\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"callbackGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"bytes32\",\"name\":\"donId\",\"type\":\"bytes32\"}],\"name\":\"sendRequest\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"internalType\":\"uint16\",\"name\":\"dataVersion\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"callbackGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"bytes32\",\"name\":\"donId\",\"type\":\"bytes32\"}],\"name\":\"sendRequestToProposed\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"allowListId\",\"type\":\"bytes32\"}],\"name\":\"setAllowListId\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"internalType\":\"bytes32\",\"name\":\"flags\",\"type\":\"bytes32\"}],\"name\":\"setFlags\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"requestId\",\"type\":\"bytes32\"},{\"internalType\":\"address\",\"name\":\"coordinator\",\"type\":\"address\"},{\"internalType\":\"uint96\",\"name\":\"estimatedTotalCostJuels\",\"type\":\"uint96\"},{\"internalType\":\"address\",\"name\":\"client\",\"type\":\"address\"},{\"internalType\":\"uint64\",\"name\":\"subscriptionId\",\"type\":\"uint64\"},{\"internalType\":\"uint32\",\"name\":\"callbackGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint72\",\"name\":\"adminFee\",\"type\":\"uint72\"},{\"internalType\":\"uint72\",\"name\":\"donFee\",\"type\":\"uint72\"},{\"internalType\":\"uint40\",\"name\":\"gasOverheadBeforeCallback\",\"type\":\"uint40\"},{\"internalType\":\"uint40\",\"name\":\"gasOverheadAfterCallback\",\"type\":\"uint40\"},{\"internalType\":\"uint32\",\"name\":\"timeoutTimestamp\",\"type\":\"uint32\"}],\"internalType\":\"structFunctionsResponse.Commitment[]\",\"name\":\"requestsToTimeoutByCommitment\",\"type\":\"tuple[]\"}],\"name\":\"timeoutRequests\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"transferOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"typeAndVersion\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"unpause\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"uint16\",\"name\":\"maxConsumersPerSubscription\",\"type\":\"uint16\"},{\"internalType\":\"uint72\",\"name\":\"adminFee\",\"type\":\"uint72\"},{\"internalType\":\"bytes4\",\"name\":\"handleOracleFulfillmentSelector\",\"type\":\"bytes4\"},{\"internalType\":\"uint16\",\"name\":\"gasForCallExactCheck\",\"type\":\"uint16\"},{\"internalType\":\"uint32[]\",\"name\":\"maxCallbackGasLimits\",\"type\":\"uint32[]\"},{\"internalType\":\"uint16\",\"name\":\"subscriptionDepositMinimumRequests\",\"type\":\"uint16\"},{\"internalType\":\"uint72\",\"name\":\"subscriptionDepositJuels\",\"type\":\"uint72\"}],\"internalType\":\"structFunctionsRouter.Config\",\"name\":\"config\",\"type\":\"tuple\"}],\"name\":\"updateConfig\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"updateContracts\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]",
+	Bin: "0x60a06040523480156200001157600080fd5b506040516200673c3803806200673c833981016040819052620000349162000549565b6001600160a01b0382166080526006805460ff191690553380600081620000a25760405162461bcd60e51b815260206004820152601860248201527f43616e6e6f7420736574206f776e657220746f207a65726f000000000000000060448201526064015b60405180910390fd5b600680546001600160a01b0380851661010002610100600160a81b031990921691909117909155811615620000dc57620000dc81620000f8565b505050620000f081620001aa60201b60201c565b50506200071a565b336001600160a01b03821603620001525760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640162000099565b600780546001600160a01b0319166001600160a01b03838116918217909255600654604051919261010090910416907fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae127890600090a350565b620001b4620002c0565b8051600a80546020808501516040860151606087015161ffff908116600160781b0261ffff60781b1960e09390931c6b010000000000000000000000029290921665ffffffffffff60581b196001600160481b0390941662010000026001600160581b031990961691909716179390931716939093171781556080830151805184936200024792600b9291019062000323565b5060a08201516002909101805460c0909301516001600160481b031662010000026001600160581b031990931661ffff909216919091179190911790556040517ea5832bf95f66c7814294cc4db681f20ee79608bfb8912a5321d66cfed5e98590620002b590839062000652565b60405180910390a150565b60065461010090046001600160a01b03163314620003215760405162461bcd60e51b815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e657200000000000000000000604482015260640162000099565b565b82805482825590600052602060002090600701600890048101928215620003c75791602002820160005b838211156200039357835183826101000a81548163ffffffff021916908363ffffffff16021790555092602001926004016020816003010492830192600103026200034d565b8015620003c55782816101000a81549063ffffffff021916905560040160208160030104928301926001030262000393565b505b50620003d5929150620003d9565b5090565b5b80821115620003d55760008155600101620003da565b634e487b7160e01b600052604160045260246000fd5b60405160e081016001600160401b03811182821017156200042b576200042b620003f0565b60405290565b604051601f8201601f191681016001600160401b03811182821017156200045c576200045c620003f0565b604052919050565b805161ffff811681146200047757600080fd5b919050565b80516001600160481b03811681146200047757600080fd5b80516001600160e01b0319811681146200047757600080fd5b600082601f830112620004bf57600080fd5b815160206001600160401b03821115620004dd57620004dd620003f0565b8160051b620004ee82820162000431565b92835284810182019282810190878511156200050957600080fd5b83870192505b848310156200053e57825163ffffffff811681146200052e5760008081fd5b825291830191908301906200050f565b979650505050505050565b600080604083850312156200055d57600080fd5b82516001600160a01b03811681146200057557600080fd5b60208401519092506001600160401b03808211156200059357600080fd5b9084019060e08287031215620005a857600080fd5b620005b262000406565b620005bd8362000464565b8152620005cd602084016200047c565b6020820152620005e06040840162000494565b6040820152620005f36060840162000464565b60608201526080830151828111156200060b57600080fd5b6200061988828601620004ad565b6080830152506200062d60a0840162000464565b60a08201526200064060c084016200047c565b60c08201528093505050509250929050565b6020808252825161ffff90811683830152838201516001600160481b03166040808501919091528401516001600160e01b0319166060808501919091528401511660808084019190915283015160e060a0840152805161010084018190526000929182019083906101208601905b80831015620006e857835163ffffffff168252928401926001929092019190840190620006c0565b5060a087015161ffff811660c0880152935060c08701516001600160481b03811660e088015293509695505050505050565b608051615fea62000752600039600081816111cd0152818161208c015281816129b801528181612a7c01526135d30152615fea6000f3fe608060405234801561001057600080fd5b50600436106102e95760003560e01c80637341c10c11610191578063b734c0f4116100e3578063e72f6e3011610097578063ea320e0b11610071578063ea320e0b146106dd578063ec2454e5146106f0578063f2fde38b1461071057600080fd5b8063e72f6e30146106a4578063e82622aa146106b7578063e82ad7d4146106ca57600080fd5b8063c3f909d4116100c8578063c3f909d414610669578063cc77470a1461067e578063d7ae1d301461069157600080fd5b8063b734c0f41461064b578063badc3eb61461065357600080fd5b80639f87fad711610145578063a4c0ed361161011f578063a4c0ed361461061d578063a9c9a91814610630578063aab396bd1461064357600080fd5b80639f87fad7146105e2578063a21a23e4146105f5578063a47c7696146105fd57600080fd5b8063823597401161017657806382359740146105a45780638456cb59146105b75780638da5cb5b146105bf57600080fd5b80637341c10c1461058957806379ba50971461059c57600080fd5b806341db4ca31161024a5780635ed6dfba116101fe57806366419970116101d857806366419970146104e1578063674603d0146105085780636a2215de1461055157600080fd5b80635ed6dfba146104a85780636162a323146104bb57806366316d8d146104ce57600080fd5b80634b8832d31161022f5780634b8832d31461045057806355fedefa146104635780635c975abb1461049157600080fd5b806341db4ca31461041c578063461d27621461043d57600080fd5b80631ded3b36116102a1578063330605291161028657806333060529146103e05780633e871e4d146104015780633f4ba83a1461041457600080fd5b80631ded3b361461039f5780632a905ccc146103b257600080fd5b806310fc49c1116102d257806310fc49c11461032357806312b5834914610336578063181f5a771461035657600080fd5b806302bcc5b6146102ee5780630c5d49cb14610303575b600080fd5b6103016102fc366004614ba6565b610723565b005b61030b608481565b60405161ffff90911681526020015b60405180910390f35b610301610331366004614be7565b610783565b6000546040516bffffffffffffffffffffffff909116815260200161031a565b6103926040518060400160405280601781526020017f46756e6374696f6e7320526f757465722076322e302e3000000000000000000081525081565b60405161031a9190614c8e565b6103016103ad366004614ca1565b61087f565b600a5462010000900468ffffffffffffffffff1660405168ffffffffffffffffff909116815260200161031a565b6103f36103ee366004614f8c565b6108b1565b60405161031a929190615074565b61030161040f366004615135565b610c7c565b610301610e91565b61042f61042a366004615249565b610ea3565b60405190815260200161031a565b61042f61044b366004615249565b610f03565b61030161045e3660046152cd565b610f0f565b61042f610471366004614ba6565b67ffffffffffffffff166000908152600360208190526040909120015490565b60065460ff165b604051901515815260200161031a565b6103016104b63660046152fb565b61105d565b6103016104c93660046153bd565b611216565b6103016104dc3660046152fb565b611396565b60025467ffffffffffffffff165b60405167ffffffffffffffff909116815260200161031a565b61051b610516366004615490565b61147f565b6040805182511515815260208084015167ffffffffffffffff90811691830191909152928201519092169082015260600161031a565b61056461055f3660046154be565b61150f565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200161031a565b6103016105973660046152cd565b6115ce565b610301611781565b6103016105b2366004614ba6565b6118a8565b6103016119ef565b600654610100900473ffffffffffffffffffffffffffffffffffffffff16610564565b6103016105f03660046152cd565b6119ff565b6104ef611daa565b61061061060b366004614ba6565b611f37565b60405161031a91906155a7565b61030161062b3660046155ba565b61206c565b61056461063e3660046154be565b6122b8565b60095461042f565b610301612317565b61065b612463565b60405161031a929190615616565b610671612533565b60405161031a919061566d565b6104ef61068c366004615749565b61269a565b61030161069f3660046152cd565b61291a565b6103016106b2366004615749565b61297f565b6103016106c5366004615766565b612af8565b6104986106d8366004614ba6565b612db7565b6103016106eb3660046154be565b612f06565b6107036106fe3660046157dc565b612f13565b60405161031a91906157fa565b61030161071e366004615749565b6131a8565b61072b6131b9565b610734816131c1565b67ffffffffffffffff81166000908152600360205260408120546107809183916c01000000000000000000000000900473ffffffffffffffffffffffffffffffffffffffff1690613237565b50565b67ffffffffffffffff8216600090815260036020819052604082200154600b54911a9081106107e8576040517f45c108ce00000000000000000000000000000000000000000000000000000000815260ff821660048201526024015b60405180910390fd5b6000600a6001018260ff16815481106108035761080361587a565b90600052602060002090600891828204019190066004029054906101000a900463ffffffff1690508063ffffffff168363ffffffff161115610879576040517f1d70f87a00000000000000000000000000000000000000000000000000000000815263ffffffff821660048201526024016107df565b50505050565b6108876131b9565b610890826131c1565b67ffffffffffffffff90911660009081526003602081905260409091200155565b6000806108bc613689565b826020015173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610925576040517f8bec23e700000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b82516000908152600560205260409020548061098a5783516020850151604051600295507f1a90e9a50793db2e394cf581e7c522e10c358a81e70acf6b5a0edd620c08dee19161097891899088906158a9565b60405180910390a25060009050610c71565b808460405160200161099c91906158db565b60405160208183030381529060405280519060200120146109f45783516020850151604051600695507f1a90e9a50793db2e394cf581e7c522e10c358a81e70acf6b5a0edd620c08dee19161097891899088906158a9565b8361012001518460a0015163ffffffff16610a0f9190615a37565b64ffffffffff165a1015610a5a5783516020850151604051600495507f1a90e9a50793db2e394cf581e7c522e10c358a81e70acf6b5a0edd620c08dee19161097891899088906158a9565b506000610a708460a0015163ffffffff16613691565b610a7a9088615a55565b9050600081878660c0015168ffffffffffffffffff16610a9a9190615a7d565b610aa49190615a7d565b9050610ab38560800151611f37565b600001516bffffffffffffffffffffffff16816bffffffffffffffffffffffff161115610b2b5784516020860151604051600596507f1a90e9a50793db2e394cf581e7c522e10c358a81e70acf6b5a0edd620c08dee191610b17918a9089906158a9565b60405180910390a25060009150610c719050565b84604001516bffffffffffffffffffffffff16816bffffffffffffffffffffffff161115610b905784516020860151604051600396507f1a90e9a50793db2e394cf581e7c522e10c358a81e70acf6b5a0edd620c08dee191610b17918a9089906158a9565b505082516000908152600560205260408120819055835160a08501516060860151610bc092918c918c9190613733565b8051909150610bd0576001610bd3565b60005b92506000610c0d8560800151866040015187606001518860c0015168ffffffffffffffffff168c610c078860200151613691565b8d6138f1565b9050846080015167ffffffffffffffff1685600001517f64778f26c70b60a8d7e29e2451b3844302d959448401c0535b768ed88c6b505e836020015189888f8f8960400151604051610c6496959493929190615aa2565b60405180910390a3519150505b965096945050505050565b610c84613c17565b8151815181141580610c965750600881115b15610ccd576040517fee03280800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60005b81811015610e47576000848281518110610cec57610cec61587a565b602002602001015190506000848381518110610d0a57610d0a61587a565b60200260200101519050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161480610d75575060008281526008602052604090205473ffffffffffffffffffffffffffffffffffffffff8281169116145b15610dac576040517fee03280800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600082815260086020526040908190205490517f8b052f0f4bf82fede7daffea71592b29d5ef86af1f3c7daaa0345dbb2f52f48191610e2c91859173ffffffffffffffffffffffffffffffffffffffff1690859092835273ffffffffffffffffffffffffffffffffffffffff918216602084015216604082015260600190565b60405180910390a1505080610e4090615b25565b9050610cd0565b506040805180820190915283815260208082018490528451600d91610e709183918801906149e6565b506020828101518051610e899260018501920190614a2d565b505050505050565b610e99613c17565b610ea1613c9d565b565b600080610eaf8361150f565b9050610ef783828a8a8a8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152508c92508b9150613d1a9050565b98975050505050505050565b600080610eaf836122b8565b610f17613689565b610f20826140ef565b610f286141b5565b73ffffffffffffffffffffffffffffffffffffffff81161580610f8f575067ffffffffffffffff821660009081526003602052604090206001015473ffffffffffffffffffffffffffffffffffffffff8281166c0100000000000000000000000090920416145b15610fc6576040517f8129bbcd00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b67ffffffffffffffff821660008181526003602090815260409182902060010180546bffffffffffffffffffffffff166c0100000000000000000000000073ffffffffffffffffffffffffffffffffffffffff8716908102919091179091558251338152918201527f69436ea6df009049404f564eff6622cd00522b0bd6a89efd9e52a355c4a879be910160405180910390a25050565b6110656131b9565b806bffffffffffffffffffffffff1660000361109b5750306000908152600160205260409020546bffffffffffffffffffffffff165b306000908152600160205260409020546bffffffffffffffffffffffff908116908216811015611107576040517f6b0fe56f0000000000000000000000000000000000000000000000000000000081526bffffffffffffffffffffffff821660048201526024016107df565b30600090815260016020526040812080548492906111349084906bffffffffffffffffffffffff16615b5d565b92506101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff160217905550816000808282829054906101000a90046bffffffffffffffffffffffff1661118a9190615b5d565b92506101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff16021790555061121183836bffffffffffffffffffffffff167f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff166142bf9092919063ffffffff16565b505050565b61121e613c17565b8051600a80546020808501516040860151606087015161ffff9081166f01000000000000000000000000000000027fffffffffffffffffffffffffffffff0000ffffffffffffffffffffffffffffff60e09390931c6b01000000000000000000000002929092167fffffffffffffffffffffffffffffff000000000000ffffffffffffffffffffff68ffffffffffffffffff90941662010000027fffffffffffffffffffffffffffffffffffffffffff0000000000000000000000909616919097161793909317169390931717815560808301518051849361130592600b92910190614aa7565b5060a08201516002909101805460c09093015168ffffffffffffffffff1662010000027fffffffffffffffffffffffffffffffffffffffffff000000000000000000000090931661ffff909216919091179190911790556040517ea5832bf95f66c7814294cc4db681f20ee79608bfb8912a5321d66cfed5e9859061138b90839061566d565b60405180910390a150565b61139e613689565b806bffffffffffffffffffffffff166000036113e6576040517f8129bbcd00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b336000908152600160205260409020546bffffffffffffffffffffffff908116908216811015611452576040517f6b0fe56f0000000000000000000000000000000000000000000000000000000081526bffffffffffffffffffffffff821660048201526024016107df565b33600090815260016020526040812080548492906111349084906bffffffffffffffffffffffff16615b5d565b60408051606080820183526000808352602080840182905292840181905273ffffffffffffffffffffffffffffffffffffffff861681526004835283812067ffffffffffffffff868116835290845290849020845192830185525460ff81161515835261010081048216938301939093526901000000000000000000909204909116918101919091525b92915050565b6000805b600d5460ff8216101561159857600d805460ff83169081106115375761153761587a565b9060005260206000200154830361158857600e805460ff831690811061155f5761155f61587a565b60009182526020909120015473ffffffffffffffffffffffffffffffffffffffff169392505050565b61159181615b82565b9050611513565b506040517f80833e33000000000000000000000000000000000000000000000000000000008152600481018390526024016107df565b6115d6613689565b6115df826140ef565b6115e76141b5565b60006115f6600a5461ffff1690565b67ffffffffffffffff841660009081526003602052604090206002015490915061ffff821611611658576040517fb72bc70300000000000000000000000000000000000000000000000000000000815261ffff821660048201526024016107df565b73ffffffffffffffffffffffffffffffffffffffff8216600090815260046020908152604080832067ffffffffffffffff8716845290915290205460ff16156116a057505050565b73ffffffffffffffffffffffffffffffffffffffff8216600081815260046020908152604080832067ffffffffffffffff881680855290835281842080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00166001908117909155600384528285206002018054918201815585529383902090930180547fffffffffffffffffffffffff000000000000000000000000000000000000000016851790555192835290917f43dc749a04ac8fb825cbd514f7c0e13f13bc6f2ee66043b76629d51776cff8e091015b60405180910390a2505050565b60075473ffffffffffffffffffffffffffffffffffffffff163314611802576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4d7573742062652070726f706f736564206f776e65720000000000000000000060448201526064016107df565b600680547fffffffffffffffffffffff0000000000000000000000000000000000000000ff81166101003381810292909217909355600780547fffffffffffffffffffffffff00000000000000000000000000000000000000001690556040519290910473ffffffffffffffffffffffffffffffffffffffff169182907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a350565b6118b0613689565b6118b86141b5565b67ffffffffffffffff81166000908152600360205260409020805460019091015473ffffffffffffffffffffffffffffffffffffffff6c010000000000000000000000009283900481169290910416338114611958576040517f4e1d9f1800000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff821660048201526024016107df565b67ffffffffffffffff831660008181526003602090815260409182902080546c01000000000000000000000000339081026bffffffffffffffffffffffff928316178355600190920180549091169055825173ffffffffffffffffffffffffffffffffffffffff87168152918201527f6f1dc65165ffffedfd8e507b4a0f1fcfdada045ed11f6c26ba27cedfe87802f09101611774565b6119f7613c17565b610ea161434c565b611a07613689565b611a10826140ef565b611a186141b5565b73ffffffffffffffffffffffffffffffffffffffff8116600090815260046020908152604080832067ffffffffffffffff8087168552908352928190208151606081018352905460ff8116151582526101008104851693820193909352690100000000000000000090920490921691810191909152611a9782846143a7565b806040015167ffffffffffffffff16816020015167ffffffffffffffff1614611aec576040517f06eb10c800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b67ffffffffffffffff8316600090815260036020908152604080832060020180548251818502810185019093528083529192909190830182828015611b6757602002820191906000526020600020905b815473ffffffffffffffffffffffffffffffffffffffff168152600190910190602001808311611b3c575b5050505050905060005b8151811015611d0f578373ffffffffffffffffffffffffffffffffffffffff16828281518110611ba357611ba361587a565b602002602001015173ffffffffffffffffffffffffffffffffffffffff1603611cff578160018351611bd59190615ba1565b81518110611be557611be561587a565b6020026020010151600360008767ffffffffffffffff1667ffffffffffffffff1681526020019081526020016000206002018281548110611c2857611c2861587a565b600091825260208083209190910180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff949094169390931790925567ffffffffffffffff87168152600390915260409020600201805480611ca257611ca2615bb4565b60008281526020902081017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff90810180547fffffffffffffffffffffffff0000000000000000000000000000000000000000169055019055611d0f565b611d0881615b25565b9050611b71565b5073ffffffffffffffffffffffffffffffffffffffff8316600081815260046020908152604080832067ffffffffffffffff89168085529083529281902080547fffffffffffffffffffffffffffffff00000000000000000000000000000000001690555192835290917f182bff9831466789164ca77075fffd84916d35a8180ba73c27e45634549b445b910160405180910390a250505050565b6000611db4613689565b611dbc6141b5565b60028054600090611dd69067ffffffffffffffff16615be3565b825467ffffffffffffffff8083166101009490940a93840293021916919091179091556040805160c0810182526000808252336020830152918101829052606081018290529192506080820190604051908082528060200260200182016040528015611e4c578160200160208202803683370190505b5081526000602091820181905267ffffffffffffffff841681526003825260409081902083518484015173ffffffffffffffffffffffffffffffffffffffff9081166c010000000000000000000000009081026bffffffffffffffffffffffff9384161784559386015160608701519091169093029216919091176001820155608083015180519192611ee792600285019290910190614a2d565b5060a0919091015160039091015560405133815267ffffffffffffffff8216907f464722b4166576d3dcbba877b999bc35cf911f4eaf434b7eba68fa113951d0bf9060200160405180910390a290565b6040805160c0810182526000808252602082018190529181018290526060808201839052608082015260a0810191909152611f71826131c1565b67ffffffffffffffff8216600090815260036020908152604091829020825160c08101845281546bffffffffffffffffffffffff808216835273ffffffffffffffffffffffffffffffffffffffff6c0100000000000000000000000092839004811684870152600185015491821684880152919004166060820152600282018054855181860281018601909652808652919492936080860193929083018282801561205257602002820191906000526020600020905b815473ffffffffffffffffffffffffffffffffffffffff168152600190910190602001808311612027575b505050505081526020016003820154815250509050919050565b612074613689565b3373ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000016146120e3576040517f44b0e3c300000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6020811461211d576040517f8129bbcd00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600061212b82840184614ba6565b67ffffffffffffffff81166000908152600360205260409020549091506c01000000000000000000000000900473ffffffffffffffffffffffffffffffffffffffff166121a4576040517f1f6a65b600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b67ffffffffffffffff8116600090815260036020526040812080546bffffffffffffffffffffffff16918691906121db8385615a7d565b92506101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff160217905550846000808282829054906101000a90046bffffffffffffffffffffffff166122319190615a7d565b92506101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff1602179055508167ffffffffffffffff167fd39ec07f4e209f627a4c427971473820dc129761ba28de8906bd56f57101d4f88287846122989190615c0a565b6040805192835260208301919091520160405180910390a2505050505050565b60008181526008602052604081205473ffffffffffffffffffffffffffffffffffffffff1680611509576040517f80833e33000000000000000000000000000000000000000000000000000000008152600481018490526024016107df565b61231f613c17565b60005b600d54811015612442576000600d60000182815481106123445761234461587a565b906000526020600020015490506000600d60010183815481106123695761236961587a565b6000918252602080832091909101548483526008825260409283902054835186815273ffffffffffffffffffffffffffffffffffffffff91821693810193909352169181018290529091507ff8a6175bca1ba37d682089187edc5e20a859989727f10ca6bd9a5bc0de8caf949060600160405180910390a160009182526008602052604090912080547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff90921691909117905561243b81615b25565b9050612322565b50600d60006124518282614b51565b61245f600183016000614b51565b5050565b606080600d600001600d600101818054806020026020016040519081016040528092919081815260200182805480156124bb57602002820191906000526020600020905b8154815260200190600101908083116124a7575b505050505091508080548060200260200160405190810160405280929190818152602001828054801561252457602002820191906000526020600020905b815473ffffffffffffffffffffffffffffffffffffffff1681526001909101906020018083116124f9575b50505050509050915091509091565b6040805160e0810182526000808252602082018190529181018290526060808201839052608082015260a0810182905260c08101919091526040805160e08082018352600a805461ffff808216855262010000820468ffffffffffffffffff166020808701919091526b010000000000000000000000830490941b7fffffffff0000000000000000000000000000000000000000000000000000000016858701526f01000000000000000000000000000000909104166060840152600b805485518185028101850190965280865293949193608086019383018282801561266557602002820191906000526020600020906000905b82829054906101000a900463ffffffff1663ffffffff16815260200190600401906020826003010492830192600103820291508084116126285790505b50505091835250506002919091015461ffff8116602083015262010000900468ffffffffffffffffff16604090910152919050565b60006126a4613689565b6126ac6141b5565b600280546000906126c69067ffffffffffffffff16615be3565b825467ffffffffffffffff8083166101009490940a93840293021916919091179091556040805160c081018252600080825233602083015291810182905260608101829052919250608082019060405190808252806020026020018201604052801561273c578160200160208202803683370190505b5081526000602091820181905267ffffffffffffffff841681526003825260409081902083518484015173ffffffffffffffffffffffffffffffffffffffff9081166c010000000000000000000000009081026bffffffffffffffffffffffff93841617845593860151606087015190911690930292169190911760018201556080830151805191926127d792600285019290910190614a2d565b5060a0919091015160039182015567ffffffffffffffff82166000818152602092835260408082206002018054600180820183559184528584200180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff891690811790915583526004855281832084845285529181902080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00169092179091555133815290917f464722b4166576d3dcbba877b999bc35cf911f4eaf434b7eba68fa113951d0bf910160405180910390a260405173ffffffffffffffffffffffffffffffffffffffff8316815267ffffffffffffffff8216907f43dc749a04ac8fb825cbd514f7c0e13f13bc6f2ee66043b76629d51776cff8e09060200160405180910390a2919050565b612922613689565b61292b826140ef565b6129336141b5565b61293c82612db7565b15612973576040517f06eb10c800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b61245f82826001613237565b6129876131b9565b6040517f70a082310000000000000000000000000000000000000000000000000000000081523060048201526000907f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff16906370a0823190602401602060405180830381865afa158015612a14573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612a389190615c1d565b6000549091506bffffffffffffffffffffffff1681811015611211576000612a608284615ba1565b9050612aa373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001685836142bf565b6040805173ffffffffffffffffffffffffffffffffffffffff86168152602081018390527f59bfc682b673f8cbf945f1e454df9334834abf7dfe7f92237ca29ecb9b436600910160405180910390a150505050565b612b00613689565b60005b81811015611211576000838383818110612b1f57612b1f61587a565b90506101600201803603810190612b369190615c36565b80516080820151600082815260056020908152604091829020549151949550929391929091612b67918691016158db565b6040516020818303038152906040528051906020012014612bb4576040517f8129bbcd00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b82610140015163ffffffff16421015612bf9576040517fa2376fe800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60208301516040517f85b214cf0000000000000000000000000000000000000000000000000000000081526004810184905273ffffffffffffffffffffffffffffffffffffffff909116906385b214cf90602401600060405180830381600087803b158015612c6757600080fd5b505af1158015612c7b573d6000803e3d6000fd5b50505060408085015167ffffffffffffffff84166000908152600360205291822060010180549193509190612cbf9084906bffffffffffffffffffffffff16615b5d565b82546bffffffffffffffffffffffff9182166101009390930a928302919092021990911617905550606083015173ffffffffffffffffffffffffffffffffffffffff16600090815260046020908152604080832067ffffffffffffffff808616855292529091208054600192600991612d479185916901000000000000000000900416615c53565b825467ffffffffffffffff9182166101009390930a9283029190920219909116179055506000828152600560205260408082208290555183917ff1ca1e9147be737b04a2b018a79405f687a97de8dd8a2559bbe62357343af41491a250505080612db090615b25565b9050612b03565b67ffffffffffffffff8116600090815260036020908152604080832060020180548251818502810185019093528083528493830182828015612e2f57602002820191906000526020600020905b815473ffffffffffffffffffffffffffffffffffffffff168152600190910190602001808311612e04575b5050505050905060005b8151811015612efc57600060046000848481518110612e5a57612e5a61587a565b60209081029190910181015173ffffffffffffffffffffffffffffffffffffffff168252818101929092526040908101600090812067ffffffffffffffff808a168352908452908290208251606081018452905460ff8116151582526101008104831694820185905269010000000000000000009004909116918101829052925014612eeb57506001949350505050565b50612ef581615b25565b9050612e39565b5060009392505050565b612f0e613c17565b600955565b60608167ffffffffffffffff168367ffffffffffffffff161180612f46575060025467ffffffffffffffff908116908316115b80612f5b575060025467ffffffffffffffff16155b15612f92576040517f8129bbcd00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b612f9c8383615c74565b612fa7906001615c53565b67ffffffffffffffff1667ffffffffffffffff811115612fc957612fc9614ccd565b60405190808252806020026020018201604052801561304657816020015b6040805160c081018252600080825260208083018290529282018190526060808301829052608083015260a082015282527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff909201910181612fe75790505b50905060005b6130568484615c74565b67ffffffffffffffff1681116131a1576003600061307e8367ffffffffffffffff8816615c0a565b67ffffffffffffffff1681526020808201929092526040908101600020815160c08101835281546bffffffffffffffffffffffff808216835273ffffffffffffffffffffffffffffffffffffffff6c010000000000000000000000009283900481168488015260018501549182168487015291900416606082015260028201805484518187028101870190955280855291949293608086019390929083018282801561316057602002820191906000526020600020905b815473ffffffffffffffffffffffffffffffffffffffff168152600190910190602001808311613135575b505050505081526020016003820154815250508282815181106131855761318561587a565b60200260200101819052508061319a90615b25565b905061304c565b5092915050565b6131b0613c17565b6107808161441b565b610ea1613c17565b67ffffffffffffffff81166000908152600360205260409020546c01000000000000000000000000900473ffffffffffffffffffffffffffffffffffffffff16610780576040517f1f6a65b600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b67ffffffffffffffff83166000908152600360209081526040808320815160c08101835281546bffffffffffffffffffffffff808216835273ffffffffffffffffffffffffffffffffffffffff6c010000000000000000000000009283900481168488015260018501549182168487015291900416606082015260028201805484518187028101870190955280855291949293608086019390929083018282801561331857602002820191906000526020600020905b815473ffffffffffffffffffffffffffffffffffffffff1681526001909101906020018083116132ed575b50505091835250506003919091015460209091015280519091506000805b83608001515181101561342e5760008460800151828151811061335b5761335b61587a565b60209081029190910181015173ffffffffffffffffffffffffffffffffffffffff8116600090815260048352604080822067ffffffffffffffff808e16845294529020549092506133bb9169010000000000000000009091041684615c53565b73ffffffffffffffffffffffffffffffffffffffff909116600090815260046020908152604080832067ffffffffffffffff8c168452909152902080547fffffffffffffffffffffffffffffff0000000000000000000000000000000000169055915061342781615b25565b9050613336565b5067ffffffffffffffff8616600090815260036020526040812081815560018101829055906134606002830182614b51565b50600060039190910155600c5461ffff81169062010000900468ffffffffffffffffff1685801561349e57508161ffff168367ffffffffffffffff16105b1561355a576000846bffffffffffffffffffffffff168268ffffffffffffffffff16116134d6578168ffffffffffffffffff166134d8565b845b90506bffffffffffffffffffffffff81161561355857306000908152600160205260408120805483929061351b9084906bffffffffffffffffffffffff16615a7d565b92506101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff16021790555080856135559190615b5d565b94505b505b6bffffffffffffffffffffffff841615613617576000805485919081906135909084906bffffffffffffffffffffffff16615b5d565b92506101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff16021790555061361787856bffffffffffffffffffffffff167f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff166142bf9092919063ffffffff16565b6040805173ffffffffffffffffffffffffffffffffffffffff891681526bffffffffffffffffffffffff8616602082015267ffffffffffffffff8a16917fe8ed5b475a5b5987aa9165e8731bb78043f39eee32ec5a1169a89e27fcd49815910160405180910390a25050505050505050565b610ea1614517565b60006bffffffffffffffffffffffff82111561372f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f53616665436173743a2076616c756520646f65736e27742066697420696e203960448201527f362062697473000000000000000000000000000000000000000000000000000060648201526084016107df565b5090565b60408051606080820183526000808352602083015291810191909152813b1580156137865750506040805160608101825260008082526020808301829052835191825281018352918101919091526138e8565b600a546040516000916b010000000000000000000000900460e01b906137b4908a908a908a90602401615c95565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0818403018152918152602080830180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fffffffff000000000000000000000000000000000000000000000000000000009590951694909417909352600a548151608480825260c0820190935292945061ffff6f01000000000000000000000000000000909104169260009283928392820181803683370190505090505a8481101561388257600080fd5b8490036040810481038a1061389657600080fd5b505a60008087516020890160008d8ff193505a900391503d60848111156138bb575060845b808252806000602084013e5060408051606081018252931515845260208401929092529082015293505050505b95945050505050565b604080518082019091526000808252602082015260006139118486615a55565b90506000816139208886615a7d565b61392a9190615a7d565b67ffffffffffffffff8b166000908152600360205260409020549091506bffffffffffffffffffffffff80831691161080613991575067ffffffffffffffff8a166000908152600360205260409020600101546bffffffffffffffffffffffff808b169116105b156139f45767ffffffffffffffff8a16600090815260036020526040908190205490517f6b0fe56f0000000000000000000000000000000000000000000000000000000081526bffffffffffffffffffffffff90911660048201526024016107df565b67ffffffffffffffff8a1660009081526003602052604081208054839290613a2b9084906bffffffffffffffffffffffff16615b5d565b82546101009290920a6bffffffffffffffffffffffff81810219909316918316021790915567ffffffffffffffff8c16600090815260036020526040812060010180548d94509092613a7f91859116615b5d565b92506101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff1602179055508184613ab99190615a7d565b3360009081526001602052604081208054909190613ae69084906bffffffffffffffffffffffff16615a7d565b82546101009290920a6bffffffffffffffffffffffff81810219909316918316021790915530600090815260016020526040812080548b94509092613b2d91859116615a7d565b82546bffffffffffffffffffffffff9182166101009390930a92830291909202199091161790555073ffffffffffffffffffffffffffffffffffffffff8816600090815260046020908152604080832067ffffffffffffffff808f16855292529091208054600192600991613bb19185916901000000000000000000900416615c53565b92506101000a81548167ffffffffffffffff021916908367ffffffffffffffff1602179055506040518060400160405280836bffffffffffffffffffffffff168152602001826bffffffffffffffffffffffff1681525092505050979650505050505050565b600654610100900473ffffffffffffffffffffffffffffffffffffffff163314610ea1576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e65720000000000000000000060448201526064016107df565b613ca5614584565b600680547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001690557f5db9ee0a495bf2e6ff9c91a7834c1ba4fdd244a5e8aa4e537bd38aeae4b073aa335b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390a1565b6000613d24613689565b613d2d856131c1565b613d3733866143a7565b613d418583610783565b8351600003613d7b576040517ec1cfc000000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6000613d8686611f37565b90506000613d94338861147f565b600a54604080516101608101825289815267ffffffffffffffff8b1660009081526003602081815293822001549495506201000090930468ffffffffffffffffff169373ffffffffffffffffffffffffffffffffffffffff8d169263a631571e929190820190815233602082015260408881015189519190920191613e1891615b5d565b6bffffffffffffffffffffffff1681526020018568ffffffffffffffffff1681526020018c67ffffffffffffffff168152602001866020015167ffffffffffffffff1681526020018963ffffffff1681526020018a61ffff168152602001866040015167ffffffffffffffff168152602001876020015173ffffffffffffffffffffffffffffffffffffffff168152506040518263ffffffff1660e01b8152600401613ec49190615cc0565b610160604051808303816000875af1158015613ee4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190613f089190615e25565b805160009081526005602052604090205490915015613f595780516040517f304f32e800000000000000000000000000000000000000000000000000000000815260048101919091526024016107df565b604051806101600160405280826000015181526020018b73ffffffffffffffffffffffffffffffffffffffff16815260200182604001516bffffffffffffffffffffffff1681526020013373ffffffffffffffffffffffffffffffffffffffff1681526020018a67ffffffffffffffff1681526020018763ffffffff1681526020018368ffffffffffffffffff1681526020018260e0015168ffffffffffffffffff16815260200182610100015164ffffffffff16815260200182610120015164ffffffffff16815260200182610140015163ffffffff1681525060405160200161404491906158db565b60405160208183030381529060405280519060200120600560008360000151815260200190815260200160002081905550614084338a83604001516145f0565b8867ffffffffffffffff168b82600001517ff67aec45c9a7ede407974a3e0c3a743dffeab99ee3f2d4c9a8144c2ebf2c7ec9876020015133328e8e8e8a604001516040516140d89796959493929190615ef8565b60405180910390a4519a9950505050505050505050565b67ffffffffffffffff81166000908152600360205260409020546c01000000000000000000000000900473ffffffffffffffffffffffffffffffffffffffff1680614166576040517f1f6a65b600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b3373ffffffffffffffffffffffffffffffffffffffff82161461245f576040517f5a68151d00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60095460009081526008602052604090205473ffffffffffffffffffffffffffffffffffffffff16806141e55750565b604080516000815260208101918290527f6b14daf80000000000000000000000000000000000000000000000000000000090915273ffffffffffffffffffffffffffffffffffffffff821690636b14daf89061424690339060248101615f70565b602060405180830381865afa158015614263573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906142879190615f9f565b610780576040517f229062630000000000000000000000000000000000000000000000000000000081523360048201526024016107df565b6040805173ffffffffffffffffffffffffffffffffffffffff8416602482015260448082018490528251808303909101815260649091019091526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fa9059cbb000000000000000000000000000000000000000000000000000000001790526112119084906146cb565b614354614517565b600680547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660011790557f62e78cea01bee320cd4e420270b5ea74000d11b0c9f74754ebdbfc544b05a258613cf03390565b73ffffffffffffffffffffffffffffffffffffffff8216600090815260046020908152604080832067ffffffffffffffff8516845290915290205460ff1661245f576040517f71e8313700000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b3373ffffffffffffffffffffffffffffffffffffffff82160361449a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c6600000000000000000060448201526064016107df565b600780547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff838116918217909255600654604051919261010090910416907fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae127890600090a350565b60065460ff1615610ea1576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601060248201527f5061757361626c653a207061757365640000000000000000000000000000000060448201526064016107df565b60065460ff16610ea1576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601460248201527f5061757361626c653a206e6f742070617573656400000000000000000000000060448201526064016107df565b67ffffffffffffffff82166000908152600360205260408120600101805483929061462a9084906bffffffffffffffffffffffff16615a7d565b82546bffffffffffffffffffffffff91821661010093840a908102920219161790915573ffffffffffffffffffffffffffffffffffffffff8516600090815260046020908152604080832067ffffffffffffffff80891685529252909120805460019450909284926146a0928492900416615c53565b92506101000a81548167ffffffffffffffff021916908367ffffffffffffffff160217905550505050565b600061472d826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c65648152508573ffffffffffffffffffffffffffffffffffffffff166147d79092919063ffffffff16565b805190915015611211578080602001905181019061474b9190615f9f565b611211576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e60448201527f6f7420737563636565640000000000000000000000000000000000000000000060648201526084016107df565b60606147e684846000856147ee565b949350505050565b606082471015614880576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f60448201527f722063616c6c000000000000000000000000000000000000000000000000000060648201526084016107df565b6000808673ffffffffffffffffffffffffffffffffffffffff1685876040516148a99190615fc1565b60006040518083038185875af1925050503d80600081146148e6576040519150601f19603f3d011682016040523d82523d6000602084013e6148eb565b606091505b50915091506148fc87838387614907565b979650505050505050565b6060831561499d5782516000036149965773ffffffffffffffffffffffffffffffffffffffff85163b614996576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000060448201526064016107df565b50816147e6565b6147e683838151156149b25781518083602001fd5b806040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016107df9190614c8e565b828054828255906000526020600020908101928215614a21579160200282015b82811115614a21578251825591602001919060010190614a06565b5061372f929150614b6b565b828054828255906000526020600020908101928215614a21579160200282015b82811115614a2157825182547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff909116178255602090920191600190910190614a4d565b82805482825590600052602060002090600701600890048101928215614a215791602002820160005b83821115614b1457835183826101000a81548163ffffffff021916908363ffffffff1602179055509260200192600401602081600301049283019260010302614ad0565b8015614b445782816101000a81549063ffffffff0219169055600401602081600301049283019260010302614b14565b505061372f929150614b6b565b508054600082559060005260206000209081019061078091905b5b8082111561372f5760008155600101614b6c565b67ffffffffffffffff8116811461078057600080fd5b8035614ba181614b80565b919050565b600060208284031215614bb857600080fd5b8135614bc381614b80565b9392505050565b63ffffffff8116811461078057600080fd5b8035614ba181614bca565b60008060408385031215614bfa57600080fd5b8235614c0581614b80565b91506020830135614c1581614bca565b809150509250929050565b60005b83811015614c3b578181015183820152602001614c23565b50506000910152565b60008151808452614c5c816020860160208601614c20565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b602081526000614bc36020830184614c44565b60008060408385031215614cb457600080fd5b8235614cbf81614b80565b946020939093013593505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b604051610160810167ffffffffffffffff81118282101715614d2057614d20614ccd565b60405290565b60405160e0810167ffffffffffffffff81118282101715614d2057614d20614ccd565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff81118282101715614d9057614d90614ccd565b604052919050565b600082601f830112614da957600080fd5b813567ffffffffffffffff811115614dc357614dc3614ccd565b614df460207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f84011601614d49565b818152846020838601011115614e0957600080fd5b816020850160208301376000918101602001919091529392505050565b6bffffffffffffffffffffffff8116811461078057600080fd5b8035614ba181614e26565b73ffffffffffffffffffffffffffffffffffffffff8116811461078057600080fd5b8035614ba181614e4b565b68ffffffffffffffffff8116811461078057600080fd5b8035614ba181614e78565b64ffffffffff8116811461078057600080fd5b8035614ba181614e9a565b60006101608284031215614ecb57600080fd5b614ed3614cfc565b905081358152614ee560208301614e6d565b6020820152614ef660408301614e40565b6040820152614f0760608301614e6d565b6060820152614f1860808301614b96565b6080820152614f2960a08301614bdc565b60a0820152614f3a60c08301614e8f565b60c0820152614f4b60e08301614e8f565b60e0820152610100614f5e818401614ead565b90820152610120614f70838201614ead565b90820152610140614f82838201614bdc565b9082015292915050565b6000806000806000806102008789031215614fa657600080fd5b863567ffffffffffffffff80821115614fbe57600080fd5b614fca8a838b01614d98565b97506020890135915080821115614fe057600080fd5b50614fed89828a01614d98565b9550506040870135614ffe81614e26565b9350606087013561500e81614e26565b9250608087013561501e81614e4b565b915061502d8860a08901614eb8565b90509295509295509295565b60078110615070577f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b9052565b604081016150828285615039565b6bffffffffffffffffffffffff831660208301529392505050565b600067ffffffffffffffff8211156150b7576150b7614ccd565b5060051b60200190565b600082601f8301126150d257600080fd5b813560206150e76150e28361509d565b614d49565b82815260059290921b8401810191818101908684111561510657600080fd5b8286015b8481101561512a57803561511d81614e4b565b835291830191830161510a565b509695505050505050565b6000806040838503121561514857600080fd5b823567ffffffffffffffff8082111561516057600080fd5b818501915085601f83011261517457600080fd5b813560206151846150e28361509d565b82815260059290921b840181019181810190898411156151a357600080fd5b948201945b838610156151c1578535825294820194908201906151a8565b965050860135925050808211156151d757600080fd5b506151e4858286016150c1565b9150509250929050565b60008083601f84011261520057600080fd5b50813567ffffffffffffffff81111561521857600080fd5b60208301915083602082850101111561523057600080fd5b9250929050565b803561ffff81168114614ba157600080fd5b60008060008060008060a0878903121561526257600080fd5b863561526d81614b80565b9550602087013567ffffffffffffffff81111561528957600080fd5b61529589828a016151ee565b90965094506152a8905060408801615237565b925060608701356152b881614bca565b80925050608087013590509295509295509295565b600080604083850312156152e057600080fd5b82356152eb81614b80565b91506020830135614c1581614e4b565b6000806040838503121561530e57600080fd5b823561531981614e4b565b91506020830135614c1581614e26565b80357fffffffff0000000000000000000000000000000000000000000000000000000081168114614ba157600080fd5b600082601f83011261536a57600080fd5b8135602061537a6150e28361509d565b82815260059290921b8401810191818101908684111561539957600080fd5b8286015b8481101561512a5780356153b081614bca565b835291830191830161539d565b6000602082840312156153cf57600080fd5b813567ffffffffffffffff808211156153e757600080fd5b9083019060e082860312156153fb57600080fd5b615403614d26565b61540c83615237565b815261541a60208401614e8f565b602082015261542b60408401615329565b604082015261543c60608401615237565b606082015260808301358281111561545357600080fd5b61545f87828601615359565b60808301525061547160a08401615237565b60a082015261548260c08401614e8f565b60c082015295945050505050565b600080604083850312156154a357600080fd5b82356154ae81614e4b565b91506020830135614c1581614b80565b6000602082840312156154d057600080fd5b5035919050565b600081518084526020808501945080840160005b8381101561551d57815173ffffffffffffffffffffffffffffffffffffffff16875295820195908201906001016154eb565b509495945050505050565b60006bffffffffffffffffffffffff808351168452602083015173ffffffffffffffffffffffffffffffffffffffff8082166020870152826040860151166040870152806060860151166060870152505050608082015160c0608085015261559360c08501826154d7565b60a093840151949093019390935250919050565b602081526000614bc36020830184615528565b600080600080606085870312156155d057600080fd5b84356155db81614e4b565b935060208501359250604085013567ffffffffffffffff8111156155fe57600080fd5b61560a878288016151ee565b95989497509550505050565b604080825283519082018190526000906020906060840190828701845b8281101561564f57815184529284019290840190600101615633565b5050508381038285015261566381866154d7565b9695505050505050565b60006020808352610100830161ffff808651168386015268ffffffffffffffffff838701511660408601527fffffffff00000000000000000000000000000000000000000000000000000000604087015116606086015280606087015116608086015250608085015160e060a0860152818151808452610120870191508483019350600092505b8083101561571a57835163ffffffff1682529284019260019290920191908401906156f4565b5060a087015161ffff811660c0880152935060c087015168ffffffffffffffffff811660e08801529350615663565b60006020828403121561575b57600080fd5b8135614bc381614e4b565b6000806020838503121561577957600080fd5b823567ffffffffffffffff8082111561579157600080fd5b818501915085601f8301126157a557600080fd5b8135818111156157b457600080fd5b866020610160830285010111156157ca57600080fd5b60209290920196919550909350505050565b600080604083850312156157ef57600080fd5b82356154ae81614b80565b6000602080830181845280855180835260408601915060408160051b870101925083870160005b8281101561586d577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc088860301845261585b858351615528565b94509285019290850190600101615821565b5092979650505050505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b73ffffffffffffffffffffffffffffffffffffffff848116825283166020820152606081016147e66040830184615039565b8151815260208083015161016083019161590c9084018273ffffffffffffffffffffffffffffffffffffffff169052565b50604083015161592c60408401826bffffffffffffffffffffffff169052565b506060830151615954606084018273ffffffffffffffffffffffffffffffffffffffff169052565b506080830151615970608084018267ffffffffffffffff169052565b5060a083015161598860a084018263ffffffff169052565b5060c08301516159a560c084018268ffffffffffffffffff169052565b5060e08301516159c260e084018268ffffffffffffffffff169052565b506101008381015164ffffffffff81168483015250506101208381015164ffffffffff81168483015250506101408381015163ffffffff8116848301525b505092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b64ffffffffff8181168382160190808211156131a1576131a1615a08565b6bffffffffffffffffffffffff818116838216028082169190828114615a0057615a00615a08565b6bffffffffffffffffffffffff8181168382160190808211156131a1576131a1615a08565b6bffffffffffffffffffffffff8716815273ffffffffffffffffffffffffffffffffffffffff86166020820152615adc6040820186615039565b60c060608201526000615af260c0830186614c44565b8281036080840152615b048186614c44565b905082810360a0840152615b188185614c44565b9998505050505050505050565b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8203615b5657615b56615a08565b5060010190565b6bffffffffffffffffffffffff8281168282160390808211156131a1576131a1615a08565b600060ff821660ff8103615b9857615b98615a08565b60010192915050565b8181038181111561150957611509615a08565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603160045260246000fd5b600067ffffffffffffffff808316818103615c0057615c00615a08565b6001019392505050565b8082018082111561150957611509615a08565b600060208284031215615c2f57600080fd5b5051919050565b60006101608284031215615c4957600080fd5b614bc38383614eb8565b67ffffffffffffffff8181168382160190808211156131a1576131a1615a08565b67ffffffffffffffff8281168282160390808211156131a1576131a1615a08565b838152606060208201526000615cae6060830185614c44565b82810360408401526156638185614c44565b6020815260008251610160806020850152615cdf610180850183614c44565b9150602085015160408501526040850151615d12606086018273ffffffffffffffffffffffffffffffffffffffff169052565b5060608501516bffffffffffffffffffffffff8116608086015250608085015168ffffffffffffffffff811660a08601525060a085015167ffffffffffffffff811660c08601525060c085015167ffffffffffffffff811660e08601525060e0850151610100615d898187018363ffffffff169052565b8601519050610120615da08682018361ffff169052565b8601519050610140615dbd8682018367ffffffffffffffff169052565b9095015173ffffffffffffffffffffffffffffffffffffffff1693019290925250919050565b8051614ba181614e4b565b8051614ba181614e26565b8051614ba181614b80565b8051614ba181614bca565b8051614ba181614e78565b8051614ba181614e9a565b60006101608284031215615e3857600080fd5b615e40614cfc565b82518152615e5060208401615de3565b6020820152615e6160408401615dee565b6040820152615e7260608401615de3565b6060820152615e8360808401615df9565b6080820152615e9460a08401615e04565b60a0820152615ea560c08401615e0f565b60c0820152615eb660e08401615e0f565b60e0820152610100615ec9818501615e1a565b90820152610120615edb848201615e1a565b90820152610140615eed848201615e04565b908201529392505050565b600073ffffffffffffffffffffffffffffffffffffffff808a168352808916602084015280881660408401525060e06060830152615f3960e0830187614c44565b61ffff9590951660808301525063ffffffff9290921660a08301526bffffffffffffffffffffffff1660c090910152949350505050565b73ffffffffffffffffffffffffffffffffffffffff831681526040602082015260006147e66040830184614c44565b600060208284031215615fb157600080fd5b81518015158114614bc357600080fd5b60008251615fd3818460208701614c20565b919091019291505056fea164736f6c6343000813000a",
 }
 
 var FunctionsRouterABI = FunctionsRouterMetaData.ABI
@@ -677,16 +677,16 @@ func (_FunctionsRouter *FunctionsRouterTransactorSession) CreateSubscriptionWith
 	return _FunctionsRouter.Contract.CreateSubscriptionWithConsumer(&_FunctionsRouter.TransactOpts, consumer)
 }
 
-func (_FunctionsRouter *FunctionsRouterTransactor) Fulfill(opts *bind.TransactOpts, response []byte, err []byte, juelsPerGas *big.Int, costWithoutCallback *big.Int, transmitter common.Address, commitment FunctionsResponseCommitment) (*types.Transaction, error) {
-	return _FunctionsRouter.contract.Transact(opts, "fulfill", response, err, juelsPerGas, costWithoutCallback, transmitter, commitment)
+func (_FunctionsRouter *FunctionsRouterTransactor) Fulfill(opts *bind.TransactOpts, response []byte, err []byte, juelsPerGas *big.Int, costWithoutFulfillment *big.Int, transmitter common.Address, commitment FunctionsResponseCommitment) (*types.Transaction, error) {
+	return _FunctionsRouter.contract.Transact(opts, "fulfill", response, err, juelsPerGas, costWithoutFulfillment, transmitter, commitment)
 }
 
-func (_FunctionsRouter *FunctionsRouterSession) Fulfill(response []byte, err []byte, juelsPerGas *big.Int, costWithoutCallback *big.Int, transmitter common.Address, commitment FunctionsResponseCommitment) (*types.Transaction, error) {
-	return _FunctionsRouter.Contract.Fulfill(&_FunctionsRouter.TransactOpts, response, err, juelsPerGas, costWithoutCallback, transmitter, commitment)
+func (_FunctionsRouter *FunctionsRouterSession) Fulfill(response []byte, err []byte, juelsPerGas *big.Int, costWithoutFulfillment *big.Int, transmitter common.Address, commitment FunctionsResponseCommitment) (*types.Transaction, error) {
+	return _FunctionsRouter.Contract.Fulfill(&_FunctionsRouter.TransactOpts, response, err, juelsPerGas, costWithoutFulfillment, transmitter, commitment)
 }
 
-func (_FunctionsRouter *FunctionsRouterTransactorSession) Fulfill(response []byte, err []byte, juelsPerGas *big.Int, costWithoutCallback *big.Int, transmitter common.Address, commitment FunctionsResponseCommitment) (*types.Transaction, error) {
-	return _FunctionsRouter.Contract.Fulfill(&_FunctionsRouter.TransactOpts, response, err, juelsPerGas, costWithoutCallback, transmitter, commitment)
+func (_FunctionsRouter *FunctionsRouterTransactorSession) Fulfill(response []byte, err []byte, juelsPerGas *big.Int, costWithoutFulfillment *big.Int, transmitter common.Address, commitment FunctionsResponseCommitment) (*types.Transaction, error) {
+	return _FunctionsRouter.Contract.Fulfill(&_FunctionsRouter.TransactOpts, response, err, juelsPerGas, costWithoutFulfillment, transmitter, commitment)
 }
 
 func (_FunctionsRouter *FunctionsRouterTransactor) OnTokenTransfer(opts *bind.TransactOpts, arg0 common.Address, amount *big.Int, data []byte) (*types.Transaction, error) {
@@ -3510,7 +3510,7 @@ type FunctionsRouterInterface interface {
 
 	CreateSubscriptionWithConsumer(opts *bind.TransactOpts, consumer common.Address) (*types.Transaction, error)
 
-	Fulfill(opts *bind.TransactOpts, response []byte, err []byte, juelsPerGas *big.Int, costWithoutCallback *big.Int, transmitter common.Address, commitment FunctionsResponseCommitment) (*types.Transaction, error)
+	Fulfill(opts *bind.TransactOpts, response []byte, err []byte, juelsPerGas *big.Int, costWithoutFulfillment *big.Int, transmitter common.Address, commitment FunctionsResponseCommitment) (*types.Transaction, error)
 
 	OnTokenTransfer(opts *bind.TransactOpts, arg0 common.Address, amount *big.Int, data []byte) (*types.Transaction, error)
 
diff --git a/core/gethwrappers/functions/generation/generated-wrapper-dependency-versions-do-not-edit.txt b/core/gethwrappers/functions/generation/generated-wrapper-dependency-versions-do-not-edit.txt
index ac1fc4e83d6..3cdd44cbc5c 100644
--- a/core/gethwrappers/functions/generation/generated-wrapper-dependency-versions-do-not-edit.txt
+++ b/core/gethwrappers/functions/generation/generated-wrapper-dependency-versions-do-not-edit.txt
@@ -1,13 +1,13 @@
 GETH_VERSION: 1.12.0
 functions: ../../../contracts/solc/v0.8.19/functions/v1_X/FunctionsRequest.abi ../../../contracts/solc/v0.8.19/functions/v1_X/FunctionsRequest.bin 3c972870b0afeb6d73a29ebb182f24956a2cebb127b21c4f867d1ecf19a762db
-functions_allow_list: ../../../contracts/solc/v0.8.19/functions/v1_X/TermsOfServiceAllowList.abi ../../../contracts/solc/v0.8.19/functions/v1_X/TermsOfServiceAllowList.bin b2697ad4dfece903a1d34028826a017fa445eb3cd984006f1734fa9d47836ca0
+functions_allow_list: ../../../contracts/solc/v0.8.19/functions/v1_X/TermsOfServiceAllowList.abi ../../../contracts/solc/v0.8.19/functions/v1_X/TermsOfServiceAllowList.bin 6beec092fbb3b619dfe69f1ad23392b0bbaf00327b335e4080f921c7122a57e4
 functions_billing_registry_events_mock: ../../../contracts/solc/v0.8.6/functions/v0_0_0/FunctionsBillingRegistryEventsMock.abi ../../../contracts/solc/v0.8.6/functions/v0_0_0/FunctionsBillingRegistryEventsMock.bin 50deeb883bd9c3729702be335c0388f9d8553bab4be5e26ecacac496a89e2b77
 functions_client: ../../../contracts/solc/v0.8.19/functions/v1_X/FunctionsClient.abi ../../../contracts/solc/v0.8.19/functions/v1_X/FunctionsClient.bin 2368f537a04489c720a46733f8596c4fc88a31062ecfa966d05f25dd98608aca
 functions_client_example: ../../../contracts/solc/v0.8.19/functions/v1_X/FunctionsClientExample.abi ../../../contracts/solc/v0.8.19/functions/v1_X/FunctionsClientExample.bin abf32e69f268f40e8530eb8d8e96bf310b798a4c0049a58022d9d2fb527b601b
-functions_coordinator: ../../../contracts/solc/v0.8.19/functions/v1_X/FunctionsCoordinator.abi ../../../contracts/solc/v0.8.19/functions/v1_X/FunctionsCoordinator.bin 97aa7c56d78c703056990eff102279af86b97b11b5855b059e8dd658dc15da8a
+functions_coordinator: ../../../contracts/solc/v0.8.19/functions/v1_X/FunctionsCoordinator.abi ../../../contracts/solc/v0.8.19/functions/v1_X/FunctionsCoordinator.bin 7e8a63d56d81fe16a51d4196f5ca3e9623eaa04b56a6e8d7dee1eb0c266944ab
 functions_load_test_client: ../../../contracts/solc/v0.8.19/functions/v1_X/FunctionsLoadTestClient.abi ../../../contracts/solc/v0.8.19/functions/v1_X/FunctionsLoadTestClient.bin c8dbbd5ebb34435800d6674700068837c3a252db60046a14b0e61e829db517de
 functions_oracle_events_mock: ../../../contracts/solc/v0.8.6/functions/v0_0_0/FunctionsOracleEventsMock.abi ../../../contracts/solc/v0.8.6/functions/v0_0_0/FunctionsOracleEventsMock.bin 3ca70f966f8fe751987f0ccb50bebb6aa5be77e4a9f835d1ae99e0e9bfb7d52c
-functions_router: ../../../contracts/solc/v0.8.19/functions/v1_X/FunctionsRouter.abi ../../../contracts/solc/v0.8.19/functions/v1_X/FunctionsRouter.bin 9dedd3a36043605fd9bedf821e7ec5b4281a5c7ae2e4a1955f37aff8ba13519f
+functions_router: ../../../contracts/solc/v0.8.19/functions/v1_X/FunctionsRouter.abi ../../../contracts/solc/v0.8.19/functions/v1_X/FunctionsRouter.bin 1f6d18f9e0846ad74b37a0a6acef5942ab73ace1e84307f201899f69e732e776
 functions_v1_events_mock: ../../../contracts/solc/v0.8.19/functions/v1_X/FunctionsV1EventsMock.abi ../../../contracts/solc/v0.8.19/functions/v1_X/FunctionsV1EventsMock.bin 0f0ba42e0cc33c7abc8b8fd4fdfce903748a169886dd5f16cfdd56e75bcf708d
 ocr2dr: ../../../contracts/solc/v0.8.6/functions/v0_0_0/Functions.abi ../../../contracts/solc/v0.8.6/functions/v0_0_0/Functions.bin d9a794b33f47cc57563d216f7cf3a612309fc3062356a27e30005cf1d59e449d
 ocr2dr_client: ../../../contracts/solc/v0.8.6/functions/v0_0_0/FunctionsClient.abi ../../../contracts/solc/v0.8.6/functions/v0_0_0/FunctionsClient.bin 84aa63f9dbc5c7eac240db699b09e613ca4c6cd56dab10bdc25b02461b717e21

From 5748ac5553cf93f7b2fe0e155528e6decc3f7db3 Mon Sep 17 00:00:00 2001
From: Adam Hamrick <adam.hamrick@smartcontract.com>
Date: Thu, 7 Dec 2023 04:56:48 -0500
Subject: [PATCH 093/130] [TT-523] Add Networks for Live Tests (#11358)

* Adds A Lot More Networks for Testnet Tests

* TT-523

* Enable new network definitions

* Clean up reporting

* Fix success indicator

* Roll-back CTF version

* Debug color

* Linea contract loader

* Reverse time further

* tidy

* Fix slack colors

* Fixes markdown formatting

* Fix kuberesolver

* Kuberesolver v4

* Tidy

* Valid slack blocks

* Update CTF

* New contract loaders

* Fixed contracts and some URLs

* Change schedule

* Debug

* Knocking problems down

* Fixed CELO funding

* More Cash

* Smaller runner

* Update actions

* Build Tests

* Fix runner sizes

* Compiled Tests

* Control

* Update CTF

* Network name

* Fix selected networks

* Moar Cash

* Contract Loader

* Deprecate Arbitrum Goerli

* Upgrade CTF

* Fix compile

* Enable Scroll

* Fix dependencies

* Add mockserver logs

* Increase timeout

* Remove debug

* Update CTF

* Update Automation Tests

* Fix name regex

* Actually fix regex

* Complete merge
---
 .github/workflows/live-testnet-tests.yml      | 881 ++++++++++++++----
 .../contracts/contract_loader.go              |  30 +-
 integration-tests/docker/test_env/test_env.go |  25 +-
 integration-tests/go.mod                      |   2 +-
 integration-tests/go.sum                      |   4 +-
 integration-tests/smoke/ocr_test.go           |   3 +-
 6 files changed, 767 insertions(+), 178 deletions(-)

diff --git a/.github/workflows/live-testnet-tests.yml b/.github/workflows/live-testnet-tests.yml
index f174e8847bd..2e9809505f2 100644
--- a/.github/workflows/live-testnet-tests.yml
+++ b/.github/workflows/live-testnet-tests.yml
@@ -1,7 +1,16 @@
+# ***
+# This workflow is a monstrosity of copy-paste, and that's to increase legibility in reporting and running, so the code be damned.
+# I suspect this can be cleaned up significantly with some clever trickery of the GitHub actions matrices, but I am not that clever.
+# We want each chain to run in parallel, but each test within the chain needs to be able to run sequentially 
+# (we're trying to eliminate this as a requirement, should make it a lot easier).
+# Each chain can have a variety of tests to run.
+# We also want reporting to be clear in the start-slack-thread and post-test-results-to-slack jobs.
+# ***
+
 name: Live Testnet Tests
 on:
   schedule:
-    - cron: "0 0 * * *" # Run nightly
+    - cron: "0 0 * * *" # Run every Sunday at midnight
   push:
     tags:
       - "*"
@@ -11,7 +20,7 @@ env:
   CHAINLINK_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
   INTERNAL_DOCKER_REPO: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com
   MOD_CACHE_VERSION: 2
-  CHAINLINK_NODE_FUNDING: .1
+  CHAINLINK_NODE_FUNDING: .5
 
   CHAINLINK_COMMIT_SHA: ${{ github.sha }}
   CHAINLINK_ENV_USER: ${{ github.actor }}
@@ -21,20 +30,53 @@ env:
   SEPOLIA_URLS: ${{ secrets.QA_SEPOLIA_URLS }}
   SEPOLIA_HTTP_URLS: ${{ secrets.QA_SEPOLIA_HTTP_URLS }}
 
+  BSC_TESTNET_URLS: ${{ secrets.QA_BSC_TESTNET_URLS }}
+  BSC_TESTNET_HTTP_URLS: ${{ secrets.QA_BSC_TESTNET_HTTP_URLS }}
+
   OPTIMISM_GOERLI_URLS: ${{ secrets.QA_OPTIMISM_GOERLI_URLS }}
   OPTIMISM_GOERLI_HTTP_URLS: ${{ secrets.QA_OPTIMISM_GOERLI_HTTP_URLS }}
 
-  ARBITRUM_GOERLI_URLS: ${{ secrets.QA_ARBITRUM_GOERLI_URLS }}
-  ARBITRUM_GOERLI_HTTP_URLS: ${{ secrets.QA_ARBITRUM_GOERLI_HTTP_URLS }}
+  OPTIMISM_SEPOLIA_URLS: ${{ secrets.QA_OPTIMISM_SEPOLIA_URLS }}
+  OPTIMISM_SEPOLIA_HTTP_URLS: ${{ secrets.QA_OPTIMISM_SEPOLIA_HTTP_URLS }}
+
+  ARBITRUM_SEPOLIA_URLS: ${{ secrets.QA_ARBITRUM_SEPOLIA_URLS }}
+  ARBITRUM_SEPOLIA_HTTP_URLS: ${{ secrets.QA_ARBITRUM_SEPOLIA_HTTP_URLS }}
+
+  BASE_GOERLI_URLS: ${{ secrets.QA_BASE_GOERLI_URLS }}
+  BASE_GOERLI_HTTP_URLS: ${{ secrets.QA_BASE_GOERLI_HTTP_URLS }}
+
+  BASE_SEPOLIA_URLS: ${{ secrets.QA_BASE_SEPOLIA_URLS }}
+  BASE_SEPOLIA_HTTP_URLS: ${{ secrets.QA_BASE_SEPOLIA_HTTP_URLS }}
+
+  POLYGON_MUMBAI_URLS: ${{ secrets.QA_POLYGON_MUMBAI_URLS }}
+  POLYGON_MUMBAI_HTTP_URLS: ${{ secrets.QA_POLYGON_MUMBAI_HTTP_URLS }}
+
+  AVALANCHE_FUJI_URLS: ${{ secrets.QA_AVALANCHE_FUJI_URLS }}
+  AVALANCHE_FUJI_HTTP_URLS: ${{ secrets.QA_AVALANCHE_FUJI_HTTP_URLS }}
+
+  FANTOM_TESTNET_URLS: ${{ secrets.QA_FANTOM_TESTNET_URLS }}
+  FANTOM_TESTNET_HTTP_URLS: ${{ secrets.QA_FANTOM_TESTNET_HTTP_URLS }}
+
+  CELO_ALFAJORES_URLS: ${{ secrets.QA_CELO_ALFAJORES_URLS }}
+  CELO_ALFAJORES_HTTP_URLS: ${{ secrets.QA_CELO_ALFAJORES_HTTP_URLS }}
+
+  SCROLL_SEPOLIA_URLS: ${{ secrets.QA_SCROLL_SEPOLIA_URLS }}
+  SCROLL_SEPOLIA_HTTP_URLS: ${{ secrets.QA_SCROLL_SEPOLIA_HTTP_URLS }}
+
+  LINEA_GOERLI_URLS: ${{ secrets.QA_LINEA_GOERLI_URLS }}
+  LINEA_GOERLI_HTTP_URLS: ${{ secrets.QA_LINEA_GOERLI_HTTP_URLS }}
 
 jobs:
+
+  # Build Test Dependencies
+
   build-chainlink:
     environment: integration
     permissions:
       id-token: write
       contents: read
     name: Build Chainlink Image
-    runs-on: ubuntu20.04-16cores-64GB
+    runs-on: ubuntu-latest
     steps:
       - name: Collect Metrics
         id: collect-gha-metrics
@@ -59,188 +101,41 @@ jobs:
           AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
 
-  # TODO: Re-enable when we have secrets properly configured
-  # sepolia-smoke-tests:
-  #   environment: integration
-  #   permissions:
-  #     checks: write
-  #     pull-requests: write
-  #     id-token: write
-  #     contents: read
-  #   needs: [build-chainlink]
-  #   env:
-  #     SELECTED_NETWORKS: SEPOLIA
-  #   strategy:
-  #     max-parallel: 1
-  #     fail-fast: false
-  #     matrix:
-  #       include: # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#example-adding-configurations
-  #         - product: OCR
-  #           test: TestOCRBasic
-  #         - product: Automation
-  #           test: TestAutomationBasic/registry_2_0
-  #   name: Sepolia ${{ matrix.product }} Tests
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: Checkout the repo
-  #       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-  #       with:
-  #         ref: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
-  #     - name: Run Tests
-  #       uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@e865e376b8c2d594028c8d645dd6c47169b72974 # v2.2.16
-  #       env:
-  #         PYROSCOPE_SERVER: ${{ secrets.QA_PYROSCOPE_INSTANCE }}
-  #         PYROSCOPE_ENVIRONMENT: ci-smoke-${{ matrix.product }}-sepolia
-  #         PYROSCOPE_KEY: ${{ secrets.QA_PYROSCOPE_KEY }}
-  #       with:
-  #         test_command_to_run: cd ./integration-tests && go test -timeout 30m -count=1 -json -test.parallel=1 -run ${{ matrix.test }} ./smoke 2>&1 | tee /tmp/gotest.log | gotestfmt
-  #         test_download_vendor_packages_command: cd ./integration-tests && go mod download
-  #         cl_repo: ${{ env.CHAINLINK_IMAGE }}
-  #         cl_image_tag: ${{ github.sha }}
-  #         aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
-  #         dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }}
-  #         dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }}
-  #         artifacts_location: ./integration-tests/smoke/logs
-  #         publish_check_name: Seplia ${{ matrix.product }} Smoke Test Results
-  #         token: ${{ secrets.GITHUB_TOKEN }}
-  #         go_mod_path: ./integration-tests/go.mod
-  #         cache_key_id: core-e2e-${{ env.MOD_CACHE_VERSION }}
-  #         cache_restore_only: "true"
-  #         QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
-  #         QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
-  #         QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
-  #     - name: Collect Metrics
-  #       if: always()
-  #       id: collect-gha-metrics
-  #       uses: smartcontractkit/push-gha-metrics-action@d1618b772a97fd87e6505de97b872ee0b1f1729a # v2.0.2
-  #       with:
-  #         basic-auth: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }}
-  #         hostname: ${{ secrets.GRAFANA_CLOUD_HOST }}
-  #         this-job-name: Sepolia ${{ matrix.product }} Tests
-  #         test-results-file: '{"testType":"go","filePath":"/tmp/gotest.log"}'
-  #       continue-on-error: true
-
-  optimism-goerli-smoke-tests:
+  build-tests:
     environment: integration
     permissions:
-      checks: write
-      pull-requests: write
       id-token: write
       contents: read
-    needs: [build-chainlink]
-    env:
-      SELECTED_NETWORKS: OPTIMISM_GOERLI
-    strategy:
-      fail-fast: false
-      max-parallel: 1
-      matrix:
-        include: # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#example-adding-configurations
-          - product: OCR
-            test: TestOCRBasic
-          - product: Automation
-            test: TestAutomationBasic/registry_2_0
-    name: Optimism Goerli ${{ matrix.product }} Tests
+    name: Build Tests Binary
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout the repo
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
-      - name: Run Tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@e865e376b8c2d594028c8d645dd6c47169b72974 # v2.2.16
-        env:
-          PYROSCOPE_SERVER: ${{ secrets.QA_PYROSCOPE_INSTANCE }}
-          PYROSCOPE_ENVIRONMENT: ci-smoke-${{ matrix.product }}-optimism-goerli
-          PYROSCOPE_KEY: ${{ secrets.QA_PYROSCOPE_KEY }}
-        with:
-          test_command_to_run: cd ./integration-tests && go test -timeout 30m -count=1 -json -test.parallel=1 -run ${{ matrix.test }} ./smoke 2>&1 | tee /tmp/gotest.log | gotestfmt
-          test_download_vendor_packages_command: cd ./integration-tests && go mod download
-          cl_repo: ${{ env.CHAINLINK_IMAGE }}
-          cl_image_tag: ${{ github.sha }}
-          aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
-          dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }}
-          dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }}
-          artifacts_location: ./integration-tests/smoke/logs
-          publish_check_name: Seplia ${{ matrix.product }} Smoke Test Results
-          token: ${{ secrets.GITHUB_TOKEN }}
-          go_mod_path: ./integration-tests/go.mod
-          cache_key_id: core-e2e-${{ env.MOD_CACHE_VERSION }}
-          cache_restore_only: "true"
-          QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
-          QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
-          QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
       - name: Collect Metrics
-        if: always()
         id: collect-gha-metrics
         uses: smartcontractkit/push-gha-metrics-action@d1618b772a97fd87e6505de97b872ee0b1f1729a # v2.0.2
         with:
           basic-auth: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_CLOUD_HOST }}
-          this-job-name: Optimism Goerli ${{ matrix.product }} Tests
-          test-results-file: '{"testType":"go","filePath":"/tmp/gotest.log"}'
+          this-job-name: Build Tests Binary
         continue-on-error: true
-
-  arbitrum-goerli-smoke-tests:
-    environment: integration
-    permissions:
-      checks: write
-      pull-requests: write
-      id-token: write
-      contents: read
-    needs: [build-chainlink]
-    env:
-      SELECTED_NETWORKS: ARBITRUM_GOERLI
-    strategy:
-      max-parallel: 1
-      fail-fast: false
-      matrix:
-        include: # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#example-adding-configurations
-          - product: OCR
-            test: TestOCRBasic
-          - product: Automation
-            test: TestAutomationBasic/registry_2_0
-    name: Arbitrum Goerli ${{ matrix.product }} Tests
-    runs-on: ubuntu-latest
-    steps:
       - name: Checkout the repo
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           ref: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
-      - name: Run Tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@e865e376b8c2d594028c8d645dd6c47169b72974 # v2.2.16
-        env:
-          PYROSCOPE_SERVER: ${{ secrets.QA_PYROSCOPE_INSTANCE }}
-          PYROSCOPE_ENVIRONMENT: ci-smoke-${{ matrix.product }}-arbitrum-goerli
-          PYROSCOPE_KEY: ${{ secrets.QA_PYROSCOPE_KEY }}
+      - name: Build Tests
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-tests@912bed7e07a1df4d06ea53a031e9773bb65dc7bd # v2.3.0
         with:
-          test_command_to_run: cd ./integration-tests && go test -timeout 30m -count=1 -json -test.parallel=1 -run ${{ matrix.test }} ./smoke 2>&1 | tee /tmp/gotest.log | gotestfmt
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
-          cl_repo: ${{ env.CHAINLINK_IMAGE }}
-          cl_image_tag: ${{ github.sha }}
-          aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
-          dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }}
-          dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }}
-          artifacts_location: ./integration-tests/smoke/logs
-          publish_check_name: Arbitrum Goerli ${{ matrix.product }} Smoke Test Results
           token: ${{ secrets.GITHUB_TOKEN }}
           go_mod_path: ./integration-tests/go.mod
           cache_key_id: core-e2e-${{ env.MOD_CACHE_VERSION }}
           cache_restore_only: "true"
-          QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
-          QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
-          QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
-      - name: Collect Metrics
-        if: always()
-        id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@d1618b772a97fd87e6505de97b872ee0b1f1729a # v2.0.2
-        with:
-          basic-auth: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }}
-          hostname: ${{ secrets.GRAFANA_CLOUD_HOST }}
-          this-job-name: Arbitrum Goerli ${{ matrix.product }} Tests
-          test-results-file: '{"testType":"go","filePath":"/tmp/gotest.log"}'
-        continue-on-error: true
+          binary_name: tests
+
+  # End Build Test Dependencies
 
-  testnet-smoke-tests-notify:
+  # Reporting Jobs
+
+  start-slack-thread:
     name: Start Slack Thread
     if: ${{ always() && needs.*.result != 'skipped' && needs.*.result != 'cancelled' }}
     environment: integration
@@ -252,7 +147,7 @@ jobs:
       id-token: write
       contents: read
     runs-on: ubuntu-latest
-    needs: [optimism-goerli-smoke-tests, arbitrum-goerli-smoke-tests]
+    needs: [sepolia-smoke-tests, bsc-testnet-tests, optimism-goerli-smoke-tests, optimism-sepolia-smoke-tests, arbitrum-sepolia-smoke-tests, base-goerli-smoke-tests, base-sepolia-smoke-tests, polygon-mumbai-smoke-tests, avalanche-fuji-smoke-tests, fantom-testnet-smoke-tests, celo-alfajores-smoke-tests, scroll-sepolia-smoke-tests, linea-goerli-smoke-tests]
     steps:
       - name: Debug Result
         run: echo ${{ join(needs.*.result, ',') }}
@@ -275,6 +170,13 @@ jobs:
                         "emoji": true
                       }
                     },
+                    {
+                      "type": "section",
+                      "text": {
+                        "type": "mrkdwn",
+                        "text": "${{ contains(join(needs.*.result, ','), 'failure') && 'Some tests failed, notifying <@U01Q4N37KFG>' || 'All Good!' }}"
+                      }
+                    },
                     {
                       "type": "divider"
                     },
@@ -292,7 +194,7 @@ jobs:
         env:
           SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
 
-  testnet-smoke-tests-results:
+  post-test-results-to-slack:
     name: Post Test Results for ${{ matrix.network }}
     if: ${{ always() && needs.*.result != 'skipped' && needs.*.result != 'cancelled' }}
     environment: integration
@@ -302,11 +204,11 @@ jobs:
       id-token: write
       contents: read
     runs-on: ubuntu-latest
-    needs: testnet-smoke-tests-notify
+    needs: start-slack-thread
     strategy:
       fail-fast: false
       matrix:
-        network: [Optimism Goerli, Arbitrum Goerli]
+        network: [Sepolia, Optimism Goerli, Optimism Sepolia, Arbitrum Sepolia, Base Goerli, Base Sepolia, Polygon Mumbai, Avalanche Fuji, Fantom Testnet, Celo Alfajores, Scroll Sepolia, Linea Goerli]
     steps:
       - name: Get Results
         id: test-results
@@ -317,7 +219,7 @@ jobs:
           PARSED_RESULTS=$(curl \
           -H "Authorization: Bearer ${{ github.token }}" \
           'https://api.github.com/repos/${{github.repository}}/actions/runs/${{ github.run_id }}/jobs' \
-          | jq -r --arg pattern "${{ matrix.network }} (?<product>\\w+) Tests" '.jobs[]
+          | jq -r --arg pattern "^${{ matrix.network }} (?<product>.*?) Tests$" '.jobs[]
           | select(.name | test($pattern)) as $job
           | $job.steps[]
           | select(.name == "Run Tests")
@@ -327,10 +229,13 @@ jobs:
           echo $PARSED_RESULTS
 
           ALL_SUCCESS=true
+          echo "Checking for failures"
+          echo "$PARSED_RESULTS" | jq -s | jq -r '.[] | select(.conclusion != ":white_check_mark:")'
           for row in $(echo "$PARSED_RESULTS" | jq -s | jq -r '.[] | select(.conclusion != ":white_check_mark:")'); do
-              success=false
+              ALL_SUCCESS=false
               break
           done
+          echo "Success: $ALL_SUCCESS"
 
           echo all_success=$ALL_SUCCESS >> $GITHUB_OUTPUT
 
@@ -360,16 +265,16 @@ jobs:
           channel-id: ${{ secrets.QA_SLACK_CHANNEL }}
           payload: |
             {
-              "thread_ts": "${{ needs.testnet-smoke-tests-notify.outputs.thread_ts }}",
+              "thread_ts": "${{ needs.start-slack-thread.outputs.thread_ts }}",
               "attachments": [
                 {
-                  "color": "${{ steps.test-results.outputs.all_success && '#2E7D32' || '#C62828' }}",
+                  "color": "${{ steps.test-results.outputs.all_success == 'true' && '#2E7D32' || '#C62828' }}",
                   "blocks": [
                     {
                       "type": "header",
                       "text": {
                         "type": "plain_text",
-                        "text": "${{ matrix.network }} ${{ steps.test-results.outputs.all_success && ':white_check_mark:' || ':x: Notifying <@U01Q4N37KFG>'}}",
+                        "text": "${{ matrix.network }} ${{ steps.test-results.outputs.all_success == 'true' && ':white_check_mark:' || ':x:'}}",
                         "emoji": true
                       }
                     },
@@ -383,3 +288,635 @@ jobs:
             }
         env:
           SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
+
+  # End Reporting Jobs
+
+  sepolia-smoke-tests:
+    environment: integration
+    permissions:
+      checks: write
+      pull-requests: write
+      id-token: write
+      contents: read
+    needs: [build-chainlink, build-tests]
+    env:
+      SELECTED_NETWORKS: SEPOLIA
+    strategy:
+      max-parallel: 1
+      fail-fast: false
+      matrix:
+        include: # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#example-adding-configurations
+          - product: OCR
+            test: TestOCRBasic
+          - product: Automation Conditional
+            test: TestAutomationBasic/registry_2_1_conditional
+          - product: Automation Log Trigger
+            test: TestAutomationBasic/registry_2_1_logtrigger
+    name: Sepolia ${{ matrix.product }} Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download Tests Binary
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        with:
+          name: tests
+      - name: Run Tests
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests-binary@912bed7e07a1df4d06ea53a031e9773bb65dc7bd # v2.3.0
+        env:
+          PYROSCOPE_SERVER: ${{ secrets.QA_PYROSCOPE_INSTANCE }}
+          PYROSCOPE_ENVIRONMENT: ci-smoke-${{ matrix.product }}-sepolia
+          PYROSCOPE_KEY: ${{ secrets.QA_PYROSCOPE_KEY }}
+        with:
+          test_command_to_run: ./tests -test.timeout 30m -test.count=1 -test.parallel=1 -test.run ${{ matrix.test }}
+          binary_name: tests
+          cl_repo: ${{ env.CHAINLINK_IMAGE }}
+          cl_image_tag: ${{ github.sha }}
+          aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
+          dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }}
+          dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }}
+          artifacts_location: ./logs
+          token: ${{ secrets.GITHUB_TOKEN }}
+          cache_key_id: core-e2e-${{ env.MOD_CACHE_VERSION }}
+          cache_restore_only: "true"
+          QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
+          QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
+          QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
+
+  bsc-testnet-tests:
+    environment: integration
+    permissions:
+      checks: write
+      pull-requests: write
+      id-token: write
+      contents: read
+    needs: [build-chainlink, build-tests]
+    env:
+      SELECTED_NETWORKS: BSC_TESTNET
+    strategy:
+      max-parallel: 1
+      fail-fast: false
+      matrix:
+        include: # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#example-adding-configurations
+          - product: OCR
+            test: TestOCRBasic
+          - product: Automation Conditional
+            test: TestAutomationBasic/registry_2_1_conditional
+          - product: Automation Log Trigger
+            test: TestAutomationBasic/registry_2_1_logtrigger
+    name: BSC Testnet ${{ matrix.product }} Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download Tests Binary
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        with:
+          name: tests
+      - name: Run Tests
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests-binary@912bed7e07a1df4d06ea53a031e9773bb65dc7bd # v2.3.0
+        env:
+          PYROSCOPE_SERVER: ${{ secrets.QA_PYROSCOPE_INSTANCE }}
+          PYROSCOPE_ENVIRONMENT: ci-smoke-${{ matrix.product }}-bsc-testnet
+          PYROSCOPE_KEY: ${{ secrets.QA_PYROSCOPE_KEY }}
+        with:
+          test_command_to_run: ./tests -test.timeout 30m -test.count=1 -test.parallel=1 -test.run ${{ matrix.test }}
+          binary_name: tests
+          cl_repo: ${{ env.CHAINLINK_IMAGE }}
+          cl_image_tag: ${{ github.sha }}
+          aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
+          dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }}
+          dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }}
+          artifacts_location: ./logs
+          token: ${{ secrets.GITHUB_TOKEN }}
+          cache_key_id: core-e2e-${{ env.MOD_CACHE_VERSION }}
+          cache_restore_only: "true"
+          QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
+          QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
+          QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
+
+  optimism-goerli-smoke-tests:
+    environment: integration
+    permissions:
+      checks: write
+      pull-requests: write
+      id-token: write
+      contents: read
+    needs: [build-chainlink, build-tests]
+    env:
+      SELECTED_NETWORKS: OPTIMISM_GOERLI
+    strategy:
+      fail-fast: false
+      max-parallel: 1
+      matrix:
+        include: # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#example-adding-configurations
+          - product: OCR
+            test: TestOCRBasic
+          - product: Automation Conditional
+            test: TestAutomationBasic/registry_2_1_conditional
+          - product: Automation Log Trigger
+            test: TestAutomationBasic/registry_2_1_logtrigger
+    name: Optimism Goerli ${{ matrix.product }} Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download Tests Binary
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        with:
+          name: tests
+      - name: Run Tests
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests-binary@912bed7e07a1df4d06ea53a031e9773bb65dc7bd # v2.3.0
+        env:
+          PYROSCOPE_SERVER: ${{ secrets.QA_PYROSCOPE_INSTANCE }}
+          PYROSCOPE_ENVIRONMENT: ci-smoke-${{ matrix.product }}-optimism-goerli
+          PYROSCOPE_KEY: ${{ secrets.QA_PYROSCOPE_KEY }}
+        with:
+          test_command_to_run: ./tests -test.timeout 30m -test.count=1 -test.parallel=1 -test.run ${{ matrix.test }}
+          binary_name: tests
+          cl_repo: ${{ env.CHAINLINK_IMAGE }}
+          cl_image_tag: ${{ github.sha }}
+          aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
+          dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }}
+          dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }}
+          artifacts_location: ./logs
+          token: ${{ secrets.GITHUB_TOKEN }}
+          cache_key_id: core-e2e-${{ env.MOD_CACHE_VERSION }}
+          cache_restore_only: "true"
+          QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
+          QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
+          QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
+
+  optimism-sepolia-smoke-tests:
+    environment: integration
+    permissions:
+      checks: write
+      pull-requests: write
+      id-token: write
+      contents: read
+    needs: [build-chainlink, build-tests]
+    env:
+      SELECTED_NETWORKS: OPTIMISM_SEPOLIA
+    strategy:
+      max-parallel: 1
+      fail-fast: false
+      matrix:
+        include: # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#example-adding-configurations
+          - product: OCR
+            test: TestOCRBasic
+          - product: Automation Conditional
+            test: TestAutomationBasic/registry_2_1_conditional
+          - product: Automation Log Trigger
+            test: TestAutomationBasic/registry_2_1_logtrigger
+    name: Optimism Sepolia ${{ matrix.product }} Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download Tests Binary
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        with:
+          name: tests
+      - name: Run Tests
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests-binary@912bed7e07a1df4d06ea53a031e9773bb65dc7bd # v2.3.0
+        env:
+          PYROSCOPE_SERVER: ${{ secrets.QA_PYROSCOPE_INSTANCE }}
+          PYROSCOPE_ENVIRONMENT: ci-smoke-${{ matrix.product }}-optimism-sepolia
+          PYROSCOPE_KEY: ${{ secrets.QA_PYROSCOPE_KEY }}
+        with:
+          test_command_to_run: ./tests -test.timeout 30m -test.count=1 -test.parallel=1 -test.run ${{ matrix.test }}
+          binary_name: tests
+          cl_repo: ${{ env.CHAINLINK_IMAGE }}
+          cl_image_tag: ${{ github.sha }}
+          aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
+          dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }}
+          dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }}
+          artifacts_location: ./logs
+          token: ${{ secrets.GITHUB_TOKEN }}
+          cache_key_id: core-e2e-${{ env.MOD_CACHE_VERSION }}
+          cache_restore_only: "true"
+          QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
+          QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
+          QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
+
+  arbitrum-sepolia-smoke-tests:
+    environment: integration
+    permissions:
+      checks: write
+      pull-requests: write
+      id-token: write
+      contents: read
+    needs: [build-chainlink, build-tests]
+    env:
+      SELECTED_NETWORKS: ARBITRUM_SEPOLIA
+    strategy:
+      max-parallel: 1
+      fail-fast: false
+      matrix:
+        include: # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#example-adding-configurations
+          - product: OCR
+            test: TestOCRBasic
+          - product: Automation Conditional
+            test: TestAutomationBasic/registry_2_1_conditional
+          - product: Automation Log Trigger
+            test: TestAutomationBasic/registry_2_1_logtrigger
+    name: Arbitrum Sepolia ${{ matrix.product }} Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download Tests Binary
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        with:
+          name: tests
+      - name: Run Tests
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests-binary@912bed7e07a1df4d06ea53a031e9773bb65dc7bd # v2.3.0
+        env:
+          PYROSCOPE_SERVER: ${{ secrets.QA_PYROSCOPE_INSTANCE }}
+          PYROSCOPE_ENVIRONMENT: ci-smoke-${{ matrix.product }}-arbitrum-sepolia
+          PYROSCOPE_KEY: ${{ secrets.QA_PYROSCOPE_KEY }}
+        with:
+          test_command_to_run: ./tests -test.timeout 30m -test.count=1 -test.parallel=1 -test.run ${{ matrix.test }}
+          binary_name: tests
+          cl_repo: ${{ env.CHAINLINK_IMAGE }}
+          cl_image_tag: ${{ github.sha }}
+          aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
+          dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }}
+          dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }}
+          artifacts_location: ./logs
+          token: ${{ secrets.GITHUB_TOKEN }}
+          cache_key_id: core-e2e-${{ env.MOD_CACHE_VERSION }}
+          cache_restore_only: "true"
+          QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
+          QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
+          QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
+
+  base-goerli-smoke-tests:
+    environment: integration
+    permissions:
+      checks: write
+      pull-requests: write
+      id-token: write
+      contents: read
+    needs: [build-chainlink, build-tests]
+    env:
+      SELECTED_NETWORKS: BASE_GOERLI
+    strategy:
+      max-parallel: 1
+      fail-fast: false
+      matrix:
+        include: # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#example-adding-configurations
+          - product: OCR
+            test: TestOCRBasic
+    name: Base Goerli ${{ matrix.product }} Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download Tests Binary
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        with:
+          name: tests
+      - name: Run Tests
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests-binary@912bed7e07a1df4d06ea53a031e9773bb65dc7bd # v2.3.0
+        env:
+          PYROSCOPE_SERVER: ${{ secrets.QA_PYROSCOPE_INSTANCE }}
+          PYROSCOPE_ENVIRONMENT: ci-smoke-${{ matrix.product }}-base-goerli
+          PYROSCOPE_KEY: ${{ secrets.QA_PYROSCOPE_KEY }}
+        with:
+          test_command_to_run: ./tests -test.timeout 30m -test.count=1 -test.parallel=1 -test.run ${{ matrix.test }}
+          binary_name: tests
+          cl_repo: ${{ env.CHAINLINK_IMAGE }}
+          cl_image_tag: ${{ github.sha }}
+          aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
+          dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }}
+          dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }}
+          artifacts_location: ./logs
+          token: ${{ secrets.GITHUB_TOKEN }}
+          cache_key_id: core-e2e-${{ env.MOD_CACHE_VERSION }}
+          cache_restore_only: "true"
+          QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
+          QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
+          QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
+
+  base-sepolia-smoke-tests:
+    environment: integration
+    permissions:
+      checks: write
+      pull-requests: write
+      id-token: write
+      contents: read
+    needs: [build-chainlink, build-tests]
+    env:
+      SELECTED_NETWORKS: BASE_SEPOLIA
+    strategy:
+      max-parallel: 1
+      fail-fast: false
+      matrix:
+        include: # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#example-adding-configurations
+          - product: OCR
+            test: TestOCRBasic
+    name: Base Sepolia ${{ matrix.product }} Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download Tests Binary
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        with:
+          name: tests
+      - name: Run Tests
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests-binary@912bed7e07a1df4d06ea53a031e9773bb65dc7bd # v2.3.0
+        env:
+          PYROSCOPE_SERVER: ${{ secrets.QA_PYROSCOPE_INSTANCE }}
+          PYROSCOPE_ENVIRONMENT: ci-smoke-${{ matrix.product }}-base-sepolia
+          PYROSCOPE_KEY: ${{ secrets.QA_PYROSCOPE_KEY }}
+        with:
+          test_command_to_run: ./tests -test.timeout 30m -test.count=1 -test.parallel=1 -test.run ${{ matrix.test }}
+          binary_name: tests
+          cl_repo: ${{ env.CHAINLINK_IMAGE }}
+          cl_image_tag: ${{ github.sha }}
+          aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
+          dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }}
+          dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }}
+          artifacts_location: ./logs
+          token: ${{ secrets.GITHUB_TOKEN }}
+          cache_key_id: core-e2e-${{ env.MOD_CACHE_VERSION }}
+          cache_restore_only: "true"
+          QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
+          QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
+          QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
+  
+  polygon-mumbai-smoke-tests:
+    environment: integration
+    permissions:
+      checks: write
+      pull-requests: write
+      id-token: write
+      contents: read
+    needs: [build-chainlink, build-tests]
+    env:
+      SELECTED_NETWORKS: POLYGON_MUMBAI
+    strategy:
+      max-parallel: 1
+      fail-fast: false
+      matrix:
+        include: # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#example-adding-configurations
+          - product: OCR
+            test: TestOCRBasic
+          - product: Automation Conditional
+            test: TestAutomationBasic/registry_2_1_conditional
+          - product: Automation Log Trigger
+            test: TestAutomationBasic/registry_2_1_logtrigger
+    name: Polygon Mumbai ${{ matrix.product }} Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download Tests Binary
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        with:
+          name: tests
+      - name: Run Tests
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests-binary@912bed7e07a1df4d06ea53a031e9773bb65dc7bd # v2.3.0
+        env:
+          PYROSCOPE_SERVER: ${{ secrets.QA_PYROSCOPE_INSTANCE }}
+          PYROSCOPE_ENVIRONMENT: ci-smoke-${{ matrix.product }}-polygon-mumbai
+          PYROSCOPE_KEY: ${{ secrets.QA_PYROSCOPE_KEY }}
+        with:
+          test_command_to_run: ./tests -test.timeout 30m -test.count=1 -test.parallel=1 -test.run ${{ matrix.test }}
+          binary_name: tests
+          cl_repo: ${{ env.CHAINLINK_IMAGE }}
+          cl_image_tag: ${{ github.sha }}
+          aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
+          dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }}
+          dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }}
+          artifacts_location: ./logs
+          token: ${{ secrets.GITHUB_TOKEN }}
+          cache_key_id: core-e2e-${{ env.MOD_CACHE_VERSION }}
+          cache_restore_only: "true"
+          QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
+          QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
+          QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
+
+  avalanche-fuji-smoke-tests:
+    environment: integration
+    permissions:
+      checks: write
+      pull-requests: write
+      id-token: write
+      contents: read
+    needs: [build-chainlink, build-tests]
+    env:
+      SELECTED_NETWORKS: AVALANCHE_FUJI
+    strategy:
+      max-parallel: 1
+      fail-fast: false
+      matrix:
+        include: # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#example-adding-configurations
+          - product: OCR
+            test: TestOCRBasic
+          - product: Automation Conditional
+            test: TestAutomationBasic/registry_2_1_conditional
+          - product: Automation Log Trigger
+            test: TestAutomationBasic/registry_2_1_logtrigger
+    name: Avalanche Fuji ${{ matrix.product }} Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download Tests Binary
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        with:
+          name: tests
+      - name: Run Tests
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests-binary@912bed7e07a1df4d06ea53a031e9773bb65dc7bd # v2.3.0
+        env:
+          PYROSCOPE_SERVER: ${{ secrets.QA_PYROSCOPE_INSTANCE }}
+          PYROSCOPE_ENVIRONMENT: ci-smoke-${{ matrix.product }}-avalanche-fuji
+          PYROSCOPE_KEY: ${{ secrets.QA_PYROSCOPE_KEY }}
+        with:
+          test_command_to_run: ./tests -test.timeout 30m -test.count=1 -test.parallel=1 -test.run ${{ matrix.test }}
+          binary_name: tests
+          cl_repo: ${{ env.CHAINLINK_IMAGE }}
+          cl_image_tag: ${{ github.sha }}
+          aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
+          dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }}
+          dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }}
+          artifacts_location: ./logs
+          token: ${{ secrets.GITHUB_TOKEN }}
+          cache_key_id: core-e2e-${{ env.MOD_CACHE_VERSION }}
+          cache_restore_only: "true"
+          QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
+          QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
+          QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
+
+  fantom-testnet-smoke-tests:
+    environment: integration
+    permissions:
+      checks: write
+      pull-requests: write
+      id-token: write
+      contents: read
+    needs: [build-chainlink, build-tests]
+    env:
+      SELECTED_NETWORKS: FANTOM_TESTNET
+    strategy:
+      max-parallel: 1
+      fail-fast: false
+      matrix:
+        include: # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#example-adding-configurations
+          - product: OCR
+            test: TestOCRBasic
+          - product: Automation Conditional
+            test: TestAutomationBasic/registry_2_1_conditional
+          - product: Automation Log Trigger
+            test: TestAutomationBasic/registry_2_1_logtrigger
+    name: Fantom Testnet ${{ matrix.product }} Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download Tests Binary
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        with:
+          name: tests
+      - name: Run Tests
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests-binary@912bed7e07a1df4d06ea53a031e9773bb65dc7bd # v2.3.0
+        env:
+          PYROSCOPE_SERVER: ${{ secrets.QA_PYROSCOPE_INSTANCE }}
+          PYROSCOPE_ENVIRONMENT: ci-smoke-${{ matrix.product }}-fantom-testnet
+          PYROSCOPE_KEY: ${{ secrets.QA_PYROSCOPE_KEY }}
+        with:
+          test_command_to_run: ./tests -test.timeout 30m -test.count=1 -test.parallel=1 -test.run ${{ matrix.test }}
+          binary_name: tests
+          cl_repo: ${{ env.CHAINLINK_IMAGE }}
+          cl_image_tag: ${{ github.sha }}
+          aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
+          dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }}
+          dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }}
+          artifacts_location: ./logs
+          token: ${{ secrets.GITHUB_TOKEN }}
+          cache_key_id: core-e2e-${{ env.MOD_CACHE_VERSION }}
+          cache_restore_only: "true"
+          QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
+          QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
+          QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
+
+  celo-alfajores-smoke-tests:
+    environment: integration
+    permissions:
+      checks: write
+      pull-requests: write
+      id-token: write
+      contents: read
+    needs: [build-chainlink, build-tests]
+    env:
+      SELECTED_NETWORKS: CELO_ALFAJORES
+    strategy:
+      max-parallel: 1
+      fail-fast: false
+      matrix:
+        include: # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#example-adding-configurations
+          - product: OCR
+            test: TestOCRBasic
+    name: Celo Alfajores ${{ matrix.product }} Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download Tests Binary
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        with:
+          name: tests
+      - name: Run Tests
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests-binary@912bed7e07a1df4d06ea53a031e9773bb65dc7bd # v2.3.0
+        env:
+          PYROSCOPE_SERVER: ${{ secrets.QA_PYROSCOPE_INSTANCE }}
+          PYROSCOPE_ENVIRONMENT: ci-smoke-${{ matrix.product }}-celo-alfajores
+          PYROSCOPE_KEY: ${{ secrets.QA_PYROSCOPE_KEY }}
+        with:
+          test_command_to_run: ./tests -test.timeout 30m -test.count=1 -test.parallel=1 -test.run ${{ matrix.test }}
+          binary_name: tests
+          cl_repo: ${{ env.CHAINLINK_IMAGE }}
+          cl_image_tag: ${{ github.sha }}
+          aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
+          dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }}
+          dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }}
+          artifacts_location: ./logs
+          token: ${{ secrets.GITHUB_TOKEN }}
+          cache_key_id: core-e2e-${{ env.MOD_CACHE_VERSION }}
+          cache_restore_only: "true"
+          QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
+          QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
+          QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
+      
+  scroll-sepolia-smoke-tests:
+    environment: integration
+    permissions:
+      checks: write
+      pull-requests: write
+      id-token: write
+      contents: read
+    needs: [build-chainlink, build-tests]
+    env:
+      SELECTED_NETWORKS: SCROLL_SEPOLIA
+    strategy:
+      max-parallel: 1
+      fail-fast: false
+      matrix:
+        include: # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#example-adding-configurations
+          - product: OCR
+            test: TestOCRBasic
+    name: Scroll Sepolia ${{ matrix.product }} Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download Tests Binary
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        with:
+          name: tests
+      - name: Run Tests
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests-binary@912bed7e07a1df4d06ea53a031e9773bb65dc7bd # v2.3.0
+        env:
+          PYROSCOPE_SERVER: ${{ secrets.QA_PYROSCOPE_INSTANCE }}
+          PYROSCOPE_ENVIRONMENT: ci-smoke-${{ matrix.product }}-scroll-sepolia
+          PYROSCOPE_KEY: ${{ secrets.QA_PYROSCOPE_KEY }}
+        with:
+          test_command_to_run: ./tests -test.timeout 30m -test.count=1 -test.parallel=1 -test.run ${{ matrix.test }}
+          binary_name: tests
+          cl_repo: ${{ env.CHAINLINK_IMAGE }}
+          cl_image_tag: ${{ github.sha }}
+          aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
+          dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }}
+          dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }}
+          artifacts_location: ./logs
+          token: ${{ secrets.GITHUB_TOKEN }}
+          cache_key_id: core-e2e-${{ env.MOD_CACHE_VERSION }}
+          cache_restore_only: "true"
+          QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
+          QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
+          QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
+
+  linea-goerli-smoke-tests:
+    environment: integration
+    permissions:
+      checks: write
+      pull-requests: write
+      id-token: write
+      contents: read
+    needs: [build-chainlink, build-tests]
+    env:
+      SELECTED_NETWORKS: LINEA_GOERLI
+    strategy:
+      max-parallel: 1
+      fail-fast: false
+      matrix:
+        include: # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#example-adding-configurations
+          - product: OCR
+            test: TestOCRBasic
+    name: Linea Goerli ${{ matrix.product }} Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download Tests Binary
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        with:
+          name: tests
+      - name: Run Tests
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests-binary@912bed7e07a1df4d06ea53a031e9773bb65dc7bd # v2.3.0
+        env:
+          PYROSCOPE_SERVER: ${{ secrets.QA_PYROSCOPE_INSTANCE }}
+          PYROSCOPE_ENVIRONMENT: ci-smoke-${{ matrix.product }}-linea-goerli
+          PYROSCOPE_KEY: ${{ secrets.QA_PYROSCOPE_KEY }}
+        with:
+          test_command_to_run: ./tests -test.timeout 30m -test.count=1 -test.parallel=1 -test.run ${{ matrix.test }}
+          binary_name: tests
+          cl_repo: ${{ env.CHAINLINK_IMAGE }}
+          cl_image_tag: ${{ github.sha }}
+          aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
+          dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }}
+          dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }}
+          artifacts_location: ./logs
+          token: ${{ secrets.GITHUB_TOKEN }}
+          cache_key_id: core-e2e-${{ env.MOD_CACHE_VERSION }}
+          cache_restore_only: "true"
+          QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
+          QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
+          QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
\ No newline at end of file
diff --git a/integration-tests/contracts/contract_loader.go b/integration-tests/contracts/contract_loader.go
index e66c95138b9..0fec424426a 100644
--- a/integration-tests/contracts/contract_loader.go
+++ b/integration-tests/contracts/contract_loader.go
@@ -71,6 +71,14 @@ func NewContractLoader(bcClient blockchain.EVMClient, logger zerolog.Logger) (Co
 		return &PolygonZkEvmContractLoader{NewEthereumContractLoader(clientImpl, logger)}, nil
 	case *blockchain.WeMixClient:
 		return &WeMixContractLoader{NewEthereumContractLoader(clientImpl, logger)}, nil
+	case *blockchain.LineaClient:
+		return &LineaContractLoader{NewEthereumContractLoader(clientImpl, logger)}, nil
+	case *blockchain.CeloClient:
+		return &CeloContractLoader{NewEthereumContractLoader(clientImpl, logger)}, nil
+	case *blockchain.ScrollClient:
+		return &ScrollContractLoader{NewEthereumContractLoader(clientImpl, logger)}, nil
+	case *blockchain.FantomClient:
+		return &FantomContractLoader{NewEthereumContractLoader(clientImpl, logger)}, nil
 	case *blockchain.BSCClient:
 		return &BSCContractLoader{NewEthereumContractLoader(clientImpl, logger)}, nil
 	}
@@ -121,7 +129,27 @@ type WeMixContractLoader struct {
 	*EthereumContractLoader
 }
 
-// BSCContractLoader wraps ethereum contract deployments for BSC
+// LineaContractLoader wraps for Linea
+type LineaContractLoader struct {
+	*EthereumContractLoader
+}
+
+// CeloContractLoader wraps for Celo
+type CeloContractLoader struct {
+	*EthereumContractLoader
+}
+
+// ScrollContractLoader wraps for Scroll
+type ScrollContractLoader struct {
+	*EthereumContractLoader
+}
+
+// FantomContractLoader wraps for Fantom
+type FantomContractLoader struct {
+	*EthereumContractLoader
+}
+
+// BSCContractLoader wraps for BSC
 type BSCContractLoader struct {
 	*EthereumContractLoader
 }
diff --git a/integration-tests/docker/test_env/test_env.go b/integration-tests/docker/test_env/test_env.go
index b1b179badc5..b04d24a9593 100644
--- a/integration-tests/docker/test_env/test_env.go
+++ b/integration-tests/docker/test_env/test_env.go
@@ -8,6 +8,7 @@ import (
 	"os"
 	"path/filepath"
 	"runtime/debug"
+	"strings"
 	"testing"
 	"time"
 
@@ -262,7 +263,8 @@ func (te *CLClusterTestEnv) logWhetherAllContainersAreRunning() {
 // collectTestLogs collects the logs from all the Chainlink nodes in the test environment and writes them to local files
 func (te *CLClusterTestEnv) collectTestLogs() error {
 	te.l.Info().Msg("Collecting test logs")
-	folder := fmt.Sprintf("./logs/%s-%s", te.t.Name(), time.Now().Format("2006-01-02T15-04-05"))
+	sanitizedNetworkName := strings.ReplaceAll(te.EVMClient.GetNetworkName(), " ", "-")
+	folder := fmt.Sprintf("./logs/%s-%s-%s", te.t.Name(), sanitizedNetworkName, time.Now().Format("2006-01-02T15-04-05"))
 	if err := os.MkdirAll(folder, os.ModePerm); err != nil {
 		return err
 	}
@@ -290,6 +292,27 @@ func (te *CLClusterTestEnv) collectTestLogs() error {
 		})
 	}
 
+	if te.MockAdapter != nil {
+		eg.Go(func() error {
+			logFileName := filepath.Join(folder, "mock-adapter.log")
+			logFile, err := os.OpenFile(logFileName, os.O_CREATE|os.O_WRONLY, 0644)
+			if err != nil {
+				return err
+			}
+			defer logFile.Close()
+			logReader, err := te.MockAdapter.Container.Logs(testcontext.Get(te.t))
+			if err != nil {
+				return err
+			}
+			_, err = io.Copy(logFile, logReader)
+			if err != nil {
+				return err
+			}
+			te.l.Info().Str("Container", te.MockAdapter.ContainerName).Str("File", logFileName).Msg("Wrote Logs")
+			return nil
+		})
+	}
+
 	if err := eg.Wait(); err != nil {
 		return err
 	}
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index 01d7c4dbef9..32c35c28a9a 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -25,7 +25,7 @@ require (
 	github.com/slack-go/slack v0.12.2
 	github.com/smartcontractkit/chainlink-automation v1.0.1
 	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231205033838-dfac15e672d4
-	github.com/smartcontractkit/chainlink-testing-framework v1.20.0
+	github.com/smartcontractkit/chainlink-testing-framework v1.20.1
 	github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
 	github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000
 	github.com/smartcontractkit/libocr v0.0.0-20231130143053-c5102a9c0fb7
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index f3d707d18ec..21e237923b9 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -1519,8 +1519,8 @@ github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231206154215-ec1718b7df3
 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231206154215-ec1718b7df3e/go.mod h1:9YIi413QRRytafTzpWm+Z+5NWBNxSqokhKyeEZ3ynlA=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231205180940-ea2e3e916725 h1:NbhPVwxx+53WN/Uld1V6c4iLgoGvUYFOsVd2kfcexe8=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231205180940-ea2e3e916725/go.mod h1:vHrPBipRL52NdPp77KXNU2k1IoCUa1B33N9otZQPYko=
-github.com/smartcontractkit/chainlink-testing-framework v1.20.0 h1:gQPQRKJuMh6QTAIMkqZ7v5WkjEmbcoMIX/V6WPVrvuI=
-github.com/smartcontractkit/chainlink-testing-framework v1.20.0/go.mod h1:+FVgkz6phTc+piVT57AcQfr3I8xvZgZ1lOpRPOu/dLQ=
+github.com/smartcontractkit/chainlink-testing-framework v1.20.1 h1:0hxLRts4yIum52MaE95RuM2Xi1S/R0r4UFExpp00iK4=
+github.com/smartcontractkit/chainlink-testing-framework v1.20.1/go.mod h1:+FVgkz6phTc+piVT57AcQfr3I8xvZgZ1lOpRPOu/dLQ=
 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 h1:FFdvEzlYwcuVHkdZ8YnZR/XomeMGbz5E2F2HZI3I3w8=
 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868/go.mod h1:Kn1Hape05UzFZ7bOUnm3GVsHzP0TNrVmpfXYNHdqGGs=
 github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306 h1:ko88+ZznniNJZbZPWAvHQU8SwKAdHngdDZ+pvVgB5ss=
diff --git a/integration-tests/smoke/ocr_test.go b/integration-tests/smoke/ocr_test.go
index 9ed692700ad..57afbdc1a4a 100644
--- a/integration-tests/smoke/ocr_test.go
+++ b/integration-tests/smoke/ocr_test.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-testing-framework/logging"
 	"github.com/smartcontractkit/chainlink-testing-framework/utils/testcontext"
+
 	"github.com/smartcontractkit/chainlink/integration-tests/actions"
 	"github.com/smartcontractkit/chainlink/integration-tests/docker/test_env"
 )
@@ -21,7 +22,7 @@ func TestOCRBasic(t *testing.T) {
 		WithGeth().
 		WithMockAdapter().
 		WithCLNodes(6).
-		WithFunding(big.NewFloat(.01)).
+		WithFunding(big.NewFloat(.5)).
 		WithStandardCleanup().
 		Build()
 	require.NoError(t, err)

From 3c9c19c31ebfd56f9634494b559844cbf280dbdb Mon Sep 17 00:00:00 2001
From: Sergey Kudasov <f4hrenh9it@gmail.com>
Date: Thu, 7 Dec 2023 17:02:17 +0300
Subject: [PATCH 094/130] Devspace non-root/build update (#11510)

* move root parts to build inside container

* update README + add more resources to the build node
---
 charts/chainlink-cluster/README.md            | 12 +++----
 charts/chainlink-cluster/devspace.yaml        | 34 ++++++++++---------
 .../templates/chainlink-node-deployment.yaml  | 10 +++---
 charts/chainlink-cluster/values.yaml          | 10 ++++++
 core/chainlink.devspace.Dockerfile            | 20 +++++++++++
 integration-tests/load/ocr/README.md          | 10 +++---
 integration-tests/load/ocr/ocr_test.go        |  4 +--
 7 files changed, 64 insertions(+), 36 deletions(-)

diff --git a/charts/chainlink-cluster/README.md b/charts/chainlink-cluster/README.md
index 5fb55536635..3deb37794a6 100644
--- a/charts/chainlink-cluster/README.md
+++ b/charts/chainlink-cluster/README.md
@@ -16,13 +16,8 @@ nix develop
 ## New cluster
 We are using [devspace](https://www.devspace.sh/docs/getting-started/installation?x0=3)
 
-Configure the cluster, see `deployments.app.helm.values` and [values.yaml](./values.yaml) comments
+Configure the cluster, see `deployments.app.helm.values` and [values.yaml](./values.yaml) comments for more details
 
-Set your registry for the image, example for `ECR`:
-```
-aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin ${aws_account}.dkr.ecr.us-west-2.amazonaws.com
-export DEVSPACE_IMAGE="${aws_account}.dkr.ecr.us-west-2.amazonaws.com/chainlink-devspace"
-```
 Enter the shell and deploy
 ```
 # set your unique namespace if it's a new cluster
@@ -45,11 +40,12 @@ Fix something in the code locally, it'd automatically sync, rebuild it inside co
 make chainlink
 make chainlink-local-start
 ```
-If you need to update the whole cluster run `deploy` again with a new set of images
+
+Reset the pod to original image
 ```
 devspace reset pods
-devspace deploy
 ```
+
 Destroy the cluster
 ```
 devspace purge
diff --git a/charts/chainlink-cluster/devspace.yaml b/charts/chainlink-cluster/devspace.yaml
index cb4c8bfce49..f62b87edf69 100644
--- a/charts/chainlink-cluster/devspace.yaml
+++ b/charts/chainlink-cluster/devspace.yaml
@@ -58,6 +58,16 @@ deployments:
             - name: node-1
               image: ${DEVSPACE_IMAGE}
               version: latest
+              # default resources are 300m/1Gi
+              # first node need more resources to build faster inside container
+              # at least 2Gi of memory is required otherwise build will fail (OOM)
+              resources:
+                requests:
+                  cpu: 2000m
+                  memory: 2048Mi
+                limits:
+                  cpu: 2000m
+                  memory: 2048Mi
               # override default config per node
               # for example, use OCRv2 P2P setup, the whole config
               #      toml: |
@@ -105,13 +115,6 @@ deployments:
             - name: node-6
               image: ${DEVSPACE_IMAGE}
               version: latest
-          resources:
-            requests:
-              cpu: 350m
-              memory: 1024Mi
-            limits:
-              cpu: 350m
-              memory: 1024Mi
 
         # each CL node have a dedicated PostgreSQL 11.15
         # use StatefulSet by setting:
@@ -231,7 +234,7 @@ profiles:
     patches:
       - op: replace
         path: dev.app.workingDir
-        value: /home/root/chainlink/integration-tests
+        value: /home/chainlink/integration-tests
       - op: replace
         path: dev.app.container
         value: runner
@@ -256,21 +259,20 @@ profiles:
 # This is a list of `dev` containers that are based on the containers created by your deployments
 dev:
   app:
-    workingDir: /home/root/chainlink
+    workingDir: /home/chainlink
     container: node
     labelSelector:
       instance: node-1
     # Sync files between the local filesystem and the development container
     sync:
-      - path: ../../core/services/chainlink:/home/root/chainlink/core/services/chainlink
+      - path: ../../core/services/chainlink:/home/chainlink/core/services/chainlink
         printLogs: true
         disableDownload: true
-      - path: ../..:/home/root/chainlink
+      - path: ../..:/home/chainlink
         printLogs: true
         disableDownload: true
         uploadExcludePaths:
           - integration-tests/
-          - .git/
           - .github/
           - belt/
           - charts/
@@ -280,16 +282,16 @@ dev:
           - integration-scripts/
           - testdata/
           - evm-test-helpers/
-          - tools/
     # Open a terminal and use the following command
     terminal:
       command: bash
     ssh:
       enabled: true
     proxyCommands:
-      - command: devspace
-      - command: kubectl
-      - command: helm
+#       TODO: access issues
+#      - command: devspace
+#      - command: kubectl
+#      - command: helm
       - gitCredentials: true
     ports:
       - port: "2345"
diff --git a/charts/chainlink-cluster/templates/chainlink-node-deployment.yaml b/charts/chainlink-cluster/templates/chainlink-node-deployment.yaml
index 463453aff93..a08c31c2c42 100644
--- a/charts/chainlink-cluster/templates/chainlink-node-deployment.yaml
+++ b/charts/chainlink-cluster/templates/chainlink-node-deployment.yaml
@@ -71,14 +71,14 @@ spec:
             initialDelaySeconds: 15
             periodSeconds: 5
             failureThreshold: 20
-          {{ if (hasKey $.Values.chainlink "resources") }}
+          {{ if (hasKey $cfg "resources") }}
           resources:
             requests:
-              memory: {{ default "1024Mi" $.Values.chainlink.resources.requests.memory }}
-              cpu: {{ default "500m" $.Values.chainlink.resources.requests.cpu }}
+              memory: {{ default "1024Mi" $cfg.resources.requests.memory }}
+              cpu: {{ default "300m" $cfg.resources.requests.cpu }}
             limits:
-              memory: {{ default "1024Mi" $.Values.chainlink.resources.limits.memory }}
-              cpu: {{ default "500m" $.Values.chainlink.resources.limits.cpu }}
+              memory: {{ default "1024Mi" $cfg.resources.limits.memory }}
+              cpu: {{ default "300m" $cfg.resources.limits.cpu }}
           {{ else }}
           {{ end }}
 {{- with $.Values.nodeSelector }}
diff --git a/charts/chainlink-cluster/values.yaml b/charts/chainlink-cluster/values.yaml
index eb93e6cefcf..feba1414444 100644
--- a/charts/chainlink-cluster/values.yaml
+++ b/charts/chainlink-cluster/values.yaml
@@ -25,6 +25,16 @@ chainlink:
   nodes:
     - name: node-1
       image: "public.ecr.aws/chainlink/chainlink:latest"
+      # default resources are 300m/1Gi
+      # first node need more resources to build faster inside container
+      # at least 2Gi of memory is required otherwise build will fail (OOM)
+      resources:
+        requests:
+          cpu: 2000m
+          memory: 2048Mi
+        limits:
+          cpu: 2000m
+          memory: 2048Mi
     # override default config per node
     # for example, use OCRv2 P2P setup, the whole config
     #      toml: |
diff --git a/core/chainlink.devspace.Dockerfile b/core/chainlink.devspace.Dockerfile
index 88d3cec16ad..c639190a80f 100644
--- a/core/chainlink.devspace.Dockerfile
+++ b/core/chainlink.devspace.Dockerfile
@@ -17,6 +17,22 @@ COPY . .
 # Build the golang binary
 RUN make install-chainlink
 
+# Link LOOP Plugin source dirs with simple names
+RUN go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-feeds | xargs -I % ln -s % /chainlink-feeds
+RUN go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-solana | xargs -I % ln -s % /chainlink-solana
+
+# Build image: Plugins
+FROM golang:1.21-bullseye as buildplugins
+RUN go version
+
+WORKDIR /chainlink-feeds
+COPY --from=buildgo /chainlink-feeds .
+RUN go install ./cmd/chainlink-feeds
+
+WORKDIR /chainlink-solana
+COPY --from=buildgo /chainlink-solana .
+RUN go install ./pkg/solana/cmd/chainlink-solana
+
 # Final image: ubuntu with chainlink binary
 FROM golang:1.21-bullseye
 
@@ -32,6 +48,10 @@ RUN curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
 
 COPY --from=buildgo /go/bin/chainlink /usr/local/bin/
 
+# Install (but don't enable) LOOP Plugins
+COPY --from=buildplugins /go/bin/chainlink-feeds /usr/local/bin/
+COPY --from=buildplugins /go/bin/chainlink-solana /usr/local/bin/
+
 # Dependency of CosmWasm/wasmd
 COPY --from=buildgo /go/pkg/mod/github.com/\!cosm\!wasm/wasmvm@v*/internal/api/libwasmvm.*.so /usr/lib/
 RUN chmod 755 /usr/lib/libwasmvm.*.so
diff --git a/integration-tests/load/ocr/README.md b/integration-tests/load/ocr/README.md
index 20446992dc2..61951ba700f 100644
--- a/integration-tests/load/ocr/README.md
+++ b/integration-tests/load/ocr/README.md
@@ -3,15 +3,15 @@
 ## Setup
 These tests can connect to any cluster create with [chainlink-cluster](../../../charts/chainlink-cluster/README.md)
 
-Create your cluster
+Create your cluster, if you already have one just use `kubefwd`
 ```
-kubectl create ns my-cluster
-devspace use namespace my-cluster
+kubectl create ns cl-cluster
+devspace use namespace cl-cluster
 devspace deploy
-sudo kubefwd svc -n my-cluster
+sudo kubefwd svc -n cl-cluster
 ```
 
-Change environment connection configuration [here](connection.toml)
+Change environment connection configuration [here](../../../charts/chainlink-cluster/connect.toml)
 
 If you haven't changed anything in [devspace.yaml](../../../charts/chainlink-cluster/devspace.yaml) then default connection configuration will work
 
diff --git a/integration-tests/load/ocr/ocr_test.go b/integration-tests/load/ocr/ocr_test.go
index 6bf1487125d..13aea441b2a 100644
--- a/integration-tests/load/ocr/ocr_test.go
+++ b/integration-tests/load/ocr/ocr_test.go
@@ -18,7 +18,7 @@ var (
 	}
 )
 
-func TestOCRPerformance(t *testing.T) {
+func TestOCRLoad(t *testing.T) {
 	l := logging.GetTestLogger(t)
 	cc, msClient, cd, bootstrapNode, workerNodes, err := k8s.ConnectRemote(l)
 	require.NoError(t, err)
@@ -46,7 +46,7 @@ func TestOCRPerformance(t *testing.T) {
 	require.NoError(t, err)
 }
 
-func TestOCRCapacity(t *testing.T) {
+func TestOCRVolume(t *testing.T) {
 	l := logging.GetTestLogger(t)
 	cc, msClient, cd, bootstrapNode, workerNodes, err := k8s.ConnectRemote(l)
 	require.NoError(t, err)

From 66653e4bfa681f388c8a08ca12a0c0c99206fe34 Mon Sep 17 00:00:00 2001
From: Jordan Krage <jmank88@gmail.com>
Date: Thu, 7 Dec 2023 08:03:53 -0600
Subject: [PATCH 095/130] bump mockery to v2.38.0 (#11509)

---
 .tool-versions                                |   2 +-
 GNUmakefile                                   |   2 +-
 common/client/mock_head_test.go               |  10 +-
 common/client/mock_node_client_test.go        |  26 +-
 common/client/mock_node_selector_test.go      |  10 +-
 common/client/mock_node_test.go               |  42 +-
 common/client/mock_rpc_test.go                | 102 ++++-
 common/client/mock_send_only_client_test.go   |  10 +-
 common/client/mock_send_only_node_test.go     |  30 +-
 common/headtracker/types/mocks/head.go        |  50 ++-
 common/mocks/head_broadcaster.go              |  26 +-
 common/mocks/head_tracker.go                  |  30 +-
 common/txmgr/mocks/tx_manager.go              |  66 ++-
 common/txmgr/types/mocks/forwarder_manager.go |  30 +-
 common/txmgr/types/mocks/key_store.go         |  14 +-
 .../txmgr/types/mocks/reaper_chain_config.go  |   6 +-
 .../txmgr/types/mocks/tx_attempt_builder.go   |  42 +-
 common/txmgr/types/mocks/tx_store.go          | 202 ++++++++-
 common/txmgr/types/mocks/tx_strategy.go       |  10 +-
 common/types/mocks/head.go                    |  38 +-
 common/types/mocks/head_trackable.go          |   2 +-
 common/types/mocks/subscription.go            |   6 +-
 core/bridges/mocks/orm.go                     |  54 ++-
 core/chains/evm/client/mocks/batch_sender.go  |   6 +-
 core/chains/evm/client/mocks/client.go        | 134 +++++-
 core/chains/evm/client/mocks/tx_sender.go     |  10 +-
 .../evm/config/mocks/chain_scoped_config.go   | 138 +++++-
 core/chains/evm/config/mocks/gas_estimator.go |  78 +++-
 core/chains/evm/forwarders/mocks/orm.go       |  22 +-
 core/chains/evm/gas/mocks/config.go           |  14 +-
 core/chains/evm/gas/mocks/eth_client.go       |   6 +-
 core/chains/evm/gas/mocks/evm_estimator.go    |  38 +-
 .../chains/evm/gas/mocks/evm_fee_estimator.go |  38 +-
 core/chains/evm/gas/mocks/rpc_client.go       |   6 +-
 .../evm/gas/rollups/mocks/eth_client.go       |   6 +-
 .../chains/evm/gas/rollups/mocks/l1_oracle.go |  26 +-
 core/chains/evm/headtracker/mocks/config.go   |  10 +-
 core/chains/evm/log/mocks/abigen_contract.go  |  10 +-
 core/chains/evm/log/mocks/broadcast.go        |  42 +-
 core/chains/evm/log/mocks/broadcaster.go      |  46 +-
 core/chains/evm/logpoller/mocks/log_poller.go | 110 ++++-
 core/chains/evm/mocks/balance_monitor.go      |  26 +-
 core/chains/evm/mocks/node.go                 | 126 +++++-
 core/chains/evm/mocks/send_only_node.go       |  34 +-
 core/chains/evm/txmgr/mocks/config.go         |  22 +-
 core/chains/evm/txmgr/mocks/evm_tx_store.go   | 230 +++++++++-
 core/chains/legacyevm/mocks/chain.go          |  78 +++-
 .../legacyevm/mocks/legacy_chain_container.go |  22 +-
 core/cmd/mocks/prompter.go                    |  14 +-
 core/config/mocks/telemetry_ingress.go        |  42 +-
 .../mocks/telemetry_ingress_endpoint.go       |  18 +-
 core/internal/mocks/application.go            | 122 +++++-
 core/internal/mocks/flags.go                  | 182 +++++++-
 core/internal/mocks/flux_aggregator.go        | 318 +++++++++++++-
 core/internal/mocks/prometheus_backend.go     |   2 +-
 core/logger/logger_mock_test.go               |  22 +-
 core/logger/mocks/logger.go                   |  22 +-
 core/services/blockhashstore/mocks/bhs.go     |  22 +-
 core/services/blockhashstore/mocks/timer.go   |   6 +-
 .../chainlink/mocks/general_config.go         | 154 ++++++-
 .../feeds/mocks/connections_manager.go        |  14 +-
 .../feeds/mocks/feeds_manager_client.go       |  22 +-
 core/services/feeds/mocks/orm.go              | 138 +++++-
 core/services/feeds/mocks/service.go          | 114 ++++-
 .../fluxmonitorv2/mocks/contract_submitter.go |   6 +-
 core/services/fluxmonitorv2/mocks/flags.go    |  18 +-
 .../mocks/key_store_interface.go              |  10 +-
 core/services/fluxmonitorv2/mocks/orm.go      |  26 +-
 .../functions/mocks/bridge_accessor.go        |   6 +-
 .../mocks/external_adapter_client.go          |  10 +-
 .../functions/mocks/functions_listener.go     |  14 +-
 .../functions/mocks/offchain_transmitter.go   |  10 +-
 core/services/functions/mocks/orm.go          |  38 +-
 .../connector/mocks/gateway_connector.go      |  22 +-
 .../mocks/gateway_connector_handler.go        |  10 +-
 .../gateway/connector/mocks/signer.go         |   6 +-
 .../functions/mocks/onchain_allowlist.go      |  18 +-
 .../functions/mocks/onchain_subscriptions.go  |  14 +-
 core/services/gateway/handlers/mocks/don.go   |   6 +-
 .../gateway/handlers/mocks/handler.go         |  18 +-
 .../network/mocks/connection_acceptor.go      |  10 +-
 .../network/mocks/connection_initiator.go     |  10 +-
 .../network/mocks/http_request_handler.go     |   6 +-
 .../gateway/network/mocks/http_server.go      |  14 +-
 .../network/mocks/web_socket_server.go        |  14 +-
 core/services/job/mocks/orm.go                | 102 ++++-
 core/services/job/mocks/service_ctx.go        |  10 +-
 core/services/job/mocks/spawner.go            |  38 +-
 core/services/keystore/mocks/cosmos.go        |  34 +-
 core/services/keystore/mocks/csa.go           |  34 +-
 core/services/keystore/mocks/dkg_encrypt.go   |  34 +-
 core/services/keystore/mocks/dkg_sign.go      |  34 +-
 core/services/keystore/mocks/eth.go           |  82 +++-
 core/services/keystore/mocks/master.go        |  54 ++-
 core/services/keystore/mocks/ocr.go           |  34 +-
 core/services/keystore/mocks/ocr2.go          |  38 +-
 core/services/keystore/mocks/p2p.go           |  38 +-
 core/services/keystore/mocks/solana.go        |  38 +-
 core/services/keystore/mocks/starknet.go      |  34 +-
 core/services/keystore/mocks/vrf.go           |  34 +-
 core/services/mocks/checker.go                |  26 +-
 .../ocr/mocks/ocr_contract_tracker_db.go      |  10 +-
 .../evmregistry/v20/mocks/registry.go         |  18 +-
 .../v21/core/mocks/upkeep_state_reader.go     |   6 +-
 .../evmregistry/v21/mocks/http_client.go      |   6 +-
 .../evmregistry/v21/mocks/registry.go         |  30 +-
 .../ocr2vrf/coordinator/mocks/vrf_beacon.go   | 290 +++++++++++-
 .../mocks/vrf_beacon_coordinator.go           |  22 +-
 .../coordinator/mocks/vrf_coordinator.go      | 414 +++++++++++++++++-
 .../promwrapper/mocks/prometheus_backend.go   |   2 +-
 .../ocr2/plugins/threshold/mocks/decryptor.go |   6 +-
 core/services/pg/mocks/event_broadcaster.go   |  30 +-
 core/services/pg/mocks/subscription.go        |  14 +-
 core/services/pipeline/mocks/config.go        |  22 +-
 core/services/pipeline/mocks/orm.go           |  74 +++-
 .../mocks/pipeline_param_unmarshaler.go       |   6 +-
 core/services/pipeline/mocks/runner.go        |  46 +-
 .../relay/evm/mercury/mocks/async_deleter.go  |   2 +-
 .../relay/evm/mocks/loop_relay_adapter.go     |  46 +-
 .../relay/evm/mocks/request_round_db.go       |  10 +-
 .../evm/types/mocks/log_poller_wrapper.go     |  26 +-
 core/services/s4/mocks/orm.go                 |  22 +-
 core/services/s4/mocks/storage.go             |  18 +-
 .../mocks/telemetry_service.go                |  22 +-
 .../vrf/mocks/aggregator_v3_interface.go      |  26 +-
 core/services/vrf/mocks/config.go             |  10 +-
 core/services/vrf/mocks/fee_config.go         |  14 +-
 core/services/vrf/mocks/vrf_coordinator_v2.go | 334 +++++++++++++-
 .../mocks/external_initiator_manager.go       |  14 +-
 core/services/webhook/mocks/http_client.go    |   6 +-
 core/sessions/ldapauth/mocks/ldap_client.go   |   6 +-
 core/sessions/ldapauth/mocks/ldap_conn.go     |  14 +-
 .../sessions/mocks/authentication_provider.go |  78 +++-
 core/sessions/mocks/basic_admin_users_orm.go  |  14 +-
 134 files changed, 5774 insertions(+), 134 deletions(-)

diff --git a/.tool-versions b/.tool-versions
index c60396ccb86..d78ce677cda 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,5 +1,5 @@
 golang 1.21.4
-mockery 2.35.4
+mockery 2.38.0
 nodejs 16.16.0
 postgres 13.3
 helm 3.10.3
diff --git a/GNUmakefile b/GNUmakefile
index 6cd5ab7143e..7d0753911a3 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -112,7 +112,7 @@ presubmit: ## Format go files and imports.
 
 .PHONY: mockery
 mockery: $(mockery) ## Install mockery.
-	go install github.com/vektra/mockery/v2@v2.35.4
+	go install github.com/vektra/mockery/v2@v2.38.0
 
 .PHONY: codecgen
 codecgen: $(codecgen) ## Install codecgen
diff --git a/common/client/mock_head_test.go b/common/client/mock_head_test.go
index 1b69eedf438..747770480f5 100644
--- a/common/client/mock_head_test.go
+++ b/common/client/mock_head_test.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package client
 
@@ -17,6 +17,10 @@ type mockHead struct {
 func (_m *mockHead) BlockDifficulty() *big.Int {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockDifficulty")
+	}
+
 	var r0 *big.Int
 	if rf, ok := ret.Get(0).(func() *big.Int); ok {
 		r0 = rf()
@@ -33,6 +37,10 @@ func (_m *mockHead) BlockDifficulty() *big.Int {
 func (_m *mockHead) BlockNumber() int64 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockNumber")
+	}
+
 	var r0 int64
 	if rf, ok := ret.Get(0).(func() int64); ok {
 		r0 = rf()
diff --git a/common/client/mock_node_client_test.go b/common/client/mock_node_client_test.go
index 7c8eb69171f..661ad68ede5 100644
--- a/common/client/mock_node_client_test.go
+++ b/common/client/mock_node_client_test.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package client
 
@@ -18,6 +18,10 @@ type mockNodeClient[CHAIN_ID types.ID, HEAD Head] struct {
 func (_m *mockNodeClient[CHAIN_ID, HEAD]) ChainID(ctx context.Context) (CHAIN_ID, error) {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChainID")
+	}
+
 	var r0 CHAIN_ID
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (CHAIN_ID, error)); ok {
@@ -42,6 +46,10 @@ func (_m *mockNodeClient[CHAIN_ID, HEAD]) ChainID(ctx context.Context) (CHAIN_ID
 func (_m *mockNodeClient[CHAIN_ID, HEAD]) ClientVersion(_a0 context.Context) (string, error) {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ClientVersion")
+	}
+
 	var r0 string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (string, error)); ok {
@@ -71,6 +79,10 @@ func (_m *mockNodeClient[CHAIN_ID, HEAD]) Close() {
 func (_m *mockNodeClient[CHAIN_ID, HEAD]) Dial(ctx context.Context) error {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Dial")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(ctx)
@@ -85,6 +97,10 @@ func (_m *mockNodeClient[CHAIN_ID, HEAD]) Dial(ctx context.Context) error {
 func (_m *mockNodeClient[CHAIN_ID, HEAD]) DialHTTP() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for DialHTTP")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -112,6 +128,10 @@ func (_m *mockNodeClient[CHAIN_ID, HEAD]) Subscribe(ctx context.Context, channel
 	_ca = append(_ca, args...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Subscribe")
+	}
+
 	var r0 types.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, chan<- HEAD, ...interface{}) (types.Subscription, error)); ok {
@@ -138,6 +158,10 @@ func (_m *mockNodeClient[CHAIN_ID, HEAD]) Subscribe(ctx context.Context, channel
 func (_m *mockNodeClient[CHAIN_ID, HEAD]) SubscribersCount() int32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for SubscribersCount")
+	}
+
 	var r0 int32
 	if rf, ok := ret.Get(0).(func() int32); ok {
 		r0 = rf()
diff --git a/common/client/mock_node_selector_test.go b/common/client/mock_node_selector_test.go
index e7b8d9ecb8d..bd0805fa4e6 100644
--- a/common/client/mock_node_selector_test.go
+++ b/common/client/mock_node_selector_test.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package client
 
@@ -16,6 +16,10 @@ type mockNodeSelector[CHAIN_ID types.ID, HEAD Head, RPC NodeClient[CHAIN_ID, HEA
 func (_m *mockNodeSelector[CHAIN_ID, HEAD, RPC]) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -30,6 +34,10 @@ func (_m *mockNodeSelector[CHAIN_ID, HEAD, RPC]) Name() string {
 func (_m *mockNodeSelector[CHAIN_ID, HEAD, RPC]) Select() Node[CHAIN_ID, HEAD, RPC] {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Select")
+	}
+
 	var r0 Node[CHAIN_ID, HEAD, RPC]
 	if rf, ok := ret.Get(0).(func() Node[CHAIN_ID, HEAD, RPC]); ok {
 		r0 = rf()
diff --git a/common/client/mock_node_test.go b/common/client/mock_node_test.go
index ea0e7d1a120..56132b2cee8 100644
--- a/common/client/mock_node_test.go
+++ b/common/client/mock_node_test.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package client
 
@@ -20,6 +20,10 @@ type mockNode[CHAIN_ID types.ID, HEAD Head, RPC NodeClient[CHAIN_ID, HEAD]] stru
 func (_m *mockNode[CHAIN_ID, HEAD, RPC]) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -34,6 +38,10 @@ func (_m *mockNode[CHAIN_ID, HEAD, RPC]) Close() error {
 func (_m *mockNode[CHAIN_ID, HEAD, RPC]) ConfiguredChainID() CHAIN_ID {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ConfiguredChainID")
+	}
+
 	var r0 CHAIN_ID
 	if rf, ok := ret.Get(0).(func() CHAIN_ID); ok {
 		r0 = rf()
@@ -48,6 +56,10 @@ func (_m *mockNode[CHAIN_ID, HEAD, RPC]) ConfiguredChainID() CHAIN_ID {
 func (_m *mockNode[CHAIN_ID, HEAD, RPC]) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -62,6 +74,10 @@ func (_m *mockNode[CHAIN_ID, HEAD, RPC]) Name() string {
 func (_m *mockNode[CHAIN_ID, HEAD, RPC]) Order() int32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Order")
+	}
+
 	var r0 int32
 	if rf, ok := ret.Get(0).(func() int32); ok {
 		r0 = rf()
@@ -76,6 +92,10 @@ func (_m *mockNode[CHAIN_ID, HEAD, RPC]) Order() int32 {
 func (_m *mockNode[CHAIN_ID, HEAD, RPC]) RPC() RPC {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for RPC")
+	}
+
 	var r0 RPC
 	if rf, ok := ret.Get(0).(func() RPC); ok {
 		r0 = rf()
@@ -90,6 +110,10 @@ func (_m *mockNode[CHAIN_ID, HEAD, RPC]) RPC() RPC {
 func (_m *mockNode[CHAIN_ID, HEAD, RPC]) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
@@ -104,6 +128,10 @@ func (_m *mockNode[CHAIN_ID, HEAD, RPC]) Start(_a0 context.Context) error {
 func (_m *mockNode[CHAIN_ID, HEAD, RPC]) State() nodeState {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for State")
+	}
+
 	var r0 nodeState
 	if rf, ok := ret.Get(0).(func() nodeState); ok {
 		r0 = rf()
@@ -118,6 +146,10 @@ func (_m *mockNode[CHAIN_ID, HEAD, RPC]) State() nodeState {
 func (_m *mockNode[CHAIN_ID, HEAD, RPC]) StateAndLatest() (nodeState, int64, *big.Int) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for StateAndLatest")
+	}
+
 	var r0 nodeState
 	var r1 int64
 	var r2 *big.Int
@@ -151,6 +183,10 @@ func (_m *mockNode[CHAIN_ID, HEAD, RPC]) StateAndLatest() (nodeState, int64, *bi
 func (_m *mockNode[CHAIN_ID, HEAD, RPC]) String() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for String")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -165,6 +201,10 @@ func (_m *mockNode[CHAIN_ID, HEAD, RPC]) String() string {
 func (_m *mockNode[CHAIN_ID, HEAD, RPC]) SubscribersCount() int32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for SubscribersCount")
+	}
+
 	var r0 int32
 	if rf, ok := ret.Get(0).(func() int32); ok {
 		r0 = rf()
diff --git a/common/client/mock_rpc_test.go b/common/client/mock_rpc_test.go
index d5e8db82836..d87a02d47c1 100644
--- a/common/client/mock_rpc_test.go
+++ b/common/client/mock_rpc_test.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package client
 
@@ -25,6 +25,10 @@ type mockRPC[CHAIN_ID types.ID, SEQ types.Sequence, ADDR types.Hashable, BLOCK_H
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) BalanceAt(ctx context.Context, accountAddress ADDR, blockNumber *big.Int) (*big.Int, error) {
 	ret := _m.Called(ctx, accountAddress, blockNumber)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BalanceAt")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR, *big.Int) (*big.Int, error)); ok {
@@ -51,6 +55,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) BatchCallContext(ctx context.Context, b []interface{}) error {
 	ret := _m.Called(ctx, b)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BatchCallContext")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, []interface{}) error); ok {
 		r0 = rf(ctx, b)
@@ -65,6 +73,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) BlockByHash(ctx context.Context, hash BLOCK_HASH) (HEAD, error) {
 	ret := _m.Called(ctx, hash)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockByHash")
+	}
+
 	var r0 HEAD
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, BLOCK_HASH) (HEAD, error)); ok {
@@ -89,6 +101,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) BlockByNumber(ctx context.Context, number *big.Int) (HEAD, error) {
 	ret := _m.Called(ctx, number)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockByNumber")
+	}
+
 	var r0 HEAD
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) (HEAD, error)); ok {
@@ -116,6 +132,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 	_ca = append(_ca, args...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CallContext")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, interface{}, string, ...interface{}) error); ok {
 		r0 = rf(ctx, result, method, args...)
@@ -130,6 +150,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) CallContract(ctx context.Context, msg interface{}, blockNumber *big.Int) ([]byte, error) {
 	ret := _m.Called(ctx, msg, blockNumber)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CallContract")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, interface{}, *big.Int) ([]byte, error)); ok {
@@ -156,6 +180,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) ChainID(ctx context.Context) (CHAIN_ID, error) {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChainID")
+	}
+
 	var r0 CHAIN_ID
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (CHAIN_ID, error)); ok {
@@ -180,6 +208,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) ClientVersion(_a0 context.Context) (string, error) {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ClientVersion")
+	}
+
 	var r0 string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (string, error)); ok {
@@ -209,6 +241,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) CodeAt(ctx context.Context, account ADDR, blockNumber *big.Int) ([]byte, error) {
 	ret := _m.Called(ctx, account, blockNumber)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CodeAt")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR, *big.Int) ([]byte, error)); ok {
@@ -235,6 +271,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) Dial(ctx context.Context) error {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Dial")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(ctx)
@@ -249,6 +289,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) DialHTTP() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for DialHTTP")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -268,6 +312,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) EstimateGas(ctx context.Context, call interface{}) (uint64, error) {
 	ret := _m.Called(ctx, call)
 
+	if len(ret) == 0 {
+		panic("no return value specified for EstimateGas")
+	}
+
 	var r0 uint64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, interface{}) (uint64, error)); ok {
@@ -292,6 +340,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) FilterEvents(ctx context.Context, query EVENT_OPS) ([]EVENT, error) {
 	ret := _m.Called(ctx, query)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterEvents")
+	}
+
 	var r0 []EVENT
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, EVENT_OPS) ([]EVENT, error)); ok {
@@ -318,6 +370,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) LINKBalance(ctx context.Context, accountAddress ADDR, linkAddress ADDR) (*assets.Link, error) {
 	ret := _m.Called(ctx, accountAddress, linkAddress)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LINKBalance")
+	}
+
 	var r0 *assets.Link
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR, ADDR) (*assets.Link, error)); ok {
@@ -344,6 +400,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) LatestBlockHeight(_a0 context.Context) (*big.Int, error) {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestBlockHeight")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (*big.Int, error)); ok {
@@ -370,6 +430,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) PendingSequenceAt(ctx context.Context, addr ADDR) (SEQ, error) {
 	ret := _m.Called(ctx, addr)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PendingSequenceAt")
+	}
+
 	var r0 SEQ
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR) (SEQ, error)); ok {
@@ -394,6 +458,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) SendEmptyTransaction(ctx context.Context, newTxAttempt func(SEQ, uint32, FEE, ADDR) (interface{}, error), seq SEQ, gasLimit uint32, fee FEE, fromAddress ADDR) (string, error) {
 	ret := _m.Called(ctx, newTxAttempt, seq, gasLimit, fee, fromAddress)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendEmptyTransaction")
+	}
+
 	var r0 string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, func(SEQ, uint32, FEE, ADDR) (interface{}, error), SEQ, uint32, FEE, ADDR) (string, error)); ok {
@@ -418,6 +486,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) SendTransaction(ctx context.Context, tx TX) error {
 	ret := _m.Called(ctx, tx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendTransaction")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, TX) error); ok {
 		r0 = rf(ctx, tx)
@@ -432,6 +504,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) SequenceAt(ctx context.Context, accountAddress ADDR, blockNumber *big.Int) (SEQ, error) {
 	ret := _m.Called(ctx, accountAddress, blockNumber)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SequenceAt")
+	}
+
 	var r0 SEQ
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR, *big.Int) (SEQ, error)); ok {
@@ -461,6 +537,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) SimulateTransaction(ctx context.Context, tx TX) error {
 	ret := _m.Called(ctx, tx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SimulateTransaction")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, TX) error); ok {
 		r0 = rf(ctx, tx)
@@ -478,6 +558,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 	_ca = append(_ca, args...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Subscribe")
+	}
+
 	var r0 types.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, chan<- HEAD, ...interface{}) (types.Subscription, error)); ok {
@@ -504,6 +588,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) SubscribersCount() int32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for SubscribersCount")
+	}
+
 	var r0 int32
 	if rf, ok := ret.Get(0).(func() int32); ok {
 		r0 = rf()
@@ -518,6 +606,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) TokenBalance(ctx context.Context, accountAddress ADDR, tokenAddress ADDR) (*big.Int, error) {
 	ret := _m.Called(ctx, accountAddress, tokenAddress)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TokenBalance")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR, ADDR) (*big.Int, error)); ok {
@@ -544,6 +636,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) TransactionByHash(ctx context.Context, txHash TX_HASH) (TX, error) {
 	ret := _m.Called(ctx, txHash)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransactionByHash")
+	}
+
 	var r0 TX
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, TX_HASH) (TX, error)); ok {
@@ -568,6 +664,10 @@ func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS
 func (_m *mockRPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD]) TransactionReceipt(ctx context.Context, txHash TX_HASH) (TX_RECEIPT, error) {
 	ret := _m.Called(ctx, txHash)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransactionReceipt")
+	}
+
 	var r0 TX_RECEIPT
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, TX_HASH) (TX_RECEIPT, error)); ok {
diff --git a/common/client/mock_send_only_client_test.go b/common/client/mock_send_only_client_test.go
index 481b2602ea3..b667a2ceb59 100644
--- a/common/client/mock_send_only_client_test.go
+++ b/common/client/mock_send_only_client_test.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package client
 
@@ -18,6 +18,10 @@ type mockSendOnlyClient[CHAIN_ID types.ID] struct {
 func (_m *mockSendOnlyClient[CHAIN_ID]) ChainID(_a0 context.Context) (CHAIN_ID, error) {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChainID")
+	}
+
 	var r0 CHAIN_ID
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (CHAIN_ID, error)); ok {
@@ -47,6 +51,10 @@ func (_m *mockSendOnlyClient[CHAIN_ID]) Close() {
 func (_m *mockSendOnlyClient[CHAIN_ID]) DialHTTP() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for DialHTTP")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
diff --git a/common/client/mock_send_only_node_test.go b/common/client/mock_send_only_node_test.go
index 524d7d8a6c5..0a319db5f78 100644
--- a/common/client/mock_send_only_node_test.go
+++ b/common/client/mock_send_only_node_test.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package client
 
@@ -18,6 +18,10 @@ type mockSendOnlyNode[CHAIN_ID types.ID, RPC sendOnlyClient[CHAIN_ID]] struct {
 func (_m *mockSendOnlyNode[CHAIN_ID, RPC]) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -32,6 +36,10 @@ func (_m *mockSendOnlyNode[CHAIN_ID, RPC]) Close() error {
 func (_m *mockSendOnlyNode[CHAIN_ID, RPC]) ConfiguredChainID() CHAIN_ID {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ConfiguredChainID")
+	}
+
 	var r0 CHAIN_ID
 	if rf, ok := ret.Get(0).(func() CHAIN_ID); ok {
 		r0 = rf()
@@ -46,6 +54,10 @@ func (_m *mockSendOnlyNode[CHAIN_ID, RPC]) ConfiguredChainID() CHAIN_ID {
 func (_m *mockSendOnlyNode[CHAIN_ID, RPC]) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -60,6 +72,10 @@ func (_m *mockSendOnlyNode[CHAIN_ID, RPC]) Name() string {
 func (_m *mockSendOnlyNode[CHAIN_ID, RPC]) RPC() RPC {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for RPC")
+	}
+
 	var r0 RPC
 	if rf, ok := ret.Get(0).(func() RPC); ok {
 		r0 = rf()
@@ -74,6 +90,10 @@ func (_m *mockSendOnlyNode[CHAIN_ID, RPC]) RPC() RPC {
 func (_m *mockSendOnlyNode[CHAIN_ID, RPC]) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
@@ -88,6 +108,10 @@ func (_m *mockSendOnlyNode[CHAIN_ID, RPC]) Start(_a0 context.Context) error {
 func (_m *mockSendOnlyNode[CHAIN_ID, RPC]) State() nodeState {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for State")
+	}
+
 	var r0 nodeState
 	if rf, ok := ret.Get(0).(func() nodeState); ok {
 		r0 = rf()
@@ -102,6 +126,10 @@ func (_m *mockSendOnlyNode[CHAIN_ID, RPC]) State() nodeState {
 func (_m *mockSendOnlyNode[CHAIN_ID, RPC]) String() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for String")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
diff --git a/common/headtracker/types/mocks/head.go b/common/headtracker/types/mocks/head.go
index 79c483c9978..f86df1d7fce 100644
--- a/common/headtracker/types/mocks/head.go
+++ b/common/headtracker/types/mocks/head.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -21,6 +21,10 @@ type Head[BLOCK_HASH types.Hashable, CHAIN_ID types.ID] struct {
 func (_m *Head[BLOCK_HASH, CHAIN_ID]) BlockDifficulty() *big.Int {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockDifficulty")
+	}
+
 	var r0 *big.Int
 	if rf, ok := ret.Get(0).(func() *big.Int); ok {
 		r0 = rf()
@@ -37,6 +41,10 @@ func (_m *Head[BLOCK_HASH, CHAIN_ID]) BlockDifficulty() *big.Int {
 func (_m *Head[BLOCK_HASH, CHAIN_ID]) BlockHash() BLOCK_HASH {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockHash")
+	}
+
 	var r0 BLOCK_HASH
 	if rf, ok := ret.Get(0).(func() BLOCK_HASH); ok {
 		r0 = rf()
@@ -51,6 +59,10 @@ func (_m *Head[BLOCK_HASH, CHAIN_ID]) BlockHash() BLOCK_HASH {
 func (_m *Head[BLOCK_HASH, CHAIN_ID]) BlockNumber() int64 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockNumber")
+	}
+
 	var r0 int64
 	if rf, ok := ret.Get(0).(func() int64); ok {
 		r0 = rf()
@@ -65,6 +77,10 @@ func (_m *Head[BLOCK_HASH, CHAIN_ID]) BlockNumber() int64 {
 func (_m *Head[BLOCK_HASH, CHAIN_ID]) ChainID() CHAIN_ID {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChainID")
+	}
+
 	var r0 CHAIN_ID
 	if rf, ok := ret.Get(0).(func() CHAIN_ID); ok {
 		r0 = rf()
@@ -79,6 +95,10 @@ func (_m *Head[BLOCK_HASH, CHAIN_ID]) ChainID() CHAIN_ID {
 func (_m *Head[BLOCK_HASH, CHAIN_ID]) ChainLength() uint32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChainLength")
+	}
+
 	var r0 uint32
 	if rf, ok := ret.Get(0).(func() uint32); ok {
 		r0 = rf()
@@ -93,6 +113,10 @@ func (_m *Head[BLOCK_HASH, CHAIN_ID]) ChainLength() uint32 {
 func (_m *Head[BLOCK_HASH, CHAIN_ID]) EarliestHeadInChain() types.Head[BLOCK_HASH] {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EarliestHeadInChain")
+	}
+
 	var r0 types.Head[BLOCK_HASH]
 	if rf, ok := ret.Get(0).(func() types.Head[BLOCK_HASH]); ok {
 		r0 = rf()
@@ -109,6 +133,10 @@ func (_m *Head[BLOCK_HASH, CHAIN_ID]) EarliestHeadInChain() types.Head[BLOCK_HAS
 func (_m *Head[BLOCK_HASH, CHAIN_ID]) GetParent() types.Head[BLOCK_HASH] {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetParent")
+	}
+
 	var r0 types.Head[BLOCK_HASH]
 	if rf, ok := ret.Get(0).(func() types.Head[BLOCK_HASH]); ok {
 		r0 = rf()
@@ -125,6 +153,10 @@ func (_m *Head[BLOCK_HASH, CHAIN_ID]) GetParent() types.Head[BLOCK_HASH] {
 func (_m *Head[BLOCK_HASH, CHAIN_ID]) GetParentHash() BLOCK_HASH {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetParentHash")
+	}
+
 	var r0 BLOCK_HASH
 	if rf, ok := ret.Get(0).(func() BLOCK_HASH); ok {
 		r0 = rf()
@@ -139,6 +171,10 @@ func (_m *Head[BLOCK_HASH, CHAIN_ID]) GetParentHash() BLOCK_HASH {
 func (_m *Head[BLOCK_HASH, CHAIN_ID]) GetTimestamp() time.Time {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTimestamp")
+	}
+
 	var r0 time.Time
 	if rf, ok := ret.Get(0).(func() time.Time); ok {
 		r0 = rf()
@@ -153,6 +189,10 @@ func (_m *Head[BLOCK_HASH, CHAIN_ID]) GetTimestamp() time.Time {
 func (_m *Head[BLOCK_HASH, CHAIN_ID]) HasChainID() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HasChainID")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -167,6 +207,10 @@ func (_m *Head[BLOCK_HASH, CHAIN_ID]) HasChainID() bool {
 func (_m *Head[BLOCK_HASH, CHAIN_ID]) HashAtHeight(blockNum int64) BLOCK_HASH {
 	ret := _m.Called(blockNum)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HashAtHeight")
+	}
+
 	var r0 BLOCK_HASH
 	if rf, ok := ret.Get(0).(func(int64) BLOCK_HASH); ok {
 		r0 = rf(blockNum)
@@ -181,6 +225,10 @@ func (_m *Head[BLOCK_HASH, CHAIN_ID]) HashAtHeight(blockNum int64) BLOCK_HASH {
 func (_m *Head[BLOCK_HASH, CHAIN_ID]) IsValid() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsValid")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
diff --git a/common/mocks/head_broadcaster.go b/common/mocks/head_broadcaster.go
index 12036f67843..265fceae91e 100644
--- a/common/mocks/head_broadcaster.go
+++ b/common/mocks/head_broadcaster.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -23,6 +23,10 @@ func (_m *HeadBroadcaster[H, BLOCK_HASH]) BroadcastNewLongestChain(_a0 H) {
 func (_m *HeadBroadcaster[H, BLOCK_HASH]) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -37,6 +41,10 @@ func (_m *HeadBroadcaster[H, BLOCK_HASH]) Close() error {
 func (_m *HeadBroadcaster[H, BLOCK_HASH]) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -53,6 +61,10 @@ func (_m *HeadBroadcaster[H, BLOCK_HASH]) HealthReport() map[string]error {
 func (_m *HeadBroadcaster[H, BLOCK_HASH]) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -67,6 +79,10 @@ func (_m *HeadBroadcaster[H, BLOCK_HASH]) Name() string {
 func (_m *HeadBroadcaster[H, BLOCK_HASH]) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -81,6 +97,10 @@ func (_m *HeadBroadcaster[H, BLOCK_HASH]) Ready() error {
 func (_m *HeadBroadcaster[H, BLOCK_HASH]) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
@@ -95,6 +115,10 @@ func (_m *HeadBroadcaster[H, BLOCK_HASH]) Start(_a0 context.Context) error {
 func (_m *HeadBroadcaster[H, BLOCK_HASH]) Subscribe(callback types.HeadTrackable[H, BLOCK_HASH]) (H, func()) {
 	ret := _m.Called(callback)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Subscribe")
+	}
+
 	var r0 H
 	var r1 func()
 	if rf, ok := ret.Get(0).(func(types.HeadTrackable[H, BLOCK_HASH]) (H, func())); ok {
diff --git a/common/mocks/head_tracker.go b/common/mocks/head_tracker.go
index 2a1f64eeeb7..83ee54b1847 100644
--- a/common/mocks/head_tracker.go
+++ b/common/mocks/head_tracker.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type HeadTracker[H types.Head[BLOCK_HASH], BLOCK_HASH types.Hashable] struct {
 func (_m *HeadTracker[H, BLOCK_HASH]) Backfill(ctx context.Context, headWithChain H, depth uint) error {
 	ret := _m.Called(ctx, headWithChain, depth)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Backfill")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, H, uint) error); ok {
 		r0 = rf(ctx, headWithChain, depth)
@@ -32,6 +36,10 @@ func (_m *HeadTracker[H, BLOCK_HASH]) Backfill(ctx context.Context, headWithChai
 func (_m *HeadTracker[H, BLOCK_HASH]) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -46,6 +54,10 @@ func (_m *HeadTracker[H, BLOCK_HASH]) Close() error {
 func (_m *HeadTracker[H, BLOCK_HASH]) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -62,6 +74,10 @@ func (_m *HeadTracker[H, BLOCK_HASH]) HealthReport() map[string]error {
 func (_m *HeadTracker[H, BLOCK_HASH]) LatestChain() H {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestChain")
+	}
+
 	var r0 H
 	if rf, ok := ret.Get(0).(func() H); ok {
 		r0 = rf()
@@ -76,6 +92,10 @@ func (_m *HeadTracker[H, BLOCK_HASH]) LatestChain() H {
 func (_m *HeadTracker[H, BLOCK_HASH]) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -90,6 +110,10 @@ func (_m *HeadTracker[H, BLOCK_HASH]) Name() string {
 func (_m *HeadTracker[H, BLOCK_HASH]) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -104,6 +128,10 @@ func (_m *HeadTracker[H, BLOCK_HASH]) Ready() error {
 func (_m *HeadTracker[H, BLOCK_HASH]) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/common/txmgr/mocks/tx_manager.go b/common/txmgr/mocks/tx_manager.go
index 27077218f6e..45a3675aced 100644
--- a/common/txmgr/mocks/tx_manager.go
+++ b/common/txmgr/mocks/tx_manager.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -27,6 +27,10 @@ type TxManager[CHAIN_ID types.ID, HEAD types.Head[BLOCK_HASH], ADDR types.Hashab
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -41,6 +45,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Close(
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) CountTransactionsByState(ctx context.Context, state txmgrtypes.TxState) (uint32, error) {
 	ret := _m.Called(ctx, state)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountTransactionsByState")
+	}
+
 	var r0 uint32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, txmgrtypes.TxState) (uint32, error)); ok {
@@ -65,6 +73,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) CountT
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) CreateTransaction(ctx context.Context, txRequest txmgrtypes.TxRequest[ADDR, TX_HASH]) (txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, txRequest)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateTransaction")
+	}
+
 	var r0 txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, txmgrtypes.TxRequest[ADDR, TX_HASH]) (txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -89,6 +101,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Create
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindEarliestUnconfirmedBroadcastTime(ctx context.Context) (null.Time, error) {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindEarliestUnconfirmedBroadcastTime")
+	}
+
 	var r0 null.Time
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (null.Time, error)); ok {
@@ -113,6 +129,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindEa
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindEarliestUnconfirmedTxAttemptBlock(ctx context.Context) (null.Int, error) {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindEarliestUnconfirmedTxAttemptBlock")
+	}
+
 	var r0 null.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (null.Int, error)); ok {
@@ -137,6 +157,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindEa
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindTxesByMetaFieldAndStates(ctx context.Context, metaField string, metaValue string, states []txmgrtypes.TxState, chainID *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, metaField, metaValue, states, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxesByMetaFieldAndStates")
+	}
+
 	var r0 []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, string, []txmgrtypes.TxState, *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -163,6 +187,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindTx
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindTxesWithAttemptsAndReceiptsByIdsAndState(ctx context.Context, ids []big.Int, states []txmgrtypes.TxState, chainID *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, ids, states, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxesWithAttemptsAndReceiptsByIdsAndState")
+	}
+
 	var r0 []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, []big.Int, []txmgrtypes.TxState, *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -189,6 +217,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindTx
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindTxesWithMetaFieldByReceiptBlockNum(ctx context.Context, metaField string, blockNum int64, chainID *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, metaField, blockNum, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxesWithMetaFieldByReceiptBlockNum")
+	}
+
 	var r0 []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, int64, *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -215,6 +247,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindTx
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindTxesWithMetaFieldByStates(ctx context.Context, metaField string, states []txmgrtypes.TxState, chainID *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, metaField, states, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxesWithMetaFieldByStates")
+	}
+
 	var r0 []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, []txmgrtypes.TxState, *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -241,6 +277,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) FindTx
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) GetForwarderForEOA(eoa ADDR) (ADDR, error) {
 	ret := _m.Called(eoa)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetForwarderForEOA")
+	}
+
 	var r0 ADDR
 	var r1 error
 	if rf, ok := ret.Get(0).(func(ADDR) (ADDR, error)); ok {
@@ -265,6 +305,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) GetFor
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -281,6 +325,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Health
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -300,6 +348,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) OnNewL
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -319,6 +371,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Regist
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Reset(addr ADDR, abandon bool) error {
 	ret := _m.Called(addr, abandon)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Reset")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(ADDR, bool) error); ok {
 		r0 = rf(addr, abandon)
@@ -333,6 +389,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Reset(
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) SendNativeToken(ctx context.Context, chainID CHAIN_ID, from ADDR, to ADDR, value big.Int, gasLimit uint32) (txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, chainID, from, to, value, gasLimit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendNativeToken")
+	}
+
 	var r0 txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, CHAIN_ID, ADDR, ADDR, big.Int, uint32) (txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -357,6 +417,10 @@ func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) SendNa
 func (_m *TxManager[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/common/txmgr/types/mocks/forwarder_manager.go b/common/txmgr/types/mocks/forwarder_manager.go
index abf176550b2..bf61d0c3d27 100644
--- a/common/txmgr/types/mocks/forwarder_manager.go
+++ b/common/txmgr/types/mocks/forwarder_manager.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -19,6 +19,10 @@ type ForwarderManager[ADDR types.Hashable] struct {
 func (_m *ForwarderManager[ADDR]) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -33,6 +37,10 @@ func (_m *ForwarderManager[ADDR]) Close() error {
 func (_m *ForwarderManager[ADDR]) ConvertPayload(dest ADDR, origPayload []byte) ([]byte, error) {
 	ret := _m.Called(dest, origPayload)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ConvertPayload")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(ADDR, []byte) ([]byte, error)); ok {
@@ -59,6 +67,10 @@ func (_m *ForwarderManager[ADDR]) ConvertPayload(dest ADDR, origPayload []byte)
 func (_m *ForwarderManager[ADDR]) ForwarderFor(addr ADDR) (ADDR, error) {
 	ret := _m.Called(addr)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ForwarderFor")
+	}
+
 	var r0 ADDR
 	var r1 error
 	if rf, ok := ret.Get(0).(func(ADDR) (ADDR, error)); ok {
@@ -83,6 +95,10 @@ func (_m *ForwarderManager[ADDR]) ForwarderFor(addr ADDR) (ADDR, error) {
 func (_m *ForwarderManager[ADDR]) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -99,6 +115,10 @@ func (_m *ForwarderManager[ADDR]) HealthReport() map[string]error {
 func (_m *ForwarderManager[ADDR]) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -113,6 +133,10 @@ func (_m *ForwarderManager[ADDR]) Name() string {
 func (_m *ForwarderManager[ADDR]) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -127,6 +151,10 @@ func (_m *ForwarderManager[ADDR]) Ready() error {
 func (_m *ForwarderManager[ADDR]) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/common/txmgr/types/mocks/key_store.go b/common/txmgr/types/mocks/key_store.go
index ad5178c09d1..d440528a41d 100644
--- a/common/txmgr/types/mocks/key_store.go
+++ b/common/txmgr/types/mocks/key_store.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type KeyStore[ADDR types.Hashable, CHAIN_ID types.ID, SEQ types.Sequence] struct
 func (_m *KeyStore[ADDR, CHAIN_ID, SEQ]) CheckEnabled(address ADDR, chainID CHAIN_ID) error {
 	ret := _m.Called(address, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CheckEnabled")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(ADDR, CHAIN_ID) error); ok {
 		r0 = rf(address, chainID)
@@ -31,6 +35,10 @@ func (_m *KeyStore[ADDR, CHAIN_ID, SEQ]) CheckEnabled(address ADDR, chainID CHAI
 func (_m *KeyStore[ADDR, CHAIN_ID, SEQ]) EnabledAddressesForChain(chainId CHAIN_ID) ([]ADDR, error) {
 	ret := _m.Called(chainId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnabledAddressesForChain")
+	}
+
 	var r0 []ADDR
 	var r1 error
 	if rf, ok := ret.Get(0).(func(CHAIN_ID) ([]ADDR, error)); ok {
@@ -57,6 +65,10 @@ func (_m *KeyStore[ADDR, CHAIN_ID, SEQ]) EnabledAddressesForChain(chainId CHAIN_
 func (_m *KeyStore[ADDR, CHAIN_ID, SEQ]) SubscribeToKeyChanges() (chan struct{}, func()) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for SubscribeToKeyChanges")
+	}
+
 	var r0 chan struct{}
 	var r1 func()
 	if rf, ok := ret.Get(0).(func() (chan struct{}, func())); ok {
diff --git a/common/txmgr/types/mocks/reaper_chain_config.go b/common/txmgr/types/mocks/reaper_chain_config.go
index a733b223701..041214b80c6 100644
--- a/common/txmgr/types/mocks/reaper_chain_config.go
+++ b/common/txmgr/types/mocks/reaper_chain_config.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -13,6 +13,10 @@ type ReaperConfig struct {
 func (_m *ReaperConfig) FinalityDepth() uint32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for FinalityDepth")
+	}
+
 	var r0 uint32
 	if rf, ok := ret.Get(0).(func() uint32); ok {
 		r0 = rf()
diff --git a/common/txmgr/types/mocks/tx_attempt_builder.go b/common/txmgr/types/mocks/tx_attempt_builder.go
index 0f3d3e3fba1..b3b6ff761fb 100644
--- a/common/txmgr/types/mocks/tx_attempt_builder.go
+++ b/common/txmgr/types/mocks/tx_attempt_builder.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -24,6 +24,10 @@ type TxAttemptBuilder[CHAIN_ID types.ID, HEAD types.Head[BLOCK_HASH], ADDR types
 func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -38,6 +42,10 @@ func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE])
 func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -54,6 +62,10 @@ func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE])
 func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -68,6 +80,10 @@ func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE])
 func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) NewBumpTxAttempt(ctx context.Context, tx txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], previousAttempt txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], priorAttempts []txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], lggr logger.Logger) (txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], FEE, uint32, bool, error) {
 	ret := _m.Called(ctx, tx, previousAttempt, priorAttempts, lggr)
 
+	if len(ret) == 0 {
+		panic("no return value specified for NewBumpTxAttempt")
+	}
+
 	var r0 txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 FEE
 	var r2 uint32
@@ -113,6 +129,10 @@ func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE])
 func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) NewCustomTxAttempt(tx txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], fee FEE, gasLimit uint32, txType int, lggr logger.Logger) (txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], bool, error) {
 	ret := _m.Called(tx, fee, gasLimit, txType, lggr)
 
+	if len(ret) == 0 {
+		panic("no return value specified for NewCustomTxAttempt")
+	}
+
 	var r0 txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 bool
 	var r2 error
@@ -144,6 +164,10 @@ func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE])
 func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) NewEmptyTxAttempt(seq SEQ, feeLimit uint32, fee FEE, fromAddress ADDR) (txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(seq, feeLimit, fee, fromAddress)
 
+	if len(ret) == 0 {
+		panic("no return value specified for NewEmptyTxAttempt")
+	}
+
 	var r0 txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(SEQ, uint32, FEE, ADDR) (txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -175,6 +199,10 @@ func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE])
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for NewTxAttempt")
+	}
+
 	var r0 txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 FEE
 	var r2 uint32
@@ -227,6 +255,10 @@ func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE])
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for NewTxAttemptWithType")
+	}
+
 	var r0 txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 FEE
 	var r2 uint32
@@ -277,6 +309,10 @@ func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE])
 func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -291,6 +327,10 @@ func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE])
 func (_m *TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/common/txmgr/types/mocks/tx_store.go b/common/txmgr/types/mocks/tx_store.go
index df1528a4c24..16c20df31d7 100644
--- a/common/txmgr/types/mocks/tx_store.go
+++ b/common/txmgr/types/mocks/tx_store.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -29,6 +29,10 @@ type TxStore[ADDR types.Hashable, CHAIN_ID types.ID, TX_HASH types.Hashable, BLO
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) Abandon(ctx context.Context, id CHAIN_ID, addr ADDR) error {
 	ret := _m.Called(ctx, id, addr)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Abandon")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, CHAIN_ID, ADDR) error); ok {
 		r0 = rf(ctx, id, addr)
@@ -43,6 +47,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) Abandon(ctx
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) CheckTxQueueCapacity(ctx context.Context, fromAddress ADDR, maxQueuedTransactions uint64, chainID CHAIN_ID) error {
 	ret := _m.Called(ctx, fromAddress, maxQueuedTransactions, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CheckTxQueueCapacity")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR, uint64, CHAIN_ID) error); ok {
 		r0 = rf(ctx, fromAddress, maxQueuedTransactions, chainID)
@@ -62,6 +70,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) Close() {
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) CountTransactionsByState(ctx context.Context, state txmgrtypes.TxState, chainID CHAIN_ID) (uint32, error) {
 	ret := _m.Called(ctx, state, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountTransactionsByState")
+	}
+
 	var r0 uint32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, txmgrtypes.TxState, CHAIN_ID) (uint32, error)); ok {
@@ -86,6 +98,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) CountTransa
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) CountUnconfirmedTransactions(ctx context.Context, fromAddress ADDR, chainID CHAIN_ID) (uint32, error) {
 	ret := _m.Called(ctx, fromAddress, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountUnconfirmedTransactions")
+	}
+
 	var r0 uint32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR, CHAIN_ID) (uint32, error)); ok {
@@ -110,6 +126,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) CountUnconf
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) CountUnstartedTransactions(ctx context.Context, fromAddress ADDR, chainID CHAIN_ID) (uint32, error) {
 	ret := _m.Called(ctx, fromAddress, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountUnstartedTransactions")
+	}
+
 	var r0 uint32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR, CHAIN_ID) (uint32, error)); ok {
@@ -134,6 +154,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) CountUnstar
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) CreateTransaction(ctx context.Context, txRequest txmgrtypes.TxRequest[ADDR, TX_HASH], chainID CHAIN_ID) (txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, txRequest, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateTransaction")
+	}
+
 	var r0 txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, txmgrtypes.TxRequest[ADDR, TX_HASH], CHAIN_ID) (txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -158,6 +182,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) CreateTrans
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) DeleteInProgressAttempt(ctx context.Context, attempt txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error {
 	ret := _m.Called(ctx, attempt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteInProgressAttempt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error); ok {
 		r0 = rf(ctx, attempt)
@@ -172,6 +200,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) DeleteInPro
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindEarliestUnconfirmedBroadcastTime(ctx context.Context, chainID CHAIN_ID) (null.Time, error) {
 	ret := _m.Called(ctx, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindEarliestUnconfirmedBroadcastTime")
+	}
+
 	var r0 null.Time
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, CHAIN_ID) (null.Time, error)); ok {
@@ -196,6 +228,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindEarlies
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindEarliestUnconfirmedTxAttemptBlock(ctx context.Context, chainID CHAIN_ID) (null.Int, error) {
 	ret := _m.Called(ctx, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindEarliestUnconfirmedTxAttemptBlock")
+	}
+
 	var r0 null.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, CHAIN_ID) (null.Int, error)); ok {
@@ -220,6 +256,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindEarlies
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindLatestSequence(ctx context.Context, fromAddress ADDR, chainId CHAIN_ID) (SEQ, error) {
 	ret := _m.Called(ctx, fromAddress, chainId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindLatestSequence")
+	}
+
 	var r0 SEQ
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR, CHAIN_ID) (SEQ, error)); ok {
@@ -244,6 +284,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindLatestS
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindNextUnstartedTransactionFromAddress(ctx context.Context, etx *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], fromAddress ADDR, chainID CHAIN_ID) error {
 	ret := _m.Called(ctx, etx, fromAddress, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindNextUnstartedTransactionFromAddress")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], ADDR, CHAIN_ID) error); ok {
 		r0 = rf(ctx, etx, fromAddress, chainID)
@@ -258,6 +302,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindNextUns
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTransactionsConfirmedInBlockRange(ctx context.Context, highBlockNumber int64, lowBlockNumber int64, chainID CHAIN_ID) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, highBlockNumber, lowBlockNumber, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTransactionsConfirmedInBlockRange")
+	}
+
 	var r0 []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, int64, CHAIN_ID) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -284,6 +332,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTransac
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxAttemptsConfirmedMissingReceipt(ctx context.Context, chainID CHAIN_ID) ([]txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxAttemptsConfirmedMissingReceipt")
+	}
+
 	var r0 []txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, CHAIN_ID) ([]txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -310,6 +362,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxAttem
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxAttemptsRequiringReceiptFetch(ctx context.Context, chainID CHAIN_ID) ([]txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxAttemptsRequiringReceiptFetch")
+	}
+
 	var r0 []txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, CHAIN_ID) ([]txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -336,6 +392,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxAttem
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxAttemptsRequiringResend(ctx context.Context, olderThan time.Time, maxInFlightTransactions uint32, chainID CHAIN_ID, address ADDR) ([]txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, olderThan, maxInFlightTransactions, chainID, address)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxAttemptsRequiringResend")
+	}
+
 	var r0 []txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, time.Time, uint32, CHAIN_ID, ADDR) ([]txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -362,6 +422,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxAttem
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxWithIdempotencyKey(ctx context.Context, idempotencyKey string, chainID CHAIN_ID) (*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, idempotencyKey, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxWithIdempotencyKey")
+	}
+
 	var r0 *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, CHAIN_ID) (*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -388,6 +452,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxWithI
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxWithSequence(ctx context.Context, fromAddress ADDR, seq SEQ) (*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, fromAddress, seq)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxWithSequence")
+	}
+
 	var r0 *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR, SEQ) (*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -414,6 +482,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxWithS
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxesByMetaFieldAndStates(ctx context.Context, metaField string, metaValue string, states []txmgrtypes.TxState, chainID *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, metaField, metaValue, states, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxesByMetaFieldAndStates")
+	}
+
 	var r0 []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, string, []txmgrtypes.TxState, *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -440,6 +512,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxesByM
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxesPendingCallback(ctx context.Context, blockNum int64, chainID CHAIN_ID) ([]txmgrtypes.ReceiptPlus[R], error) {
 	ret := _m.Called(ctx, blockNum, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxesPendingCallback")
+	}
+
 	var r0 []txmgrtypes.ReceiptPlus[R]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, CHAIN_ID) ([]txmgrtypes.ReceiptPlus[R], error)); ok {
@@ -466,6 +542,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxesPen
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxesWithAttemptsAndReceiptsByIdsAndState(ctx context.Context, ids []big.Int, states []txmgrtypes.TxState, chainID *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, ids, states, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxesWithAttemptsAndReceiptsByIdsAndState")
+	}
+
 	var r0 []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, []big.Int, []txmgrtypes.TxState, *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -492,6 +572,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxesWit
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxesWithMetaFieldByReceiptBlockNum(ctx context.Context, metaField string, blockNum int64, chainID *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, metaField, blockNum, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxesWithMetaFieldByReceiptBlockNum")
+	}
+
 	var r0 []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, int64, *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -518,6 +602,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxesWit
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxesWithMetaFieldByStates(ctx context.Context, metaField string, states []txmgrtypes.TxState, chainID *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, metaField, states, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxesWithMetaFieldByStates")
+	}
+
 	var r0 []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, []txmgrtypes.TxState, *big.Int) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -544,6 +632,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxesWit
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxsRequiringGasBump(ctx context.Context, address ADDR, blockNum int64, gasBumpThreshold int64, depth int64, chainID CHAIN_ID) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, address, blockNum, gasBumpThreshold, depth, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxsRequiringGasBump")
+	}
+
 	var r0 []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR, int64, int64, int64, CHAIN_ID) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -570,6 +662,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxsRequ
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxsRequiringResubmissionDueToInsufficientFunds(ctx context.Context, address ADDR, chainID CHAIN_ID) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, address, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxsRequiringResubmissionDueToInsufficientFunds")
+	}
+
 	var r0 []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR, CHAIN_ID) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -596,6 +692,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) FindTxsRequ
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) GetInProgressTxAttempts(ctx context.Context, address ADDR, chainID CHAIN_ID) ([]txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, address, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetInProgressTxAttempts")
+	}
+
 	var r0 []txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR, CHAIN_ID) ([]txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -622,6 +722,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) GetInProgre
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) GetNonFatalTransactions(ctx context.Context, chainID CHAIN_ID) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetNonFatalTransactions")
+	}
+
 	var r0 []*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, CHAIN_ID) ([]*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -648,6 +752,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) GetNonFatal
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) GetTxByID(ctx context.Context, id int64) (*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTxByID")
+	}
+
 	var r0 *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64) (*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -674,6 +782,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) GetTxByID(c
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) GetTxInProgress(ctx context.Context, fromAddress ADDR) (*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error) {
 	ret := _m.Called(ctx, fromAddress)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTxInProgress")
+	}
+
 	var r0 *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR) (*txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], error)); ok {
@@ -700,6 +812,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) GetTxInProg
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) HasInProgressTransaction(ctx context.Context, account ADDR, chainID CHAIN_ID) (bool, error) {
 	ret := _m.Called(ctx, account, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HasInProgressTransaction")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ADDR, CHAIN_ID) (bool, error)); ok {
@@ -724,6 +840,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) HasInProgre
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) IsTxFinalized(ctx context.Context, blockHeight int64, txID int64, chainID CHAIN_ID) (bool, error) {
 	ret := _m.Called(ctx, blockHeight, txID, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsTxFinalized")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, int64, CHAIN_ID) (bool, error)); ok {
@@ -748,6 +868,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) IsTxFinaliz
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) LoadTxAttempts(ctx context.Context, etx *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error {
 	ret := _m.Called(ctx, etx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LoadTxAttempts")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error); ok {
 		r0 = rf(ctx, etx)
@@ -762,6 +886,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) LoadTxAttem
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) MarkAllConfirmedMissingReceipt(ctx context.Context, chainID CHAIN_ID) error {
 	ret := _m.Called(ctx, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MarkAllConfirmedMissingReceipt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, CHAIN_ID) error); ok {
 		r0 = rf(ctx, chainID)
@@ -776,6 +904,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) MarkAllConf
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) MarkOldTxesMissingReceiptAsErrored(ctx context.Context, blockNum int64, finalityDepth uint32, chainID CHAIN_ID) error {
 	ret := _m.Called(ctx, blockNum, finalityDepth, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MarkOldTxesMissingReceiptAsErrored")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, uint32, CHAIN_ID) error); ok {
 		r0 = rf(ctx, blockNum, finalityDepth, chainID)
@@ -790,6 +922,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) MarkOldTxes
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) PreloadTxes(ctx context.Context, attempts []txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error {
 	ret := _m.Called(ctx, attempts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PreloadTxes")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, []txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error); ok {
 		r0 = rf(ctx, attempts)
@@ -804,6 +940,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) PreloadTxes
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) PruneUnstartedTxQueue(ctx context.Context, queueSize uint32, subject uuid.UUID) (int64, error) {
 	ret := _m.Called(ctx, queueSize, subject)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PruneUnstartedTxQueue")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, uint32, uuid.UUID) (int64, error)); ok {
@@ -828,6 +968,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) PruneUnstar
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) ReapTxHistory(ctx context.Context, minBlockNumberToKeep int64, timeThreshold time.Time, chainID CHAIN_ID) error {
 	ret := _m.Called(ctx, minBlockNumberToKeep, timeThreshold, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ReapTxHistory")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, time.Time, CHAIN_ID) error); ok {
 		r0 = rf(ctx, minBlockNumberToKeep, timeThreshold, chainID)
@@ -842,6 +986,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) ReapTxHisto
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) SaveConfirmedMissingReceiptAttempt(ctx context.Context, timeout time.Duration, attempt *txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], broadcastAt time.Time) error {
 	ret := _m.Called(ctx, timeout, attempt, broadcastAt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveConfirmedMissingReceiptAttempt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, time.Duration, *txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], time.Time) error); ok {
 		r0 = rf(ctx, timeout, attempt, broadcastAt)
@@ -856,6 +1004,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) SaveConfirm
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) SaveFetchedReceipts(ctx context.Context, receipts []R, chainID CHAIN_ID) error {
 	ret := _m.Called(ctx, receipts, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveFetchedReceipts")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, []R, CHAIN_ID) error); ok {
 		r0 = rf(ctx, receipts, chainID)
@@ -870,6 +1022,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) SaveFetched
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) SaveInProgressAttempt(ctx context.Context, attempt *txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error {
 	ret := _m.Called(ctx, attempt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveInProgressAttempt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error); ok {
 		r0 = rf(ctx, attempt)
@@ -884,6 +1040,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) SaveInProgr
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) SaveInsufficientFundsAttempt(ctx context.Context, timeout time.Duration, attempt *txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], broadcastAt time.Time) error {
 	ret := _m.Called(ctx, timeout, attempt, broadcastAt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveInsufficientFundsAttempt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, time.Duration, *txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], time.Time) error); ok {
 		r0 = rf(ctx, timeout, attempt, broadcastAt)
@@ -898,6 +1058,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) SaveInsuffi
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) SaveReplacementInProgressAttempt(ctx context.Context, oldAttempt txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], replacementAttempt *txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error {
 	ret := _m.Called(ctx, oldAttempt, replacementAttempt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveReplacementInProgressAttempt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], *txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error); ok {
 		r0 = rf(ctx, oldAttempt, replacementAttempt)
@@ -912,6 +1076,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) SaveReplace
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) SaveSentAttempt(ctx context.Context, timeout time.Duration, attempt *txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], broadcastAt time.Time) error {
 	ret := _m.Called(ctx, timeout, attempt, broadcastAt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveSentAttempt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, time.Duration, *txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], time.Time) error); ok {
 		r0 = rf(ctx, timeout, attempt, broadcastAt)
@@ -926,6 +1094,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) SaveSentAtt
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) SetBroadcastBeforeBlockNum(ctx context.Context, blockNum int64, chainID CHAIN_ID) error {
 	ret := _m.Called(ctx, blockNum, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetBroadcastBeforeBlockNum")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, CHAIN_ID) error); ok {
 		r0 = rf(ctx, blockNum, chainID)
@@ -940,6 +1112,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) SetBroadcas
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) UpdateBroadcastAts(ctx context.Context, now time.Time, etxIDs []int64) error {
 	ret := _m.Called(ctx, now, etxIDs)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateBroadcastAts")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, time.Time, []int64) error); ok {
 		r0 = rf(ctx, now, etxIDs)
@@ -954,6 +1130,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) UpdateBroad
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) UpdateTxAttemptInProgressToBroadcast(ctx context.Context, etx *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], attempt txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], NewAttemptState txmgrtypes.TxAttemptState) error {
 	ret := _m.Called(ctx, etx, attempt, NewAttemptState)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTxAttemptInProgressToBroadcast")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], txmgrtypes.TxAttemptState) error); ok {
 		r0 = rf(ctx, etx, attempt, NewAttemptState)
@@ -968,6 +1148,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) UpdateTxAtt
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) UpdateTxCallbackCompleted(ctx context.Context, pipelineTaskRunRid uuid.UUID, chainId CHAIN_ID) error {
 	ret := _m.Called(ctx, pipelineTaskRunRid, chainId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTxCallbackCompleted")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, uuid.UUID, CHAIN_ID) error); ok {
 		r0 = rf(ctx, pipelineTaskRunRid, chainId)
@@ -982,6 +1166,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) UpdateTxCal
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) UpdateTxFatalError(ctx context.Context, etx *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error {
 	ret := _m.Called(ctx, etx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTxFatalError")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error); ok {
 		r0 = rf(ctx, etx)
@@ -996,6 +1184,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) UpdateTxFat
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) UpdateTxForRebroadcast(ctx context.Context, etx txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], etxAttempt txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error {
 	ret := _m.Called(ctx, etx, etxAttempt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTxForRebroadcast")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error); ok {
 		r0 = rf(ctx, etx, etxAttempt)
@@ -1010,6 +1202,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) UpdateTxFor
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) UpdateTxUnstartedToInProgress(ctx context.Context, etx *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], attempt *txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error {
 	ret := _m.Called(ctx, etx, attempt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTxUnstartedToInProgress")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], *txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error); ok {
 		r0 = rf(ctx, etx, attempt)
@@ -1024,6 +1220,10 @@ func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) UpdateTxUns
 func (_m *TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) UpdateTxsUnconfirmed(ctx context.Context, ids []int64) error {
 	ret := _m.Called(ctx, ids)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTxsUnconfirmed")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, []int64) error); ok {
 		r0 = rf(ctx, ids)
diff --git a/common/txmgr/types/mocks/tx_strategy.go b/common/txmgr/types/mocks/tx_strategy.go
index f4ec9bef49a..7992c3fe05f 100644
--- a/common/txmgr/types/mocks/tx_strategy.go
+++ b/common/txmgr/types/mocks/tx_strategy.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -20,6 +20,10 @@ type TxStrategy struct {
 func (_m *TxStrategy) PruneQueue(ctx context.Context, pruneService types.UnstartedTxQueuePruner) (int64, error) {
 	ret := _m.Called(ctx, pruneService)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PruneQueue")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, types.UnstartedTxQueuePruner) (int64, error)); ok {
@@ -44,6 +48,10 @@ func (_m *TxStrategy) PruneQueue(ctx context.Context, pruneService types.Unstart
 func (_m *TxStrategy) Subject() uuid.NullUUID {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Subject")
+	}
+
 	var r0 uuid.NullUUID
 	if rf, ok := ret.Get(0).(func() uuid.NullUUID); ok {
 		r0 = rf()
diff --git a/common/types/mocks/head.go b/common/types/mocks/head.go
index 99d2a265b44..29b6d073656 100644
--- a/common/types/mocks/head.go
+++ b/common/types/mocks/head.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -20,6 +20,10 @@ type Head[BLOCK_HASH types.Hashable] struct {
 func (_m *Head[BLOCK_HASH]) BlockDifficulty() *big.Int {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockDifficulty")
+	}
+
 	var r0 *big.Int
 	if rf, ok := ret.Get(0).(func() *big.Int); ok {
 		r0 = rf()
@@ -36,6 +40,10 @@ func (_m *Head[BLOCK_HASH]) BlockDifficulty() *big.Int {
 func (_m *Head[BLOCK_HASH]) BlockHash() BLOCK_HASH {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockHash")
+	}
+
 	var r0 BLOCK_HASH
 	if rf, ok := ret.Get(0).(func() BLOCK_HASH); ok {
 		r0 = rf()
@@ -50,6 +58,10 @@ func (_m *Head[BLOCK_HASH]) BlockHash() BLOCK_HASH {
 func (_m *Head[BLOCK_HASH]) BlockNumber() int64 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockNumber")
+	}
+
 	var r0 int64
 	if rf, ok := ret.Get(0).(func() int64); ok {
 		r0 = rf()
@@ -64,6 +76,10 @@ func (_m *Head[BLOCK_HASH]) BlockNumber() int64 {
 func (_m *Head[BLOCK_HASH]) ChainLength() uint32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChainLength")
+	}
+
 	var r0 uint32
 	if rf, ok := ret.Get(0).(func() uint32); ok {
 		r0 = rf()
@@ -78,6 +94,10 @@ func (_m *Head[BLOCK_HASH]) ChainLength() uint32 {
 func (_m *Head[BLOCK_HASH]) EarliestHeadInChain() types.Head[BLOCK_HASH] {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EarliestHeadInChain")
+	}
+
 	var r0 types.Head[BLOCK_HASH]
 	if rf, ok := ret.Get(0).(func() types.Head[BLOCK_HASH]); ok {
 		r0 = rf()
@@ -94,6 +114,10 @@ func (_m *Head[BLOCK_HASH]) EarliestHeadInChain() types.Head[BLOCK_HASH] {
 func (_m *Head[BLOCK_HASH]) GetParent() types.Head[BLOCK_HASH] {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetParent")
+	}
+
 	var r0 types.Head[BLOCK_HASH]
 	if rf, ok := ret.Get(0).(func() types.Head[BLOCK_HASH]); ok {
 		r0 = rf()
@@ -110,6 +134,10 @@ func (_m *Head[BLOCK_HASH]) GetParent() types.Head[BLOCK_HASH] {
 func (_m *Head[BLOCK_HASH]) GetParentHash() BLOCK_HASH {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetParentHash")
+	}
+
 	var r0 BLOCK_HASH
 	if rf, ok := ret.Get(0).(func() BLOCK_HASH); ok {
 		r0 = rf()
@@ -124,6 +152,10 @@ func (_m *Head[BLOCK_HASH]) GetParentHash() BLOCK_HASH {
 func (_m *Head[BLOCK_HASH]) GetTimestamp() time.Time {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTimestamp")
+	}
+
 	var r0 time.Time
 	if rf, ok := ret.Get(0).(func() time.Time); ok {
 		r0 = rf()
@@ -138,6 +170,10 @@ func (_m *Head[BLOCK_HASH]) GetTimestamp() time.Time {
 func (_m *Head[BLOCK_HASH]) HashAtHeight(blockNum int64) BLOCK_HASH {
 	ret := _m.Called(blockNum)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HashAtHeight")
+	}
+
 	var r0 BLOCK_HASH
 	if rf, ok := ret.Get(0).(func(int64) BLOCK_HASH); ok {
 		r0 = rf(blockNum)
diff --git a/common/types/mocks/head_trackable.go b/common/types/mocks/head_trackable.go
index e63e9ca2497..55f0ebd288e 100644
--- a/common/types/mocks/head_trackable.go
+++ b/common/types/mocks/head_trackable.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/common/types/mocks/subscription.go b/common/types/mocks/subscription.go
index 5577ee4a62a..32db6dfa769 100644
--- a/common/types/mocks/subscription.go
+++ b/common/types/mocks/subscription.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -13,6 +13,10 @@ type Subscription struct {
 func (_m *Subscription) Err() <-chan error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Err")
+	}
+
 	var r0 <-chan error
 	if rf, ok := ret.Get(0).(func() <-chan error); ok {
 		r0 = rf()
diff --git a/core/bridges/mocks/orm.go b/core/bridges/mocks/orm.go
index ba8c7526d1c..2c92a7e8024 100644
--- a/core/bridges/mocks/orm.go
+++ b/core/bridges/mocks/orm.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -20,6 +20,10 @@ type ORM struct {
 func (_m *ORM) BridgeTypes(offset int, limit int) ([]bridges.BridgeType, int, error) {
 	ret := _m.Called(offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BridgeTypes")
+	}
+
 	var r0 []bridges.BridgeType
 	var r1 int
 	var r2 error
@@ -53,6 +57,10 @@ func (_m *ORM) BridgeTypes(offset int, limit int) ([]bridges.BridgeType, int, er
 func (_m *ORM) CreateBridgeType(bt *bridges.BridgeType) error {
 	ret := _m.Called(bt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateBridgeType")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*bridges.BridgeType) error); ok {
 		r0 = rf(bt)
@@ -67,6 +75,10 @@ func (_m *ORM) CreateBridgeType(bt *bridges.BridgeType) error {
 func (_m *ORM) CreateExternalInitiator(externalInitiator *bridges.ExternalInitiator) error {
 	ret := _m.Called(externalInitiator)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateExternalInitiator")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*bridges.ExternalInitiator) error); ok {
 		r0 = rf(externalInitiator)
@@ -81,6 +93,10 @@ func (_m *ORM) CreateExternalInitiator(externalInitiator *bridges.ExternalInitia
 func (_m *ORM) DeleteBridgeType(bt *bridges.BridgeType) error {
 	ret := _m.Called(bt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteBridgeType")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*bridges.BridgeType) error); ok {
 		r0 = rf(bt)
@@ -95,6 +111,10 @@ func (_m *ORM) DeleteBridgeType(bt *bridges.BridgeType) error {
 func (_m *ORM) DeleteExternalInitiator(name string) error {
 	ret := _m.Called(name)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteExternalInitiator")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(name)
@@ -109,6 +129,10 @@ func (_m *ORM) DeleteExternalInitiator(name string) error {
 func (_m *ORM) ExternalInitiators(offset int, limit int) ([]bridges.ExternalInitiator, int, error) {
 	ret := _m.Called(offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ExternalInitiators")
+	}
+
 	var r0 []bridges.ExternalInitiator
 	var r1 int
 	var r2 error
@@ -142,6 +166,10 @@ func (_m *ORM) ExternalInitiators(offset int, limit int) ([]bridges.ExternalInit
 func (_m *ORM) FindBridge(name bridges.BridgeName) (bridges.BridgeType, error) {
 	ret := _m.Called(name)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindBridge")
+	}
+
 	var r0 bridges.BridgeType
 	var r1 error
 	if rf, ok := ret.Get(0).(func(bridges.BridgeName) (bridges.BridgeType, error)); ok {
@@ -166,6 +194,10 @@ func (_m *ORM) FindBridge(name bridges.BridgeName) (bridges.BridgeType, error) {
 func (_m *ORM) FindBridges(name []bridges.BridgeName) ([]bridges.BridgeType, error) {
 	ret := _m.Called(name)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindBridges")
+	}
+
 	var r0 []bridges.BridgeType
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]bridges.BridgeName) ([]bridges.BridgeType, error)); ok {
@@ -192,6 +224,10 @@ func (_m *ORM) FindBridges(name []bridges.BridgeName) ([]bridges.BridgeType, err
 func (_m *ORM) FindExternalInitiator(eia *auth.Token) (*bridges.ExternalInitiator, error) {
 	ret := _m.Called(eia)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindExternalInitiator")
+	}
+
 	var r0 *bridges.ExternalInitiator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*auth.Token) (*bridges.ExternalInitiator, error)); ok {
@@ -218,6 +254,10 @@ func (_m *ORM) FindExternalInitiator(eia *auth.Token) (*bridges.ExternalInitiato
 func (_m *ORM) FindExternalInitiatorByName(iname string) (bridges.ExternalInitiator, error) {
 	ret := _m.Called(iname)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindExternalInitiatorByName")
+	}
+
 	var r0 bridges.ExternalInitiator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (bridges.ExternalInitiator, error)); ok {
@@ -242,6 +282,10 @@ func (_m *ORM) FindExternalInitiatorByName(iname string) (bridges.ExternalInitia
 func (_m *ORM) GetCachedResponse(dotId string, specId int32, maxElapsed time.Duration) ([]byte, error) {
 	ret := _m.Called(dotId, specId, maxElapsed)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetCachedResponse")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, int32, time.Duration) ([]byte, error)); ok {
@@ -268,6 +312,10 @@ func (_m *ORM) GetCachedResponse(dotId string, specId int32, maxElapsed time.Dur
 func (_m *ORM) UpdateBridgeType(bt *bridges.BridgeType, btr *bridges.BridgeTypeRequest) error {
 	ret := _m.Called(bt, btr)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateBridgeType")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*bridges.BridgeType, *bridges.BridgeTypeRequest) error); ok {
 		r0 = rf(bt, btr)
@@ -282,6 +330,10 @@ func (_m *ORM) UpdateBridgeType(bt *bridges.BridgeType, btr *bridges.BridgeTypeR
 func (_m *ORM) UpsertBridgeResponse(dotId string, specId int32, response []byte) error {
 	ret := _m.Called(dotId, specId, response)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpsertBridgeResponse")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, int32, []byte) error); ok {
 		r0 = rf(dotId, specId, response)
diff --git a/core/chains/evm/client/mocks/batch_sender.go b/core/chains/evm/client/mocks/batch_sender.go
index 7f1a5bdee69..3d65749b5bc 100644
--- a/core/chains/evm/client/mocks/batch_sender.go
+++ b/core/chains/evm/client/mocks/batch_sender.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type BatchSender struct {
 func (_m *BatchSender) BatchCallContext(ctx context.Context, b []rpc.BatchElem) error {
 	ret := _m.Called(ctx, b)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BatchCallContext")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, []rpc.BatchElem) error); ok {
 		r0 = rf(ctx, b)
diff --git a/core/chains/evm/client/mocks/client.go b/core/chains/evm/client/mocks/client.go
index 22498370a2a..0b45894cf28 100644
--- a/core/chains/evm/client/mocks/client.go
+++ b/core/chains/evm/client/mocks/client.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -33,6 +33,10 @@ type Client struct {
 func (_m *Client) BalanceAt(ctx context.Context, account common.Address, blockNumber *big.Int) (*big.Int, error) {
 	ret := _m.Called(ctx, account, blockNumber)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BalanceAt")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, *big.Int) (*big.Int, error)); ok {
@@ -59,6 +63,10 @@ func (_m *Client) BalanceAt(ctx context.Context, account common.Address, blockNu
 func (_m *Client) BatchCallContext(ctx context.Context, b []rpc.BatchElem) error {
 	ret := _m.Called(ctx, b)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BatchCallContext")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, []rpc.BatchElem) error); ok {
 		r0 = rf(ctx, b)
@@ -73,6 +81,10 @@ func (_m *Client) BatchCallContext(ctx context.Context, b []rpc.BatchElem) error
 func (_m *Client) BatchCallContextAll(ctx context.Context, b []rpc.BatchElem) error {
 	ret := _m.Called(ctx, b)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BatchCallContextAll")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, []rpc.BatchElem) error); ok {
 		r0 = rf(ctx, b)
@@ -87,6 +99,10 @@ func (_m *Client) BatchCallContextAll(ctx context.Context, b []rpc.BatchElem) er
 func (_m *Client) BlockByHash(ctx context.Context, hash common.Hash) (*types.Block, error) {
 	ret := _m.Called(ctx, hash)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockByHash")
+	}
+
 	var r0 *types.Block
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Hash) (*types.Block, error)); ok {
@@ -113,6 +129,10 @@ func (_m *Client) BlockByHash(ctx context.Context, hash common.Hash) (*types.Blo
 func (_m *Client) BlockByNumber(ctx context.Context, number *big.Int) (*types.Block, error) {
 	ret := _m.Called(ctx, number)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockByNumber")
+	}
+
 	var r0 *types.Block
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) (*types.Block, error)); ok {
@@ -142,6 +162,10 @@ func (_m *Client) CallContext(ctx context.Context, result interface{}, method st
 	_ca = append(_ca, args...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CallContext")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, interface{}, string, ...interface{}) error); ok {
 		r0 = rf(ctx, result, method, args...)
@@ -156,6 +180,10 @@ func (_m *Client) CallContext(ctx context.Context, result interface{}, method st
 func (_m *Client) CallContract(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) ([]byte, error) {
 	ret := _m.Called(ctx, msg, blockNumber)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CallContract")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ethereum.CallMsg, *big.Int) ([]byte, error)); ok {
@@ -182,6 +210,10 @@ func (_m *Client) CallContract(ctx context.Context, msg ethereum.CallMsg, blockN
 func (_m *Client) ChainID() (*big.Int, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChainID")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (*big.Int, error)); ok {
@@ -213,6 +245,10 @@ func (_m *Client) Close() {
 func (_m *Client) CodeAt(ctx context.Context, account common.Address, blockNumber *big.Int) ([]byte, error) {
 	ret := _m.Called(ctx, account, blockNumber)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CodeAt")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, *big.Int) ([]byte, error)); ok {
@@ -239,6 +275,10 @@ func (_m *Client) CodeAt(ctx context.Context, account common.Address, blockNumbe
 func (_m *Client) ConfiguredChainID() *big.Int {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ConfiguredChainID")
+	}
+
 	var r0 *big.Int
 	if rf, ok := ret.Get(0).(func() *big.Int); ok {
 		r0 = rf()
@@ -255,6 +295,10 @@ func (_m *Client) ConfiguredChainID() *big.Int {
 func (_m *Client) Dial(ctx context.Context) error {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Dial")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(ctx)
@@ -269,6 +313,10 @@ func (_m *Client) Dial(ctx context.Context) error {
 func (_m *Client) EstimateGas(ctx context.Context, call ethereum.CallMsg) (uint64, error) {
 	ret := _m.Called(ctx, call)
 
+	if len(ret) == 0 {
+		panic("no return value specified for EstimateGas")
+	}
+
 	var r0 uint64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ethereum.CallMsg) (uint64, error)); ok {
@@ -293,6 +341,10 @@ func (_m *Client) EstimateGas(ctx context.Context, call ethereum.CallMsg) (uint6
 func (_m *Client) FilterLogs(ctx context.Context, q ethereum.FilterQuery) ([]types.Log, error) {
 	ret := _m.Called(ctx, q)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterLogs")
+	}
+
 	var r0 []types.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ethereum.FilterQuery) ([]types.Log, error)); ok {
@@ -319,6 +371,10 @@ func (_m *Client) FilterLogs(ctx context.Context, q ethereum.FilterQuery) ([]typ
 func (_m *Client) HeadByHash(ctx context.Context, n common.Hash) (*evmtypes.Head, error) {
 	ret := _m.Called(ctx, n)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HeadByHash")
+	}
+
 	var r0 *evmtypes.Head
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Hash) (*evmtypes.Head, error)); ok {
@@ -345,6 +401,10 @@ func (_m *Client) HeadByHash(ctx context.Context, n common.Hash) (*evmtypes.Head
 func (_m *Client) HeadByNumber(ctx context.Context, n *big.Int) (*evmtypes.Head, error) {
 	ret := _m.Called(ctx, n)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HeadByNumber")
+	}
+
 	var r0 *evmtypes.Head
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) (*evmtypes.Head, error)); ok {
@@ -371,6 +431,10 @@ func (_m *Client) HeadByNumber(ctx context.Context, n *big.Int) (*evmtypes.Head,
 func (_m *Client) HeaderByHash(ctx context.Context, h common.Hash) (*types.Header, error) {
 	ret := _m.Called(ctx, h)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HeaderByHash")
+	}
+
 	var r0 *types.Header
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Hash) (*types.Header, error)); ok {
@@ -397,6 +461,10 @@ func (_m *Client) HeaderByHash(ctx context.Context, h common.Hash) (*types.Heade
 func (_m *Client) HeaderByNumber(ctx context.Context, n *big.Int) (*types.Header, error) {
 	ret := _m.Called(ctx, n)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HeaderByNumber")
+	}
+
 	var r0 *types.Header
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) (*types.Header, error)); ok {
@@ -423,6 +491,10 @@ func (_m *Client) HeaderByNumber(ctx context.Context, n *big.Int) (*types.Header
 func (_m *Client) IsL2() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsL2")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -437,6 +509,10 @@ func (_m *Client) IsL2() bool {
 func (_m *Client) LINKBalance(ctx context.Context, address common.Address, linkAddress common.Address) (*assets.Link, error) {
 	ret := _m.Called(ctx, address, linkAddress)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LINKBalance")
+	}
+
 	var r0 *assets.Link
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, common.Address) (*assets.Link, error)); ok {
@@ -463,6 +539,10 @@ func (_m *Client) LINKBalance(ctx context.Context, address common.Address, linkA
 func (_m *Client) LatestBlockHeight(ctx context.Context) (*big.Int, error) {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestBlockHeight")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (*big.Int, error)); ok {
@@ -489,6 +569,10 @@ func (_m *Client) LatestBlockHeight(ctx context.Context) (*big.Int, error) {
 func (_m *Client) NodeStates() map[string]string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for NodeStates")
+	}
+
 	var r0 map[string]string
 	if rf, ok := ret.Get(0).(func() map[string]string); ok {
 		r0 = rf()
@@ -505,6 +589,10 @@ func (_m *Client) NodeStates() map[string]string {
 func (_m *Client) PendingCodeAt(ctx context.Context, account common.Address) ([]byte, error) {
 	ret := _m.Called(ctx, account)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PendingCodeAt")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address) ([]byte, error)); ok {
@@ -531,6 +619,10 @@ func (_m *Client) PendingCodeAt(ctx context.Context, account common.Address) ([]
 func (_m *Client) PendingNonceAt(ctx context.Context, account common.Address) (uint64, error) {
 	ret := _m.Called(ctx, account)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PendingNonceAt")
+	}
+
 	var r0 uint64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address) (uint64, error)); ok {
@@ -555,6 +647,10 @@ func (_m *Client) PendingNonceAt(ctx context.Context, account common.Address) (u
 func (_m *Client) SendTransaction(ctx context.Context, tx *types.Transaction) error {
 	ret := _m.Called(ctx, tx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendTransaction")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *types.Transaction) error); ok {
 		r0 = rf(ctx, tx)
@@ -569,6 +665,10 @@ func (_m *Client) SendTransaction(ctx context.Context, tx *types.Transaction) er
 func (_m *Client) SendTransactionReturnCode(ctx context.Context, tx *types.Transaction, fromAddress common.Address) (commonclient.SendTxReturnCode, error) {
 	ret := _m.Called(ctx, tx, fromAddress)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendTransactionReturnCode")
+	}
+
 	var r0 commonclient.SendTxReturnCode
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *types.Transaction, common.Address) (commonclient.SendTxReturnCode, error)); ok {
@@ -593,6 +693,10 @@ func (_m *Client) SendTransactionReturnCode(ctx context.Context, tx *types.Trans
 func (_m *Client) SequenceAt(ctx context.Context, account common.Address, blockNumber *big.Int) (evmtypes.Nonce, error) {
 	ret := _m.Called(ctx, account, blockNumber)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SequenceAt")
+	}
+
 	var r0 evmtypes.Nonce
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, *big.Int) (evmtypes.Nonce, error)); ok {
@@ -617,6 +721,10 @@ func (_m *Client) SequenceAt(ctx context.Context, account common.Address, blockN
 func (_m *Client) SubscribeFilterLogs(ctx context.Context, q ethereum.FilterQuery, ch chan<- types.Log) (ethereum.Subscription, error) {
 	ret := _m.Called(ctx, q, ch)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SubscribeFilterLogs")
+	}
+
 	var r0 ethereum.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ethereum.FilterQuery, chan<- types.Log) (ethereum.Subscription, error)); ok {
@@ -643,6 +751,10 @@ func (_m *Client) SubscribeFilterLogs(ctx context.Context, q ethereum.FilterQuer
 func (_m *Client) SubscribeNewHead(ctx context.Context, ch chan<- *evmtypes.Head) (ethereum.Subscription, error) {
 	ret := _m.Called(ctx, ch)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SubscribeNewHead")
+	}
+
 	var r0 ethereum.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, chan<- *evmtypes.Head) (ethereum.Subscription, error)); ok {
@@ -669,6 +781,10 @@ func (_m *Client) SubscribeNewHead(ctx context.Context, ch chan<- *evmtypes.Head
 func (_m *Client) SuggestGasPrice(ctx context.Context) (*big.Int, error) {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SuggestGasPrice")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (*big.Int, error)); ok {
@@ -695,6 +811,10 @@ func (_m *Client) SuggestGasPrice(ctx context.Context) (*big.Int, error) {
 func (_m *Client) SuggestGasTipCap(ctx context.Context) (*big.Int, error) {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SuggestGasTipCap")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (*big.Int, error)); ok {
@@ -721,6 +841,10 @@ func (_m *Client) SuggestGasTipCap(ctx context.Context) (*big.Int, error) {
 func (_m *Client) TokenBalance(ctx context.Context, address common.Address, contractAddress common.Address) (*big.Int, error) {
 	ret := _m.Called(ctx, address, contractAddress)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TokenBalance")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, common.Address) (*big.Int, error)); ok {
@@ -747,6 +871,10 @@ func (_m *Client) TokenBalance(ctx context.Context, address common.Address, cont
 func (_m *Client) TransactionByHash(ctx context.Context, txHash common.Hash) (*types.Transaction, error) {
 	ret := _m.Called(ctx, txHash)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransactionByHash")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Hash) (*types.Transaction, error)); ok {
@@ -773,6 +901,10 @@ func (_m *Client) TransactionByHash(ctx context.Context, txHash common.Hash) (*t
 func (_m *Client) TransactionReceipt(ctx context.Context, txHash common.Hash) (*types.Receipt, error) {
 	ret := _m.Called(ctx, txHash)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransactionReceipt")
+	}
+
 	var r0 *types.Receipt
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Hash) (*types.Receipt, error)); ok {
diff --git a/core/chains/evm/client/mocks/tx_sender.go b/core/chains/evm/client/mocks/tx_sender.go
index 889069dcfca..a769a786a18 100644
--- a/core/chains/evm/client/mocks/tx_sender.go
+++ b/core/chains/evm/client/mocks/tx_sender.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -21,6 +21,10 @@ type TxSender struct {
 func (_m *TxSender) ChainID(_a0 context.Context) (*big.Int, error) {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChainID")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (*big.Int, error)); ok {
@@ -47,6 +51,10 @@ func (_m *TxSender) ChainID(_a0 context.Context) (*big.Int, error) {
 func (_m *TxSender) SendTransaction(ctx context.Context, tx *types.Transaction) error {
 	ret := _m.Called(ctx, tx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendTransaction")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *types.Transaction) error); ok {
 		r0 = rf(ctx, tx)
diff --git a/core/chains/evm/config/mocks/chain_scoped_config.go b/core/chains/evm/config/mocks/chain_scoped_config.go
index cb18282f495..badba1d69f3 100644
--- a/core/chains/evm/config/mocks/chain_scoped_config.go
+++ b/core/chains/evm/config/mocks/chain_scoped_config.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -24,6 +24,10 @@ type ChainScopedConfig struct {
 func (_m *ChainScopedConfig) AppID() uuid.UUID {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for AppID")
+	}
+
 	var r0 uuid.UUID
 	if rf, ok := ret.Get(0).(func() uuid.UUID); ok {
 		r0 = rf()
@@ -40,6 +44,10 @@ func (_m *ChainScopedConfig) AppID() uuid.UUID {
 func (_m *ChainScopedConfig) AuditLogger() coreconfig.AuditLogger {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for AuditLogger")
+	}
+
 	var r0 coreconfig.AuditLogger
 	if rf, ok := ret.Get(0).(func() coreconfig.AuditLogger); ok {
 		r0 = rf()
@@ -56,6 +64,10 @@ func (_m *ChainScopedConfig) AuditLogger() coreconfig.AuditLogger {
 func (_m *ChainScopedConfig) AutoPprof() coreconfig.AutoPprof {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for AutoPprof")
+	}
+
 	var r0 coreconfig.AutoPprof
 	if rf, ok := ret.Get(0).(func() coreconfig.AutoPprof); ok {
 		r0 = rf()
@@ -72,6 +84,10 @@ func (_m *ChainScopedConfig) AutoPprof() coreconfig.AutoPprof {
 func (_m *ChainScopedConfig) CosmosEnabled() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for CosmosEnabled")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -86,6 +102,10 @@ func (_m *ChainScopedConfig) CosmosEnabled() bool {
 func (_m *ChainScopedConfig) Database() coreconfig.Database {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Database")
+	}
+
 	var r0 coreconfig.Database
 	if rf, ok := ret.Get(0).(func() coreconfig.Database); ok {
 		r0 = rf()
@@ -102,6 +122,10 @@ func (_m *ChainScopedConfig) Database() coreconfig.Database {
 func (_m *ChainScopedConfig) EVM() config.EVM {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EVM")
+	}
+
 	var r0 config.EVM
 	if rf, ok := ret.Get(0).(func() config.EVM); ok {
 		r0 = rf()
@@ -118,6 +142,10 @@ func (_m *ChainScopedConfig) EVM() config.EVM {
 func (_m *ChainScopedConfig) EVMEnabled() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EVMEnabled")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -132,6 +160,10 @@ func (_m *ChainScopedConfig) EVMEnabled() bool {
 func (_m *ChainScopedConfig) EVMRPCEnabled() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EVMRPCEnabled")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -146,6 +178,10 @@ func (_m *ChainScopedConfig) EVMRPCEnabled() bool {
 func (_m *ChainScopedConfig) Feature() coreconfig.Feature {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Feature")
+	}
+
 	var r0 coreconfig.Feature
 	if rf, ok := ret.Get(0).(func() coreconfig.Feature); ok {
 		r0 = rf()
@@ -162,6 +198,10 @@ func (_m *ChainScopedConfig) Feature() coreconfig.Feature {
 func (_m *ChainScopedConfig) FluxMonitor() coreconfig.FluxMonitor {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for FluxMonitor")
+	}
+
 	var r0 coreconfig.FluxMonitor
 	if rf, ok := ret.Get(0).(func() coreconfig.FluxMonitor); ok {
 		r0 = rf()
@@ -178,6 +218,10 @@ func (_m *ChainScopedConfig) FluxMonitor() coreconfig.FluxMonitor {
 func (_m *ChainScopedConfig) Insecure() coreconfig.Insecure {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Insecure")
+	}
+
 	var r0 coreconfig.Insecure
 	if rf, ok := ret.Get(0).(func() coreconfig.Insecure); ok {
 		r0 = rf()
@@ -194,6 +238,10 @@ func (_m *ChainScopedConfig) Insecure() coreconfig.Insecure {
 func (_m *ChainScopedConfig) InsecureFastScrypt() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for InsecureFastScrypt")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -208,6 +256,10 @@ func (_m *ChainScopedConfig) InsecureFastScrypt() bool {
 func (_m *ChainScopedConfig) JobPipeline() coreconfig.JobPipeline {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for JobPipeline")
+	}
+
 	var r0 coreconfig.JobPipeline
 	if rf, ok := ret.Get(0).(func() coreconfig.JobPipeline); ok {
 		r0 = rf()
@@ -224,6 +276,10 @@ func (_m *ChainScopedConfig) JobPipeline() coreconfig.JobPipeline {
 func (_m *ChainScopedConfig) Keeper() coreconfig.Keeper {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Keeper")
+	}
+
 	var r0 coreconfig.Keeper
 	if rf, ok := ret.Get(0).(func() coreconfig.Keeper); ok {
 		r0 = rf()
@@ -240,6 +296,10 @@ func (_m *ChainScopedConfig) Keeper() coreconfig.Keeper {
 func (_m *ChainScopedConfig) Log() coreconfig.Log {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Log")
+	}
+
 	var r0 coreconfig.Log
 	if rf, ok := ret.Get(0).(func() coreconfig.Log); ok {
 		r0 = rf()
@@ -261,6 +321,10 @@ func (_m *ChainScopedConfig) LogConfiguration(log coreconfig.LogfFn, warn coreco
 func (_m *ChainScopedConfig) Mercury() coreconfig.Mercury {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Mercury")
+	}
+
 	var r0 coreconfig.Mercury
 	if rf, ok := ret.Get(0).(func() coreconfig.Mercury); ok {
 		r0 = rf()
@@ -277,6 +341,10 @@ func (_m *ChainScopedConfig) Mercury() coreconfig.Mercury {
 func (_m *ChainScopedConfig) OCR() coreconfig.OCR {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for OCR")
+	}
+
 	var r0 coreconfig.OCR
 	if rf, ok := ret.Get(0).(func() coreconfig.OCR); ok {
 		r0 = rf()
@@ -293,6 +361,10 @@ func (_m *ChainScopedConfig) OCR() coreconfig.OCR {
 func (_m *ChainScopedConfig) OCR2() coreconfig.OCR2 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for OCR2")
+	}
+
 	var r0 coreconfig.OCR2
 	if rf, ok := ret.Get(0).(func() coreconfig.OCR2); ok {
 		r0 = rf()
@@ -309,6 +381,10 @@ func (_m *ChainScopedConfig) OCR2() coreconfig.OCR2 {
 func (_m *ChainScopedConfig) P2P() coreconfig.P2P {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for P2P")
+	}
+
 	var r0 coreconfig.P2P
 	if rf, ok := ret.Get(0).(func() coreconfig.P2P); ok {
 		r0 = rf()
@@ -325,6 +401,10 @@ func (_m *ChainScopedConfig) P2P() coreconfig.P2P {
 func (_m *ChainScopedConfig) Password() coreconfig.Password {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Password")
+	}
+
 	var r0 coreconfig.Password
 	if rf, ok := ret.Get(0).(func() coreconfig.Password); ok {
 		r0 = rf()
@@ -341,6 +421,10 @@ func (_m *ChainScopedConfig) Password() coreconfig.Password {
 func (_m *ChainScopedConfig) Prometheus() coreconfig.Prometheus {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Prometheus")
+	}
+
 	var r0 coreconfig.Prometheus
 	if rf, ok := ret.Get(0).(func() coreconfig.Prometheus); ok {
 		r0 = rf()
@@ -357,6 +441,10 @@ func (_m *ChainScopedConfig) Prometheus() coreconfig.Prometheus {
 func (_m *ChainScopedConfig) Pyroscope() coreconfig.Pyroscope {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Pyroscope")
+	}
+
 	var r0 coreconfig.Pyroscope
 	if rf, ok := ret.Get(0).(func() coreconfig.Pyroscope); ok {
 		r0 = rf()
@@ -373,6 +461,10 @@ func (_m *ChainScopedConfig) Pyroscope() coreconfig.Pyroscope {
 func (_m *ChainScopedConfig) RootDir() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for RootDir")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -387,6 +479,10 @@ func (_m *ChainScopedConfig) RootDir() string {
 func (_m *ChainScopedConfig) Sentry() coreconfig.Sentry {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Sentry")
+	}
+
 	var r0 coreconfig.Sentry
 	if rf, ok := ret.Get(0).(func() coreconfig.Sentry); ok {
 		r0 = rf()
@@ -403,6 +499,10 @@ func (_m *ChainScopedConfig) Sentry() coreconfig.Sentry {
 func (_m *ChainScopedConfig) SetLogLevel(lvl zapcore.Level) error {
 	ret := _m.Called(lvl)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetLogLevel")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(zapcore.Level) error); ok {
 		r0 = rf(lvl)
@@ -427,6 +527,10 @@ func (_m *ChainScopedConfig) SetPasswords(keystore *string, vrf *string) {
 func (_m *ChainScopedConfig) ShutdownGracePeriod() time.Duration {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ShutdownGracePeriod")
+	}
+
 	var r0 time.Duration
 	if rf, ok := ret.Get(0).(func() time.Duration); ok {
 		r0 = rf()
@@ -441,6 +545,10 @@ func (_m *ChainScopedConfig) ShutdownGracePeriod() time.Duration {
 func (_m *ChainScopedConfig) SolanaEnabled() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for SolanaEnabled")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -455,6 +563,10 @@ func (_m *ChainScopedConfig) SolanaEnabled() bool {
 func (_m *ChainScopedConfig) StarkNetEnabled() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for StarkNetEnabled")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -469,6 +581,10 @@ func (_m *ChainScopedConfig) StarkNetEnabled() bool {
 func (_m *ChainScopedConfig) TelemetryIngress() coreconfig.TelemetryIngress {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for TelemetryIngress")
+	}
+
 	var r0 coreconfig.TelemetryIngress
 	if rf, ok := ret.Get(0).(func() coreconfig.TelemetryIngress); ok {
 		r0 = rf()
@@ -485,6 +601,10 @@ func (_m *ChainScopedConfig) TelemetryIngress() coreconfig.TelemetryIngress {
 func (_m *ChainScopedConfig) Threshold() coreconfig.Threshold {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Threshold")
+	}
+
 	var r0 coreconfig.Threshold
 	if rf, ok := ret.Get(0).(func() coreconfig.Threshold); ok {
 		r0 = rf()
@@ -501,6 +621,10 @@ func (_m *ChainScopedConfig) Threshold() coreconfig.Threshold {
 func (_m *ChainScopedConfig) Tracing() coreconfig.Tracing {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Tracing")
+	}
+
 	var r0 coreconfig.Tracing
 	if rf, ok := ret.Get(0).(func() coreconfig.Tracing); ok {
 		r0 = rf()
@@ -517,6 +641,10 @@ func (_m *ChainScopedConfig) Tracing() coreconfig.Tracing {
 func (_m *ChainScopedConfig) Validate() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Validate")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -531,6 +659,10 @@ func (_m *ChainScopedConfig) Validate() error {
 func (_m *ChainScopedConfig) ValidateDB() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ValidateDB")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -545,6 +677,10 @@ func (_m *ChainScopedConfig) ValidateDB() error {
 func (_m *ChainScopedConfig) WebServer() coreconfig.WebServer {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for WebServer")
+	}
+
 	var r0 coreconfig.WebServer
 	if rf, ok := ret.Get(0).(func() coreconfig.WebServer); ok {
 		r0 = rf()
diff --git a/core/chains/evm/config/mocks/gas_estimator.go b/core/chains/evm/config/mocks/gas_estimator.go
index 6260b3cd501..69a2c852757 100644
--- a/core/chains/evm/config/mocks/gas_estimator.go
+++ b/core/chains/evm/config/mocks/gas_estimator.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -20,6 +20,10 @@ type GasEstimator struct {
 func (_m *GasEstimator) BlockHistory() config.BlockHistory {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockHistory")
+	}
+
 	var r0 config.BlockHistory
 	if rf, ok := ret.Get(0).(func() config.BlockHistory); ok {
 		r0 = rf()
@@ -36,6 +40,10 @@ func (_m *GasEstimator) BlockHistory() config.BlockHistory {
 func (_m *GasEstimator) BumpMin() *assets.Wei {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BumpMin")
+	}
+
 	var r0 *assets.Wei
 	if rf, ok := ret.Get(0).(func() *assets.Wei); ok {
 		r0 = rf()
@@ -52,6 +60,10 @@ func (_m *GasEstimator) BumpMin() *assets.Wei {
 func (_m *GasEstimator) BumpPercent() uint16 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BumpPercent")
+	}
+
 	var r0 uint16
 	if rf, ok := ret.Get(0).(func() uint16); ok {
 		r0 = rf()
@@ -66,6 +78,10 @@ func (_m *GasEstimator) BumpPercent() uint16 {
 func (_m *GasEstimator) BumpThreshold() uint64 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BumpThreshold")
+	}
+
 	var r0 uint64
 	if rf, ok := ret.Get(0).(func() uint64); ok {
 		r0 = rf()
@@ -80,6 +96,10 @@ func (_m *GasEstimator) BumpThreshold() uint64 {
 func (_m *GasEstimator) BumpTxDepth() uint32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BumpTxDepth")
+	}
+
 	var r0 uint32
 	if rf, ok := ret.Get(0).(func() uint32); ok {
 		r0 = rf()
@@ -94,6 +114,10 @@ func (_m *GasEstimator) BumpTxDepth() uint32 {
 func (_m *GasEstimator) EIP1559DynamicFees() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EIP1559DynamicFees")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -108,6 +132,10 @@ func (_m *GasEstimator) EIP1559DynamicFees() bool {
 func (_m *GasEstimator) FeeCapDefault() *assets.Wei {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for FeeCapDefault")
+	}
+
 	var r0 *assets.Wei
 	if rf, ok := ret.Get(0).(func() *assets.Wei); ok {
 		r0 = rf()
@@ -124,6 +152,10 @@ func (_m *GasEstimator) FeeCapDefault() *assets.Wei {
 func (_m *GasEstimator) LimitDefault() uint32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LimitDefault")
+	}
+
 	var r0 uint32
 	if rf, ok := ret.Get(0).(func() uint32); ok {
 		r0 = rf()
@@ -138,6 +170,10 @@ func (_m *GasEstimator) LimitDefault() uint32 {
 func (_m *GasEstimator) LimitJobType() config.LimitJobType {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LimitJobType")
+	}
+
 	var r0 config.LimitJobType
 	if rf, ok := ret.Get(0).(func() config.LimitJobType); ok {
 		r0 = rf()
@@ -154,6 +190,10 @@ func (_m *GasEstimator) LimitJobType() config.LimitJobType {
 func (_m *GasEstimator) LimitMax() uint32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LimitMax")
+	}
+
 	var r0 uint32
 	if rf, ok := ret.Get(0).(func() uint32); ok {
 		r0 = rf()
@@ -168,6 +208,10 @@ func (_m *GasEstimator) LimitMax() uint32 {
 func (_m *GasEstimator) LimitMultiplier() float32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LimitMultiplier")
+	}
+
 	var r0 float32
 	if rf, ok := ret.Get(0).(func() float32); ok {
 		r0 = rf()
@@ -182,6 +226,10 @@ func (_m *GasEstimator) LimitMultiplier() float32 {
 func (_m *GasEstimator) LimitTransfer() uint32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LimitTransfer")
+	}
+
 	var r0 uint32
 	if rf, ok := ret.Get(0).(func() uint32); ok {
 		r0 = rf()
@@ -196,6 +244,10 @@ func (_m *GasEstimator) LimitTransfer() uint32 {
 func (_m *GasEstimator) Mode() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Mode")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -210,6 +262,10 @@ func (_m *GasEstimator) Mode() string {
 func (_m *GasEstimator) PriceDefault() *assets.Wei {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for PriceDefault")
+	}
+
 	var r0 *assets.Wei
 	if rf, ok := ret.Get(0).(func() *assets.Wei); ok {
 		r0 = rf()
@@ -226,6 +282,10 @@ func (_m *GasEstimator) PriceDefault() *assets.Wei {
 func (_m *GasEstimator) PriceMax() *assets.Wei {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for PriceMax")
+	}
+
 	var r0 *assets.Wei
 	if rf, ok := ret.Get(0).(func() *assets.Wei); ok {
 		r0 = rf()
@@ -242,6 +302,10 @@ func (_m *GasEstimator) PriceMax() *assets.Wei {
 func (_m *GasEstimator) PriceMaxKey(_a0 common.Address) *assets.Wei {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PriceMaxKey")
+	}
+
 	var r0 *assets.Wei
 	if rf, ok := ret.Get(0).(func(common.Address) *assets.Wei); ok {
 		r0 = rf(_a0)
@@ -258,6 +322,10 @@ func (_m *GasEstimator) PriceMaxKey(_a0 common.Address) *assets.Wei {
 func (_m *GasEstimator) PriceMin() *assets.Wei {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for PriceMin")
+	}
+
 	var r0 *assets.Wei
 	if rf, ok := ret.Get(0).(func() *assets.Wei); ok {
 		r0 = rf()
@@ -274,6 +342,10 @@ func (_m *GasEstimator) PriceMin() *assets.Wei {
 func (_m *GasEstimator) TipCapDefault() *assets.Wei {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for TipCapDefault")
+	}
+
 	var r0 *assets.Wei
 	if rf, ok := ret.Get(0).(func() *assets.Wei); ok {
 		r0 = rf()
@@ -290,6 +362,10 @@ func (_m *GasEstimator) TipCapDefault() *assets.Wei {
 func (_m *GasEstimator) TipCapMin() *assets.Wei {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for TipCapMin")
+	}
+
 	var r0 *assets.Wei
 	if rf, ok := ret.Get(0).(func() *assets.Wei); ok {
 		r0 = rf()
diff --git a/core/chains/evm/forwarders/mocks/orm.go b/core/chains/evm/forwarders/mocks/orm.go
index e8ab62ce7de..c06a04b8eb1 100644
--- a/core/chains/evm/forwarders/mocks/orm.go
+++ b/core/chains/evm/forwarders/mocks/orm.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -21,6 +21,10 @@ type ORM struct {
 func (_m *ORM) CreateForwarder(addr common.Address, evmChainId utils.Big) (forwarders.Forwarder, error) {
 	ret := _m.Called(addr, evmChainId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateForwarder")
+	}
+
 	var r0 forwarders.Forwarder
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Address, utils.Big) (forwarders.Forwarder, error)); ok {
@@ -45,6 +49,10 @@ func (_m *ORM) CreateForwarder(addr common.Address, evmChainId utils.Big) (forwa
 func (_m *ORM) DeleteForwarder(id int64, cleanup func(pg.Queryer, int64, common.Address) error) error {
 	ret := _m.Called(id, cleanup)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteForwarder")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int64, func(pg.Queryer, int64, common.Address) error) error); ok {
 		r0 = rf(id, cleanup)
@@ -59,6 +67,10 @@ func (_m *ORM) DeleteForwarder(id int64, cleanup func(pg.Queryer, int64, common.
 func (_m *ORM) FindForwarders(offset int, limit int) ([]forwarders.Forwarder, int, error) {
 	ret := _m.Called(offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindForwarders")
+	}
+
 	var r0 []forwarders.Forwarder
 	var r1 int
 	var r2 error
@@ -92,6 +104,10 @@ func (_m *ORM) FindForwarders(offset int, limit int) ([]forwarders.Forwarder, in
 func (_m *ORM) FindForwardersByChain(evmChainId utils.Big) ([]forwarders.Forwarder, error) {
 	ret := _m.Called(evmChainId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindForwardersByChain")
+	}
+
 	var r0 []forwarders.Forwarder
 	var r1 error
 	if rf, ok := ret.Get(0).(func(utils.Big) ([]forwarders.Forwarder, error)); ok {
@@ -118,6 +134,10 @@ func (_m *ORM) FindForwardersByChain(evmChainId utils.Big) ([]forwarders.Forward
 func (_m *ORM) FindForwardersInListByChain(evmChainId utils.Big, addrs []common.Address) ([]forwarders.Forwarder, error) {
 	ret := _m.Called(evmChainId, addrs)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindForwardersInListByChain")
+	}
+
 	var r0 []forwarders.Forwarder
 	var r1 error
 	if rf, ok := ret.Get(0).(func(utils.Big, []common.Address) ([]forwarders.Forwarder, error)); ok {
diff --git a/core/chains/evm/gas/mocks/config.go b/core/chains/evm/gas/mocks/config.go
index c09005b5e3d..4a7b6f4d7eb 100644
--- a/core/chains/evm/gas/mocks/config.go
+++ b/core/chains/evm/gas/mocks/config.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type Config struct {
 func (_m *Config) ChainType() config.ChainType {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChainType")
+	}
+
 	var r0 config.ChainType
 	if rf, ok := ret.Get(0).(func() config.ChainType); ok {
 		r0 = rf()
@@ -31,6 +35,10 @@ func (_m *Config) ChainType() config.ChainType {
 func (_m *Config) FinalityDepth() uint32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for FinalityDepth")
+	}
+
 	var r0 uint32
 	if rf, ok := ret.Get(0).(func() uint32); ok {
 		r0 = rf()
@@ -45,6 +53,10 @@ func (_m *Config) FinalityDepth() uint32 {
 func (_m *Config) FinalityTagEnabled() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for FinalityTagEnabled")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
diff --git a/core/chains/evm/gas/mocks/eth_client.go b/core/chains/evm/gas/mocks/eth_client.go
index 2b0aaff0257..bb0784f8515 100644
--- a/core/chains/evm/gas/mocks/eth_client.go
+++ b/core/chains/evm/gas/mocks/eth_client.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -20,6 +20,10 @@ type ETHClient struct {
 func (_m *ETHClient) CallContract(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) ([]byte, error) {
 	ret := _m.Called(ctx, msg, blockNumber)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CallContract")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ethereum.CallMsg, *big.Int) ([]byte, error)); ok {
diff --git a/core/chains/evm/gas/mocks/evm_estimator.go b/core/chains/evm/gas/mocks/evm_estimator.go
index f2cb51f8560..29705b2a5d9 100644
--- a/core/chains/evm/gas/mocks/evm_estimator.go
+++ b/core/chains/evm/gas/mocks/evm_estimator.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -25,6 +25,10 @@ type EvmEstimator struct {
 func (_m *EvmEstimator) BumpDynamicFee(ctx context.Context, original gas.DynamicFee, gasLimit uint32, maxGasPriceWei *assets.Wei, attempts []gas.EvmPriorAttempt) (gas.DynamicFee, uint32, error) {
 	ret := _m.Called(ctx, original, gasLimit, maxGasPriceWei, attempts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BumpDynamicFee")
+	}
+
 	var r0 gas.DynamicFee
 	var r1 uint32
 	var r2 error
@@ -56,6 +60,10 @@ func (_m *EvmEstimator) BumpDynamicFee(ctx context.Context, original gas.Dynamic
 func (_m *EvmEstimator) BumpLegacyGas(ctx context.Context, originalGasPrice *assets.Wei, gasLimit uint32, maxGasPriceWei *assets.Wei, attempts []gas.EvmPriorAttempt) (*assets.Wei, uint32, error) {
 	ret := _m.Called(ctx, originalGasPrice, gasLimit, maxGasPriceWei, attempts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BumpLegacyGas")
+	}
+
 	var r0 *assets.Wei
 	var r1 uint32
 	var r2 error
@@ -89,6 +97,10 @@ func (_m *EvmEstimator) BumpLegacyGas(ctx context.Context, originalGasPrice *ass
 func (_m *EvmEstimator) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -103,6 +115,10 @@ func (_m *EvmEstimator) Close() error {
 func (_m *EvmEstimator) GetDynamicFee(ctx context.Context, gasLimit uint32, maxGasPriceWei *assets.Wei) (gas.DynamicFee, uint32, error) {
 	ret := _m.Called(ctx, gasLimit, maxGasPriceWei)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetDynamicFee")
+	}
+
 	var r0 gas.DynamicFee
 	var r1 uint32
 	var r2 error
@@ -141,6 +157,10 @@ func (_m *EvmEstimator) GetLegacyGas(ctx context.Context, calldata []byte, gasLi
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetLegacyGas")
+	}
+
 	var r0 *assets.Wei
 	var r1 uint32
 	var r2 error
@@ -174,6 +194,10 @@ func (_m *EvmEstimator) GetLegacyGas(ctx context.Context, calldata []byte, gasLi
 func (_m *EvmEstimator) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -190,6 +214,10 @@ func (_m *EvmEstimator) HealthReport() map[string]error {
 func (_m *EvmEstimator) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -209,6 +237,10 @@ func (_m *EvmEstimator) OnNewLongestChain(ctx context.Context, head *evmtypes.He
 func (_m *EvmEstimator) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -223,6 +255,10 @@ func (_m *EvmEstimator) Ready() error {
 func (_m *EvmEstimator) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/chains/evm/gas/mocks/evm_fee_estimator.go b/core/chains/evm/gas/mocks/evm_fee_estimator.go
index b9b16367796..66acbdbf7ff 100644
--- a/core/chains/evm/gas/mocks/evm_fee_estimator.go
+++ b/core/chains/evm/gas/mocks/evm_fee_estimator.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -29,6 +29,10 @@ type EvmFeeEstimator struct {
 func (_m *EvmFeeEstimator) BumpFee(ctx context.Context, originalFee gas.EvmFee, feeLimit uint32, maxFeePrice *assets.Wei, attempts []gas.EvmPriorAttempt) (gas.EvmFee, uint32, error) {
 	ret := _m.Called(ctx, originalFee, feeLimit, maxFeePrice, attempts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BumpFee")
+	}
+
 	var r0 gas.EvmFee
 	var r1 uint32
 	var r2 error
@@ -60,6 +64,10 @@ func (_m *EvmFeeEstimator) BumpFee(ctx context.Context, originalFee gas.EvmFee,
 func (_m *EvmFeeEstimator) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -81,6 +89,10 @@ func (_m *EvmFeeEstimator) GetFee(ctx context.Context, calldata []byte, feeLimit
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetFee")
+	}
+
 	var r0 gas.EvmFee
 	var r1 uint32
 	var r2 error
@@ -119,6 +131,10 @@ func (_m *EvmFeeEstimator) GetMaxCost(ctx context.Context, amount assets.Eth, ca
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetMaxCost")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, assets.Eth, []byte, uint32, *assets.Wei, ...types.Opt) (*big.Int, error)); ok {
@@ -145,6 +161,10 @@ func (_m *EvmFeeEstimator) GetMaxCost(ctx context.Context, amount assets.Eth, ca
 func (_m *EvmFeeEstimator) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -161,6 +181,10 @@ func (_m *EvmFeeEstimator) HealthReport() map[string]error {
 func (_m *EvmFeeEstimator) L1Oracle() rollups.L1Oracle {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for L1Oracle")
+	}
+
 	var r0 rollups.L1Oracle
 	if rf, ok := ret.Get(0).(func() rollups.L1Oracle); ok {
 		r0 = rf()
@@ -177,6 +201,10 @@ func (_m *EvmFeeEstimator) L1Oracle() rollups.L1Oracle {
 func (_m *EvmFeeEstimator) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -196,6 +224,10 @@ func (_m *EvmFeeEstimator) OnNewLongestChain(ctx context.Context, head *evmtypes
 func (_m *EvmFeeEstimator) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -210,6 +242,10 @@ func (_m *EvmFeeEstimator) Ready() error {
 func (_m *EvmFeeEstimator) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/chains/evm/gas/mocks/rpc_client.go b/core/chains/evm/gas/mocks/rpc_client.go
index 6f6ac8d6b79..d1262665f66 100644
--- a/core/chains/evm/gas/mocks/rpc_client.go
+++ b/core/chains/evm/gas/mocks/rpc_client.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -20,6 +20,10 @@ func (_m *RPCClient) CallContext(ctx context.Context, result interface{}, method
 	_ca = append(_ca, args...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CallContext")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, interface{}, string, ...interface{}) error); ok {
 		r0 = rf(ctx, result, method, args...)
diff --git a/core/chains/evm/gas/rollups/mocks/eth_client.go b/core/chains/evm/gas/rollups/mocks/eth_client.go
index 2b0aaff0257..bb0784f8515 100644
--- a/core/chains/evm/gas/rollups/mocks/eth_client.go
+++ b/core/chains/evm/gas/rollups/mocks/eth_client.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -20,6 +20,10 @@ type ETHClient struct {
 func (_m *ETHClient) CallContract(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) ([]byte, error) {
 	ret := _m.Called(ctx, msg, blockNumber)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CallContract")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ethereum.CallMsg, *big.Int) ([]byte, error)); ok {
diff --git a/core/chains/evm/gas/rollups/mocks/l1_oracle.go b/core/chains/evm/gas/rollups/mocks/l1_oracle.go
index f6f8cc736af..9e52a3ec38e 100644
--- a/core/chains/evm/gas/rollups/mocks/l1_oracle.go
+++ b/core/chains/evm/gas/rollups/mocks/l1_oracle.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -19,6 +19,10 @@ type L1Oracle struct {
 func (_m *L1Oracle) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -33,6 +37,10 @@ func (_m *L1Oracle) Close() error {
 func (_m *L1Oracle) GasPrice(ctx context.Context) (*assets.Wei, error) {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GasPrice")
+	}
+
 	var r0 *assets.Wei
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (*assets.Wei, error)); ok {
@@ -59,6 +67,10 @@ func (_m *L1Oracle) GasPrice(ctx context.Context) (*assets.Wei, error) {
 func (_m *L1Oracle) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -75,6 +87,10 @@ func (_m *L1Oracle) HealthReport() map[string]error {
 func (_m *L1Oracle) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -89,6 +105,10 @@ func (_m *L1Oracle) Name() string {
 func (_m *L1Oracle) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -103,6 +123,10 @@ func (_m *L1Oracle) Ready() error {
 func (_m *L1Oracle) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/chains/evm/headtracker/mocks/config.go b/core/chains/evm/headtracker/mocks/config.go
index b505cfc445d..74376a71362 100644
--- a/core/chains/evm/headtracker/mocks/config.go
+++ b/core/chains/evm/headtracker/mocks/config.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type Config struct {
 func (_m *Config) BlockEmissionIdleWarningThreshold() time.Duration {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockEmissionIdleWarningThreshold")
+	}
+
 	var r0 time.Duration
 	if rf, ok := ret.Get(0).(func() time.Duration); ok {
 		r0 = rf()
@@ -31,6 +35,10 @@ func (_m *Config) BlockEmissionIdleWarningThreshold() time.Duration {
 func (_m *Config) FinalityDepth() uint32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for FinalityDepth")
+	}
+
 	var r0 uint32
 	if rf, ok := ret.Get(0).(func() uint32); ok {
 		r0 = rf()
diff --git a/core/chains/evm/log/mocks/abigen_contract.go b/core/chains/evm/log/mocks/abigen_contract.go
index dcc95a1acdb..fde8949e4fe 100644
--- a/core/chains/evm/log/mocks/abigen_contract.go
+++ b/core/chains/evm/log/mocks/abigen_contract.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -20,6 +20,10 @@ type AbigenContract struct {
 func (_m *AbigenContract) Address() common.Address {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Address")
+	}
+
 	var r0 common.Address
 	if rf, ok := ret.Get(0).(func() common.Address); ok {
 		r0 = rf()
@@ -36,6 +40,10 @@ func (_m *AbigenContract) Address() common.Address {
 func (_m *AbigenContract) ParseLog(_a0 types.Log) (generated.AbigenLog, error) {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseLog")
+	}
+
 	var r0 generated.AbigenLog
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (generated.AbigenLog, error)); ok {
diff --git a/core/chains/evm/log/mocks/broadcast.go b/core/chains/evm/log/mocks/broadcast.go
index a58ce9f30e4..6d9a83716d5 100644
--- a/core/chains/evm/log/mocks/broadcast.go
+++ b/core/chains/evm/log/mocks/broadcast.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -21,6 +21,10 @@ type Broadcast struct {
 func (_m *Broadcast) DecodedLog() interface{} {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for DecodedLog")
+	}
+
 	var r0 interface{}
 	if rf, ok := ret.Get(0).(func() interface{}); ok {
 		r0 = rf()
@@ -37,6 +41,10 @@ func (_m *Broadcast) DecodedLog() interface{} {
 func (_m *Broadcast) EVMChainID() big.Int {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EVMChainID")
+	}
+
 	var r0 big.Int
 	if rf, ok := ret.Get(0).(func() big.Int); ok {
 		r0 = rf()
@@ -51,6 +59,10 @@ func (_m *Broadcast) EVMChainID() big.Int {
 func (_m *Broadcast) JobID() int32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for JobID")
+	}
+
 	var r0 int32
 	if rf, ok := ret.Get(0).(func() int32); ok {
 		r0 = rf()
@@ -65,6 +77,10 @@ func (_m *Broadcast) JobID() int32 {
 func (_m *Broadcast) LatestBlockHash() common.Hash {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestBlockHash")
+	}
+
 	var r0 common.Hash
 	if rf, ok := ret.Get(0).(func() common.Hash); ok {
 		r0 = rf()
@@ -81,6 +97,10 @@ func (_m *Broadcast) LatestBlockHash() common.Hash {
 func (_m *Broadcast) LatestBlockNumber() uint64 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestBlockNumber")
+	}
+
 	var r0 uint64
 	if rf, ok := ret.Get(0).(func() uint64); ok {
 		r0 = rf()
@@ -95,6 +115,10 @@ func (_m *Broadcast) LatestBlockNumber() uint64 {
 func (_m *Broadcast) RawLog() types.Log {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for RawLog")
+	}
+
 	var r0 types.Log
 	if rf, ok := ret.Get(0).(func() types.Log); ok {
 		r0 = rf()
@@ -109,6 +133,10 @@ func (_m *Broadcast) RawLog() types.Log {
 func (_m *Broadcast) ReceiptsRoot() common.Hash {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ReceiptsRoot")
+	}
+
 	var r0 common.Hash
 	if rf, ok := ret.Get(0).(func() common.Hash); ok {
 		r0 = rf()
@@ -125,6 +153,10 @@ func (_m *Broadcast) ReceiptsRoot() common.Hash {
 func (_m *Broadcast) StateRoot() common.Hash {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for StateRoot")
+	}
+
 	var r0 common.Hash
 	if rf, ok := ret.Get(0).(func() common.Hash); ok {
 		r0 = rf()
@@ -141,6 +173,10 @@ func (_m *Broadcast) StateRoot() common.Hash {
 func (_m *Broadcast) String() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for String")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -155,6 +191,10 @@ func (_m *Broadcast) String() string {
 func (_m *Broadcast) TransactionsRoot() common.Hash {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransactionsRoot")
+	}
+
 	var r0 common.Hash
 	if rf, ok := ret.Get(0).(func() common.Hash); ok {
 		r0 = rf()
diff --git a/core/chains/evm/log/mocks/broadcaster.go b/core/chains/evm/log/mocks/broadcaster.go
index 84f143b39e4..031bdaaa7d9 100644
--- a/core/chains/evm/log/mocks/broadcaster.go
+++ b/core/chains/evm/log/mocks/broadcaster.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -27,6 +27,10 @@ func (_m *Broadcaster) AddDependents(n int) {
 func (_m *Broadcaster) AwaitDependents() <-chan struct{} {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for AwaitDependents")
+	}
+
 	var r0 <-chan struct{}
 	if rf, ok := ret.Get(0).(func() <-chan struct{}); ok {
 		r0 = rf()
@@ -43,6 +47,10 @@ func (_m *Broadcaster) AwaitDependents() <-chan struct{} {
 func (_m *Broadcaster) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -62,6 +70,10 @@ func (_m *Broadcaster) DependentReady() {
 func (_m *Broadcaster) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -78,6 +90,10 @@ func (_m *Broadcaster) HealthReport() map[string]error {
 func (_m *Broadcaster) IsConnected() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsConnected")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -99,6 +115,10 @@ func (_m *Broadcaster) MarkConsumed(lb log.Broadcast, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MarkConsumed")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(log.Broadcast, ...pg.QOpt) error); ok {
 		r0 = rf(lb, qopts...)
@@ -120,6 +140,10 @@ func (_m *Broadcaster) MarkManyConsumed(lbs []log.Broadcast, qopts ...pg.QOpt) e
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MarkManyConsumed")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func([]log.Broadcast, ...pg.QOpt) error); ok {
 		r0 = rf(lbs, qopts...)
@@ -134,6 +158,10 @@ func (_m *Broadcaster) MarkManyConsumed(lbs []log.Broadcast, qopts ...pg.QOpt) e
 func (_m *Broadcaster) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -153,6 +181,10 @@ func (_m *Broadcaster) OnNewLongestChain(ctx context.Context, head *types.Head)
 func (_m *Broadcaster) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -167,6 +199,10 @@ func (_m *Broadcaster) Ready() error {
 func (_m *Broadcaster) Register(listener log.Listener, opts log.ListenerOpts) func() {
 	ret := _m.Called(listener, opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Register")
+	}
+
 	var r0 func()
 	if rf, ok := ret.Get(0).(func(log.Listener, log.ListenerOpts) func()); ok {
 		r0 = rf(listener, opts)
@@ -188,6 +224,10 @@ func (_m *Broadcaster) ReplayFromBlock(number int64, forceBroadcast bool) {
 func (_m *Broadcaster) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
@@ -209,6 +249,10 @@ func (_m *Broadcaster) WasAlreadyConsumed(lb log.Broadcast, qopts ...pg.QOpt) (b
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WasAlreadyConsumed")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(log.Broadcast, ...pg.QOpt) (bool, error)); ok {
diff --git a/core/chains/evm/logpoller/mocks/log_poller.go b/core/chains/evm/logpoller/mocks/log_poller.go
index fe4ccc965cc..65d808b98d5 100644
--- a/core/chains/evm/logpoller/mocks/log_poller.go
+++ b/core/chains/evm/logpoller/mocks/log_poller.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -25,6 +25,10 @@ type LogPoller struct {
 func (_m *LogPoller) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -46,6 +50,10 @@ func (_m *LogPoller) GetBlocksRange(ctx context.Context, numbers []uint64, qopts
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetBlocksRange")
+	}
+
 	var r0 []logpoller.LogPollerBlock
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, []uint64, ...pg.QOpt) ([]logpoller.LogPollerBlock, error)); ok {
@@ -72,6 +80,10 @@ func (_m *LogPoller) GetBlocksRange(ctx context.Context, numbers []uint64, qopts
 func (_m *LogPoller) HasFilter(name string) bool {
 	ret := _m.Called(name)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HasFilter")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func(string) bool); ok {
 		r0 = rf(name)
@@ -86,6 +98,10 @@ func (_m *LogPoller) HasFilter(name string) bool {
 func (_m *LogPoller) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -109,6 +125,10 @@ func (_m *LogPoller) IndexedLogs(eventSig common.Hash, address common.Address, t
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IndexedLogs")
+	}
+
 	var r0 []logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Hash, common.Address, int, []common.Hash, logpoller.Confirmations, ...pg.QOpt) ([]logpoller.Log, error)); ok {
@@ -142,6 +162,10 @@ func (_m *LogPoller) IndexedLogsByBlockRange(start int64, end int64, eventSig co
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IndexedLogsByBlockRange")
+	}
+
 	var r0 []logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, int64, common.Hash, common.Address, int, []common.Hash, ...pg.QOpt) ([]logpoller.Log, error)); ok {
@@ -175,6 +199,10 @@ func (_m *LogPoller) IndexedLogsByTxHash(eventSig common.Hash, address common.Ad
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IndexedLogsByTxHash")
+	}
+
 	var r0 []logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Hash, common.Address, common.Hash, ...pg.QOpt) ([]logpoller.Log, error)); ok {
@@ -208,6 +236,10 @@ func (_m *LogPoller) IndexedLogsCreatedAfter(eventSig common.Hash, address commo
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IndexedLogsCreatedAfter")
+	}
+
 	var r0 []logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Hash, common.Address, int, []common.Hash, time.Time, logpoller.Confirmations, ...pg.QOpt) ([]logpoller.Log, error)); ok {
@@ -241,6 +273,10 @@ func (_m *LogPoller) IndexedLogsTopicGreaterThan(eventSig common.Hash, address c
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IndexedLogsTopicGreaterThan")
+	}
+
 	var r0 []logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Hash, common.Address, int, common.Hash, logpoller.Confirmations, ...pg.QOpt) ([]logpoller.Log, error)); ok {
@@ -274,6 +310,10 @@ func (_m *LogPoller) IndexedLogsTopicRange(eventSig common.Hash, address common.
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IndexedLogsTopicRange")
+	}
+
 	var r0 []logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Hash, common.Address, int, common.Hash, common.Hash, logpoller.Confirmations, ...pg.QOpt) ([]logpoller.Log, error)); ok {
@@ -307,6 +347,10 @@ func (_m *LogPoller) IndexedLogsWithSigsExcluding(address common.Address, eventS
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IndexedLogsWithSigsExcluding")
+	}
+
 	var r0 []logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Address, common.Hash, common.Hash, int, int64, int64, logpoller.Confirmations, ...pg.QOpt) ([]logpoller.Log, error)); ok {
@@ -339,6 +383,10 @@ func (_m *LogPoller) LatestBlock(qopts ...pg.QOpt) (logpoller.LogPollerBlock, er
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestBlock")
+	}
+
 	var r0 logpoller.LogPollerBlock
 	var r1 error
 	if rf, ok := ret.Get(0).(func(...pg.QOpt) (logpoller.LogPollerBlock, error)); ok {
@@ -370,6 +418,10 @@ func (_m *LogPoller) LatestBlockByEventSigsAddrsWithConfs(fromBlock int64, event
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestBlockByEventSigsAddrsWithConfs")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, []common.Hash, []common.Address, logpoller.Confirmations, ...pg.QOpt) (int64, error)); ok {
@@ -401,6 +453,10 @@ func (_m *LogPoller) LatestLogByEventSigWithConfs(eventSig common.Hash, address
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestLogByEventSigWithConfs")
+	}
+
 	var r0 *logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Hash, common.Address, logpoller.Confirmations, ...pg.QOpt) (*logpoller.Log, error)); ok {
@@ -434,6 +490,10 @@ func (_m *LogPoller) LatestLogEventSigsAddrsWithConfs(fromBlock int64, eventSigs
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestLogEventSigsAddrsWithConfs")
+	}
+
 	var r0 []logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, []common.Hash, []common.Address, logpoller.Confirmations, ...pg.QOpt) ([]logpoller.Log, error)); ok {
@@ -467,6 +527,10 @@ func (_m *LogPoller) Logs(start int64, end int64, eventSig common.Hash, address
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Logs")
+	}
+
 	var r0 []logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, int64, common.Hash, common.Address, ...pg.QOpt) ([]logpoller.Log, error)); ok {
@@ -500,6 +564,10 @@ func (_m *LogPoller) LogsCreatedAfter(eventSig common.Hash, address common.Addre
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LogsCreatedAfter")
+	}
+
 	var r0 []logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Hash, common.Address, time.Time, logpoller.Confirmations, ...pg.QOpt) ([]logpoller.Log, error)); ok {
@@ -533,6 +601,10 @@ func (_m *LogPoller) LogsDataWordBetween(eventSig common.Hash, address common.Ad
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LogsDataWordBetween")
+	}
+
 	var r0 []logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Hash, common.Address, int, int, common.Hash, logpoller.Confirmations, ...pg.QOpt) ([]logpoller.Log, error)); ok {
@@ -566,6 +638,10 @@ func (_m *LogPoller) LogsDataWordGreaterThan(eventSig common.Hash, address commo
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LogsDataWordGreaterThan")
+	}
+
 	var r0 []logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Hash, common.Address, int, common.Hash, logpoller.Confirmations, ...pg.QOpt) ([]logpoller.Log, error)); ok {
@@ -599,6 +675,10 @@ func (_m *LogPoller) LogsDataWordRange(eventSig common.Hash, address common.Addr
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LogsDataWordRange")
+	}
+
 	var r0 []logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Hash, common.Address, int, common.Hash, common.Hash, logpoller.Confirmations, ...pg.QOpt) ([]logpoller.Log, error)); ok {
@@ -632,6 +712,10 @@ func (_m *LogPoller) LogsWithSigs(start int64, end int64, eventSigs []common.Has
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LogsWithSigs")
+	}
+
 	var r0 []logpoller.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, int64, []common.Hash, common.Address, ...pg.QOpt) ([]logpoller.Log, error)); ok {
@@ -658,6 +742,10 @@ func (_m *LogPoller) LogsWithSigs(start int64, end int64, eventSigs []common.Has
 func (_m *LogPoller) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -672,6 +760,10 @@ func (_m *LogPoller) Name() string {
 func (_m *LogPoller) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -693,6 +785,10 @@ func (_m *LogPoller) RegisterFilter(filter logpoller.Filter, qopts ...pg.QOpt) e
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RegisterFilter")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(logpoller.Filter, ...pg.QOpt) error); ok {
 		r0 = rf(filter, qopts...)
@@ -707,6 +803,10 @@ func (_m *LogPoller) RegisterFilter(filter logpoller.Filter, qopts ...pg.QOpt) e
 func (_m *LogPoller) Replay(ctx context.Context, fromBlock int64) error {
 	ret := _m.Called(ctx, fromBlock)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Replay")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64) error); ok {
 		r0 = rf(ctx, fromBlock)
@@ -726,6 +826,10 @@ func (_m *LogPoller) ReplayAsync(fromBlock int64) {
 func (_m *LogPoller) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
@@ -747,6 +851,10 @@ func (_m *LogPoller) UnregisterFilter(name string, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UnregisterFilter")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, ...pg.QOpt) error); ok {
 		r0 = rf(name, qopts...)
diff --git a/core/chains/evm/mocks/balance_monitor.go b/core/chains/evm/mocks/balance_monitor.go
index cdda18b7f03..f03fd8829cc 100644
--- a/core/chains/evm/mocks/balance_monitor.go
+++ b/core/chains/evm/mocks/balance_monitor.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -22,6 +22,10 @@ type BalanceMonitor struct {
 func (_m *BalanceMonitor) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -36,6 +40,10 @@ func (_m *BalanceMonitor) Close() error {
 func (_m *BalanceMonitor) GetEthBalance(_a0 common.Address) *assets.Eth {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetEthBalance")
+	}
+
 	var r0 *assets.Eth
 	if rf, ok := ret.Get(0).(func(common.Address) *assets.Eth); ok {
 		r0 = rf(_a0)
@@ -52,6 +60,10 @@ func (_m *BalanceMonitor) GetEthBalance(_a0 common.Address) *assets.Eth {
 func (_m *BalanceMonitor) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -68,6 +80,10 @@ func (_m *BalanceMonitor) HealthReport() map[string]error {
 func (_m *BalanceMonitor) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -87,6 +103,10 @@ func (_m *BalanceMonitor) OnNewLongestChain(ctx context.Context, head *types.Hea
 func (_m *BalanceMonitor) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -101,6 +121,10 @@ func (_m *BalanceMonitor) Ready() error {
 func (_m *BalanceMonitor) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/chains/evm/mocks/node.go b/core/chains/evm/mocks/node.go
index 69020d411f4..8f27218aec7 100644
--- a/core/chains/evm/mocks/node.go
+++ b/core/chains/evm/mocks/node.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -30,6 +30,10 @@ type Node struct {
 func (_m *Node) BalanceAt(ctx context.Context, account common.Address, blockNumber *big.Int) (*big.Int, error) {
 	ret := _m.Called(ctx, account, blockNumber)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BalanceAt")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, *big.Int) (*big.Int, error)); ok {
@@ -56,6 +60,10 @@ func (_m *Node) BalanceAt(ctx context.Context, account common.Address, blockNumb
 func (_m *Node) BatchCallContext(ctx context.Context, b []rpc.BatchElem) error {
 	ret := _m.Called(ctx, b)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BatchCallContext")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, []rpc.BatchElem) error); ok {
 		r0 = rf(ctx, b)
@@ -70,6 +78,10 @@ func (_m *Node) BatchCallContext(ctx context.Context, b []rpc.BatchElem) error {
 func (_m *Node) BlockByHash(ctx context.Context, hash common.Hash) (*types.Block, error) {
 	ret := _m.Called(ctx, hash)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockByHash")
+	}
+
 	var r0 *types.Block
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Hash) (*types.Block, error)); ok {
@@ -96,6 +108,10 @@ func (_m *Node) BlockByHash(ctx context.Context, hash common.Hash) (*types.Block
 func (_m *Node) BlockByNumber(ctx context.Context, number *big.Int) (*types.Block, error) {
 	ret := _m.Called(ctx, number)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockByNumber")
+	}
+
 	var r0 *types.Block
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) (*types.Block, error)); ok {
@@ -122,6 +138,10 @@ func (_m *Node) BlockByNumber(ctx context.Context, number *big.Int) (*types.Bloc
 func (_m *Node) BlockNumber(ctx context.Context) (uint64, error) {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BlockNumber")
+	}
+
 	var r0 uint64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (uint64, error)); ok {
@@ -149,6 +169,10 @@ func (_m *Node) CallContext(ctx context.Context, result interface{}, method stri
 	_ca = append(_ca, args...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CallContext")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, interface{}, string, ...interface{}) error); ok {
 		r0 = rf(ctx, result, method, args...)
@@ -163,6 +187,10 @@ func (_m *Node) CallContext(ctx context.Context, result interface{}, method stri
 func (_m *Node) CallContract(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) ([]byte, error) {
 	ret := _m.Called(ctx, msg, blockNumber)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CallContract")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ethereum.CallMsg, *big.Int) ([]byte, error)); ok {
@@ -189,6 +217,10 @@ func (_m *Node) CallContract(ctx context.Context, msg ethereum.CallMsg, blockNum
 func (_m *Node) ChainID() *big.Int {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChainID")
+	}
+
 	var r0 *big.Int
 	if rf, ok := ret.Get(0).(func() *big.Int); ok {
 		r0 = rf()
@@ -205,6 +237,10 @@ func (_m *Node) ChainID() *big.Int {
 func (_m *Node) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -219,6 +255,10 @@ func (_m *Node) Close() error {
 func (_m *Node) CodeAt(ctx context.Context, account common.Address, blockNumber *big.Int) ([]byte, error) {
 	ret := _m.Called(ctx, account, blockNumber)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CodeAt")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, *big.Int) ([]byte, error)); ok {
@@ -245,6 +285,10 @@ func (_m *Node) CodeAt(ctx context.Context, account common.Address, blockNumber
 func (_m *Node) EstimateGas(ctx context.Context, call ethereum.CallMsg) (uint64, error) {
 	ret := _m.Called(ctx, call)
 
+	if len(ret) == 0 {
+		panic("no return value specified for EstimateGas")
+	}
+
 	var r0 uint64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ethereum.CallMsg) (uint64, error)); ok {
@@ -272,6 +316,10 @@ func (_m *Node) EthSubscribe(ctx context.Context, channel chan<- *evmtypes.Head,
 	_ca = append(_ca, args...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for EthSubscribe")
+	}
+
 	var r0 ethereum.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, chan<- *evmtypes.Head, ...interface{}) (ethereum.Subscription, error)); ok {
@@ -298,6 +346,10 @@ func (_m *Node) EthSubscribe(ctx context.Context, channel chan<- *evmtypes.Head,
 func (_m *Node) FilterLogs(ctx context.Context, q ethereum.FilterQuery) ([]types.Log, error) {
 	ret := _m.Called(ctx, q)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterLogs")
+	}
+
 	var r0 []types.Log
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ethereum.FilterQuery) ([]types.Log, error)); ok {
@@ -324,6 +376,10 @@ func (_m *Node) FilterLogs(ctx context.Context, q ethereum.FilterQuery) ([]types
 func (_m *Node) HeaderByHash(_a0 context.Context, _a1 common.Hash) (*types.Header, error) {
 	ret := _m.Called(_a0, _a1)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HeaderByHash")
+	}
+
 	var r0 *types.Header
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Hash) (*types.Header, error)); ok {
@@ -350,6 +406,10 @@ func (_m *Node) HeaderByHash(_a0 context.Context, _a1 common.Hash) (*types.Heade
 func (_m *Node) HeaderByNumber(_a0 context.Context, _a1 *big.Int) (*types.Header, error) {
 	ret := _m.Called(_a0, _a1)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HeaderByNumber")
+	}
+
 	var r0 *types.Header
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) (*types.Header, error)); ok {
@@ -376,6 +436,10 @@ func (_m *Node) HeaderByNumber(_a0 context.Context, _a1 *big.Int) (*types.Header
 func (_m *Node) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -390,6 +454,10 @@ func (_m *Node) Name() string {
 func (_m *Node) NonceAt(ctx context.Context, account common.Address, blockNumber *big.Int) (uint64, error) {
 	ret := _m.Called(ctx, account, blockNumber)
 
+	if len(ret) == 0 {
+		panic("no return value specified for NonceAt")
+	}
+
 	var r0 uint64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, *big.Int) (uint64, error)); ok {
@@ -414,6 +482,10 @@ func (_m *Node) NonceAt(ctx context.Context, account common.Address, blockNumber
 func (_m *Node) Order() int32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Order")
+	}
+
 	var r0 int32
 	if rf, ok := ret.Get(0).(func() int32); ok {
 		r0 = rf()
@@ -428,6 +500,10 @@ func (_m *Node) Order() int32 {
 func (_m *Node) PendingCodeAt(ctx context.Context, account common.Address) ([]byte, error) {
 	ret := _m.Called(ctx, account)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PendingCodeAt")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address) ([]byte, error)); ok {
@@ -454,6 +530,10 @@ func (_m *Node) PendingCodeAt(ctx context.Context, account common.Address) ([]by
 func (_m *Node) PendingNonceAt(ctx context.Context, account common.Address) (uint64, error) {
 	ret := _m.Called(ctx, account)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PendingNonceAt")
+	}
+
 	var r0 uint64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address) (uint64, error)); ok {
@@ -478,6 +558,10 @@ func (_m *Node) PendingNonceAt(ctx context.Context, account common.Address) (uin
 func (_m *Node) SendTransaction(ctx context.Context, tx *types.Transaction) error {
 	ret := _m.Called(ctx, tx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendTransaction")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *types.Transaction) error); ok {
 		r0 = rf(ctx, tx)
@@ -492,6 +576,10 @@ func (_m *Node) SendTransaction(ctx context.Context, tx *types.Transaction) erro
 func (_m *Node) Start(ctx context.Context) error {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(ctx)
@@ -506,6 +594,10 @@ func (_m *Node) Start(ctx context.Context) error {
 func (_m *Node) State() client.NodeState {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for State")
+	}
+
 	var r0 client.NodeState
 	if rf, ok := ret.Get(0).(func() client.NodeState); ok {
 		r0 = rf()
@@ -520,6 +612,10 @@ func (_m *Node) State() client.NodeState {
 func (_m *Node) StateAndLatest() (client.NodeState, int64, *big.Int) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for StateAndLatest")
+	}
+
 	var r0 client.NodeState
 	var r1 int64
 	var r2 *big.Int
@@ -553,6 +649,10 @@ func (_m *Node) StateAndLatest() (client.NodeState, int64, *big.Int) {
 func (_m *Node) String() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for String")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -567,6 +667,10 @@ func (_m *Node) String() string {
 func (_m *Node) SubscribeFilterLogs(ctx context.Context, q ethereum.FilterQuery, ch chan<- types.Log) (ethereum.Subscription, error) {
 	ret := _m.Called(ctx, q, ch)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SubscribeFilterLogs")
+	}
+
 	var r0 ethereum.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ethereum.FilterQuery, chan<- types.Log) (ethereum.Subscription, error)); ok {
@@ -593,6 +697,10 @@ func (_m *Node) SubscribeFilterLogs(ctx context.Context, q ethereum.FilterQuery,
 func (_m *Node) SubscribersCount() int32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for SubscribersCount")
+	}
+
 	var r0 int32
 	if rf, ok := ret.Get(0).(func() int32); ok {
 		r0 = rf()
@@ -607,6 +715,10 @@ func (_m *Node) SubscribersCount() int32 {
 func (_m *Node) SuggestGasPrice(ctx context.Context) (*big.Int, error) {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SuggestGasPrice")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (*big.Int, error)); ok {
@@ -633,6 +745,10 @@ func (_m *Node) SuggestGasPrice(ctx context.Context) (*big.Int, error) {
 func (_m *Node) SuggestGasTipCap(ctx context.Context) (*big.Int, error) {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SuggestGasTipCap")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (*big.Int, error)); ok {
@@ -659,6 +775,10 @@ func (_m *Node) SuggestGasTipCap(ctx context.Context) (*big.Int, error) {
 func (_m *Node) TransactionByHash(ctx context.Context, txHash common.Hash) (*types.Transaction, error) {
 	ret := _m.Called(ctx, txHash)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransactionByHash")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Hash) (*types.Transaction, error)); ok {
@@ -685,6 +805,10 @@ func (_m *Node) TransactionByHash(ctx context.Context, txHash common.Hash) (*typ
 func (_m *Node) TransactionReceipt(ctx context.Context, txHash common.Hash) (*types.Receipt, error) {
 	ret := _m.Called(ctx, txHash)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransactionReceipt")
+	}
+
 	var r0 *types.Receipt
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Hash) (*types.Receipt, error)); ok {
diff --git a/core/chains/evm/mocks/send_only_node.go b/core/chains/evm/mocks/send_only_node.go
index c836399a8ba..8ec3270281d 100644
--- a/core/chains/evm/mocks/send_only_node.go
+++ b/core/chains/evm/mocks/send_only_node.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -24,6 +24,10 @@ type SendOnlyNode struct {
 func (_m *SendOnlyNode) BatchCallContext(ctx context.Context, b []rpc.BatchElem) error {
 	ret := _m.Called(ctx, b)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BatchCallContext")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, []rpc.BatchElem) error); ok {
 		r0 = rf(ctx, b)
@@ -38,6 +42,10 @@ func (_m *SendOnlyNode) BatchCallContext(ctx context.Context, b []rpc.BatchElem)
 func (_m *SendOnlyNode) ChainID() *big.Int {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChainID")
+	}
+
 	var r0 *big.Int
 	if rf, ok := ret.Get(0).(func() *big.Int); ok {
 		r0 = rf()
@@ -54,6 +62,10 @@ func (_m *SendOnlyNode) ChainID() *big.Int {
 func (_m *SendOnlyNode) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -68,6 +80,10 @@ func (_m *SendOnlyNode) Close() error {
 func (_m *SendOnlyNode) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -82,6 +98,10 @@ func (_m *SendOnlyNode) Name() string {
 func (_m *SendOnlyNode) SendTransaction(ctx context.Context, tx *types.Transaction) error {
 	ret := _m.Called(ctx, tx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendTransaction")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *types.Transaction) error); ok {
 		r0 = rf(ctx, tx)
@@ -96,6 +116,10 @@ func (_m *SendOnlyNode) SendTransaction(ctx context.Context, tx *types.Transacti
 func (_m *SendOnlyNode) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
@@ -110,6 +134,10 @@ func (_m *SendOnlyNode) Start(_a0 context.Context) error {
 func (_m *SendOnlyNode) State() client.NodeState {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for State")
+	}
+
 	var r0 client.NodeState
 	if rf, ok := ret.Get(0).(func() client.NodeState); ok {
 		r0 = rf()
@@ -124,6 +152,10 @@ func (_m *SendOnlyNode) State() client.NodeState {
 func (_m *SendOnlyNode) String() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for String")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
diff --git a/core/chains/evm/txmgr/mocks/config.go b/core/chains/evm/txmgr/mocks/config.go
index ab98d686c85..0a0ece4b90b 100644
--- a/core/chains/evm/txmgr/mocks/config.go
+++ b/core/chains/evm/txmgr/mocks/config.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -16,6 +16,10 @@ type Config struct {
 func (_m *Config) ChainType() config.ChainType {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChainType")
+	}
+
 	var r0 config.ChainType
 	if rf, ok := ret.Get(0).(func() config.ChainType); ok {
 		r0 = rf()
@@ -30,6 +34,10 @@ func (_m *Config) ChainType() config.ChainType {
 func (_m *Config) FinalityDepth() uint32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for FinalityDepth")
+	}
+
 	var r0 uint32
 	if rf, ok := ret.Get(0).(func() uint32); ok {
 		r0 = rf()
@@ -44,6 +52,10 @@ func (_m *Config) FinalityDepth() uint32 {
 func (_m *Config) FinalityTagEnabled() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for FinalityTagEnabled")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -58,6 +70,10 @@ func (_m *Config) FinalityTagEnabled() bool {
 func (_m *Config) NonceAutoSync() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for NonceAutoSync")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -72,6 +88,10 @@ func (_m *Config) NonceAutoSync() bool {
 func (_m *Config) RPCDefaultBatchSize() uint32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for RPCDefaultBatchSize")
+	}
+
 	var r0 uint32
 	if rf, ok := ret.Get(0).(func() uint32); ok {
 		r0 = rf()
diff --git a/core/chains/evm/txmgr/mocks/evm_tx_store.go b/core/chains/evm/txmgr/mocks/evm_tx_store.go
index bf3088b2aa1..a9a7023ac1f 100644
--- a/core/chains/evm/txmgr/mocks/evm_tx_store.go
+++ b/core/chains/evm/txmgr/mocks/evm_tx_store.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -32,6 +32,10 @@ type EvmTxStore struct {
 func (_m *EvmTxStore) Abandon(ctx context.Context, id *big.Int, addr common.Address) error {
 	ret := _m.Called(ctx, id, addr)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Abandon")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *big.Int, common.Address) error); ok {
 		r0 = rf(ctx, id, addr)
@@ -46,6 +50,10 @@ func (_m *EvmTxStore) Abandon(ctx context.Context, id *big.Int, addr common.Addr
 func (_m *EvmTxStore) CheckTxQueueCapacity(ctx context.Context, fromAddress common.Address, maxQueuedTransactions uint64, chainID *big.Int) error {
 	ret := _m.Called(ctx, fromAddress, maxQueuedTransactions, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CheckTxQueueCapacity")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, uint64, *big.Int) error); ok {
 		r0 = rf(ctx, fromAddress, maxQueuedTransactions, chainID)
@@ -65,6 +73,10 @@ func (_m *EvmTxStore) Close() {
 func (_m *EvmTxStore) CountTransactionsByState(ctx context.Context, state types.TxState, chainID *big.Int) (uint32, error) {
 	ret := _m.Called(ctx, state, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountTransactionsByState")
+	}
+
 	var r0 uint32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, types.TxState, *big.Int) (uint32, error)); ok {
@@ -89,6 +101,10 @@ func (_m *EvmTxStore) CountTransactionsByState(ctx context.Context, state types.
 func (_m *EvmTxStore) CountUnconfirmedTransactions(ctx context.Context, fromAddress common.Address, chainID *big.Int) (uint32, error) {
 	ret := _m.Called(ctx, fromAddress, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountUnconfirmedTransactions")
+	}
+
 	var r0 uint32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, *big.Int) (uint32, error)); ok {
@@ -113,6 +129,10 @@ func (_m *EvmTxStore) CountUnconfirmedTransactions(ctx context.Context, fromAddr
 func (_m *EvmTxStore) CountUnstartedTransactions(ctx context.Context, fromAddress common.Address, chainID *big.Int) (uint32, error) {
 	ret := _m.Called(ctx, fromAddress, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountUnstartedTransactions")
+	}
+
 	var r0 uint32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, *big.Int) (uint32, error)); ok {
@@ -137,6 +157,10 @@ func (_m *EvmTxStore) CountUnstartedTransactions(ctx context.Context, fromAddres
 func (_m *EvmTxStore) CreateTransaction(ctx context.Context, txRequest types.TxRequest[common.Address, common.Hash], chainID *big.Int) (types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, txRequest, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateTransaction")
+	}
+
 	var r0 types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, types.TxRequest[common.Address, common.Hash], *big.Int) (types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -161,6 +185,10 @@ func (_m *EvmTxStore) CreateTransaction(ctx context.Context, txRequest types.TxR
 func (_m *EvmTxStore) DeleteInProgressAttempt(ctx context.Context, attempt types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error {
 	ret := _m.Called(ctx, attempt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteInProgressAttempt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error); ok {
 		r0 = rf(ctx, attempt)
@@ -175,6 +203,10 @@ func (_m *EvmTxStore) DeleteInProgressAttempt(ctx context.Context, attempt types
 func (_m *EvmTxStore) FindEarliestUnconfirmedBroadcastTime(ctx context.Context, chainID *big.Int) (null.Time, error) {
 	ret := _m.Called(ctx, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindEarliestUnconfirmedBroadcastTime")
+	}
+
 	var r0 null.Time
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) (null.Time, error)); ok {
@@ -199,6 +231,10 @@ func (_m *EvmTxStore) FindEarliestUnconfirmedBroadcastTime(ctx context.Context,
 func (_m *EvmTxStore) FindEarliestUnconfirmedTxAttemptBlock(ctx context.Context, chainID *big.Int) (null.Int, error) {
 	ret := _m.Called(ctx, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindEarliestUnconfirmedTxAttemptBlock")
+	}
+
 	var r0 null.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) (null.Int, error)); ok {
@@ -223,6 +259,10 @@ func (_m *EvmTxStore) FindEarliestUnconfirmedTxAttemptBlock(ctx context.Context,
 func (_m *EvmTxStore) FindLatestSequence(ctx context.Context, fromAddress common.Address, chainId *big.Int) (evmtypes.Nonce, error) {
 	ret := _m.Called(ctx, fromAddress, chainId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindLatestSequence")
+	}
+
 	var r0 evmtypes.Nonce
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, *big.Int) (evmtypes.Nonce, error)); ok {
@@ -247,6 +287,10 @@ func (_m *EvmTxStore) FindLatestSequence(ctx context.Context, fromAddress common
 func (_m *EvmTxStore) FindNextUnstartedTransactionFromAddress(ctx context.Context, etx *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], fromAddress common.Address, chainID *big.Int) error {
 	ret := _m.Called(ctx, etx, fromAddress, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindNextUnstartedTransactionFromAddress")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], common.Address, *big.Int) error); ok {
 		r0 = rf(ctx, etx, fromAddress, chainID)
@@ -261,6 +305,10 @@ func (_m *EvmTxStore) FindNextUnstartedTransactionFromAddress(ctx context.Contex
 func (_m *EvmTxStore) FindTransactionsConfirmedInBlockRange(ctx context.Context, highBlockNumber int64, lowBlockNumber int64, chainID *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, highBlockNumber, lowBlockNumber, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTransactionsConfirmedInBlockRange")
+	}
+
 	var r0 []*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, int64, *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -287,6 +335,10 @@ func (_m *EvmTxStore) FindTransactionsConfirmedInBlockRange(ctx context.Context,
 func (_m *EvmTxStore) FindTxAttempt(hash common.Hash) (*types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(hash)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxAttempt")
+	}
+
 	var r0 *types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Hash) (*types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -313,6 +365,10 @@ func (_m *EvmTxStore) FindTxAttempt(hash common.Hash) (*types.TxAttempt[*big.Int
 func (_m *EvmTxStore) FindTxAttemptConfirmedByTxIDs(ids []int64) ([]types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ids)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxAttemptConfirmedByTxIDs")
+	}
+
 	var r0 []types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]int64) ([]types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -339,6 +395,10 @@ func (_m *EvmTxStore) FindTxAttemptConfirmedByTxIDs(ids []int64) ([]types.TxAtte
 func (_m *EvmTxStore) FindTxAttemptsConfirmedMissingReceipt(ctx context.Context, chainID *big.Int) ([]types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxAttemptsConfirmedMissingReceipt")
+	}
+
 	var r0 []types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) ([]types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -365,6 +425,10 @@ func (_m *EvmTxStore) FindTxAttemptsConfirmedMissingReceipt(ctx context.Context,
 func (_m *EvmTxStore) FindTxAttemptsRequiringReceiptFetch(ctx context.Context, chainID *big.Int) ([]types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxAttemptsRequiringReceiptFetch")
+	}
+
 	var r0 []types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) ([]types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -391,6 +455,10 @@ func (_m *EvmTxStore) FindTxAttemptsRequiringReceiptFetch(ctx context.Context, c
 func (_m *EvmTxStore) FindTxAttemptsRequiringResend(ctx context.Context, olderThan time.Time, maxInFlightTransactions uint32, chainID *big.Int, address common.Address) ([]types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, olderThan, maxInFlightTransactions, chainID, address)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxAttemptsRequiringResend")
+	}
+
 	var r0 []types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, time.Time, uint32, *big.Int, common.Address) ([]types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -417,6 +485,10 @@ func (_m *EvmTxStore) FindTxAttemptsRequiringResend(ctx context.Context, olderTh
 func (_m *EvmTxStore) FindTxByHash(hash common.Hash) (*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(hash)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxByHash")
+	}
+
 	var r0 *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Hash) (*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -443,6 +515,10 @@ func (_m *EvmTxStore) FindTxByHash(hash common.Hash) (*types.Tx[*big.Int, common
 func (_m *EvmTxStore) FindTxWithAttempts(etxID int64) (types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(etxID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxWithAttempts")
+	}
+
 	var r0 types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) (types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -467,6 +543,10 @@ func (_m *EvmTxStore) FindTxWithAttempts(etxID int64) (types.Tx[*big.Int, common
 func (_m *EvmTxStore) FindTxWithIdempotencyKey(ctx context.Context, idempotencyKey string, chainID *big.Int) (*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, idempotencyKey, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxWithIdempotencyKey")
+	}
+
 	var r0 *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, *big.Int) (*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -493,6 +573,10 @@ func (_m *EvmTxStore) FindTxWithIdempotencyKey(ctx context.Context, idempotencyK
 func (_m *EvmTxStore) FindTxWithSequence(ctx context.Context, fromAddress common.Address, seq evmtypes.Nonce) (*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, fromAddress, seq)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxWithSequence")
+	}
+
 	var r0 *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, evmtypes.Nonce) (*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -519,6 +603,10 @@ func (_m *EvmTxStore) FindTxWithSequence(ctx context.Context, fromAddress common
 func (_m *EvmTxStore) FindTxesByMetaFieldAndStates(ctx context.Context, metaField string, metaValue string, states []types.TxState, chainID *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, metaField, metaValue, states, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxesByMetaFieldAndStates")
+	}
+
 	var r0 []*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, string, []types.TxState, *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -545,6 +633,10 @@ func (_m *EvmTxStore) FindTxesByMetaFieldAndStates(ctx context.Context, metaFiel
 func (_m *EvmTxStore) FindTxesPendingCallback(ctx context.Context, blockNum int64, chainID *big.Int) ([]types.ReceiptPlus[*evmtypes.Receipt], error) {
 	ret := _m.Called(ctx, blockNum, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxesPendingCallback")
+	}
+
 	var r0 []types.ReceiptPlus[*evmtypes.Receipt]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, *big.Int) ([]types.ReceiptPlus[*evmtypes.Receipt], error)); ok {
@@ -571,6 +663,10 @@ func (_m *EvmTxStore) FindTxesPendingCallback(ctx context.Context, blockNum int6
 func (_m *EvmTxStore) FindTxesWithAttemptsAndReceiptsByIdsAndState(ctx context.Context, ids []big.Int, states []types.TxState, chainID *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, ids, states, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxesWithAttemptsAndReceiptsByIdsAndState")
+	}
+
 	var r0 []*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, []big.Int, []types.TxState, *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -597,6 +693,10 @@ func (_m *EvmTxStore) FindTxesWithAttemptsAndReceiptsByIdsAndState(ctx context.C
 func (_m *EvmTxStore) FindTxesWithMetaFieldByReceiptBlockNum(ctx context.Context, metaField string, blockNum int64, chainID *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, metaField, blockNum, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxesWithMetaFieldByReceiptBlockNum")
+	}
+
 	var r0 []*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, int64, *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -623,6 +723,10 @@ func (_m *EvmTxStore) FindTxesWithMetaFieldByReceiptBlockNum(ctx context.Context
 func (_m *EvmTxStore) FindTxesWithMetaFieldByStates(ctx context.Context, metaField string, states []types.TxState, chainID *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, metaField, states, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxesWithMetaFieldByStates")
+	}
+
 	var r0 []*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, []types.TxState, *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -649,6 +753,10 @@ func (_m *EvmTxStore) FindTxesWithMetaFieldByStates(ctx context.Context, metaFie
 func (_m *EvmTxStore) FindTxsRequiringGasBump(ctx context.Context, address common.Address, blockNum int64, gasBumpThreshold int64, depth int64, chainID *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, address, blockNum, gasBumpThreshold, depth, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxsRequiringGasBump")
+	}
+
 	var r0 []*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, int64, int64, int64, *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -675,6 +783,10 @@ func (_m *EvmTxStore) FindTxsRequiringGasBump(ctx context.Context, address commo
 func (_m *EvmTxStore) FindTxsRequiringResubmissionDueToInsufficientFunds(ctx context.Context, address common.Address, chainID *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, address, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTxsRequiringResubmissionDueToInsufficientFunds")
+	}
+
 	var r0 []*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -701,6 +813,10 @@ func (_m *EvmTxStore) FindTxsRequiringResubmissionDueToInsufficientFunds(ctx con
 func (_m *EvmTxStore) GetInProgressTxAttempts(ctx context.Context, address common.Address, chainID *big.Int) ([]types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, address, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetInProgressTxAttempts")
+	}
+
 	var r0 []types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, *big.Int) ([]types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -727,6 +843,10 @@ func (_m *EvmTxStore) GetInProgressTxAttempts(ctx context.Context, address commo
 func (_m *EvmTxStore) GetNonFatalTransactions(ctx context.Context, chainID *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetNonFatalTransactions")
+	}
+
 	var r0 []*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) ([]*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -753,6 +873,10 @@ func (_m *EvmTxStore) GetNonFatalTransactions(ctx context.Context, chainID *big.
 func (_m *EvmTxStore) GetTxByID(ctx context.Context, id int64) (*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTxByID")
+	}
+
 	var r0 *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64) (*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -779,6 +903,10 @@ func (_m *EvmTxStore) GetTxByID(ctx context.Context, id int64) (*types.Tx[*big.I
 func (_m *EvmTxStore) GetTxInProgress(ctx context.Context, fromAddress common.Address) (*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error) {
 	ret := _m.Called(ctx, fromAddress)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTxInProgress")
+	}
+
 	var r0 *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address) (*types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], error)); ok {
@@ -805,6 +933,10 @@ func (_m *EvmTxStore) GetTxInProgress(ctx context.Context, fromAddress common.Ad
 func (_m *EvmTxStore) HasInProgressTransaction(ctx context.Context, account common.Address, chainID *big.Int) (bool, error) {
 	ret := _m.Called(ctx, account, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HasInProgressTransaction")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, *big.Int) (bool, error)); ok {
@@ -829,6 +961,10 @@ func (_m *EvmTxStore) HasInProgressTransaction(ctx context.Context, account comm
 func (_m *EvmTxStore) IsTxFinalized(ctx context.Context, blockHeight int64, txID int64, chainID *big.Int) (bool, error) {
 	ret := _m.Called(ctx, blockHeight, txID, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsTxFinalized")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, int64, *big.Int) (bool, error)); ok {
@@ -853,6 +989,10 @@ func (_m *EvmTxStore) IsTxFinalized(ctx context.Context, blockHeight int64, txID
 func (_m *EvmTxStore) LoadTxAttempts(ctx context.Context, etx *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error {
 	ret := _m.Called(ctx, etx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LoadTxAttempts")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error); ok {
 		r0 = rf(ctx, etx)
@@ -867,6 +1007,10 @@ func (_m *EvmTxStore) LoadTxAttempts(ctx context.Context, etx *types.Tx[*big.Int
 func (_m *EvmTxStore) MarkAllConfirmedMissingReceipt(ctx context.Context, chainID *big.Int) error {
 	ret := _m.Called(ctx, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MarkAllConfirmedMissingReceipt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *big.Int) error); ok {
 		r0 = rf(ctx, chainID)
@@ -881,6 +1025,10 @@ func (_m *EvmTxStore) MarkAllConfirmedMissingReceipt(ctx context.Context, chainI
 func (_m *EvmTxStore) MarkOldTxesMissingReceiptAsErrored(ctx context.Context, blockNum int64, finalityDepth uint32, chainID *big.Int) error {
 	ret := _m.Called(ctx, blockNum, finalityDepth, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MarkOldTxesMissingReceiptAsErrored")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, uint32, *big.Int) error); ok {
 		r0 = rf(ctx, blockNum, finalityDepth, chainID)
@@ -895,6 +1043,10 @@ func (_m *EvmTxStore) MarkOldTxesMissingReceiptAsErrored(ctx context.Context, bl
 func (_m *EvmTxStore) PreloadTxes(ctx context.Context, attempts []types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error {
 	ret := _m.Called(ctx, attempts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PreloadTxes")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, []types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error); ok {
 		r0 = rf(ctx, attempts)
@@ -909,6 +1061,10 @@ func (_m *EvmTxStore) PreloadTxes(ctx context.Context, attempts []types.TxAttemp
 func (_m *EvmTxStore) PruneUnstartedTxQueue(ctx context.Context, queueSize uint32, subject uuid.UUID) (int64, error) {
 	ret := _m.Called(ctx, queueSize, subject)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PruneUnstartedTxQueue")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, uint32, uuid.UUID) (int64, error)); ok {
@@ -933,6 +1089,10 @@ func (_m *EvmTxStore) PruneUnstartedTxQueue(ctx context.Context, queueSize uint3
 func (_m *EvmTxStore) ReapTxHistory(ctx context.Context, minBlockNumberToKeep int64, timeThreshold time.Time, chainID *big.Int) error {
 	ret := _m.Called(ctx, minBlockNumberToKeep, timeThreshold, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ReapTxHistory")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, time.Time, *big.Int) error); ok {
 		r0 = rf(ctx, minBlockNumberToKeep, timeThreshold, chainID)
@@ -947,6 +1107,10 @@ func (_m *EvmTxStore) ReapTxHistory(ctx context.Context, minBlockNumberToKeep in
 func (_m *EvmTxStore) SaveConfirmedMissingReceiptAttempt(ctx context.Context, timeout time.Duration, attempt *types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], broadcastAt time.Time) error {
 	ret := _m.Called(ctx, timeout, attempt, broadcastAt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveConfirmedMissingReceiptAttempt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, time.Duration, *types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], time.Time) error); ok {
 		r0 = rf(ctx, timeout, attempt, broadcastAt)
@@ -961,6 +1125,10 @@ func (_m *EvmTxStore) SaveConfirmedMissingReceiptAttempt(ctx context.Context, ti
 func (_m *EvmTxStore) SaveFetchedReceipts(ctx context.Context, receipts []*evmtypes.Receipt, chainID *big.Int) error {
 	ret := _m.Called(ctx, receipts, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveFetchedReceipts")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, []*evmtypes.Receipt, *big.Int) error); ok {
 		r0 = rf(ctx, receipts, chainID)
@@ -975,6 +1143,10 @@ func (_m *EvmTxStore) SaveFetchedReceipts(ctx context.Context, receipts []*evmty
 func (_m *EvmTxStore) SaveInProgressAttempt(ctx context.Context, attempt *types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error {
 	ret := _m.Called(ctx, attempt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveInProgressAttempt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error); ok {
 		r0 = rf(ctx, attempt)
@@ -989,6 +1161,10 @@ func (_m *EvmTxStore) SaveInProgressAttempt(ctx context.Context, attempt *types.
 func (_m *EvmTxStore) SaveInsufficientFundsAttempt(ctx context.Context, timeout time.Duration, attempt *types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], broadcastAt time.Time) error {
 	ret := _m.Called(ctx, timeout, attempt, broadcastAt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveInsufficientFundsAttempt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, time.Duration, *types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], time.Time) error); ok {
 		r0 = rf(ctx, timeout, attempt, broadcastAt)
@@ -1003,6 +1179,10 @@ func (_m *EvmTxStore) SaveInsufficientFundsAttempt(ctx context.Context, timeout
 func (_m *EvmTxStore) SaveReplacementInProgressAttempt(ctx context.Context, oldAttempt types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], replacementAttempt *types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error {
 	ret := _m.Called(ctx, oldAttempt, replacementAttempt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveReplacementInProgressAttempt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], *types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error); ok {
 		r0 = rf(ctx, oldAttempt, replacementAttempt)
@@ -1017,6 +1197,10 @@ func (_m *EvmTxStore) SaveReplacementInProgressAttempt(ctx context.Context, oldA
 func (_m *EvmTxStore) SaveSentAttempt(ctx context.Context, timeout time.Duration, attempt *types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], broadcastAt time.Time) error {
 	ret := _m.Called(ctx, timeout, attempt, broadcastAt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveSentAttempt")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, time.Duration, *types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], time.Time) error); ok {
 		r0 = rf(ctx, timeout, attempt, broadcastAt)
@@ -1031,6 +1215,10 @@ func (_m *EvmTxStore) SaveSentAttempt(ctx context.Context, timeout time.Duration
 func (_m *EvmTxStore) SetBroadcastBeforeBlockNum(ctx context.Context, blockNum int64, chainID *big.Int) error {
 	ret := _m.Called(ctx, blockNum, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetBroadcastBeforeBlockNum")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, *big.Int) error); ok {
 		r0 = rf(ctx, blockNum, chainID)
@@ -1045,6 +1233,10 @@ func (_m *EvmTxStore) SetBroadcastBeforeBlockNum(ctx context.Context, blockNum i
 func (_m *EvmTxStore) Transactions(offset int, limit int) ([]types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], int, error) {
 	ret := _m.Called(offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Transactions")
+	}
+
 	var r0 []types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 int
 	var r2 error
@@ -1078,6 +1270,10 @@ func (_m *EvmTxStore) Transactions(offset int, limit int) ([]types.Tx[*big.Int,
 func (_m *EvmTxStore) TransactionsWithAttempts(offset int, limit int) ([]types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], int, error) {
 	ret := _m.Called(offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransactionsWithAttempts")
+	}
+
 	var r0 []types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 int
 	var r2 error
@@ -1111,6 +1307,10 @@ func (_m *EvmTxStore) TransactionsWithAttempts(offset int, limit int) ([]types.T
 func (_m *EvmTxStore) TxAttempts(offset int, limit int) ([]types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], int, error) {
 	ret := _m.Called(offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TxAttempts")
+	}
+
 	var r0 []types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	var r1 int
 	var r2 error
@@ -1144,6 +1344,10 @@ func (_m *EvmTxStore) TxAttempts(offset int, limit int) ([]types.TxAttempt[*big.
 func (_m *EvmTxStore) UpdateBroadcastAts(ctx context.Context, now time.Time, etxIDs []int64) error {
 	ret := _m.Called(ctx, now, etxIDs)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateBroadcastAts")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, time.Time, []int64) error); ok {
 		r0 = rf(ctx, now, etxIDs)
@@ -1158,6 +1362,10 @@ func (_m *EvmTxStore) UpdateBroadcastAts(ctx context.Context, now time.Time, etx
 func (_m *EvmTxStore) UpdateTxAttemptInProgressToBroadcast(ctx context.Context, etx *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], attempt types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], NewAttemptState types.TxAttemptState) error {
 	ret := _m.Called(ctx, etx, attempt, NewAttemptState)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTxAttemptInProgressToBroadcast")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], types.TxAttemptState) error); ok {
 		r0 = rf(ctx, etx, attempt, NewAttemptState)
@@ -1172,6 +1380,10 @@ func (_m *EvmTxStore) UpdateTxAttemptInProgressToBroadcast(ctx context.Context,
 func (_m *EvmTxStore) UpdateTxCallbackCompleted(ctx context.Context, pipelineTaskRunRid uuid.UUID, chainId *big.Int) error {
 	ret := _m.Called(ctx, pipelineTaskRunRid, chainId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTxCallbackCompleted")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, uuid.UUID, *big.Int) error); ok {
 		r0 = rf(ctx, pipelineTaskRunRid, chainId)
@@ -1186,6 +1398,10 @@ func (_m *EvmTxStore) UpdateTxCallbackCompleted(ctx context.Context, pipelineTas
 func (_m *EvmTxStore) UpdateTxFatalError(ctx context.Context, etx *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error {
 	ret := _m.Called(ctx, etx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTxFatalError")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error); ok {
 		r0 = rf(ctx, etx)
@@ -1200,6 +1416,10 @@ func (_m *EvmTxStore) UpdateTxFatalError(ctx context.Context, etx *types.Tx[*big
 func (_m *EvmTxStore) UpdateTxForRebroadcast(ctx context.Context, etx types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], etxAttempt types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error {
 	ret := _m.Called(ctx, etx, etxAttempt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTxForRebroadcast")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error); ok {
 		r0 = rf(ctx, etx, etxAttempt)
@@ -1214,6 +1434,10 @@ func (_m *EvmTxStore) UpdateTxForRebroadcast(ctx context.Context, etx types.Tx[*
 func (_m *EvmTxStore) UpdateTxUnstartedToInProgress(ctx context.Context, etx *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], attempt *types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error {
 	ret := _m.Called(ctx, etx, attempt)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTxUnstartedToInProgress")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *types.Tx[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee], *types.TxAttempt[*big.Int, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]) error); ok {
 		r0 = rf(ctx, etx, attempt)
@@ -1228,6 +1452,10 @@ func (_m *EvmTxStore) UpdateTxUnstartedToInProgress(ctx context.Context, etx *ty
 func (_m *EvmTxStore) UpdateTxsUnconfirmed(ctx context.Context, ids []int64) error {
 	ret := _m.Called(ctx, ids)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTxsUnconfirmed")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, []int64) error); ok {
 		r0 = rf(ctx, ids)
diff --git a/core/chains/legacyevm/mocks/chain.go b/core/chains/legacyevm/mocks/chain.go
index 3a686887d76..d8cc4895493 100644
--- a/core/chains/legacyevm/mocks/chain.go
+++ b/core/chains/legacyevm/mocks/chain.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -42,6 +42,10 @@ type Chain struct {
 func (_m *Chain) BalanceMonitor() monitor.BalanceMonitor {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BalanceMonitor")
+	}
+
 	var r0 monitor.BalanceMonitor
 	if rf, ok := ret.Get(0).(func() monitor.BalanceMonitor); ok {
 		r0 = rf()
@@ -58,6 +62,10 @@ func (_m *Chain) BalanceMonitor() monitor.BalanceMonitor {
 func (_m *Chain) Client() client.Client {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Client")
+	}
+
 	var r0 client.Client
 	if rf, ok := ret.Get(0).(func() client.Client); ok {
 		r0 = rf()
@@ -74,6 +82,10 @@ func (_m *Chain) Client() client.Client {
 func (_m *Chain) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -88,6 +100,10 @@ func (_m *Chain) Close() error {
 func (_m *Chain) Config() config.ChainScopedConfig {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Config")
+	}
+
 	var r0 config.ChainScopedConfig
 	if rf, ok := ret.Get(0).(func() config.ChainScopedConfig); ok {
 		r0 = rf()
@@ -104,6 +120,10 @@ func (_m *Chain) Config() config.ChainScopedConfig {
 func (_m *Chain) GasEstimator() gas.EvmFeeEstimator {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GasEstimator")
+	}
+
 	var r0 gas.EvmFeeEstimator
 	if rf, ok := ret.Get(0).(func() gas.EvmFeeEstimator); ok {
 		r0 = rf()
@@ -120,6 +140,10 @@ func (_m *Chain) GasEstimator() gas.EvmFeeEstimator {
 func (_m *Chain) GetChainStatus(ctx context.Context) (types.ChainStatus, error) {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetChainStatus")
+	}
+
 	var r0 types.ChainStatus
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (types.ChainStatus, error)); ok {
@@ -144,6 +168,10 @@ func (_m *Chain) GetChainStatus(ctx context.Context) (types.ChainStatus, error)
 func (_m *Chain) HeadBroadcaster() commontypes.HeadBroadcaster[*evmtypes.Head, common.Hash] {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HeadBroadcaster")
+	}
+
 	var r0 commontypes.HeadBroadcaster[*evmtypes.Head, common.Hash]
 	if rf, ok := ret.Get(0).(func() commontypes.HeadBroadcaster[*evmtypes.Head, common.Hash]); ok {
 		r0 = rf()
@@ -160,6 +188,10 @@ func (_m *Chain) HeadBroadcaster() commontypes.HeadBroadcaster[*evmtypes.Head, c
 func (_m *Chain) HeadTracker() commontypes.HeadTracker[*evmtypes.Head, common.Hash] {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HeadTracker")
+	}
+
 	var r0 commontypes.HeadTracker[*evmtypes.Head, common.Hash]
 	if rf, ok := ret.Get(0).(func() commontypes.HeadTracker[*evmtypes.Head, common.Hash]); ok {
 		r0 = rf()
@@ -176,6 +208,10 @@ func (_m *Chain) HeadTracker() commontypes.HeadTracker[*evmtypes.Head, common.Ha
 func (_m *Chain) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -192,6 +228,10 @@ func (_m *Chain) HealthReport() map[string]error {
 func (_m *Chain) ID() *big.Int {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ID")
+	}
+
 	var r0 *big.Int
 	if rf, ok := ret.Get(0).(func() *big.Int); ok {
 		r0 = rf()
@@ -208,6 +248,10 @@ func (_m *Chain) ID() *big.Int {
 func (_m *Chain) ListNodeStatuses(ctx context.Context, pageSize int32, pageToken string) ([]types.NodeStatus, string, int, error) {
 	ret := _m.Called(ctx, pageSize, pageToken)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListNodeStatuses")
+	}
+
 	var r0 []types.NodeStatus
 	var r1 string
 	var r2 int
@@ -248,6 +292,10 @@ func (_m *Chain) ListNodeStatuses(ctx context.Context, pageSize int32, pageToken
 func (_m *Chain) LogBroadcaster() log.Broadcaster {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LogBroadcaster")
+	}
+
 	var r0 log.Broadcaster
 	if rf, ok := ret.Get(0).(func() log.Broadcaster); ok {
 		r0 = rf()
@@ -264,6 +312,10 @@ func (_m *Chain) LogBroadcaster() log.Broadcaster {
 func (_m *Chain) LogPoller() logpoller.LogPoller {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LogPoller")
+	}
+
 	var r0 logpoller.LogPoller
 	if rf, ok := ret.Get(0).(func() logpoller.LogPoller); ok {
 		r0 = rf()
@@ -280,6 +332,10 @@ func (_m *Chain) LogPoller() logpoller.LogPoller {
 func (_m *Chain) Logger() logger.Logger {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Logger")
+	}
+
 	var r0 logger.Logger
 	if rf, ok := ret.Get(0).(func() logger.Logger); ok {
 		r0 = rf()
@@ -296,6 +352,10 @@ func (_m *Chain) Logger() logger.Logger {
 func (_m *Chain) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -310,6 +370,10 @@ func (_m *Chain) Name() string {
 func (_m *Chain) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -324,6 +388,10 @@ func (_m *Chain) Ready() error {
 func (_m *Chain) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
@@ -338,6 +406,10 @@ func (_m *Chain) Start(_a0 context.Context) error {
 func (_m *Chain) Transact(ctx context.Context, from string, to string, amount *big.Int, balanceCheck bool) error {
 	ret := _m.Called(ctx, from, to, amount, balanceCheck)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Transact")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, string, *big.Int, bool) error); ok {
 		r0 = rf(ctx, from, to, amount, balanceCheck)
@@ -352,6 +424,10 @@ func (_m *Chain) Transact(ctx context.Context, from string, to string, amount *b
 func (_m *Chain) TxManager() txmgr.TxManager[*big.Int, *evmtypes.Head, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee] {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for TxManager")
+	}
+
 	var r0 txmgr.TxManager[*big.Int, *evmtypes.Head, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]
 	if rf, ok := ret.Get(0).(func() txmgr.TxManager[*big.Int, *evmtypes.Head, common.Address, common.Hash, common.Hash, evmtypes.Nonce, gas.EvmFee]); ok {
 		r0 = rf()
diff --git a/core/chains/legacyevm/mocks/legacy_chain_container.go b/core/chains/legacyevm/mocks/legacy_chain_container.go
index 9ebacb890aa..812b95d3697 100644
--- a/core/chains/legacyevm/mocks/legacy_chain_container.go
+++ b/core/chains/legacyevm/mocks/legacy_chain_container.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type LegacyChainContainer struct {
 func (_m *LegacyChainContainer) ChainNodeConfigs() types.Configs {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChainNodeConfigs")
+	}
+
 	var r0 types.Configs
 	if rf, ok := ret.Get(0).(func() types.Configs); ok {
 		r0 = rf()
@@ -34,6 +38,10 @@ func (_m *LegacyChainContainer) ChainNodeConfigs() types.Configs {
 func (_m *LegacyChainContainer) Get(id string) (legacyevm.Chain, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 legacyevm.Chain
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (legacyevm.Chain, error)); ok {
@@ -60,6 +68,10 @@ func (_m *LegacyChainContainer) Get(id string) (legacyevm.Chain, error) {
 func (_m *LegacyChainContainer) Len() int {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Len")
+	}
+
 	var r0 int
 	if rf, ok := ret.Get(0).(func() int); ok {
 		r0 = rf()
@@ -80,6 +92,10 @@ func (_m *LegacyChainContainer) List(ids ...string) ([]legacyevm.Chain, error) {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for List")
+	}
+
 	var r0 []legacyevm.Chain
 	var r1 error
 	if rf, ok := ret.Get(0).(func(...string) ([]legacyevm.Chain, error)); ok {
@@ -106,6 +122,10 @@ func (_m *LegacyChainContainer) List(ids ...string) ([]legacyevm.Chain, error) {
 func (_m *LegacyChainContainer) Slice() []legacyevm.Chain {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Slice")
+	}
+
 	var r0 []legacyevm.Chain
 	if rf, ok := ret.Get(0).(func() []legacyevm.Chain); ok {
 		r0 = rf()
diff --git a/core/cmd/mocks/prompter.go b/core/cmd/mocks/prompter.go
index c0f682d5b9f..a05d24d671b 100644
--- a/core/cmd/mocks/prompter.go
+++ b/core/cmd/mocks/prompter.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -13,6 +13,10 @@ type Prompter struct {
 func (_m *Prompter) IsTerminal() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsTerminal")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -27,6 +31,10 @@ func (_m *Prompter) IsTerminal() bool {
 func (_m *Prompter) PasswordPrompt(_a0 string) string {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PasswordPrompt")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func(string) string); ok {
 		r0 = rf(_a0)
@@ -41,6 +49,10 @@ func (_m *Prompter) PasswordPrompt(_a0 string) string {
 func (_m *Prompter) Prompt(_a0 string) string {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Prompt")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func(string) string); ok {
 		r0 = rf(_a0)
diff --git a/core/config/mocks/telemetry_ingress.go b/core/config/mocks/telemetry_ingress.go
index 59f4ed10dad..ed5dbc4cf52 100644
--- a/core/config/mocks/telemetry_ingress.go
+++ b/core/config/mocks/telemetry_ingress.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -20,6 +20,10 @@ type TelemetryIngress struct {
 func (_m *TelemetryIngress) BufferSize() uint {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BufferSize")
+	}
+
 	var r0 uint
 	if rf, ok := ret.Get(0).(func() uint); ok {
 		r0 = rf()
@@ -34,6 +38,10 @@ func (_m *TelemetryIngress) BufferSize() uint {
 func (_m *TelemetryIngress) Endpoints() []config.TelemetryIngressEndpoint {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Endpoints")
+	}
+
 	var r0 []config.TelemetryIngressEndpoint
 	if rf, ok := ret.Get(0).(func() []config.TelemetryIngressEndpoint); ok {
 		r0 = rf()
@@ -50,6 +58,10 @@ func (_m *TelemetryIngress) Endpoints() []config.TelemetryIngressEndpoint {
 func (_m *TelemetryIngress) Logging() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Logging")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -64,6 +76,10 @@ func (_m *TelemetryIngress) Logging() bool {
 func (_m *TelemetryIngress) MaxBatchSize() uint {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for MaxBatchSize")
+	}
+
 	var r0 uint
 	if rf, ok := ret.Get(0).(func() uint); ok {
 		r0 = rf()
@@ -78,6 +94,10 @@ func (_m *TelemetryIngress) MaxBatchSize() uint {
 func (_m *TelemetryIngress) SendInterval() time.Duration {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendInterval")
+	}
+
 	var r0 time.Duration
 	if rf, ok := ret.Get(0).(func() time.Duration); ok {
 		r0 = rf()
@@ -92,6 +112,10 @@ func (_m *TelemetryIngress) SendInterval() time.Duration {
 func (_m *TelemetryIngress) SendTimeout() time.Duration {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendTimeout")
+	}
+
 	var r0 time.Duration
 	if rf, ok := ret.Get(0).(func() time.Duration); ok {
 		r0 = rf()
@@ -106,6 +130,10 @@ func (_m *TelemetryIngress) SendTimeout() time.Duration {
 func (_m *TelemetryIngress) ServerPubKey() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ServerPubKey")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -120,6 +148,10 @@ func (_m *TelemetryIngress) ServerPubKey() string {
 func (_m *TelemetryIngress) URL() *url.URL {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for URL")
+	}
+
 	var r0 *url.URL
 	if rf, ok := ret.Get(0).(func() *url.URL); ok {
 		r0 = rf()
@@ -136,6 +168,10 @@ func (_m *TelemetryIngress) URL() *url.URL {
 func (_m *TelemetryIngress) UniConn() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for UniConn")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -150,6 +186,10 @@ func (_m *TelemetryIngress) UniConn() bool {
 func (_m *TelemetryIngress) UseBatchSend() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for UseBatchSend")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
diff --git a/core/config/mocks/telemetry_ingress_endpoint.go b/core/config/mocks/telemetry_ingress_endpoint.go
index 7aa6f46aa2b..08432cfe0ee 100644
--- a/core/config/mocks/telemetry_ingress_endpoint.go
+++ b/core/config/mocks/telemetry_ingress_endpoint.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type TelemetryIngressEndpoint struct {
 func (_m *TelemetryIngressEndpoint) ChainID() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChainID")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -31,6 +35,10 @@ func (_m *TelemetryIngressEndpoint) ChainID() string {
 func (_m *TelemetryIngressEndpoint) Network() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Network")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -45,6 +53,10 @@ func (_m *TelemetryIngressEndpoint) Network() string {
 func (_m *TelemetryIngressEndpoint) ServerPubKey() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ServerPubKey")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -59,6 +71,10 @@ func (_m *TelemetryIngressEndpoint) ServerPubKey() string {
 func (_m *TelemetryIngressEndpoint) URL() *url.URL {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for URL")
+	}
+
 	var r0 *url.URL
 	if rf, ok := ret.Get(0).(func() *url.URL); ok {
 		r0 = rf()
diff --git a/core/internal/mocks/application.go b/core/internal/mocks/application.go
index 48f8e12dac3..20874e4b60e 100644
--- a/core/internal/mocks/application.go
+++ b/core/internal/mocks/application.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -53,6 +53,10 @@ type Application struct {
 func (_m *Application) AddJobV2(ctx context.Context, _a1 *job.Job) error {
 	ret := _m.Called(ctx, _a1)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AddJobV2")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *job.Job) error); ok {
 		r0 = rf(ctx, _a1)
@@ -67,6 +71,10 @@ func (_m *Application) AddJobV2(ctx context.Context, _a1 *job.Job) error {
 func (_m *Application) AuthenticationProvider() sessions.AuthenticationProvider {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for AuthenticationProvider")
+	}
+
 	var r0 sessions.AuthenticationProvider
 	if rf, ok := ret.Get(0).(func() sessions.AuthenticationProvider); ok {
 		r0 = rf()
@@ -83,6 +91,10 @@ func (_m *Application) AuthenticationProvider() sessions.AuthenticationProvider
 func (_m *Application) BasicAdminUsersORM() sessions.BasicAdminUsersORM {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BasicAdminUsersORM")
+	}
+
 	var r0 sessions.BasicAdminUsersORM
 	if rf, ok := ret.Get(0).(func() sessions.BasicAdminUsersORM); ok {
 		r0 = rf()
@@ -99,6 +111,10 @@ func (_m *Application) BasicAdminUsersORM() sessions.BasicAdminUsersORM {
 func (_m *Application) BridgeORM() bridges.ORM {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for BridgeORM")
+	}
+
 	var r0 bridges.ORM
 	if rf, ok := ret.Get(0).(func() bridges.ORM); ok {
 		r0 = rf()
@@ -115,6 +131,10 @@ func (_m *Application) BridgeORM() bridges.ORM {
 func (_m *Application) DeleteJob(ctx context.Context, jobID int32) error {
 	ret := _m.Called(ctx, jobID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteJob")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int32) error); ok {
 		r0 = rf(ctx, jobID)
@@ -129,6 +149,10 @@ func (_m *Application) DeleteJob(ctx context.Context, jobID int32) error {
 func (_m *Application) EVMORM() types.Configs {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EVMORM")
+	}
+
 	var r0 types.Configs
 	if rf, ok := ret.Get(0).(func() types.Configs); ok {
 		r0 = rf()
@@ -145,6 +169,10 @@ func (_m *Application) EVMORM() types.Configs {
 func (_m *Application) GetAuditLogger() audit.AuditLogger {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAuditLogger")
+	}
+
 	var r0 audit.AuditLogger
 	if rf, ok := ret.Get(0).(func() audit.AuditLogger); ok {
 		r0 = rf()
@@ -161,6 +189,10 @@ func (_m *Application) GetAuditLogger() audit.AuditLogger {
 func (_m *Application) GetConfig() chainlink.GeneralConfig {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetConfig")
+	}
+
 	var r0 chainlink.GeneralConfig
 	if rf, ok := ret.Get(0).(func() chainlink.GeneralConfig); ok {
 		r0 = rf()
@@ -177,6 +209,10 @@ func (_m *Application) GetConfig() chainlink.GeneralConfig {
 func (_m *Application) GetExternalInitiatorManager() webhook.ExternalInitiatorManager {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetExternalInitiatorManager")
+	}
+
 	var r0 webhook.ExternalInitiatorManager
 	if rf, ok := ret.Get(0).(func() webhook.ExternalInitiatorManager); ok {
 		r0 = rf()
@@ -193,6 +229,10 @@ func (_m *Application) GetExternalInitiatorManager() webhook.ExternalInitiatorMa
 func (_m *Application) GetFeedsService() feeds.Service {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetFeedsService")
+	}
+
 	var r0 feeds.Service
 	if rf, ok := ret.Get(0).(func() feeds.Service); ok {
 		r0 = rf()
@@ -209,6 +249,10 @@ func (_m *Application) GetFeedsService() feeds.Service {
 func (_m *Application) GetHealthChecker() services.Checker {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetHealthChecker")
+	}
+
 	var r0 services.Checker
 	if rf, ok := ret.Get(0).(func() services.Checker); ok {
 		r0 = rf()
@@ -225,6 +269,10 @@ func (_m *Application) GetHealthChecker() services.Checker {
 func (_m *Application) GetKeyStore() keystore.Master {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetKeyStore")
+	}
+
 	var r0 keystore.Master
 	if rf, ok := ret.Get(0).(func() keystore.Master); ok {
 		r0 = rf()
@@ -241,6 +289,10 @@ func (_m *Application) GetKeyStore() keystore.Master {
 func (_m *Application) GetLogger() logger.SugaredLogger {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetLogger")
+	}
+
 	var r0 logger.SugaredLogger
 	if rf, ok := ret.Get(0).(func() logger.SugaredLogger); ok {
 		r0 = rf()
@@ -257,6 +309,10 @@ func (_m *Application) GetLogger() logger.SugaredLogger {
 func (_m *Application) GetLoopRegistry() *plugins.LoopRegistry {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetLoopRegistry")
+	}
+
 	var r0 *plugins.LoopRegistry
 	if rf, ok := ret.Get(0).(func() *plugins.LoopRegistry); ok {
 		r0 = rf()
@@ -273,6 +329,10 @@ func (_m *Application) GetLoopRegistry() *plugins.LoopRegistry {
 func (_m *Application) GetRelayers() chainlink.RelayerChainInteroperators {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetRelayers")
+	}
+
 	var r0 chainlink.RelayerChainInteroperators
 	if rf, ok := ret.Get(0).(func() chainlink.RelayerChainInteroperators); ok {
 		r0 = rf()
@@ -289,6 +349,10 @@ func (_m *Application) GetRelayers() chainlink.RelayerChainInteroperators {
 func (_m *Application) GetSqlxDB() *sqlx.DB {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetSqlxDB")
+	}
+
 	var r0 *sqlx.DB
 	if rf, ok := ret.Get(0).(func() *sqlx.DB); ok {
 		r0 = rf()
@@ -305,6 +369,10 @@ func (_m *Application) GetSqlxDB() *sqlx.DB {
 func (_m *Application) GetWebAuthnConfiguration() sessions.WebAuthnConfiguration {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetWebAuthnConfiguration")
+	}
+
 	var r0 sessions.WebAuthnConfiguration
 	if rf, ok := ret.Get(0).(func() sessions.WebAuthnConfiguration); ok {
 		r0 = rf()
@@ -319,6 +387,10 @@ func (_m *Application) GetWebAuthnConfiguration() sessions.WebAuthnConfiguration
 func (_m *Application) ID() uuid.UUID {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ID")
+	}
+
 	var r0 uuid.UUID
 	if rf, ok := ret.Get(0).(func() uuid.UUID); ok {
 		r0 = rf()
@@ -335,6 +407,10 @@ func (_m *Application) ID() uuid.UUID {
 func (_m *Application) JobORM() job.ORM {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for JobORM")
+	}
+
 	var r0 job.ORM
 	if rf, ok := ret.Get(0).(func() job.ORM); ok {
 		r0 = rf()
@@ -351,6 +427,10 @@ func (_m *Application) JobORM() job.ORM {
 func (_m *Application) JobSpawner() job.Spawner {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for JobSpawner")
+	}
+
 	var r0 job.Spawner
 	if rf, ok := ret.Get(0).(func() job.Spawner); ok {
 		r0 = rf()
@@ -367,6 +447,10 @@ func (_m *Application) JobSpawner() job.Spawner {
 func (_m *Application) PipelineORM() pipeline.ORM {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for PipelineORM")
+	}
+
 	var r0 pipeline.ORM
 	if rf, ok := ret.Get(0).(func() pipeline.ORM); ok {
 		r0 = rf()
@@ -383,6 +467,10 @@ func (_m *Application) PipelineORM() pipeline.ORM {
 func (_m *Application) ReplayFromBlock(chainID *big.Int, number uint64, forceBroadcast bool) error {
 	ret := _m.Called(chainID, number, forceBroadcast)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ReplayFromBlock")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*big.Int, uint64, bool) error); ok {
 		r0 = rf(chainID, number, forceBroadcast)
@@ -397,6 +485,10 @@ func (_m *Application) ReplayFromBlock(chainID *big.Int, number uint64, forceBro
 func (_m *Application) ResumeJobV2(ctx context.Context, taskID uuid.UUID, result pipeline.Result) error {
 	ret := _m.Called(ctx, taskID, result)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ResumeJobV2")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, uuid.UUID, pipeline.Result) error); ok {
 		r0 = rf(ctx, taskID, result)
@@ -411,6 +503,10 @@ func (_m *Application) ResumeJobV2(ctx context.Context, taskID uuid.UUID, result
 func (_m *Application) RunJobV2(ctx context.Context, jobID int32, meta map[string]interface{}) (int64, error) {
 	ret := _m.Called(ctx, jobID, meta)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RunJobV2")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, int32, map[string]interface{}) (int64, error)); ok {
@@ -435,6 +531,10 @@ func (_m *Application) RunJobV2(ctx context.Context, jobID int32, meta map[strin
 func (_m *Application) RunWebhookJobV2(ctx context.Context, jobUUID uuid.UUID, requestBody string, meta pipeline.JSONSerializable) (int64, error) {
 	ret := _m.Called(ctx, jobUUID, requestBody, meta)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RunWebhookJobV2")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, uuid.UUID, string, pipeline.JSONSerializable) (int64, error)); ok {
@@ -459,6 +559,10 @@ func (_m *Application) RunWebhookJobV2(ctx context.Context, jobUUID uuid.UUID, r
 func (_m *Application) SecretGenerator() chainlink.SecretGenerator {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for SecretGenerator")
+	}
+
 	var r0 chainlink.SecretGenerator
 	if rf, ok := ret.Get(0).(func() chainlink.SecretGenerator); ok {
 		r0 = rf()
@@ -475,6 +579,10 @@ func (_m *Application) SecretGenerator() chainlink.SecretGenerator {
 func (_m *Application) SetLogLevel(lvl zapcore.Level) error {
 	ret := _m.Called(lvl)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetLogLevel")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(zapcore.Level) error); ok {
 		r0 = rf(lvl)
@@ -489,6 +597,10 @@ func (_m *Application) SetLogLevel(lvl zapcore.Level) error {
 func (_m *Application) Start(ctx context.Context) error {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(ctx)
@@ -503,6 +615,10 @@ func (_m *Application) Start(ctx context.Context) error {
 func (_m *Application) Stop() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Stop")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -517,6 +633,10 @@ func (_m *Application) Stop() error {
 func (_m *Application) TxmStorageService() txmgr.EvmTxStore {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for TxmStorageService")
+	}
+
 	var r0 txmgr.EvmTxStore
 	if rf, ok := ret.Get(0).(func() txmgr.EvmTxStore); ok {
 		r0 = rf()
diff --git a/core/internal/mocks/flags.go b/core/internal/mocks/flags.go
index 5b5aa812680..32d21326ba0 100644
--- a/core/internal/mocks/flags.go
+++ b/core/internal/mocks/flags.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -26,6 +26,10 @@ type Flags struct {
 func (_m *Flags) AcceptOwnership(opts *bind.TransactOpts) (*types.Transaction, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AcceptOwnership")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts) (*types.Transaction, error)); ok {
@@ -52,6 +56,10 @@ func (_m *Flags) AcceptOwnership(opts *bind.TransactOpts) (*types.Transaction, e
 func (_m *Flags) AddAccess(opts *bind.TransactOpts, _user common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, _user)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AddAccess")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -78,6 +86,10 @@ func (_m *Flags) AddAccess(opts *bind.TransactOpts, _user common.Address) (*type
 func (_m *Flags) Address() common.Address {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Address")
+	}
+
 	var r0 common.Address
 	if rf, ok := ret.Get(0).(func() common.Address); ok {
 		r0 = rf()
@@ -94,6 +106,10 @@ func (_m *Flags) Address() common.Address {
 func (_m *Flags) CheckEnabled(opts *bind.CallOpts) (bool, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CheckEnabled")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (bool, error)); ok {
@@ -118,6 +134,10 @@ func (_m *Flags) CheckEnabled(opts *bind.CallOpts) (bool, error) {
 func (_m *Flags) DisableAccessCheck(opts *bind.TransactOpts) (*types.Transaction, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DisableAccessCheck")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts) (*types.Transaction, error)); ok {
@@ -144,6 +164,10 @@ func (_m *Flags) DisableAccessCheck(opts *bind.TransactOpts) (*types.Transaction
 func (_m *Flags) EnableAccessCheck(opts *bind.TransactOpts) (*types.Transaction, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnableAccessCheck")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts) (*types.Transaction, error)); ok {
@@ -170,6 +194,10 @@ func (_m *Flags) EnableAccessCheck(opts *bind.TransactOpts) (*types.Transaction,
 func (_m *Flags) FilterAddedAccess(opts *bind.FilterOpts) (*flags_wrapper.FlagsAddedAccessIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterAddedAccess")
+	}
+
 	var r0 *flags_wrapper.FlagsAddedAccessIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*flags_wrapper.FlagsAddedAccessIterator, error)); ok {
@@ -196,6 +224,10 @@ func (_m *Flags) FilterAddedAccess(opts *bind.FilterOpts) (*flags_wrapper.FlagsA
 func (_m *Flags) FilterCheckAccessDisabled(opts *bind.FilterOpts) (*flags_wrapper.FlagsCheckAccessDisabledIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterCheckAccessDisabled")
+	}
+
 	var r0 *flags_wrapper.FlagsCheckAccessDisabledIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*flags_wrapper.FlagsCheckAccessDisabledIterator, error)); ok {
@@ -222,6 +254,10 @@ func (_m *Flags) FilterCheckAccessDisabled(opts *bind.FilterOpts) (*flags_wrappe
 func (_m *Flags) FilterCheckAccessEnabled(opts *bind.FilterOpts) (*flags_wrapper.FlagsCheckAccessEnabledIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterCheckAccessEnabled")
+	}
+
 	var r0 *flags_wrapper.FlagsCheckAccessEnabledIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*flags_wrapper.FlagsCheckAccessEnabledIterator, error)); ok {
@@ -248,6 +284,10 @@ func (_m *Flags) FilterCheckAccessEnabled(opts *bind.FilterOpts) (*flags_wrapper
 func (_m *Flags) FilterFlagLowered(opts *bind.FilterOpts, subject []common.Address) (*flags_wrapper.FlagsFlagLoweredIterator, error) {
 	ret := _m.Called(opts, subject)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterFlagLowered")
+	}
+
 	var r0 *flags_wrapper.FlagsFlagLoweredIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) (*flags_wrapper.FlagsFlagLoweredIterator, error)); ok {
@@ -274,6 +314,10 @@ func (_m *Flags) FilterFlagLowered(opts *bind.FilterOpts, subject []common.Addre
 func (_m *Flags) FilterFlagRaised(opts *bind.FilterOpts, subject []common.Address) (*flags_wrapper.FlagsFlagRaisedIterator, error) {
 	ret := _m.Called(opts, subject)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterFlagRaised")
+	}
+
 	var r0 *flags_wrapper.FlagsFlagRaisedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) (*flags_wrapper.FlagsFlagRaisedIterator, error)); ok {
@@ -300,6 +344,10 @@ func (_m *Flags) FilterFlagRaised(opts *bind.FilterOpts, subject []common.Addres
 func (_m *Flags) FilterOwnershipTransferRequested(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*flags_wrapper.FlagsOwnershipTransferRequestedIterator, error) {
 	ret := _m.Called(opts, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOwnershipTransferRequested")
+	}
+
 	var r0 *flags_wrapper.FlagsOwnershipTransferRequestedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*flags_wrapper.FlagsOwnershipTransferRequestedIterator, error)); ok {
@@ -326,6 +374,10 @@ func (_m *Flags) FilterOwnershipTransferRequested(opts *bind.FilterOpts, from []
 func (_m *Flags) FilterOwnershipTransferred(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*flags_wrapper.FlagsOwnershipTransferredIterator, error) {
 	ret := _m.Called(opts, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOwnershipTransferred")
+	}
+
 	var r0 *flags_wrapper.FlagsOwnershipTransferredIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*flags_wrapper.FlagsOwnershipTransferredIterator, error)); ok {
@@ -352,6 +404,10 @@ func (_m *Flags) FilterOwnershipTransferred(opts *bind.FilterOpts, from []common
 func (_m *Flags) FilterRaisingAccessControllerUpdated(opts *bind.FilterOpts, previous []common.Address, current []common.Address) (*flags_wrapper.FlagsRaisingAccessControllerUpdatedIterator, error) {
 	ret := _m.Called(opts, previous, current)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterRaisingAccessControllerUpdated")
+	}
+
 	var r0 *flags_wrapper.FlagsRaisingAccessControllerUpdatedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*flags_wrapper.FlagsRaisingAccessControllerUpdatedIterator, error)); ok {
@@ -378,6 +434,10 @@ func (_m *Flags) FilterRaisingAccessControllerUpdated(opts *bind.FilterOpts, pre
 func (_m *Flags) FilterRemovedAccess(opts *bind.FilterOpts) (*flags_wrapper.FlagsRemovedAccessIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterRemovedAccess")
+	}
+
 	var r0 *flags_wrapper.FlagsRemovedAccessIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*flags_wrapper.FlagsRemovedAccessIterator, error)); ok {
@@ -404,6 +464,10 @@ func (_m *Flags) FilterRemovedAccess(opts *bind.FilterOpts) (*flags_wrapper.Flag
 func (_m *Flags) GetFlag(opts *bind.CallOpts, subject common.Address) (bool, error) {
 	ret := _m.Called(opts, subject)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetFlag")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address) (bool, error)); ok {
@@ -428,6 +492,10 @@ func (_m *Flags) GetFlag(opts *bind.CallOpts, subject common.Address) (bool, err
 func (_m *Flags) GetFlags(opts *bind.CallOpts, subjects []common.Address) ([]bool, error) {
 	ret := _m.Called(opts, subjects)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetFlags")
+	}
+
 	var r0 []bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, []common.Address) ([]bool, error)); ok {
@@ -454,6 +522,10 @@ func (_m *Flags) GetFlags(opts *bind.CallOpts, subjects []common.Address) ([]boo
 func (_m *Flags) HasAccess(opts *bind.CallOpts, _user common.Address, _calldata []byte) (bool, error) {
 	ret := _m.Called(opts, _user, _calldata)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HasAccess")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address, []byte) (bool, error)); ok {
@@ -478,6 +550,10 @@ func (_m *Flags) HasAccess(opts *bind.CallOpts, _user common.Address, _calldata
 func (_m *Flags) LowerFlags(opts *bind.TransactOpts, subjects []common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, subjects)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LowerFlags")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []common.Address) (*types.Transaction, error)); ok {
@@ -504,6 +580,10 @@ func (_m *Flags) LowerFlags(opts *bind.TransactOpts, subjects []common.Address)
 func (_m *Flags) Owner(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Owner")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -530,6 +610,10 @@ func (_m *Flags) Owner(opts *bind.CallOpts) (common.Address, error) {
 func (_m *Flags) ParseAddedAccess(log types.Log) (*flags_wrapper.FlagsAddedAccess, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseAddedAccess")
+	}
+
 	var r0 *flags_wrapper.FlagsAddedAccess
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flags_wrapper.FlagsAddedAccess, error)); ok {
@@ -556,6 +640,10 @@ func (_m *Flags) ParseAddedAccess(log types.Log) (*flags_wrapper.FlagsAddedAcces
 func (_m *Flags) ParseCheckAccessDisabled(log types.Log) (*flags_wrapper.FlagsCheckAccessDisabled, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseCheckAccessDisabled")
+	}
+
 	var r0 *flags_wrapper.FlagsCheckAccessDisabled
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flags_wrapper.FlagsCheckAccessDisabled, error)); ok {
@@ -582,6 +670,10 @@ func (_m *Flags) ParseCheckAccessDisabled(log types.Log) (*flags_wrapper.FlagsCh
 func (_m *Flags) ParseCheckAccessEnabled(log types.Log) (*flags_wrapper.FlagsCheckAccessEnabled, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseCheckAccessEnabled")
+	}
+
 	var r0 *flags_wrapper.FlagsCheckAccessEnabled
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flags_wrapper.FlagsCheckAccessEnabled, error)); ok {
@@ -608,6 +700,10 @@ func (_m *Flags) ParseCheckAccessEnabled(log types.Log) (*flags_wrapper.FlagsChe
 func (_m *Flags) ParseFlagLowered(log types.Log) (*flags_wrapper.FlagsFlagLowered, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseFlagLowered")
+	}
+
 	var r0 *flags_wrapper.FlagsFlagLowered
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flags_wrapper.FlagsFlagLowered, error)); ok {
@@ -634,6 +730,10 @@ func (_m *Flags) ParseFlagLowered(log types.Log) (*flags_wrapper.FlagsFlagLowere
 func (_m *Flags) ParseFlagRaised(log types.Log) (*flags_wrapper.FlagsFlagRaised, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseFlagRaised")
+	}
+
 	var r0 *flags_wrapper.FlagsFlagRaised
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flags_wrapper.FlagsFlagRaised, error)); ok {
@@ -660,6 +760,10 @@ func (_m *Flags) ParseFlagRaised(log types.Log) (*flags_wrapper.FlagsFlagRaised,
 func (_m *Flags) ParseLog(log types.Log) (generated.AbigenLog, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseLog")
+	}
+
 	var r0 generated.AbigenLog
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (generated.AbigenLog, error)); ok {
@@ -686,6 +790,10 @@ func (_m *Flags) ParseLog(log types.Log) (generated.AbigenLog, error) {
 func (_m *Flags) ParseOwnershipTransferRequested(log types.Log) (*flags_wrapper.FlagsOwnershipTransferRequested, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOwnershipTransferRequested")
+	}
+
 	var r0 *flags_wrapper.FlagsOwnershipTransferRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flags_wrapper.FlagsOwnershipTransferRequested, error)); ok {
@@ -712,6 +820,10 @@ func (_m *Flags) ParseOwnershipTransferRequested(log types.Log) (*flags_wrapper.
 func (_m *Flags) ParseOwnershipTransferred(log types.Log) (*flags_wrapper.FlagsOwnershipTransferred, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOwnershipTransferred")
+	}
+
 	var r0 *flags_wrapper.FlagsOwnershipTransferred
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flags_wrapper.FlagsOwnershipTransferred, error)); ok {
@@ -738,6 +850,10 @@ func (_m *Flags) ParseOwnershipTransferred(log types.Log) (*flags_wrapper.FlagsO
 func (_m *Flags) ParseRaisingAccessControllerUpdated(log types.Log) (*flags_wrapper.FlagsRaisingAccessControllerUpdated, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseRaisingAccessControllerUpdated")
+	}
+
 	var r0 *flags_wrapper.FlagsRaisingAccessControllerUpdated
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flags_wrapper.FlagsRaisingAccessControllerUpdated, error)); ok {
@@ -764,6 +880,10 @@ func (_m *Flags) ParseRaisingAccessControllerUpdated(log types.Log) (*flags_wrap
 func (_m *Flags) ParseRemovedAccess(log types.Log) (*flags_wrapper.FlagsRemovedAccess, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseRemovedAccess")
+	}
+
 	var r0 *flags_wrapper.FlagsRemovedAccess
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flags_wrapper.FlagsRemovedAccess, error)); ok {
@@ -790,6 +910,10 @@ func (_m *Flags) ParseRemovedAccess(log types.Log) (*flags_wrapper.FlagsRemovedA
 func (_m *Flags) RaiseFlag(opts *bind.TransactOpts, subject common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, subject)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RaiseFlag")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -816,6 +940,10 @@ func (_m *Flags) RaiseFlag(opts *bind.TransactOpts, subject common.Address) (*ty
 func (_m *Flags) RaiseFlags(opts *bind.TransactOpts, subjects []common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, subjects)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RaiseFlags")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []common.Address) (*types.Transaction, error)); ok {
@@ -842,6 +970,10 @@ func (_m *Flags) RaiseFlags(opts *bind.TransactOpts, subjects []common.Address)
 func (_m *Flags) RaisingAccessController(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RaisingAccessController")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -868,6 +1000,10 @@ func (_m *Flags) RaisingAccessController(opts *bind.CallOpts) (common.Address, e
 func (_m *Flags) RemoveAccess(opts *bind.TransactOpts, _user common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, _user)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RemoveAccess")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -894,6 +1030,10 @@ func (_m *Flags) RemoveAccess(opts *bind.TransactOpts, _user common.Address) (*t
 func (_m *Flags) SetRaisingAccessController(opts *bind.TransactOpts, racAddress common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, racAddress)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetRaisingAccessController")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -920,6 +1060,10 @@ func (_m *Flags) SetRaisingAccessController(opts *bind.TransactOpts, racAddress
 func (_m *Flags) TransferOwnership(opts *bind.TransactOpts, _to common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, _to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransferOwnership")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -946,6 +1090,10 @@ func (_m *Flags) TransferOwnership(opts *bind.TransactOpts, _to common.Address)
 func (_m *Flags) WatchAddedAccess(opts *bind.WatchOpts, sink chan<- *flags_wrapper.FlagsAddedAccess) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchAddedAccess")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flags_wrapper.FlagsAddedAccess) (event.Subscription, error)); ok {
@@ -972,6 +1120,10 @@ func (_m *Flags) WatchAddedAccess(opts *bind.WatchOpts, sink chan<- *flags_wrapp
 func (_m *Flags) WatchCheckAccessDisabled(opts *bind.WatchOpts, sink chan<- *flags_wrapper.FlagsCheckAccessDisabled) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchCheckAccessDisabled")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flags_wrapper.FlagsCheckAccessDisabled) (event.Subscription, error)); ok {
@@ -998,6 +1150,10 @@ func (_m *Flags) WatchCheckAccessDisabled(opts *bind.WatchOpts, sink chan<- *fla
 func (_m *Flags) WatchCheckAccessEnabled(opts *bind.WatchOpts, sink chan<- *flags_wrapper.FlagsCheckAccessEnabled) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchCheckAccessEnabled")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flags_wrapper.FlagsCheckAccessEnabled) (event.Subscription, error)); ok {
@@ -1024,6 +1180,10 @@ func (_m *Flags) WatchCheckAccessEnabled(opts *bind.WatchOpts, sink chan<- *flag
 func (_m *Flags) WatchFlagLowered(opts *bind.WatchOpts, sink chan<- *flags_wrapper.FlagsFlagLowered, subject []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subject)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchFlagLowered")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flags_wrapper.FlagsFlagLowered, []common.Address) (event.Subscription, error)); ok {
@@ -1050,6 +1210,10 @@ func (_m *Flags) WatchFlagLowered(opts *bind.WatchOpts, sink chan<- *flags_wrapp
 func (_m *Flags) WatchFlagRaised(opts *bind.WatchOpts, sink chan<- *flags_wrapper.FlagsFlagRaised, subject []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subject)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchFlagRaised")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flags_wrapper.FlagsFlagRaised, []common.Address) (event.Subscription, error)); ok {
@@ -1076,6 +1240,10 @@ func (_m *Flags) WatchFlagRaised(opts *bind.WatchOpts, sink chan<- *flags_wrappe
 func (_m *Flags) WatchOwnershipTransferRequested(opts *bind.WatchOpts, sink chan<- *flags_wrapper.FlagsOwnershipTransferRequested, from []common.Address, to []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOwnershipTransferRequested")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flags_wrapper.FlagsOwnershipTransferRequested, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -1102,6 +1270,10 @@ func (_m *Flags) WatchOwnershipTransferRequested(opts *bind.WatchOpts, sink chan
 func (_m *Flags) WatchOwnershipTransferred(opts *bind.WatchOpts, sink chan<- *flags_wrapper.FlagsOwnershipTransferred, from []common.Address, to []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOwnershipTransferred")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flags_wrapper.FlagsOwnershipTransferred, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -1128,6 +1300,10 @@ func (_m *Flags) WatchOwnershipTransferred(opts *bind.WatchOpts, sink chan<- *fl
 func (_m *Flags) WatchRaisingAccessControllerUpdated(opts *bind.WatchOpts, sink chan<- *flags_wrapper.FlagsRaisingAccessControllerUpdated, previous []common.Address, current []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, previous, current)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchRaisingAccessControllerUpdated")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flags_wrapper.FlagsRaisingAccessControllerUpdated, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -1154,6 +1330,10 @@ func (_m *Flags) WatchRaisingAccessControllerUpdated(opts *bind.WatchOpts, sink
 func (_m *Flags) WatchRemovedAccess(opts *bind.WatchOpts, sink chan<- *flags_wrapper.FlagsRemovedAccess) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchRemovedAccess")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flags_wrapper.FlagsRemovedAccess) (event.Subscription, error)); ok {
diff --git a/core/internal/mocks/flux_aggregator.go b/core/internal/mocks/flux_aggregator.go
index e3da1b83dff..ac72bd07db8 100644
--- a/core/internal/mocks/flux_aggregator.go
+++ b/core/internal/mocks/flux_aggregator.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -28,6 +28,10 @@ type FluxAggregator struct {
 func (_m *FluxAggregator) AcceptAdmin(opts *bind.TransactOpts, _oracle common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, _oracle)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AcceptAdmin")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -54,6 +58,10 @@ func (_m *FluxAggregator) AcceptAdmin(opts *bind.TransactOpts, _oracle common.Ad
 func (_m *FluxAggregator) AcceptOwnership(opts *bind.TransactOpts) (*types.Transaction, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AcceptOwnership")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts) (*types.Transaction, error)); ok {
@@ -80,6 +88,10 @@ func (_m *FluxAggregator) AcceptOwnership(opts *bind.TransactOpts) (*types.Trans
 func (_m *FluxAggregator) Address() common.Address {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Address")
+	}
+
 	var r0 common.Address
 	if rf, ok := ret.Get(0).(func() common.Address); ok {
 		r0 = rf()
@@ -96,6 +108,10 @@ func (_m *FluxAggregator) Address() common.Address {
 func (_m *FluxAggregator) AllocatedFunds(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AllocatedFunds")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -122,6 +138,10 @@ func (_m *FluxAggregator) AllocatedFunds(opts *bind.CallOpts) (*big.Int, error)
 func (_m *FluxAggregator) AvailableFunds(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AvailableFunds")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -148,6 +168,10 @@ func (_m *FluxAggregator) AvailableFunds(opts *bind.CallOpts) (*big.Int, error)
 func (_m *FluxAggregator) ChangeOracles(opts *bind.TransactOpts, _removed []common.Address, _added []common.Address, _addedAdmins []common.Address, _minSubmissions uint32, _maxSubmissions uint32, _restartDelay uint32) (*types.Transaction, error) {
 	ret := _m.Called(opts, _removed, _added, _addedAdmins, _minSubmissions, _maxSubmissions, _restartDelay)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChangeOracles")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []common.Address, []common.Address, []common.Address, uint32, uint32, uint32) (*types.Transaction, error)); ok {
@@ -174,6 +198,10 @@ func (_m *FluxAggregator) ChangeOracles(opts *bind.TransactOpts, _removed []comm
 func (_m *FluxAggregator) Decimals(opts *bind.CallOpts) (uint8, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Decimals")
+	}
+
 	var r0 uint8
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint8, error)); ok {
@@ -198,6 +226,10 @@ func (_m *FluxAggregator) Decimals(opts *bind.CallOpts) (uint8, error) {
 func (_m *FluxAggregator) Description(opts *bind.CallOpts) (string, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Description")
+	}
+
 	var r0 string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (string, error)); ok {
@@ -222,6 +254,10 @@ func (_m *FluxAggregator) Description(opts *bind.CallOpts) (string, error) {
 func (_m *FluxAggregator) FilterAnswerUpdated(opts *bind.FilterOpts, current []*big.Int, roundId []*big.Int) (*flux_aggregator_wrapper.FluxAggregatorAnswerUpdatedIterator, error) {
 	ret := _m.Called(opts, current, roundId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterAnswerUpdated")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorAnswerUpdatedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int, []*big.Int) (*flux_aggregator_wrapper.FluxAggregatorAnswerUpdatedIterator, error)); ok {
@@ -248,6 +284,10 @@ func (_m *FluxAggregator) FilterAnswerUpdated(opts *bind.FilterOpts, current []*
 func (_m *FluxAggregator) FilterAvailableFundsUpdated(opts *bind.FilterOpts, amount []*big.Int) (*flux_aggregator_wrapper.FluxAggregatorAvailableFundsUpdatedIterator, error) {
 	ret := _m.Called(opts, amount)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterAvailableFundsUpdated")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorAvailableFundsUpdatedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int) (*flux_aggregator_wrapper.FluxAggregatorAvailableFundsUpdatedIterator, error)); ok {
@@ -274,6 +314,10 @@ func (_m *FluxAggregator) FilterAvailableFundsUpdated(opts *bind.FilterOpts, amo
 func (_m *FluxAggregator) FilterNewRound(opts *bind.FilterOpts, roundId []*big.Int, startedBy []common.Address) (*flux_aggregator_wrapper.FluxAggregatorNewRoundIterator, error) {
 	ret := _m.Called(opts, roundId, startedBy)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterNewRound")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorNewRoundIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int, []common.Address) (*flux_aggregator_wrapper.FluxAggregatorNewRoundIterator, error)); ok {
@@ -300,6 +344,10 @@ func (_m *FluxAggregator) FilterNewRound(opts *bind.FilterOpts, roundId []*big.I
 func (_m *FluxAggregator) FilterOracleAdminUpdateRequested(opts *bind.FilterOpts, oracle []common.Address) (*flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdateRequestedIterator, error) {
 	ret := _m.Called(opts, oracle)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOracleAdminUpdateRequested")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdateRequestedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) (*flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdateRequestedIterator, error)); ok {
@@ -326,6 +374,10 @@ func (_m *FluxAggregator) FilterOracleAdminUpdateRequested(opts *bind.FilterOpts
 func (_m *FluxAggregator) FilterOracleAdminUpdated(opts *bind.FilterOpts, oracle []common.Address, newAdmin []common.Address) (*flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdatedIterator, error) {
 	ret := _m.Called(opts, oracle, newAdmin)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOracleAdminUpdated")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdatedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdatedIterator, error)); ok {
@@ -352,6 +404,10 @@ func (_m *FluxAggregator) FilterOracleAdminUpdated(opts *bind.FilterOpts, oracle
 func (_m *FluxAggregator) FilterOraclePermissionsUpdated(opts *bind.FilterOpts, oracle []common.Address, whitelisted []bool) (*flux_aggregator_wrapper.FluxAggregatorOraclePermissionsUpdatedIterator, error) {
 	ret := _m.Called(opts, oracle, whitelisted)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOraclePermissionsUpdated")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorOraclePermissionsUpdatedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []bool) (*flux_aggregator_wrapper.FluxAggregatorOraclePermissionsUpdatedIterator, error)); ok {
@@ -378,6 +434,10 @@ func (_m *FluxAggregator) FilterOraclePermissionsUpdated(opts *bind.FilterOpts,
 func (_m *FluxAggregator) FilterOwnershipTransferRequested(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*flux_aggregator_wrapper.FluxAggregatorOwnershipTransferRequestedIterator, error) {
 	ret := _m.Called(opts, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOwnershipTransferRequested")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorOwnershipTransferRequestedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*flux_aggregator_wrapper.FluxAggregatorOwnershipTransferRequestedIterator, error)); ok {
@@ -404,6 +464,10 @@ func (_m *FluxAggregator) FilterOwnershipTransferRequested(opts *bind.FilterOpts
 func (_m *FluxAggregator) FilterOwnershipTransferred(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*flux_aggregator_wrapper.FluxAggregatorOwnershipTransferredIterator, error) {
 	ret := _m.Called(opts, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOwnershipTransferred")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorOwnershipTransferredIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*flux_aggregator_wrapper.FluxAggregatorOwnershipTransferredIterator, error)); ok {
@@ -430,6 +494,10 @@ func (_m *FluxAggregator) FilterOwnershipTransferred(opts *bind.FilterOpts, from
 func (_m *FluxAggregator) FilterRequesterPermissionsSet(opts *bind.FilterOpts, requester []common.Address) (*flux_aggregator_wrapper.FluxAggregatorRequesterPermissionsSetIterator, error) {
 	ret := _m.Called(opts, requester)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterRequesterPermissionsSet")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorRequesterPermissionsSetIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) (*flux_aggregator_wrapper.FluxAggregatorRequesterPermissionsSetIterator, error)); ok {
@@ -456,6 +524,10 @@ func (_m *FluxAggregator) FilterRequesterPermissionsSet(opts *bind.FilterOpts, r
 func (_m *FluxAggregator) FilterRoundDetailsUpdated(opts *bind.FilterOpts, paymentAmount []*big.Int, minSubmissionCount []uint32, maxSubmissionCount []uint32) (*flux_aggregator_wrapper.FluxAggregatorRoundDetailsUpdatedIterator, error) {
 	ret := _m.Called(opts, paymentAmount, minSubmissionCount, maxSubmissionCount)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterRoundDetailsUpdated")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorRoundDetailsUpdatedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int, []uint32, []uint32) (*flux_aggregator_wrapper.FluxAggregatorRoundDetailsUpdatedIterator, error)); ok {
@@ -482,6 +554,10 @@ func (_m *FluxAggregator) FilterRoundDetailsUpdated(opts *bind.FilterOpts, payme
 func (_m *FluxAggregator) FilterSubmissionReceived(opts *bind.FilterOpts, submission []*big.Int, round []uint32, oracle []common.Address) (*flux_aggregator_wrapper.FluxAggregatorSubmissionReceivedIterator, error) {
 	ret := _m.Called(opts, submission, round, oracle)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubmissionReceived")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorSubmissionReceivedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int, []uint32, []common.Address) (*flux_aggregator_wrapper.FluxAggregatorSubmissionReceivedIterator, error)); ok {
@@ -508,6 +584,10 @@ func (_m *FluxAggregator) FilterSubmissionReceived(opts *bind.FilterOpts, submis
 func (_m *FluxAggregator) FilterValidatorUpdated(opts *bind.FilterOpts, previous []common.Address, current []common.Address) (*flux_aggregator_wrapper.FluxAggregatorValidatorUpdatedIterator, error) {
 	ret := _m.Called(opts, previous, current)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterValidatorUpdated")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorValidatorUpdatedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*flux_aggregator_wrapper.FluxAggregatorValidatorUpdatedIterator, error)); ok {
@@ -534,6 +614,10 @@ func (_m *FluxAggregator) FilterValidatorUpdated(opts *bind.FilterOpts, previous
 func (_m *FluxAggregator) GetAdmin(opts *bind.CallOpts, _oracle common.Address) (common.Address, error) {
 	ret := _m.Called(opts, _oracle)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAdmin")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address) (common.Address, error)); ok {
@@ -560,6 +644,10 @@ func (_m *FluxAggregator) GetAdmin(opts *bind.CallOpts, _oracle common.Address)
 func (_m *FluxAggregator) GetAnswer(opts *bind.CallOpts, _roundId *big.Int) (*big.Int, error) {
 	ret := _m.Called(opts, _roundId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAnswer")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int) (*big.Int, error)); ok {
@@ -586,6 +674,10 @@ func (_m *FluxAggregator) GetAnswer(opts *bind.CallOpts, _roundId *big.Int) (*bi
 func (_m *FluxAggregator) GetOracles(opts *bind.CallOpts) ([]common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetOracles")
+	}
+
 	var r0 []common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) ([]common.Address, error)); ok {
@@ -612,6 +704,10 @@ func (_m *FluxAggregator) GetOracles(opts *bind.CallOpts) ([]common.Address, err
 func (_m *FluxAggregator) GetRoundData(opts *bind.CallOpts, _roundId *big.Int) (flux_aggregator_wrapper.GetRoundData, error) {
 	ret := _m.Called(opts, _roundId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetRoundData")
+	}
+
 	var r0 flux_aggregator_wrapper.GetRoundData
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int) (flux_aggregator_wrapper.GetRoundData, error)); ok {
@@ -636,6 +732,10 @@ func (_m *FluxAggregator) GetRoundData(opts *bind.CallOpts, _roundId *big.Int) (
 func (_m *FluxAggregator) GetTimestamp(opts *bind.CallOpts, _roundId *big.Int) (*big.Int, error) {
 	ret := _m.Called(opts, _roundId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTimestamp")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int) (*big.Int, error)); ok {
@@ -662,6 +762,10 @@ func (_m *FluxAggregator) GetTimestamp(opts *bind.CallOpts, _roundId *big.Int) (
 func (_m *FluxAggregator) LatestAnswer(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestAnswer")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -688,6 +792,10 @@ func (_m *FluxAggregator) LatestAnswer(opts *bind.CallOpts) (*big.Int, error) {
 func (_m *FluxAggregator) LatestRound(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestRound")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -714,6 +822,10 @@ func (_m *FluxAggregator) LatestRound(opts *bind.CallOpts) (*big.Int, error) {
 func (_m *FluxAggregator) LatestRoundData(opts *bind.CallOpts) (flux_aggregator_wrapper.LatestRoundData, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestRoundData")
+	}
+
 	var r0 flux_aggregator_wrapper.LatestRoundData
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (flux_aggregator_wrapper.LatestRoundData, error)); ok {
@@ -738,6 +850,10 @@ func (_m *FluxAggregator) LatestRoundData(opts *bind.CallOpts) (flux_aggregator_
 func (_m *FluxAggregator) LatestTimestamp(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestTimestamp")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -764,6 +880,10 @@ func (_m *FluxAggregator) LatestTimestamp(opts *bind.CallOpts) (*big.Int, error)
 func (_m *FluxAggregator) LinkToken(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LinkToken")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -790,6 +910,10 @@ func (_m *FluxAggregator) LinkToken(opts *bind.CallOpts) (common.Address, error)
 func (_m *FluxAggregator) MaxSubmissionCount(opts *bind.CallOpts) (uint32, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MaxSubmissionCount")
+	}
+
 	var r0 uint32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint32, error)); ok {
@@ -814,6 +938,10 @@ func (_m *FluxAggregator) MaxSubmissionCount(opts *bind.CallOpts) (uint32, error
 func (_m *FluxAggregator) MaxSubmissionValue(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MaxSubmissionValue")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -840,6 +968,10 @@ func (_m *FluxAggregator) MaxSubmissionValue(opts *bind.CallOpts) (*big.Int, err
 func (_m *FluxAggregator) MinSubmissionCount(opts *bind.CallOpts) (uint32, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MinSubmissionCount")
+	}
+
 	var r0 uint32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint32, error)); ok {
@@ -864,6 +996,10 @@ func (_m *FluxAggregator) MinSubmissionCount(opts *bind.CallOpts) (uint32, error
 func (_m *FluxAggregator) MinSubmissionValue(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MinSubmissionValue")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -890,6 +1026,10 @@ func (_m *FluxAggregator) MinSubmissionValue(opts *bind.CallOpts) (*big.Int, err
 func (_m *FluxAggregator) OnTokenTransfer(opts *bind.TransactOpts, arg0 common.Address, arg1 *big.Int, _data []byte) (*types.Transaction, error) {
 	ret := _m.Called(opts, arg0, arg1, _data)
 
+	if len(ret) == 0 {
+		panic("no return value specified for OnTokenTransfer")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address, *big.Int, []byte) (*types.Transaction, error)); ok {
@@ -916,6 +1056,10 @@ func (_m *FluxAggregator) OnTokenTransfer(opts *bind.TransactOpts, arg0 common.A
 func (_m *FluxAggregator) OracleCount(opts *bind.CallOpts) (uint8, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for OracleCount")
+	}
+
 	var r0 uint8
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint8, error)); ok {
@@ -940,6 +1084,10 @@ func (_m *FluxAggregator) OracleCount(opts *bind.CallOpts) (uint8, error) {
 func (_m *FluxAggregator) OracleRoundState(opts *bind.CallOpts, _oracle common.Address, _queriedRoundId uint32) (flux_aggregator_wrapper.OracleRoundState, error) {
 	ret := _m.Called(opts, _oracle, _queriedRoundId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for OracleRoundState")
+	}
+
 	var r0 flux_aggregator_wrapper.OracleRoundState
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address, uint32) (flux_aggregator_wrapper.OracleRoundState, error)); ok {
@@ -964,6 +1112,10 @@ func (_m *FluxAggregator) OracleRoundState(opts *bind.CallOpts, _oracle common.A
 func (_m *FluxAggregator) Owner(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Owner")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -990,6 +1142,10 @@ func (_m *FluxAggregator) Owner(opts *bind.CallOpts) (common.Address, error) {
 func (_m *FluxAggregator) ParseAnswerUpdated(log types.Log) (*flux_aggregator_wrapper.FluxAggregatorAnswerUpdated, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseAnswerUpdated")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorAnswerUpdated
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flux_aggregator_wrapper.FluxAggregatorAnswerUpdated, error)); ok {
@@ -1016,6 +1172,10 @@ func (_m *FluxAggregator) ParseAnswerUpdated(log types.Log) (*flux_aggregator_wr
 func (_m *FluxAggregator) ParseAvailableFundsUpdated(log types.Log) (*flux_aggregator_wrapper.FluxAggregatorAvailableFundsUpdated, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseAvailableFundsUpdated")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorAvailableFundsUpdated
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flux_aggregator_wrapper.FluxAggregatorAvailableFundsUpdated, error)); ok {
@@ -1042,6 +1202,10 @@ func (_m *FluxAggregator) ParseAvailableFundsUpdated(log types.Log) (*flux_aggre
 func (_m *FluxAggregator) ParseLog(log types.Log) (generated.AbigenLog, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseLog")
+	}
+
 	var r0 generated.AbigenLog
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (generated.AbigenLog, error)); ok {
@@ -1068,6 +1232,10 @@ func (_m *FluxAggregator) ParseLog(log types.Log) (generated.AbigenLog, error) {
 func (_m *FluxAggregator) ParseNewRound(log types.Log) (*flux_aggregator_wrapper.FluxAggregatorNewRound, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseNewRound")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorNewRound
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flux_aggregator_wrapper.FluxAggregatorNewRound, error)); ok {
@@ -1094,6 +1262,10 @@ func (_m *FluxAggregator) ParseNewRound(log types.Log) (*flux_aggregator_wrapper
 func (_m *FluxAggregator) ParseOracleAdminUpdateRequested(log types.Log) (*flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdateRequested, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOracleAdminUpdateRequested")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdateRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdateRequested, error)); ok {
@@ -1120,6 +1292,10 @@ func (_m *FluxAggregator) ParseOracleAdminUpdateRequested(log types.Log) (*flux_
 func (_m *FluxAggregator) ParseOracleAdminUpdated(log types.Log) (*flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdated, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOracleAdminUpdated")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdated
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdated, error)); ok {
@@ -1146,6 +1322,10 @@ func (_m *FluxAggregator) ParseOracleAdminUpdated(log types.Log) (*flux_aggregat
 func (_m *FluxAggregator) ParseOraclePermissionsUpdated(log types.Log) (*flux_aggregator_wrapper.FluxAggregatorOraclePermissionsUpdated, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOraclePermissionsUpdated")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorOraclePermissionsUpdated
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flux_aggregator_wrapper.FluxAggregatorOraclePermissionsUpdated, error)); ok {
@@ -1172,6 +1352,10 @@ func (_m *FluxAggregator) ParseOraclePermissionsUpdated(log types.Log) (*flux_ag
 func (_m *FluxAggregator) ParseOwnershipTransferRequested(log types.Log) (*flux_aggregator_wrapper.FluxAggregatorOwnershipTransferRequested, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOwnershipTransferRequested")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorOwnershipTransferRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flux_aggregator_wrapper.FluxAggregatorOwnershipTransferRequested, error)); ok {
@@ -1198,6 +1382,10 @@ func (_m *FluxAggregator) ParseOwnershipTransferRequested(log types.Log) (*flux_
 func (_m *FluxAggregator) ParseOwnershipTransferred(log types.Log) (*flux_aggregator_wrapper.FluxAggregatorOwnershipTransferred, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOwnershipTransferred")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorOwnershipTransferred
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flux_aggregator_wrapper.FluxAggregatorOwnershipTransferred, error)); ok {
@@ -1224,6 +1412,10 @@ func (_m *FluxAggregator) ParseOwnershipTransferred(log types.Log) (*flux_aggreg
 func (_m *FluxAggregator) ParseRequesterPermissionsSet(log types.Log) (*flux_aggregator_wrapper.FluxAggregatorRequesterPermissionsSet, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseRequesterPermissionsSet")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorRequesterPermissionsSet
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flux_aggregator_wrapper.FluxAggregatorRequesterPermissionsSet, error)); ok {
@@ -1250,6 +1442,10 @@ func (_m *FluxAggregator) ParseRequesterPermissionsSet(log types.Log) (*flux_agg
 func (_m *FluxAggregator) ParseRoundDetailsUpdated(log types.Log) (*flux_aggregator_wrapper.FluxAggregatorRoundDetailsUpdated, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseRoundDetailsUpdated")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorRoundDetailsUpdated
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flux_aggregator_wrapper.FluxAggregatorRoundDetailsUpdated, error)); ok {
@@ -1276,6 +1472,10 @@ func (_m *FluxAggregator) ParseRoundDetailsUpdated(log types.Log) (*flux_aggrega
 func (_m *FluxAggregator) ParseSubmissionReceived(log types.Log) (*flux_aggregator_wrapper.FluxAggregatorSubmissionReceived, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubmissionReceived")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorSubmissionReceived
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flux_aggregator_wrapper.FluxAggregatorSubmissionReceived, error)); ok {
@@ -1302,6 +1502,10 @@ func (_m *FluxAggregator) ParseSubmissionReceived(log types.Log) (*flux_aggregat
 func (_m *FluxAggregator) ParseValidatorUpdated(log types.Log) (*flux_aggregator_wrapper.FluxAggregatorValidatorUpdated, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseValidatorUpdated")
+	}
+
 	var r0 *flux_aggregator_wrapper.FluxAggregatorValidatorUpdated
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*flux_aggregator_wrapper.FluxAggregatorValidatorUpdated, error)); ok {
@@ -1328,6 +1532,10 @@ func (_m *FluxAggregator) ParseValidatorUpdated(log types.Log) (*flux_aggregator
 func (_m *FluxAggregator) PaymentAmount(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PaymentAmount")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -1354,6 +1562,10 @@ func (_m *FluxAggregator) PaymentAmount(opts *bind.CallOpts) (*big.Int, error) {
 func (_m *FluxAggregator) RequestNewRound(opts *bind.TransactOpts) (*types.Transaction, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RequestNewRound")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts) (*types.Transaction, error)); ok {
@@ -1380,6 +1592,10 @@ func (_m *FluxAggregator) RequestNewRound(opts *bind.TransactOpts) (*types.Trans
 func (_m *FluxAggregator) RestartDelay(opts *bind.CallOpts) (uint32, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RestartDelay")
+	}
+
 	var r0 uint32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint32, error)); ok {
@@ -1404,6 +1620,10 @@ func (_m *FluxAggregator) RestartDelay(opts *bind.CallOpts) (uint32, error) {
 func (_m *FluxAggregator) SetRequesterPermissions(opts *bind.TransactOpts, _requester common.Address, _authorized bool, _delay uint32) (*types.Transaction, error) {
 	ret := _m.Called(opts, _requester, _authorized, _delay)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetRequesterPermissions")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address, bool, uint32) (*types.Transaction, error)); ok {
@@ -1430,6 +1650,10 @@ func (_m *FluxAggregator) SetRequesterPermissions(opts *bind.TransactOpts, _requ
 func (_m *FluxAggregator) SetValidator(opts *bind.TransactOpts, _newValidator common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, _newValidator)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetValidator")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -1456,6 +1680,10 @@ func (_m *FluxAggregator) SetValidator(opts *bind.TransactOpts, _newValidator co
 func (_m *FluxAggregator) Submit(opts *bind.TransactOpts, _roundId *big.Int, _submission *big.Int) (*types.Transaction, error) {
 	ret := _m.Called(opts, _roundId, _submission)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Submit")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, *big.Int, *big.Int) (*types.Transaction, error)); ok {
@@ -1482,6 +1710,10 @@ func (_m *FluxAggregator) Submit(opts *bind.TransactOpts, _roundId *big.Int, _su
 func (_m *FluxAggregator) Timeout(opts *bind.CallOpts) (uint32, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Timeout")
+	}
+
 	var r0 uint32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint32, error)); ok {
@@ -1506,6 +1738,10 @@ func (_m *FluxAggregator) Timeout(opts *bind.CallOpts) (uint32, error) {
 func (_m *FluxAggregator) TransferAdmin(opts *bind.TransactOpts, _oracle common.Address, _newAdmin common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, _oracle, _newAdmin)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransferAdmin")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address, common.Address) (*types.Transaction, error)); ok {
@@ -1532,6 +1768,10 @@ func (_m *FluxAggregator) TransferAdmin(opts *bind.TransactOpts, _oracle common.
 func (_m *FluxAggregator) TransferOwnership(opts *bind.TransactOpts, _to common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, _to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransferOwnership")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -1558,6 +1798,10 @@ func (_m *FluxAggregator) TransferOwnership(opts *bind.TransactOpts, _to common.
 func (_m *FluxAggregator) UpdateAvailableFunds(opts *bind.TransactOpts) (*types.Transaction, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateAvailableFunds")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts) (*types.Transaction, error)); ok {
@@ -1584,6 +1828,10 @@ func (_m *FluxAggregator) UpdateAvailableFunds(opts *bind.TransactOpts) (*types.
 func (_m *FluxAggregator) UpdateFutureRounds(opts *bind.TransactOpts, _paymentAmount *big.Int, _minSubmissions uint32, _maxSubmissions uint32, _restartDelay uint32, _timeout uint32) (*types.Transaction, error) {
 	ret := _m.Called(opts, _paymentAmount, _minSubmissions, _maxSubmissions, _restartDelay, _timeout)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateFutureRounds")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, *big.Int, uint32, uint32, uint32, uint32) (*types.Transaction, error)); ok {
@@ -1610,6 +1858,10 @@ func (_m *FluxAggregator) UpdateFutureRounds(opts *bind.TransactOpts, _paymentAm
 func (_m *FluxAggregator) Validator(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Validator")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -1636,6 +1888,10 @@ func (_m *FluxAggregator) Validator(opts *bind.CallOpts) (common.Address, error)
 func (_m *FluxAggregator) Version(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Version")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -1662,6 +1918,10 @@ func (_m *FluxAggregator) Version(opts *bind.CallOpts) (*big.Int, error) {
 func (_m *FluxAggregator) WatchAnswerUpdated(opts *bind.WatchOpts, sink chan<- *flux_aggregator_wrapper.FluxAggregatorAnswerUpdated, current []*big.Int, roundId []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, current, roundId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchAnswerUpdated")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flux_aggregator_wrapper.FluxAggregatorAnswerUpdated, []*big.Int, []*big.Int) (event.Subscription, error)); ok {
@@ -1688,6 +1948,10 @@ func (_m *FluxAggregator) WatchAnswerUpdated(opts *bind.WatchOpts, sink chan<- *
 func (_m *FluxAggregator) WatchAvailableFundsUpdated(opts *bind.WatchOpts, sink chan<- *flux_aggregator_wrapper.FluxAggregatorAvailableFundsUpdated, amount []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, amount)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchAvailableFundsUpdated")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flux_aggregator_wrapper.FluxAggregatorAvailableFundsUpdated, []*big.Int) (event.Subscription, error)); ok {
@@ -1714,6 +1978,10 @@ func (_m *FluxAggregator) WatchAvailableFundsUpdated(opts *bind.WatchOpts, sink
 func (_m *FluxAggregator) WatchNewRound(opts *bind.WatchOpts, sink chan<- *flux_aggregator_wrapper.FluxAggregatorNewRound, roundId []*big.Int, startedBy []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, roundId, startedBy)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchNewRound")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flux_aggregator_wrapper.FluxAggregatorNewRound, []*big.Int, []common.Address) (event.Subscription, error)); ok {
@@ -1740,6 +2008,10 @@ func (_m *FluxAggregator) WatchNewRound(opts *bind.WatchOpts, sink chan<- *flux_
 func (_m *FluxAggregator) WatchOracleAdminUpdateRequested(opts *bind.WatchOpts, sink chan<- *flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdateRequested, oracle []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, oracle)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOracleAdminUpdateRequested")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdateRequested, []common.Address) (event.Subscription, error)); ok {
@@ -1766,6 +2038,10 @@ func (_m *FluxAggregator) WatchOracleAdminUpdateRequested(opts *bind.WatchOpts,
 func (_m *FluxAggregator) WatchOracleAdminUpdated(opts *bind.WatchOpts, sink chan<- *flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdated, oracle []common.Address, newAdmin []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, oracle, newAdmin)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOracleAdminUpdated")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flux_aggregator_wrapper.FluxAggregatorOracleAdminUpdated, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -1792,6 +2068,10 @@ func (_m *FluxAggregator) WatchOracleAdminUpdated(opts *bind.WatchOpts, sink cha
 func (_m *FluxAggregator) WatchOraclePermissionsUpdated(opts *bind.WatchOpts, sink chan<- *flux_aggregator_wrapper.FluxAggregatorOraclePermissionsUpdated, oracle []common.Address, whitelisted []bool) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, oracle, whitelisted)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOraclePermissionsUpdated")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flux_aggregator_wrapper.FluxAggregatorOraclePermissionsUpdated, []common.Address, []bool) (event.Subscription, error)); ok {
@@ -1818,6 +2098,10 @@ func (_m *FluxAggregator) WatchOraclePermissionsUpdated(opts *bind.WatchOpts, si
 func (_m *FluxAggregator) WatchOwnershipTransferRequested(opts *bind.WatchOpts, sink chan<- *flux_aggregator_wrapper.FluxAggregatorOwnershipTransferRequested, from []common.Address, to []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOwnershipTransferRequested")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flux_aggregator_wrapper.FluxAggregatorOwnershipTransferRequested, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -1844,6 +2128,10 @@ func (_m *FluxAggregator) WatchOwnershipTransferRequested(opts *bind.WatchOpts,
 func (_m *FluxAggregator) WatchOwnershipTransferred(opts *bind.WatchOpts, sink chan<- *flux_aggregator_wrapper.FluxAggregatorOwnershipTransferred, from []common.Address, to []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOwnershipTransferred")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flux_aggregator_wrapper.FluxAggregatorOwnershipTransferred, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -1870,6 +2158,10 @@ func (_m *FluxAggregator) WatchOwnershipTransferred(opts *bind.WatchOpts, sink c
 func (_m *FluxAggregator) WatchRequesterPermissionsSet(opts *bind.WatchOpts, sink chan<- *flux_aggregator_wrapper.FluxAggregatorRequesterPermissionsSet, requester []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, requester)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchRequesterPermissionsSet")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flux_aggregator_wrapper.FluxAggregatorRequesterPermissionsSet, []common.Address) (event.Subscription, error)); ok {
@@ -1896,6 +2188,10 @@ func (_m *FluxAggregator) WatchRequesterPermissionsSet(opts *bind.WatchOpts, sin
 func (_m *FluxAggregator) WatchRoundDetailsUpdated(opts *bind.WatchOpts, sink chan<- *flux_aggregator_wrapper.FluxAggregatorRoundDetailsUpdated, paymentAmount []*big.Int, minSubmissionCount []uint32, maxSubmissionCount []uint32) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, paymentAmount, minSubmissionCount, maxSubmissionCount)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchRoundDetailsUpdated")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flux_aggregator_wrapper.FluxAggregatorRoundDetailsUpdated, []*big.Int, []uint32, []uint32) (event.Subscription, error)); ok {
@@ -1922,6 +2218,10 @@ func (_m *FluxAggregator) WatchRoundDetailsUpdated(opts *bind.WatchOpts, sink ch
 func (_m *FluxAggregator) WatchSubmissionReceived(opts *bind.WatchOpts, sink chan<- *flux_aggregator_wrapper.FluxAggregatorSubmissionReceived, submission []*big.Int, round []uint32, oracle []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, submission, round, oracle)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubmissionReceived")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flux_aggregator_wrapper.FluxAggregatorSubmissionReceived, []*big.Int, []uint32, []common.Address) (event.Subscription, error)); ok {
@@ -1948,6 +2248,10 @@ func (_m *FluxAggregator) WatchSubmissionReceived(opts *bind.WatchOpts, sink cha
 func (_m *FluxAggregator) WatchValidatorUpdated(opts *bind.WatchOpts, sink chan<- *flux_aggregator_wrapper.FluxAggregatorValidatorUpdated, previous []common.Address, current []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, previous, current)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchValidatorUpdated")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *flux_aggregator_wrapper.FluxAggregatorValidatorUpdated, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -1974,6 +2278,10 @@ func (_m *FluxAggregator) WatchValidatorUpdated(opts *bind.WatchOpts, sink chan<
 func (_m *FluxAggregator) WithdrawFunds(opts *bind.TransactOpts, _recipient common.Address, _amount *big.Int) (*types.Transaction, error) {
 	ret := _m.Called(opts, _recipient, _amount)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WithdrawFunds")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address, *big.Int) (*types.Transaction, error)); ok {
@@ -2000,6 +2308,10 @@ func (_m *FluxAggregator) WithdrawFunds(opts *bind.TransactOpts, _recipient comm
 func (_m *FluxAggregator) WithdrawPayment(opts *bind.TransactOpts, _oracle common.Address, _recipient common.Address, _amount *big.Int) (*types.Transaction, error) {
 	ret := _m.Called(opts, _oracle, _recipient, _amount)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WithdrawPayment")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address, common.Address, *big.Int) (*types.Transaction, error)); ok {
@@ -2026,6 +2338,10 @@ func (_m *FluxAggregator) WithdrawPayment(opts *bind.TransactOpts, _oracle commo
 func (_m *FluxAggregator) WithdrawablePayment(opts *bind.CallOpts, _oracle common.Address) (*big.Int, error) {
 	ret := _m.Called(opts, _oracle)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WithdrawablePayment")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address) (*big.Int, error)); ok {
diff --git a/core/internal/mocks/prometheus_backend.go b/core/internal/mocks/prometheus_backend.go
index b2556a0bad4..6573dbaf03f 100644
--- a/core/internal/mocks/prometheus_backend.go
+++ b/core/internal/mocks/prometheus_backend.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/core/logger/logger_mock_test.go b/core/logger/logger_mock_test.go
index 2b6dfcf3b22..afddd031888 100644
--- a/core/logger/logger_mock_test.go
+++ b/core/logger/logger_mock_test.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package logger
 
@@ -108,6 +108,10 @@ func (_m *MockLogger) Fatalw(msg string, keysAndValues ...interface{}) {
 func (_m *MockLogger) Helper(skip int) Logger {
 	ret := _m.Called(skip)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Helper")
+	}
+
 	var r0 Logger
 	if rf, ok := ret.Get(0).(func(int) Logger); ok {
 		r0 = rf(skip)
@@ -147,6 +151,10 @@ func (_m *MockLogger) Infow(msg string, keysAndValues ...interface{}) {
 func (_m *MockLogger) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -161,6 +169,10 @@ func (_m *MockLogger) Name() string {
 func (_m *MockLogger) Named(name string) Logger {
 	ret := _m.Called(name)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Named")
+	}
+
 	var r0 Logger
 	if rf, ok := ret.Get(0).(func(string) Logger); ok {
 		r0 = rf(name)
@@ -210,6 +222,10 @@ func (_m *MockLogger) SetLogLevel(_a0 zapcore.Level) {
 func (_m *MockLogger) Sync() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Sync")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -272,6 +288,10 @@ func (_m *MockLogger) With(args ...interface{}) Logger {
 	_ca = append(_ca, args...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for With")
+	}
+
 	var r0 Logger
 	if rf, ok := ret.Get(0).(func(...interface{}) Logger); ok {
 		r0 = rf(args...)
diff --git a/core/logger/mocks/logger.go b/core/logger/mocks/logger.go
index 965bd57baaf..316f6216b90 100644
--- a/core/logger/mocks/logger.go
+++ b/core/logger/mocks/logger.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -110,6 +110,10 @@ func (_m *Logger) Fatalw(msg string, keysAndValues ...interface{}) {
 func (_m *Logger) Helper(skip int) logger.Logger {
 	ret := _m.Called(skip)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Helper")
+	}
+
 	var r0 logger.Logger
 	if rf, ok := ret.Get(0).(func(int) logger.Logger); ok {
 		r0 = rf(skip)
@@ -149,6 +153,10 @@ func (_m *Logger) Infow(msg string, keysAndValues ...interface{}) {
 func (_m *Logger) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -163,6 +171,10 @@ func (_m *Logger) Name() string {
 func (_m *Logger) Named(name string) logger.Logger {
 	ret := _m.Called(name)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Named")
+	}
+
 	var r0 logger.Logger
 	if rf, ok := ret.Get(0).(func(string) logger.Logger); ok {
 		r0 = rf(name)
@@ -212,6 +224,10 @@ func (_m *Logger) SetLogLevel(_a0 zapcore.Level) {
 func (_m *Logger) Sync() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Sync")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -274,6 +290,10 @@ func (_m *Logger) With(args ...interface{}) logger.Logger {
 	_ca = append(_ca, args...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for With")
+	}
+
 	var r0 logger.Logger
 	if rf, ok := ret.Get(0).(func(...interface{}) logger.Logger); ok {
 		r0 = rf(args...)
diff --git a/core/services/blockhashstore/mocks/bhs.go b/core/services/blockhashstore/mocks/bhs.go
index 51ddca46a0d..a69016c8026 100644
--- a/core/services/blockhashstore/mocks/bhs.go
+++ b/core/services/blockhashstore/mocks/bhs.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -19,6 +19,10 @@ type BHS struct {
 func (_m *BHS) IsStored(ctx context.Context, blockNum uint64) (bool, error) {
 	ret := _m.Called(ctx, blockNum)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsStored")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, uint64) (bool, error)); ok {
@@ -43,6 +47,10 @@ func (_m *BHS) IsStored(ctx context.Context, blockNum uint64) (bool, error) {
 func (_m *BHS) IsTrusted() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsTrusted")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -57,6 +65,10 @@ func (_m *BHS) IsTrusted() bool {
 func (_m *BHS) Store(ctx context.Context, blockNum uint64) error {
 	ret := _m.Called(ctx, blockNum)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Store")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, uint64) error); ok {
 		r0 = rf(ctx, blockNum)
@@ -71,6 +83,10 @@ func (_m *BHS) Store(ctx context.Context, blockNum uint64) error {
 func (_m *BHS) StoreEarliest(ctx context.Context) error {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for StoreEarliest")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(ctx)
@@ -85,6 +101,10 @@ func (_m *BHS) StoreEarliest(ctx context.Context) error {
 func (_m *BHS) StoreTrusted(ctx context.Context, blockNums []uint64, blockhashes []common.Hash, recentBlock uint64, recentBlockhash common.Hash) error {
 	ret := _m.Called(ctx, blockNums, blockhashes, recentBlock, recentBlockhash)
 
+	if len(ret) == 0 {
+		panic("no return value specified for StoreTrusted")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, []uint64, []common.Hash, uint64, common.Hash) error); ok {
 		r0 = rf(ctx, blockNums, blockhashes, recentBlock, recentBlockhash)
diff --git a/core/services/blockhashstore/mocks/timer.go b/core/services/blockhashstore/mocks/timer.go
index c116163a3df..4236bdf8d92 100644
--- a/core/services/blockhashstore/mocks/timer.go
+++ b/core/services/blockhashstore/mocks/timer.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type Timer struct {
 func (_m *Timer) After(d time.Duration) <-chan time.Time {
 	ret := _m.Called(d)
 
+	if len(ret) == 0 {
+		panic("no return value specified for After")
+	}
+
 	var r0 <-chan time.Time
 	if rf, ok := ret.Get(0).(func(time.Duration) <-chan time.Time); ok {
 		r0 = rf(d)
diff --git a/core/services/chainlink/mocks/general_config.go b/core/services/chainlink/mocks/general_config.go
index 98796e90053..1dd85875395 100644
--- a/core/services/chainlink/mocks/general_config.go
+++ b/core/services/chainlink/mocks/general_config.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -30,6 +30,10 @@ type GeneralConfig struct {
 func (_m *GeneralConfig) AppID() uuid.UUID {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for AppID")
+	}
+
 	var r0 uuid.UUID
 	if rf, ok := ret.Get(0).(func() uuid.UUID); ok {
 		r0 = rf()
@@ -46,6 +50,10 @@ func (_m *GeneralConfig) AppID() uuid.UUID {
 func (_m *GeneralConfig) AuditLogger() config.AuditLogger {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for AuditLogger")
+	}
+
 	var r0 config.AuditLogger
 	if rf, ok := ret.Get(0).(func() config.AuditLogger); ok {
 		r0 = rf()
@@ -62,6 +70,10 @@ func (_m *GeneralConfig) AuditLogger() config.AuditLogger {
 func (_m *GeneralConfig) AutoPprof() config.AutoPprof {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for AutoPprof")
+	}
+
 	var r0 config.AutoPprof
 	if rf, ok := ret.Get(0).(func() config.AutoPprof); ok {
 		r0 = rf()
@@ -78,6 +90,10 @@ func (_m *GeneralConfig) AutoPprof() config.AutoPprof {
 func (_m *GeneralConfig) ConfigTOML() (string, string) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ConfigTOML")
+	}
+
 	var r0 string
 	var r1 string
 	if rf, ok := ret.Get(0).(func() (string, string)); ok {
@@ -102,6 +118,10 @@ func (_m *GeneralConfig) ConfigTOML() (string, string) {
 func (_m *GeneralConfig) CosmosConfigs() cosmosconfig.TOMLConfigs {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for CosmosConfigs")
+	}
+
 	var r0 cosmosconfig.TOMLConfigs
 	if rf, ok := ret.Get(0).(func() cosmosconfig.TOMLConfigs); ok {
 		r0 = rf()
@@ -118,6 +138,10 @@ func (_m *GeneralConfig) CosmosConfigs() cosmosconfig.TOMLConfigs {
 func (_m *GeneralConfig) CosmosEnabled() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for CosmosEnabled")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -132,6 +156,10 @@ func (_m *GeneralConfig) CosmosEnabled() bool {
 func (_m *GeneralConfig) Database() config.Database {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Database")
+	}
+
 	var r0 config.Database
 	if rf, ok := ret.Get(0).(func() config.Database); ok {
 		r0 = rf()
@@ -148,6 +176,10 @@ func (_m *GeneralConfig) Database() config.Database {
 func (_m *GeneralConfig) EVMConfigs() toml.EVMConfigs {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EVMConfigs")
+	}
+
 	var r0 toml.EVMConfigs
 	if rf, ok := ret.Get(0).(func() toml.EVMConfigs); ok {
 		r0 = rf()
@@ -164,6 +196,10 @@ func (_m *GeneralConfig) EVMConfigs() toml.EVMConfigs {
 func (_m *GeneralConfig) EVMEnabled() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EVMEnabled")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -178,6 +214,10 @@ func (_m *GeneralConfig) EVMEnabled() bool {
 func (_m *GeneralConfig) EVMRPCEnabled() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EVMRPCEnabled")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -192,6 +232,10 @@ func (_m *GeneralConfig) EVMRPCEnabled() bool {
 func (_m *GeneralConfig) Feature() config.Feature {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Feature")
+	}
+
 	var r0 config.Feature
 	if rf, ok := ret.Get(0).(func() config.Feature); ok {
 		r0 = rf()
@@ -208,6 +252,10 @@ func (_m *GeneralConfig) Feature() config.Feature {
 func (_m *GeneralConfig) FluxMonitor() config.FluxMonitor {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for FluxMonitor")
+	}
+
 	var r0 config.FluxMonitor
 	if rf, ok := ret.Get(0).(func() config.FluxMonitor); ok {
 		r0 = rf()
@@ -224,6 +272,10 @@ func (_m *GeneralConfig) FluxMonitor() config.FluxMonitor {
 func (_m *GeneralConfig) Insecure() config.Insecure {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Insecure")
+	}
+
 	var r0 config.Insecure
 	if rf, ok := ret.Get(0).(func() config.Insecure); ok {
 		r0 = rf()
@@ -240,6 +292,10 @@ func (_m *GeneralConfig) Insecure() config.Insecure {
 func (_m *GeneralConfig) InsecureFastScrypt() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for InsecureFastScrypt")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -254,6 +310,10 @@ func (_m *GeneralConfig) InsecureFastScrypt() bool {
 func (_m *GeneralConfig) JobPipeline() config.JobPipeline {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for JobPipeline")
+	}
+
 	var r0 config.JobPipeline
 	if rf, ok := ret.Get(0).(func() config.JobPipeline); ok {
 		r0 = rf()
@@ -270,6 +330,10 @@ func (_m *GeneralConfig) JobPipeline() config.JobPipeline {
 func (_m *GeneralConfig) Keeper() config.Keeper {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Keeper")
+	}
+
 	var r0 config.Keeper
 	if rf, ok := ret.Get(0).(func() config.Keeper); ok {
 		r0 = rf()
@@ -286,6 +350,10 @@ func (_m *GeneralConfig) Keeper() config.Keeper {
 func (_m *GeneralConfig) Log() config.Log {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Log")
+	}
+
 	var r0 config.Log
 	if rf, ok := ret.Get(0).(func() config.Log); ok {
 		r0 = rf()
@@ -307,6 +375,10 @@ func (_m *GeneralConfig) LogConfiguration(log config.LogfFn, warn config.LogfFn)
 func (_m *GeneralConfig) Mercury() config.Mercury {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Mercury")
+	}
+
 	var r0 config.Mercury
 	if rf, ok := ret.Get(0).(func() config.Mercury); ok {
 		r0 = rf()
@@ -323,6 +395,10 @@ func (_m *GeneralConfig) Mercury() config.Mercury {
 func (_m *GeneralConfig) OCR() config.OCR {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for OCR")
+	}
+
 	var r0 config.OCR
 	if rf, ok := ret.Get(0).(func() config.OCR); ok {
 		r0 = rf()
@@ -339,6 +415,10 @@ func (_m *GeneralConfig) OCR() config.OCR {
 func (_m *GeneralConfig) OCR2() config.OCR2 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for OCR2")
+	}
+
 	var r0 config.OCR2
 	if rf, ok := ret.Get(0).(func() config.OCR2); ok {
 		r0 = rf()
@@ -355,6 +435,10 @@ func (_m *GeneralConfig) OCR2() config.OCR2 {
 func (_m *GeneralConfig) P2P() config.P2P {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for P2P")
+	}
+
 	var r0 config.P2P
 	if rf, ok := ret.Get(0).(func() config.P2P); ok {
 		r0 = rf()
@@ -371,6 +455,10 @@ func (_m *GeneralConfig) P2P() config.P2P {
 func (_m *GeneralConfig) Password() config.Password {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Password")
+	}
+
 	var r0 config.Password
 	if rf, ok := ret.Get(0).(func() config.Password); ok {
 		r0 = rf()
@@ -387,6 +475,10 @@ func (_m *GeneralConfig) Password() config.Password {
 func (_m *GeneralConfig) Prometheus() config.Prometheus {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Prometheus")
+	}
+
 	var r0 config.Prometheus
 	if rf, ok := ret.Get(0).(func() config.Prometheus); ok {
 		r0 = rf()
@@ -403,6 +495,10 @@ func (_m *GeneralConfig) Prometheus() config.Prometheus {
 func (_m *GeneralConfig) Pyroscope() config.Pyroscope {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Pyroscope")
+	}
+
 	var r0 config.Pyroscope
 	if rf, ok := ret.Get(0).(func() config.Pyroscope); ok {
 		r0 = rf()
@@ -419,6 +515,10 @@ func (_m *GeneralConfig) Pyroscope() config.Pyroscope {
 func (_m *GeneralConfig) RootDir() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for RootDir")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -433,6 +533,10 @@ func (_m *GeneralConfig) RootDir() string {
 func (_m *GeneralConfig) Sentry() config.Sentry {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Sentry")
+	}
+
 	var r0 config.Sentry
 	if rf, ok := ret.Get(0).(func() config.Sentry); ok {
 		r0 = rf()
@@ -449,6 +553,10 @@ func (_m *GeneralConfig) Sentry() config.Sentry {
 func (_m *GeneralConfig) SetLogLevel(lvl zapcore.Level) error {
 	ret := _m.Called(lvl)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetLogLevel")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(zapcore.Level) error); ok {
 		r0 = rf(lvl)
@@ -473,6 +581,10 @@ func (_m *GeneralConfig) SetPasswords(keystore *string, vrf *string) {
 func (_m *GeneralConfig) ShutdownGracePeriod() time.Duration {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ShutdownGracePeriod")
+	}
+
 	var r0 time.Duration
 	if rf, ok := ret.Get(0).(func() time.Duration); ok {
 		r0 = rf()
@@ -487,6 +599,10 @@ func (_m *GeneralConfig) ShutdownGracePeriod() time.Duration {
 func (_m *GeneralConfig) SolanaConfigs() solana.TOMLConfigs {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for SolanaConfigs")
+	}
+
 	var r0 solana.TOMLConfigs
 	if rf, ok := ret.Get(0).(func() solana.TOMLConfigs); ok {
 		r0 = rf()
@@ -503,6 +619,10 @@ func (_m *GeneralConfig) SolanaConfigs() solana.TOMLConfigs {
 func (_m *GeneralConfig) SolanaEnabled() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for SolanaEnabled")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -517,6 +637,10 @@ func (_m *GeneralConfig) SolanaEnabled() bool {
 func (_m *GeneralConfig) StarkNetEnabled() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for StarkNetEnabled")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -531,6 +655,10 @@ func (_m *GeneralConfig) StarkNetEnabled() bool {
 func (_m *GeneralConfig) StarknetConfigs() chainlinkconfig.TOMLConfigs {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for StarknetConfigs")
+	}
+
 	var r0 chainlinkconfig.TOMLConfigs
 	if rf, ok := ret.Get(0).(func() chainlinkconfig.TOMLConfigs); ok {
 		r0 = rf()
@@ -547,6 +675,10 @@ func (_m *GeneralConfig) StarknetConfigs() chainlinkconfig.TOMLConfigs {
 func (_m *GeneralConfig) TelemetryIngress() config.TelemetryIngress {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for TelemetryIngress")
+	}
+
 	var r0 config.TelemetryIngress
 	if rf, ok := ret.Get(0).(func() config.TelemetryIngress); ok {
 		r0 = rf()
@@ -563,6 +695,10 @@ func (_m *GeneralConfig) TelemetryIngress() config.TelemetryIngress {
 func (_m *GeneralConfig) Threshold() config.Threshold {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Threshold")
+	}
+
 	var r0 config.Threshold
 	if rf, ok := ret.Get(0).(func() config.Threshold); ok {
 		r0 = rf()
@@ -579,6 +715,10 @@ func (_m *GeneralConfig) Threshold() config.Threshold {
 func (_m *GeneralConfig) Tracing() config.Tracing {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Tracing")
+	}
+
 	var r0 config.Tracing
 	if rf, ok := ret.Get(0).(func() config.Tracing); ok {
 		r0 = rf()
@@ -595,6 +735,10 @@ func (_m *GeneralConfig) Tracing() config.Tracing {
 func (_m *GeneralConfig) Validate() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Validate")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -609,6 +753,10 @@ func (_m *GeneralConfig) Validate() error {
 func (_m *GeneralConfig) ValidateDB() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ValidateDB")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -623,6 +771,10 @@ func (_m *GeneralConfig) ValidateDB() error {
 func (_m *GeneralConfig) WebServer() config.WebServer {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for WebServer")
+	}
+
 	var r0 config.WebServer
 	if rf, ok := ret.Get(0).(func() config.WebServer); ok {
 		r0 = rf()
diff --git a/core/services/feeds/mocks/connections_manager.go b/core/services/feeds/mocks/connections_manager.go
index e72c98a987a..5bdc5087108 100644
--- a/core/services/feeds/mocks/connections_manager.go
+++ b/core/services/feeds/mocks/connections_manager.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -28,6 +28,10 @@ func (_m *ConnectionsManager) Connect(opts feeds.ConnectOpts) {
 func (_m *ConnectionsManager) Disconnect(id int64) error {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Disconnect")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int64) error); ok {
 		r0 = rf(id)
@@ -42,6 +46,10 @@ func (_m *ConnectionsManager) Disconnect(id int64) error {
 func (_m *ConnectionsManager) GetClient(id int64) (proto.FeedsManagerClient, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetClient")
+	}
+
 	var r0 proto.FeedsManagerClient
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) (proto.FeedsManagerClient, error)); ok {
@@ -68,6 +76,10 @@ func (_m *ConnectionsManager) GetClient(id int64) (proto.FeedsManagerClient, err
 func (_m *ConnectionsManager) IsConnected(id int64) bool {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsConnected")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func(int64) bool); ok {
 		r0 = rf(id)
diff --git a/core/services/feeds/mocks/feeds_manager_client.go b/core/services/feeds/mocks/feeds_manager_client.go
index 9d0037ceabc..f07200cc8fd 100644
--- a/core/services/feeds/mocks/feeds_manager_client.go
+++ b/core/services/feeds/mocks/feeds_manager_client.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type FeedsManagerClient struct {
 func (_m *FeedsManagerClient) ApprovedJob(ctx context.Context, in *proto.ApprovedJobRequest) (*proto.ApprovedJobResponse, error) {
 	ret := _m.Called(ctx, in)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ApprovedJob")
+	}
+
 	var r0 *proto.ApprovedJobResponse
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *proto.ApprovedJobRequest) (*proto.ApprovedJobResponse, error)); ok {
@@ -44,6 +48,10 @@ func (_m *FeedsManagerClient) ApprovedJob(ctx context.Context, in *proto.Approve
 func (_m *FeedsManagerClient) CancelledJob(ctx context.Context, in *proto.CancelledJobRequest) (*proto.CancelledJobResponse, error) {
 	ret := _m.Called(ctx, in)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CancelledJob")
+	}
+
 	var r0 *proto.CancelledJobResponse
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *proto.CancelledJobRequest) (*proto.CancelledJobResponse, error)); ok {
@@ -70,6 +78,10 @@ func (_m *FeedsManagerClient) CancelledJob(ctx context.Context, in *proto.Cancel
 func (_m *FeedsManagerClient) Healthcheck(ctx context.Context, in *proto.HealthcheckRequest) (*proto.HealthcheckResponse, error) {
 	ret := _m.Called(ctx, in)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Healthcheck")
+	}
+
 	var r0 *proto.HealthcheckResponse
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *proto.HealthcheckRequest) (*proto.HealthcheckResponse, error)); ok {
@@ -96,6 +108,10 @@ func (_m *FeedsManagerClient) Healthcheck(ctx context.Context, in *proto.Healthc
 func (_m *FeedsManagerClient) RejectedJob(ctx context.Context, in *proto.RejectedJobRequest) (*proto.RejectedJobResponse, error) {
 	ret := _m.Called(ctx, in)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RejectedJob")
+	}
+
 	var r0 *proto.RejectedJobResponse
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *proto.RejectedJobRequest) (*proto.RejectedJobResponse, error)); ok {
@@ -122,6 +138,10 @@ func (_m *FeedsManagerClient) RejectedJob(ctx context.Context, in *proto.Rejecte
 func (_m *FeedsManagerClient) UpdateNode(ctx context.Context, in *proto.UpdateNodeRequest) (*proto.UpdateNodeResponse, error) {
 	ret := _m.Called(ctx, in)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateNode")
+	}
+
 	var r0 *proto.UpdateNodeResponse
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *proto.UpdateNodeRequest) (*proto.UpdateNodeResponse, error)); ok {
diff --git a/core/services/feeds/mocks/orm.go b/core/services/feeds/mocks/orm.go
index 09326ada518..73bc4c4d4a0 100644
--- a/core/services/feeds/mocks/orm.go
+++ b/core/services/feeds/mocks/orm.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -35,6 +35,10 @@ func (_m *ORM) ApproveSpec(id int64, externalJobID uuid.UUID, qopts ...pg.QOpt)
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ApproveSpec")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int64, uuid.UUID, ...pg.QOpt) error); ok {
 		r0 = rf(id, externalJobID, qopts...)
@@ -93,6 +97,10 @@ func (_m *ORM) CancelSpec(id int64, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CancelSpec")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int64, ...pg.QOpt) error); ok {
 		r0 = rf(id, qopts...)
@@ -143,6 +151,10 @@ func (_c *ORM_CancelSpec_Call) RunAndReturn(run func(int64, ...pg.QOpt) error) *
 func (_m *ORM) CountJobProposals() (int64, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountJobProposals")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (int64, error)); ok {
@@ -194,6 +206,10 @@ func (_c *ORM_CountJobProposals_Call) RunAndReturn(run func() (int64, error)) *O
 func (_m *ORM) CountJobProposalsByStatus() (*feeds.JobProposalCounts, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountJobProposalsByStatus")
+	}
+
 	var r0 *feeds.JobProposalCounts
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (*feeds.JobProposalCounts, error)); ok {
@@ -247,6 +263,10 @@ func (_c *ORM_CountJobProposalsByStatus_Call) RunAndReturn(run func() (*feeds.Jo
 func (_m *ORM) CountManagers() (int64, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountManagers")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (int64, error)); ok {
@@ -305,6 +325,10 @@ func (_m *ORM) CreateBatchChainConfig(cfgs []feeds.ChainConfig, qopts ...pg.QOpt
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateBatchChainConfig")
+	}
+
 	var r0 []int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]feeds.ChainConfig, ...pg.QOpt) ([]int64, error)); ok {
@@ -374,6 +398,10 @@ func (_m *ORM) CreateChainConfig(cfg feeds.ChainConfig, qopts ...pg.QOpt) (int64
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateChainConfig")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(feeds.ChainConfig, ...pg.QOpt) (int64, error)); ok {
@@ -434,6 +462,10 @@ func (_c *ORM_CreateChainConfig_Call) RunAndReturn(run func(feeds.ChainConfig, .
 func (_m *ORM) CreateJobProposal(jp *feeds.JobProposal) (int64, error) {
 	ret := _m.Called(jp)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateJobProposal")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*feeds.JobProposal) (int64, error)); ok {
@@ -493,6 +525,10 @@ func (_m *ORM) CreateManager(ms *feeds.FeedsManager, qopts ...pg.QOpt) (int64, e
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateManager")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*feeds.FeedsManager, ...pg.QOpt) (int64, error)); ok {
@@ -560,6 +596,10 @@ func (_m *ORM) CreateSpec(spec feeds.JobProposalSpec, qopts ...pg.QOpt) (int64,
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateSpec")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(feeds.JobProposalSpec, ...pg.QOpt) (int64, error)); ok {
@@ -620,6 +660,10 @@ func (_c *ORM_CreateSpec_Call) RunAndReturn(run func(feeds.JobProposalSpec, ...p
 func (_m *ORM) DeleteChainConfig(id int64) (int64, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteChainConfig")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) (int64, error)); ok {
@@ -679,6 +723,10 @@ func (_m *ORM) DeleteProposal(id int64, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteProposal")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int64, ...pg.QOpt) error); ok {
 		r0 = rf(id, qopts...)
@@ -736,6 +784,10 @@ func (_m *ORM) ExistsSpecByJobProposalIDAndVersion(jpID int64, version int32, qo
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ExistsSpecByJobProposalIDAndVersion")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, int32, ...pg.QOpt) (bool, error)); ok {
@@ -804,6 +856,10 @@ func (_m *ORM) GetApprovedSpec(jpID int64, qopts ...pg.QOpt) (*feeds.JobProposal
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetApprovedSpec")
+	}
+
 	var r0 *feeds.JobProposalSpec
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, ...pg.QOpt) (*feeds.JobProposalSpec, error)); ok {
@@ -866,6 +922,10 @@ func (_c *ORM_GetApprovedSpec_Call) RunAndReturn(run func(int64, ...pg.QOpt) (*f
 func (_m *ORM) GetChainConfig(id int64) (*feeds.ChainConfig, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetChainConfig")
+	}
+
 	var r0 *feeds.ChainConfig
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) (*feeds.ChainConfig, error)); ok {
@@ -927,6 +987,10 @@ func (_m *ORM) GetJobProposal(id int64, qopts ...pg.QOpt) (*feeds.JobProposal, e
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetJobProposal")
+	}
+
 	var r0 *feeds.JobProposal
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, ...pg.QOpt) (*feeds.JobProposal, error)); ok {
@@ -989,6 +1053,10 @@ func (_c *ORM_GetJobProposal_Call) RunAndReturn(run func(int64, ...pg.QOpt) (*fe
 func (_m *ORM) GetJobProposalByRemoteUUID(_a0 uuid.UUID) (*feeds.JobProposal, error) {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetJobProposalByRemoteUUID")
+	}
+
 	var r0 *feeds.JobProposal
 	var r1 error
 	if rf, ok := ret.Get(0).(func(uuid.UUID) (*feeds.JobProposal, error)); ok {
@@ -1043,6 +1111,10 @@ func (_c *ORM_GetJobProposalByRemoteUUID_Call) RunAndReturn(run func(uuid.UUID)
 func (_m *ORM) GetLatestSpec(jpID int64) (*feeds.JobProposalSpec, error) {
 	ret := _m.Called(jpID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetLatestSpec")
+	}
+
 	var r0 *feeds.JobProposalSpec
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) (*feeds.JobProposalSpec, error)); ok {
@@ -1097,6 +1169,10 @@ func (_c *ORM_GetLatestSpec_Call) RunAndReturn(run func(int64) (*feeds.JobPropos
 func (_m *ORM) GetManager(id int64) (*feeds.FeedsManager, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetManager")
+	}
+
 	var r0 *feeds.FeedsManager
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) (*feeds.FeedsManager, error)); ok {
@@ -1158,6 +1234,10 @@ func (_m *ORM) GetSpec(id int64, qopts ...pg.QOpt) (*feeds.JobProposalSpec, erro
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetSpec")
+	}
+
 	var r0 *feeds.JobProposalSpec
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, ...pg.QOpt) (*feeds.JobProposalSpec, error)); ok {
@@ -1227,6 +1307,10 @@ func (_m *ORM) IsJobManaged(jobID int64, qopts ...pg.QOpt) (bool, error) {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsJobManaged")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, ...pg.QOpt) (bool, error)); ok {
@@ -1287,6 +1371,10 @@ func (_c *ORM_IsJobManaged_Call) RunAndReturn(run func(int64, ...pg.QOpt) (bool,
 func (_m *ORM) ListChainConfigsByManagerIDs(mgrIDs []int64) ([]feeds.ChainConfig, error) {
 	ret := _m.Called(mgrIDs)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListChainConfigsByManagerIDs")
+	}
+
 	var r0 []feeds.ChainConfig
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]int64) ([]feeds.ChainConfig, error)); ok {
@@ -1341,6 +1429,10 @@ func (_c *ORM_ListChainConfigsByManagerIDs_Call) RunAndReturn(run func([]int64)
 func (_m *ORM) ListJobProposals() ([]feeds.JobProposal, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListJobProposals")
+	}
+
 	var r0 []feeds.JobProposal
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]feeds.JobProposal, error)); ok {
@@ -1401,6 +1493,10 @@ func (_m *ORM) ListJobProposalsByManagersIDs(ids []int64, qopts ...pg.QOpt) ([]f
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListJobProposalsByManagersIDs")
+	}
+
 	var r0 []feeds.JobProposal
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]int64, ...pg.QOpt) ([]feeds.JobProposal, error)); ok {
@@ -1463,6 +1559,10 @@ func (_c *ORM_ListJobProposalsByManagersIDs_Call) RunAndReturn(run func([]int64,
 func (_m *ORM) ListManagers() ([]feeds.FeedsManager, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListManagers")
+	}
+
 	var r0 []feeds.FeedsManager
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]feeds.FeedsManager, error)); ok {
@@ -1516,6 +1616,10 @@ func (_c *ORM_ListManagers_Call) RunAndReturn(run func() ([]feeds.FeedsManager,
 func (_m *ORM) ListManagersByIDs(ids []int64) ([]feeds.FeedsManager, error) {
 	ret := _m.Called(ids)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListManagersByIDs")
+	}
+
 	var r0 []feeds.FeedsManager
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]int64) ([]feeds.FeedsManager, error)); ok {
@@ -1577,6 +1681,10 @@ func (_m *ORM) ListSpecsByJobProposalIDs(ids []int64, qopts ...pg.QOpt) ([]feeds
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListSpecsByJobProposalIDs")
+	}
+
 	var r0 []feeds.JobProposalSpec
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]int64, ...pg.QOpt) ([]feeds.JobProposalSpec, error)); ok {
@@ -1646,6 +1754,10 @@ func (_m *ORM) RejectSpec(id int64, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RejectSpec")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int64, ...pg.QOpt) error); ok {
 		r0 = rf(id, qopts...)
@@ -1703,6 +1815,10 @@ func (_m *ORM) RevokeSpec(id int64, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RevokeSpec")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int64, ...pg.QOpt) error); ok {
 		r0 = rf(id, qopts...)
@@ -1753,6 +1869,10 @@ func (_c *ORM_RevokeSpec_Call) RunAndReturn(run func(int64, ...pg.QOpt) error) *
 func (_m *ORM) UpdateChainConfig(cfg feeds.ChainConfig) (int64, error) {
 	ret := _m.Called(cfg)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateChainConfig")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(feeds.ChainConfig) (int64, error)); ok {
@@ -1812,6 +1932,10 @@ func (_m *ORM) UpdateJobProposalStatus(id int64, status feeds.JobProposalStatus,
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateJobProposalStatus")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int64, feeds.JobProposalStatus, ...pg.QOpt) error); ok {
 		r0 = rf(id, status, qopts...)
@@ -1870,6 +1994,10 @@ func (_m *ORM) UpdateManager(mgr feeds.FeedsManager, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateManager")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(feeds.FeedsManager, ...pg.QOpt) error); ok {
 		r0 = rf(mgr, qopts...)
@@ -1927,6 +2055,10 @@ func (_m *ORM) UpdateSpecDefinition(id int64, spec string, qopts ...pg.QOpt) err
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateSpecDefinition")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int64, string, ...pg.QOpt) error); ok {
 		r0 = rf(id, spec, qopts...)
@@ -1985,6 +2117,10 @@ func (_m *ORM) UpsertJobProposal(jp *feeds.JobProposal, qopts ...pg.QOpt) (int64
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpsertJobProposal")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*feeds.JobProposal, ...pg.QOpt) (int64, error)); ok {
diff --git a/core/services/feeds/mocks/service.go b/core/services/feeds/mocks/service.go
index 1681918bb74..d8bc88c8159 100644
--- a/core/services/feeds/mocks/service.go
+++ b/core/services/feeds/mocks/service.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type Service struct {
 func (_m *Service) ApproveSpec(ctx context.Context, id int64, force bool) error {
 	ret := _m.Called(ctx, id, force)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ApproveSpec")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, bool) error); ok {
 		r0 = rf(ctx, id, force)
@@ -32,6 +36,10 @@ func (_m *Service) ApproveSpec(ctx context.Context, id int64, force bool) error
 func (_m *Service) CancelSpec(ctx context.Context, id int64) error {
 	ret := _m.Called(ctx, id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CancelSpec")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64) error); ok {
 		r0 = rf(ctx, id)
@@ -46,6 +54,10 @@ func (_m *Service) CancelSpec(ctx context.Context, id int64) error {
 func (_m *Service) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -60,6 +72,10 @@ func (_m *Service) Close() error {
 func (_m *Service) CountJobProposalsByStatus() (*feeds.JobProposalCounts, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountJobProposalsByStatus")
+	}
+
 	var r0 *feeds.JobProposalCounts
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (*feeds.JobProposalCounts, error)); ok {
@@ -86,6 +102,10 @@ func (_m *Service) CountJobProposalsByStatus() (*feeds.JobProposalCounts, error)
 func (_m *Service) CountManagers() (int64, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountManagers")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (int64, error)); ok {
@@ -110,6 +130,10 @@ func (_m *Service) CountManagers() (int64, error) {
 func (_m *Service) CreateChainConfig(ctx context.Context, cfg feeds.ChainConfig) (int64, error) {
 	ret := _m.Called(ctx, cfg)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateChainConfig")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, feeds.ChainConfig) (int64, error)); ok {
@@ -134,6 +158,10 @@ func (_m *Service) CreateChainConfig(ctx context.Context, cfg feeds.ChainConfig)
 func (_m *Service) DeleteChainConfig(ctx context.Context, id int64) (int64, error) {
 	ret := _m.Called(ctx, id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteChainConfig")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64) (int64, error)); ok {
@@ -158,6 +186,10 @@ func (_m *Service) DeleteChainConfig(ctx context.Context, id int64) (int64, erro
 func (_m *Service) DeleteJob(ctx context.Context, args *feeds.DeleteJobArgs) (int64, error) {
 	ret := _m.Called(ctx, args)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteJob")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *feeds.DeleteJobArgs) (int64, error)); ok {
@@ -182,6 +214,10 @@ func (_m *Service) DeleteJob(ctx context.Context, args *feeds.DeleteJobArgs) (in
 func (_m *Service) GetChainConfig(id int64) (*feeds.ChainConfig, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetChainConfig")
+	}
+
 	var r0 *feeds.ChainConfig
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) (*feeds.ChainConfig, error)); ok {
@@ -208,6 +244,10 @@ func (_m *Service) GetChainConfig(id int64) (*feeds.ChainConfig, error) {
 func (_m *Service) GetJobProposal(id int64) (*feeds.JobProposal, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetJobProposal")
+	}
+
 	var r0 *feeds.JobProposal
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) (*feeds.JobProposal, error)); ok {
@@ -234,6 +274,10 @@ func (_m *Service) GetJobProposal(id int64) (*feeds.JobProposal, error) {
 func (_m *Service) GetManager(id int64) (*feeds.FeedsManager, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetManager")
+	}
+
 	var r0 *feeds.FeedsManager
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) (*feeds.FeedsManager, error)); ok {
@@ -260,6 +304,10 @@ func (_m *Service) GetManager(id int64) (*feeds.FeedsManager, error) {
 func (_m *Service) GetSpec(id int64) (*feeds.JobProposalSpec, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetSpec")
+	}
+
 	var r0 *feeds.JobProposalSpec
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) (*feeds.JobProposalSpec, error)); ok {
@@ -286,6 +334,10 @@ func (_m *Service) GetSpec(id int64) (*feeds.JobProposalSpec, error) {
 func (_m *Service) IsJobManaged(ctx context.Context, jobID int64) (bool, error) {
 	ret := _m.Called(ctx, jobID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsJobManaged")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64) (bool, error)); ok {
@@ -310,6 +362,10 @@ func (_m *Service) IsJobManaged(ctx context.Context, jobID int64) (bool, error)
 func (_m *Service) ListChainConfigsByManagerIDs(mgrIDs []int64) ([]feeds.ChainConfig, error) {
 	ret := _m.Called(mgrIDs)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListChainConfigsByManagerIDs")
+	}
+
 	var r0 []feeds.ChainConfig
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]int64) ([]feeds.ChainConfig, error)); ok {
@@ -336,6 +392,10 @@ func (_m *Service) ListChainConfigsByManagerIDs(mgrIDs []int64) ([]feeds.ChainCo
 func (_m *Service) ListJobProposals() ([]feeds.JobProposal, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListJobProposals")
+	}
+
 	var r0 []feeds.JobProposal
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]feeds.JobProposal, error)); ok {
@@ -362,6 +422,10 @@ func (_m *Service) ListJobProposals() ([]feeds.JobProposal, error) {
 func (_m *Service) ListJobProposalsByManagersIDs(ids []int64) ([]feeds.JobProposal, error) {
 	ret := _m.Called(ids)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListJobProposalsByManagersIDs")
+	}
+
 	var r0 []feeds.JobProposal
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]int64) ([]feeds.JobProposal, error)); ok {
@@ -388,6 +452,10 @@ func (_m *Service) ListJobProposalsByManagersIDs(ids []int64) ([]feeds.JobPropos
 func (_m *Service) ListManagers() ([]feeds.FeedsManager, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListManagers")
+	}
+
 	var r0 []feeds.FeedsManager
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]feeds.FeedsManager, error)); ok {
@@ -414,6 +482,10 @@ func (_m *Service) ListManagers() ([]feeds.FeedsManager, error) {
 func (_m *Service) ListManagersByIDs(ids []int64) ([]feeds.FeedsManager, error) {
 	ret := _m.Called(ids)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListManagersByIDs")
+	}
+
 	var r0 []feeds.FeedsManager
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]int64) ([]feeds.FeedsManager, error)); ok {
@@ -440,6 +512,10 @@ func (_m *Service) ListManagersByIDs(ids []int64) ([]feeds.FeedsManager, error)
 func (_m *Service) ListSpecsByJobProposalIDs(ids []int64) ([]feeds.JobProposalSpec, error) {
 	ret := _m.Called(ids)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListSpecsByJobProposalIDs")
+	}
+
 	var r0 []feeds.JobProposalSpec
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]int64) ([]feeds.JobProposalSpec, error)); ok {
@@ -466,6 +542,10 @@ func (_m *Service) ListSpecsByJobProposalIDs(ids []int64) ([]feeds.JobProposalSp
 func (_m *Service) ProposeJob(ctx context.Context, args *feeds.ProposeJobArgs) (int64, error) {
 	ret := _m.Called(ctx, args)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ProposeJob")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *feeds.ProposeJobArgs) (int64, error)); ok {
@@ -490,6 +570,10 @@ func (_m *Service) ProposeJob(ctx context.Context, args *feeds.ProposeJobArgs) (
 func (_m *Service) RegisterManager(ctx context.Context, params feeds.RegisterManagerParams) (int64, error) {
 	ret := _m.Called(ctx, params)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RegisterManager")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, feeds.RegisterManagerParams) (int64, error)); ok {
@@ -514,6 +598,10 @@ func (_m *Service) RegisterManager(ctx context.Context, params feeds.RegisterMan
 func (_m *Service) RejectSpec(ctx context.Context, id int64) error {
 	ret := _m.Called(ctx, id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RejectSpec")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64) error); ok {
 		r0 = rf(ctx, id)
@@ -528,6 +616,10 @@ func (_m *Service) RejectSpec(ctx context.Context, id int64) error {
 func (_m *Service) RevokeJob(ctx context.Context, args *feeds.RevokeJobArgs) (int64, error) {
 	ret := _m.Called(ctx, args)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RevokeJob")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *feeds.RevokeJobArgs) (int64, error)); ok {
@@ -552,6 +644,10 @@ func (_m *Service) RevokeJob(ctx context.Context, args *feeds.RevokeJobArgs) (in
 func (_m *Service) Start(ctx context.Context) error {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(ctx)
@@ -566,6 +662,10 @@ func (_m *Service) Start(ctx context.Context) error {
 func (_m *Service) SyncNodeInfo(ctx context.Context, id int64) error {
 	ret := _m.Called(ctx, id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SyncNodeInfo")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64) error); ok {
 		r0 = rf(ctx, id)
@@ -585,6 +685,10 @@ func (_m *Service) Unsafe_SetConnectionsManager(_a0 feeds.ConnectionsManager) {
 func (_m *Service) UpdateChainConfig(ctx context.Context, cfg feeds.ChainConfig) (int64, error) {
 	ret := _m.Called(ctx, cfg)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateChainConfig")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, feeds.ChainConfig) (int64, error)); ok {
@@ -609,6 +713,10 @@ func (_m *Service) UpdateChainConfig(ctx context.Context, cfg feeds.ChainConfig)
 func (_m *Service) UpdateManager(ctx context.Context, mgr feeds.FeedsManager) error {
 	ret := _m.Called(ctx, mgr)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateManager")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, feeds.FeedsManager) error); ok {
 		r0 = rf(ctx, mgr)
@@ -623,6 +731,10 @@ func (_m *Service) UpdateManager(ctx context.Context, mgr feeds.FeedsManager) er
 func (_m *Service) UpdateSpecDefinition(ctx context.Context, id int64, spec string) error {
 	ret := _m.Called(ctx, id, spec)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateSpecDefinition")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64, string) error); ok {
 		r0 = rf(ctx, id, spec)
diff --git a/core/services/fluxmonitorv2/mocks/contract_submitter.go b/core/services/fluxmonitorv2/mocks/contract_submitter.go
index 03540a6cb1c..3154b4c86ee 100644
--- a/core/services/fluxmonitorv2/mocks/contract_submitter.go
+++ b/core/services/fluxmonitorv2/mocks/contract_submitter.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type ContractSubmitter struct {
 func (_m *ContractSubmitter) Submit(ctx context.Context, roundID *big.Int, submission *big.Int, idempotencyKey *string) error {
 	ret := _m.Called(ctx, roundID, submission, idempotencyKey)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Submit")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *big.Int, *big.Int, *string) error); ok {
 		r0 = rf(ctx, roundID, submission, idempotencyKey)
diff --git a/core/services/fluxmonitorv2/mocks/flags.go b/core/services/fluxmonitorv2/mocks/flags.go
index 08ad0f5b3f7..6ff1616111b 100644
--- a/core/services/fluxmonitorv2/mocks/flags.go
+++ b/core/services/fluxmonitorv2/mocks/flags.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -21,6 +21,10 @@ type Flags struct {
 func (_m *Flags) Address() common.Address {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Address")
+	}
+
 	var r0 common.Address
 	if rf, ok := ret.Get(0).(func() common.Address); ok {
 		r0 = rf()
@@ -37,6 +41,10 @@ func (_m *Flags) Address() common.Address {
 func (_m *Flags) ContractExists() bool {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ContractExists")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func() bool); ok {
 		r0 = rf()
@@ -51,6 +59,10 @@ func (_m *Flags) ContractExists() bool {
 func (_m *Flags) IsLowered(contractAddr common.Address) (bool, error) {
 	ret := _m.Called(contractAddr)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsLowered")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Address) (bool, error)); ok {
@@ -75,6 +87,10 @@ func (_m *Flags) IsLowered(contractAddr common.Address) (bool, error) {
 func (_m *Flags) ParseLog(log types.Log) (generated.AbigenLog, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseLog")
+	}
+
 	var r0 generated.AbigenLog
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (generated.AbigenLog, error)); ok {
diff --git a/core/services/fluxmonitorv2/mocks/key_store_interface.go b/core/services/fluxmonitorv2/mocks/key_store_interface.go
index c409a987e02..98f5ab71020 100644
--- a/core/services/fluxmonitorv2/mocks/key_store_interface.go
+++ b/core/services/fluxmonitorv2/mocks/key_store_interface.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -20,6 +20,10 @@ type KeyStoreInterface struct {
 func (_m *KeyStoreInterface) EnabledKeysForChain(chainID *big.Int) ([]ethkey.KeyV2, error) {
 	ret := _m.Called(chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnabledKeysForChain")
+	}
+
 	var r0 []ethkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*big.Int) ([]ethkey.KeyV2, error)); ok {
@@ -53,6 +57,10 @@ func (_m *KeyStoreInterface) GetRoundRobinAddress(chainID *big.Int, addrs ...com
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetRoundRobinAddress")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*big.Int, ...common.Address) (common.Address, error)); ok {
diff --git a/core/services/fluxmonitorv2/mocks/orm.go b/core/services/fluxmonitorv2/mocks/orm.go
index 5080f19edf0..8d277d61d2e 100644
--- a/core/services/fluxmonitorv2/mocks/orm.go
+++ b/core/services/fluxmonitorv2/mocks/orm.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -23,6 +23,10 @@ type ORM struct {
 func (_m *ORM) CountFluxMonitorRoundStats() (int, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountFluxMonitorRoundStats")
+	}
+
 	var r0 int
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (int, error)); ok {
@@ -47,6 +51,10 @@ func (_m *ORM) CountFluxMonitorRoundStats() (int, error) {
 func (_m *ORM) CreateEthTransaction(ctx context.Context, fromAddress common.Address, toAddress common.Address, payload []byte, gasLimit uint32, idempotencyKey *string) error {
 	ret := _m.Called(ctx, fromAddress, toAddress, payload, gasLimit, idempotencyKey)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateEthTransaction")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address, common.Address, []byte, uint32, *string) error); ok {
 		r0 = rf(ctx, fromAddress, toAddress, payload, gasLimit, idempotencyKey)
@@ -61,6 +69,10 @@ func (_m *ORM) CreateEthTransaction(ctx context.Context, fromAddress common.Addr
 func (_m *ORM) DeleteFluxMonitorRoundsBackThrough(aggregator common.Address, roundID uint32) error {
 	ret := _m.Called(aggregator, roundID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteFluxMonitorRoundsBackThrough")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(common.Address, uint32) error); ok {
 		r0 = rf(aggregator, roundID)
@@ -75,6 +87,10 @@ func (_m *ORM) DeleteFluxMonitorRoundsBackThrough(aggregator common.Address, rou
 func (_m *ORM) FindOrCreateFluxMonitorRoundStats(aggregator common.Address, roundID uint32, newRoundLogs uint) (fluxmonitorv2.FluxMonitorRoundStatsV2, error) {
 	ret := _m.Called(aggregator, roundID, newRoundLogs)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindOrCreateFluxMonitorRoundStats")
+	}
+
 	var r0 fluxmonitorv2.FluxMonitorRoundStatsV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Address, uint32, uint) (fluxmonitorv2.FluxMonitorRoundStatsV2, error)); ok {
@@ -99,6 +115,10 @@ func (_m *ORM) FindOrCreateFluxMonitorRoundStats(aggregator common.Address, roun
 func (_m *ORM) MostRecentFluxMonitorRoundID(aggregator common.Address) (uint32, error) {
 	ret := _m.Called(aggregator)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MostRecentFluxMonitorRoundID")
+	}
+
 	var r0 uint32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Address) (uint32, error)); ok {
@@ -130,6 +150,10 @@ func (_m *ORM) UpdateFluxMonitorRoundStats(aggregator common.Address, roundID ui
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateFluxMonitorRoundStats")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(common.Address, uint32, int64, uint, ...pg.QOpt) error); ok {
 		r0 = rf(aggregator, roundID, runID, newRoundLogsAddition, qopts...)
diff --git a/core/services/functions/mocks/bridge_accessor.go b/core/services/functions/mocks/bridge_accessor.go
index 65e81ab8b83..fa765287c44 100644
--- a/core/services/functions/mocks/bridge_accessor.go
+++ b/core/services/functions/mocks/bridge_accessor.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -16,6 +16,10 @@ type BridgeAccessor struct {
 func (_m *BridgeAccessor) NewExternalAdapterClient() (functions.ExternalAdapterClient, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for NewExternalAdapterClient")
+	}
+
 	var r0 functions.ExternalAdapterClient
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (functions.ExternalAdapterClient, error)); ok {
diff --git a/core/services/functions/mocks/external_adapter_client.go b/core/services/functions/mocks/external_adapter_client.go
index b06f13fdea7..dbf4081c95d 100644
--- a/core/services/functions/mocks/external_adapter_client.go
+++ b/core/services/functions/mocks/external_adapter_client.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type ExternalAdapterClient struct {
 func (_m *ExternalAdapterClient) FetchEncryptedSecrets(ctx context.Context, encryptedSecretsUrls []byte, requestId string, jobName string) ([]byte, []byte, error) {
 	ret := _m.Called(ctx, encryptedSecretsUrls, requestId, jobName)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FetchEncryptedSecrets")
+	}
+
 	var r0 []byte
 	var r1 []byte
 	var r2 error
@@ -53,6 +57,10 @@ func (_m *ExternalAdapterClient) FetchEncryptedSecrets(ctx context.Context, encr
 func (_m *ExternalAdapterClient) RunComputation(ctx context.Context, requestId string, jobName string, subscriptionOwner string, subscriptionId uint64, flags functions.RequestFlags, nodeProvidedSecrets string, requestData *functions.RequestData) ([]byte, []byte, []string, error) {
 	ret := _m.Called(ctx, requestId, jobName, subscriptionOwner, subscriptionId, flags, nodeProvidedSecrets, requestData)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RunComputation")
+	}
+
 	var r0 []byte
 	var r1 []byte
 	var r2 []string
diff --git a/core/services/functions/mocks/functions_listener.go b/core/services/functions/mocks/functions_listener.go
index d2aeb2ddab8..d63248f00cf 100644
--- a/core/services/functions/mocks/functions_listener.go
+++ b/core/services/functions/mocks/functions_listener.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type FunctionsListener struct {
 func (_m *FunctionsListener) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -32,6 +36,10 @@ func (_m *FunctionsListener) Close() error {
 func (_m *FunctionsListener) HandleOffchainRequest(ctx context.Context, request *functions.OffchainRequest) error {
 	ret := _m.Called(ctx, request)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HandleOffchainRequest")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *functions.OffchainRequest) error); ok {
 		r0 = rf(ctx, request)
@@ -46,6 +54,10 @@ func (_m *FunctionsListener) HandleOffchainRequest(ctx context.Context, request
 func (_m *FunctionsListener) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/services/functions/mocks/offchain_transmitter.go b/core/services/functions/mocks/offchain_transmitter.go
index d9a7be04dd4..5eee967e685 100644
--- a/core/services/functions/mocks/offchain_transmitter.go
+++ b/core/services/functions/mocks/offchain_transmitter.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type OffchainTransmitter struct {
 func (_m *OffchainTransmitter) ReportChannel() chan *functions.OffchainResponse {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ReportChannel")
+	}
+
 	var r0 chan *functions.OffchainResponse
 	if rf, ok := ret.Get(0).(func() chan *functions.OffchainResponse); ok {
 		r0 = rf()
@@ -34,6 +38,10 @@ func (_m *OffchainTransmitter) ReportChannel() chan *functions.OffchainResponse
 func (_m *OffchainTransmitter) TransmitReport(ctx context.Context, report *functions.OffchainResponse) error {
 	ret := _m.Called(ctx, report)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransmitReport")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *functions.OffchainResponse) error); ok {
 		r0 = rf(ctx, report)
diff --git a/core/services/functions/mocks/orm.go b/core/services/functions/mocks/orm.go
index 8d11b0b9817..90055fe6286 100644
--- a/core/services/functions/mocks/orm.go
+++ b/core/services/functions/mocks/orm.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -27,6 +27,10 @@ func (_m *ORM) CreateRequest(request *functions.Request, qopts ...pg.QOpt) error
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateRequest")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*functions.Request, ...pg.QOpt) error); ok {
 		r0 = rf(request, qopts...)
@@ -48,6 +52,10 @@ func (_m *ORM) FindById(requestID functions.RequestID, qopts ...pg.QOpt) (*funct
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindById")
+	}
+
 	var r0 *functions.Request
 	var r1 error
 	if rf, ok := ret.Get(0).(func(functions.RequestID, ...pg.QOpt) (*functions.Request, error)); ok {
@@ -81,6 +89,10 @@ func (_m *ORM) FindOldestEntriesByState(state functions.RequestState, limit uint
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindOldestEntriesByState")
+	}
+
 	var r0 []functions.Request
 	var r1 error
 	if rf, ok := ret.Get(0).(func(functions.RequestState, uint32, ...pg.QOpt) ([]functions.Request, error)); ok {
@@ -114,6 +126,10 @@ func (_m *ORM) PruneOldestRequests(maxRequestsInDB uint32, batchSize uint32, qop
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PruneOldestRequests")
+	}
+
 	var r0 uint32
 	var r1 uint32
 	var r2 error
@@ -152,6 +168,10 @@ func (_m *ORM) SetConfirmed(requestID functions.RequestID, qopts ...pg.QOpt) err
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetConfirmed")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(functions.RequestID, ...pg.QOpt) error); ok {
 		r0 = rf(requestID, qopts...)
@@ -173,6 +193,10 @@ func (_m *ORM) SetError(requestID functions.RequestID, errorType functions.ErrTy
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetError")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(functions.RequestID, functions.ErrType, []byte, time.Time, bool, ...pg.QOpt) error); ok {
 		r0 = rf(requestID, errorType, computationError, readyAt, readyForProcessing, qopts...)
@@ -194,6 +218,10 @@ func (_m *ORM) SetFinalized(requestID functions.RequestID, reportedResult []byte
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetFinalized")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(functions.RequestID, []byte, []byte, ...pg.QOpt) error); ok {
 		r0 = rf(requestID, reportedResult, reportedError, qopts...)
@@ -215,6 +243,10 @@ func (_m *ORM) SetResult(requestID functions.RequestID, computationResult []byte
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetResult")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(functions.RequestID, []byte, time.Time, ...pg.QOpt) error); ok {
 		r0 = rf(requestID, computationResult, readyAt, qopts...)
@@ -236,6 +268,10 @@ func (_m *ORM) TimeoutExpiredResults(cutoff time.Time, limit uint32, qopts ...pg
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TimeoutExpiredResults")
+	}
+
 	var r0 []functions.RequestID
 	var r1 error
 	if rf, ok := ret.Get(0).(func(time.Time, uint32, ...pg.QOpt) ([]functions.RequestID, error)); ok {
diff --git a/core/services/gateway/connector/mocks/gateway_connector.go b/core/services/gateway/connector/mocks/gateway_connector.go
index a9fa69e1e3b..ba972425f66 100644
--- a/core/services/gateway/connector/mocks/gateway_connector.go
+++ b/core/services/gateway/connector/mocks/gateway_connector.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -21,6 +21,10 @@ type GatewayConnector struct {
 func (_m *GatewayConnector) ChallengeResponse(_a0 *url.URL, challenge []byte) ([]byte, error) {
 	ret := _m.Called(_a0, challenge)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChallengeResponse")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*url.URL, []byte) ([]byte, error)); ok {
@@ -47,6 +51,10 @@ func (_m *GatewayConnector) ChallengeResponse(_a0 *url.URL, challenge []byte) ([
 func (_m *GatewayConnector) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -61,6 +69,10 @@ func (_m *GatewayConnector) Close() error {
 func (_m *GatewayConnector) NewAuthHeader(_a0 *url.URL) ([]byte, error) {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for NewAuthHeader")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*url.URL) ([]byte, error)); ok {
@@ -87,6 +99,10 @@ func (_m *GatewayConnector) NewAuthHeader(_a0 *url.URL) ([]byte, error) {
 func (_m *GatewayConnector) SendToGateway(ctx context.Context, gatewayId string, msg *api.Message) error {
 	ret := _m.Called(ctx, gatewayId, msg)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendToGateway")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, *api.Message) error); ok {
 		r0 = rf(ctx, gatewayId, msg)
@@ -101,6 +117,10 @@ func (_m *GatewayConnector) SendToGateway(ctx context.Context, gatewayId string,
 func (_m *GatewayConnector) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/services/gateway/connector/mocks/gateway_connector_handler.go b/core/services/gateway/connector/mocks/gateway_connector_handler.go
index 8eb27708a5a..e83e06b60e3 100644
--- a/core/services/gateway/connector/mocks/gateway_connector_handler.go
+++ b/core/services/gateway/connector/mocks/gateway_connector_handler.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -19,6 +19,10 @@ type GatewayConnectorHandler struct {
 func (_m *GatewayConnectorHandler) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -38,6 +42,10 @@ func (_m *GatewayConnectorHandler) HandleGatewayMessage(ctx context.Context, gat
 func (_m *GatewayConnectorHandler) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/services/gateway/connector/mocks/signer.go b/core/services/gateway/connector/mocks/signer.go
index 497b25d8df3..18c7186f7fc 100644
--- a/core/services/gateway/connector/mocks/signer.go
+++ b/core/services/gateway/connector/mocks/signer.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -19,6 +19,10 @@ func (_m *Signer) Sign(data ...[]byte) ([]byte, error) {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Sign")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(...[]byte) ([]byte, error)); ok {
diff --git a/core/services/gateway/handlers/functions/mocks/onchain_allowlist.go b/core/services/gateway/handlers/functions/mocks/onchain_allowlist.go
index 8cbf301f0ea..6668a3c76ff 100644
--- a/core/services/gateway/handlers/functions/mocks/onchain_allowlist.go
+++ b/core/services/gateway/handlers/functions/mocks/onchain_allowlist.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -19,6 +19,10 @@ type OnchainAllowlist struct {
 func (_m *OnchainAllowlist) Allow(_a0 common.Address) bool {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Allow")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func(common.Address) bool); ok {
 		r0 = rf(_a0)
@@ -33,6 +37,10 @@ func (_m *OnchainAllowlist) Allow(_a0 common.Address) bool {
 func (_m *OnchainAllowlist) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -47,6 +55,10 @@ func (_m *OnchainAllowlist) Close() error {
 func (_m *OnchainAllowlist) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
@@ -61,6 +73,10 @@ func (_m *OnchainAllowlist) Start(_a0 context.Context) error {
 func (_m *OnchainAllowlist) UpdateFromContract(ctx context.Context) error {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateFromContract")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(ctx)
diff --git a/core/services/gateway/handlers/functions/mocks/onchain_subscriptions.go b/core/services/gateway/handlers/functions/mocks/onchain_subscriptions.go
index 64e2960f949..5f2054c4e47 100644
--- a/core/services/gateway/handlers/functions/mocks/onchain_subscriptions.go
+++ b/core/services/gateway/handlers/functions/mocks/onchain_subscriptions.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -20,6 +20,10 @@ type OnchainSubscriptions struct {
 func (_m *OnchainSubscriptions) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -34,6 +38,10 @@ func (_m *OnchainSubscriptions) Close() error {
 func (_m *OnchainSubscriptions) GetMaxUserBalance(_a0 common.Address) (*big.Int, error) {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetMaxUserBalance")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Address) (*big.Int, error)); ok {
@@ -60,6 +68,10 @@ func (_m *OnchainSubscriptions) GetMaxUserBalance(_a0 common.Address) (*big.Int,
 func (_m *OnchainSubscriptions) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/services/gateway/handlers/mocks/don.go b/core/services/gateway/handlers/mocks/don.go
index 02df7c0334f..6e88708dd7d 100644
--- a/core/services/gateway/handlers/mocks/don.go
+++ b/core/services/gateway/handlers/mocks/don.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -19,6 +19,10 @@ type DON struct {
 func (_m *DON) SendToNode(ctx context.Context, nodeAddress string, msg *api.Message) error {
 	ret := _m.Called(ctx, nodeAddress, msg)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SendToNode")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, *api.Message) error); ok {
 		r0 = rf(ctx, nodeAddress, msg)
diff --git a/core/services/gateway/handlers/mocks/handler.go b/core/services/gateway/handlers/mocks/handler.go
index 10a31c6d76e..7dfe1eae784 100644
--- a/core/services/gateway/handlers/mocks/handler.go
+++ b/core/services/gateway/handlers/mocks/handler.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -21,6 +21,10 @@ type Handler struct {
 func (_m *Handler) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -35,6 +39,10 @@ func (_m *Handler) Close() error {
 func (_m *Handler) HandleNodeMessage(ctx context.Context, msg *api.Message, nodeAddr string) error {
 	ret := _m.Called(ctx, msg, nodeAddr)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HandleNodeMessage")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *api.Message, string) error); ok {
 		r0 = rf(ctx, msg, nodeAddr)
@@ -49,6 +57,10 @@ func (_m *Handler) HandleNodeMessage(ctx context.Context, msg *api.Message, node
 func (_m *Handler) HandleUserMessage(ctx context.Context, msg *api.Message, callbackCh chan<- handlers.UserCallbackPayload) error {
 	ret := _m.Called(ctx, msg, callbackCh)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HandleUserMessage")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *api.Message, chan<- handlers.UserCallbackPayload) error); ok {
 		r0 = rf(ctx, msg, callbackCh)
@@ -63,6 +75,10 @@ func (_m *Handler) HandleUserMessage(ctx context.Context, msg *api.Message, call
 func (_m *Handler) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/services/gateway/network/mocks/connection_acceptor.go b/core/services/gateway/network/mocks/connection_acceptor.go
index 738904984af..c45cc7fbe3e 100644
--- a/core/services/gateway/network/mocks/connection_acceptor.go
+++ b/core/services/gateway/network/mocks/connection_acceptor.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -22,6 +22,10 @@ func (_m *ConnectionAcceptor) AbortHandshake(attemptId string) {
 func (_m *ConnectionAcceptor) FinalizeHandshake(attemptId string, response []byte, conn *websocket.Conn) error {
 	ret := _m.Called(attemptId, response, conn)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FinalizeHandshake")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, []byte, *websocket.Conn) error); ok {
 		r0 = rf(attemptId, response, conn)
@@ -36,6 +40,10 @@ func (_m *ConnectionAcceptor) FinalizeHandshake(attemptId string, response []byt
 func (_m *ConnectionAcceptor) StartHandshake(authHeader []byte) (string, []byte, error) {
 	ret := _m.Called(authHeader)
 
+	if len(ret) == 0 {
+		panic("no return value specified for StartHandshake")
+	}
+
 	var r0 string
 	var r1 []byte
 	var r2 error
diff --git a/core/services/gateway/network/mocks/connection_initiator.go b/core/services/gateway/network/mocks/connection_initiator.go
index 3ff60e61398..87e4f407328 100644
--- a/core/services/gateway/network/mocks/connection_initiator.go
+++ b/core/services/gateway/network/mocks/connection_initiator.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type ConnectionInitiator struct {
 func (_m *ConnectionInitiator) ChallengeResponse(_a0 *url.URL, challenge []byte) ([]byte, error) {
 	ret := _m.Called(_a0, challenge)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChallengeResponse")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*url.URL, []byte) ([]byte, error)); ok {
@@ -43,6 +47,10 @@ func (_m *ConnectionInitiator) ChallengeResponse(_a0 *url.URL, challenge []byte)
 func (_m *ConnectionInitiator) NewAuthHeader(_a0 *url.URL) ([]byte, error) {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for NewAuthHeader")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*url.URL) ([]byte, error)); ok {
diff --git a/core/services/gateway/network/mocks/http_request_handler.go b/core/services/gateway/network/mocks/http_request_handler.go
index 7716626ac72..7c5ff4025cf 100644
--- a/core/services/gateway/network/mocks/http_request_handler.go
+++ b/core/services/gateway/network/mocks/http_request_handler.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type HTTPRequestHandler struct {
 func (_m *HTTPRequestHandler) ProcessRequest(ctx context.Context, rawRequest []byte) ([]byte, int) {
 	ret := _m.Called(ctx, rawRequest)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ProcessRequest")
+	}
+
 	var r0 []byte
 	var r1 int
 	if rf, ok := ret.Get(0).(func(context.Context, []byte) ([]byte, int)); ok {
diff --git a/core/services/gateway/network/mocks/http_server.go b/core/services/gateway/network/mocks/http_server.go
index 197e77f1b8a..81e180e7b8d 100644
--- a/core/services/gateway/network/mocks/http_server.go
+++ b/core/services/gateway/network/mocks/http_server.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type HttpServer struct {
 func (_m *HttpServer) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -32,6 +36,10 @@ func (_m *HttpServer) Close() error {
 func (_m *HttpServer) GetPort() int {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetPort")
+	}
+
 	var r0 int
 	if rf, ok := ret.Get(0).(func() int); ok {
 		r0 = rf()
@@ -51,6 +59,10 @@ func (_m *HttpServer) SetHTTPRequestHandler(handler network.HTTPRequestHandler)
 func (_m *HttpServer) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/services/gateway/network/mocks/web_socket_server.go b/core/services/gateway/network/mocks/web_socket_server.go
index d88cd5ba4f7..4f75f3b7d0f 100644
--- a/core/services/gateway/network/mocks/web_socket_server.go
+++ b/core/services/gateway/network/mocks/web_socket_server.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type WebSocketServer struct {
 func (_m *WebSocketServer) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -31,6 +35,10 @@ func (_m *WebSocketServer) Close() error {
 func (_m *WebSocketServer) GetPort() int {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetPort")
+	}
+
 	var r0 int
 	if rf, ok := ret.Get(0).(func() int); ok {
 		r0 = rf()
@@ -45,6 +53,10 @@ func (_m *WebSocketServer) GetPort() int {
 func (_m *WebSocketServer) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/services/job/mocks/orm.go b/core/services/job/mocks/orm.go
index 9e18573f4e5..66602c60053 100644
--- a/core/services/job/mocks/orm.go
+++ b/core/services/job/mocks/orm.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -31,6 +31,10 @@ type ORM struct {
 func (_m *ORM) AssertBridgesExist(p pipeline.Pipeline) error {
 	ret := _m.Called(p)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AssertBridgesExist")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(pipeline.Pipeline) error); ok {
 		r0 = rf(p)
@@ -45,6 +49,10 @@ func (_m *ORM) AssertBridgesExist(p pipeline.Pipeline) error {
 func (_m *ORM) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -59,6 +67,10 @@ func (_m *ORM) Close() error {
 func (_m *ORM) CountPipelineRunsByJobID(jobID int32) (int32, error) {
 	ret := _m.Called(jobID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CountPipelineRunsByJobID")
+	}
+
 	var r0 int32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int32) (int32, error)); ok {
@@ -90,6 +102,10 @@ func (_m *ORM) CreateJob(jb *job.Job, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateJob")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*job.Job, ...pg.QOpt) error); ok {
 		r0 = rf(jb, qopts...)
@@ -111,6 +127,10 @@ func (_m *ORM) DeleteJob(id int32, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteJob")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int32, ...pg.QOpt) error); ok {
 		r0 = rf(id, qopts...)
@@ -125,6 +145,10 @@ func (_m *ORM) DeleteJob(id int32, qopts ...pg.QOpt) error {
 func (_m *ORM) DismissError(ctx context.Context, errorID int64) error {
 	ret := _m.Called(ctx, errorID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DismissError")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, int64) error); ok {
 		r0 = rf(ctx, errorID)
@@ -139,6 +163,10 @@ func (_m *ORM) DismissError(ctx context.Context, errorID int64) error {
 func (_m *ORM) FindJob(ctx context.Context, id int32) (job.Job, error) {
 	ret := _m.Called(ctx, id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindJob")
+	}
+
 	var r0 job.Job
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, int32) (job.Job, error)); ok {
@@ -170,6 +198,10 @@ func (_m *ORM) FindJobByExternalJobID(_a0 uuid.UUID, qopts ...pg.QOpt) (job.Job,
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindJobByExternalJobID")
+	}
+
 	var r0 job.Job
 	var r1 error
 	if rf, ok := ret.Get(0).(func(uuid.UUID, ...pg.QOpt) (job.Job, error)); ok {
@@ -201,6 +233,10 @@ func (_m *ORM) FindJobIDByAddress(address ethkey.EIP55Address, evmChainID *utils
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindJobIDByAddress")
+	}
+
 	var r0 int32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(ethkey.EIP55Address, *utils.Big, ...pg.QOpt) (int32, error)); ok {
@@ -225,6 +261,10 @@ func (_m *ORM) FindJobIDByAddress(address ethkey.EIP55Address, evmChainID *utils
 func (_m *ORM) FindJobIDsWithBridge(name string) ([]int32, error) {
 	ret := _m.Called(name)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindJobIDsWithBridge")
+	}
+
 	var r0 []int32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]int32, error)); ok {
@@ -251,6 +291,10 @@ func (_m *ORM) FindJobIDsWithBridge(name string) ([]int32, error) {
 func (_m *ORM) FindJobTx(ctx context.Context, id int32) (job.Job, error) {
 	ret := _m.Called(ctx, id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindJobTx")
+	}
+
 	var r0 job.Job
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, int32) (job.Job, error)); ok {
@@ -275,6 +319,10 @@ func (_m *ORM) FindJobTx(ctx context.Context, id int32) (job.Job, error) {
 func (_m *ORM) FindJobWithoutSpecErrors(id int32) (job.Job, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindJobWithoutSpecErrors")
+	}
+
 	var r0 job.Job
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int32) (job.Job, error)); ok {
@@ -299,6 +347,10 @@ func (_m *ORM) FindJobWithoutSpecErrors(id int32) (job.Job, error) {
 func (_m *ORM) FindJobs(offset int, limit int) ([]job.Job, int, error) {
 	ret := _m.Called(offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindJobs")
+	}
+
 	var r0 []job.Job
 	var r1 int
 	var r2 error
@@ -332,6 +384,10 @@ func (_m *ORM) FindJobs(offset int, limit int) ([]job.Job, int, error) {
 func (_m *ORM) FindJobsByPipelineSpecIDs(ids []int32) ([]job.Job, error) {
 	ret := _m.Called(ids)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindJobsByPipelineSpecIDs")
+	}
+
 	var r0 []job.Job
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]int32) ([]job.Job, error)); ok {
@@ -365,6 +421,10 @@ func (_m *ORM) FindOCR2JobIDByAddress(contractID string, feedID *common.Hash, qo
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindOCR2JobIDByAddress")
+	}
+
 	var r0 int32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, *common.Hash, ...pg.QOpt) (int32, error)); ok {
@@ -389,6 +449,10 @@ func (_m *ORM) FindOCR2JobIDByAddress(contractID string, feedID *common.Hash, qo
 func (_m *ORM) FindPipelineRunByID(id int64) (pipeline.Run, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindPipelineRunByID")
+	}
+
 	var r0 pipeline.Run
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) (pipeline.Run, error)); ok {
@@ -413,6 +477,10 @@ func (_m *ORM) FindPipelineRunByID(id int64) (pipeline.Run, error) {
 func (_m *ORM) FindPipelineRunIDsByJobID(jobID int32, offset int, limit int) ([]int64, error) {
 	ret := _m.Called(jobID, offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindPipelineRunIDsByJobID")
+	}
+
 	var r0 []int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int32, int, int) ([]int64, error)); ok {
@@ -439,6 +507,10 @@ func (_m *ORM) FindPipelineRunIDsByJobID(jobID int32, offset int, limit int) ([]
 func (_m *ORM) FindPipelineRunsByIDs(ids []int64) ([]pipeline.Run, error) {
 	ret := _m.Called(ids)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindPipelineRunsByIDs")
+	}
+
 	var r0 []pipeline.Run
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]int64) ([]pipeline.Run, error)); ok {
@@ -472,6 +544,10 @@ func (_m *ORM) FindSpecError(id int64, qopts ...pg.QOpt) (job.SpecError, error)
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindSpecError")
+	}
+
 	var r0 job.SpecError
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, ...pg.QOpt) (job.SpecError, error)); ok {
@@ -503,6 +579,10 @@ func (_m *ORM) FindSpecErrorsByJobIDs(ids []int32, qopts ...pg.QOpt) ([]job.Spec
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindSpecErrorsByJobIDs")
+	}
+
 	var r0 []job.SpecError
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]int32, ...pg.QOpt) ([]job.SpecError, error)); ok {
@@ -536,6 +616,10 @@ func (_m *ORM) FindTaskResultByRunIDAndTaskName(runID int64, taskName string, qo
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindTaskResultByRunIDAndTaskName")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64, string, ...pg.QOpt) ([]byte, error)); ok {
@@ -569,6 +653,10 @@ func (_m *ORM) InsertJob(_a0 *job.Job, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for InsertJob")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*job.Job, ...pg.QOpt) error); ok {
 		r0 = rf(_a0, qopts...)
@@ -590,6 +678,10 @@ func (_m *ORM) InsertWebhookSpec(webhookSpec *job.WebhookSpec, qopts ...pg.QOpt)
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for InsertWebhookSpec")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*job.WebhookSpec, ...pg.QOpt) error); ok {
 		r0 = rf(webhookSpec, qopts...)
@@ -604,6 +696,10 @@ func (_m *ORM) InsertWebhookSpec(webhookSpec *job.WebhookSpec, qopts ...pg.QOpt)
 func (_m *ORM) PipelineRuns(jobID *int32, offset int, size int) ([]pipeline.Run, int, error) {
 	ret := _m.Called(jobID, offset, size)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PipelineRuns")
+	}
+
 	var r0 []pipeline.Run
 	var r1 int
 	var r2 error
@@ -644,6 +740,10 @@ func (_m *ORM) RecordError(jobID int32, description string, qopts ...pg.QOpt) er
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RecordError")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int32, string, ...pg.QOpt) error); ok {
 		r0 = rf(jobID, description, qopts...)
diff --git a/core/services/job/mocks/service_ctx.go b/core/services/job/mocks/service_ctx.go
index 93ef76619d9..43c28632963 100644
--- a/core/services/job/mocks/service_ctx.go
+++ b/core/services/job/mocks/service_ctx.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type ServiceCtx struct {
 func (_m *ServiceCtx) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -31,6 +35,10 @@ func (_m *ServiceCtx) Close() error {
 func (_m *ServiceCtx) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/services/job/mocks/spawner.go b/core/services/job/mocks/spawner.go
index 6866f1fc156..60d36b18fa5 100644
--- a/core/services/job/mocks/spawner.go
+++ b/core/services/job/mocks/spawner.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -20,6 +20,10 @@ type Spawner struct {
 func (_m *Spawner) ActiveJobs() map[int32]job.Job {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ActiveJobs")
+	}
+
 	var r0 map[int32]job.Job
 	if rf, ok := ret.Get(0).(func() map[int32]job.Job); ok {
 		r0 = rf()
@@ -36,6 +40,10 @@ func (_m *Spawner) ActiveJobs() map[int32]job.Job {
 func (_m *Spawner) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -57,6 +65,10 @@ func (_m *Spawner) CreateJob(jb *job.Job, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateJob")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*job.Job, ...pg.QOpt) error); ok {
 		r0 = rf(jb, qopts...)
@@ -78,6 +90,10 @@ func (_m *Spawner) DeleteJob(jobID int32, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteJob")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int32, ...pg.QOpt) error); ok {
 		r0 = rf(jobID, qopts...)
@@ -92,6 +108,10 @@ func (_m *Spawner) DeleteJob(jobID int32, qopts ...pg.QOpt) error {
 func (_m *Spawner) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -108,6 +128,10 @@ func (_m *Spawner) HealthReport() map[string]error {
 func (_m *Spawner) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -122,6 +146,10 @@ func (_m *Spawner) Name() string {
 func (_m *Spawner) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -136,6 +164,10 @@ func (_m *Spawner) Ready() error {
 func (_m *Spawner) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
@@ -157,6 +189,10 @@ func (_m *Spawner) StartService(ctx context.Context, spec job.Job, qopts ...pg.Q
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for StartService")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, job.Job, ...pg.QOpt) error); ok {
 		r0 = rf(ctx, spec, qopts...)
diff --git a/core/services/keystore/mocks/cosmos.go b/core/services/keystore/mocks/cosmos.go
index b8d5d56c373..40ba12d15d7 100644
--- a/core/services/keystore/mocks/cosmos.go
+++ b/core/services/keystore/mocks/cosmos.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type Cosmos struct {
 func (_m *Cosmos) Add(key cosmoskey.Key) error {
 	ret := _m.Called(key)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Add")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(cosmoskey.Key) error); ok {
 		r0 = rf(key)
@@ -31,6 +35,10 @@ func (_m *Cosmos) Add(key cosmoskey.Key) error {
 func (_m *Cosmos) Create() (cosmoskey.Key, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
 	var r0 cosmoskey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (cosmoskey.Key, error)); ok {
@@ -55,6 +63,10 @@ func (_m *Cosmos) Create() (cosmoskey.Key, error) {
 func (_m *Cosmos) Delete(id string) (cosmoskey.Key, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 cosmoskey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (cosmoskey.Key, error)); ok {
@@ -79,6 +91,10 @@ func (_m *Cosmos) Delete(id string) (cosmoskey.Key, error) {
 func (_m *Cosmos) EnsureKey() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnsureKey")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -93,6 +109,10 @@ func (_m *Cosmos) EnsureKey() error {
 func (_m *Cosmos) Export(id string, password string) ([]byte, error) {
 	ret := _m.Called(id, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Export")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]byte, error)); ok {
@@ -119,6 +139,10 @@ func (_m *Cosmos) Export(id string, password string) ([]byte, error) {
 func (_m *Cosmos) Get(id string) (cosmoskey.Key, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 cosmoskey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (cosmoskey.Key, error)); ok {
@@ -143,6 +167,10 @@ func (_m *Cosmos) Get(id string) (cosmoskey.Key, error) {
 func (_m *Cosmos) GetAll() ([]cosmoskey.Key, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []cosmoskey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]cosmoskey.Key, error)); ok {
@@ -169,6 +197,10 @@ func (_m *Cosmos) GetAll() ([]cosmoskey.Key, error) {
 func (_m *Cosmos) Import(keyJSON []byte, password string) (cosmoskey.Key, error) {
 	ret := _m.Called(keyJSON, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Import")
+	}
+
 	var r0 cosmoskey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]byte, string) (cosmoskey.Key, error)); ok {
diff --git a/core/services/keystore/mocks/csa.go b/core/services/keystore/mocks/csa.go
index 4f4e02a2fe6..ad5b25a27bd 100644
--- a/core/services/keystore/mocks/csa.go
+++ b/core/services/keystore/mocks/csa.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type CSA struct {
 func (_m *CSA) Add(key csakey.KeyV2) error {
 	ret := _m.Called(key)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Add")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(csakey.KeyV2) error); ok {
 		r0 = rf(key)
@@ -31,6 +35,10 @@ func (_m *CSA) Add(key csakey.KeyV2) error {
 func (_m *CSA) Create() (csakey.KeyV2, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
 	var r0 csakey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (csakey.KeyV2, error)); ok {
@@ -55,6 +63,10 @@ func (_m *CSA) Create() (csakey.KeyV2, error) {
 func (_m *CSA) Delete(id string) (csakey.KeyV2, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 csakey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (csakey.KeyV2, error)); ok {
@@ -79,6 +91,10 @@ func (_m *CSA) Delete(id string) (csakey.KeyV2, error) {
 func (_m *CSA) EnsureKey() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnsureKey")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -93,6 +109,10 @@ func (_m *CSA) EnsureKey() error {
 func (_m *CSA) Export(id string, password string) ([]byte, error) {
 	ret := _m.Called(id, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Export")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]byte, error)); ok {
@@ -119,6 +139,10 @@ func (_m *CSA) Export(id string, password string) ([]byte, error) {
 func (_m *CSA) Get(id string) (csakey.KeyV2, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 csakey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (csakey.KeyV2, error)); ok {
@@ -143,6 +167,10 @@ func (_m *CSA) Get(id string) (csakey.KeyV2, error) {
 func (_m *CSA) GetAll() ([]csakey.KeyV2, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []csakey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]csakey.KeyV2, error)); ok {
@@ -169,6 +197,10 @@ func (_m *CSA) GetAll() ([]csakey.KeyV2, error) {
 func (_m *CSA) Import(keyJSON []byte, password string) (csakey.KeyV2, error) {
 	ret := _m.Called(keyJSON, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Import")
+	}
+
 	var r0 csakey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]byte, string) (csakey.KeyV2, error)); ok {
diff --git a/core/services/keystore/mocks/dkg_encrypt.go b/core/services/keystore/mocks/dkg_encrypt.go
index e1f83888c48..e7e52bada25 100644
--- a/core/services/keystore/mocks/dkg_encrypt.go
+++ b/core/services/keystore/mocks/dkg_encrypt.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type DKGEncrypt struct {
 func (_m *DKGEncrypt) Add(key dkgencryptkey.Key) error {
 	ret := _m.Called(key)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Add")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(dkgencryptkey.Key) error); ok {
 		r0 = rf(key)
@@ -31,6 +35,10 @@ func (_m *DKGEncrypt) Add(key dkgencryptkey.Key) error {
 func (_m *DKGEncrypt) Create() (dkgencryptkey.Key, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
 	var r0 dkgencryptkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (dkgencryptkey.Key, error)); ok {
@@ -55,6 +63,10 @@ func (_m *DKGEncrypt) Create() (dkgencryptkey.Key, error) {
 func (_m *DKGEncrypt) Delete(id string) (dkgencryptkey.Key, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 dkgencryptkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (dkgencryptkey.Key, error)); ok {
@@ -79,6 +91,10 @@ func (_m *DKGEncrypt) Delete(id string) (dkgencryptkey.Key, error) {
 func (_m *DKGEncrypt) EnsureKey() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnsureKey")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -93,6 +109,10 @@ func (_m *DKGEncrypt) EnsureKey() error {
 func (_m *DKGEncrypt) Export(id string, password string) ([]byte, error) {
 	ret := _m.Called(id, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Export")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]byte, error)); ok {
@@ -119,6 +139,10 @@ func (_m *DKGEncrypt) Export(id string, password string) ([]byte, error) {
 func (_m *DKGEncrypt) Get(id string) (dkgencryptkey.Key, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 dkgencryptkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (dkgencryptkey.Key, error)); ok {
@@ -143,6 +167,10 @@ func (_m *DKGEncrypt) Get(id string) (dkgencryptkey.Key, error) {
 func (_m *DKGEncrypt) GetAll() ([]dkgencryptkey.Key, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []dkgencryptkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]dkgencryptkey.Key, error)); ok {
@@ -169,6 +197,10 @@ func (_m *DKGEncrypt) GetAll() ([]dkgencryptkey.Key, error) {
 func (_m *DKGEncrypt) Import(keyJSON []byte, password string) (dkgencryptkey.Key, error) {
 	ret := _m.Called(keyJSON, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Import")
+	}
+
 	var r0 dkgencryptkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]byte, string) (dkgencryptkey.Key, error)); ok {
diff --git a/core/services/keystore/mocks/dkg_sign.go b/core/services/keystore/mocks/dkg_sign.go
index ed1aa756a6d..e5c6434d90d 100644
--- a/core/services/keystore/mocks/dkg_sign.go
+++ b/core/services/keystore/mocks/dkg_sign.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type DKGSign struct {
 func (_m *DKGSign) Add(key dkgsignkey.Key) error {
 	ret := _m.Called(key)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Add")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(dkgsignkey.Key) error); ok {
 		r0 = rf(key)
@@ -31,6 +35,10 @@ func (_m *DKGSign) Add(key dkgsignkey.Key) error {
 func (_m *DKGSign) Create() (dkgsignkey.Key, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
 	var r0 dkgsignkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (dkgsignkey.Key, error)); ok {
@@ -55,6 +63,10 @@ func (_m *DKGSign) Create() (dkgsignkey.Key, error) {
 func (_m *DKGSign) Delete(id string) (dkgsignkey.Key, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 dkgsignkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (dkgsignkey.Key, error)); ok {
@@ -79,6 +91,10 @@ func (_m *DKGSign) Delete(id string) (dkgsignkey.Key, error) {
 func (_m *DKGSign) EnsureKey() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnsureKey")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -93,6 +109,10 @@ func (_m *DKGSign) EnsureKey() error {
 func (_m *DKGSign) Export(id string, password string) ([]byte, error) {
 	ret := _m.Called(id, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Export")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]byte, error)); ok {
@@ -119,6 +139,10 @@ func (_m *DKGSign) Export(id string, password string) ([]byte, error) {
 func (_m *DKGSign) Get(id string) (dkgsignkey.Key, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 dkgsignkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (dkgsignkey.Key, error)); ok {
@@ -143,6 +167,10 @@ func (_m *DKGSign) Get(id string) (dkgsignkey.Key, error) {
 func (_m *DKGSign) GetAll() ([]dkgsignkey.Key, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []dkgsignkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]dkgsignkey.Key, error)); ok {
@@ -169,6 +197,10 @@ func (_m *DKGSign) GetAll() ([]dkgsignkey.Key, error) {
 func (_m *DKGSign) Import(keyJSON []byte, password string) (dkgsignkey.Key, error) {
 	ret := _m.Called(keyJSON, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Import")
+	}
+
 	var r0 dkgsignkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]byte, string) (dkgsignkey.Key, error)); ok {
diff --git a/core/services/keystore/mocks/eth.go b/core/services/keystore/mocks/eth.go
index 6a076e130d1..b3827398fd5 100644
--- a/core/services/keystore/mocks/eth.go
+++ b/core/services/keystore/mocks/eth.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -31,6 +31,10 @@ func (_m *Eth) Add(address common.Address, chainID *big.Int, qopts ...pg.QOpt) e
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Add")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(common.Address, *big.Int, ...pg.QOpt) error); ok {
 		r0 = rf(address, chainID, qopts...)
@@ -45,6 +49,10 @@ func (_m *Eth) Add(address common.Address, chainID *big.Int, qopts ...pg.QOpt) e
 func (_m *Eth) CheckEnabled(address common.Address, chainID *big.Int) error {
 	ret := _m.Called(address, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CheckEnabled")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(common.Address, *big.Int) error); ok {
 		r0 = rf(address, chainID)
@@ -65,6 +73,10 @@ func (_m *Eth) Create(chainIDs ...*big.Int) (ethkey.KeyV2, error) {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
 	var r0 ethkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(...*big.Int) (ethkey.KeyV2, error)); ok {
@@ -89,6 +101,10 @@ func (_m *Eth) Create(chainIDs ...*big.Int) (ethkey.KeyV2, error) {
 func (_m *Eth) Delete(id string) (ethkey.KeyV2, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 ethkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (ethkey.KeyV2, error)); ok {
@@ -120,6 +136,10 @@ func (_m *Eth) Disable(address common.Address, chainID *big.Int, qopts ...pg.QOp
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Disable")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(common.Address, *big.Int, ...pg.QOpt) error); ok {
 		r0 = rf(address, chainID, qopts...)
@@ -141,6 +161,10 @@ func (_m *Eth) Enable(address common.Address, chainID *big.Int, qopts ...pg.QOpt
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Enable")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(common.Address, *big.Int, ...pg.QOpt) error); ok {
 		r0 = rf(address, chainID, qopts...)
@@ -155,6 +179,10 @@ func (_m *Eth) Enable(address common.Address, chainID *big.Int, qopts ...pg.QOpt
 func (_m *Eth) EnabledAddressesForChain(chainID *big.Int) ([]common.Address, error) {
 	ret := _m.Called(chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnabledAddressesForChain")
+	}
+
 	var r0 []common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*big.Int) ([]common.Address, error)); ok {
@@ -181,6 +209,10 @@ func (_m *Eth) EnabledAddressesForChain(chainID *big.Int) ([]common.Address, err
 func (_m *Eth) EnabledKeysForChain(chainID *big.Int) ([]ethkey.KeyV2, error) {
 	ret := _m.Called(chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnabledKeysForChain")
+	}
+
 	var r0 []ethkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*big.Int) ([]ethkey.KeyV2, error)); ok {
@@ -213,6 +245,10 @@ func (_m *Eth) EnsureKeys(chainIDs ...*big.Int) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnsureKeys")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(...*big.Int) error); ok {
 		r0 = rf(chainIDs...)
@@ -227,6 +263,10 @@ func (_m *Eth) EnsureKeys(chainIDs ...*big.Int) error {
 func (_m *Eth) Export(id string, password string) ([]byte, error) {
 	ret := _m.Called(id, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Export")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]byte, error)); ok {
@@ -253,6 +293,10 @@ func (_m *Eth) Export(id string, password string) ([]byte, error) {
 func (_m *Eth) Get(id string) (ethkey.KeyV2, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 ethkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (ethkey.KeyV2, error)); ok {
@@ -277,6 +321,10 @@ func (_m *Eth) Get(id string) (ethkey.KeyV2, error) {
 func (_m *Eth) GetAll() ([]ethkey.KeyV2, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []ethkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]ethkey.KeyV2, error)); ok {
@@ -310,6 +358,10 @@ func (_m *Eth) GetRoundRobinAddress(chainID *big.Int, addresses ...common.Addres
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetRoundRobinAddress")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*big.Int, ...common.Address) (common.Address, error)); ok {
@@ -336,6 +388,10 @@ func (_m *Eth) GetRoundRobinAddress(chainID *big.Int, addresses ...common.Addres
 func (_m *Eth) GetState(id string, chainID *big.Int) (ethkey.State, error) {
 	ret := _m.Called(id, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetState")
+	}
+
 	var r0 ethkey.State
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, *big.Int) (ethkey.State, error)); ok {
@@ -360,6 +416,10 @@ func (_m *Eth) GetState(id string, chainID *big.Int) (ethkey.State, error) {
 func (_m *Eth) GetStateForKey(_a0 ethkey.KeyV2) (ethkey.State, error) {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetStateForKey")
+	}
+
 	var r0 ethkey.State
 	var r1 error
 	if rf, ok := ret.Get(0).(func(ethkey.KeyV2) (ethkey.State, error)); ok {
@@ -384,6 +444,10 @@ func (_m *Eth) GetStateForKey(_a0 ethkey.KeyV2) (ethkey.State, error) {
 func (_m *Eth) GetStatesForChain(chainID *big.Int) ([]ethkey.State, error) {
 	ret := _m.Called(chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetStatesForChain")
+	}
+
 	var r0 []ethkey.State
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*big.Int) ([]ethkey.State, error)); ok {
@@ -410,6 +474,10 @@ func (_m *Eth) GetStatesForChain(chainID *big.Int) ([]ethkey.State, error) {
 func (_m *Eth) GetStatesForKeys(_a0 []ethkey.KeyV2) ([]ethkey.State, error) {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetStatesForKeys")
+	}
+
 	var r0 []ethkey.State
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]ethkey.KeyV2) ([]ethkey.State, error)); ok {
@@ -443,6 +511,10 @@ func (_m *Eth) Import(keyJSON []byte, password string, chainIDs ...*big.Int) (et
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Import")
+	}
+
 	var r0 ethkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]byte, string, ...*big.Int) (ethkey.KeyV2, error)); ok {
@@ -467,6 +539,10 @@ func (_m *Eth) Import(keyJSON []byte, password string, chainIDs ...*big.Int) (et
 func (_m *Eth) SignTx(fromAddress common.Address, tx *types.Transaction, chainID *big.Int) (*types.Transaction, error) {
 	ret := _m.Called(fromAddress, tx, chainID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SignTx")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(common.Address, *types.Transaction, *big.Int) (*types.Transaction, error)); ok {
@@ -493,6 +569,10 @@ func (_m *Eth) SignTx(fromAddress common.Address, tx *types.Transaction, chainID
 func (_m *Eth) SubscribeToKeyChanges() (chan struct{}, func()) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for SubscribeToKeyChanges")
+	}
+
 	var r0 chan struct{}
 	var r1 func()
 	if rf, ok := ret.Get(0).(func() (chan struct{}, func())); ok {
diff --git a/core/services/keystore/mocks/master.go b/core/services/keystore/mocks/master.go
index d29d2fa4692..3025f5b103a 100644
--- a/core/services/keystore/mocks/master.go
+++ b/core/services/keystore/mocks/master.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -16,6 +16,10 @@ type Master struct {
 func (_m *Master) CSA() keystore.CSA {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for CSA")
+	}
+
 	var r0 keystore.CSA
 	if rf, ok := ret.Get(0).(func() keystore.CSA); ok {
 		r0 = rf()
@@ -32,6 +36,10 @@ func (_m *Master) CSA() keystore.CSA {
 func (_m *Master) Cosmos() keystore.Cosmos {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Cosmos")
+	}
+
 	var r0 keystore.Cosmos
 	if rf, ok := ret.Get(0).(func() keystore.Cosmos); ok {
 		r0 = rf()
@@ -48,6 +56,10 @@ func (_m *Master) Cosmos() keystore.Cosmos {
 func (_m *Master) DKGEncrypt() keystore.DKGEncrypt {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for DKGEncrypt")
+	}
+
 	var r0 keystore.DKGEncrypt
 	if rf, ok := ret.Get(0).(func() keystore.DKGEncrypt); ok {
 		r0 = rf()
@@ -64,6 +76,10 @@ func (_m *Master) DKGEncrypt() keystore.DKGEncrypt {
 func (_m *Master) DKGSign() keystore.DKGSign {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for DKGSign")
+	}
+
 	var r0 keystore.DKGSign
 	if rf, ok := ret.Get(0).(func() keystore.DKGSign); ok {
 		r0 = rf()
@@ -80,6 +96,10 @@ func (_m *Master) DKGSign() keystore.DKGSign {
 func (_m *Master) Eth() keystore.Eth {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Eth")
+	}
+
 	var r0 keystore.Eth
 	if rf, ok := ret.Get(0).(func() keystore.Eth); ok {
 		r0 = rf()
@@ -96,6 +116,10 @@ func (_m *Master) Eth() keystore.Eth {
 func (_m *Master) IsEmpty() (bool, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsEmpty")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (bool, error)); ok {
@@ -120,6 +144,10 @@ func (_m *Master) IsEmpty() (bool, error) {
 func (_m *Master) OCR() keystore.OCR {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for OCR")
+	}
+
 	var r0 keystore.OCR
 	if rf, ok := ret.Get(0).(func() keystore.OCR); ok {
 		r0 = rf()
@@ -136,6 +164,10 @@ func (_m *Master) OCR() keystore.OCR {
 func (_m *Master) OCR2() keystore.OCR2 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for OCR2")
+	}
+
 	var r0 keystore.OCR2
 	if rf, ok := ret.Get(0).(func() keystore.OCR2); ok {
 		r0 = rf()
@@ -152,6 +184,10 @@ func (_m *Master) OCR2() keystore.OCR2 {
 func (_m *Master) P2P() keystore.P2P {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for P2P")
+	}
+
 	var r0 keystore.P2P
 	if rf, ok := ret.Get(0).(func() keystore.P2P); ok {
 		r0 = rf()
@@ -168,6 +204,10 @@ func (_m *Master) P2P() keystore.P2P {
 func (_m *Master) Solana() keystore.Solana {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Solana")
+	}
+
 	var r0 keystore.Solana
 	if rf, ok := ret.Get(0).(func() keystore.Solana); ok {
 		r0 = rf()
@@ -184,6 +224,10 @@ func (_m *Master) Solana() keystore.Solana {
 func (_m *Master) StarkNet() keystore.StarkNet {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for StarkNet")
+	}
+
 	var r0 keystore.StarkNet
 	if rf, ok := ret.Get(0).(func() keystore.StarkNet); ok {
 		r0 = rf()
@@ -200,6 +244,10 @@ func (_m *Master) StarkNet() keystore.StarkNet {
 func (_m *Master) Unlock(password string) error {
 	ret := _m.Called(password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Unlock")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(password)
@@ -214,6 +262,10 @@ func (_m *Master) Unlock(password string) error {
 func (_m *Master) VRF() keystore.VRF {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for VRF")
+	}
+
 	var r0 keystore.VRF
 	if rf, ok := ret.Get(0).(func() keystore.VRF); ok {
 		r0 = rf()
diff --git a/core/services/keystore/mocks/ocr.go b/core/services/keystore/mocks/ocr.go
index 505eaa0e46e..e1c4d588330 100644
--- a/core/services/keystore/mocks/ocr.go
+++ b/core/services/keystore/mocks/ocr.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -16,6 +16,10 @@ type OCR struct {
 func (_m *OCR) Add(key ocrkey.KeyV2) error {
 	ret := _m.Called(key)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Add")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(ocrkey.KeyV2) error); ok {
 		r0 = rf(key)
@@ -30,6 +34,10 @@ func (_m *OCR) Add(key ocrkey.KeyV2) error {
 func (_m *OCR) Create() (ocrkey.KeyV2, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
 	var r0 ocrkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (ocrkey.KeyV2, error)); ok {
@@ -54,6 +62,10 @@ func (_m *OCR) Create() (ocrkey.KeyV2, error) {
 func (_m *OCR) Delete(id string) (ocrkey.KeyV2, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 ocrkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (ocrkey.KeyV2, error)); ok {
@@ -78,6 +90,10 @@ func (_m *OCR) Delete(id string) (ocrkey.KeyV2, error) {
 func (_m *OCR) EnsureKey() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnsureKey")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -92,6 +108,10 @@ func (_m *OCR) EnsureKey() error {
 func (_m *OCR) Export(id string, password string) ([]byte, error) {
 	ret := _m.Called(id, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Export")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]byte, error)); ok {
@@ -118,6 +138,10 @@ func (_m *OCR) Export(id string, password string) ([]byte, error) {
 func (_m *OCR) Get(id string) (ocrkey.KeyV2, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 ocrkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (ocrkey.KeyV2, error)); ok {
@@ -142,6 +166,10 @@ func (_m *OCR) Get(id string) (ocrkey.KeyV2, error) {
 func (_m *OCR) GetAll() ([]ocrkey.KeyV2, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []ocrkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]ocrkey.KeyV2, error)); ok {
@@ -168,6 +196,10 @@ func (_m *OCR) GetAll() ([]ocrkey.KeyV2, error) {
 func (_m *OCR) Import(keyJSON []byte, password string) (ocrkey.KeyV2, error) {
 	ret := _m.Called(keyJSON, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Import")
+	}
+
 	var r0 ocrkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]byte, string) (ocrkey.KeyV2, error)); ok {
diff --git a/core/services/keystore/mocks/ocr2.go b/core/services/keystore/mocks/ocr2.go
index 30d870dcdc7..d44e739deed 100644
--- a/core/services/keystore/mocks/ocr2.go
+++ b/core/services/keystore/mocks/ocr2.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -19,6 +19,10 @@ type OCR2 struct {
 func (_m *OCR2) Add(key ocr2key.KeyBundle) error {
 	ret := _m.Called(key)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Add")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(ocr2key.KeyBundle) error); ok {
 		r0 = rf(key)
@@ -33,6 +37,10 @@ func (_m *OCR2) Add(key ocr2key.KeyBundle) error {
 func (_m *OCR2) Create(_a0 chaintype.ChainType) (ocr2key.KeyBundle, error) {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
 	var r0 ocr2key.KeyBundle
 	var r1 error
 	if rf, ok := ret.Get(0).(func(chaintype.ChainType) (ocr2key.KeyBundle, error)); ok {
@@ -59,6 +67,10 @@ func (_m *OCR2) Create(_a0 chaintype.ChainType) (ocr2key.KeyBundle, error) {
 func (_m *OCR2) Delete(id string) error {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(id)
@@ -79,6 +91,10 @@ func (_m *OCR2) EnsureKeys(enabledChains ...chaintype.ChainType) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnsureKeys")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(...chaintype.ChainType) error); ok {
 		r0 = rf(enabledChains...)
@@ -93,6 +109,10 @@ func (_m *OCR2) EnsureKeys(enabledChains ...chaintype.ChainType) error {
 func (_m *OCR2) Export(id string, password string) ([]byte, error) {
 	ret := _m.Called(id, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Export")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]byte, error)); ok {
@@ -119,6 +139,10 @@ func (_m *OCR2) Export(id string, password string) ([]byte, error) {
 func (_m *OCR2) Get(id string) (ocr2key.KeyBundle, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 ocr2key.KeyBundle
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (ocr2key.KeyBundle, error)); ok {
@@ -145,6 +169,10 @@ func (_m *OCR2) Get(id string) (ocr2key.KeyBundle, error) {
 func (_m *OCR2) GetAll() ([]ocr2key.KeyBundle, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []ocr2key.KeyBundle
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]ocr2key.KeyBundle, error)); ok {
@@ -171,6 +199,10 @@ func (_m *OCR2) GetAll() ([]ocr2key.KeyBundle, error) {
 func (_m *OCR2) GetAllOfType(_a0 chaintype.ChainType) ([]ocr2key.KeyBundle, error) {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAllOfType")
+	}
+
 	var r0 []ocr2key.KeyBundle
 	var r1 error
 	if rf, ok := ret.Get(0).(func(chaintype.ChainType) ([]ocr2key.KeyBundle, error)); ok {
@@ -197,6 +229,10 @@ func (_m *OCR2) GetAllOfType(_a0 chaintype.ChainType) ([]ocr2key.KeyBundle, erro
 func (_m *OCR2) Import(keyJSON []byte, password string) (ocr2key.KeyBundle, error) {
 	ret := _m.Called(keyJSON, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Import")
+	}
+
 	var r0 ocr2key.KeyBundle
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]byte, string) (ocr2key.KeyBundle, error)); ok {
diff --git a/core/services/keystore/mocks/p2p.go b/core/services/keystore/mocks/p2p.go
index c91be5a4a92..fa2a1b6ceeb 100644
--- a/core/services/keystore/mocks/p2p.go
+++ b/core/services/keystore/mocks/p2p.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -16,6 +16,10 @@ type P2P struct {
 func (_m *P2P) Add(key p2pkey.KeyV2) error {
 	ret := _m.Called(key)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Add")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(p2pkey.KeyV2) error); ok {
 		r0 = rf(key)
@@ -30,6 +34,10 @@ func (_m *P2P) Add(key p2pkey.KeyV2) error {
 func (_m *P2P) Create() (p2pkey.KeyV2, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
 	var r0 p2pkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (p2pkey.KeyV2, error)); ok {
@@ -54,6 +62,10 @@ func (_m *P2P) Create() (p2pkey.KeyV2, error) {
 func (_m *P2P) Delete(id p2pkey.PeerID) (p2pkey.KeyV2, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 p2pkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(p2pkey.PeerID) (p2pkey.KeyV2, error)); ok {
@@ -78,6 +90,10 @@ func (_m *P2P) Delete(id p2pkey.PeerID) (p2pkey.KeyV2, error) {
 func (_m *P2P) EnsureKey() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnsureKey")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -92,6 +108,10 @@ func (_m *P2P) EnsureKey() error {
 func (_m *P2P) Export(id p2pkey.PeerID, password string) ([]byte, error) {
 	ret := _m.Called(id, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Export")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(p2pkey.PeerID, string) ([]byte, error)); ok {
@@ -118,6 +138,10 @@ func (_m *P2P) Export(id p2pkey.PeerID, password string) ([]byte, error) {
 func (_m *P2P) Get(id p2pkey.PeerID) (p2pkey.KeyV2, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 p2pkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(p2pkey.PeerID) (p2pkey.KeyV2, error)); ok {
@@ -142,6 +166,10 @@ func (_m *P2P) Get(id p2pkey.PeerID) (p2pkey.KeyV2, error) {
 func (_m *P2P) GetAll() ([]p2pkey.KeyV2, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []p2pkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]p2pkey.KeyV2, error)); ok {
@@ -168,6 +196,10 @@ func (_m *P2P) GetAll() ([]p2pkey.KeyV2, error) {
 func (_m *P2P) GetOrFirst(id p2pkey.PeerID) (p2pkey.KeyV2, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetOrFirst")
+	}
+
 	var r0 p2pkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(p2pkey.PeerID) (p2pkey.KeyV2, error)); ok {
@@ -192,6 +224,10 @@ func (_m *P2P) GetOrFirst(id p2pkey.PeerID) (p2pkey.KeyV2, error) {
 func (_m *P2P) Import(keyJSON []byte, password string) (p2pkey.KeyV2, error) {
 	ret := _m.Called(keyJSON, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Import")
+	}
+
 	var r0 p2pkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]byte, string) (p2pkey.KeyV2, error)); ok {
diff --git a/core/services/keystore/mocks/solana.go b/core/services/keystore/mocks/solana.go
index 66357e32b93..c2cc4139bab 100644
--- a/core/services/keystore/mocks/solana.go
+++ b/core/services/keystore/mocks/solana.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -19,6 +19,10 @@ type Solana struct {
 func (_m *Solana) Add(key solkey.Key) error {
 	ret := _m.Called(key)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Add")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(solkey.Key) error); ok {
 		r0 = rf(key)
@@ -33,6 +37,10 @@ func (_m *Solana) Add(key solkey.Key) error {
 func (_m *Solana) Create() (solkey.Key, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
 	var r0 solkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (solkey.Key, error)); ok {
@@ -57,6 +65,10 @@ func (_m *Solana) Create() (solkey.Key, error) {
 func (_m *Solana) Delete(id string) (solkey.Key, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 solkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (solkey.Key, error)); ok {
@@ -81,6 +93,10 @@ func (_m *Solana) Delete(id string) (solkey.Key, error) {
 func (_m *Solana) EnsureKey() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnsureKey")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -95,6 +111,10 @@ func (_m *Solana) EnsureKey() error {
 func (_m *Solana) Export(id string, password string) ([]byte, error) {
 	ret := _m.Called(id, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Export")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]byte, error)); ok {
@@ -121,6 +141,10 @@ func (_m *Solana) Export(id string, password string) ([]byte, error) {
 func (_m *Solana) Get(id string) (solkey.Key, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 solkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (solkey.Key, error)); ok {
@@ -145,6 +169,10 @@ func (_m *Solana) Get(id string) (solkey.Key, error) {
 func (_m *Solana) GetAll() ([]solkey.Key, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []solkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]solkey.Key, error)); ok {
@@ -171,6 +199,10 @@ func (_m *Solana) GetAll() ([]solkey.Key, error) {
 func (_m *Solana) Import(keyJSON []byte, password string) (solkey.Key, error) {
 	ret := _m.Called(keyJSON, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Import")
+	}
+
 	var r0 solkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]byte, string) (solkey.Key, error)); ok {
@@ -195,6 +227,10 @@ func (_m *Solana) Import(keyJSON []byte, password string) (solkey.Key, error) {
 func (_m *Solana) Sign(ctx context.Context, id string, msg []byte) ([]byte, error) {
 	ret := _m.Called(ctx, id, msg)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Sign")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, []byte) ([]byte, error)); ok {
diff --git a/core/services/keystore/mocks/starknet.go b/core/services/keystore/mocks/starknet.go
index ff9b52d7136..c3d74a8389f 100644
--- a/core/services/keystore/mocks/starknet.go
+++ b/core/services/keystore/mocks/starknet.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -16,6 +16,10 @@ type StarkNet struct {
 func (_m *StarkNet) Add(key starkkey.Key) error {
 	ret := _m.Called(key)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Add")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(starkkey.Key) error); ok {
 		r0 = rf(key)
@@ -30,6 +34,10 @@ func (_m *StarkNet) Add(key starkkey.Key) error {
 func (_m *StarkNet) Create() (starkkey.Key, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
 	var r0 starkkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (starkkey.Key, error)); ok {
@@ -54,6 +62,10 @@ func (_m *StarkNet) Create() (starkkey.Key, error) {
 func (_m *StarkNet) Delete(id string) (starkkey.Key, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 starkkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (starkkey.Key, error)); ok {
@@ -78,6 +90,10 @@ func (_m *StarkNet) Delete(id string) (starkkey.Key, error) {
 func (_m *StarkNet) EnsureKey() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for EnsureKey")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -92,6 +108,10 @@ func (_m *StarkNet) EnsureKey() error {
 func (_m *StarkNet) Export(id string, password string) ([]byte, error) {
 	ret := _m.Called(id, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Export")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]byte, error)); ok {
@@ -118,6 +138,10 @@ func (_m *StarkNet) Export(id string, password string) ([]byte, error) {
 func (_m *StarkNet) Get(id string) (starkkey.Key, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 starkkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (starkkey.Key, error)); ok {
@@ -142,6 +166,10 @@ func (_m *StarkNet) Get(id string) (starkkey.Key, error) {
 func (_m *StarkNet) GetAll() ([]starkkey.Key, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []starkkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]starkkey.Key, error)); ok {
@@ -168,6 +196,10 @@ func (_m *StarkNet) GetAll() ([]starkkey.Key, error) {
 func (_m *StarkNet) Import(keyJSON []byte, password string) (starkkey.Key, error) {
 	ret := _m.Called(keyJSON, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Import")
+	}
+
 	var r0 starkkey.Key
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]byte, string) (starkkey.Key, error)); ok {
diff --git a/core/services/keystore/mocks/vrf.go b/core/services/keystore/mocks/vrf.go
index 5aa15dca59e..ab730ebec67 100644
--- a/core/services/keystore/mocks/vrf.go
+++ b/core/services/keystore/mocks/vrf.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -19,6 +19,10 @@ type VRF struct {
 func (_m *VRF) Add(key vrfkey.KeyV2) error {
 	ret := _m.Called(key)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Add")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(vrfkey.KeyV2) error); ok {
 		r0 = rf(key)
@@ -33,6 +37,10 @@ func (_m *VRF) Add(key vrfkey.KeyV2) error {
 func (_m *VRF) Create() (vrfkey.KeyV2, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Create")
+	}
+
 	var r0 vrfkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (vrfkey.KeyV2, error)); ok {
@@ -57,6 +65,10 @@ func (_m *VRF) Create() (vrfkey.KeyV2, error) {
 func (_m *VRF) Delete(id string) (vrfkey.KeyV2, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Delete")
+	}
+
 	var r0 vrfkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (vrfkey.KeyV2, error)); ok {
@@ -81,6 +93,10 @@ func (_m *VRF) Delete(id string) (vrfkey.KeyV2, error) {
 func (_m *VRF) Export(id string, password string) ([]byte, error) {
 	ret := _m.Called(id, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Export")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) ([]byte, error)); ok {
@@ -107,6 +123,10 @@ func (_m *VRF) Export(id string, password string) ([]byte, error) {
 func (_m *VRF) GenerateProof(id string, seed *big.Int) (vrfkey.Proof, error) {
 	ret := _m.Called(id, seed)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GenerateProof")
+	}
+
 	var r0 vrfkey.Proof
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, *big.Int) (vrfkey.Proof, error)); ok {
@@ -131,6 +151,10 @@ func (_m *VRF) GenerateProof(id string, seed *big.Int) (vrfkey.Proof, error) {
 func (_m *VRF) Get(id string) (vrfkey.KeyV2, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 vrfkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (vrfkey.KeyV2, error)); ok {
@@ -155,6 +179,10 @@ func (_m *VRF) Get(id string) (vrfkey.KeyV2, error) {
 func (_m *VRF) GetAll() ([]vrfkey.KeyV2, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAll")
+	}
+
 	var r0 []vrfkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]vrfkey.KeyV2, error)); ok {
@@ -181,6 +209,10 @@ func (_m *VRF) GetAll() ([]vrfkey.KeyV2, error) {
 func (_m *VRF) Import(keyJSON []byte, password string) (vrfkey.KeyV2, error) {
 	ret := _m.Called(keyJSON, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Import")
+	}
+
 	var r0 vrfkey.KeyV2
 	var r1 error
 	if rf, ok := ret.Get(0).(func([]byte, string) (vrfkey.KeyV2, error)); ok {
diff --git a/core/services/mocks/checker.go b/core/services/mocks/checker.go
index e0c209d8afb..2572efb1822 100644
--- a/core/services/mocks/checker.go
+++ b/core/services/mocks/checker.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -16,6 +16,10 @@ type Checker struct {
 func (_m *Checker) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -30,6 +34,10 @@ func (_m *Checker) Close() error {
 func (_m *Checker) IsHealthy() (bool, map[string]error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsHealthy")
+	}
+
 	var r0 bool
 	var r1 map[string]error
 	if rf, ok := ret.Get(0).(func() (bool, map[string]error)); ok {
@@ -56,6 +64,10 @@ func (_m *Checker) IsHealthy() (bool, map[string]error) {
 func (_m *Checker) IsReady() (bool, map[string]error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for IsReady")
+	}
+
 	var r0 bool
 	var r1 map[string]error
 	if rf, ok := ret.Get(0).(func() (bool, map[string]error)); ok {
@@ -82,6 +94,10 @@ func (_m *Checker) IsReady() (bool, map[string]error) {
 func (_m *Checker) Register(service pkgservices.HealthReporter) error {
 	ret := _m.Called(service)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Register")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(pkgservices.HealthReporter) error); ok {
 		r0 = rf(service)
@@ -96,6 +112,10 @@ func (_m *Checker) Register(service pkgservices.HealthReporter) error {
 func (_m *Checker) Start() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -110,6 +130,10 @@ func (_m *Checker) Start() error {
 func (_m *Checker) Unregister(name string) error {
 	ret := _m.Called(name)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Unregister")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(name)
diff --git a/core/services/ocr/mocks/ocr_contract_tracker_db.go b/core/services/ocr/mocks/ocr_contract_tracker_db.go
index a1d2f523ccb..6724e418014 100644
--- a/core/services/ocr/mocks/ocr_contract_tracker_db.go
+++ b/core/services/ocr/mocks/ocr_contract_tracker_db.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -19,6 +19,10 @@ type OCRContractTrackerDB struct {
 func (_m *OCRContractTrackerDB) LoadLatestRoundRequested() (offchainaggregator.OffchainAggregatorRoundRequested, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LoadLatestRoundRequested")
+	}
+
 	var r0 offchainaggregator.OffchainAggregatorRoundRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (offchainaggregator.OffchainAggregatorRoundRequested, error)); ok {
@@ -43,6 +47,10 @@ func (_m *OCRContractTrackerDB) LoadLatestRoundRequested() (offchainaggregator.O
 func (_m *OCRContractTrackerDB) SaveLatestRoundRequested(tx pg.Queryer, rr offchainaggregator.OffchainAggregatorRoundRequested) error {
 	ret := _m.Called(tx, rr)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveLatestRoundRequested")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(pg.Queryer, offchainaggregator.OffchainAggregatorRoundRequested) error); ok {
 		r0 = rf(tx, rr)
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/mocks/registry.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/mocks/registry.go
index bc30ac781de..8c8ea721d73 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/mocks/registry.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/mocks/registry.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -25,6 +25,10 @@ type Registry struct {
 func (_m *Registry) GetActiveUpkeepIDs(opts *bind.CallOpts, startIndex *big.Int, maxCount *big.Int) ([]*big.Int, error) {
 	ret := _m.Called(opts, startIndex, maxCount)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetActiveUpkeepIDs")
+	}
+
 	var r0 []*big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int, *big.Int) ([]*big.Int, error)); ok {
@@ -51,6 +55,10 @@ func (_m *Registry) GetActiveUpkeepIDs(opts *bind.CallOpts, startIndex *big.Int,
 func (_m *Registry) GetState(opts *bind.CallOpts) (keeper_registry_wrapper2_0.GetState, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetState")
+	}
+
 	var r0 keeper_registry_wrapper2_0.GetState
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (keeper_registry_wrapper2_0.GetState, error)); ok {
@@ -75,6 +83,10 @@ func (_m *Registry) GetState(opts *bind.CallOpts) (keeper_registry_wrapper2_0.Ge
 func (_m *Registry) GetUpkeep(opts *bind.CallOpts, id *big.Int) (keeper_registry_wrapper2_0.UpkeepInfo, error) {
 	ret := _m.Called(opts, id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUpkeep")
+	}
+
 	var r0 keeper_registry_wrapper2_0.UpkeepInfo
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int) (keeper_registry_wrapper2_0.UpkeepInfo, error)); ok {
@@ -99,6 +111,10 @@ func (_m *Registry) GetUpkeep(opts *bind.CallOpts, id *big.Int) (keeper_registry
 func (_m *Registry) ParseLog(log types.Log) (generated.AbigenLog, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseLog")
+	}
+
 	var r0 generated.AbigenLog
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (generated.AbigenLog, error)); ok {
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/mocks/upkeep_state_reader.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/mocks/upkeep_state_reader.go
index b036fbb26c3..3167cf97aad 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/mocks/upkeep_state_reader.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/mocks/upkeep_state_reader.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -26,6 +26,10 @@ func (_m *UpkeepStateReader) SelectByWorkIDs(ctx context.Context, workIDs ...str
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SelectByWorkIDs")
+	}
+
 	var r0 []types.UpkeepState
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, ...string) ([]types.UpkeepState, error)); ok {
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mocks/http_client.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mocks/http_client.go
index 53d347b1c06..d6982e9dbdb 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mocks/http_client.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mocks/http_client.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type HttpClient struct {
 func (_m *HttpClient) Do(req *http.Request) (*http.Response, error) {
 	ret := _m.Called(req)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Do")
+	}
+
 	var r0 *http.Response
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*http.Request) (*http.Response, error)); ok {
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mocks/registry.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mocks/registry.go
index a3cbd772b1d..1bb4cb2a325 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mocks/registry.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mocks/registry.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -25,6 +25,10 @@ type Registry struct {
 func (_m *Registry) CheckCallback(opts *bind.CallOpts, id *big.Int, values [][]byte, extraData []byte) (i_keeper_registry_master_wrapper_2_1.CheckCallback, error) {
 	ret := _m.Called(opts, id, values, extraData)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CheckCallback")
+	}
+
 	var r0 i_keeper_registry_master_wrapper_2_1.CheckCallback
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int, [][]byte, []byte) (i_keeper_registry_master_wrapper_2_1.CheckCallback, error)); ok {
@@ -49,6 +53,10 @@ func (_m *Registry) CheckCallback(opts *bind.CallOpts, id *big.Int, values [][]b
 func (_m *Registry) GetActiveUpkeepIDs(opts *bind.CallOpts, startIndex *big.Int, maxCount *big.Int) ([]*big.Int, error) {
 	ret := _m.Called(opts, startIndex, maxCount)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetActiveUpkeepIDs")
+	}
+
 	var r0 []*big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int, *big.Int) ([]*big.Int, error)); ok {
@@ -75,6 +83,10 @@ func (_m *Registry) GetActiveUpkeepIDs(opts *bind.CallOpts, startIndex *big.Int,
 func (_m *Registry) GetState(opts *bind.CallOpts) (i_keeper_registry_master_wrapper_2_1.GetState, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetState")
+	}
+
 	var r0 i_keeper_registry_master_wrapper_2_1.GetState
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (i_keeper_registry_master_wrapper_2_1.GetState, error)); ok {
@@ -99,6 +111,10 @@ func (_m *Registry) GetState(opts *bind.CallOpts) (i_keeper_registry_master_wrap
 func (_m *Registry) GetUpkeep(opts *bind.CallOpts, id *big.Int) (i_keeper_registry_master_wrapper_2_1.KeeperRegistryBase21UpkeepInfo, error) {
 	ret := _m.Called(opts, id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUpkeep")
+	}
+
 	var r0 i_keeper_registry_master_wrapper_2_1.KeeperRegistryBase21UpkeepInfo
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int) (i_keeper_registry_master_wrapper_2_1.KeeperRegistryBase21UpkeepInfo, error)); ok {
@@ -123,6 +139,10 @@ func (_m *Registry) GetUpkeep(opts *bind.CallOpts, id *big.Int) (i_keeper_regist
 func (_m *Registry) GetUpkeepPrivilegeConfig(opts *bind.CallOpts, upkeepId *big.Int) ([]byte, error) {
 	ret := _m.Called(opts, upkeepId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUpkeepPrivilegeConfig")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int) ([]byte, error)); ok {
@@ -149,6 +169,10 @@ func (_m *Registry) GetUpkeepPrivilegeConfig(opts *bind.CallOpts, upkeepId *big.
 func (_m *Registry) GetUpkeepTriggerConfig(opts *bind.CallOpts, upkeepId *big.Int) ([]byte, error) {
 	ret := _m.Called(opts, upkeepId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUpkeepTriggerConfig")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int) ([]byte, error)); ok {
@@ -175,6 +199,10 @@ func (_m *Registry) GetUpkeepTriggerConfig(opts *bind.CallOpts, upkeepId *big.In
 func (_m *Registry) ParseLog(log types.Log) (generated.AbigenLog, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseLog")
+	}
+
 	var r0 generated.AbigenLog
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (generated.AbigenLog, error)); ok {
diff --git a/core/services/ocr2/plugins/ocr2vrf/coordinator/mocks/vrf_beacon.go b/core/services/ocr2/plugins/ocr2vrf/coordinator/mocks/vrf_beacon.go
index d3fe5c91195..57521566a71 100644
--- a/core/services/ocr2/plugins/ocr2vrf/coordinator/mocks/vrf_beacon.go
+++ b/core/services/ocr2/plugins/ocr2vrf/coordinator/mocks/vrf_beacon.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -28,6 +28,10 @@ type VRFBeaconInterface struct {
 func (_m *VRFBeaconInterface) AcceptOwnership(opts *bind.TransactOpts) (*types.Transaction, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AcceptOwnership")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts) (*types.Transaction, error)); ok {
@@ -54,6 +58,10 @@ func (_m *VRFBeaconInterface) AcceptOwnership(opts *bind.TransactOpts) (*types.T
 func (_m *VRFBeaconInterface) AcceptPayeeship(opts *bind.TransactOpts, transmitter common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, transmitter)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AcceptPayeeship")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -80,6 +88,10 @@ func (_m *VRFBeaconInterface) AcceptPayeeship(opts *bind.TransactOpts, transmitt
 func (_m *VRFBeaconInterface) Address() common.Address {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Address")
+	}
+
 	var r0 common.Address
 	if rf, ok := ret.Get(0).(func() common.Address); ok {
 		r0 = rf()
@@ -96,6 +108,10 @@ func (_m *VRFBeaconInterface) Address() common.Address {
 func (_m *VRFBeaconInterface) ExposeType(opts *bind.TransactOpts, arg0 vrf_beacon.VRFBeaconReportReport) (*types.Transaction, error) {
 	ret := _m.Called(opts, arg0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ExposeType")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, vrf_beacon.VRFBeaconReportReport) (*types.Transaction, error)); ok {
@@ -122,6 +138,10 @@ func (_m *VRFBeaconInterface) ExposeType(opts *bind.TransactOpts, arg0 vrf_beaco
 func (_m *VRFBeaconInterface) FilterBillingAccessControllerSet(opts *bind.FilterOpts) (*vrf_beacon.VRFBeaconBillingAccessControllerSetIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterBillingAccessControllerSet")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconBillingAccessControllerSetIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*vrf_beacon.VRFBeaconBillingAccessControllerSetIterator, error)); ok {
@@ -148,6 +168,10 @@ func (_m *VRFBeaconInterface) FilterBillingAccessControllerSet(opts *bind.Filter
 func (_m *VRFBeaconInterface) FilterBillingSet(opts *bind.FilterOpts) (*vrf_beacon.VRFBeaconBillingSetIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterBillingSet")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconBillingSetIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*vrf_beacon.VRFBeaconBillingSetIterator, error)); ok {
@@ -174,6 +198,10 @@ func (_m *VRFBeaconInterface) FilterBillingSet(opts *bind.FilterOpts) (*vrf_beac
 func (_m *VRFBeaconInterface) FilterConfigSet(opts *bind.FilterOpts) (*vrf_beacon.VRFBeaconConfigSetIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterConfigSet")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconConfigSetIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*vrf_beacon.VRFBeaconConfigSetIterator, error)); ok {
@@ -200,6 +228,10 @@ func (_m *VRFBeaconInterface) FilterConfigSet(opts *bind.FilterOpts) (*vrf_beaco
 func (_m *VRFBeaconInterface) FilterNewTransmission(opts *bind.FilterOpts, epochAndRound []*big.Int) (*vrf_beacon.VRFBeaconNewTransmissionIterator, error) {
 	ret := _m.Called(opts, epochAndRound)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterNewTransmission")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconNewTransmissionIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int) (*vrf_beacon.VRFBeaconNewTransmissionIterator, error)); ok {
@@ -226,6 +258,10 @@ func (_m *VRFBeaconInterface) FilterNewTransmission(opts *bind.FilterOpts, epoch
 func (_m *VRFBeaconInterface) FilterOraclePaid(opts *bind.FilterOpts, transmitter []common.Address, payee []common.Address, linkToken []common.Address) (*vrf_beacon.VRFBeaconOraclePaidIterator, error) {
 	ret := _m.Called(opts, transmitter, payee, linkToken)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOraclePaid")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconOraclePaidIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address, []common.Address) (*vrf_beacon.VRFBeaconOraclePaidIterator, error)); ok {
@@ -252,6 +288,10 @@ func (_m *VRFBeaconInterface) FilterOraclePaid(opts *bind.FilterOpts, transmitte
 func (_m *VRFBeaconInterface) FilterOutputsServed(opts *bind.FilterOpts) (*vrf_beacon.VRFBeaconOutputsServedIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOutputsServed")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconOutputsServedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*vrf_beacon.VRFBeaconOutputsServedIterator, error)); ok {
@@ -278,6 +318,10 @@ func (_m *VRFBeaconInterface) FilterOutputsServed(opts *bind.FilterOpts) (*vrf_b
 func (_m *VRFBeaconInterface) FilterOwnershipTransferRequested(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*vrf_beacon.VRFBeaconOwnershipTransferRequestedIterator, error) {
 	ret := _m.Called(opts, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOwnershipTransferRequested")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconOwnershipTransferRequestedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*vrf_beacon.VRFBeaconOwnershipTransferRequestedIterator, error)); ok {
@@ -304,6 +348,10 @@ func (_m *VRFBeaconInterface) FilterOwnershipTransferRequested(opts *bind.Filter
 func (_m *VRFBeaconInterface) FilterOwnershipTransferred(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*vrf_beacon.VRFBeaconOwnershipTransferredIterator, error) {
 	ret := _m.Called(opts, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOwnershipTransferred")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconOwnershipTransferredIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*vrf_beacon.VRFBeaconOwnershipTransferredIterator, error)); ok {
@@ -330,6 +378,10 @@ func (_m *VRFBeaconInterface) FilterOwnershipTransferred(opts *bind.FilterOpts,
 func (_m *VRFBeaconInterface) FilterPayeeshipTransferRequested(opts *bind.FilterOpts, transmitter []common.Address, current []common.Address, proposed []common.Address) (*vrf_beacon.VRFBeaconPayeeshipTransferRequestedIterator, error) {
 	ret := _m.Called(opts, transmitter, current, proposed)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterPayeeshipTransferRequested")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconPayeeshipTransferRequestedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address, []common.Address) (*vrf_beacon.VRFBeaconPayeeshipTransferRequestedIterator, error)); ok {
@@ -356,6 +408,10 @@ func (_m *VRFBeaconInterface) FilterPayeeshipTransferRequested(opts *bind.Filter
 func (_m *VRFBeaconInterface) FilterPayeeshipTransferred(opts *bind.FilterOpts, transmitter []common.Address, previous []common.Address, current []common.Address) (*vrf_beacon.VRFBeaconPayeeshipTransferredIterator, error) {
 	ret := _m.Called(opts, transmitter, previous, current)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterPayeeshipTransferred")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconPayeeshipTransferredIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address, []common.Address) (*vrf_beacon.VRFBeaconPayeeshipTransferredIterator, error)); ok {
@@ -382,6 +438,10 @@ func (_m *VRFBeaconInterface) FilterPayeeshipTransferred(opts *bind.FilterOpts,
 func (_m *VRFBeaconInterface) FilterRandomWordsFulfilled(opts *bind.FilterOpts) (*vrf_beacon.VRFBeaconRandomWordsFulfilledIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterRandomWordsFulfilled")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconRandomWordsFulfilledIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*vrf_beacon.VRFBeaconRandomWordsFulfilledIterator, error)); ok {
@@ -408,6 +468,10 @@ func (_m *VRFBeaconInterface) FilterRandomWordsFulfilled(opts *bind.FilterOpts)
 func (_m *VRFBeaconInterface) FilterRandomnessFulfillmentRequested(opts *bind.FilterOpts, requestID []*big.Int) (*vrf_beacon.VRFBeaconRandomnessFulfillmentRequestedIterator, error) {
 	ret := _m.Called(opts, requestID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterRandomnessFulfillmentRequested")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconRandomnessFulfillmentRequestedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int) (*vrf_beacon.VRFBeaconRandomnessFulfillmentRequestedIterator, error)); ok {
@@ -434,6 +498,10 @@ func (_m *VRFBeaconInterface) FilterRandomnessFulfillmentRequested(opts *bind.Fi
 func (_m *VRFBeaconInterface) FilterRandomnessRedeemed(opts *bind.FilterOpts, requestID []*big.Int, requester []common.Address) (*vrf_beacon.VRFBeaconRandomnessRedeemedIterator, error) {
 	ret := _m.Called(opts, requestID, requester)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterRandomnessRedeemed")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconRandomnessRedeemedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int, []common.Address) (*vrf_beacon.VRFBeaconRandomnessRedeemedIterator, error)); ok {
@@ -460,6 +528,10 @@ func (_m *VRFBeaconInterface) FilterRandomnessRedeemed(opts *bind.FilterOpts, re
 func (_m *VRFBeaconInterface) FilterRandomnessRequested(opts *bind.FilterOpts, requestID []*big.Int) (*vrf_beacon.VRFBeaconRandomnessRequestedIterator, error) {
 	ret := _m.Called(opts, requestID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterRandomnessRequested")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconRandomnessRequestedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int) (*vrf_beacon.VRFBeaconRandomnessRequestedIterator, error)); ok {
@@ -486,6 +558,10 @@ func (_m *VRFBeaconInterface) FilterRandomnessRequested(opts *bind.FilterOpts, r
 func (_m *VRFBeaconInterface) GetBilling(opts *bind.CallOpts) (vrf_beacon.GetBilling, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetBilling")
+	}
+
 	var r0 vrf_beacon.GetBilling
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (vrf_beacon.GetBilling, error)); ok {
@@ -510,6 +586,10 @@ func (_m *VRFBeaconInterface) GetBilling(opts *bind.CallOpts) (vrf_beacon.GetBil
 func (_m *VRFBeaconInterface) GetBillingAccessController(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetBillingAccessController")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -536,6 +616,10 @@ func (_m *VRFBeaconInterface) GetBillingAccessController(opts *bind.CallOpts) (c
 func (_m *VRFBeaconInterface) ICoordinator(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ICoordinator")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -562,6 +646,10 @@ func (_m *VRFBeaconInterface) ICoordinator(opts *bind.CallOpts) (common.Address,
 func (_m *VRFBeaconInterface) ILink(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ILink")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -588,6 +676,10 @@ func (_m *VRFBeaconInterface) ILink(opts *bind.CallOpts) (common.Address, error)
 func (_m *VRFBeaconInterface) KeyGenerated(opts *bind.TransactOpts, kd vrf_beacon.KeyDataStructKeyData) (*types.Transaction, error) {
 	ret := _m.Called(opts, kd)
 
+	if len(ret) == 0 {
+		panic("no return value specified for KeyGenerated")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, vrf_beacon.KeyDataStructKeyData) (*types.Transaction, error)); ok {
@@ -614,6 +706,10 @@ func (_m *VRFBeaconInterface) KeyGenerated(opts *bind.TransactOpts, kd vrf_beaco
 func (_m *VRFBeaconInterface) LatestConfigDetails(opts *bind.CallOpts) (vrf_beacon.LatestConfigDetails, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestConfigDetails")
+	}
+
 	var r0 vrf_beacon.LatestConfigDetails
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (vrf_beacon.LatestConfigDetails, error)); ok {
@@ -638,6 +734,10 @@ func (_m *VRFBeaconInterface) LatestConfigDetails(opts *bind.CallOpts) (vrf_beac
 func (_m *VRFBeaconInterface) LatestConfigDigestAndEpoch(opts *bind.CallOpts) (vrf_beacon.LatestConfigDigestAndEpoch, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestConfigDigestAndEpoch")
+	}
+
 	var r0 vrf_beacon.LatestConfigDigestAndEpoch
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (vrf_beacon.LatestConfigDigestAndEpoch, error)); ok {
@@ -662,6 +762,10 @@ func (_m *VRFBeaconInterface) LatestConfigDigestAndEpoch(opts *bind.CallOpts) (v
 func (_m *VRFBeaconInterface) LinkAvailableForPayment(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LinkAvailableForPayment")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -688,6 +792,10 @@ func (_m *VRFBeaconInterface) LinkAvailableForPayment(opts *bind.CallOpts) (*big
 func (_m *VRFBeaconInterface) NUMCONFDELAYS(opts *bind.CallOpts) (uint8, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for NUMCONFDELAYS")
+	}
+
 	var r0 uint8
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint8, error)); ok {
@@ -712,6 +820,10 @@ func (_m *VRFBeaconInterface) NUMCONFDELAYS(opts *bind.CallOpts) (uint8, error)
 func (_m *VRFBeaconInterface) NewKeyRequested(opts *bind.TransactOpts) (*types.Transaction, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for NewKeyRequested")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts) (*types.Transaction, error)); ok {
@@ -738,6 +850,10 @@ func (_m *VRFBeaconInterface) NewKeyRequested(opts *bind.TransactOpts) (*types.T
 func (_m *VRFBeaconInterface) OwedPayment(opts *bind.CallOpts, transmitterAddress common.Address) (*big.Int, error) {
 	ret := _m.Called(opts, transmitterAddress)
 
+	if len(ret) == 0 {
+		panic("no return value specified for OwedPayment")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, common.Address) (*big.Int, error)); ok {
@@ -764,6 +880,10 @@ func (_m *VRFBeaconInterface) OwedPayment(opts *bind.CallOpts, transmitterAddres
 func (_m *VRFBeaconInterface) Owner(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Owner")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -790,6 +910,10 @@ func (_m *VRFBeaconInterface) Owner(opts *bind.CallOpts) (common.Address, error)
 func (_m *VRFBeaconInterface) ParseBillingAccessControllerSet(log types.Log) (*vrf_beacon.VRFBeaconBillingAccessControllerSet, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseBillingAccessControllerSet")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconBillingAccessControllerSet
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_beacon.VRFBeaconBillingAccessControllerSet, error)); ok {
@@ -816,6 +940,10 @@ func (_m *VRFBeaconInterface) ParseBillingAccessControllerSet(log types.Log) (*v
 func (_m *VRFBeaconInterface) ParseBillingSet(log types.Log) (*vrf_beacon.VRFBeaconBillingSet, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseBillingSet")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconBillingSet
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_beacon.VRFBeaconBillingSet, error)); ok {
@@ -842,6 +970,10 @@ func (_m *VRFBeaconInterface) ParseBillingSet(log types.Log) (*vrf_beacon.VRFBea
 func (_m *VRFBeaconInterface) ParseConfigSet(log types.Log) (*vrf_beacon.VRFBeaconConfigSet, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseConfigSet")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconConfigSet
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_beacon.VRFBeaconConfigSet, error)); ok {
@@ -868,6 +1000,10 @@ func (_m *VRFBeaconInterface) ParseConfigSet(log types.Log) (*vrf_beacon.VRFBeac
 func (_m *VRFBeaconInterface) ParseLog(log types.Log) (generated.AbigenLog, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseLog")
+	}
+
 	var r0 generated.AbigenLog
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (generated.AbigenLog, error)); ok {
@@ -894,6 +1030,10 @@ func (_m *VRFBeaconInterface) ParseLog(log types.Log) (generated.AbigenLog, erro
 func (_m *VRFBeaconInterface) ParseNewTransmission(log types.Log) (*vrf_beacon.VRFBeaconNewTransmission, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseNewTransmission")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconNewTransmission
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_beacon.VRFBeaconNewTransmission, error)); ok {
@@ -920,6 +1060,10 @@ func (_m *VRFBeaconInterface) ParseNewTransmission(log types.Log) (*vrf_beacon.V
 func (_m *VRFBeaconInterface) ParseOraclePaid(log types.Log) (*vrf_beacon.VRFBeaconOraclePaid, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOraclePaid")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconOraclePaid
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_beacon.VRFBeaconOraclePaid, error)); ok {
@@ -946,6 +1090,10 @@ func (_m *VRFBeaconInterface) ParseOraclePaid(log types.Log) (*vrf_beacon.VRFBea
 func (_m *VRFBeaconInterface) ParseOutputsServed(log types.Log) (*vrf_beacon.VRFBeaconOutputsServed, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOutputsServed")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconOutputsServed
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_beacon.VRFBeaconOutputsServed, error)); ok {
@@ -972,6 +1120,10 @@ func (_m *VRFBeaconInterface) ParseOutputsServed(log types.Log) (*vrf_beacon.VRF
 func (_m *VRFBeaconInterface) ParseOwnershipTransferRequested(log types.Log) (*vrf_beacon.VRFBeaconOwnershipTransferRequested, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOwnershipTransferRequested")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconOwnershipTransferRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_beacon.VRFBeaconOwnershipTransferRequested, error)); ok {
@@ -998,6 +1150,10 @@ func (_m *VRFBeaconInterface) ParseOwnershipTransferRequested(log types.Log) (*v
 func (_m *VRFBeaconInterface) ParseOwnershipTransferred(log types.Log) (*vrf_beacon.VRFBeaconOwnershipTransferred, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOwnershipTransferred")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconOwnershipTransferred
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_beacon.VRFBeaconOwnershipTransferred, error)); ok {
@@ -1024,6 +1180,10 @@ func (_m *VRFBeaconInterface) ParseOwnershipTransferred(log types.Log) (*vrf_bea
 func (_m *VRFBeaconInterface) ParsePayeeshipTransferRequested(log types.Log) (*vrf_beacon.VRFBeaconPayeeshipTransferRequested, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParsePayeeshipTransferRequested")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconPayeeshipTransferRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_beacon.VRFBeaconPayeeshipTransferRequested, error)); ok {
@@ -1050,6 +1210,10 @@ func (_m *VRFBeaconInterface) ParsePayeeshipTransferRequested(log types.Log) (*v
 func (_m *VRFBeaconInterface) ParsePayeeshipTransferred(log types.Log) (*vrf_beacon.VRFBeaconPayeeshipTransferred, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParsePayeeshipTransferred")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconPayeeshipTransferred
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_beacon.VRFBeaconPayeeshipTransferred, error)); ok {
@@ -1076,6 +1240,10 @@ func (_m *VRFBeaconInterface) ParsePayeeshipTransferred(log types.Log) (*vrf_bea
 func (_m *VRFBeaconInterface) ParseRandomWordsFulfilled(log types.Log) (*vrf_beacon.VRFBeaconRandomWordsFulfilled, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseRandomWordsFulfilled")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconRandomWordsFulfilled
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_beacon.VRFBeaconRandomWordsFulfilled, error)); ok {
@@ -1102,6 +1270,10 @@ func (_m *VRFBeaconInterface) ParseRandomWordsFulfilled(log types.Log) (*vrf_bea
 func (_m *VRFBeaconInterface) ParseRandomnessFulfillmentRequested(log types.Log) (*vrf_beacon.VRFBeaconRandomnessFulfillmentRequested, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseRandomnessFulfillmentRequested")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconRandomnessFulfillmentRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_beacon.VRFBeaconRandomnessFulfillmentRequested, error)); ok {
@@ -1128,6 +1300,10 @@ func (_m *VRFBeaconInterface) ParseRandomnessFulfillmentRequested(log types.Log)
 func (_m *VRFBeaconInterface) ParseRandomnessRedeemed(log types.Log) (*vrf_beacon.VRFBeaconRandomnessRedeemed, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseRandomnessRedeemed")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconRandomnessRedeemed
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_beacon.VRFBeaconRandomnessRedeemed, error)); ok {
@@ -1154,6 +1330,10 @@ func (_m *VRFBeaconInterface) ParseRandomnessRedeemed(log types.Log) (*vrf_beaco
 func (_m *VRFBeaconInterface) ParseRandomnessRequested(log types.Log) (*vrf_beacon.VRFBeaconRandomnessRequested, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseRandomnessRequested")
+	}
+
 	var r0 *vrf_beacon.VRFBeaconRandomnessRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_beacon.VRFBeaconRandomnessRequested, error)); ok {
@@ -1180,6 +1360,10 @@ func (_m *VRFBeaconInterface) ParseRandomnessRequested(log types.Log) (*vrf_beac
 func (_m *VRFBeaconInterface) SKeyID(opts *bind.CallOpts) ([32]byte, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SKeyID")
+	}
+
 	var r0 [32]byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) ([32]byte, error)); ok {
@@ -1206,6 +1390,10 @@ func (_m *VRFBeaconInterface) SKeyID(opts *bind.CallOpts) ([32]byte, error) {
 func (_m *VRFBeaconInterface) SKeyProvider(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SKeyProvider")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -1232,6 +1420,10 @@ func (_m *VRFBeaconInterface) SKeyProvider(opts *bind.CallOpts) (common.Address,
 func (_m *VRFBeaconInterface) SProvingKeyHash(opts *bind.CallOpts) ([32]byte, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SProvingKeyHash")
+	}
+
 	var r0 [32]byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) ([32]byte, error)); ok {
@@ -1258,6 +1450,10 @@ func (_m *VRFBeaconInterface) SProvingKeyHash(opts *bind.CallOpts) ([32]byte, er
 func (_m *VRFBeaconInterface) SetBilling(opts *bind.TransactOpts, maximumGasPrice uint64, reasonableGasPrice uint64, observationPayment uint64, transmissionPayment uint64, accountingGas *big.Int) (*types.Transaction, error) {
 	ret := _m.Called(opts, maximumGasPrice, reasonableGasPrice, observationPayment, transmissionPayment, accountingGas)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetBilling")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, uint64, uint64, uint64, uint64, *big.Int) (*types.Transaction, error)); ok {
@@ -1284,6 +1480,10 @@ func (_m *VRFBeaconInterface) SetBilling(opts *bind.TransactOpts, maximumGasPric
 func (_m *VRFBeaconInterface) SetBillingAccessController(opts *bind.TransactOpts, _billingAccessController common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, _billingAccessController)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetBillingAccessController")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -1310,6 +1510,10 @@ func (_m *VRFBeaconInterface) SetBillingAccessController(opts *bind.TransactOpts
 func (_m *VRFBeaconInterface) SetConfig(opts *bind.TransactOpts, signers []common.Address, transmitters []common.Address, f uint8, onchainConfig []byte, offchainConfigVersion uint64, offchainConfig []byte) (*types.Transaction, error) {
 	ret := _m.Called(opts, signers, transmitters, f, onchainConfig, offchainConfigVersion, offchainConfig)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetConfig")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []common.Address, []common.Address, uint8, []byte, uint64, []byte) (*types.Transaction, error)); ok {
@@ -1336,6 +1540,10 @@ func (_m *VRFBeaconInterface) SetConfig(opts *bind.TransactOpts, signers []commo
 func (_m *VRFBeaconInterface) SetPayees(opts *bind.TransactOpts, transmitters []common.Address, payees []common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, transmitters, payees)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetPayees")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []common.Address, []common.Address) (*types.Transaction, error)); ok {
@@ -1362,6 +1570,10 @@ func (_m *VRFBeaconInterface) SetPayees(opts *bind.TransactOpts, transmitters []
 func (_m *VRFBeaconInterface) TransferOwnership(opts *bind.TransactOpts, to common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransferOwnership")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -1388,6 +1600,10 @@ func (_m *VRFBeaconInterface) TransferOwnership(opts *bind.TransactOpts, to comm
 func (_m *VRFBeaconInterface) TransferPayeeship(opts *bind.TransactOpts, transmitter common.Address, proposed common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, transmitter, proposed)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransferPayeeship")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address, common.Address) (*types.Transaction, error)); ok {
@@ -1414,6 +1630,10 @@ func (_m *VRFBeaconInterface) TransferPayeeship(opts *bind.TransactOpts, transmi
 func (_m *VRFBeaconInterface) Transmit(opts *bind.TransactOpts, reportContext [3][32]byte, report []byte, rs [][32]byte, ss [][32]byte, rawVs [32]byte) (*types.Transaction, error) {
 	ret := _m.Called(opts, reportContext, report, rs, ss, rawVs)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Transmit")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, [3][32]byte, []byte, [][32]byte, [][32]byte, [32]byte) (*types.Transaction, error)); ok {
@@ -1440,6 +1660,10 @@ func (_m *VRFBeaconInterface) Transmit(opts *bind.TransactOpts, reportContext [3
 func (_m *VRFBeaconInterface) TypeAndVersion(opts *bind.CallOpts) (string, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TypeAndVersion")
+	}
+
 	var r0 string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (string, error)); ok {
@@ -1464,6 +1688,10 @@ func (_m *VRFBeaconInterface) TypeAndVersion(opts *bind.CallOpts) (string, error
 func (_m *VRFBeaconInterface) WatchBillingAccessControllerSet(opts *bind.WatchOpts, sink chan<- *vrf_beacon.VRFBeaconBillingAccessControllerSet) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchBillingAccessControllerSet")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_beacon.VRFBeaconBillingAccessControllerSet) (event.Subscription, error)); ok {
@@ -1490,6 +1718,10 @@ func (_m *VRFBeaconInterface) WatchBillingAccessControllerSet(opts *bind.WatchOp
 func (_m *VRFBeaconInterface) WatchBillingSet(opts *bind.WatchOpts, sink chan<- *vrf_beacon.VRFBeaconBillingSet) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchBillingSet")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_beacon.VRFBeaconBillingSet) (event.Subscription, error)); ok {
@@ -1516,6 +1748,10 @@ func (_m *VRFBeaconInterface) WatchBillingSet(opts *bind.WatchOpts, sink chan<-
 func (_m *VRFBeaconInterface) WatchConfigSet(opts *bind.WatchOpts, sink chan<- *vrf_beacon.VRFBeaconConfigSet) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchConfigSet")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_beacon.VRFBeaconConfigSet) (event.Subscription, error)); ok {
@@ -1542,6 +1778,10 @@ func (_m *VRFBeaconInterface) WatchConfigSet(opts *bind.WatchOpts, sink chan<- *
 func (_m *VRFBeaconInterface) WatchNewTransmission(opts *bind.WatchOpts, sink chan<- *vrf_beacon.VRFBeaconNewTransmission, epochAndRound []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, epochAndRound)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchNewTransmission")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_beacon.VRFBeaconNewTransmission, []*big.Int) (event.Subscription, error)); ok {
@@ -1568,6 +1808,10 @@ func (_m *VRFBeaconInterface) WatchNewTransmission(opts *bind.WatchOpts, sink ch
 func (_m *VRFBeaconInterface) WatchOraclePaid(opts *bind.WatchOpts, sink chan<- *vrf_beacon.VRFBeaconOraclePaid, transmitter []common.Address, payee []common.Address, linkToken []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, transmitter, payee, linkToken)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOraclePaid")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_beacon.VRFBeaconOraclePaid, []common.Address, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -1594,6 +1838,10 @@ func (_m *VRFBeaconInterface) WatchOraclePaid(opts *bind.WatchOpts, sink chan<-
 func (_m *VRFBeaconInterface) WatchOutputsServed(opts *bind.WatchOpts, sink chan<- *vrf_beacon.VRFBeaconOutputsServed) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOutputsServed")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_beacon.VRFBeaconOutputsServed) (event.Subscription, error)); ok {
@@ -1620,6 +1868,10 @@ func (_m *VRFBeaconInterface) WatchOutputsServed(opts *bind.WatchOpts, sink chan
 func (_m *VRFBeaconInterface) WatchOwnershipTransferRequested(opts *bind.WatchOpts, sink chan<- *vrf_beacon.VRFBeaconOwnershipTransferRequested, from []common.Address, to []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOwnershipTransferRequested")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_beacon.VRFBeaconOwnershipTransferRequested, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -1646,6 +1898,10 @@ func (_m *VRFBeaconInterface) WatchOwnershipTransferRequested(opts *bind.WatchOp
 func (_m *VRFBeaconInterface) WatchOwnershipTransferred(opts *bind.WatchOpts, sink chan<- *vrf_beacon.VRFBeaconOwnershipTransferred, from []common.Address, to []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOwnershipTransferred")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_beacon.VRFBeaconOwnershipTransferred, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -1672,6 +1928,10 @@ func (_m *VRFBeaconInterface) WatchOwnershipTransferred(opts *bind.WatchOpts, si
 func (_m *VRFBeaconInterface) WatchPayeeshipTransferRequested(opts *bind.WatchOpts, sink chan<- *vrf_beacon.VRFBeaconPayeeshipTransferRequested, transmitter []common.Address, current []common.Address, proposed []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, transmitter, current, proposed)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchPayeeshipTransferRequested")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_beacon.VRFBeaconPayeeshipTransferRequested, []common.Address, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -1698,6 +1958,10 @@ func (_m *VRFBeaconInterface) WatchPayeeshipTransferRequested(opts *bind.WatchOp
 func (_m *VRFBeaconInterface) WatchPayeeshipTransferred(opts *bind.WatchOpts, sink chan<- *vrf_beacon.VRFBeaconPayeeshipTransferred, transmitter []common.Address, previous []common.Address, current []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, transmitter, previous, current)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchPayeeshipTransferred")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_beacon.VRFBeaconPayeeshipTransferred, []common.Address, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -1724,6 +1988,10 @@ func (_m *VRFBeaconInterface) WatchPayeeshipTransferred(opts *bind.WatchOpts, si
 func (_m *VRFBeaconInterface) WatchRandomWordsFulfilled(opts *bind.WatchOpts, sink chan<- *vrf_beacon.VRFBeaconRandomWordsFulfilled) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchRandomWordsFulfilled")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_beacon.VRFBeaconRandomWordsFulfilled) (event.Subscription, error)); ok {
@@ -1750,6 +2018,10 @@ func (_m *VRFBeaconInterface) WatchRandomWordsFulfilled(opts *bind.WatchOpts, si
 func (_m *VRFBeaconInterface) WatchRandomnessFulfillmentRequested(opts *bind.WatchOpts, sink chan<- *vrf_beacon.VRFBeaconRandomnessFulfillmentRequested, requestID []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, requestID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchRandomnessFulfillmentRequested")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_beacon.VRFBeaconRandomnessFulfillmentRequested, []*big.Int) (event.Subscription, error)); ok {
@@ -1776,6 +2048,10 @@ func (_m *VRFBeaconInterface) WatchRandomnessFulfillmentRequested(opts *bind.Wat
 func (_m *VRFBeaconInterface) WatchRandomnessRedeemed(opts *bind.WatchOpts, sink chan<- *vrf_beacon.VRFBeaconRandomnessRedeemed, requestID []*big.Int, requester []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, requestID, requester)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchRandomnessRedeemed")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_beacon.VRFBeaconRandomnessRedeemed, []*big.Int, []common.Address) (event.Subscription, error)); ok {
@@ -1802,6 +2078,10 @@ func (_m *VRFBeaconInterface) WatchRandomnessRedeemed(opts *bind.WatchOpts, sink
 func (_m *VRFBeaconInterface) WatchRandomnessRequested(opts *bind.WatchOpts, sink chan<- *vrf_beacon.VRFBeaconRandomnessRequested, requestID []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, requestID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchRandomnessRequested")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_beacon.VRFBeaconRandomnessRequested, []*big.Int) (event.Subscription, error)); ok {
@@ -1828,6 +2108,10 @@ func (_m *VRFBeaconInterface) WatchRandomnessRequested(opts *bind.WatchOpts, sin
 func (_m *VRFBeaconInterface) WithdrawFunds(opts *bind.TransactOpts, recipient common.Address, amount *big.Int) (*types.Transaction, error) {
 	ret := _m.Called(opts, recipient, amount)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WithdrawFunds")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address, *big.Int) (*types.Transaction, error)); ok {
@@ -1854,6 +2138,10 @@ func (_m *VRFBeaconInterface) WithdrawFunds(opts *bind.TransactOpts, recipient c
 func (_m *VRFBeaconInterface) WithdrawPayment(opts *bind.TransactOpts, transmitter common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, transmitter)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WithdrawPayment")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
diff --git a/core/services/ocr2/plugins/ocr2vrf/coordinator/mocks/vrf_beacon_coordinator.go b/core/services/ocr2/plugins/ocr2vrf/coordinator/mocks/vrf_beacon_coordinator.go
index 835702d136a..c0f85d67e06 100644
--- a/core/services/ocr2/plugins/ocr2vrf/coordinator/mocks/vrf_beacon_coordinator.go
+++ b/core/services/ocr2/plugins/ocr2vrf/coordinator/mocks/vrf_beacon_coordinator.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -23,6 +23,10 @@ type VRFBeaconCoordinator struct {
 func (_m *VRFBeaconCoordinator) GetConfirmationDelays(opts *bind.CallOpts) ([8]*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetConfirmationDelays")
+	}
+
 	var r0 [8]*big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) ([8]*big.Int, error)); ok {
@@ -49,6 +53,10 @@ func (_m *VRFBeaconCoordinator) GetConfirmationDelays(opts *bind.CallOpts) ([8]*
 func (_m *VRFBeaconCoordinator) IBeaconPeriodBlocks(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IBeaconPeriodBlocks")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -75,6 +83,10 @@ func (_m *VRFBeaconCoordinator) IBeaconPeriodBlocks(opts *bind.CallOpts) (*big.I
 func (_m *VRFBeaconCoordinator) ParseLog(log types.Log) (generated.AbigenLog, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseLog")
+	}
+
 	var r0 generated.AbigenLog
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (generated.AbigenLog, error)); ok {
@@ -101,6 +113,10 @@ func (_m *VRFBeaconCoordinator) ParseLog(log types.Log) (generated.AbigenLog, er
 func (_m *VRFBeaconCoordinator) SKeyID(opts *bind.CallOpts) ([32]byte, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SKeyID")
+	}
+
 	var r0 [32]byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) ([32]byte, error)); ok {
@@ -127,6 +143,10 @@ func (_m *VRFBeaconCoordinator) SKeyID(opts *bind.CallOpts) ([32]byte, error) {
 func (_m *VRFBeaconCoordinator) SProvingKeyHash(opts *bind.CallOpts) ([32]byte, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SProvingKeyHash")
+	}
+
 	var r0 [32]byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) ([32]byte, error)); ok {
diff --git a/core/services/ocr2/plugins/ocr2vrf/coordinator/mocks/vrf_coordinator.go b/core/services/ocr2/plugins/ocr2vrf/coordinator/mocks/vrf_coordinator.go
index d5e373f4bca..4b2155bb4e2 100644
--- a/core/services/ocr2/plugins/ocr2vrf/coordinator/mocks/vrf_coordinator.go
+++ b/core/services/ocr2/plugins/ocr2vrf/coordinator/mocks/vrf_coordinator.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -28,6 +28,10 @@ type VRFCoordinatorInterface struct {
 func (_m *VRFCoordinatorInterface) AcceptOwnership(opts *bind.TransactOpts) (*types.Transaction, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AcceptOwnership")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts) (*types.Transaction, error)); ok {
@@ -54,6 +58,10 @@ func (_m *VRFCoordinatorInterface) AcceptOwnership(opts *bind.TransactOpts) (*ty
 func (_m *VRFCoordinatorInterface) AcceptSubscriptionOwnerTransfer(opts *bind.TransactOpts, subId *big.Int) (*types.Transaction, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AcceptSubscriptionOwnerTransfer")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, *big.Int) (*types.Transaction, error)); ok {
@@ -80,6 +88,10 @@ func (_m *VRFCoordinatorInterface) AcceptSubscriptionOwnerTransfer(opts *bind.Tr
 func (_m *VRFCoordinatorInterface) AddConsumer(opts *bind.TransactOpts, subId *big.Int, consumer common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, subId, consumer)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AddConsumer")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, *big.Int, common.Address) (*types.Transaction, error)); ok {
@@ -106,6 +118,10 @@ func (_m *VRFCoordinatorInterface) AddConsumer(opts *bind.TransactOpts, subId *b
 func (_m *VRFCoordinatorInterface) Address() common.Address {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Address")
+	}
+
 	var r0 common.Address
 	if rf, ok := ret.Get(0).(func() common.Address); ok {
 		r0 = rf()
@@ -122,6 +138,10 @@ func (_m *VRFCoordinatorInterface) Address() common.Address {
 func (_m *VRFCoordinatorInterface) BatchTransferLink(opts *bind.TransactOpts, recipients []common.Address, paymentsInJuels []*big.Int) (*types.Transaction, error) {
 	ret := _m.Called(opts, recipients, paymentsInJuels)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BatchTransferLink")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []common.Address, []*big.Int) (*types.Transaction, error)); ok {
@@ -148,6 +168,10 @@ func (_m *VRFCoordinatorInterface) BatchTransferLink(opts *bind.TransactOpts, re
 func (_m *VRFCoordinatorInterface) CancelSubscription(opts *bind.TransactOpts, subId *big.Int, to common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, subId, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CancelSubscription")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, *big.Int, common.Address) (*types.Transaction, error)); ok {
@@ -174,6 +198,10 @@ func (_m *VRFCoordinatorInterface) CancelSubscription(opts *bind.TransactOpts, s
 func (_m *VRFCoordinatorInterface) CreateSubscription(opts *bind.TransactOpts) (*types.Transaction, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateSubscription")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts) (*types.Transaction, error)); ok {
@@ -200,6 +228,10 @@ func (_m *VRFCoordinatorInterface) CreateSubscription(opts *bind.TransactOpts) (
 func (_m *VRFCoordinatorInterface) DeregisterMigratableCoordinator(opts *bind.TransactOpts, target common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, target)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeregisterMigratableCoordinator")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -226,6 +258,10 @@ func (_m *VRFCoordinatorInterface) DeregisterMigratableCoordinator(opts *bind.Tr
 func (_m *VRFCoordinatorInterface) FilterCallbackConfigSet(opts *bind.FilterOpts) (*vrf_coordinator.VRFCoordinatorCallbackConfigSetIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterCallbackConfigSet")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorCallbackConfigSetIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*vrf_coordinator.VRFCoordinatorCallbackConfigSetIterator, error)); ok {
@@ -252,6 +288,10 @@ func (_m *VRFCoordinatorInterface) FilterCallbackConfigSet(opts *bind.FilterOpts
 func (_m *VRFCoordinatorInterface) FilterCoordinatorConfigSet(opts *bind.FilterOpts) (*vrf_coordinator.VRFCoordinatorCoordinatorConfigSetIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterCoordinatorConfigSet")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorCoordinatorConfigSetIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*vrf_coordinator.VRFCoordinatorCoordinatorConfigSetIterator, error)); ok {
@@ -278,6 +318,10 @@ func (_m *VRFCoordinatorInterface) FilterCoordinatorConfigSet(opts *bind.FilterO
 func (_m *VRFCoordinatorInterface) FilterCoordinatorDeregistered(opts *bind.FilterOpts) (*vrf_coordinator.VRFCoordinatorCoordinatorDeregisteredIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterCoordinatorDeregistered")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorCoordinatorDeregisteredIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*vrf_coordinator.VRFCoordinatorCoordinatorDeregisteredIterator, error)); ok {
@@ -304,6 +348,10 @@ func (_m *VRFCoordinatorInterface) FilterCoordinatorDeregistered(opts *bind.Filt
 func (_m *VRFCoordinatorInterface) FilterCoordinatorRegistered(opts *bind.FilterOpts) (*vrf_coordinator.VRFCoordinatorCoordinatorRegisteredIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterCoordinatorRegistered")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorCoordinatorRegisteredIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*vrf_coordinator.VRFCoordinatorCoordinatorRegisteredIterator, error)); ok {
@@ -330,6 +378,10 @@ func (_m *VRFCoordinatorInterface) FilterCoordinatorRegistered(opts *bind.Filter
 func (_m *VRFCoordinatorInterface) FilterMigrationCompleted(opts *bind.FilterOpts, newVersion []uint8, subID []*big.Int) (*vrf_coordinator.VRFCoordinatorMigrationCompletedIterator, error) {
 	ret := _m.Called(opts, newVersion, subID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterMigrationCompleted")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorMigrationCompletedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint8, []*big.Int) (*vrf_coordinator.VRFCoordinatorMigrationCompletedIterator, error)); ok {
@@ -356,6 +408,10 @@ func (_m *VRFCoordinatorInterface) FilterMigrationCompleted(opts *bind.FilterOpt
 func (_m *VRFCoordinatorInterface) FilterOutputsServed(opts *bind.FilterOpts) (*vrf_coordinator.VRFCoordinatorOutputsServedIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOutputsServed")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorOutputsServedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*vrf_coordinator.VRFCoordinatorOutputsServedIterator, error)); ok {
@@ -382,6 +438,10 @@ func (_m *VRFCoordinatorInterface) FilterOutputsServed(opts *bind.FilterOpts) (*
 func (_m *VRFCoordinatorInterface) FilterOwnershipTransferRequested(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*vrf_coordinator.VRFCoordinatorOwnershipTransferRequestedIterator, error) {
 	ret := _m.Called(opts, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOwnershipTransferRequested")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorOwnershipTransferRequestedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*vrf_coordinator.VRFCoordinatorOwnershipTransferRequestedIterator, error)); ok {
@@ -408,6 +468,10 @@ func (_m *VRFCoordinatorInterface) FilterOwnershipTransferRequested(opts *bind.F
 func (_m *VRFCoordinatorInterface) FilterOwnershipTransferred(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*vrf_coordinator.VRFCoordinatorOwnershipTransferredIterator, error) {
 	ret := _m.Called(opts, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOwnershipTransferred")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorOwnershipTransferredIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*vrf_coordinator.VRFCoordinatorOwnershipTransferredIterator, error)); ok {
@@ -434,6 +498,10 @@ func (_m *VRFCoordinatorInterface) FilterOwnershipTransferred(opts *bind.FilterO
 func (_m *VRFCoordinatorInterface) FilterPauseFlagChanged(opts *bind.FilterOpts) (*vrf_coordinator.VRFCoordinatorPauseFlagChangedIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterPauseFlagChanged")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorPauseFlagChangedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*vrf_coordinator.VRFCoordinatorPauseFlagChangedIterator, error)); ok {
@@ -460,6 +528,10 @@ func (_m *VRFCoordinatorInterface) FilterPauseFlagChanged(opts *bind.FilterOpts)
 func (_m *VRFCoordinatorInterface) FilterRandomWordsFulfilled(opts *bind.FilterOpts) (*vrf_coordinator.VRFCoordinatorRandomWordsFulfilledIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterRandomWordsFulfilled")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorRandomWordsFulfilledIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*vrf_coordinator.VRFCoordinatorRandomWordsFulfilledIterator, error)); ok {
@@ -486,6 +558,10 @@ func (_m *VRFCoordinatorInterface) FilterRandomWordsFulfilled(opts *bind.FilterO
 func (_m *VRFCoordinatorInterface) FilterRandomnessFulfillmentRequested(opts *bind.FilterOpts, requestID []*big.Int) (*vrf_coordinator.VRFCoordinatorRandomnessFulfillmentRequestedIterator, error) {
 	ret := _m.Called(opts, requestID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterRandomnessFulfillmentRequested")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorRandomnessFulfillmentRequestedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int) (*vrf_coordinator.VRFCoordinatorRandomnessFulfillmentRequestedIterator, error)); ok {
@@ -512,6 +588,10 @@ func (_m *VRFCoordinatorInterface) FilterRandomnessFulfillmentRequested(opts *bi
 func (_m *VRFCoordinatorInterface) FilterRandomnessRedeemed(opts *bind.FilterOpts, requestID []*big.Int, requester []common.Address) (*vrf_coordinator.VRFCoordinatorRandomnessRedeemedIterator, error) {
 	ret := _m.Called(opts, requestID, requester)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterRandomnessRedeemed")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorRandomnessRedeemedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int, []common.Address) (*vrf_coordinator.VRFCoordinatorRandomnessRedeemedIterator, error)); ok {
@@ -538,6 +618,10 @@ func (_m *VRFCoordinatorInterface) FilterRandomnessRedeemed(opts *bind.FilterOpt
 func (_m *VRFCoordinatorInterface) FilterRandomnessRequested(opts *bind.FilterOpts, requestID []*big.Int) (*vrf_coordinator.VRFCoordinatorRandomnessRequestedIterator, error) {
 	ret := _m.Called(opts, requestID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterRandomnessRequested")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorRandomnessRequestedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int) (*vrf_coordinator.VRFCoordinatorRandomnessRequestedIterator, error)); ok {
@@ -564,6 +648,10 @@ func (_m *VRFCoordinatorInterface) FilterRandomnessRequested(opts *bind.FilterOp
 func (_m *VRFCoordinatorInterface) FilterSubscriptionCanceled(opts *bind.FilterOpts, subId []*big.Int) (*vrf_coordinator.VRFCoordinatorSubscriptionCanceledIterator, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubscriptionCanceled")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorSubscriptionCanceledIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int) (*vrf_coordinator.VRFCoordinatorSubscriptionCanceledIterator, error)); ok {
@@ -590,6 +678,10 @@ func (_m *VRFCoordinatorInterface) FilterSubscriptionCanceled(opts *bind.FilterO
 func (_m *VRFCoordinatorInterface) FilterSubscriptionConsumerAdded(opts *bind.FilterOpts, subId []*big.Int) (*vrf_coordinator.VRFCoordinatorSubscriptionConsumerAddedIterator, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubscriptionConsumerAdded")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorSubscriptionConsumerAddedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int) (*vrf_coordinator.VRFCoordinatorSubscriptionConsumerAddedIterator, error)); ok {
@@ -616,6 +708,10 @@ func (_m *VRFCoordinatorInterface) FilterSubscriptionConsumerAdded(opts *bind.Fi
 func (_m *VRFCoordinatorInterface) FilterSubscriptionConsumerRemoved(opts *bind.FilterOpts, subId []*big.Int) (*vrf_coordinator.VRFCoordinatorSubscriptionConsumerRemovedIterator, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubscriptionConsumerRemoved")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorSubscriptionConsumerRemovedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int) (*vrf_coordinator.VRFCoordinatorSubscriptionConsumerRemovedIterator, error)); ok {
@@ -642,6 +738,10 @@ func (_m *VRFCoordinatorInterface) FilterSubscriptionConsumerRemoved(opts *bind.
 func (_m *VRFCoordinatorInterface) FilterSubscriptionCreated(opts *bind.FilterOpts, subId []*big.Int, owner []common.Address) (*vrf_coordinator.VRFCoordinatorSubscriptionCreatedIterator, error) {
 	ret := _m.Called(opts, subId, owner)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubscriptionCreated")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorSubscriptionCreatedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int, []common.Address) (*vrf_coordinator.VRFCoordinatorSubscriptionCreatedIterator, error)); ok {
@@ -668,6 +768,10 @@ func (_m *VRFCoordinatorInterface) FilterSubscriptionCreated(opts *bind.FilterOp
 func (_m *VRFCoordinatorInterface) FilterSubscriptionFunded(opts *bind.FilterOpts, subId []*big.Int) (*vrf_coordinator.VRFCoordinatorSubscriptionFundedIterator, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubscriptionFunded")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorSubscriptionFundedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int) (*vrf_coordinator.VRFCoordinatorSubscriptionFundedIterator, error)); ok {
@@ -694,6 +798,10 @@ func (_m *VRFCoordinatorInterface) FilterSubscriptionFunded(opts *bind.FilterOpt
 func (_m *VRFCoordinatorInterface) FilterSubscriptionOwnerTransferRequested(opts *bind.FilterOpts, subId []*big.Int) (*vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferRequestedIterator, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubscriptionOwnerTransferRequested")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferRequestedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int) (*vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferRequestedIterator, error)); ok {
@@ -720,6 +828,10 @@ func (_m *VRFCoordinatorInterface) FilterSubscriptionOwnerTransferRequested(opts
 func (_m *VRFCoordinatorInterface) FilterSubscriptionOwnerTransferred(opts *bind.FilterOpts, subId []*big.Int) (*vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferredIterator, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubscriptionOwnerTransferred")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferredIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int) (*vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferredIterator, error)); ok {
@@ -746,6 +858,10 @@ func (_m *VRFCoordinatorInterface) FilterSubscriptionOwnerTransferred(opts *bind
 func (_m *VRFCoordinatorInterface) GetCallbackMemo(opts *bind.CallOpts, requestId *big.Int) ([32]byte, error) {
 	ret := _m.Called(opts, requestId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetCallbackMemo")
+	}
+
 	var r0 [32]byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int) ([32]byte, error)); ok {
@@ -772,6 +888,10 @@ func (_m *VRFCoordinatorInterface) GetCallbackMemo(opts *bind.CallOpts, requestI
 func (_m *VRFCoordinatorInterface) GetConfirmationDelays(opts *bind.CallOpts) ([8]*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetConfirmationDelays")
+	}
+
 	var r0 [8]*big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) ([8]*big.Int, error)); ok {
@@ -798,6 +918,10 @@ func (_m *VRFCoordinatorInterface) GetConfirmationDelays(opts *bind.CallOpts) ([
 func (_m *VRFCoordinatorInterface) GetFee(opts *bind.CallOpts, arg0 *big.Int, arg1 []byte) (*big.Int, error) {
 	ret := _m.Called(opts, arg0, arg1)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetFee")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int, []byte) (*big.Int, error)); ok {
@@ -824,6 +948,10 @@ func (_m *VRFCoordinatorInterface) GetFee(opts *bind.CallOpts, arg0 *big.Int, ar
 func (_m *VRFCoordinatorInterface) GetFulfillmentFee(opts *bind.CallOpts, arg0 *big.Int, callbackGasLimit uint32, arguments []byte, arg3 []byte) (*big.Int, error) {
 	ret := _m.Called(opts, arg0, callbackGasLimit, arguments, arg3)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetFulfillmentFee")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int, uint32, []byte, []byte) (*big.Int, error)); ok {
@@ -850,6 +978,10 @@ func (_m *VRFCoordinatorInterface) GetFulfillmentFee(opts *bind.CallOpts, arg0 *
 func (_m *VRFCoordinatorInterface) GetSubscription(opts *bind.CallOpts, subId *big.Int) (vrf_coordinator.GetSubscription, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetSubscription")
+	}
+
 	var r0 vrf_coordinator.GetSubscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int) (vrf_coordinator.GetSubscription, error)); ok {
@@ -874,6 +1006,10 @@ func (_m *VRFCoordinatorInterface) GetSubscription(opts *bind.CallOpts, subId *b
 func (_m *VRFCoordinatorInterface) GetSubscriptionLinkBalance(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetSubscriptionLinkBalance")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -900,6 +1036,10 @@ func (_m *VRFCoordinatorInterface) GetSubscriptionLinkBalance(opts *bind.CallOpt
 func (_m *VRFCoordinatorInterface) IBeaconPeriodBlocks(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for IBeaconPeriodBlocks")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -926,6 +1066,10 @@ func (_m *VRFCoordinatorInterface) IBeaconPeriodBlocks(opts *bind.CallOpts) (*bi
 func (_m *VRFCoordinatorInterface) ILink(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ILink")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -952,6 +1096,10 @@ func (_m *VRFCoordinatorInterface) ILink(opts *bind.CallOpts) (common.Address, e
 func (_m *VRFCoordinatorInterface) MAXCONSUMERS(opts *bind.CallOpts) (uint16, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MAXCONSUMERS")
+	}
+
 	var r0 uint16
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint16, error)); ok {
@@ -976,6 +1124,10 @@ func (_m *VRFCoordinatorInterface) MAXCONSUMERS(opts *bind.CallOpts) (uint16, er
 func (_m *VRFCoordinatorInterface) MAXNUMWORDS(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MAXNUMWORDS")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -1002,6 +1154,10 @@ func (_m *VRFCoordinatorInterface) MAXNUMWORDS(opts *bind.CallOpts) (*big.Int, e
 func (_m *VRFCoordinatorInterface) Migrate(opts *bind.TransactOpts, newCoordinator common.Address, encodedRequest []byte) (*types.Transaction, error) {
 	ret := _m.Called(opts, newCoordinator, encodedRequest)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Migrate")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address, []byte) (*types.Transaction, error)); ok {
@@ -1028,6 +1184,10 @@ func (_m *VRFCoordinatorInterface) Migrate(opts *bind.TransactOpts, newCoordinat
 func (_m *VRFCoordinatorInterface) MigrationVersion(opts *bind.CallOpts) (uint8, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MigrationVersion")
+	}
+
 	var r0 uint8
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint8, error)); ok {
@@ -1052,6 +1212,10 @@ func (_m *VRFCoordinatorInterface) MigrationVersion(opts *bind.CallOpts) (uint8,
 func (_m *VRFCoordinatorInterface) NUMCONFDELAYS(opts *bind.CallOpts) (uint8, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for NUMCONFDELAYS")
+	}
+
 	var r0 uint8
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint8, error)); ok {
@@ -1076,6 +1240,10 @@ func (_m *VRFCoordinatorInterface) NUMCONFDELAYS(opts *bind.CallOpts) (uint8, er
 func (_m *VRFCoordinatorInterface) OnMigration(opts *bind.CallOpts, arg0 []byte) error {
 	ret := _m.Called(opts, arg0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for OnMigration")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, []byte) error); ok {
 		r0 = rf(opts, arg0)
@@ -1090,6 +1258,10 @@ func (_m *VRFCoordinatorInterface) OnMigration(opts *bind.CallOpts, arg0 []byte)
 func (_m *VRFCoordinatorInterface) OnTokenTransfer(opts *bind.TransactOpts, arg0 common.Address, amount *big.Int, data []byte) (*types.Transaction, error) {
 	ret := _m.Called(opts, arg0, amount, data)
 
+	if len(ret) == 0 {
+		panic("no return value specified for OnTokenTransfer")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address, *big.Int, []byte) (*types.Transaction, error)); ok {
@@ -1116,6 +1288,10 @@ func (_m *VRFCoordinatorInterface) OnTokenTransfer(opts *bind.TransactOpts, arg0
 func (_m *VRFCoordinatorInterface) Owner(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Owner")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -1142,6 +1318,10 @@ func (_m *VRFCoordinatorInterface) Owner(opts *bind.CallOpts) (common.Address, e
 func (_m *VRFCoordinatorInterface) ParseCallbackConfigSet(log types.Log) (*vrf_coordinator.VRFCoordinatorCallbackConfigSet, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseCallbackConfigSet")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorCallbackConfigSet
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorCallbackConfigSet, error)); ok {
@@ -1168,6 +1348,10 @@ func (_m *VRFCoordinatorInterface) ParseCallbackConfigSet(log types.Log) (*vrf_c
 func (_m *VRFCoordinatorInterface) ParseCoordinatorConfigSet(log types.Log) (*vrf_coordinator.VRFCoordinatorCoordinatorConfigSet, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseCoordinatorConfigSet")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorCoordinatorConfigSet
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorCoordinatorConfigSet, error)); ok {
@@ -1194,6 +1378,10 @@ func (_m *VRFCoordinatorInterface) ParseCoordinatorConfigSet(log types.Log) (*vr
 func (_m *VRFCoordinatorInterface) ParseCoordinatorDeregistered(log types.Log) (*vrf_coordinator.VRFCoordinatorCoordinatorDeregistered, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseCoordinatorDeregistered")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorCoordinatorDeregistered
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorCoordinatorDeregistered, error)); ok {
@@ -1220,6 +1408,10 @@ func (_m *VRFCoordinatorInterface) ParseCoordinatorDeregistered(log types.Log) (
 func (_m *VRFCoordinatorInterface) ParseCoordinatorRegistered(log types.Log) (*vrf_coordinator.VRFCoordinatorCoordinatorRegistered, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseCoordinatorRegistered")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorCoordinatorRegistered
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorCoordinatorRegistered, error)); ok {
@@ -1246,6 +1438,10 @@ func (_m *VRFCoordinatorInterface) ParseCoordinatorRegistered(log types.Log) (*v
 func (_m *VRFCoordinatorInterface) ParseLog(log types.Log) (generated.AbigenLog, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseLog")
+	}
+
 	var r0 generated.AbigenLog
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (generated.AbigenLog, error)); ok {
@@ -1272,6 +1468,10 @@ func (_m *VRFCoordinatorInterface) ParseLog(log types.Log) (generated.AbigenLog,
 func (_m *VRFCoordinatorInterface) ParseMigrationCompleted(log types.Log) (*vrf_coordinator.VRFCoordinatorMigrationCompleted, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseMigrationCompleted")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorMigrationCompleted
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorMigrationCompleted, error)); ok {
@@ -1298,6 +1498,10 @@ func (_m *VRFCoordinatorInterface) ParseMigrationCompleted(log types.Log) (*vrf_
 func (_m *VRFCoordinatorInterface) ParseOutputsServed(log types.Log) (*vrf_coordinator.VRFCoordinatorOutputsServed, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOutputsServed")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorOutputsServed
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorOutputsServed, error)); ok {
@@ -1324,6 +1528,10 @@ func (_m *VRFCoordinatorInterface) ParseOutputsServed(log types.Log) (*vrf_coord
 func (_m *VRFCoordinatorInterface) ParseOwnershipTransferRequested(log types.Log) (*vrf_coordinator.VRFCoordinatorOwnershipTransferRequested, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOwnershipTransferRequested")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorOwnershipTransferRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorOwnershipTransferRequested, error)); ok {
@@ -1350,6 +1558,10 @@ func (_m *VRFCoordinatorInterface) ParseOwnershipTransferRequested(log types.Log
 func (_m *VRFCoordinatorInterface) ParseOwnershipTransferred(log types.Log) (*vrf_coordinator.VRFCoordinatorOwnershipTransferred, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOwnershipTransferred")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorOwnershipTransferred
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorOwnershipTransferred, error)); ok {
@@ -1376,6 +1588,10 @@ func (_m *VRFCoordinatorInterface) ParseOwnershipTransferred(log types.Log) (*vr
 func (_m *VRFCoordinatorInterface) ParsePauseFlagChanged(log types.Log) (*vrf_coordinator.VRFCoordinatorPauseFlagChanged, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParsePauseFlagChanged")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorPauseFlagChanged
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorPauseFlagChanged, error)); ok {
@@ -1402,6 +1618,10 @@ func (_m *VRFCoordinatorInterface) ParsePauseFlagChanged(log types.Log) (*vrf_co
 func (_m *VRFCoordinatorInterface) ParseRandomWordsFulfilled(log types.Log) (*vrf_coordinator.VRFCoordinatorRandomWordsFulfilled, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseRandomWordsFulfilled")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorRandomWordsFulfilled
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorRandomWordsFulfilled, error)); ok {
@@ -1428,6 +1648,10 @@ func (_m *VRFCoordinatorInterface) ParseRandomWordsFulfilled(log types.Log) (*vr
 func (_m *VRFCoordinatorInterface) ParseRandomnessFulfillmentRequested(log types.Log) (*vrf_coordinator.VRFCoordinatorRandomnessFulfillmentRequested, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseRandomnessFulfillmentRequested")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorRandomnessFulfillmentRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorRandomnessFulfillmentRequested, error)); ok {
@@ -1454,6 +1678,10 @@ func (_m *VRFCoordinatorInterface) ParseRandomnessFulfillmentRequested(log types
 func (_m *VRFCoordinatorInterface) ParseRandomnessRedeemed(log types.Log) (*vrf_coordinator.VRFCoordinatorRandomnessRedeemed, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseRandomnessRedeemed")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorRandomnessRedeemed
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorRandomnessRedeemed, error)); ok {
@@ -1480,6 +1708,10 @@ func (_m *VRFCoordinatorInterface) ParseRandomnessRedeemed(log types.Log) (*vrf_
 func (_m *VRFCoordinatorInterface) ParseRandomnessRequested(log types.Log) (*vrf_coordinator.VRFCoordinatorRandomnessRequested, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseRandomnessRequested")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorRandomnessRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorRandomnessRequested, error)); ok {
@@ -1506,6 +1738,10 @@ func (_m *VRFCoordinatorInterface) ParseRandomnessRequested(log types.Log) (*vrf
 func (_m *VRFCoordinatorInterface) ParseSubscriptionCanceled(log types.Log) (*vrf_coordinator.VRFCoordinatorSubscriptionCanceled, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubscriptionCanceled")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorSubscriptionCanceled
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorSubscriptionCanceled, error)); ok {
@@ -1532,6 +1768,10 @@ func (_m *VRFCoordinatorInterface) ParseSubscriptionCanceled(log types.Log) (*vr
 func (_m *VRFCoordinatorInterface) ParseSubscriptionConsumerAdded(log types.Log) (*vrf_coordinator.VRFCoordinatorSubscriptionConsumerAdded, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubscriptionConsumerAdded")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorSubscriptionConsumerAdded
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorSubscriptionConsumerAdded, error)); ok {
@@ -1558,6 +1798,10 @@ func (_m *VRFCoordinatorInterface) ParseSubscriptionConsumerAdded(log types.Log)
 func (_m *VRFCoordinatorInterface) ParseSubscriptionConsumerRemoved(log types.Log) (*vrf_coordinator.VRFCoordinatorSubscriptionConsumerRemoved, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubscriptionConsumerRemoved")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorSubscriptionConsumerRemoved
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorSubscriptionConsumerRemoved, error)); ok {
@@ -1584,6 +1828,10 @@ func (_m *VRFCoordinatorInterface) ParseSubscriptionConsumerRemoved(log types.Lo
 func (_m *VRFCoordinatorInterface) ParseSubscriptionCreated(log types.Log) (*vrf_coordinator.VRFCoordinatorSubscriptionCreated, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubscriptionCreated")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorSubscriptionCreated
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorSubscriptionCreated, error)); ok {
@@ -1610,6 +1858,10 @@ func (_m *VRFCoordinatorInterface) ParseSubscriptionCreated(log types.Log) (*vrf
 func (_m *VRFCoordinatorInterface) ParseSubscriptionFunded(log types.Log) (*vrf_coordinator.VRFCoordinatorSubscriptionFunded, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubscriptionFunded")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorSubscriptionFunded
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorSubscriptionFunded, error)); ok {
@@ -1636,6 +1888,10 @@ func (_m *VRFCoordinatorInterface) ParseSubscriptionFunded(log types.Log) (*vrf_
 func (_m *VRFCoordinatorInterface) ParseSubscriptionOwnerTransferRequested(log types.Log) (*vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferRequested, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubscriptionOwnerTransferRequested")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferRequested, error)); ok {
@@ -1662,6 +1918,10 @@ func (_m *VRFCoordinatorInterface) ParseSubscriptionOwnerTransferRequested(log t
 func (_m *VRFCoordinatorInterface) ParseSubscriptionOwnerTransferred(log types.Log) (*vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferred, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubscriptionOwnerTransferred")
+	}
+
 	var r0 *vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferred
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferred, error)); ok {
@@ -1688,6 +1948,10 @@ func (_m *VRFCoordinatorInterface) ParseSubscriptionOwnerTransferred(log types.L
 func (_m *VRFCoordinatorInterface) ProcessVRFOutputs(opts *bind.TransactOpts, vrfOutputs []vrf_coordinator.VRFBeaconTypesVRFOutput, juelsPerFeeCoin *big.Int, reasonableGasPrice uint64, blockHeight uint64) (*types.Transaction, error) {
 	ret := _m.Called(opts, vrfOutputs, juelsPerFeeCoin, reasonableGasPrice, blockHeight)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ProcessVRFOutputs")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, []vrf_coordinator.VRFBeaconTypesVRFOutput, *big.Int, uint64, uint64) (*types.Transaction, error)); ok {
@@ -1714,6 +1978,10 @@ func (_m *VRFCoordinatorInterface) ProcessVRFOutputs(opts *bind.TransactOpts, vr
 func (_m *VRFCoordinatorInterface) RedeemRandomness(opts *bind.TransactOpts, subID *big.Int, requestID *big.Int, arg2 []byte) (*types.Transaction, error) {
 	ret := _m.Called(opts, subID, requestID, arg2)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RedeemRandomness")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, *big.Int, *big.Int, []byte) (*types.Transaction, error)); ok {
@@ -1740,6 +2008,10 @@ func (_m *VRFCoordinatorInterface) RedeemRandomness(opts *bind.TransactOpts, sub
 func (_m *VRFCoordinatorInterface) RegisterMigratableCoordinator(opts *bind.TransactOpts, target common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, target)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RegisterMigratableCoordinator")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -1766,6 +2038,10 @@ func (_m *VRFCoordinatorInterface) RegisterMigratableCoordinator(opts *bind.Tran
 func (_m *VRFCoordinatorInterface) RemoveConsumer(opts *bind.TransactOpts, subId *big.Int, consumer common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, subId, consumer)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RemoveConsumer")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, *big.Int, common.Address) (*types.Transaction, error)); ok {
@@ -1792,6 +2068,10 @@ func (_m *VRFCoordinatorInterface) RemoveConsumer(opts *bind.TransactOpts, subId
 func (_m *VRFCoordinatorInterface) RequestRandomness(opts *bind.TransactOpts, subID *big.Int, numWords uint16, confDelay *big.Int, arg3 []byte) (*types.Transaction, error) {
 	ret := _m.Called(opts, subID, numWords, confDelay, arg3)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RequestRandomness")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, *big.Int, uint16, *big.Int, []byte) (*types.Transaction, error)); ok {
@@ -1818,6 +2098,10 @@ func (_m *VRFCoordinatorInterface) RequestRandomness(opts *bind.TransactOpts, su
 func (_m *VRFCoordinatorInterface) RequestRandomnessFulfillment(opts *bind.TransactOpts, subID *big.Int, numWords uint16, confDelay *big.Int, callbackGasLimit uint32, arguments []byte, arg5 []byte) (*types.Transaction, error) {
 	ret := _m.Called(opts, subID, numWords, confDelay, callbackGasLimit, arguments, arg5)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RequestRandomnessFulfillment")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, *big.Int, uint16, *big.Int, uint32, []byte, []byte) (*types.Transaction, error)); ok {
@@ -1844,6 +2128,10 @@ func (_m *VRFCoordinatorInterface) RequestRandomnessFulfillment(opts *bind.Trans
 func (_m *VRFCoordinatorInterface) RequestSubscriptionOwnerTransfer(opts *bind.TransactOpts, subId *big.Int, newOwner common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, subId, newOwner)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RequestSubscriptionOwnerTransfer")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, *big.Int, common.Address) (*types.Transaction, error)); ok {
@@ -1870,6 +2158,10 @@ func (_m *VRFCoordinatorInterface) RequestSubscriptionOwnerTransfer(opts *bind.T
 func (_m *VRFCoordinatorInterface) SCallbackConfig(opts *bind.CallOpts) (vrf_coordinator.SCallbackConfig, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SCallbackConfig")
+	}
+
 	var r0 vrf_coordinator.SCallbackConfig
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (vrf_coordinator.SCallbackConfig, error)); ok {
@@ -1894,6 +2186,10 @@ func (_m *VRFCoordinatorInterface) SCallbackConfig(opts *bind.CallOpts) (vrf_coo
 func (_m *VRFCoordinatorInterface) SCoordinatorConfig(opts *bind.CallOpts) (vrf_coordinator.SCoordinatorConfig, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SCoordinatorConfig")
+	}
+
 	var r0 vrf_coordinator.SCoordinatorConfig
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (vrf_coordinator.SCoordinatorConfig, error)); ok {
@@ -1918,6 +2214,10 @@ func (_m *VRFCoordinatorInterface) SCoordinatorConfig(opts *bind.CallOpts) (vrf_
 func (_m *VRFCoordinatorInterface) SPendingRequests(opts *bind.CallOpts, arg0 *big.Int) (vrf_coordinator.SPendingRequests, error) {
 	ret := _m.Called(opts, arg0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SPendingRequests")
+	}
+
 	var r0 vrf_coordinator.SPendingRequests
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int) (vrf_coordinator.SPendingRequests, error)); ok {
@@ -1942,6 +2242,10 @@ func (_m *VRFCoordinatorInterface) SPendingRequests(opts *bind.CallOpts, arg0 *b
 func (_m *VRFCoordinatorInterface) SProducer(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SProducer")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -1968,6 +2272,10 @@ func (_m *VRFCoordinatorInterface) SProducer(opts *bind.CallOpts) (common.Addres
 func (_m *VRFCoordinatorInterface) SetCallbackConfig(opts *bind.TransactOpts, config vrf_coordinator.VRFCoordinatorCallbackConfig) (*types.Transaction, error) {
 	ret := _m.Called(opts, config)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetCallbackConfig")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, vrf_coordinator.VRFCoordinatorCallbackConfig) (*types.Transaction, error)); ok {
@@ -1994,6 +2302,10 @@ func (_m *VRFCoordinatorInterface) SetCallbackConfig(opts *bind.TransactOpts, co
 func (_m *VRFCoordinatorInterface) SetConfirmationDelays(opts *bind.TransactOpts, confDelays [8]*big.Int) (*types.Transaction, error) {
 	ret := _m.Called(opts, confDelays)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetConfirmationDelays")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, [8]*big.Int) (*types.Transaction, error)); ok {
@@ -2020,6 +2332,10 @@ func (_m *VRFCoordinatorInterface) SetConfirmationDelays(opts *bind.TransactOpts
 func (_m *VRFCoordinatorInterface) SetCoordinatorConfig(opts *bind.TransactOpts, coordinatorConfig vrf_coordinator.VRFBeaconTypesCoordinatorConfig) (*types.Transaction, error) {
 	ret := _m.Called(opts, coordinatorConfig)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetCoordinatorConfig")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, vrf_coordinator.VRFBeaconTypesCoordinatorConfig) (*types.Transaction, error)); ok {
@@ -2046,6 +2362,10 @@ func (_m *VRFCoordinatorInterface) SetCoordinatorConfig(opts *bind.TransactOpts,
 func (_m *VRFCoordinatorInterface) SetPauseFlag(opts *bind.TransactOpts, pause bool) (*types.Transaction, error) {
 	ret := _m.Called(opts, pause)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetPauseFlag")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, bool) (*types.Transaction, error)); ok {
@@ -2072,6 +2392,10 @@ func (_m *VRFCoordinatorInterface) SetPauseFlag(opts *bind.TransactOpts, pause b
 func (_m *VRFCoordinatorInterface) SetProducer(opts *bind.TransactOpts, producer common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, producer)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetProducer")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -2098,6 +2422,10 @@ func (_m *VRFCoordinatorInterface) SetProducer(opts *bind.TransactOpts, producer
 func (_m *VRFCoordinatorInterface) TransferLink(opts *bind.TransactOpts, recipient common.Address, juelsAmount *big.Int) (*types.Transaction, error) {
 	ret := _m.Called(opts, recipient, juelsAmount)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransferLink")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address, *big.Int) (*types.Transaction, error)); ok {
@@ -2124,6 +2452,10 @@ func (_m *VRFCoordinatorInterface) TransferLink(opts *bind.TransactOpts, recipie
 func (_m *VRFCoordinatorInterface) TransferOwnership(opts *bind.TransactOpts, to common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransferOwnership")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -2150,6 +2482,10 @@ func (_m *VRFCoordinatorInterface) TransferOwnership(opts *bind.TransactOpts, to
 func (_m *VRFCoordinatorInterface) WatchCallbackConfigSet(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorCallbackConfigSet) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchCallbackConfigSet")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorCallbackConfigSet) (event.Subscription, error)); ok {
@@ -2176,6 +2512,10 @@ func (_m *VRFCoordinatorInterface) WatchCallbackConfigSet(opts *bind.WatchOpts,
 func (_m *VRFCoordinatorInterface) WatchCoordinatorConfigSet(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorCoordinatorConfigSet) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchCoordinatorConfigSet")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorCoordinatorConfigSet) (event.Subscription, error)); ok {
@@ -2202,6 +2542,10 @@ func (_m *VRFCoordinatorInterface) WatchCoordinatorConfigSet(opts *bind.WatchOpt
 func (_m *VRFCoordinatorInterface) WatchCoordinatorDeregistered(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorCoordinatorDeregistered) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchCoordinatorDeregistered")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorCoordinatorDeregistered) (event.Subscription, error)); ok {
@@ -2228,6 +2572,10 @@ func (_m *VRFCoordinatorInterface) WatchCoordinatorDeregistered(opts *bind.Watch
 func (_m *VRFCoordinatorInterface) WatchCoordinatorRegistered(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorCoordinatorRegistered) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchCoordinatorRegistered")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorCoordinatorRegistered) (event.Subscription, error)); ok {
@@ -2254,6 +2602,10 @@ func (_m *VRFCoordinatorInterface) WatchCoordinatorRegistered(opts *bind.WatchOp
 func (_m *VRFCoordinatorInterface) WatchMigrationCompleted(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorMigrationCompleted, newVersion []uint8, subID []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, newVersion, subID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchMigrationCompleted")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorMigrationCompleted, []uint8, []*big.Int) (event.Subscription, error)); ok {
@@ -2280,6 +2632,10 @@ func (_m *VRFCoordinatorInterface) WatchMigrationCompleted(opts *bind.WatchOpts,
 func (_m *VRFCoordinatorInterface) WatchOutputsServed(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorOutputsServed) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOutputsServed")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorOutputsServed) (event.Subscription, error)); ok {
@@ -2306,6 +2662,10 @@ func (_m *VRFCoordinatorInterface) WatchOutputsServed(opts *bind.WatchOpts, sink
 func (_m *VRFCoordinatorInterface) WatchOwnershipTransferRequested(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorOwnershipTransferRequested, from []common.Address, to []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOwnershipTransferRequested")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorOwnershipTransferRequested, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -2332,6 +2692,10 @@ func (_m *VRFCoordinatorInterface) WatchOwnershipTransferRequested(opts *bind.Wa
 func (_m *VRFCoordinatorInterface) WatchOwnershipTransferred(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorOwnershipTransferred, from []common.Address, to []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOwnershipTransferred")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorOwnershipTransferred, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -2358,6 +2722,10 @@ func (_m *VRFCoordinatorInterface) WatchOwnershipTransferred(opts *bind.WatchOpt
 func (_m *VRFCoordinatorInterface) WatchPauseFlagChanged(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorPauseFlagChanged) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchPauseFlagChanged")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorPauseFlagChanged) (event.Subscription, error)); ok {
@@ -2384,6 +2752,10 @@ func (_m *VRFCoordinatorInterface) WatchPauseFlagChanged(opts *bind.WatchOpts, s
 func (_m *VRFCoordinatorInterface) WatchRandomWordsFulfilled(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorRandomWordsFulfilled) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchRandomWordsFulfilled")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorRandomWordsFulfilled) (event.Subscription, error)); ok {
@@ -2410,6 +2782,10 @@ func (_m *VRFCoordinatorInterface) WatchRandomWordsFulfilled(opts *bind.WatchOpt
 func (_m *VRFCoordinatorInterface) WatchRandomnessFulfillmentRequested(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorRandomnessFulfillmentRequested, requestID []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, requestID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchRandomnessFulfillmentRequested")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorRandomnessFulfillmentRequested, []*big.Int) (event.Subscription, error)); ok {
@@ -2436,6 +2812,10 @@ func (_m *VRFCoordinatorInterface) WatchRandomnessFulfillmentRequested(opts *bin
 func (_m *VRFCoordinatorInterface) WatchRandomnessRedeemed(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorRandomnessRedeemed, requestID []*big.Int, requester []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, requestID, requester)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchRandomnessRedeemed")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorRandomnessRedeemed, []*big.Int, []common.Address) (event.Subscription, error)); ok {
@@ -2462,6 +2842,10 @@ func (_m *VRFCoordinatorInterface) WatchRandomnessRedeemed(opts *bind.WatchOpts,
 func (_m *VRFCoordinatorInterface) WatchRandomnessRequested(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorRandomnessRequested, requestID []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, requestID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchRandomnessRequested")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorRandomnessRequested, []*big.Int) (event.Subscription, error)); ok {
@@ -2488,6 +2872,10 @@ func (_m *VRFCoordinatorInterface) WatchRandomnessRequested(opts *bind.WatchOpts
 func (_m *VRFCoordinatorInterface) WatchSubscriptionCanceled(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorSubscriptionCanceled, subId []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubscriptionCanceled")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorSubscriptionCanceled, []*big.Int) (event.Subscription, error)); ok {
@@ -2514,6 +2902,10 @@ func (_m *VRFCoordinatorInterface) WatchSubscriptionCanceled(opts *bind.WatchOpt
 func (_m *VRFCoordinatorInterface) WatchSubscriptionConsumerAdded(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorSubscriptionConsumerAdded, subId []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubscriptionConsumerAdded")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorSubscriptionConsumerAdded, []*big.Int) (event.Subscription, error)); ok {
@@ -2540,6 +2932,10 @@ func (_m *VRFCoordinatorInterface) WatchSubscriptionConsumerAdded(opts *bind.Wat
 func (_m *VRFCoordinatorInterface) WatchSubscriptionConsumerRemoved(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorSubscriptionConsumerRemoved, subId []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubscriptionConsumerRemoved")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorSubscriptionConsumerRemoved, []*big.Int) (event.Subscription, error)); ok {
@@ -2566,6 +2962,10 @@ func (_m *VRFCoordinatorInterface) WatchSubscriptionConsumerRemoved(opts *bind.W
 func (_m *VRFCoordinatorInterface) WatchSubscriptionCreated(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorSubscriptionCreated, subId []*big.Int, owner []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subId, owner)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubscriptionCreated")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorSubscriptionCreated, []*big.Int, []common.Address) (event.Subscription, error)); ok {
@@ -2592,6 +2992,10 @@ func (_m *VRFCoordinatorInterface) WatchSubscriptionCreated(opts *bind.WatchOpts
 func (_m *VRFCoordinatorInterface) WatchSubscriptionFunded(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorSubscriptionFunded, subId []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubscriptionFunded")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorSubscriptionFunded, []*big.Int) (event.Subscription, error)); ok {
@@ -2618,6 +3022,10 @@ func (_m *VRFCoordinatorInterface) WatchSubscriptionFunded(opts *bind.WatchOpts,
 func (_m *VRFCoordinatorInterface) WatchSubscriptionOwnerTransferRequested(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferRequested, subId []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubscriptionOwnerTransferRequested")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferRequested, []*big.Int) (event.Subscription, error)); ok {
@@ -2644,6 +3052,10 @@ func (_m *VRFCoordinatorInterface) WatchSubscriptionOwnerTransferRequested(opts
 func (_m *VRFCoordinatorInterface) WatchSubscriptionOwnerTransferred(opts *bind.WatchOpts, sink chan<- *vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferred, subId []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubscriptionOwnerTransferred")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator.VRFCoordinatorSubscriptionOwnerTransferred, []*big.Int) (event.Subscription, error)); ok {
diff --git a/core/services/ocr2/plugins/promwrapper/mocks/prometheus_backend.go b/core/services/ocr2/plugins/promwrapper/mocks/prometheus_backend.go
index ba97eda30b1..418cb276011 100644
--- a/core/services/ocr2/plugins/promwrapper/mocks/prometheus_backend.go
+++ b/core/services/ocr2/plugins/promwrapper/mocks/prometheus_backend.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/core/services/ocr2/plugins/threshold/mocks/decryptor.go b/core/services/ocr2/plugins/threshold/mocks/decryptor.go
index 4b91cbbd26f..5496483c9dd 100644
--- a/core/services/ocr2/plugins/threshold/mocks/decryptor.go
+++ b/core/services/ocr2/plugins/threshold/mocks/decryptor.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type Decryptor struct {
 func (_m *Decryptor) Decrypt(ctx context.Context, ciphertextId decryptionplugin.CiphertextId, ciphertext []byte) ([]byte, error) {
 	ret := _m.Called(ctx, ciphertextId, ciphertext)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Decrypt")
+	}
+
 	var r0 []byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, decryptionplugin.CiphertextId, []byte) ([]byte, error)); ok {
diff --git a/core/services/pg/mocks/event_broadcaster.go b/core/services/pg/mocks/event_broadcaster.go
index b4d04b8b999..63f06db494b 100644
--- a/core/services/pg/mocks/event_broadcaster.go
+++ b/core/services/pg/mocks/event_broadcaster.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type EventBroadcaster struct {
 func (_m *EventBroadcaster) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -32,6 +36,10 @@ func (_m *EventBroadcaster) Close() error {
 func (_m *EventBroadcaster) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -48,6 +56,10 @@ func (_m *EventBroadcaster) HealthReport() map[string]error {
 func (_m *EventBroadcaster) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -62,6 +74,10 @@ func (_m *EventBroadcaster) Name() string {
 func (_m *EventBroadcaster) Notify(channel string, payload string) error {
 	ret := _m.Called(channel, payload)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Notify")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string) error); ok {
 		r0 = rf(channel, payload)
@@ -76,6 +92,10 @@ func (_m *EventBroadcaster) Notify(channel string, payload string) error {
 func (_m *EventBroadcaster) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -90,6 +110,10 @@ func (_m *EventBroadcaster) Ready() error {
 func (_m *EventBroadcaster) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
@@ -104,6 +128,10 @@ func (_m *EventBroadcaster) Start(_a0 context.Context) error {
 func (_m *EventBroadcaster) Subscribe(channel string, payloadFilter string) (pg.Subscription, error) {
 	ret := _m.Called(channel, payloadFilter)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Subscribe")
+	}
+
 	var r0 pg.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (pg.Subscription, error)); ok {
diff --git a/core/services/pg/mocks/subscription.go b/core/services/pg/mocks/subscription.go
index 9cfe4c4f020..fcd194004de 100644
--- a/core/services/pg/mocks/subscription.go
+++ b/core/services/pg/mocks/subscription.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -16,6 +16,10 @@ type Subscription struct {
 func (_m *Subscription) ChannelName() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ChannelName")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -35,6 +39,10 @@ func (_m *Subscription) Close() {
 func (_m *Subscription) Events() <-chan pg.Event {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Events")
+	}
+
 	var r0 <-chan pg.Event
 	if rf, ok := ret.Get(0).(func() <-chan pg.Event); ok {
 		r0 = rf()
@@ -51,6 +59,10 @@ func (_m *Subscription) Events() <-chan pg.Event {
 func (_m *Subscription) InterestedIn(event pg.Event) bool {
 	ret := _m.Called(event)
 
+	if len(ret) == 0 {
+		panic("no return value specified for InterestedIn")
+	}
+
 	var r0 bool
 	if rf, ok := ret.Get(0).(func(pg.Event) bool); ok {
 		r0 = rf(event)
diff --git a/core/services/pipeline/mocks/config.go b/core/services/pipeline/mocks/config.go
index eb9a411f423..4cd6bc7a724 100644
--- a/core/services/pipeline/mocks/config.go
+++ b/core/services/pipeline/mocks/config.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type Config struct {
 func (_m *Config) DefaultHTTPLimit() int64 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for DefaultHTTPLimit")
+	}
+
 	var r0 int64
 	if rf, ok := ret.Get(0).(func() int64); ok {
 		r0 = rf()
@@ -32,6 +36,10 @@ func (_m *Config) DefaultHTTPLimit() int64 {
 func (_m *Config) DefaultHTTPTimeout() models.Duration {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for DefaultHTTPTimeout")
+	}
+
 	var r0 models.Duration
 	if rf, ok := ret.Get(0).(func() models.Duration); ok {
 		r0 = rf()
@@ -46,6 +54,10 @@ func (_m *Config) DefaultHTTPTimeout() models.Duration {
 func (_m *Config) MaxRunDuration() time.Duration {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for MaxRunDuration")
+	}
+
 	var r0 time.Duration
 	if rf, ok := ret.Get(0).(func() time.Duration); ok {
 		r0 = rf()
@@ -60,6 +72,10 @@ func (_m *Config) MaxRunDuration() time.Duration {
 func (_m *Config) ReaperInterval() time.Duration {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ReaperInterval")
+	}
+
 	var r0 time.Duration
 	if rf, ok := ret.Get(0).(func() time.Duration); ok {
 		r0 = rf()
@@ -74,6 +90,10 @@ func (_m *Config) ReaperInterval() time.Duration {
 func (_m *Config) ReaperThreshold() time.Duration {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ReaperThreshold")
+	}
+
 	var r0 time.Duration
 	if rf, ok := ret.Get(0).(func() time.Duration); ok {
 		r0 = rf()
diff --git a/core/services/pipeline/mocks/orm.go b/core/services/pipeline/mocks/orm.go
index 88d067c6ffa..759686204d4 100644
--- a/core/services/pipeline/mocks/orm.go
+++ b/core/services/pipeline/mocks/orm.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -26,6 +26,10 @@ type ORM struct {
 func (_m *ORM) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -47,6 +51,10 @@ func (_m *ORM) CreateRun(run *pipeline.Run, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateRun")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*pipeline.Run, ...pg.QOpt) error); ok {
 		r0 = rf(run, qopts...)
@@ -68,6 +76,10 @@ func (_m *ORM) CreateSpec(_a0 pipeline.Pipeline, maxTaskTimeout models.Interval,
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateSpec")
+	}
+
 	var r0 int32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(pipeline.Pipeline, models.Interval, ...pg.QOpt) (int32, error)); ok {
@@ -92,6 +104,10 @@ func (_m *ORM) CreateSpec(_a0 pipeline.Pipeline, maxTaskTimeout models.Interval,
 func (_m *ORM) DeleteRun(id int64) error {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteRun")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int64) error); ok {
 		r0 = rf(id)
@@ -106,6 +122,10 @@ func (_m *ORM) DeleteRun(id int64) error {
 func (_m *ORM) DeleteRunsOlderThan(_a0 context.Context, _a1 time.Duration) error {
 	ret := _m.Called(_a0, _a1)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteRunsOlderThan")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, time.Duration) error); ok {
 		r0 = rf(_a0, _a1)
@@ -120,6 +140,10 @@ func (_m *ORM) DeleteRunsOlderThan(_a0 context.Context, _a1 time.Duration) error
 func (_m *ORM) FindRun(id int64) (pipeline.Run, error) {
 	ret := _m.Called(id)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindRun")
+	}
+
 	var r0 pipeline.Run
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int64) (pipeline.Run, error)); ok {
@@ -144,6 +168,10 @@ func (_m *ORM) FindRun(id int64) (pipeline.Run, error) {
 func (_m *ORM) GetAllRuns() ([]pipeline.Run, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetAllRuns")
+	}
+
 	var r0 []pipeline.Run
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]pipeline.Run, error)); ok {
@@ -170,6 +198,10 @@ func (_m *ORM) GetAllRuns() ([]pipeline.Run, error) {
 func (_m *ORM) GetQ() pg.Q {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetQ")
+	}
+
 	var r0 pg.Q
 	if rf, ok := ret.Get(0).(func() pg.Q); ok {
 		r0 = rf()
@@ -184,6 +216,10 @@ func (_m *ORM) GetQ() pg.Q {
 func (_m *ORM) GetUnfinishedRuns(_a0 context.Context, _a1 time.Time, _a2 func(pipeline.Run) error) error {
 	ret := _m.Called(_a0, _a1, _a2)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUnfinishedRuns")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, time.Time, func(pipeline.Run) error) error); ok {
 		r0 = rf(_a0, _a1, _a2)
@@ -198,6 +234,10 @@ func (_m *ORM) GetUnfinishedRuns(_a0 context.Context, _a1 time.Time, _a2 func(pi
 func (_m *ORM) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -221,6 +261,10 @@ func (_m *ORM) InsertFinishedRun(run *pipeline.Run, saveSuccessfulTaskRuns bool,
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for InsertFinishedRun")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*pipeline.Run, bool, ...pg.QOpt) error); ok {
 		r0 = rf(run, saveSuccessfulTaskRuns, qopts...)
@@ -242,6 +286,10 @@ func (_m *ORM) InsertFinishedRuns(run []*pipeline.Run, saveSuccessfulTaskRuns bo
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for InsertFinishedRuns")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func([]*pipeline.Run, bool, ...pg.QOpt) error); ok {
 		r0 = rf(run, saveSuccessfulTaskRuns, qopts...)
@@ -263,6 +311,10 @@ func (_m *ORM) InsertRun(run *pipeline.Run, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for InsertRun")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*pipeline.Run, ...pg.QOpt) error); ok {
 		r0 = rf(run, qopts...)
@@ -277,6 +329,10 @@ func (_m *ORM) InsertRun(run *pipeline.Run, qopts ...pg.QOpt) error {
 func (_m *ORM) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -291,6 +347,10 @@ func (_m *ORM) Name() string {
 func (_m *ORM) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -305,6 +365,10 @@ func (_m *ORM) Ready() error {
 func (_m *ORM) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
@@ -326,6 +390,10 @@ func (_m *ORM) StoreRun(run *pipeline.Run, qopts ...pg.QOpt) (bool, error) {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for StoreRun")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*pipeline.Run, ...pg.QOpt) (bool, error)); ok {
@@ -350,6 +418,10 @@ func (_m *ORM) StoreRun(run *pipeline.Run, qopts ...pg.QOpt) (bool, error) {
 func (_m *ORM) UpdateTaskRunResult(taskID uuid.UUID, result pipeline.Result) (pipeline.Run, bool, error) {
 	ret := _m.Called(taskID, result)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateTaskRunResult")
+	}
+
 	var r0 pipeline.Run
 	var r1 bool
 	var r2 error
diff --git a/core/services/pipeline/mocks/pipeline_param_unmarshaler.go b/core/services/pipeline/mocks/pipeline_param_unmarshaler.go
index 3478ce1322d..40f2ba4dd32 100644
--- a/core/services/pipeline/mocks/pipeline_param_unmarshaler.go
+++ b/core/services/pipeline/mocks/pipeline_param_unmarshaler.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -13,6 +13,10 @@ type PipelineParamUnmarshaler struct {
 func (_m *PipelineParamUnmarshaler) UnmarshalPipelineParam(val interface{}) error {
 	ret := _m.Called(val)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UnmarshalPipelineParam")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(interface{}) error); ok {
 		r0 = rf(val)
diff --git a/core/services/pipeline/mocks/runner.go b/core/services/pipeline/mocks/runner.go
index 34b55399752..f6e5033eae9 100644
--- a/core/services/pipeline/mocks/runner.go
+++ b/core/services/pipeline/mocks/runner.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -24,6 +24,10 @@ type Runner struct {
 func (_m *Runner) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -38,6 +42,10 @@ func (_m *Runner) Close() error {
 func (_m *Runner) ExecuteAndInsertFinishedRun(ctx context.Context, spec pipeline.Spec, vars pipeline.Vars, l logger.Logger, saveSuccessfulTaskRuns bool) (int64, pipeline.FinalResult, error) {
 	ret := _m.Called(ctx, spec, vars, l, saveSuccessfulTaskRuns)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ExecuteAndInsertFinishedRun")
+	}
+
 	var r0 int64
 	var r1 pipeline.FinalResult
 	var r2 error
@@ -69,6 +77,10 @@ func (_m *Runner) ExecuteAndInsertFinishedRun(ctx context.Context, spec pipeline
 func (_m *Runner) ExecuteRun(ctx context.Context, spec pipeline.Spec, vars pipeline.Vars, l logger.Logger) (*pipeline.Run, pipeline.TaskRunResults, error) {
 	ret := _m.Called(ctx, spec, vars, l)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ExecuteRun")
+	}
+
 	var r0 *pipeline.Run
 	var r1 pipeline.TaskRunResults
 	var r2 error
@@ -104,6 +116,10 @@ func (_m *Runner) ExecuteRun(ctx context.Context, spec pipeline.Spec, vars pipel
 func (_m *Runner) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -127,6 +143,10 @@ func (_m *Runner) InsertFinishedRun(run *pipeline.Run, saveSuccessfulTaskRuns bo
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for InsertFinishedRun")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*pipeline.Run, bool, ...pg.QOpt) error); ok {
 		r0 = rf(run, saveSuccessfulTaskRuns, qopts...)
@@ -148,6 +168,10 @@ func (_m *Runner) InsertFinishedRuns(runs []*pipeline.Run, saveSuccessfulTaskRun
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for InsertFinishedRuns")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func([]*pipeline.Run, bool, ...pg.QOpt) error); ok {
 		r0 = rf(runs, saveSuccessfulTaskRuns, qopts...)
@@ -162,6 +186,10 @@ func (_m *Runner) InsertFinishedRuns(runs []*pipeline.Run, saveSuccessfulTaskRun
 func (_m *Runner) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -181,6 +209,10 @@ func (_m *Runner) OnRunFinished(_a0 func(*pipeline.Run)) {
 func (_m *Runner) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -195,6 +227,10 @@ func (_m *Runner) Ready() error {
 func (_m *Runner) ResumeRun(taskID uuid.UUID, value interface{}, err error) error {
 	ret := _m.Called(taskID, value, err)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ResumeRun")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(uuid.UUID, interface{}, error) error); ok {
 		r0 = rf(taskID, value, err)
@@ -209,6 +245,10 @@ func (_m *Runner) ResumeRun(taskID uuid.UUID, value interface{}, err error) erro
 func (_m *Runner) Run(ctx context.Context, run *pipeline.Run, l logger.Logger, saveSuccessfulTaskRuns bool, fn func(pg.Queryer) error) (bool, error) {
 	ret := _m.Called(ctx, run, l, saveSuccessfulTaskRuns, fn)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Run")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, *pipeline.Run, logger.Logger, bool, func(pg.Queryer) error) (bool, error)); ok {
@@ -233,6 +273,10 @@ func (_m *Runner) Run(ctx context.Context, run *pipeline.Run, l logger.Logger, s
 func (_m *Runner) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/services/relay/evm/mercury/mocks/async_deleter.go b/core/services/relay/evm/mercury/mocks/async_deleter.go
index c0f583efd18..b706e9c771e 100644
--- a/core/services/relay/evm/mercury/mocks/async_deleter.go
+++ b/core/services/relay/evm/mercury/mocks/async_deleter.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
diff --git a/core/services/relay/evm/mocks/loop_relay_adapter.go b/core/services/relay/evm/mocks/loop_relay_adapter.go
index 0376c9f27a4..5b927f1b8ac 100644
--- a/core/services/relay/evm/mocks/loop_relay_adapter.go
+++ b/core/services/relay/evm/mocks/loop_relay_adapter.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -22,6 +22,10 @@ type LoopRelayAdapter struct {
 func (_m *LoopRelayAdapter) Chain() legacyevm.Chain {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Chain")
+	}
+
 	var r0 legacyevm.Chain
 	if rf, ok := ret.Get(0).(func() legacyevm.Chain); ok {
 		r0 = rf()
@@ -38,6 +42,10 @@ func (_m *LoopRelayAdapter) Chain() legacyevm.Chain {
 func (_m *LoopRelayAdapter) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -52,6 +60,10 @@ func (_m *LoopRelayAdapter) Close() error {
 func (_m *LoopRelayAdapter) GetChainStatus(ctx context.Context) (types.ChainStatus, error) {
 	ret := _m.Called(ctx)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetChainStatus")
+	}
+
 	var r0 types.ChainStatus
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context) (types.ChainStatus, error)); ok {
@@ -76,6 +88,10 @@ func (_m *LoopRelayAdapter) GetChainStatus(ctx context.Context) (types.ChainStat
 func (_m *LoopRelayAdapter) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -92,6 +108,10 @@ func (_m *LoopRelayAdapter) HealthReport() map[string]error {
 func (_m *LoopRelayAdapter) ListNodeStatuses(ctx context.Context, pageSize int32, pageToken string) ([]types.NodeStatus, string, int, error) {
 	ret := _m.Called(ctx, pageSize, pageToken)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListNodeStatuses")
+	}
+
 	var r0 []types.NodeStatus
 	var r1 string
 	var r2 int
@@ -132,6 +152,10 @@ func (_m *LoopRelayAdapter) ListNodeStatuses(ctx context.Context, pageSize int32
 func (_m *LoopRelayAdapter) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -146,6 +170,10 @@ func (_m *LoopRelayAdapter) Name() string {
 func (_m *LoopRelayAdapter) NewConfigProvider(_a0 context.Context, _a1 types.RelayArgs) (types.ConfigProvider, error) {
 	ret := _m.Called(_a0, _a1)
 
+	if len(ret) == 0 {
+		panic("no return value specified for NewConfigProvider")
+	}
+
 	var r0 types.ConfigProvider
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, types.RelayArgs) (types.ConfigProvider, error)); ok {
@@ -172,6 +200,10 @@ func (_m *LoopRelayAdapter) NewConfigProvider(_a0 context.Context, _a1 types.Rel
 func (_m *LoopRelayAdapter) NewPluginProvider(_a0 context.Context, _a1 types.RelayArgs, _a2 types.PluginArgs) (types.PluginProvider, error) {
 	ret := _m.Called(_a0, _a1, _a2)
 
+	if len(ret) == 0 {
+		panic("no return value specified for NewPluginProvider")
+	}
+
 	var r0 types.PluginProvider
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, types.RelayArgs, types.PluginArgs) (types.PluginProvider, error)); ok {
@@ -198,6 +230,10 @@ func (_m *LoopRelayAdapter) NewPluginProvider(_a0 context.Context, _a1 types.Rel
 func (_m *LoopRelayAdapter) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -212,6 +248,10 @@ func (_m *LoopRelayAdapter) Ready() error {
 func (_m *LoopRelayAdapter) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
@@ -226,6 +266,10 @@ func (_m *LoopRelayAdapter) Start(_a0 context.Context) error {
 func (_m *LoopRelayAdapter) Transact(ctx context.Context, from string, to string, amount *big.Int, balanceCheck bool) error {
 	ret := _m.Called(ctx, from, to, amount, balanceCheck)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Transact")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, string, string, *big.Int, bool) error); ok {
 		r0 = rf(ctx, from, to, amount, balanceCheck)
diff --git a/core/services/relay/evm/mocks/request_round_db.go b/core/services/relay/evm/mocks/request_round_db.go
index 1727e8cc47d..eb27e8bd526 100644
--- a/core/services/relay/evm/mocks/request_round_db.go
+++ b/core/services/relay/evm/mocks/request_round_db.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type RequestRoundDB struct {
 func (_m *RequestRoundDB) LoadLatestRoundRequested() (ocr2aggregator.OCR2AggregatorRoundRequested, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LoadLatestRoundRequested")
+	}
+
 	var r0 ocr2aggregator.OCR2AggregatorRoundRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (ocr2aggregator.OCR2AggregatorRoundRequested, error)); ok {
@@ -41,6 +45,10 @@ func (_m *RequestRoundDB) LoadLatestRoundRequested() (ocr2aggregator.OCR2Aggrega
 func (_m *RequestRoundDB) SaveLatestRoundRequested(tx pg.Queryer, rr ocr2aggregator.OCR2AggregatorRoundRequested) error {
 	ret := _m.Called(tx, rr)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveLatestRoundRequested")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(pg.Queryer, ocr2aggregator.OCR2AggregatorRoundRequested) error); ok {
 		r0 = rf(tx, rr)
diff --git a/core/services/relay/evm/types/mocks/log_poller_wrapper.go b/core/services/relay/evm/types/mocks/log_poller_wrapper.go
index 6812ce5aba3..675cf317b14 100644
--- a/core/services/relay/evm/types/mocks/log_poller_wrapper.go
+++ b/core/services/relay/evm/types/mocks/log_poller_wrapper.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type LogPollerWrapper struct {
 func (_m *LogPollerWrapper) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -32,6 +36,10 @@ func (_m *LogPollerWrapper) Close() error {
 func (_m *LogPollerWrapper) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -48,6 +56,10 @@ func (_m *LogPollerWrapper) HealthReport() map[string]error {
 func (_m *LogPollerWrapper) LatestEvents() ([]types.OracleRequest, []types.OracleResponse, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestEvents")
+	}
+
 	var r0 []types.OracleRequest
 	var r1 []types.OracleResponse
 	var r2 error
@@ -83,6 +95,10 @@ func (_m *LogPollerWrapper) LatestEvents() ([]types.OracleRequest, []types.Oracl
 func (_m *LogPollerWrapper) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -97,6 +113,10 @@ func (_m *LogPollerWrapper) Name() string {
 func (_m *LogPollerWrapper) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -111,6 +131,10 @@ func (_m *LogPollerWrapper) Ready() error {
 func (_m *LogPollerWrapper) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/services/s4/mocks/orm.go b/core/services/s4/mocks/orm.go
index f053af9ca7b..706c1194293 100644
--- a/core/services/s4/mocks/orm.go
+++ b/core/services/s4/mocks/orm.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -28,6 +28,10 @@ func (_m *ORM) DeleteExpired(limit uint, utcNow time.Time, qopts ...pg.QOpt) (in
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteExpired")
+	}
+
 	var r0 int64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(uint, time.Time, ...pg.QOpt) (int64, error)); ok {
@@ -59,6 +63,10 @@ func (_m *ORM) Get(address *utils.Big, slotId uint, qopts ...pg.QOpt) (*s4.Row,
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *s4.Row
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*utils.Big, uint, ...pg.QOpt) (*s4.Row, error)); ok {
@@ -92,6 +100,10 @@ func (_m *ORM) GetSnapshot(addressRange *s4.AddressRange, qopts ...pg.QOpt) ([]*
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetSnapshot")
+	}
+
 	var r0 []*s4.SnapshotRow
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*s4.AddressRange, ...pg.QOpt) ([]*s4.SnapshotRow, error)); ok {
@@ -125,6 +137,10 @@ func (_m *ORM) GetUnconfirmedRows(limit uint, qopts ...pg.QOpt) ([]*s4.Row, erro
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUnconfirmedRows")
+	}
+
 	var r0 []*s4.Row
 	var r1 error
 	if rf, ok := ret.Get(0).(func(uint, ...pg.QOpt) ([]*s4.Row, error)); ok {
@@ -158,6 +174,10 @@ func (_m *ORM) Update(row *s4.Row, qopts ...pg.QOpt) error {
 	_ca = append(_ca, _va...)
 	ret := _m.Called(_ca...)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Update")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*s4.Row, ...pg.QOpt) error); ok {
 		r0 = rf(row, qopts...)
diff --git a/core/services/s4/mocks/storage.go b/core/services/s4/mocks/storage.go
index f4174f171b8..06fc153a358 100644
--- a/core/services/s4/mocks/storage.go
+++ b/core/services/s4/mocks/storage.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -21,6 +21,10 @@ type Storage struct {
 func (_m *Storage) Constraints() s4.Constraints {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Constraints")
+	}
+
 	var r0 s4.Constraints
 	if rf, ok := ret.Get(0).(func() s4.Constraints); ok {
 		r0 = rf()
@@ -35,6 +39,10 @@ func (_m *Storage) Constraints() s4.Constraints {
 func (_m *Storage) Get(ctx context.Context, key *s4.Key) (*s4.Record, *s4.Metadata, error) {
 	ret := _m.Called(ctx, key)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *s4.Record
 	var r1 *s4.Metadata
 	var r2 error
@@ -70,6 +78,10 @@ func (_m *Storage) Get(ctx context.Context, key *s4.Key) (*s4.Record, *s4.Metada
 func (_m *Storage) List(ctx context.Context, address common.Address) ([]*s4.SnapshotRow, error) {
 	ret := _m.Called(ctx, address)
 
+	if len(ret) == 0 {
+		panic("no return value specified for List")
+	}
+
 	var r0 []*s4.SnapshotRow
 	var r1 error
 	if rf, ok := ret.Get(0).(func(context.Context, common.Address) ([]*s4.SnapshotRow, error)); ok {
@@ -96,6 +108,10 @@ func (_m *Storage) List(ctx context.Context, address common.Address) ([]*s4.Snap
 func (_m *Storage) Put(ctx context.Context, key *s4.Key, record *s4.Record, signature []byte) error {
 	ret := _m.Called(ctx, key, record, signature)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Put")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context, *s4.Key, *s4.Record, []byte) error); ok {
 		r0 = rf(ctx, key, record, signature)
diff --git a/core/services/synchronization/mocks/telemetry_service.go b/core/services/synchronization/mocks/telemetry_service.go
index bd822666b97..375b46ad7bb 100644
--- a/core/services/synchronization/mocks/telemetry_service.go
+++ b/core/services/synchronization/mocks/telemetry_service.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -18,6 +18,10 @@ type TelemetryService struct {
 func (_m *TelemetryService) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -32,6 +36,10 @@ func (_m *TelemetryService) Close() error {
 func (_m *TelemetryService) HealthReport() map[string]error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for HealthReport")
+	}
+
 	var r0 map[string]error
 	if rf, ok := ret.Get(0).(func() map[string]error); ok {
 		r0 = rf()
@@ -48,6 +56,10 @@ func (_m *TelemetryService) HealthReport() map[string]error {
 func (_m *TelemetryService) Name() string {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Name")
+	}
+
 	var r0 string
 	if rf, ok := ret.Get(0).(func() string); ok {
 		r0 = rf()
@@ -62,6 +74,10 @@ func (_m *TelemetryService) Name() string {
 func (_m *TelemetryService) Ready() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Ready")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -81,6 +97,10 @@ func (_m *TelemetryService) Send(ctx context.Context, telemetry []byte, contract
 func (_m *TelemetryService) Start(_a0 context.Context) error {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Start")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
 		r0 = rf(_a0)
diff --git a/core/services/vrf/mocks/aggregator_v3_interface.go b/core/services/vrf/mocks/aggregator_v3_interface.go
index 956e315f297..46ca11aa200 100644
--- a/core/services/vrf/mocks/aggregator_v3_interface.go
+++ b/core/services/vrf/mocks/aggregator_v3_interface.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -23,6 +23,10 @@ type AggregatorV3Interface struct {
 func (_m *AggregatorV3Interface) Address() common.Address {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Address")
+	}
+
 	var r0 common.Address
 	if rf, ok := ret.Get(0).(func() common.Address); ok {
 		r0 = rf()
@@ -39,6 +43,10 @@ func (_m *AggregatorV3Interface) Address() common.Address {
 func (_m *AggregatorV3Interface) Decimals(opts *bind.CallOpts) (uint8, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Decimals")
+	}
+
 	var r0 uint8
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint8, error)); ok {
@@ -63,6 +71,10 @@ func (_m *AggregatorV3Interface) Decimals(opts *bind.CallOpts) (uint8, error) {
 func (_m *AggregatorV3Interface) Description(opts *bind.CallOpts) (string, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Description")
+	}
+
 	var r0 string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (string, error)); ok {
@@ -87,6 +99,10 @@ func (_m *AggregatorV3Interface) Description(opts *bind.CallOpts) (string, error
 func (_m *AggregatorV3Interface) GetRoundData(opts *bind.CallOpts, _roundId *big.Int) (aggregator_v3_interface.GetRoundData, error) {
 	ret := _m.Called(opts, _roundId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetRoundData")
+	}
+
 	var r0 aggregator_v3_interface.GetRoundData
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int) (aggregator_v3_interface.GetRoundData, error)); ok {
@@ -111,6 +127,10 @@ func (_m *AggregatorV3Interface) GetRoundData(opts *bind.CallOpts, _roundId *big
 func (_m *AggregatorV3Interface) LatestRoundData(opts *bind.CallOpts) (aggregator_v3_interface.LatestRoundData, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LatestRoundData")
+	}
+
 	var r0 aggregator_v3_interface.LatestRoundData
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (aggregator_v3_interface.LatestRoundData, error)); ok {
@@ -135,6 +155,10 @@ func (_m *AggregatorV3Interface) LatestRoundData(opts *bind.CallOpts) (aggregato
 func (_m *AggregatorV3Interface) Version(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Version")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
diff --git a/core/services/vrf/mocks/config.go b/core/services/vrf/mocks/config.go
index 72d5960f2c9..b46a28ec037 100644
--- a/core/services/vrf/mocks/config.go
+++ b/core/services/vrf/mocks/config.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -13,6 +13,10 @@ type Config struct {
 func (_m *Config) FinalityDepth() uint32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for FinalityDepth")
+	}
+
 	var r0 uint32
 	if rf, ok := ret.Get(0).(func() uint32); ok {
 		r0 = rf()
@@ -27,6 +31,10 @@ func (_m *Config) FinalityDepth() uint32 {
 func (_m *Config) MinIncomingConfirmations() uint32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for MinIncomingConfirmations")
+	}
+
 	var r0 uint32
 	if rf, ok := ret.Get(0).(func() uint32); ok {
 		r0 = rf()
diff --git a/core/services/vrf/mocks/fee_config.go b/core/services/vrf/mocks/fee_config.go
index 067ce7e4455..2f33415b338 100644
--- a/core/services/vrf/mocks/fee_config.go
+++ b/core/services/vrf/mocks/fee_config.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -20,6 +20,10 @@ type FeeConfig struct {
 func (_m *FeeConfig) LimitDefault() uint32 {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LimitDefault")
+	}
+
 	var r0 uint32
 	if rf, ok := ret.Get(0).(func() uint32); ok {
 		r0 = rf()
@@ -34,6 +38,10 @@ func (_m *FeeConfig) LimitDefault() uint32 {
 func (_m *FeeConfig) LimitJobType() config.LimitJobType {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for LimitJobType")
+	}
+
 	var r0 config.LimitJobType
 	if rf, ok := ret.Get(0).(func() config.LimitJobType); ok {
 		r0 = rf()
@@ -50,6 +58,10 @@ func (_m *FeeConfig) LimitJobType() config.LimitJobType {
 func (_m *FeeConfig) PriceMaxKey(addr common.Address) *assets.Wei {
 	ret := _m.Called(addr)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PriceMaxKey")
+	}
+
 	var r0 *assets.Wei
 	if rf, ok := ret.Get(0).(func(common.Address) *assets.Wei); ok {
 		r0 = rf(addr)
diff --git a/core/services/vrf/mocks/vrf_coordinator_v2.go b/core/services/vrf/mocks/vrf_coordinator_v2.go
index c39995b38e9..529bc789257 100644
--- a/core/services/vrf/mocks/vrf_coordinator_v2.go
+++ b/core/services/vrf/mocks/vrf_coordinator_v2.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -28,6 +28,10 @@ type VRFCoordinatorV2Interface struct {
 func (_m *VRFCoordinatorV2Interface) AcceptOwnership(opts *bind.TransactOpts) (*types.Transaction, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AcceptOwnership")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts) (*types.Transaction, error)); ok {
@@ -54,6 +58,10 @@ func (_m *VRFCoordinatorV2Interface) AcceptOwnership(opts *bind.TransactOpts) (*
 func (_m *VRFCoordinatorV2Interface) AcceptSubscriptionOwnerTransfer(opts *bind.TransactOpts, subId uint64) (*types.Transaction, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AcceptSubscriptionOwnerTransfer")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, uint64) (*types.Transaction, error)); ok {
@@ -80,6 +88,10 @@ func (_m *VRFCoordinatorV2Interface) AcceptSubscriptionOwnerTransfer(opts *bind.
 func (_m *VRFCoordinatorV2Interface) AddConsumer(opts *bind.TransactOpts, subId uint64, consumer common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, subId, consumer)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AddConsumer")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, uint64, common.Address) (*types.Transaction, error)); ok {
@@ -106,6 +118,10 @@ func (_m *VRFCoordinatorV2Interface) AddConsumer(opts *bind.TransactOpts, subId
 func (_m *VRFCoordinatorV2Interface) Address() common.Address {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Address")
+	}
+
 	var r0 common.Address
 	if rf, ok := ret.Get(0).(func() common.Address); ok {
 		r0 = rf()
@@ -122,6 +138,10 @@ func (_m *VRFCoordinatorV2Interface) Address() common.Address {
 func (_m *VRFCoordinatorV2Interface) BLOCKHASHSTORE(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for BLOCKHASHSTORE")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -148,6 +168,10 @@ func (_m *VRFCoordinatorV2Interface) BLOCKHASHSTORE(opts *bind.CallOpts) (common
 func (_m *VRFCoordinatorV2Interface) CancelSubscription(opts *bind.TransactOpts, subId uint64, to common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, subId, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CancelSubscription")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, uint64, common.Address) (*types.Transaction, error)); ok {
@@ -174,6 +198,10 @@ func (_m *VRFCoordinatorV2Interface) CancelSubscription(opts *bind.TransactOpts,
 func (_m *VRFCoordinatorV2Interface) CreateSubscription(opts *bind.TransactOpts) (*types.Transaction, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateSubscription")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts) (*types.Transaction, error)); ok {
@@ -200,6 +228,10 @@ func (_m *VRFCoordinatorV2Interface) CreateSubscription(opts *bind.TransactOpts)
 func (_m *VRFCoordinatorV2Interface) DeregisterProvingKey(opts *bind.TransactOpts, publicProvingKey [2]*big.Int) (*types.Transaction, error) {
 	ret := _m.Called(opts, publicProvingKey)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeregisterProvingKey")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, [2]*big.Int) (*types.Transaction, error)); ok {
@@ -226,6 +258,10 @@ func (_m *VRFCoordinatorV2Interface) DeregisterProvingKey(opts *bind.TransactOpt
 func (_m *VRFCoordinatorV2Interface) FilterConfigSet(opts *bind.FilterOpts) (*vrf_coordinator_v2.VRFCoordinatorV2ConfigSetIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterConfigSet")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2ConfigSetIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*vrf_coordinator_v2.VRFCoordinatorV2ConfigSetIterator, error)); ok {
@@ -252,6 +288,10 @@ func (_m *VRFCoordinatorV2Interface) FilterConfigSet(opts *bind.FilterOpts) (*vr
 func (_m *VRFCoordinatorV2Interface) FilterFundsRecovered(opts *bind.FilterOpts) (*vrf_coordinator_v2.VRFCoordinatorV2FundsRecoveredIterator, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterFundsRecovered")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2FundsRecoveredIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts) (*vrf_coordinator_v2.VRFCoordinatorV2FundsRecoveredIterator, error)); ok {
@@ -278,6 +318,10 @@ func (_m *VRFCoordinatorV2Interface) FilterFundsRecovered(opts *bind.FilterOpts)
 func (_m *VRFCoordinatorV2Interface) FilterOwnershipTransferRequested(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferRequestedIterator, error) {
 	ret := _m.Called(opts, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOwnershipTransferRequested")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferRequestedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferRequestedIterator, error)); ok {
@@ -304,6 +348,10 @@ func (_m *VRFCoordinatorV2Interface) FilterOwnershipTransferRequested(opts *bind
 func (_m *VRFCoordinatorV2Interface) FilterOwnershipTransferred(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferredIterator, error) {
 	ret := _m.Called(opts, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterOwnershipTransferred")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferredIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address, []common.Address) (*vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferredIterator, error)); ok {
@@ -330,6 +378,10 @@ func (_m *VRFCoordinatorV2Interface) FilterOwnershipTransferred(opts *bind.Filte
 func (_m *VRFCoordinatorV2Interface) FilterProvingKeyDeregistered(opts *bind.FilterOpts, oracle []common.Address) (*vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyDeregisteredIterator, error) {
 	ret := _m.Called(opts, oracle)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterProvingKeyDeregistered")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyDeregisteredIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) (*vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyDeregisteredIterator, error)); ok {
@@ -356,6 +408,10 @@ func (_m *VRFCoordinatorV2Interface) FilterProvingKeyDeregistered(opts *bind.Fil
 func (_m *VRFCoordinatorV2Interface) FilterProvingKeyRegistered(opts *bind.FilterOpts, oracle []common.Address) (*vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyRegisteredIterator, error) {
 	ret := _m.Called(opts, oracle)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterProvingKeyRegistered")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyRegisteredIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []common.Address) (*vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyRegisteredIterator, error)); ok {
@@ -382,6 +438,10 @@ func (_m *VRFCoordinatorV2Interface) FilterProvingKeyRegistered(opts *bind.Filte
 func (_m *VRFCoordinatorV2Interface) FilterRandomWordsFulfilled(opts *bind.FilterOpts, requestId []*big.Int) (*vrf_coordinator_v2.VRFCoordinatorV2RandomWordsFulfilledIterator, error) {
 	ret := _m.Called(opts, requestId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterRandomWordsFulfilled")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2RandomWordsFulfilledIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []*big.Int) (*vrf_coordinator_v2.VRFCoordinatorV2RandomWordsFulfilledIterator, error)); ok {
@@ -408,6 +468,10 @@ func (_m *VRFCoordinatorV2Interface) FilterRandomWordsFulfilled(opts *bind.Filte
 func (_m *VRFCoordinatorV2Interface) FilterRandomWordsRequested(opts *bind.FilterOpts, keyHash [][32]byte, subId []uint64, sender []common.Address) (*vrf_coordinator_v2.VRFCoordinatorV2RandomWordsRequestedIterator, error) {
 	ret := _m.Called(opts, keyHash, subId, sender)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterRandomWordsRequested")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2RandomWordsRequestedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, [][32]byte, []uint64, []common.Address) (*vrf_coordinator_v2.VRFCoordinatorV2RandomWordsRequestedIterator, error)); ok {
@@ -434,6 +498,10 @@ func (_m *VRFCoordinatorV2Interface) FilterRandomWordsRequested(opts *bind.Filte
 func (_m *VRFCoordinatorV2Interface) FilterSubscriptionCanceled(opts *bind.FilterOpts, subId []uint64) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCanceledIterator, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubscriptionCanceled")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCanceledIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCanceledIterator, error)); ok {
@@ -460,6 +528,10 @@ func (_m *VRFCoordinatorV2Interface) FilterSubscriptionCanceled(opts *bind.Filte
 func (_m *VRFCoordinatorV2Interface) FilterSubscriptionConsumerAdded(opts *bind.FilterOpts, subId []uint64) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerAddedIterator, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubscriptionConsumerAdded")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerAddedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerAddedIterator, error)); ok {
@@ -486,6 +558,10 @@ func (_m *VRFCoordinatorV2Interface) FilterSubscriptionConsumerAdded(opts *bind.
 func (_m *VRFCoordinatorV2Interface) FilterSubscriptionConsumerRemoved(opts *bind.FilterOpts, subId []uint64) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerRemovedIterator, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubscriptionConsumerRemoved")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerRemovedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerRemovedIterator, error)); ok {
@@ -512,6 +588,10 @@ func (_m *VRFCoordinatorV2Interface) FilterSubscriptionConsumerRemoved(opts *bin
 func (_m *VRFCoordinatorV2Interface) FilterSubscriptionCreated(opts *bind.FilterOpts, subId []uint64) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCreatedIterator, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubscriptionCreated")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCreatedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCreatedIterator, error)); ok {
@@ -538,6 +618,10 @@ func (_m *VRFCoordinatorV2Interface) FilterSubscriptionCreated(opts *bind.Filter
 func (_m *VRFCoordinatorV2Interface) FilterSubscriptionFunded(opts *bind.FilterOpts, subId []uint64) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionFundedIterator, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubscriptionFunded")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionFundedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionFundedIterator, error)); ok {
@@ -564,6 +648,10 @@ func (_m *VRFCoordinatorV2Interface) FilterSubscriptionFunded(opts *bind.FilterO
 func (_m *VRFCoordinatorV2Interface) FilterSubscriptionOwnerTransferRequested(opts *bind.FilterOpts, subId []uint64) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferRequestedIterator, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubscriptionOwnerTransferRequested")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferRequestedIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferRequestedIterator, error)); ok {
@@ -590,6 +678,10 @@ func (_m *VRFCoordinatorV2Interface) FilterSubscriptionOwnerTransferRequested(op
 func (_m *VRFCoordinatorV2Interface) FilterSubscriptionOwnerTransferred(opts *bind.FilterOpts, subId []uint64) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferredIterator, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FilterSubscriptionOwnerTransferred")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferredIterator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.FilterOpts, []uint64) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferredIterator, error)); ok {
@@ -616,6 +708,10 @@ func (_m *VRFCoordinatorV2Interface) FilterSubscriptionOwnerTransferred(opts *bi
 func (_m *VRFCoordinatorV2Interface) FulfillRandomWords(opts *bind.TransactOpts, proof vrf_coordinator_v2.VRFProof, rc vrf_coordinator_v2.VRFCoordinatorV2RequestCommitment) (*types.Transaction, error) {
 	ret := _m.Called(opts, proof, rc)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FulfillRandomWords")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, vrf_coordinator_v2.VRFProof, vrf_coordinator_v2.VRFCoordinatorV2RequestCommitment) (*types.Transaction, error)); ok {
@@ -642,6 +738,10 @@ func (_m *VRFCoordinatorV2Interface) FulfillRandomWords(opts *bind.TransactOpts,
 func (_m *VRFCoordinatorV2Interface) GetCommitment(opts *bind.CallOpts, requestId *big.Int) ([32]byte, error) {
 	ret := _m.Called(opts, requestId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetCommitment")
+	}
+
 	var r0 [32]byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, *big.Int) ([32]byte, error)); ok {
@@ -668,6 +768,10 @@ func (_m *VRFCoordinatorV2Interface) GetCommitment(opts *bind.CallOpts, requestI
 func (_m *VRFCoordinatorV2Interface) GetConfig(opts *bind.CallOpts) (vrf_coordinator_v2.GetConfig, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetConfig")
+	}
+
 	var r0 vrf_coordinator_v2.GetConfig
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (vrf_coordinator_v2.GetConfig, error)); ok {
@@ -692,6 +796,10 @@ func (_m *VRFCoordinatorV2Interface) GetConfig(opts *bind.CallOpts) (vrf_coordin
 func (_m *VRFCoordinatorV2Interface) GetCurrentSubId(opts *bind.CallOpts) (uint64, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetCurrentSubId")
+	}
+
 	var r0 uint64
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint64, error)); ok {
@@ -716,6 +824,10 @@ func (_m *VRFCoordinatorV2Interface) GetCurrentSubId(opts *bind.CallOpts) (uint6
 func (_m *VRFCoordinatorV2Interface) GetFallbackWeiPerUnitLink(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetFallbackWeiPerUnitLink")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -742,6 +854,10 @@ func (_m *VRFCoordinatorV2Interface) GetFallbackWeiPerUnitLink(opts *bind.CallOp
 func (_m *VRFCoordinatorV2Interface) GetFeeConfig(opts *bind.CallOpts) (vrf_coordinator_v2.GetFeeConfig, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetFeeConfig")
+	}
+
 	var r0 vrf_coordinator_v2.GetFeeConfig
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (vrf_coordinator_v2.GetFeeConfig, error)); ok {
@@ -766,6 +882,10 @@ func (_m *VRFCoordinatorV2Interface) GetFeeConfig(opts *bind.CallOpts) (vrf_coor
 func (_m *VRFCoordinatorV2Interface) GetFeeTier(opts *bind.CallOpts, reqCount uint64) (uint32, error) {
 	ret := _m.Called(opts, reqCount)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetFeeTier")
+	}
+
 	var r0 uint32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64) (uint32, error)); ok {
@@ -790,6 +910,10 @@ func (_m *VRFCoordinatorV2Interface) GetFeeTier(opts *bind.CallOpts, reqCount ui
 func (_m *VRFCoordinatorV2Interface) GetRequestConfig(opts *bind.CallOpts) (uint16, uint32, [][32]byte, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetRequestConfig")
+	}
+
 	var r0 uint16
 	var r1 uint32
 	var r2 [][32]byte
@@ -830,6 +954,10 @@ func (_m *VRFCoordinatorV2Interface) GetRequestConfig(opts *bind.CallOpts) (uint
 func (_m *VRFCoordinatorV2Interface) GetSubscription(opts *bind.CallOpts, subId uint64) (vrf_coordinator_v2.GetSubscription, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetSubscription")
+	}
+
 	var r0 vrf_coordinator_v2.GetSubscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64) (vrf_coordinator_v2.GetSubscription, error)); ok {
@@ -854,6 +982,10 @@ func (_m *VRFCoordinatorV2Interface) GetSubscription(opts *bind.CallOpts, subId
 func (_m *VRFCoordinatorV2Interface) GetTotalBalance(opts *bind.CallOpts) (*big.Int, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetTotalBalance")
+	}
+
 	var r0 *big.Int
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (*big.Int, error)); ok {
@@ -880,6 +1012,10 @@ func (_m *VRFCoordinatorV2Interface) GetTotalBalance(opts *bind.CallOpts) (*big.
 func (_m *VRFCoordinatorV2Interface) HashOfKey(opts *bind.CallOpts, publicKey [2]*big.Int) ([32]byte, error) {
 	ret := _m.Called(opts, publicKey)
 
+	if len(ret) == 0 {
+		panic("no return value specified for HashOfKey")
+	}
+
 	var r0 [32]byte
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, [2]*big.Int) ([32]byte, error)); ok {
@@ -906,6 +1042,10 @@ func (_m *VRFCoordinatorV2Interface) HashOfKey(opts *bind.CallOpts, publicKey [2
 func (_m *VRFCoordinatorV2Interface) LINK(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LINK")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -932,6 +1072,10 @@ func (_m *VRFCoordinatorV2Interface) LINK(opts *bind.CallOpts) (common.Address,
 func (_m *VRFCoordinatorV2Interface) LINKETHFEED(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for LINKETHFEED")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -958,6 +1102,10 @@ func (_m *VRFCoordinatorV2Interface) LINKETHFEED(opts *bind.CallOpts) (common.Ad
 func (_m *VRFCoordinatorV2Interface) MAXCONSUMERS(opts *bind.CallOpts) (uint16, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MAXCONSUMERS")
+	}
+
 	var r0 uint16
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint16, error)); ok {
@@ -982,6 +1130,10 @@ func (_m *VRFCoordinatorV2Interface) MAXCONSUMERS(opts *bind.CallOpts) (uint16,
 func (_m *VRFCoordinatorV2Interface) MAXNUMWORDS(opts *bind.CallOpts) (uint32, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MAXNUMWORDS")
+	}
+
 	var r0 uint32
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint32, error)); ok {
@@ -1006,6 +1158,10 @@ func (_m *VRFCoordinatorV2Interface) MAXNUMWORDS(opts *bind.CallOpts) (uint32, e
 func (_m *VRFCoordinatorV2Interface) MAXREQUESTCONFIRMATIONS(opts *bind.CallOpts) (uint16, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for MAXREQUESTCONFIRMATIONS")
+	}
+
 	var r0 uint16
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (uint16, error)); ok {
@@ -1030,6 +1186,10 @@ func (_m *VRFCoordinatorV2Interface) MAXREQUESTCONFIRMATIONS(opts *bind.CallOpts
 func (_m *VRFCoordinatorV2Interface) OnTokenTransfer(opts *bind.TransactOpts, arg0 common.Address, amount *big.Int, data []byte) (*types.Transaction, error) {
 	ret := _m.Called(opts, arg0, amount, data)
 
+	if len(ret) == 0 {
+		panic("no return value specified for OnTokenTransfer")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address, *big.Int, []byte) (*types.Transaction, error)); ok {
@@ -1056,6 +1216,10 @@ func (_m *VRFCoordinatorV2Interface) OnTokenTransfer(opts *bind.TransactOpts, ar
 func (_m *VRFCoordinatorV2Interface) OracleWithdraw(opts *bind.TransactOpts, recipient common.Address, amount *big.Int) (*types.Transaction, error) {
 	ret := _m.Called(opts, recipient, amount)
 
+	if len(ret) == 0 {
+		panic("no return value specified for OracleWithdraw")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address, *big.Int) (*types.Transaction, error)); ok {
@@ -1082,6 +1246,10 @@ func (_m *VRFCoordinatorV2Interface) OracleWithdraw(opts *bind.TransactOpts, rec
 func (_m *VRFCoordinatorV2Interface) Owner(opts *bind.CallOpts) (common.Address, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Owner")
+	}
+
 	var r0 common.Address
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (common.Address, error)); ok {
@@ -1108,6 +1276,10 @@ func (_m *VRFCoordinatorV2Interface) Owner(opts *bind.CallOpts) (common.Address,
 func (_m *VRFCoordinatorV2Interface) OwnerCancelSubscription(opts *bind.TransactOpts, subId uint64) (*types.Transaction, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for OwnerCancelSubscription")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, uint64) (*types.Transaction, error)); ok {
@@ -1134,6 +1306,10 @@ func (_m *VRFCoordinatorV2Interface) OwnerCancelSubscription(opts *bind.Transact
 func (_m *VRFCoordinatorV2Interface) ParseConfigSet(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2ConfigSet, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseConfigSet")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2ConfigSet
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2ConfigSet, error)); ok {
@@ -1160,6 +1336,10 @@ func (_m *VRFCoordinatorV2Interface) ParseConfigSet(log types.Log) (*vrf_coordin
 func (_m *VRFCoordinatorV2Interface) ParseFundsRecovered(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2FundsRecovered, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseFundsRecovered")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2FundsRecovered
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2FundsRecovered, error)); ok {
@@ -1186,6 +1366,10 @@ func (_m *VRFCoordinatorV2Interface) ParseFundsRecovered(log types.Log) (*vrf_co
 func (_m *VRFCoordinatorV2Interface) ParseLog(log types.Log) (generated.AbigenLog, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseLog")
+	}
+
 	var r0 generated.AbigenLog
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (generated.AbigenLog, error)); ok {
@@ -1212,6 +1396,10 @@ func (_m *VRFCoordinatorV2Interface) ParseLog(log types.Log) (generated.AbigenLo
 func (_m *VRFCoordinatorV2Interface) ParseOwnershipTransferRequested(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferRequested, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOwnershipTransferRequested")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferRequested, error)); ok {
@@ -1238,6 +1426,10 @@ func (_m *VRFCoordinatorV2Interface) ParseOwnershipTransferRequested(log types.L
 func (_m *VRFCoordinatorV2Interface) ParseOwnershipTransferred(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferred, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseOwnershipTransferred")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferred
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferred, error)); ok {
@@ -1264,6 +1456,10 @@ func (_m *VRFCoordinatorV2Interface) ParseOwnershipTransferred(log types.Log) (*
 func (_m *VRFCoordinatorV2Interface) ParseProvingKeyDeregistered(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyDeregistered, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseProvingKeyDeregistered")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyDeregistered
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyDeregistered, error)); ok {
@@ -1290,6 +1486,10 @@ func (_m *VRFCoordinatorV2Interface) ParseProvingKeyDeregistered(log types.Log)
 func (_m *VRFCoordinatorV2Interface) ParseProvingKeyRegistered(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyRegistered, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseProvingKeyRegistered")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyRegistered
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyRegistered, error)); ok {
@@ -1316,6 +1516,10 @@ func (_m *VRFCoordinatorV2Interface) ParseProvingKeyRegistered(log types.Log) (*
 func (_m *VRFCoordinatorV2Interface) ParseRandomWordsFulfilled(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2RandomWordsFulfilled, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseRandomWordsFulfilled")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2RandomWordsFulfilled
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2RandomWordsFulfilled, error)); ok {
@@ -1342,6 +1546,10 @@ func (_m *VRFCoordinatorV2Interface) ParseRandomWordsFulfilled(log types.Log) (*
 func (_m *VRFCoordinatorV2Interface) ParseRandomWordsRequested(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2RandomWordsRequested, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseRandomWordsRequested")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2RandomWordsRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2RandomWordsRequested, error)); ok {
@@ -1368,6 +1576,10 @@ func (_m *VRFCoordinatorV2Interface) ParseRandomWordsRequested(log types.Log) (*
 func (_m *VRFCoordinatorV2Interface) ParseSubscriptionCanceled(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCanceled, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubscriptionCanceled")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCanceled
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCanceled, error)); ok {
@@ -1394,6 +1606,10 @@ func (_m *VRFCoordinatorV2Interface) ParseSubscriptionCanceled(log types.Log) (*
 func (_m *VRFCoordinatorV2Interface) ParseSubscriptionConsumerAdded(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerAdded, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubscriptionConsumerAdded")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerAdded
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerAdded, error)); ok {
@@ -1420,6 +1636,10 @@ func (_m *VRFCoordinatorV2Interface) ParseSubscriptionConsumerAdded(log types.Lo
 func (_m *VRFCoordinatorV2Interface) ParseSubscriptionConsumerRemoved(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerRemoved, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubscriptionConsumerRemoved")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerRemoved
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerRemoved, error)); ok {
@@ -1446,6 +1666,10 @@ func (_m *VRFCoordinatorV2Interface) ParseSubscriptionConsumerRemoved(log types.
 func (_m *VRFCoordinatorV2Interface) ParseSubscriptionCreated(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCreated, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubscriptionCreated")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCreated
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCreated, error)); ok {
@@ -1472,6 +1696,10 @@ func (_m *VRFCoordinatorV2Interface) ParseSubscriptionCreated(log types.Log) (*v
 func (_m *VRFCoordinatorV2Interface) ParseSubscriptionFunded(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionFunded, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubscriptionFunded")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionFunded
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionFunded, error)); ok {
@@ -1498,6 +1726,10 @@ func (_m *VRFCoordinatorV2Interface) ParseSubscriptionFunded(log types.Log) (*vr
 func (_m *VRFCoordinatorV2Interface) ParseSubscriptionOwnerTransferRequested(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferRequested, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubscriptionOwnerTransferRequested")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferRequested
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferRequested, error)); ok {
@@ -1524,6 +1756,10 @@ func (_m *VRFCoordinatorV2Interface) ParseSubscriptionOwnerTransferRequested(log
 func (_m *VRFCoordinatorV2Interface) ParseSubscriptionOwnerTransferred(log types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferred, error) {
 	ret := _m.Called(log)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ParseSubscriptionOwnerTransferred")
+	}
+
 	var r0 *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferred
 	var r1 error
 	if rf, ok := ret.Get(0).(func(types.Log) (*vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferred, error)); ok {
@@ -1550,6 +1786,10 @@ func (_m *VRFCoordinatorV2Interface) ParseSubscriptionOwnerTransferred(log types
 func (_m *VRFCoordinatorV2Interface) PendingRequestExists(opts *bind.CallOpts, subId uint64) (bool, error) {
 	ret := _m.Called(opts, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for PendingRequestExists")
+	}
+
 	var r0 bool
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts, uint64) (bool, error)); ok {
@@ -1574,6 +1814,10 @@ func (_m *VRFCoordinatorV2Interface) PendingRequestExists(opts *bind.CallOpts, s
 func (_m *VRFCoordinatorV2Interface) RecoverFunds(opts *bind.TransactOpts, to common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RecoverFunds")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -1600,6 +1844,10 @@ func (_m *VRFCoordinatorV2Interface) RecoverFunds(opts *bind.TransactOpts, to co
 func (_m *VRFCoordinatorV2Interface) RegisterProvingKey(opts *bind.TransactOpts, oracle common.Address, publicProvingKey [2]*big.Int) (*types.Transaction, error) {
 	ret := _m.Called(opts, oracle, publicProvingKey)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RegisterProvingKey")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address, [2]*big.Int) (*types.Transaction, error)); ok {
@@ -1626,6 +1874,10 @@ func (_m *VRFCoordinatorV2Interface) RegisterProvingKey(opts *bind.TransactOpts,
 func (_m *VRFCoordinatorV2Interface) RemoveConsumer(opts *bind.TransactOpts, subId uint64, consumer common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, subId, consumer)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RemoveConsumer")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, uint64, common.Address) (*types.Transaction, error)); ok {
@@ -1652,6 +1904,10 @@ func (_m *VRFCoordinatorV2Interface) RemoveConsumer(opts *bind.TransactOpts, sub
 func (_m *VRFCoordinatorV2Interface) RequestRandomWords(opts *bind.TransactOpts, keyHash [32]byte, subId uint64, requestConfirmations uint16, callbackGasLimit uint32, numWords uint32) (*types.Transaction, error) {
 	ret := _m.Called(opts, keyHash, subId, requestConfirmations, callbackGasLimit, numWords)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RequestRandomWords")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, [32]byte, uint64, uint16, uint32, uint32) (*types.Transaction, error)); ok {
@@ -1678,6 +1934,10 @@ func (_m *VRFCoordinatorV2Interface) RequestRandomWords(opts *bind.TransactOpts,
 func (_m *VRFCoordinatorV2Interface) RequestSubscriptionOwnerTransfer(opts *bind.TransactOpts, subId uint64, newOwner common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, subId, newOwner)
 
+	if len(ret) == 0 {
+		panic("no return value specified for RequestSubscriptionOwnerTransfer")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, uint64, common.Address) (*types.Transaction, error)); ok {
@@ -1704,6 +1964,10 @@ func (_m *VRFCoordinatorV2Interface) RequestSubscriptionOwnerTransfer(opts *bind
 func (_m *VRFCoordinatorV2Interface) SetConfig(opts *bind.TransactOpts, minimumRequestConfirmations uint16, maxGasLimit uint32, stalenessSeconds uint32, gasAfterPaymentCalculation uint32, fallbackWeiPerUnitLink *big.Int, feeConfig vrf_coordinator_v2.VRFCoordinatorV2FeeConfig) (*types.Transaction, error) {
 	ret := _m.Called(opts, minimumRequestConfirmations, maxGasLimit, stalenessSeconds, gasAfterPaymentCalculation, fallbackWeiPerUnitLink, feeConfig)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetConfig")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, uint16, uint32, uint32, uint32, *big.Int, vrf_coordinator_v2.VRFCoordinatorV2FeeConfig) (*types.Transaction, error)); ok {
@@ -1730,6 +1994,10 @@ func (_m *VRFCoordinatorV2Interface) SetConfig(opts *bind.TransactOpts, minimumR
 func (_m *VRFCoordinatorV2Interface) TransferOwnership(opts *bind.TransactOpts, to common.Address) (*types.Transaction, error) {
 	ret := _m.Called(opts, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TransferOwnership")
+	}
+
 	var r0 *types.Transaction
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.TransactOpts, common.Address) (*types.Transaction, error)); ok {
@@ -1756,6 +2024,10 @@ func (_m *VRFCoordinatorV2Interface) TransferOwnership(opts *bind.TransactOpts,
 func (_m *VRFCoordinatorV2Interface) TypeAndVersion(opts *bind.CallOpts) (string, error) {
 	ret := _m.Called(opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TypeAndVersion")
+	}
+
 	var r0 string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.CallOpts) (string, error)); ok {
@@ -1780,6 +2052,10 @@ func (_m *VRFCoordinatorV2Interface) TypeAndVersion(opts *bind.CallOpts) (string
 func (_m *VRFCoordinatorV2Interface) WatchConfigSet(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2ConfigSet) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchConfigSet")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2ConfigSet) (event.Subscription, error)); ok {
@@ -1806,6 +2082,10 @@ func (_m *VRFCoordinatorV2Interface) WatchConfigSet(opts *bind.WatchOpts, sink c
 func (_m *VRFCoordinatorV2Interface) WatchFundsRecovered(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2FundsRecovered) (event.Subscription, error) {
 	ret := _m.Called(opts, sink)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchFundsRecovered")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2FundsRecovered) (event.Subscription, error)); ok {
@@ -1832,6 +2112,10 @@ func (_m *VRFCoordinatorV2Interface) WatchFundsRecovered(opts *bind.WatchOpts, s
 func (_m *VRFCoordinatorV2Interface) WatchOwnershipTransferRequested(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferRequested, from []common.Address, to []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOwnershipTransferRequested")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferRequested, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -1858,6 +2142,10 @@ func (_m *VRFCoordinatorV2Interface) WatchOwnershipTransferRequested(opts *bind.
 func (_m *VRFCoordinatorV2Interface) WatchOwnershipTransferred(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferred, from []common.Address, to []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, from, to)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchOwnershipTransferred")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2OwnershipTransferred, []common.Address, []common.Address) (event.Subscription, error)); ok {
@@ -1884,6 +2172,10 @@ func (_m *VRFCoordinatorV2Interface) WatchOwnershipTransferred(opts *bind.WatchO
 func (_m *VRFCoordinatorV2Interface) WatchProvingKeyDeregistered(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyDeregistered, oracle []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, oracle)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchProvingKeyDeregistered")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyDeregistered, []common.Address) (event.Subscription, error)); ok {
@@ -1910,6 +2202,10 @@ func (_m *VRFCoordinatorV2Interface) WatchProvingKeyDeregistered(opts *bind.Watc
 func (_m *VRFCoordinatorV2Interface) WatchProvingKeyRegistered(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyRegistered, oracle []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, oracle)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchProvingKeyRegistered")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2ProvingKeyRegistered, []common.Address) (event.Subscription, error)); ok {
@@ -1936,6 +2232,10 @@ func (_m *VRFCoordinatorV2Interface) WatchProvingKeyRegistered(opts *bind.WatchO
 func (_m *VRFCoordinatorV2Interface) WatchRandomWordsFulfilled(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2RandomWordsFulfilled, requestId []*big.Int) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, requestId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchRandomWordsFulfilled")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2RandomWordsFulfilled, []*big.Int) (event.Subscription, error)); ok {
@@ -1962,6 +2262,10 @@ func (_m *VRFCoordinatorV2Interface) WatchRandomWordsFulfilled(opts *bind.WatchO
 func (_m *VRFCoordinatorV2Interface) WatchRandomWordsRequested(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2RandomWordsRequested, keyHash [][32]byte, subId []uint64, sender []common.Address) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, keyHash, subId, sender)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchRandomWordsRequested")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2RandomWordsRequested, [][32]byte, []uint64, []common.Address) (event.Subscription, error)); ok {
@@ -1988,6 +2292,10 @@ func (_m *VRFCoordinatorV2Interface) WatchRandomWordsRequested(opts *bind.WatchO
 func (_m *VRFCoordinatorV2Interface) WatchSubscriptionCanceled(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCanceled, subId []uint64) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubscriptionCanceled")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCanceled, []uint64) (event.Subscription, error)); ok {
@@ -2014,6 +2322,10 @@ func (_m *VRFCoordinatorV2Interface) WatchSubscriptionCanceled(opts *bind.WatchO
 func (_m *VRFCoordinatorV2Interface) WatchSubscriptionConsumerAdded(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerAdded, subId []uint64) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubscriptionConsumerAdded")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerAdded, []uint64) (event.Subscription, error)); ok {
@@ -2040,6 +2352,10 @@ func (_m *VRFCoordinatorV2Interface) WatchSubscriptionConsumerAdded(opts *bind.W
 func (_m *VRFCoordinatorV2Interface) WatchSubscriptionConsumerRemoved(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerRemoved, subId []uint64) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubscriptionConsumerRemoved")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionConsumerRemoved, []uint64) (event.Subscription, error)); ok {
@@ -2066,6 +2382,10 @@ func (_m *VRFCoordinatorV2Interface) WatchSubscriptionConsumerRemoved(opts *bind
 func (_m *VRFCoordinatorV2Interface) WatchSubscriptionCreated(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCreated, subId []uint64) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubscriptionCreated")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionCreated, []uint64) (event.Subscription, error)); ok {
@@ -2092,6 +2412,10 @@ func (_m *VRFCoordinatorV2Interface) WatchSubscriptionCreated(opts *bind.WatchOp
 func (_m *VRFCoordinatorV2Interface) WatchSubscriptionFunded(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionFunded, subId []uint64) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubscriptionFunded")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionFunded, []uint64) (event.Subscription, error)); ok {
@@ -2118,6 +2442,10 @@ func (_m *VRFCoordinatorV2Interface) WatchSubscriptionFunded(opts *bind.WatchOpt
 func (_m *VRFCoordinatorV2Interface) WatchSubscriptionOwnerTransferRequested(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferRequested, subId []uint64) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubscriptionOwnerTransferRequested")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferRequested, []uint64) (event.Subscription, error)); ok {
@@ -2144,6 +2472,10 @@ func (_m *VRFCoordinatorV2Interface) WatchSubscriptionOwnerTransferRequested(opt
 func (_m *VRFCoordinatorV2Interface) WatchSubscriptionOwnerTransferred(opts *bind.WatchOpts, sink chan<- *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferred, subId []uint64) (event.Subscription, error) {
 	ret := _m.Called(opts, sink, subId)
 
+	if len(ret) == 0 {
+		panic("no return value specified for WatchSubscriptionOwnerTransferred")
+	}
+
 	var r0 event.Subscription
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*bind.WatchOpts, chan<- *vrf_coordinator_v2.VRFCoordinatorV2SubscriptionOwnerTransferred, []uint64) (event.Subscription, error)); ok {
diff --git a/core/services/webhook/mocks/external_initiator_manager.go b/core/services/webhook/mocks/external_initiator_manager.go
index a94f2ffe97d..6c061f5412d 100644
--- a/core/services/webhook/mocks/external_initiator_manager.go
+++ b/core/services/webhook/mocks/external_initiator_manager.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -16,6 +16,10 @@ type ExternalInitiatorManager struct {
 func (_m *ExternalInitiatorManager) DeleteJob(webhookSpecID int32) error {
 	ret := _m.Called(webhookSpecID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteJob")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int32) error); ok {
 		r0 = rf(webhookSpecID)
@@ -30,6 +34,10 @@ func (_m *ExternalInitiatorManager) DeleteJob(webhookSpecID int32) error {
 func (_m *ExternalInitiatorManager) FindExternalInitiatorByName(name string) (bridges.ExternalInitiator, error) {
 	ret := _m.Called(name)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindExternalInitiatorByName")
+	}
+
 	var r0 bridges.ExternalInitiator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (bridges.ExternalInitiator, error)); ok {
@@ -54,6 +62,10 @@ func (_m *ExternalInitiatorManager) FindExternalInitiatorByName(name string) (br
 func (_m *ExternalInitiatorManager) Notify(webhookSpecID int32) error {
 	ret := _m.Called(webhookSpecID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Notify")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(int32) error); ok {
 		r0 = rf(webhookSpecID)
diff --git a/core/services/webhook/mocks/http_client.go b/core/services/webhook/mocks/http_client.go
index b5b448a56d0..fa4f597dc4f 100644
--- a/core/services/webhook/mocks/http_client.go
+++ b/core/services/webhook/mocks/http_client.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type HTTPClient struct {
 func (_m *HTTPClient) Do(req *http.Request) (*http.Response, error) {
 	ret := _m.Called(req)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Do")
+	}
+
 	var r0 *http.Response
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*http.Request) (*http.Response, error)); ok {
diff --git a/core/sessions/ldapauth/mocks/ldap_client.go b/core/sessions/ldapauth/mocks/ldap_client.go
index 7a44778dcaa..63021636018 100644
--- a/core/sessions/ldapauth/mocks/ldap_client.go
+++ b/core/sessions/ldapauth/mocks/ldap_client.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -16,6 +16,10 @@ type LDAPClient struct {
 func (_m *LDAPClient) CreateEphemeralConnection() (ldapauth.LDAPConn, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateEphemeralConnection")
+	}
+
 	var r0 ldapauth.LDAPConn
 	var r1 error
 	if rf, ok := ret.Get(0).(func() (ldapauth.LDAPConn, error)); ok {
diff --git a/core/sessions/ldapauth/mocks/ldap_conn.go b/core/sessions/ldapauth/mocks/ldap_conn.go
index c05fb6c4fa6..8b4fff82047 100644
--- a/core/sessions/ldapauth/mocks/ldap_conn.go
+++ b/core/sessions/ldapauth/mocks/ldap_conn.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -17,6 +17,10 @@ type LDAPConn struct {
 func (_m *LDAPConn) Bind(username string, password string) error {
 	ret := _m.Called(username, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Bind")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string) error); ok {
 		r0 = rf(username, password)
@@ -31,6 +35,10 @@ func (_m *LDAPConn) Bind(username string, password string) error {
 func (_m *LDAPConn) Close() error {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for Close")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func() error); ok {
 		r0 = rf()
@@ -45,6 +53,10 @@ func (_m *LDAPConn) Close() error {
 func (_m *LDAPConn) Search(searchRequest *ldap.SearchRequest) (*ldap.SearchResult, error) {
 	ret := _m.Called(searchRequest)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Search")
+	}
+
 	var r0 *ldap.SearchResult
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*ldap.SearchRequest) (*ldap.SearchResult, error)); ok {
diff --git a/core/sessions/mocks/authentication_provider.go b/core/sessions/mocks/authentication_provider.go
index d6e33d11e45..d1b846c318b 100644
--- a/core/sessions/mocks/authentication_provider.go
+++ b/core/sessions/mocks/authentication_provider.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -20,6 +20,10 @@ type AuthenticationProvider struct {
 func (_m *AuthenticationProvider) AuthorizedUserWithSession(sessionID string) (sessions.User, error) {
 	ret := _m.Called(sessionID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for AuthorizedUserWithSession")
+	}
+
 	var r0 sessions.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (sessions.User, error)); ok {
@@ -44,6 +48,10 @@ func (_m *AuthenticationProvider) AuthorizedUserWithSession(sessionID string) (s
 func (_m *AuthenticationProvider) ClearNonCurrentSessions(sessionID string) error {
 	ret := _m.Called(sessionID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for ClearNonCurrentSessions")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(sessionID)
@@ -58,6 +66,10 @@ func (_m *AuthenticationProvider) ClearNonCurrentSessions(sessionID string) erro
 func (_m *AuthenticationProvider) CreateAndSetAuthToken(user *sessions.User) (*auth.Token, error) {
 	ret := _m.Called(user)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateAndSetAuthToken")
+	}
+
 	var r0 *auth.Token
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*sessions.User) (*auth.Token, error)); ok {
@@ -84,6 +96,10 @@ func (_m *AuthenticationProvider) CreateAndSetAuthToken(user *sessions.User) (*a
 func (_m *AuthenticationProvider) CreateSession(sr sessions.SessionRequest) (string, error) {
 	ret := _m.Called(sr)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateSession")
+	}
+
 	var r0 string
 	var r1 error
 	if rf, ok := ret.Get(0).(func(sessions.SessionRequest) (string, error)); ok {
@@ -108,6 +124,10 @@ func (_m *AuthenticationProvider) CreateSession(sr sessions.SessionRequest) (str
 func (_m *AuthenticationProvider) CreateUser(user *sessions.User) error {
 	ret := _m.Called(user)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateUser")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*sessions.User) error); ok {
 		r0 = rf(user)
@@ -122,6 +142,10 @@ func (_m *AuthenticationProvider) CreateUser(user *sessions.User) error {
 func (_m *AuthenticationProvider) DeleteAuthToken(user *sessions.User) error {
 	ret := _m.Called(user)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteAuthToken")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*sessions.User) error); ok {
 		r0 = rf(user)
@@ -136,6 +160,10 @@ func (_m *AuthenticationProvider) DeleteAuthToken(user *sessions.User) error {
 func (_m *AuthenticationProvider) DeleteUser(email string) error {
 	ret := _m.Called(email)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteUser")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(email)
@@ -150,6 +178,10 @@ func (_m *AuthenticationProvider) DeleteUser(email string) error {
 func (_m *AuthenticationProvider) DeleteUserSession(sessionID string) error {
 	ret := _m.Called(sessionID)
 
+	if len(ret) == 0 {
+		panic("no return value specified for DeleteUserSession")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string) error); ok {
 		r0 = rf(sessionID)
@@ -164,6 +196,10 @@ func (_m *AuthenticationProvider) DeleteUserSession(sessionID string) error {
 func (_m *AuthenticationProvider) FindExternalInitiator(eia *auth.Token) (*bridges.ExternalInitiator, error) {
 	ret := _m.Called(eia)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindExternalInitiator")
+	}
+
 	var r0 *bridges.ExternalInitiator
 	var r1 error
 	if rf, ok := ret.Get(0).(func(*auth.Token) (*bridges.ExternalInitiator, error)); ok {
@@ -190,6 +226,10 @@ func (_m *AuthenticationProvider) FindExternalInitiator(eia *auth.Token) (*bridg
 func (_m *AuthenticationProvider) FindUser(email string) (sessions.User, error) {
 	ret := _m.Called(email)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindUser")
+	}
+
 	var r0 sessions.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (sessions.User, error)); ok {
@@ -214,6 +254,10 @@ func (_m *AuthenticationProvider) FindUser(email string) (sessions.User, error)
 func (_m *AuthenticationProvider) FindUserByAPIToken(apiToken string) (sessions.User, error) {
 	ret := _m.Called(apiToken)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindUserByAPIToken")
+	}
+
 	var r0 sessions.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (sessions.User, error)); ok {
@@ -238,6 +282,10 @@ func (_m *AuthenticationProvider) FindUserByAPIToken(apiToken string) (sessions.
 func (_m *AuthenticationProvider) GetUserWebAuthn(email string) ([]sessions.WebAuthn, error) {
 	ret := _m.Called(email)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetUserWebAuthn")
+	}
+
 	var r0 []sessions.WebAuthn
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) ([]sessions.WebAuthn, error)); ok {
@@ -264,6 +312,10 @@ func (_m *AuthenticationProvider) GetUserWebAuthn(email string) ([]sessions.WebA
 func (_m *AuthenticationProvider) ListUsers() ([]sessions.User, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListUsers")
+	}
+
 	var r0 []sessions.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]sessions.User, error)); ok {
@@ -290,6 +342,10 @@ func (_m *AuthenticationProvider) ListUsers() ([]sessions.User, error) {
 func (_m *AuthenticationProvider) SaveWebAuthn(token *sessions.WebAuthn) error {
 	ret := _m.Called(token)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SaveWebAuthn")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*sessions.WebAuthn) error); ok {
 		r0 = rf(token)
@@ -304,6 +360,10 @@ func (_m *AuthenticationProvider) SaveWebAuthn(token *sessions.WebAuthn) error {
 func (_m *AuthenticationProvider) Sessions(offset int, limit int) ([]sessions.Session, error) {
 	ret := _m.Called(offset, limit)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Sessions")
+	}
+
 	var r0 []sessions.Session
 	var r1 error
 	if rf, ok := ret.Get(0).(func(int, int) ([]sessions.Session, error)); ok {
@@ -330,6 +390,10 @@ func (_m *AuthenticationProvider) Sessions(offset int, limit int) ([]sessions.Se
 func (_m *AuthenticationProvider) SetAuthToken(user *sessions.User, token *auth.Token) error {
 	ret := _m.Called(user, token)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetAuthToken")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*sessions.User, *auth.Token) error); ok {
 		r0 = rf(user, token)
@@ -344,6 +408,10 @@ func (_m *AuthenticationProvider) SetAuthToken(user *sessions.User, token *auth.
 func (_m *AuthenticationProvider) SetPassword(user *sessions.User, newPassword string) error {
 	ret := _m.Called(user, newPassword)
 
+	if len(ret) == 0 {
+		panic("no return value specified for SetPassword")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*sessions.User, string) error); ok {
 		r0 = rf(user, newPassword)
@@ -358,6 +426,10 @@ func (_m *AuthenticationProvider) SetPassword(user *sessions.User, newPassword s
 func (_m *AuthenticationProvider) TestPassword(email string, password string) error {
 	ret := _m.Called(email, password)
 
+	if len(ret) == 0 {
+		panic("no return value specified for TestPassword")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(string, string) error); ok {
 		r0 = rf(email, password)
@@ -372,6 +444,10 @@ func (_m *AuthenticationProvider) TestPassword(email string, password string) er
 func (_m *AuthenticationProvider) UpdateRole(email string, newRole string) (sessions.User, error) {
 	ret := _m.Called(email, newRole)
 
+	if len(ret) == 0 {
+		panic("no return value specified for UpdateRole")
+	}
+
 	var r0 sessions.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string, string) (sessions.User, error)); ok {
diff --git a/core/sessions/mocks/basic_admin_users_orm.go b/core/sessions/mocks/basic_admin_users_orm.go
index 845e2d8880e..44ee0b1f705 100644
--- a/core/sessions/mocks/basic_admin_users_orm.go
+++ b/core/sessions/mocks/basic_admin_users_orm.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.35.4. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
@@ -16,6 +16,10 @@ type BasicAdminUsersORM struct {
 func (_m *BasicAdminUsersORM) CreateUser(user *sessions.User) error {
 	ret := _m.Called(user)
 
+	if len(ret) == 0 {
+		panic("no return value specified for CreateUser")
+	}
+
 	var r0 error
 	if rf, ok := ret.Get(0).(func(*sessions.User) error); ok {
 		r0 = rf(user)
@@ -30,6 +34,10 @@ func (_m *BasicAdminUsersORM) CreateUser(user *sessions.User) error {
 func (_m *BasicAdminUsersORM) FindUser(email string) (sessions.User, error) {
 	ret := _m.Called(email)
 
+	if len(ret) == 0 {
+		panic("no return value specified for FindUser")
+	}
+
 	var r0 sessions.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func(string) (sessions.User, error)); ok {
@@ -54,6 +62,10 @@ func (_m *BasicAdminUsersORM) FindUser(email string) (sessions.User, error) {
 func (_m *BasicAdminUsersORM) ListUsers() ([]sessions.User, error) {
 	ret := _m.Called()
 
+	if len(ret) == 0 {
+		panic("no return value specified for ListUsers")
+	}
+
 	var r0 []sessions.User
 	var r1 error
 	if rf, ok := ret.Get(0).(func() ([]sessions.User, error)); ok {

From cefb1c6bb77c775e5faa9c5046e7d88aae47eeb2 Mon Sep 17 00:00:00 2001
From: Sri Kidambi <1702865+kidambisrinivas@users.noreply.github.com>
Date: Thu, 7 Dec 2023 17:34:17 +0000
Subject: [PATCH 096/130] Test VRF LogPoller functionality-
 initializeLastProcessedBlock, updateLastProcessedBlock and getUnfulfilled
 (#11472)

* Test VRF LogPoller functionality- initializeLastProcessedBlock, updateLastProcessedBlock and getUnfulfilled

* Addressed PR comments

* Minor change

* Add comments to explain replay

* Addressed PR comments

* Prettier
---
 .../scripts/native_solc_compile_all_logpoller |    3 +-
 contracts/src/v0.8/tests/VRFLogEmitter.sol    |   42 +
 .../vrf_log_emitter/vrf_log_emitter.go        |  526 +++++++++
 ...rapper-dependency-versions-do-not-edit.txt |    1 +
 core/gethwrappers/go_generate_logpoller.go    |    7 +
 .../vrf/v2/listener_v2_log_listener_test.go   | 1039 +++++++++++++++++
 6 files changed, 1617 insertions(+), 1 deletion(-)
 create mode 100644 contracts/src/v0.8/tests/VRFLogEmitter.sol
 create mode 100644 core/gethwrappers/generated/vrf_log_emitter/vrf_log_emitter.go
 create mode 100644 core/gethwrappers/go_generate_logpoller.go
 create mode 100644 core/services/vrf/v2/listener_v2_log_listener_test.go

diff --git a/contracts/scripts/native_solc_compile_all_logpoller b/contracts/scripts/native_solc_compile_all_logpoller
index b6ac51ecedb..e8ea2a2be80 100755
--- a/contracts/scripts/native_solc_compile_all_logpoller
+++ b/contracts/scripts/native_solc_compile_all_logpoller
@@ -29,4 +29,5 @@ compileContract () {
 }
 
 
-compileContract tests/LogEmitter.sol
\ No newline at end of file
+compileContract tests/LogEmitter.sol
+compileContract tests/VRFLogEmitter.sol
\ No newline at end of file
diff --git a/contracts/src/v0.8/tests/VRFLogEmitter.sol b/contracts/src/v0.8/tests/VRFLogEmitter.sol
new file mode 100644
index 00000000000..18b99605ac9
--- /dev/null
+++ b/contracts/src/v0.8/tests/VRFLogEmitter.sol
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+contract VRFLogEmitter {
+  event RandomWordsRequested(
+    bytes32 indexed keyHash,
+    uint256 requestId,
+    uint256 preSeed,
+    uint64 indexed subId,
+    uint16 minimumRequestConfirmations,
+    uint32 callbackGasLimit,
+    uint32 numWords,
+    address indexed sender
+  );
+  event RandomWordsFulfilled(uint256 indexed requestId, uint256 outputSeed, uint96 payment, bool success);
+
+  function emitRandomWordsRequested(
+    bytes32 keyHash,
+    uint256 requestId,
+    uint256 preSeed,
+    uint64 subId,
+    uint16 minimumRequestConfirmations,
+    uint32 callbackGasLimit,
+    uint32 numWords,
+    address sender
+  ) public {
+    emit RandomWordsRequested(
+      keyHash,
+      requestId,
+      preSeed,
+      subId,
+      minimumRequestConfirmations,
+      callbackGasLimit,
+      numWords,
+      sender
+    );
+  }
+
+  function emitRandomWordsFulfilled(uint256 requestId, uint256 outputSeed, uint96 payment, bool success) public {
+    emit RandomWordsFulfilled(requestId, outputSeed, payment, success);
+  }
+}
diff --git a/core/gethwrappers/generated/vrf_log_emitter/vrf_log_emitter.go b/core/gethwrappers/generated/vrf_log_emitter/vrf_log_emitter.go
new file mode 100644
index 00000000000..2cdeaa6c3a8
--- /dev/null
+++ b/core/gethwrappers/generated/vrf_log_emitter/vrf_log_emitter.go
@@ -0,0 +1,526 @@
+// Code generated - DO NOT EDIT.
+// This file is a generated binding and any manual changes will be lost.
+
+package vrf_log_emitter
+
+import (
+	"errors"
+	"fmt"
+	"math/big"
+	"strings"
+
+	ethereum "github.com/ethereum/go-ethereum"
+	"github.com/ethereum/go-ethereum/accounts/abi"
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/event"
+	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated"
+)
+
+var (
+	_ = errors.New
+	_ = big.NewInt
+	_ = strings.NewReader
+	_ = ethereum.NotFound
+	_ = bind.Bind
+	_ = common.Big1
+	_ = types.BloomLookup
+	_ = event.NewSubscription
+	_ = abi.ConvertType
+)
+
+var VRFLogEmitterMetaData = &bind.MetaData{
+	ABI: "[{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint256\",\"name\":\"requestId\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"outputSeed\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint96\",\"name\":\"payment\",\"type\":\"uint96\"},{\"indexed\":false,\"internalType\":\"bool\",\"name\":\"success\",\"type\":\"bool\"}],\"name\":\"RandomWordsFulfilled\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"keyHash\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"requestId\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"preSeed\",\"type\":\"uint256\"},{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"subId\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"uint16\",\"name\":\"minimumRequestConfirmations\",\"type\":\"uint16\"},{\"indexed\":false,\"internalType\":\"uint32\",\"name\":\"callbackGasLimit\",\"type\":\"uint32\"},{\"indexed\":false,\"internalType\":\"uint32\",\"name\":\"numWords\",\"type\":\"uint32\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"}],\"name\":\"RandomWordsRequested\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"requestId\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"outputSeed\",\"type\":\"uint256\"},{\"internalType\":\"uint96\",\"name\":\"payment\",\"type\":\"uint96\"},{\"internalType\":\"bool\",\"name\":\"success\",\"type\":\"bool\"}],\"name\":\"emitRandomWordsFulfilled\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"keyHash\",\"type\":\"bytes32\"},{\"internalType\":\"uint256\",\"name\":\"requestId\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"preSeed\",\"type\":\"uint256\"},{\"internalType\":\"uint64\",\"name\":\"subId\",\"type\":\"uint64\"},{\"internalType\":\"uint16\",\"name\":\"minimumRequestConfirmations\",\"type\":\"uint16\"},{\"internalType\":\"uint32\",\"name\":\"callbackGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"numWords\",\"type\":\"uint32\"},{\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"}],\"name\":\"emitRandomWordsRequested\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]",
+	Bin: "0x608060405234801561001057600080fd5b5061027f806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063ca920adb1461003b578063fe62d3e914610050575b600080fd5b61004e61004936600461015b565b610063565b005b61004e61005e366004610212565b6100eb565b604080518881526020810188905261ffff86168183015263ffffffff858116606083015284166080820152905173ffffffffffffffffffffffffffffffffffffffff83169167ffffffffffffffff8816918b917f63373d1c4696214b898952999c9aaec57dac1ee2723cec59bea6888f489a9772919081900360a00190a45050505050505050565b604080518481526bffffffffffffffffffffffff8416602082015282151581830152905185917f7dffc5ae5ee4e2e4df1651cf6ad329a73cebdb728f37ea0187b9b17e036756e4919081900360600190a250505050565b803563ffffffff8116811461015657600080fd5b919050565b600080600080600080600080610100898b03121561017857600080fd5b883597506020890135965060408901359550606089013567ffffffffffffffff811681146101a557600080fd5b9450608089013561ffff811681146101bc57600080fd5b93506101ca60a08a01610142565b92506101d860c08a01610142565b915060e089013573ffffffffffffffffffffffffffffffffffffffff8116811461020157600080fd5b809150509295985092959890939650565b6000806000806080858703121561022857600080fd5b843593506020850135925060408501356bffffffffffffffffffffffff8116811461025257600080fd5b91506060850135801515811461026757600080fd5b93969295509093505056fea164736f6c6343000813000a",
+}
+
+var VRFLogEmitterABI = VRFLogEmitterMetaData.ABI
+
+var VRFLogEmitterBin = VRFLogEmitterMetaData.Bin
+
+func DeployVRFLogEmitter(auth *bind.TransactOpts, backend bind.ContractBackend) (common.Address, *types.Transaction, *VRFLogEmitter, error) {
+	parsed, err := VRFLogEmitterMetaData.GetAbi()
+	if err != nil {
+		return common.Address{}, nil, nil, err
+	}
+	if parsed == nil {
+		return common.Address{}, nil, nil, errors.New("GetABI returned nil")
+	}
+
+	address, tx, contract, err := bind.DeployContract(auth, *parsed, common.FromHex(VRFLogEmitterBin), backend)
+	if err != nil {
+		return common.Address{}, nil, nil, err
+	}
+	return address, tx, &VRFLogEmitter{address: address, abi: *parsed, VRFLogEmitterCaller: VRFLogEmitterCaller{contract: contract}, VRFLogEmitterTransactor: VRFLogEmitterTransactor{contract: contract}, VRFLogEmitterFilterer: VRFLogEmitterFilterer{contract: contract}}, nil
+}
+
+type VRFLogEmitter struct {
+	address common.Address
+	abi     abi.ABI
+	VRFLogEmitterCaller
+	VRFLogEmitterTransactor
+	VRFLogEmitterFilterer
+}
+
+type VRFLogEmitterCaller struct {
+	contract *bind.BoundContract
+}
+
+type VRFLogEmitterTransactor struct {
+	contract *bind.BoundContract
+}
+
+type VRFLogEmitterFilterer struct {
+	contract *bind.BoundContract
+}
+
+type VRFLogEmitterSession struct {
+	Contract     *VRFLogEmitter
+	CallOpts     bind.CallOpts
+	TransactOpts bind.TransactOpts
+}
+
+type VRFLogEmitterCallerSession struct {
+	Contract *VRFLogEmitterCaller
+	CallOpts bind.CallOpts
+}
+
+type VRFLogEmitterTransactorSession struct {
+	Contract     *VRFLogEmitterTransactor
+	TransactOpts bind.TransactOpts
+}
+
+type VRFLogEmitterRaw struct {
+	Contract *VRFLogEmitter
+}
+
+type VRFLogEmitterCallerRaw struct {
+	Contract *VRFLogEmitterCaller
+}
+
+type VRFLogEmitterTransactorRaw struct {
+	Contract *VRFLogEmitterTransactor
+}
+
+func NewVRFLogEmitter(address common.Address, backend bind.ContractBackend) (*VRFLogEmitter, error) {
+	abi, err := abi.JSON(strings.NewReader(VRFLogEmitterABI))
+	if err != nil {
+		return nil, err
+	}
+	contract, err := bindVRFLogEmitter(address, backend, backend, backend)
+	if err != nil {
+		return nil, err
+	}
+	return &VRFLogEmitter{address: address, abi: abi, VRFLogEmitterCaller: VRFLogEmitterCaller{contract: contract}, VRFLogEmitterTransactor: VRFLogEmitterTransactor{contract: contract}, VRFLogEmitterFilterer: VRFLogEmitterFilterer{contract: contract}}, nil
+}
+
+func NewVRFLogEmitterCaller(address common.Address, caller bind.ContractCaller) (*VRFLogEmitterCaller, error) {
+	contract, err := bindVRFLogEmitter(address, caller, nil, nil)
+	if err != nil {
+		return nil, err
+	}
+	return &VRFLogEmitterCaller{contract: contract}, nil
+}
+
+func NewVRFLogEmitterTransactor(address common.Address, transactor bind.ContractTransactor) (*VRFLogEmitterTransactor, error) {
+	contract, err := bindVRFLogEmitter(address, nil, transactor, nil)
+	if err != nil {
+		return nil, err
+	}
+	return &VRFLogEmitterTransactor{contract: contract}, nil
+}
+
+func NewVRFLogEmitterFilterer(address common.Address, filterer bind.ContractFilterer) (*VRFLogEmitterFilterer, error) {
+	contract, err := bindVRFLogEmitter(address, nil, nil, filterer)
+	if err != nil {
+		return nil, err
+	}
+	return &VRFLogEmitterFilterer{contract: contract}, nil
+}
+
+func bindVRFLogEmitter(address common.Address, caller bind.ContractCaller, transactor bind.ContractTransactor, filterer bind.ContractFilterer) (*bind.BoundContract, error) {
+	parsed, err := VRFLogEmitterMetaData.GetAbi()
+	if err != nil {
+		return nil, err
+	}
+	return bind.NewBoundContract(address, *parsed, caller, transactor, filterer), nil
+}
+
+func (_VRFLogEmitter *VRFLogEmitterRaw) Call(opts *bind.CallOpts, result *[]interface{}, method string, params ...interface{}) error {
+	return _VRFLogEmitter.Contract.VRFLogEmitterCaller.contract.Call(opts, result, method, params...)
+}
+
+func (_VRFLogEmitter *VRFLogEmitterRaw) Transfer(opts *bind.TransactOpts) (*types.Transaction, error) {
+	return _VRFLogEmitter.Contract.VRFLogEmitterTransactor.contract.Transfer(opts)
+}
+
+func (_VRFLogEmitter *VRFLogEmitterRaw) Transact(opts *bind.TransactOpts, method string, params ...interface{}) (*types.Transaction, error) {
+	return _VRFLogEmitter.Contract.VRFLogEmitterTransactor.contract.Transact(opts, method, params...)
+}
+
+func (_VRFLogEmitter *VRFLogEmitterCallerRaw) Call(opts *bind.CallOpts, result *[]interface{}, method string, params ...interface{}) error {
+	return _VRFLogEmitter.Contract.contract.Call(opts, result, method, params...)
+}
+
+func (_VRFLogEmitter *VRFLogEmitterTransactorRaw) Transfer(opts *bind.TransactOpts) (*types.Transaction, error) {
+	return _VRFLogEmitter.Contract.contract.Transfer(opts)
+}
+
+func (_VRFLogEmitter *VRFLogEmitterTransactorRaw) Transact(opts *bind.TransactOpts, method string, params ...interface{}) (*types.Transaction, error) {
+	return _VRFLogEmitter.Contract.contract.Transact(opts, method, params...)
+}
+
+func (_VRFLogEmitter *VRFLogEmitterTransactor) EmitRandomWordsFulfilled(opts *bind.TransactOpts, requestId *big.Int, outputSeed *big.Int, payment *big.Int, success bool) (*types.Transaction, error) {
+	return _VRFLogEmitter.contract.Transact(opts, "emitRandomWordsFulfilled", requestId, outputSeed, payment, success)
+}
+
+func (_VRFLogEmitter *VRFLogEmitterSession) EmitRandomWordsFulfilled(requestId *big.Int, outputSeed *big.Int, payment *big.Int, success bool) (*types.Transaction, error) {
+	return _VRFLogEmitter.Contract.EmitRandomWordsFulfilled(&_VRFLogEmitter.TransactOpts, requestId, outputSeed, payment, success)
+}
+
+func (_VRFLogEmitter *VRFLogEmitterTransactorSession) EmitRandomWordsFulfilled(requestId *big.Int, outputSeed *big.Int, payment *big.Int, success bool) (*types.Transaction, error) {
+	return _VRFLogEmitter.Contract.EmitRandomWordsFulfilled(&_VRFLogEmitter.TransactOpts, requestId, outputSeed, payment, success)
+}
+
+func (_VRFLogEmitter *VRFLogEmitterTransactor) EmitRandomWordsRequested(opts *bind.TransactOpts, keyHash [32]byte, requestId *big.Int, preSeed *big.Int, subId uint64, minimumRequestConfirmations uint16, callbackGasLimit uint32, numWords uint32, sender common.Address) (*types.Transaction, error) {
+	return _VRFLogEmitter.contract.Transact(opts, "emitRandomWordsRequested", keyHash, requestId, preSeed, subId, minimumRequestConfirmations, callbackGasLimit, numWords, sender)
+}
+
+func (_VRFLogEmitter *VRFLogEmitterSession) EmitRandomWordsRequested(keyHash [32]byte, requestId *big.Int, preSeed *big.Int, subId uint64, minimumRequestConfirmations uint16, callbackGasLimit uint32, numWords uint32, sender common.Address) (*types.Transaction, error) {
+	return _VRFLogEmitter.Contract.EmitRandomWordsRequested(&_VRFLogEmitter.TransactOpts, keyHash, requestId, preSeed, subId, minimumRequestConfirmations, callbackGasLimit, numWords, sender)
+}
+
+func (_VRFLogEmitter *VRFLogEmitterTransactorSession) EmitRandomWordsRequested(keyHash [32]byte, requestId *big.Int, preSeed *big.Int, subId uint64, minimumRequestConfirmations uint16, callbackGasLimit uint32, numWords uint32, sender common.Address) (*types.Transaction, error) {
+	return _VRFLogEmitter.Contract.EmitRandomWordsRequested(&_VRFLogEmitter.TransactOpts, keyHash, requestId, preSeed, subId, minimumRequestConfirmations, callbackGasLimit, numWords, sender)
+}
+
+type VRFLogEmitterRandomWordsFulfilledIterator struct {
+	Event *VRFLogEmitterRandomWordsFulfilled
+
+	contract *bind.BoundContract
+	event    string
+
+	logs chan types.Log
+	sub  ethereum.Subscription
+	done bool
+	fail error
+}
+
+func (it *VRFLogEmitterRandomWordsFulfilledIterator) Next() bool {
+
+	if it.fail != nil {
+		return false
+	}
+
+	if it.done {
+		select {
+		case log := <-it.logs:
+			it.Event = new(VRFLogEmitterRandomWordsFulfilled)
+			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+				it.fail = err
+				return false
+			}
+			it.Event.Raw = log
+			return true
+
+		default:
+			return false
+		}
+	}
+
+	select {
+	case log := <-it.logs:
+		it.Event = new(VRFLogEmitterRandomWordsFulfilled)
+		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+			it.fail = err
+			return false
+		}
+		it.Event.Raw = log
+		return true
+
+	case err := <-it.sub.Err():
+		it.done = true
+		it.fail = err
+		return it.Next()
+	}
+}
+
+func (it *VRFLogEmitterRandomWordsFulfilledIterator) Error() error {
+	return it.fail
+}
+
+func (it *VRFLogEmitterRandomWordsFulfilledIterator) Close() error {
+	it.sub.Unsubscribe()
+	return nil
+}
+
+type VRFLogEmitterRandomWordsFulfilled struct {
+	RequestId  *big.Int
+	OutputSeed *big.Int
+	Payment    *big.Int
+	Success    bool
+	Raw        types.Log
+}
+
+func (_VRFLogEmitter *VRFLogEmitterFilterer) FilterRandomWordsFulfilled(opts *bind.FilterOpts, requestId []*big.Int) (*VRFLogEmitterRandomWordsFulfilledIterator, error) {
+
+	var requestIdRule []interface{}
+	for _, requestIdItem := range requestId {
+		requestIdRule = append(requestIdRule, requestIdItem)
+	}
+
+	logs, sub, err := _VRFLogEmitter.contract.FilterLogs(opts, "RandomWordsFulfilled", requestIdRule)
+	if err != nil {
+		return nil, err
+	}
+	return &VRFLogEmitterRandomWordsFulfilledIterator{contract: _VRFLogEmitter.contract, event: "RandomWordsFulfilled", logs: logs, sub: sub}, nil
+}
+
+func (_VRFLogEmitter *VRFLogEmitterFilterer) WatchRandomWordsFulfilled(opts *bind.WatchOpts, sink chan<- *VRFLogEmitterRandomWordsFulfilled, requestId []*big.Int) (event.Subscription, error) {
+
+	var requestIdRule []interface{}
+	for _, requestIdItem := range requestId {
+		requestIdRule = append(requestIdRule, requestIdItem)
+	}
+
+	logs, sub, err := _VRFLogEmitter.contract.WatchLogs(opts, "RandomWordsFulfilled", requestIdRule)
+	if err != nil {
+		return nil, err
+	}
+	return event.NewSubscription(func(quit <-chan struct{}) error {
+		defer sub.Unsubscribe()
+		for {
+			select {
+			case log := <-logs:
+
+				event := new(VRFLogEmitterRandomWordsFulfilled)
+				if err := _VRFLogEmitter.contract.UnpackLog(event, "RandomWordsFulfilled", log); err != nil {
+					return err
+				}
+				event.Raw = log
+
+				select {
+				case sink <- event:
+				case err := <-sub.Err():
+					return err
+				case <-quit:
+					return nil
+				}
+			case err := <-sub.Err():
+				return err
+			case <-quit:
+				return nil
+			}
+		}
+	}), nil
+}
+
+func (_VRFLogEmitter *VRFLogEmitterFilterer) ParseRandomWordsFulfilled(log types.Log) (*VRFLogEmitterRandomWordsFulfilled, error) {
+	event := new(VRFLogEmitterRandomWordsFulfilled)
+	if err := _VRFLogEmitter.contract.UnpackLog(event, "RandomWordsFulfilled", log); err != nil {
+		return nil, err
+	}
+	event.Raw = log
+	return event, nil
+}
+
+type VRFLogEmitterRandomWordsRequestedIterator struct {
+	Event *VRFLogEmitterRandomWordsRequested
+
+	contract *bind.BoundContract
+	event    string
+
+	logs chan types.Log
+	sub  ethereum.Subscription
+	done bool
+	fail error
+}
+
+func (it *VRFLogEmitterRandomWordsRequestedIterator) Next() bool {
+
+	if it.fail != nil {
+		return false
+	}
+
+	if it.done {
+		select {
+		case log := <-it.logs:
+			it.Event = new(VRFLogEmitterRandomWordsRequested)
+			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+				it.fail = err
+				return false
+			}
+			it.Event.Raw = log
+			return true
+
+		default:
+			return false
+		}
+	}
+
+	select {
+	case log := <-it.logs:
+		it.Event = new(VRFLogEmitterRandomWordsRequested)
+		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
+			it.fail = err
+			return false
+		}
+		it.Event.Raw = log
+		return true
+
+	case err := <-it.sub.Err():
+		it.done = true
+		it.fail = err
+		return it.Next()
+	}
+}
+
+func (it *VRFLogEmitterRandomWordsRequestedIterator) Error() error {
+	return it.fail
+}
+
+func (it *VRFLogEmitterRandomWordsRequestedIterator) Close() error {
+	it.sub.Unsubscribe()
+	return nil
+}
+
+type VRFLogEmitterRandomWordsRequested struct {
+	KeyHash                     [32]byte
+	RequestId                   *big.Int
+	PreSeed                     *big.Int
+	SubId                       uint64
+	MinimumRequestConfirmations uint16
+	CallbackGasLimit            uint32
+	NumWords                    uint32
+	Sender                      common.Address
+	Raw                         types.Log
+}
+
+func (_VRFLogEmitter *VRFLogEmitterFilterer) FilterRandomWordsRequested(opts *bind.FilterOpts, keyHash [][32]byte, subId []uint64, sender []common.Address) (*VRFLogEmitterRandomWordsRequestedIterator, error) {
+
+	var keyHashRule []interface{}
+	for _, keyHashItem := range keyHash {
+		keyHashRule = append(keyHashRule, keyHashItem)
+	}
+
+	var subIdRule []interface{}
+	for _, subIdItem := range subId {
+		subIdRule = append(subIdRule, subIdItem)
+	}
+
+	var senderRule []interface{}
+	for _, senderItem := range sender {
+		senderRule = append(senderRule, senderItem)
+	}
+
+	logs, sub, err := _VRFLogEmitter.contract.FilterLogs(opts, "RandomWordsRequested", keyHashRule, subIdRule, senderRule)
+	if err != nil {
+		return nil, err
+	}
+	return &VRFLogEmitterRandomWordsRequestedIterator{contract: _VRFLogEmitter.contract, event: "RandomWordsRequested", logs: logs, sub: sub}, nil
+}
+
+func (_VRFLogEmitter *VRFLogEmitterFilterer) WatchRandomWordsRequested(opts *bind.WatchOpts, sink chan<- *VRFLogEmitterRandomWordsRequested, keyHash [][32]byte, subId []uint64, sender []common.Address) (event.Subscription, error) {
+
+	var keyHashRule []interface{}
+	for _, keyHashItem := range keyHash {
+		keyHashRule = append(keyHashRule, keyHashItem)
+	}
+
+	var subIdRule []interface{}
+	for _, subIdItem := range subId {
+		subIdRule = append(subIdRule, subIdItem)
+	}
+
+	var senderRule []interface{}
+	for _, senderItem := range sender {
+		senderRule = append(senderRule, senderItem)
+	}
+
+	logs, sub, err := _VRFLogEmitter.contract.WatchLogs(opts, "RandomWordsRequested", keyHashRule, subIdRule, senderRule)
+	if err != nil {
+		return nil, err
+	}
+	return event.NewSubscription(func(quit <-chan struct{}) error {
+		defer sub.Unsubscribe()
+		for {
+			select {
+			case log := <-logs:
+
+				event := new(VRFLogEmitterRandomWordsRequested)
+				if err := _VRFLogEmitter.contract.UnpackLog(event, "RandomWordsRequested", log); err != nil {
+					return err
+				}
+				event.Raw = log
+
+				select {
+				case sink <- event:
+				case err := <-sub.Err():
+					return err
+				case <-quit:
+					return nil
+				}
+			case err := <-sub.Err():
+				return err
+			case <-quit:
+				return nil
+			}
+		}
+	}), nil
+}
+
+func (_VRFLogEmitter *VRFLogEmitterFilterer) ParseRandomWordsRequested(log types.Log) (*VRFLogEmitterRandomWordsRequested, error) {
+	event := new(VRFLogEmitterRandomWordsRequested)
+	if err := _VRFLogEmitter.contract.UnpackLog(event, "RandomWordsRequested", log); err != nil {
+		return nil, err
+	}
+	event.Raw = log
+	return event, nil
+}
+
+func (_VRFLogEmitter *VRFLogEmitter) ParseLog(log types.Log) (generated.AbigenLog, error) {
+	switch log.Topics[0] {
+	case _VRFLogEmitter.abi.Events["RandomWordsFulfilled"].ID:
+		return _VRFLogEmitter.ParseRandomWordsFulfilled(log)
+	case _VRFLogEmitter.abi.Events["RandomWordsRequested"].ID:
+		return _VRFLogEmitter.ParseRandomWordsRequested(log)
+
+	default:
+		return nil, fmt.Errorf("abigen wrapper received unknown log topic: %v", log.Topics[0])
+	}
+}
+
+func (VRFLogEmitterRandomWordsFulfilled) Topic() common.Hash {
+	return common.HexToHash("0x7dffc5ae5ee4e2e4df1651cf6ad329a73cebdb728f37ea0187b9b17e036756e4")
+}
+
+func (VRFLogEmitterRandomWordsRequested) Topic() common.Hash {
+	return common.HexToHash("0x63373d1c4696214b898952999c9aaec57dac1ee2723cec59bea6888f489a9772")
+}
+
+func (_VRFLogEmitter *VRFLogEmitter) Address() common.Address {
+	return _VRFLogEmitter.address
+}
+
+type VRFLogEmitterInterface interface {
+	EmitRandomWordsFulfilled(opts *bind.TransactOpts, requestId *big.Int, outputSeed *big.Int, payment *big.Int, success bool) (*types.Transaction, error)
+
+	EmitRandomWordsRequested(opts *bind.TransactOpts, keyHash [32]byte, requestId *big.Int, preSeed *big.Int, subId uint64, minimumRequestConfirmations uint16, callbackGasLimit uint32, numWords uint32, sender common.Address) (*types.Transaction, error)
+
+	FilterRandomWordsFulfilled(opts *bind.FilterOpts, requestId []*big.Int) (*VRFLogEmitterRandomWordsFulfilledIterator, error)
+
+	WatchRandomWordsFulfilled(opts *bind.WatchOpts, sink chan<- *VRFLogEmitterRandomWordsFulfilled, requestId []*big.Int) (event.Subscription, error)
+
+	ParseRandomWordsFulfilled(log types.Log) (*VRFLogEmitterRandomWordsFulfilled, error)
+
+	FilterRandomWordsRequested(opts *bind.FilterOpts, keyHash [][32]byte, subId []uint64, sender []common.Address) (*VRFLogEmitterRandomWordsRequestedIterator, error)
+
+	WatchRandomWordsRequested(opts *bind.WatchOpts, sink chan<- *VRFLogEmitterRandomWordsRequested, keyHash [][32]byte, subId []uint64, sender []common.Address) (event.Subscription, error)
+
+	ParseRandomWordsRequested(log types.Log) (*VRFLogEmitterRandomWordsRequested, error)
+
+	ParseLog(log types.Log) (generated.AbigenLog, error)
+
+	Address() common.Address
+}
diff --git a/core/gethwrappers/generation/generated-wrapper-dependency-versions-do-not-edit.txt b/core/gethwrappers/generation/generated-wrapper-dependency-versions-do-not-edit.txt
index 1db18d8366d..5e9dcfc3326 100644
--- a/core/gethwrappers/generation/generated-wrapper-dependency-versions-do-not-edit.txt
+++ b/core/gethwrappers/generation/generated-wrapper-dependency-versions-do-not-edit.txt
@@ -82,6 +82,7 @@ vrf_external_sub_owner_example: ../../contracts/solc/v0.8.6/VRFExternalSubOwnerE
 vrf_load_test_external_sub_owner: ../../contracts/solc/v0.8.6/VRFLoadTestExternalSubOwner/VRFLoadTestExternalSubOwner.abi ../../contracts/solc/v0.8.6/VRFLoadTestExternalSubOwner/VRFLoadTestExternalSubOwner.bin 2097faa70265e420036cc8a3efb1f1e0836ad2d7323b295b9a26a125dbbe6c7d
 vrf_load_test_ownerless_consumer: ../../contracts/solc/v0.8.6/VRFLoadTestOwnerlessConsumer/VRFLoadTestOwnerlessConsumer.abi ../../contracts/solc/v0.8.6/VRFLoadTestOwnerlessConsumer/VRFLoadTestOwnerlessConsumer.bin 74f914843cbc70b9c3079c3e1c709382ce415225e8bb40113e7ac018bfcb0f5c
 vrf_load_test_with_metrics: ../../contracts/solc/v0.8.6/VRFV2LoadTestWithMetrics/VRFV2LoadTestWithMetrics.abi ../../contracts/solc/v0.8.6/VRFV2LoadTestWithMetrics/VRFV2LoadTestWithMetrics.bin 8ab9de5816fbdf93a2865e2711b85a39a6fc9c413a4b336578c485be1158d430
+vrf_log_emitter: ../../contracts/solc/v0.8.19/VRFLogEmitter/VRFLogEmitter.abi ../../contracts/solc/v0.8.19/VRFLogEmitter/VRFLogEmitter.bin 15f491d445ac4d0c712d1cbe4e5054c759b080bf20de7d54bfe2a82cde4dcf06
 vrf_malicious_consumer_v2: ../../contracts/solc/v0.8.6/VRFMaliciousConsumerV2/VRFMaliciousConsumerV2.abi ../../contracts/solc/v0.8.6/VRFMaliciousConsumerV2/VRFMaliciousConsumerV2.bin 9755fa8ffc7f5f0b337d5d413d77b0c9f6cd6f68c31727d49acdf9d4a51bc522
 vrf_malicious_consumer_v2_plus: ../../contracts/solc/v0.8.6/VRFMaliciousConsumerV2Plus/VRFMaliciousConsumerV2Plus.abi ../../contracts/solc/v0.8.6/VRFMaliciousConsumerV2Plus/VRFMaliciousConsumerV2Plus.bin e2a72638e11da807b6533d037e7e5aaeed695efd5035777b8e20d2f8973a574c
 vrf_owner: ../../contracts/solc/v0.8.6/VRFOwner/VRFOwner.abi ../../contracts/solc/v0.8.6/VRFOwner/VRFOwner.bin eccfae5ee295b5850e22f61240c469f79752b8d9a3bac5d64aec7ac8def2f6cb
diff --git a/core/gethwrappers/go_generate_logpoller.go b/core/gethwrappers/go_generate_logpoller.go
new file mode 100644
index 00000000000..b28b8205830
--- /dev/null
+++ b/core/gethwrappers/go_generate_logpoller.go
@@ -0,0 +1,7 @@
+// Package gethwrappers provides tools for wrapping solidity contracts with
+// golang packages, using abigen.
+package gethwrappers
+
+// Log tester
+//go:generate go run ./generation/generate/wrap.go ../../contracts/solc/v0.8.19/LogEmitter/LogEmitter.abi ../../contracts/solc/v0.8.19/LogEmitter/LogEmitter.bin LogEmitter log_emitter
+//go:generate go run ./generation/generate/wrap.go ../../contracts/solc/v0.8.19/VRFLogEmitter/VRFLogEmitter.abi ../../contracts/solc/v0.8.19/VRFLogEmitter/VRFLogEmitter.bin VRFLogEmitter vrf_log_emitter
diff --git a/core/services/vrf/v2/listener_v2_log_listener_test.go b/core/services/vrf/v2/listener_v2_log_listener_test.go
new file mode 100644
index 00000000000..11b299abc40
--- /dev/null
+++ b/core/services/vrf/v2/listener_v2_log_listener_test.go
@@ -0,0 +1,1039 @@
+package v2
+
+import (
+	"context"
+	"fmt"
+	"math/big"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/ethereum/go-ethereum/accounts/abi"
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
+	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core"
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/ethdb"
+	"github.com/jmoiron/sqlx"
+	"github.com/stretchr/testify/require"
+
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
+	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	evmmocks "github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm/mocks"
+	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/log_emitter"
+	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/vrf_coordinator_v2"
+	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/vrf_log_emitter"
+	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
+	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
+	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
+	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
+	"github.com/smartcontractkit/chainlink/v2/core/services/vrf/vrfcommon"
+	"github.com/smartcontractkit/chainlink/v2/core/testdata/testspecs"
+	"github.com/smartcontractkit/chainlink/v2/core/utils"
+)
+
+var (
+	emitterABI, _    = abi.JSON(strings.NewReader(log_emitter.LogEmitterABI))
+	vrfEmitterABI, _ = abi.JSON(strings.NewReader(vrf_log_emitter.VRFLogEmitterABI))
+)
+
+type vrfLogPollerListenerTH struct {
+	Lggr              logger.Logger
+	ChainID           *big.Int
+	ORM               *logpoller.DbORM
+	LogPoller         logpoller.LogPollerTest
+	Client            *backends.SimulatedBackend
+	Emitter           *log_emitter.LogEmitter
+	EmitterAddress    common.Address
+	VRFLogEmitter     *vrf_log_emitter.VRFLogEmitter
+	VRFEmitterAddress common.Address
+	Owner             *bind.TransactOpts
+	EthDB             ethdb.Database
+	Db                *sqlx.DB
+	Listener          *listenerV2
+	Ctx               context.Context
+}
+
+func setupVRFLogPollerListenerTH(t *testing.T,
+	useFinalityTag bool,
+	finalityDepth, backfillBatchSize,
+	rpcBatchSize, keepFinalizedBlocksDepth int64,
+	mockChainUpdateFn func(*evmmocks.Chain, *vrfLogPollerListenerTH)) *vrfLogPollerListenerTH {
+
+	lggr := logger.TestLogger(t)
+	chainID := testutils.NewRandomEVMChainID()
+	db := pgtest.NewSqlxDB(t)
+
+	o := logpoller.NewORM(chainID, db, lggr, pgtest.NewQConfig(true))
+	owner := testutils.MustNewSimTransactor(t)
+	ethDB := rawdb.NewMemoryDatabase()
+	ec := backends.NewSimulatedBackendWithDatabase(ethDB, map[common.Address]core.GenesisAccount{
+		owner.From: {
+			Balance: big.NewInt(0).Mul(big.NewInt(10), big.NewInt(1e18)),
+		},
+	}, 10e6)
+	// VRF Listener relies on block timestamps, but SimulatedBackend uses by default clock starting from 1970-01-01
+	// This trick is used to move the clock closer to the current time. We set first block to be X hours ago.
+	// FirstBlockAge is used to compute first block's timestamp in SimulatedBackend (time.Now() - FirstBlockAge)
+	const FirstBlockAge = 24 * time.Hour
+	blockTime := time.UnixMilli(int64(ec.Blockchain().CurrentHeader().Time))
+	err := ec.AdjustTime(time.Since(blockTime) - FirstBlockAge)
+	require.NoError(t, err)
+	ec.Commit()
+
+	esc := client.NewSimulatedBackendClient(t, ec, chainID)
+	// Mark genesis block as finalized to avoid any nulls in the tests
+	head := esc.Backend().Blockchain().CurrentHeader()
+	esc.Backend().Blockchain().SetFinalized(head)
+
+	// Poll period doesn't matter, we intend to call poll and save logs directly in the test.
+	// Set it to some insanely high value to not interfere with any tests.
+	lp := logpoller.NewLogPoller(o, esc, lggr, 1*time.Hour, useFinalityTag, finalityDepth, backfillBatchSize, rpcBatchSize, keepFinalizedBlocksDepth)
+
+	emitterAddress1, _, emitter1, err := log_emitter.DeployLogEmitter(owner, ec)
+	require.NoError(t, err)
+	vrfLogEmitterAddress, _, vrfLogEmitter, err := vrf_log_emitter.DeployVRFLogEmitter(owner, ec)
+	require.NoError(t, err)
+	ec.Commit()
+
+	// Log Poller Listener
+	cfg := pgtest.NewQConfig(false)
+	ks := keystore.NewInMemory(db, utils.FastScryptParams, lggr, cfg)
+	require.NoError(t, ks.Unlock("blah"))
+	j, err := vrfcommon.ValidatedVRFSpec(testspecs.GenerateVRFSpec(testspecs.VRFSpecParams{
+		RequestedConfsDelay: 10,
+		EVMChainID:          chainID.String(),
+	}).Toml())
+	require.NoError(t, err)
+
+	coordinatorV2, err := vrf_coordinator_v2.NewVRFCoordinatorV2(vrfLogEmitter.Address(), ec)
+	require.Nil(t, err)
+	coordinator := NewCoordinatorV2(coordinatorV2)
+
+	chain := evmmocks.NewChain(t)
+	listener := &listenerV2{
+		respCount:   map[string]uint64{},
+		job:         j,
+		chain:       chain,
+		l:           logger.Sugared(lggr),
+		coordinator: coordinator,
+	}
+	ctx := testutils.Context(t)
+
+	// Filter registration is idempotent, so we can just call it every time
+	// and retry on errors using the ticker.
+	err = lp.RegisterFilter(logpoller.Filter{
+		Name: fmt.Sprintf("vrf_%s_keyhash_%s_job_%d", "v2", listener.job.VRFSpec.PublicKey.MustHash().String(), listener.job.ID),
+		EventSigs: evmtypes.HashArray{
+			vrf_log_emitter.VRFLogEmitterRandomWordsRequested{}.Topic(),
+			vrf_log_emitter.VRFLogEmitterRandomWordsFulfilled{}.Topic(),
+		},
+		Addresses: evmtypes.AddressArray{
+			vrfLogEmitter.Address(),
+			// listener.job.VRFSpec.CoordinatorAddress.Address(),
+		},
+	})
+	require.Nil(t, err)
+	require.NoError(t, lp.RegisterFilter(logpoller.Filter{
+		Name:      "Integration test",
+		EventSigs: []common.Hash{emitterABI.Events["Log1"].ID},
+		Addresses: []common.Address{emitterAddress1},
+		Retention: 0}))
+	require.Nil(t, err)
+	require.Len(t, lp.Filter(nil, nil, nil).Addresses, 2)
+	require.Len(t, lp.Filter(nil, nil, nil).Topics, 1)
+	require.Len(t, lp.Filter(nil, nil, nil).Topics[0], 3)
+
+	th := &vrfLogPollerListenerTH{
+		Lggr:              lggr,
+		ChainID:           chainID,
+		ORM:               o,
+		LogPoller:         lp,
+		Emitter:           emitter1,
+		EmitterAddress:    emitterAddress1,
+		VRFLogEmitter:     vrfLogEmitter,
+		VRFEmitterAddress: vrfLogEmitterAddress,
+		Client:            ec,
+		Owner:             owner,
+		EthDB:             ethDB,
+		Db:                db,
+		Listener:          listener,
+		Ctx:               ctx,
+	}
+	mockChainUpdateFn(chain, th)
+	return th
+}
+
+/* Tests for initializeLastProcessedBlock: BEGIN
+ * TestInitProcessedBlock_NoVRFReqs
+ * TestInitProcessedBlock_NoUnfulfilledVRFReqs
+ * TestInitProcessedBlock_OneUnfulfilledVRFReq
+ * TestInitProcessedBlock_SomeUnfulfilledVRFReqs
+ * TestInitProcessedBlock_UnfulfilledNFulfilledVRFReqs
+ */
+
+func TestInitProcessedBlock_NoVRFReqs(t *testing.T) {
+	t.Parallel()
+
+	finalityDepth := int64(3)
+	th := setupVRFLogPollerListenerTH(t, false, finalityDepth, 3, 2, 1000, func(mockChain *evmmocks.Chain, th *vrfLogPollerListenerTH) {
+		mockChain.On("ID").Return(th.ChainID)
+		mockChain.On("LogPoller").Return(th.LogPoller)
+	})
+
+	// Block 3 to finalityDepth. Ensure we have finality number of blocks
+	for i := 1; i < int(finalityDepth); i++ {
+		th.Client.Commit()
+	}
+
+	// Emit some logs from block 5 to 9 (Inclusive)
+	n := 5
+	for i := 0; i < n; i++ {
+		_, err1 := th.Emitter.EmitLog1(th.Owner, []*big.Int{big.NewInt(int64(i))})
+		require.NoError(t, err1)
+		_, err1 = th.Emitter.EmitLog2(th.Owner, []*big.Int{big.NewInt(int64(i))})
+		require.NoError(t, err1)
+		th.Client.Commit()
+	}
+
+	// Blocks till now: 2 (in SetupTH) + 2 (empty blocks) + 5 (EmitLog blocks) = 9
+
+	// Calling Start() after RegisterFilter() simulates a node restart after job creation, should reload Filter from db.
+	require.NoError(t, th.LogPoller.Start(testutils.Context(t)))
+
+	// The poller starts on a new chain at latest-finality (finalityDepth + 5 in this case),
+	// Replaying from block 4 should guarantee we have block 4 immediately.  (We will also get
+	// block 3 once the backup poller runs, since it always starts 100 blocks behind.)
+	require.NoError(t, th.LogPoller.Replay(testutils.Context(t), 4))
+
+	// Should return logs from block 5 to 7 (inclusive)
+	logs, err := th.LogPoller.Logs(4, 7, emitterABI.Events["Log1"].ID, th.EmitterAddress,
+		pg.WithParentCtx(testutils.Context(t)))
+	require.NoError(t, err)
+	require.Equal(t, 3, len(logs))
+
+	lastProcessedBlock, err := th.Listener.initializeLastProcessedBlock(th.Ctx)
+	require.Nil(t, err)
+	require.Equal(t, int64(6), lastProcessedBlock)
+}
+
+func TestInitProcessedBlock_NoUnfulfilledVRFReqs(t *testing.T) {
+	t.Parallel()
+
+	finalityDepth := int64(3)
+	th := setupVRFLogPollerListenerTH(t, false, finalityDepth, 3, 2, 1000, func(mockChain *evmmocks.Chain, curTH *vrfLogPollerListenerTH) {
+		mockChain.On("ID").Return(curTH.ChainID)
+		mockChain.On("LogPoller").Return(curTH.LogPoller)
+	})
+
+	// Block 3 to finalityDepth. Ensure we have finality number of blocks
+	for i := 1; i < int(finalityDepth); i++ {
+		th.Client.Commit()
+	}
+
+	// Create VRF request block and a fulfillment block
+	keyHash := [32]byte(th.Listener.job.VRFSpec.PublicKey.MustHash().Bytes())
+	preSeed := big.NewInt(105)
+	subID := uint64(1)
+	reqID := big.NewInt(1)
+	_, err2 := th.VRFLogEmitter.EmitRandomWordsRequested(th.Owner,
+		keyHash, reqID, preSeed, subID, 10, 10000, 2, th.Owner.From)
+	require.NoError(t, err2)
+	th.Client.Commit()
+	_, err2 = th.VRFLogEmitter.EmitRandomWordsFulfilled(th.Owner, reqID, preSeed, big.NewInt(10), true)
+	require.NoError(t, err2)
+	th.Client.Commit()
+
+	// Emit some logs in blocks to make the VRF req and fulfillment older than finalityDepth from latestBlock
+	n := 5
+	for i := 0; i < n; i++ {
+		_, err1 := th.Emitter.EmitLog1(th.Owner, []*big.Int{big.NewInt(int64(i))})
+		require.NoError(t, err1)
+		_, err1 = th.Emitter.EmitLog2(th.Owner, []*big.Int{big.NewInt(int64(i))})
+		require.NoError(t, err1)
+		th.Client.Commit()
+	}
+
+	// Calling Start() after RegisterFilter() simulates a node restart after job creation, should reload Filter from db.
+	require.NoError(t, th.LogPoller.Start(th.Ctx))
+
+	// Blocks till now: 2 (in SetupTH) + 2 (empty blocks) + 2 (VRF req/resp block) + 5 (EmitLog blocks) = 11
+	latestBlock := int64(2 + 2 + 2 + 5)
+
+	// A replay is needed so that log poller has a latest block
+	// Replay from block 11 (latest) onwards, so that log poller has a latest block
+	// Then test if log poller is able to replay from finalizedBlockNumber (8 --> onwards)
+	// since there are no pending VRF requests
+	// Blocks: 1 2 3 4 [5;Request] [6;Fulfilment] 7 8 9 10 11
+	require.NoError(t, th.LogPoller.Replay(th.Ctx, latestBlock))
+
+	// initializeLastProcessedBlock must return the finalizedBlockNumber (8) instead of
+	// VRF request block number (5), since all VRF requests are fulfilled
+	lastProcessedBlock, err := th.Listener.initializeLastProcessedBlock(th.Ctx)
+	require.Nil(t, err)
+	require.Equal(t, int64(8), lastProcessedBlock)
+}
+
+func TestInitProcessedBlock_OneUnfulfilledVRFReq(t *testing.T) {
+	t.Parallel()
+
+	finalityDepth := int64(3)
+	th := setupVRFLogPollerListenerTH(t, false, finalityDepth, 3, 2, 1000, func(mockChain *evmmocks.Chain, curTH *vrfLogPollerListenerTH) {
+		mockChain.On("ID").Return(curTH.ChainID)
+		mockChain.On("LogPoller").Return(curTH.LogPoller)
+	})
+
+	// Block 3 to finalityDepth. Ensure we have finality number of blocks
+	for i := 1; i < int(finalityDepth); i++ {
+		th.Client.Commit()
+	}
+
+	// Make a VRF request without fulfilling it
+	keyHash := [32]byte(th.Listener.job.VRFSpec.PublicKey.MustHash().Bytes())
+	preSeed := big.NewInt(105)
+	subID := uint64(1)
+	reqID := big.NewInt(1)
+	_, err2 := th.VRFLogEmitter.EmitRandomWordsRequested(th.Owner,
+		keyHash, reqID, preSeed, subID, 10, 10000, 2, th.Owner.From)
+	require.NoError(t, err2)
+	th.Client.Commit()
+
+	// Emit some logs in blocks to make the VRF req and fulfillment older than finalityDepth from latestBlock
+	n := 5
+	th.Client.Commit()
+	for i := 0; i < n; i++ {
+		_, err1 := th.Emitter.EmitLog1(th.Owner, []*big.Int{big.NewInt(int64(i))})
+		require.NoError(t, err1)
+		_, err1 = th.Emitter.EmitLog2(th.Owner, []*big.Int{big.NewInt(int64(i))})
+		require.NoError(t, err1)
+		th.Client.Commit()
+	}
+
+	// Calling Start() after RegisterFilter() simulates a node restart after job creation, should reload Filter from db.
+	require.NoError(t, th.LogPoller.Start(th.Ctx))
+
+	// Blocks till now: 2 (in SetupTH) + 2 (empty blocks) + 1 (VRF req block) + 5 (EmitLog blocks) = 10
+	latestBlock := int64(2 + 2 + 1 + 5)
+
+	// A replay is needed so that log poller has a latest block
+	// Replay from block 10 (latest) onwards, so that log poller has a latest block
+	// Then test if log poller is able to replay from earliestUnprocessedBlock (5 --> onwards)
+	// Blocks: 1 2 3 4 [5;Request] 6 7 8 9 10
+	require.NoError(t, th.LogPoller.Replay(th.Ctx, latestBlock))
+
+	// initializeLastProcessedBlock must return the unfulfilled VRF
+	// request block number (5) instead of finalizedBlockNumber (8)
+	lastProcessedBlock, err := th.Listener.initializeLastProcessedBlock(th.Ctx)
+	require.Nil(t, err)
+	require.Equal(t, int64(5), lastProcessedBlock)
+}
+
+func TestInitProcessedBlock_SomeUnfulfilledVRFReqs(t *testing.T) {
+	t.Parallel()
+
+	finalityDepth := int64(3)
+	th := setupVRFLogPollerListenerTH(t, false, finalityDepth, 3, 2, 1000, func(mockChain *evmmocks.Chain, curTH *vrfLogPollerListenerTH) {
+		mockChain.On("ID").Return(curTH.ChainID)
+		mockChain.On("LogPoller").Return(curTH.LogPoller)
+	})
+
+	// Block 3 to finalityDepth. Ensure we have finality number of blocks
+	for i := 1; i < int(finalityDepth); i++ {
+		th.Client.Commit()
+	}
+
+	// Emit some logs in blocks with VRF reqs interspersed
+	// No fulfillment for any VRF requests
+	n := 5
+	for i := 0; i < n; i++ {
+		_, err1 := th.Emitter.EmitLog1(th.Owner, []*big.Int{big.NewInt(int64(i))})
+		require.NoError(t, err1)
+		_, err1 = th.Emitter.EmitLog2(th.Owner, []*big.Int{big.NewInt(int64(i))})
+		require.NoError(t, err1)
+		th.Client.Commit()
+
+		// Create 2 blocks with VRF requests in each iteration
+		keyHash := [32]byte(th.Listener.job.VRFSpec.PublicKey.MustHash().Bytes())
+		preSeed := big.NewInt(105)
+		subID := uint64(1)
+		reqID1 := big.NewInt(int64(2 * i))
+		_, err2 := th.VRFLogEmitter.EmitRandomWordsRequested(th.Owner,
+			keyHash, reqID1, preSeed, subID, 10, 10000, 2, th.Owner.From)
+		require.NoError(t, err2)
+		th.Client.Commit()
+
+		reqID2 := big.NewInt(int64(2*i + 1))
+		_, err2 = th.VRFLogEmitter.EmitRandomWordsRequested(th.Owner,
+			keyHash, reqID2, preSeed, subID, 10, 10000, 2, th.Owner.From)
+		require.NoError(t, err2)
+		th.Client.Commit()
+	}
+
+	// Calling Start() after RegisterFilter() simulates a node restart after job creation, should reload Filter from db.
+	require.NoError(t, th.LogPoller.Start(th.Ctx))
+
+	// Blocks till now: 2 (in SetupTH) + 2 (empty blocks) + 3*5 (EmitLog + VRF req/resp blocks) = 19
+	latestBlock := int64(2 + 2 + 3*5)
+
+	// A replay is needed so that log poller has a latest block
+	// Replay from block 19 (latest) onwards, so that log poller has a latest block
+	// Then test if log poller is able to replay from earliestUnprocessedBlock (6 --> onwards)
+	// Blocks: 1 2 3 4 5 [6;Request] [7;Request] 8 [9;Request] [10;Request]
+	// 11 [12;Request] [13;Request] 14 [15;Request] [16;Request]
+	// 17 [18;Request] [19;Request]
+	require.NoError(t, th.LogPoller.Replay(th.Ctx, latestBlock))
+
+	// initializeLastProcessedBlock must return the earliest unfulfilled VRF request block
+	// number instead of finalizedBlockNumber
+	lastProcessedBlock, err := th.Listener.initializeLastProcessedBlock(th.Ctx)
+	require.Nil(t, err)
+	require.Equal(t, int64(6), lastProcessedBlock)
+}
+
+func TestInitProcessedBlock_UnfulfilledNFulfilledVRFReqs(t *testing.T) {
+	t.Parallel()
+
+	finalityDepth := int64(3)
+	th := setupVRFLogPollerListenerTH(t, false, finalityDepth, 3, 2, 1000, func(mockChain *evmmocks.Chain, curTH *vrfLogPollerListenerTH) {
+		mockChain.On("ID").Return(curTH.ChainID)
+		mockChain.On("LogPoller").Return(curTH.LogPoller)
+	})
+
+	// Block 3 to finalityDepth. Ensure we have finality number of blocks
+	for i := 1; i < int(finalityDepth); i++ {
+		th.Client.Commit()
+	}
+
+	// Emit some logs in blocks with VRF reqs interspersed
+	// One VRF request in each iteration is fulfilled to imitate mixed workload
+	n := 5
+	for i := 0; i < n; i++ {
+		_, err1 := th.Emitter.EmitLog1(th.Owner, []*big.Int{big.NewInt(int64(i))})
+		require.NoError(t, err1)
+		_, err1 = th.Emitter.EmitLog2(th.Owner, []*big.Int{big.NewInt(int64(i))})
+		require.NoError(t, err1)
+		th.Client.Commit()
+
+		// Create 2 blocks with VRF requests in each iteration and fulfill one
+		// of them. This creates a mixed workload of fulfilled and unfulfilled
+		// VRF requests for testing the VRF listener
+		keyHash := [32]byte(th.Listener.job.VRFSpec.PublicKey.MustHash().Bytes())
+		preSeed := big.NewInt(105)
+		subID := uint64(1)
+		reqID1 := big.NewInt(int64(2 * i))
+		_, err2 := th.VRFLogEmitter.EmitRandomWordsRequested(th.Owner,
+			keyHash, reqID1, preSeed, subID, 10, 10000, 2, th.Owner.From)
+		require.NoError(t, err2)
+		th.Client.Commit()
+
+		reqID2 := big.NewInt(int64(2*i + 1))
+		_, err2 = th.VRFLogEmitter.EmitRandomWordsRequested(th.Owner,
+			keyHash, reqID2, preSeed, subID, 10, 10000, 2, th.Owner.From)
+		require.NoError(t, err2)
+
+		_, err2 = th.VRFLogEmitter.EmitRandomWordsFulfilled(th.Owner, reqID1, preSeed, big.NewInt(10), true)
+		require.NoError(t, err2)
+		th.Client.Commit()
+	}
+
+	// Calling Start() after RegisterFilter() simulates a node restart after job creation, should reload Filter from db.
+	require.NoError(t, th.LogPoller.Start(th.Ctx))
+
+	// Blocks till now: 2 (in SetupTH) + 2 (empty blocks) + 3*5 (EmitLog + VRF req/resp blocks) = 19
+	latestBlock := int64(2 + 2 + 3*5)
+	// A replay is needed so that log poller has a latest block
+	// Replay from block 19 (latest) onwards, so that log poller has a latest block
+	// Then test if log poller is able to replay from earliestUnprocessedBlock (7 --> onwards)
+	// Blocks: 1 2 3 4 5 [6;Request] [7;Request;6-Fulfilment] 8 [9;Request] [10;Request;9-Fulfilment]
+	// 11 [12;Request] [13;Request;12-Fulfilment] 14 [15;Request] [16;Request;15-Fulfilment]
+	// 17 [18;Request] [19;Request;18-Fulfilment]
+	require.NoError(t, th.LogPoller.Replay(th.Ctx, latestBlock))
+
+	// initializeLastProcessedBlock must return the earliest unfulfilled VRF request block
+	// number instead of finalizedBlockNumber
+	lastProcessedBlock, err := th.Listener.initializeLastProcessedBlock(th.Ctx)
+	require.Nil(t, err)
+	require.Equal(t, int64(7), lastProcessedBlock)
+}
+
+/* Tests for initializeLastProcessedBlock: END */
+
+/* Tests for updateLastProcessedBlock: BEGIN
+ * TestUpdateLastProcessedBlock_NoVRFReqs
+ * TestUpdateLastProcessedBlock_NoUnfulfilledVRFReqs
+ * TestUpdateLastProcessedBlock_OneUnfulfilledVRFReq
+ * TestUpdateLastProcessedBlock_SomeUnfulfilledVRFReqs
+ * TestUpdateLastProcessedBlock_UnfulfilledNFulfilledVRFReqs
+ */
+
+func TestUpdateLastProcessedBlock_NoVRFReqs(t *testing.T) {
+	t.Parallel()
+
+	finalityDepth := int64(3)
+	th := setupVRFLogPollerListenerTH(t, false, finalityDepth, 3, 2, 1000, func(mockChain *evmmocks.Chain, curTH *vrfLogPollerListenerTH) {
+		mockChain.On("LogPoller").Return(curTH.LogPoller)
+	})
+
+	// Block 3 to finalityDepth. Ensure we have finality number of blocks
+	for i := 1; i < int(finalityDepth); i++ {
+		th.Client.Commit()
+	}
+
+	// Create VRF request logs
+	keyHash := [32]byte(th.Listener.job.VRFSpec.PublicKey.MustHash().Bytes())
+	preSeed := big.NewInt(105)
+	subID := uint64(1)
+	reqID1 := big.NewInt(int64(1))
+
+	_, err2 := th.VRFLogEmitter.EmitRandomWordsRequested(th.Owner,
+		keyHash, reqID1, preSeed, subID, 10, 10000, 2, th.Owner.From)
+	require.NoError(t, err2)
+	th.Client.Commit()
+
+	reqID2 := big.NewInt(int64(2))
+	_, err2 = th.VRFLogEmitter.EmitRandomWordsRequested(th.Owner,
+		keyHash, reqID2, preSeed, subID, 10, 10000, 2, th.Owner.From)
+	require.NoError(t, err2)
+	th.Client.Commit()
+
+	// Emit some logs in blocks to make the VRF req and fulfillment older than finalityDepth from latestBlock
+	n := 5
+	for i := 0; i < n; i++ {
+		_, err1 := th.Emitter.EmitLog1(th.Owner, []*big.Int{big.NewInt(int64(i))})
+		require.NoError(t, err1)
+		_, err1 = th.Emitter.EmitLog2(th.Owner, []*big.Int{big.NewInt(int64(i))})
+		require.NoError(t, err1)
+		th.Client.Commit()
+	}
+
+	// Blocks till now: 2 (in SetupTH) + 2 (empty blocks) + 2 (VRF req blocks) + 5 (EmitLog blocks) = 11
+
+	// Calling Start() after RegisterFilter() simulates a node restart after job creation, should reload Filter from db.
+	require.NoError(t, th.LogPoller.Start(th.Ctx))
+
+	// We've to replay from before VRF request log, since updateLastProcessedBlock
+	// does not internally call LogPoller.Replay
+	require.NoError(t, th.LogPoller.Replay(th.Ctx, 4))
+
+	// updateLastProcessedBlock must return the finalizedBlockNumber as there are
+	// no VRF requests, after currLastProcessedBlock (block 6). The VRF requests
+	// made above are before the currLastProcessedBlock (7) passed in below
+	lastProcessedBlock, err := th.Listener.updateLastProcessedBlock(th.Ctx, 7)
+	require.Nil(t, err)
+	require.Equal(t, int64(8), lastProcessedBlock)
+}
+
+func TestUpdateLastProcessedBlock_NoUnfulfilledVRFReqs(t *testing.T) {
+	t.Parallel()
+
+	finalityDepth := int64(3)
+	th := setupVRFLogPollerListenerTH(t, false, finalityDepth, 3, 2, 1000, func(mockChain *evmmocks.Chain, curTH *vrfLogPollerListenerTH) {
+		mockChain.On("LogPoller").Return(curTH.LogPoller)
+	})
+
+	// Block 3 to finalityDepth. Ensure we have finality number of blocks
+	for i := 1; i < int(finalityDepth); i++ {
+		th.Client.Commit()
+	}
+
+	// Create VRF request log block with a fulfillment log block
+	keyHash := [32]byte(th.Listener.job.VRFSpec.PublicKey.MustHash().Bytes())
+	preSeed := big.NewInt(105)
+	subID := uint64(1)
+	reqID1 := big.NewInt(int64(1))
+
+	_, err2 := th.VRFLogEmitter.EmitRandomWordsRequested(th.Owner,
+		keyHash, reqID1, preSeed, subID, 10, 10000, 2, th.Owner.From)
+	require.NoError(t, err2)
+	th.Client.Commit()
+
+	_, err2 = th.VRFLogEmitter.EmitRandomWordsFulfilled(th.Owner, reqID1, preSeed, big.NewInt(10), true)
+	require.NoError(t, err2)
+	th.Client.Commit()
+
+	// Emit some logs in blocks to make the VRF req and fulfillment older than finalityDepth from latestBlock
+	n := 5
+	for i := 0; i < n; i++ {
+		_, err1 := th.Emitter.EmitLog1(th.Owner, []*big.Int{big.NewInt(int64(i))})
+		require.NoError(t, err1)
+		_, err1 = th.Emitter.EmitLog2(th.Owner, []*big.Int{big.NewInt(int64(i))})
+		require.NoError(t, err1)
+		th.Client.Commit()
+	}
+
+	// Blocks till now: 2 (in SetupTH) + 2 (empty blocks) + 2 (VRF req/resp blocks) + 5 (EmitLog blocks) = 11
+
+	// Calling Start() after RegisterFilter() simulates a node restart after job creation, should reload Filter from db.
+	require.NoError(t, th.LogPoller.Start(th.Ctx))
+
+	// We've to replay from before VRF request log, since updateLastProcessedBlock
+	// does not internally call LogPoller.Replay
+	require.NoError(t, th.LogPoller.Replay(th.Ctx, 4))
+
+	// updateLastProcessedBlock must return the finalizedBlockNumber (8) though we have
+	// a VRF req at block (5) after currLastProcessedBlock (4) passed below, because
+	// the VRF request is fulfilled
+	lastProcessedBlock, err := th.Listener.updateLastProcessedBlock(th.Ctx, 4)
+	require.Nil(t, err)
+	require.Equal(t, int64(8), lastProcessedBlock)
+}
+
+func TestUpdateLastProcessedBlock_OneUnfulfilledVRFReq(t *testing.T) {
+	t.Parallel()
+
+	finalityDepth := int64(3)
+	th := setupVRFLogPollerListenerTH(t, false, finalityDepth, 3, 2, 1000, func(mockChain *evmmocks.Chain, curTH *vrfLogPollerListenerTH) {
+		mockChain.On("LogPoller").Return(curTH.LogPoller)
+	})
+
+	// Block 3 to finalityDepth. Ensure we have finality number of blocks
+	for i := 1; i < int(finalityDepth); i++ {
+		th.Client.Commit()
+	}
+
+	// Create VRF request logs without a fulfillment log block
+	keyHash := [32]byte(th.Listener.job.VRFSpec.PublicKey.MustHash().Bytes())
+	preSeed := big.NewInt(105)
+	subID := uint64(1)
+	reqID1 := big.NewInt(int64(1))
+
+	_, err2 := th.VRFLogEmitter.EmitRandomWordsRequested(th.Owner,
+		keyHash, reqID1, preSeed, subID, 10, 10000, 2, th.Owner.From)
+	require.NoError(t, err2)
+	th.Client.Commit()
+
+	// Emit some logs in blocks to make the VRF req and fulfillment older than finalityDepth from latestBlock
+	n := 5
+	for i := 0; i < n; i++ {
+		_, err1 := th.Emitter.EmitLog1(th.Owner, []*big.Int{big.NewInt(int64(i))})
+		require.NoError(t, err1)
+		_, err1 = th.Emitter.EmitLog2(th.Owner, []*big.Int{big.NewInt(int64(i))})
+		require.NoError(t, err1)
+		th.Client.Commit()
+	}
+
+	// Blocks till now: 2 (in SetupTH) + 2 (empty blocks) + 1 (VRF req block) + 5 (EmitLog blocks) = 10
+
+	// Calling Start() after RegisterFilter() simulates a node restart after job creation, should reload Filter from db.
+	require.NoError(t, th.LogPoller.Start(th.Ctx))
+
+	// We've to replay from before VRF request log, since updateLastProcessedBlock
+	// does not internally call LogPoller.Replay
+	require.NoError(t, th.LogPoller.Replay(th.Ctx, 4))
+
+	// updateLastProcessedBlock must return the VRF req at block (5) instead of
+	// finalizedBlockNumber (8) after currLastProcessedBlock (4) passed below,
+	// because the VRF request is unfulfilled
+	lastProcessedBlock, err := th.Listener.updateLastProcessedBlock(th.Ctx, 4)
+	require.Nil(t, err)
+	require.Equal(t, int64(5), lastProcessedBlock)
+}
+
+func TestUpdateLastProcessedBlock_SomeUnfulfilledVRFReqs(t *testing.T) {
+	t.Parallel()
+
+	finalityDepth := int64(3)
+	th := setupVRFLogPollerListenerTH(t, false, finalityDepth, 3, 2, 1000, func(mockChain *evmmocks.Chain, curTH *vrfLogPollerListenerTH) {
+		mockChain.On("LogPoller").Return(curTH.LogPoller)
+	})
+
+	// Block 3 to finalityDepth. Ensure we have finality number of blocks
+	for i := 1; i < int(finalityDepth); i++ {
+		th.Client.Commit()
+	}
+
+	// Emit some logs in blocks to make the VRF req and fulfillment older than finalityDepth from latestBlock
+	n := 5
+	for i := 0; i < n; i++ {
+		_, err1 := th.Emitter.EmitLog1(th.Owner, []*big.Int{big.NewInt(int64(i))})
+		require.NoError(t, err1)
+		_, err1 = th.Emitter.EmitLog2(th.Owner, []*big.Int{big.NewInt(int64(i))})
+		require.NoError(t, err1)
+		th.Client.Commit()
+
+		// Create 2 blocks with VRF requests in each iteration
+		keyHash := [32]byte(th.Listener.job.VRFSpec.PublicKey.MustHash().Bytes())
+		preSeed := big.NewInt(105)
+		subID := uint64(1)
+		reqID1 := big.NewInt(int64(2 * i))
+
+		_, err2 := th.VRFLogEmitter.EmitRandomWordsRequested(th.Owner,
+			keyHash, reqID1, preSeed, subID, 10, 10000, 2, th.Owner.From)
+		require.NoError(t, err2)
+		th.Client.Commit()
+
+		reqID2 := big.NewInt(int64(2*i + 1))
+		_, err2 = th.VRFLogEmitter.EmitRandomWordsRequested(th.Owner,
+			keyHash, reqID2, preSeed, subID, 10, 10000, 2, th.Owner.From)
+		require.NoError(t, err2)
+		th.Client.Commit()
+	}
+
+	// Blocks till now: 2 (in SetupTH) + 2 (empty blocks) + 3*5 (EmitLog + VRF req blocks) = 19
+
+	// Calling Start() after RegisterFilter() simulates a node restart after job creation, should reload Filter from db.
+	require.NoError(t, th.LogPoller.Start(th.Ctx))
+
+	// We've to replay from before VRF request log, since updateLastProcessedBlock
+	// does not internally call LogPoller.Replay
+	require.NoError(t, th.LogPoller.Replay(th.Ctx, 4))
+
+	// updateLastProcessedBlock must return the VRF req at block (6) instead of
+	// finalizedBlockNumber (16) after currLastProcessedBlock (4) passed below,
+	// as block 6 contains the earliest unfulfilled VRF request
+	lastProcessedBlock, err := th.Listener.updateLastProcessedBlock(th.Ctx, 4)
+	require.Nil(t, err)
+	require.Equal(t, int64(6), lastProcessedBlock)
+}
+
+func TestUpdateLastProcessedBlock_UnfulfilledNFulfilledVRFReqs(t *testing.T) {
+	t.Parallel()
+
+	finalityDepth := int64(3)
+	th := setupVRFLogPollerListenerTH(t, false, finalityDepth, 3, 2, 1000, func(mockChain *evmmocks.Chain, curTH *vrfLogPollerListenerTH) {
+		mockChain.On("LogPoller").Return(curTH.LogPoller)
+	})
+
+	// Block 3 to finalityDepth. Ensure we have finality number of blocks
+	for i := 1; i < int(finalityDepth); i++ {
+		th.Client.Commit()
+	}
+
+	// Emit some logs in blocks to make the VRF req and fulfillment older than finalityDepth from latestBlock
+	n := 5
+	for i := 0; i < n; i++ {
+		_, err1 := th.Emitter.EmitLog1(th.Owner, []*big.Int{big.NewInt(int64(i))})
+		require.NoError(t, err1)
+		_, err1 = th.Emitter.EmitLog2(th.Owner, []*big.Int{big.NewInt(int64(i))})
+		require.NoError(t, err1)
+		th.Client.Commit()
+
+		// Create 2 blocks with VRF requests in each iteration and fulfill one
+		// of them. This creates a mixed workload of fulfilled and unfulfilled
+		// VRF requests for testing the VRF listener
+		keyHash := [32]byte(th.Listener.job.VRFSpec.PublicKey.MustHash().Bytes())
+		preSeed := big.NewInt(105)
+		subID := uint64(1)
+		reqID1 := big.NewInt(int64(2 * i))
+
+		_, err2 := th.VRFLogEmitter.EmitRandomWordsRequested(th.Owner,
+			keyHash, reqID1, preSeed, subID, 10, 10000, 2, th.Owner.From)
+		require.NoError(t, err2)
+		th.Client.Commit()
+
+		reqID2 := big.NewInt(int64(2*i + 1))
+		_, err2 = th.VRFLogEmitter.EmitRandomWordsRequested(th.Owner,
+			keyHash, reqID2, preSeed, subID, 10, 10000, 2, th.Owner.From)
+		require.NoError(t, err2)
+		_, err2 = th.VRFLogEmitter.EmitRandomWordsFulfilled(th.Owner, reqID1, preSeed, big.NewInt(10), true)
+		require.NoError(t, err2)
+		th.Client.Commit()
+	}
+
+	// Blocks till now: 2 (in SetupTH) + 2 (empty blocks) + 3*5 (EmitLog + VRF req blocks) = 19
+
+	// Calling Start() after RegisterFilter() simulates a node restart after job creation, should reload Filter from db.
+	require.NoError(t, th.LogPoller.Start(th.Ctx))
+
+	// We've to replay from before VRF request log, since updateLastProcessedBlock
+	// does not internally call LogPoller.Replay
+	require.NoError(t, th.LogPoller.Replay(th.Ctx, 4))
+
+	// updateLastProcessedBlock must return the VRF req at block (7) instead of
+	// finalizedBlockNumber (16) after currLastProcessedBlock (4) passed below,
+	// as block 7 contains the earliest unfulfilled VRF request. VRF request
+	// in block 6 has been fulfilled in block 7.
+	lastProcessedBlock, err := th.Listener.updateLastProcessedBlock(th.Ctx, 4)
+	require.Nil(t, err)
+	require.Equal(t, int64(7), lastProcessedBlock)
+}
+
+/* Tests for updateLastProcessedBlock: END */
+
+/* Tests for getUnfulfilled: BEGIN
+ * TestGetUnfulfilled_NoVRFReqs
+ * TestGetUnfulfilled_NoUnfulfilledVRFReqs
+ * TestGetUnfulfilled_OneUnfulfilledVRFReq
+ * TestGetUnfulfilled_SomeUnfulfilledVRFReqs
+ * TestGetUnfulfilled_UnfulfilledNFulfilledVRFReqs
+ */
+
+func SetupGetUnfulfilledTH(t *testing.T) (*listenerV2, *utils.Big) {
+	chainID := utils.NewBig(big.NewInt(12345))
+	lggr := logger.TestLogger(t)
+	j, err := vrfcommon.ValidatedVRFSpec(testspecs.GenerateVRFSpec(testspecs.VRFSpecParams{
+		RequestedConfsDelay: 10,
+		EVMChainID:          chainID.String(),
+	}).Toml())
+	require.NoError(t, err)
+	chain := evmmocks.NewChain(t)
+
+	// Construct CoordinatorV2_X object for VRF listener
+	owner := testutils.MustNewSimTransactor(t)
+	ethDB := rawdb.NewMemoryDatabase()
+	ec := backends.NewSimulatedBackendWithDatabase(ethDB, map[common.Address]core.GenesisAccount{
+		owner.From: {
+			Balance: big.NewInt(0).Mul(big.NewInt(10), big.NewInt(1e18)),
+		},
+	}, 10e6)
+	_, _, vrfLogEmitter, err := vrf_log_emitter.DeployVRFLogEmitter(owner, ec)
+	require.NoError(t, err)
+	ec.Commit()
+	coordinatorV2, err := vrf_coordinator_v2.NewVRFCoordinatorV2(vrfLogEmitter.Address(), ec)
+	require.Nil(t, err)
+	coordinator := NewCoordinatorV2(coordinatorV2)
+
+	listener := &listenerV2{
+		respCount:   map[string]uint64{},
+		job:         j,
+		chain:       chain,
+		l:           logger.Sugared(lggr),
+		coordinator: coordinator,
+	}
+	return listener, chainID
+}
+
+func TestGetUnfulfilled_NoVRFReqs(t *testing.T) {
+	t.Parallel()
+
+	listener, chainID := SetupGetUnfulfilledTH(t)
+
+	logs := []logpoller.Log{}
+	for i := 0; i < 10; i++ {
+		logs = append(logs, logpoller.Log{
+			EvmChainId:     chainID,
+			LogIndex:       0,
+			BlockHash:      common.BigToHash(big.NewInt(int64(i))),
+			BlockNumber:    int64(i),
+			BlockTimestamp: time.Now(),
+			Topics: [][]byte{
+				[]byte("0x46692c0e59ca9cd1ad8f984a9d11715ec83424398b7eed4e05c8ce84662415a8"),
+			},
+			EventSig:  emitterABI.Events["Log1"].ID,
+			Address:   common.Address{},
+			TxHash:    common.BigToHash(big.NewInt(int64(i))),
+			Data:      nil,
+			CreatedAt: time.Now(),
+		})
+	}
+
+	unfulfilled, _, fulfilled := listener.getUnfulfilled(logs, listener.l)
+	require.Empty(t, unfulfilled)
+	require.Empty(t, fulfilled)
+}
+
+func TestGetUnfulfilled_NoUnfulfilledVRFReqs(t *testing.T) {
+	t.Parallel()
+
+	listener, chainID := SetupGetUnfulfilledTH(t)
+
+	logs := []logpoller.Log{}
+	for i := 0; i < 10; i++ {
+		eventSig := emitterABI.Events["Log1"].ID
+		topics := [][]byte{
+			common.FromHex("0x46692c0e59ca9cd1ad8f984a9d11715ec83424398b7eed4e05c8ce84662415a8"),
+		}
+		if i%2 == 0 {
+			eventSig = vrfEmitterABI.Events["RandomWordsRequested"].ID
+			topics = [][]byte{
+				common.FromHex("0x63373d1c4696214b898952999c9aaec57dac1ee2723cec59bea6888f489a9772"),
+				common.FromHex("0xc0a6c424ac7157ae408398df7e5f4552091a69125d5dfcb7b8c2659029395bdf"),
+				common.FromHex("0x0000000000000000000000000000000000000000000000000000000000000001"),
+				common.FromHex("0x0000000000000000000000005ee3b50502b5c4c9184dcb281471a0614d4b2ef9"),
+			}
+		}
+		logs = append(logs, logpoller.Log{
+			EvmChainId:     chainID,
+			LogIndex:       0,
+			BlockHash:      common.BigToHash(big.NewInt(int64(2 * i))),
+			BlockNumber:    int64(2 * i),
+			BlockTimestamp: time.Now(),
+			Topics:         topics,
+			EventSig:       eventSig,
+			Address:        common.Address{},
+			TxHash:         common.BigToHash(big.NewInt(int64(2 * i))),
+			Data:           common.FromHex("0x000000000000000000000000000000000000000000000000000000000000000" + fmt.Sprintf("%d", i) + "000000000000000000000000000000000000000000000000000000000000006a000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000027100000000000000000000000000000000000000000000000000000000000000002"),
+			CreatedAt:      time.Now(),
+		})
+		if i%2 == 0 {
+			logs = append(logs, logpoller.Log{
+				EvmChainId:     chainID,
+				LogIndex:       0,
+				BlockHash:      common.BigToHash(big.NewInt(int64(2*i + 1))),
+				BlockNumber:    int64(2*i + 1),
+				BlockTimestamp: time.Now(),
+				Topics: [][]byte{
+					common.FromHex("0x7dffc5ae5ee4e2e4df1651cf6ad329a73cebdb728f37ea0187b9b17e036756e4"),
+					common.FromHex("0x000000000000000000000000000000000000000000000000000000000000000" + fmt.Sprintf("%d", i)),
+				},
+				EventSig:  vrfEmitterABI.Events["RandomWordsFulfilled"].ID,
+				Address:   common.Address{},
+				TxHash:    common.BigToHash(big.NewInt(int64(2*i + 1))),
+				Data:      common.FromHex("0x0000000000000000000000000000000000000000000000000000000000000069000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000001"),
+				CreatedAt: time.Now(),
+			})
+		}
+	}
+
+	unfulfilled, _, fulfilled := listener.getUnfulfilled(logs, listener.l)
+	require.Empty(t, unfulfilled)
+	require.Len(t, fulfilled, 5)
+}
+
+func TestGetUnfulfilled_OneUnfulfilledVRFReq(t *testing.T) {
+	t.Parallel()
+
+	listener, chainID := SetupGetUnfulfilledTH(t)
+
+	logs := []logpoller.Log{}
+	for i := 0; i < 10; i++ {
+		eventSig := emitterABI.Events["Log1"].ID
+		topics := [][]byte{
+			common.FromHex("0x46692c0e59ca9cd1ad8f984a9d11715ec83424398b7eed4e05c8ce84662415a8"),
+		}
+		if i == 4 {
+			eventSig = vrfEmitterABI.Events["RandomWordsRequested"].ID
+			topics = [][]byte{
+				common.FromHex("0x63373d1c4696214b898952999c9aaec57dac1ee2723cec59bea6888f489a9772"),
+				common.FromHex("0xc0a6c424ac7157ae408398df7e5f4552091a69125d5dfcb7b8c2659029395bdf"),
+				common.FromHex("0x0000000000000000000000000000000000000000000000000000000000000001"),
+				common.FromHex("0x0000000000000000000000005ee3b50502b5c4c9184dcb281471a0614d4b2ef9"),
+			}
+		}
+		logs = append(logs, logpoller.Log{
+			EvmChainId:     chainID,
+			LogIndex:       0,
+			BlockHash:      common.BigToHash(big.NewInt(int64(2 * i))),
+			BlockNumber:    int64(2 * i),
+			BlockTimestamp: time.Now(),
+			Topics:         topics,
+			EventSig:       eventSig,
+			Address:        common.Address{},
+			TxHash:         common.BigToHash(big.NewInt(int64(2 * i))),
+			Data:           common.FromHex("0x000000000000000000000000000000000000000000000000000000000000000" + fmt.Sprintf("%d", i) + "000000000000000000000000000000000000000000000000000000000000006a000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000027100000000000000000000000000000000000000000000000000000000000000002"),
+			CreatedAt:      time.Now(),
+		})
+	}
+
+	unfulfilled, _, fulfilled := listener.getUnfulfilled(logs, listener.l)
+	require.Equal(t, unfulfilled[0].RequestID().Int64(), big.NewInt(4).Int64())
+	require.Len(t, unfulfilled, 1)
+	require.Empty(t, fulfilled)
+}
+
+func TestGetUnfulfilled_SomeUnfulfilledVRFReq(t *testing.T) {
+	t.Parallel()
+
+	listener, chainID := SetupGetUnfulfilledTH(t)
+
+	logs := []logpoller.Log{}
+	for i := 0; i < 10; i++ {
+		eventSig := emitterABI.Events["Log1"].ID
+		topics := [][]byte{
+			common.FromHex("0x46692c0e59ca9cd1ad8f984a9d11715ec83424398b7eed4e05c8ce84662415a8"),
+		}
+		if i%2 == 0 {
+			eventSig = vrfEmitterABI.Events["RandomWordsRequested"].ID
+			topics = [][]byte{
+				common.FromHex("0x63373d1c4696214b898952999c9aaec57dac1ee2723cec59bea6888f489a9772"),
+				common.FromHex("0xc0a6c424ac7157ae408398df7e5f4552091a69125d5dfcb7b8c2659029395bdf"),
+				common.FromHex("0x0000000000000000000000000000000000000000000000000000000000000001"),
+				common.FromHex("0x0000000000000000000000005ee3b50502b5c4c9184dcb281471a0614d4b2ef9"),
+			}
+		}
+		logs = append(logs, logpoller.Log{
+			EvmChainId:     chainID,
+			LogIndex:       0,
+			BlockHash:      common.BigToHash(big.NewInt(int64(2 * i))),
+			BlockNumber:    int64(2 * i),
+			BlockTimestamp: time.Now(),
+			Topics:         topics,
+			EventSig:       eventSig,
+			Address:        common.Address{},
+			TxHash:         common.BigToHash(big.NewInt(int64(2 * i))),
+			Data:           common.FromHex("0x000000000000000000000000000000000000000000000000000000000000000" + fmt.Sprintf("%d", i) + "000000000000000000000000000000000000000000000000000000000000006a000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000027100000000000000000000000000000000000000000000000000000000000000002"),
+			CreatedAt:      time.Now(),
+		})
+	}
+
+	unfulfilled, _, fulfilled := listener.getUnfulfilled(logs, listener.l)
+	require.Len(t, unfulfilled, 5)
+	require.Len(t, fulfilled, 0)
+	expected := map[int64]bool{0: true, 2: true, 4: true, 6: true, 8: true}
+	for _, u := range unfulfilled {
+		v, ok := expected[u.RequestID().Int64()]
+		require.Equal(t, ok, true)
+		require.Equal(t, v, true)
+	}
+	require.Equal(t, len(expected), len(unfulfilled))
+}
+
+func TestGetUnfulfilled_UnfulfilledNFulfilledVRFReqs(t *testing.T) {
+	t.Parallel()
+
+	listener, chainID := SetupGetUnfulfilledTH(t)
+
+	logs := []logpoller.Log{}
+	for i := 0; i < 10; i++ {
+		eventSig := emitterABI.Events["Log1"].ID
+		topics := [][]byte{
+			common.FromHex("0x46692c0e59ca9cd1ad8f984a9d11715ec83424398b7eed4e05c8ce84662415a8"),
+		}
+		if i%2 == 0 {
+			eventSig = vrfEmitterABI.Events["RandomWordsRequested"].ID
+			topics = [][]byte{
+				common.FromHex("0x63373d1c4696214b898952999c9aaec57dac1ee2723cec59bea6888f489a9772"),
+				common.FromHex("0xc0a6c424ac7157ae408398df7e5f4552091a69125d5dfcb7b8c2659029395bdf"),
+				common.FromHex("0x0000000000000000000000000000000000000000000000000000000000000001"),
+				common.FromHex("0x0000000000000000000000005ee3b50502b5c4c9184dcb281471a0614d4b2ef9"),
+			}
+		}
+		logs = append(logs, logpoller.Log{
+			EvmChainId:     chainID,
+			LogIndex:       0,
+			BlockHash:      common.BigToHash(big.NewInt(int64(2 * i))),
+			BlockNumber:    int64(2 * i),
+			BlockTimestamp: time.Now(),
+			Topics:         topics,
+			EventSig:       eventSig,
+			Address:        common.Address{},
+			TxHash:         common.BigToHash(big.NewInt(int64(2 * i))),
+			Data:           common.FromHex("0x000000000000000000000000000000000000000000000000000000000000000" + fmt.Sprintf("%d", i) + "000000000000000000000000000000000000000000000000000000000000006a000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000027100000000000000000000000000000000000000000000000000000000000000002"),
+			CreatedAt:      time.Now(),
+		})
+		if i%2 == 0 && i < 6 {
+			logs = append(logs, logpoller.Log{
+				EvmChainId:     chainID,
+				LogIndex:       0,
+				BlockHash:      common.BigToHash(big.NewInt(int64(2*i + 1))),
+				BlockNumber:    int64(2*i + 1),
+				BlockTimestamp: time.Now(),
+				Topics: [][]byte{
+					common.FromHex("0x7dffc5ae5ee4e2e4df1651cf6ad329a73cebdb728f37ea0187b9b17e036756e4"),
+					common.FromHex("0x000000000000000000000000000000000000000000000000000000000000000" + fmt.Sprintf("%d", i)),
+				},
+				EventSig:  vrfEmitterABI.Events["RandomWordsFulfilled"].ID,
+				Address:   common.Address{},
+				TxHash:    common.BigToHash(big.NewInt(int64(2*i + 1))),
+				Data:      common.FromHex("0x0000000000000000000000000000000000000000000000000000000000000069000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000001"),
+				CreatedAt: time.Now(),
+			})
+		}
+	}
+
+	unfulfilled, _, fulfilled := listener.getUnfulfilled(logs, listener.l)
+	require.Len(t, unfulfilled, 2)
+	require.Len(t, fulfilled, 3)
+	expected := map[int64]bool{6: true, 8: true}
+	for _, u := range unfulfilled {
+		v, ok := expected[u.RequestID().Int64()]
+		require.Equal(t, ok, true)
+		require.Equal(t, v, true)
+	}
+	require.Equal(t, len(expected), len(unfulfilled))
+}
+
+/* Tests for getUnfulfilled: END */

From 6e677d908e24cffb458c038d22e2b34d239432c0 Mon Sep 17 00:00:00 2001
From: Dylan Tinianov <dylantinianov@gmail.com>
Date: Thu, 7 Dec 2023 12:38:24 -0500
Subject: [PATCH 097/130] EVM Extraction core/services/servicetest (#11514)

* Extract servicetest

* tidy
---
 core/chains/evm/log/helpers_test.go     | 4 ++--
 core/chains/evm/log/integration_test.go | 4 ++--
 core/scripts/go.mod                     | 2 +-
 core/scripts/go.sum                     | 4 ++--
 go.mod                                  | 2 +-
 go.sum                                  | 4 ++--
 integration-tests/go.mod                | 2 +-
 integration-tests/go.sum                | 4 ++--
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/core/chains/evm/log/helpers_test.go b/core/chains/evm/log/helpers_test.go
index ac7eb863e62..49f9266f705 100644
--- a/core/chains/evm/log/helpers_test.go
+++ b/core/chains/evm/log/helpers_test.go
@@ -21,6 +21,7 @@ import (
 	"github.com/jmoiron/sqlx"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	evmconfig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config"
@@ -40,7 +41,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
 	evmrelay "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
-	"github.com/smartcontractkit/chainlink/v2/core/services/srvctest"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -89,7 +89,7 @@ func newBroadcasterHelperWithEthClient(t *testing.T, ethClient evmclient.Client,
 	})
 	config := evmtest.NewChainScopedConfig(t, globalConfig)
 	lggr := logger.Test(t)
-	mailMon := srvctest.Start(t, utils.NewMailboxMonitor(t.Name()))
+	mailMon := servicetest.Run(t, utils.NewMailboxMonitor(t.Name()))
 
 	db := pgtest.NewSqlxDB(t)
 	orm := log.NewORM(db, lggr, config.Database(), cltest.FixtureChainID)
diff --git a/core/chains/evm/log/integration_test.go b/core/chains/evm/log/integration_test.go
index edc04a4ada4..2d66cdf585c 100644
--- a/core/chains/evm/log/integration_test.go
+++ b/core/chains/evm/log/integration_test.go
@@ -17,6 +17,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
 	logmocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/log/mocks"
@@ -27,7 +28,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
-	"github.com/smartcontractkit/chainlink/v2/core/services/srvctest"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -1324,7 +1324,7 @@ func TestBroadcaster_AppendLogChannel(t *testing.T) {
 	ch3 := make(chan types.Log)
 
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
-	mailMon := srvctest.Start(t, utils.NewMailboxMonitor(t.Name()))
+	mailMon := servicetest.Run(t, utils.NewMailboxMonitor(t.Name()))
 	lb := log.NewBroadcaster(nil, ethClient, nil, logger.Test(t), nil, mailMon)
 	chCombined := lb.ExportedAppendLogChannel(ch1, ch2)
 	chCombined = lb.ExportedAppendLogChannel(chCombined, ch3)
diff --git a/core/scripts/go.mod b/core/scripts/go.mod
index b0b5f801ed5..07d41c9d7e4 100644
--- a/core/scripts/go.mod
+++ b/core/scripts/go.mod
@@ -258,7 +258,7 @@ require (
 	github.com/shirou/gopsutil/v3 v3.23.10 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231205033838-dfac15e672d4 // indirect
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231206181640-faad3f11cfad // indirect
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231206164210-03f8b219402e // indirect
 	github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 // indirect
 	github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d // indirect
diff --git a/core/scripts/go.sum b/core/scripts/go.sum
index dd69053b405..48b168459ba 100644
--- a/core/scripts/go.sum
+++ b/core/scripts/go.sum
@@ -1214,8 +1214,8 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
 github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
 github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231205033838-dfac15e672d4 h1:2LC5HtHkAm7I1h5j4Uz0KTX+h4fo4z/5NoAARSF4ZVA=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231205033838-dfac15e672d4/go.mod h1:IdlfCN9rUs8Q/hrOYe8McNBIwEOHEsi0jilb3Cw77xs=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231206181640-faad3f11cfad h1:ysPjfbCPJuVxxFZa1Ifv8OPE20pzvnEHjJrPDUo4gT0=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231206181640-faad3f11cfad/go.mod h1:IdlfCN9rUs8Q/hrOYe8McNBIwEOHEsi0jilb3Cw77xs=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231206164210-03f8b219402e h1:xvqffqFec2HkEcUKrCkm4FDJRnn/+gHmvrE/dz3Zlw8=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231206164210-03f8b219402e/go.mod h1:soVgcl4CbfR6hC9UptjuCQhz19HJaFEjwnOpiySkxg0=
 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ=
diff --git a/go.mod b/go.mod
index 2ac067959ef..f659881d1a0 100644
--- a/go.mod
+++ b/go.mod
@@ -66,7 +66,7 @@ require (
 	github.com/shopspring/decimal v1.3.1
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704
 	github.com/smartcontractkit/chainlink-automation v1.0.1
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231205033838-dfac15e672d4
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231206181640-faad3f11cfad
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231206164210-03f8b219402e
 	github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1
 	github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d
diff --git a/go.sum b/go.sum
index b7305210e05..d700ec724b9 100644
--- a/go.sum
+++ b/go.sum
@@ -1217,8 +1217,8 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
 github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
 github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231205033838-dfac15e672d4 h1:2LC5HtHkAm7I1h5j4Uz0KTX+h4fo4z/5NoAARSF4ZVA=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231205033838-dfac15e672d4/go.mod h1:IdlfCN9rUs8Q/hrOYe8McNBIwEOHEsi0jilb3Cw77xs=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231206181640-faad3f11cfad h1:ysPjfbCPJuVxxFZa1Ifv8OPE20pzvnEHjJrPDUo4gT0=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231206181640-faad3f11cfad/go.mod h1:IdlfCN9rUs8Q/hrOYe8McNBIwEOHEsi0jilb3Cw77xs=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231206164210-03f8b219402e h1:xvqffqFec2HkEcUKrCkm4FDJRnn/+gHmvrE/dz3Zlw8=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231206164210-03f8b219402e/go.mod h1:soVgcl4CbfR6hC9UptjuCQhz19HJaFEjwnOpiySkxg0=
 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ=
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index 32c35c28a9a..90f4bbae267 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/segmentio/ksuid v1.0.4
 	github.com/slack-go/slack v0.12.2
 	github.com/smartcontractkit/chainlink-automation v1.0.1
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231205033838-dfac15e672d4
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231206181640-faad3f11cfad
 	github.com/smartcontractkit/chainlink-testing-framework v1.20.1
 	github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
 	github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index 21e237923b9..f5640eb8917 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -1507,8 +1507,8 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
 github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
 github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231205033838-dfac15e672d4 h1:2LC5HtHkAm7I1h5j4Uz0KTX+h4fo4z/5NoAARSF4ZVA=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231205033838-dfac15e672d4/go.mod h1:IdlfCN9rUs8Q/hrOYe8McNBIwEOHEsi0jilb3Cw77xs=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231206181640-faad3f11cfad h1:ysPjfbCPJuVxxFZa1Ifv8OPE20pzvnEHjJrPDUo4gT0=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231206181640-faad3f11cfad/go.mod h1:IdlfCN9rUs8Q/hrOYe8McNBIwEOHEsi0jilb3Cw77xs=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231206164210-03f8b219402e h1:xvqffqFec2HkEcUKrCkm4FDJRnn/+gHmvrE/dz3Zlw8=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231206164210-03f8b219402e/go.mod h1:soVgcl4CbfR6hC9UptjuCQhz19HJaFEjwnOpiySkxg0=
 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ=

From a093bbeac5daf97cc33bea74130bcac90acb8358 Mon Sep 17 00:00:00 2001
From: Bartek Tofel <bartek.tofel@smartcontract.com>
Date: Thu, 7 Dec 2023 19:08:18 -0300
Subject: [PATCH 098/130] [TT-590] Logstream with buffered streaming to Loki
 (#11477)

* testing out with local CTF

* print location for failed tests

* use logwatch with buffer

* try logwatch with loki and test targets in CI

* fix merge conflict

* fix lint issue

* adjust env vars in workflow

* add logwatch env vars as env and not with

* fix env var name

* fix go.mod

* use newer ctf

* fix go.sum

* use correct ctf version

* fix go.sum

* trigger tests

* small debug

* make the Gh summary print a bit nicer

* latest ctf, use var not secret for grafana url

* update ctf, change how we print test summary

* shutdown logwatch after flushing logs

* trigger tests

* use latest ctf where logwatch -> logstream

* update var name in GH workflow

* enable log stream for all smoke tests

* use better method for logstream shutdown and log flushing

* fix compile error

* latest ctf, remove comment

* remove replace from go.mod

* collect all logs to see what happens

* update ctf, better scoped dashboard link

* do not save logs if test doesn't fail

* print absolute log folder path

* cause test failure to make sure file logs are where they should be

* fix typo in var declaration in gh workflow

* run go mod tidy for integeration tests

* always execute test summary step

* remove failing vrfv2 test on purpose

* use taggeg CTF version

* connect mock adapter to logstream

* initialise killgrave only when necessary
---
 .github/workflows/integration-tests.yml       |  28 ++++
 .gitignore                                    |   3 +
 integration-tests/docker/test_env/cl_node.go  |  33 +++--
 integration-tests/docker/test_env/test_env.go | 131 ++++--------------
 .../docker/test_env/test_env_builder.go       |  46 ++++--
 integration-tests/go.mod                      |  19 ++-
 integration-tests/go.sum                      |  43 +++---
 integration-tests/load/vrfv2/vrfv2_test.go    |   2 +-
 .../load/vrfv2plus/vrfv2plus_test.go          |   2 +-
 integration-tests/smoke/automation_test.go    |   1 +
 integration-tests/smoke/cron_test.go          |   2 +
 integration-tests/smoke/flux_test.go          |   1 +
 integration-tests/smoke/forwarder_ocr_test.go |   1 +
 .../smoke/forwarders_ocr2_test.go             |   1 +
 integration-tests/smoke/keeper_test.go        |   1 +
 integration-tests/smoke/ocr2_test.go          |   2 +
 integration-tests/smoke/ocr_test.go           |   1 +
 integration-tests/smoke/runlog_test.go        |   1 +
 integration-tests/smoke/vrf_test.go           |   2 +
 integration-tests/smoke/vrfv2_test.go         |   2 +
 integration-tests/smoke/vrfv2plus_test.go     |   3 +
 .../universal/log_poller/helpers.go           |   1 +
 22 files changed, 180 insertions(+), 146 deletions(-)

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 5e3cf02a7c0..37a2718be46 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -435,6 +435,13 @@ jobs:
           PYROSCOPE_SERVER: ${{ matrix.product.pyroscope_env == '' && '' || !startsWith(github.ref, 'refs/tags/') && '' || secrets.QA_PYROSCOPE_INSTANCE }} # Avoid sending blank envs https://github.com/orgs/community/discussions/25725
           PYROSCOPE_ENVIRONMENT: ${{ matrix.product.pyroscope_env }}
           PYROSCOPE_KEY: ${{ secrets.QA_PYROSCOPE_KEY }}
+          LOKI_TENANT_ID: ${{ vars.LOKI_TENANT_ID }}
+          LOKI_URL: ${{ secrets.LOKI_URL }}
+          LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
+          LOGSTREAM_LOG_TARGETS: ${{ vars.LOGSTREAM_LOG_TARGETS }}
+          GRAFANA_URL: ${{ vars.GRAFANA_URL }}
+          GRAFANA_DATASOURCE: ${{ vars.GRAFANA_DATASOURCE }}
+          RUN_ID: ${{ github.run_id }}
         with:
           test_command_to_run: cd ./integration-tests && go test -timeout 30m -count=1 -json -test.parallel=${{ matrix.product.nodes }} ${{ steps.build-go-test-command.outputs.run_command }} 2>&1 | tee /tmp/gotest.log | gotestfmt
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
@@ -487,6 +494,27 @@ jobs:
         with:
           name: trace-data
           path: ./integration-tests/smoke/traces/trace-data.json
+      - name: Print failed test summary
+        if: always()
+        run: |
+          directory="./integration-tests/smoke/.test_summary"
+          files=("$directory"/*)
+          if [ -d "$directory" ]; then
+            echo "Test summary folder found"
+            if [ ${#files[@]} -gt 0 ]; then
+              first_file="${files[0]}"
+              echo "Name of the first test summary file: $(basename "$first_file")"
+              echo "### Failed Test Execution Logs Dashboard (over VPN):" >> $GITHUB_STEP_SUMMARY
+              cat "$first_file" | jq -r '.loki[] | "* [\(.test_name)](\(.value))"' >> $GITHUB_STEP_SUMMARY
+              if [ ${#files[@]} -gt 1 ]; then
+                echo "Found more than one test summary file. This is incorrect, there should be only one file"
+              fi
+            else
+                echo "Test summary directory is empty. This should not happen"
+            fi
+          else
+            echo "No test summary folder found. If no test failed or log collection wasn't explicitly requested this is correct. Exiting"
+          fi
 
   ### Used to check the required checks box when the matrix completes
   eth-smoke-tests:
diff --git a/.gitignore b/.gitignore
index 3f016503a81..8d127dbb728 100644
--- a/.gitignore
+++ b/.gitignore
@@ -82,3 +82,6 @@ go.work*
 
 # This sometimes shows up for some reason
 tools/flakeytests/coverage.txt
+
+.test_summary/
+.run.id
\ No newline at end of file
diff --git a/integration-tests/docker/test_env/cl_node.go b/integration-tests/docker/test_env/cl_node.go
index 7dc077ad34b..60394256334 100644
--- a/integration-tests/docker/test_env/cl_node.go
+++ b/integration-tests/docker/test_env/cl_node.go
@@ -1,6 +1,7 @@
 package test_env
 
 import (
+	"context"
 	"fmt"
 	"math/big"
 	"net/url"
@@ -22,7 +23,7 @@ import (
 	"github.com/smartcontractkit/chainlink-testing-framework/docker"
 	"github.com/smartcontractkit/chainlink-testing-framework/docker/test_env"
 	"github.com/smartcontractkit/chainlink-testing-framework/logging"
-	"github.com/smartcontractkit/chainlink-testing-framework/logwatch"
+	"github.com/smartcontractkit/chainlink-testing-framework/logstream"
 	"github.com/smartcontractkit/chainlink-testing-framework/utils/testcontext"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/chaintype"
@@ -47,7 +48,7 @@ type ClNode struct {
 	UserPassword          string                  `json:"userPassword"`
 	t                     *testing.T
 	l                     zerolog.Logger
-	lw                    *logwatch.LogWatch
+	ls                    *logstream.LogStream
 }
 
 type ClNodeOption = func(c *ClNode)
@@ -76,9 +77,9 @@ func WithDbContainerName(name string) ClNodeOption {
 	}
 }
 
-func WithLogWatch(lw *logwatch.LogWatch) ClNodeOption {
+func WithLogStream(ls *logstream.LogStream) ClNodeOption {
 	return func(c *ClNode) {
-		c.lw = lw
+		c.ls = ls
 	}
 }
 
@@ -285,11 +286,7 @@ func (n *ClNode) StartContainer() error {
 	if err != nil {
 		return fmt.Errorf("%s err: %w", ErrStartCLNodeContainer, err)
 	}
-	if n.lw != nil {
-		if err := n.lw.ConnectContainer(testcontext.Get(n.t), container, "cl-node", true); err != nil {
-			return err
-		}
-	}
+
 	clEndpoint, err := test_env.GetEndpoint(testcontext.Get(n.t), container, "http")
 	if err != nil {
 		return err
@@ -410,5 +407,23 @@ func (n *ClNode) getContainerRequest(secrets string) (
 				FileMode:          0644,
 			},
 		},
+		LifecycleHooks: []tc.ContainerLifecycleHooks{
+			{PostStarts: []tc.ContainerHook{
+				func(ctx context.Context, c tc.Container) error {
+					if n.ls != nil {
+						return n.ls.ConnectContainer(ctx, c, "cl-node")
+					}
+					return nil
+				},
+			},
+				PostStops: []tc.ContainerHook{
+					func(ctx context.Context, c tc.Container) error {
+						if n.ls != nil {
+							return n.ls.DisconnectContainer(c)
+						}
+						return nil
+					},
+				}},
+		},
 	}, nil
 }
diff --git a/integration-tests/docker/test_env/test_env.go b/integration-tests/docker/test_env/test_env.go
index b04d24a9593..15bf6641bf4 100644
--- a/integration-tests/docker/test_env/test_env.go
+++ b/integration-tests/docker/test_env/test_env.go
@@ -1,14 +1,12 @@
 package test_env
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
-	"io"
 	"math/big"
 	"os"
-	"path/filepath"
 	"runtime/debug"
-	"strings"
 	"testing"
 	"time"
 
@@ -16,14 +14,12 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	tc "github.com/testcontainers/testcontainers-go"
-	"golang.org/x/sync/errgroup"
 
 	"github.com/smartcontractkit/chainlink-testing-framework/blockchain"
 	"github.com/smartcontractkit/chainlink-testing-framework/docker"
 	"github.com/smartcontractkit/chainlink-testing-framework/docker/test_env"
 	"github.com/smartcontractkit/chainlink-testing-framework/logging"
-	"github.com/smartcontractkit/chainlink-testing-framework/logwatch"
-	"github.com/smartcontractkit/chainlink-testing-framework/utils/testcontext"
+	"github.com/smartcontractkit/chainlink-testing-framework/logstream"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 
 	"github.com/smartcontractkit/chainlink/integration-tests/client"
@@ -35,9 +31,9 @@ var (
 )
 
 type CLClusterTestEnv struct {
-	Cfg      *TestEnvConfig
-	Network  *tc.DockerNetwork
-	LogWatch *logwatch.LogWatch
+	Cfg       *TestEnvConfig
+	Network   *tc.DockerNetwork
+	LogStream *logstream.LogStream
 
 	/* components */
 	ClCluster             *ClCluster
@@ -58,11 +54,9 @@ func NewTestEnv() (*CLClusterTestEnv, error) {
 	if err != nil {
 		return nil, err
 	}
-	n := []string{network.Name}
 	return &CLClusterTestEnv{
-		MockAdapter: test_env.NewKillgrave(n, ""),
-		Network:     network,
-		l:           log.Logger,
+		Network: network,
+		l:       log.Logger,
 	}, nil
 }
 
@@ -70,15 +64,19 @@ func NewTestEnv() (*CLClusterTestEnv, error) {
 // Sets up private ethereum chain and MockAdapter containers with the provided cfg.
 func (te *CLClusterTestEnv) WithTestEnvConfig(cfg *TestEnvConfig) *CLClusterTestEnv {
 	te.Cfg = cfg
-	n := []string{te.Network.Name}
-	te.MockAdapter = test_env.NewKillgrave(n, te.Cfg.MockAdapter.ImpostersPath, test_env.WithContainerName(te.Cfg.MockAdapter.ContainerName))
+	if cfg.MockAdapter.ContainerName != "" {
+		n := []string{te.Network.Name}
+		te.MockAdapter = test_env.NewKillgrave(n, te.Cfg.MockAdapter.ImpostersPath, test_env.WithContainerName(te.Cfg.MockAdapter.ContainerName))
+	}
 	return te
 }
 
 func (te *CLClusterTestEnv) WithTestLogger(t *testing.T) *CLClusterTestEnv {
 	te.t = t
 	te.l = logging.GetTestLogger(t)
-	te.MockAdapter.WithTestLogger(t)
+	if te.MockAdapter != nil {
+		te.MockAdapter.WithTestLogger(t)
+	}
 	return te
 }
 
@@ -174,6 +172,18 @@ func (te *CLClusterTestEnv) StartClCluster(nodeConfig *chainlink.Config, count i
 		}
 	}
 
+	if te.LogStream != nil {
+		for _, node := range te.ClCluster.Nodes {
+			node.ls = te.LogStream
+		}
+		if te.MockAdapter != nil {
+			err := te.LogStream.ConnectContainer(context.Background(), te.MockAdapter.Container, "mock-adapter")
+			if err != nil {
+				return err
+			}
+		}
+	}
+
 	// Start/attach node containers
 	return te.ClCluster.Start()
 }
@@ -207,23 +217,6 @@ func (te *CLClusterTestEnv) Cleanup() error {
 
 	te.logWhetherAllContainersAreRunning()
 
-	// Getting the absolute path
-	wd, err := os.Getwd()
-	if err != nil {
-		return err
-	}
-
-	wd = filepath.Join(wd, "logs")
-	te.l.Info().Str("Working dir", wd).Msg("Would write test logs here")
-
-	// TODO: This is an imperfect and temporary solution, see TT-590 for a more sustainable solution
-	// Collect logs if the test fails, or if we just want them
-	if te.t.Failed() || os.Getenv("TEST_LOG_COLLECT") == "true" {
-		if err := te.collectTestLogs(); err != nil {
-			return err
-		}
-	}
-
 	if te.EVMClient == nil {
 		return fmt.Errorf("evm client is nil, unable to return funds from chainlink nodes during cleanup")
 	} else if te.EVMClient.NetworkSimulated() {
@@ -247,6 +240,10 @@ func (te *CLClusterTestEnv) Cleanup() error {
 
 func (te *CLClusterTestEnv) logWhetherAllContainersAreRunning() {
 	for _, node := range te.ClCluster.Nodes {
+		if node.Container == nil {
+			continue
+		}
+
 		isCLRunning := node.Container.IsRunning()
 		isDBRunning := node.PostgresDb.Container.IsRunning()
 
@@ -260,74 +257,6 @@ func (te *CLClusterTestEnv) logWhetherAllContainersAreRunning() {
 	}
 }
 
-// collectTestLogs collects the logs from all the Chainlink nodes in the test environment and writes them to local files
-func (te *CLClusterTestEnv) collectTestLogs() error {
-	te.l.Info().Msg("Collecting test logs")
-	sanitizedNetworkName := strings.ReplaceAll(te.EVMClient.GetNetworkName(), " ", "-")
-	folder := fmt.Sprintf("./logs/%s-%s-%s", te.t.Name(), sanitizedNetworkName, time.Now().Format("2006-01-02T15-04-05"))
-	if err := os.MkdirAll(folder, os.ModePerm); err != nil {
-		return err
-	}
-
-	eg := &errgroup.Group{}
-	for _, n := range te.ClCluster.Nodes {
-		node := n
-		eg.Go(func() error {
-			logFileName := filepath.Join(folder, fmt.Sprintf("node-%s.log", node.ContainerName))
-			logFile, err := os.OpenFile(logFileName, os.O_CREATE|os.O_WRONLY, 0644)
-			if err != nil {
-				return err
-			}
-			defer logFile.Close()
-			logReader, err := node.Container.Logs(testcontext.Get(te.t))
-			if err != nil {
-				return err
-			}
-			_, err = io.Copy(logFile, logReader)
-			if err != nil {
-				return err
-			}
-			te.l.Info().Str("Node", node.ContainerName).Str("File", logFileName).Msg("Wrote Logs")
-			return nil
-		})
-	}
-
-	if te.MockAdapter != nil {
-		eg.Go(func() error {
-			logFileName := filepath.Join(folder, "mock-adapter.log")
-			logFile, err := os.OpenFile(logFileName, os.O_CREATE|os.O_WRONLY, 0644)
-			if err != nil {
-				return err
-			}
-			defer logFile.Close()
-			logReader, err := te.MockAdapter.Container.Logs(testcontext.Get(te.t))
-			if err != nil {
-				return err
-			}
-			_, err = io.Copy(logFile, logReader)
-			if err != nil {
-				return err
-			}
-			te.l.Info().Str("Container", te.MockAdapter.ContainerName).Str("File", logFileName).Msg("Wrote Logs")
-			return nil
-		})
-	}
-
-	if err := eg.Wait(); err != nil {
-		return err
-	}
-
-	// Getting the absolute path
-	wd, err := os.Getwd()
-	if err != nil {
-		return err
-	}
-	absolutePath := filepath.Join(wd, folder)
-
-	te.l.Info().Str("Logs absolute Location", absolutePath).Msg("Wrote test logs")
-	return nil
-}
-
 func (te *CLClusterTestEnv) returnFunds() error {
 	te.l.Info().Msg("Attempting to return Chainlink node funds to default network wallets")
 	for _, chainlinkNode := range te.ClCluster.Nodes {
diff --git a/integration-tests/docker/test_env/test_env_builder.go b/integration-tests/docker/test_env/test_env_builder.go
index 685ea5338ae..cc0499ea0ce 100644
--- a/integration-tests/docker/test_env/test_env_builder.go
+++ b/integration-tests/docker/test_env/test_env_builder.go
@@ -13,8 +13,9 @@ import (
 	"github.com/smartcontractkit/chainlink-testing-framework/blockchain"
 	"github.com/smartcontractkit/chainlink-testing-framework/docker/test_env"
 	"github.com/smartcontractkit/chainlink-testing-framework/logging"
-	"github.com/smartcontractkit/chainlink-testing-framework/logwatch"
+	"github.com/smartcontractkit/chainlink-testing-framework/logstream"
 	"github.com/smartcontractkit/chainlink-testing-framework/networks"
+	"github.com/smartcontractkit/chainlink-testing-framework/utils/osutil"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 
 	evmcfg "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
@@ -32,8 +33,7 @@ const (
 )
 
 type CLTestEnvBuilder struct {
-	hasLogWatch bool
-	// hasGeth                bool
+	hasLogStream           bool
 	hasKillgrave           bool
 	hasForwarders          bool
 	clNodeConfig           *chainlink.Config
@@ -101,8 +101,8 @@ func (b *CLTestEnvBuilder) WithTestLogger(t *testing.T) *CLTestEnvBuilder {
 	return b
 }
 
-func (b *CLTestEnvBuilder) WithLogWatcher() *CLTestEnvBuilder {
-	b.hasLogWatch = true
+func (b *CLTestEnvBuilder) WithLogStream() *CLTestEnvBuilder {
+	b.hasLogStream = true
 	return b
 }
 
@@ -220,24 +220,30 @@ func (b *CLTestEnvBuilder) Build() (*CLClusterTestEnv, error) {
 	}
 
 	var err error
-	if b.t != nil {
-		b.te.WithTestLogger(b.t)
-	}
-
-	if b.hasLogWatch {
-		b.te.LogWatch, err = logwatch.NewLogWatch(nil, nil)
+	if b.hasLogStream {
+		b.te.LogStream, err = logstream.NewLogStream(b.t, nil)
 		if err != nil {
 			return nil, err
 		}
 	}
 
 	if b.hasKillgrave {
+		if b.te.Network == nil {
+			return nil, fmt.Errorf("test environment builder failed: %w", fmt.Errorf("cannot start mock adapter without a network"))
+		}
+
+		b.te.MockAdapter = test_env.NewKillgrave([]string{b.te.Network.Name}, "")
+
 		err = b.te.StartMockAdapter()
 		if err != nil {
 			return nil, err
 		}
 	}
 
+	if b.t != nil {
+		b.te.WithTestLogger(b.t)
+	}
+
 	switch b.cleanUpType {
 	case CleanUpTypeStandard:
 		b.t.Cleanup(func() {
@@ -253,6 +259,24 @@ func (b *CLTestEnvBuilder) Build() (*CLClusterTestEnv, error) {
 		return b.te, fmt.Errorf("test environment builder failed: %w", fmt.Errorf("explicit cleanup type must be set when building test environment"))
 	}
 
+	if b.te.LogStream != nil {
+		b.t.Cleanup(func() {
+			b.l.Warn().Msg("Shutting down LogStream")
+			logPath, err := osutil.GetAbsoluteFolderPath("logs")
+			if err != nil {
+				b.l.Info().Str("Absolute path", logPath).Msg("LogStream logs folder location")
+			}
+
+			if b.t.Failed() || os.Getenv("TEST_LOG_COLLECT") == "true" {
+				// we can't do much if this fails, so we just log the error in logstream
+				_ = b.te.LogStream.FlushAndShutdown()
+				b.te.LogStream.PrintLogTargetsLocations()
+				b.te.LogStream.SaveLogLocationInTestSummary()
+			}
+
+		})
+	}
+
 	if b.nonDevGethNetworks != nil {
 		b.te.WithPrivateChain(b.nonDevGethNetworks)
 		err := b.te.StartPrivateChain()
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index 90f4bbae267..2f32347bb4b 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -25,12 +25,12 @@ require (
 	github.com/slack-go/slack v0.12.2
 	github.com/smartcontractkit/chainlink-automation v1.0.1
 	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231206181640-faad3f11cfad
-	github.com/smartcontractkit/chainlink-testing-framework v1.20.1
+	github.com/smartcontractkit/chainlink-testing-framework v1.21.0
 	github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
 	github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000
 	github.com/smartcontractkit/libocr v0.0.0-20231130143053-c5102a9c0fb7
 	github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1
-	github.com/smartcontractkit/wasp v0.3.6
+	github.com/smartcontractkit/wasp v0.3.7
 	github.com/spf13/cobra v1.6.1
 	github.com/stretchr/testify v1.8.4
 	github.com/testcontainers/testcontainers-go v0.23.0
@@ -42,8 +42,12 @@ require (
 	gopkg.in/guregu/null.v4 v4.0.0
 )
 
+// avoids ambigious imports of indirect dependencies
+exclude github.com/hashicorp/consul v1.2.1
+
 // Pin K8s versions as their updates are highly disruptive and go mod keeps wanting to update them
 replace (
+	github.com/testcontainers/testcontainers-go => github.com/Tofel/testcontainers-go v0.0.0-20231130110817-e6fbf9498b56
 	k8s.io/api => k8s.io/api v0.25.11
 	k8s.io/client-go => k8s.io/client-go v0.25.11
 	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d
@@ -73,11 +77,13 @@ require (
 	github.com/MakeNowJust/heredoc v1.0.0 // indirect
 	github.com/Masterminds/semver/v3 v3.2.1 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
+	github.com/Microsoft/hcsshim v0.11.1 // indirect
 	github.com/VictoriaMetrics/fastcache v1.10.0 // indirect
 	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
 	github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 // indirect
 	github.com/armon/go-metrics v0.4.1 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
+	github.com/avast/retry-go v3.0.0+incompatible // indirect
 	github.com/avast/retry-go/v4 v4.5.1 // indirect
 	github.com/aws/aws-sdk-go v1.45.25 // indirect
 	github.com/aws/constructs-go/constructs/v10 v10.1.255 // indirect
@@ -109,7 +115,8 @@ require (
 	github.com/cometbft/cometbft v0.37.2 // indirect
 	github.com/cometbft/cometbft-db v0.7.0 // indirect
 	github.com/confio/ics23/go v0.9.0 // indirect
-	github.com/containerd/containerd v1.7.3 // indirect
+	github.com/containerd/containerd v1.7.7 // indirect
+	github.com/containerd/log v0.1.0 // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/cosmos/btcutil v1.0.5 // indirect
@@ -276,6 +283,7 @@ require (
 	github.com/libp2p/go-openssl v0.0.7 // indirect
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
 	github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
+	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
@@ -290,7 +298,7 @@ require (
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/moby/patternmatcher v0.5.0 // indirect
+	github.com/moby/patternmatcher v0.6.0 // indirect
 	github.com/moby/spdystream v0.2.0 // indirect
 	github.com/moby/sys/sequential v0.5.0 // indirect
 	github.com/moby/term v0.5.0 // indirect
@@ -316,7 +324,7 @@ require (
 	github.com/oklog/ulid v1.3.1 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0-rc4 // indirect
+	github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
 	github.com/opencontainers/runc v1.1.7 // indirect
 	github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e // indirect
 	github.com/opentracing-contrib/go-stdlib v1.0.0 // indirect
@@ -349,6 +357,7 @@ require (
 	github.com/sercand/kuberesolver/v5 v5.1.1 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
 	github.com/shirou/gopsutil/v3 v3.23.10 // indirect
+	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index f5640eb8917..08d02446d1d 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -131,16 +131,18 @@ github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0
 github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
 github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
 github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
-github.com/Microsoft/hcsshim v0.10.0-rc.8 h1:YSZVvlIIDD1UxQpJp0h+dnpLUw+TrY0cx8obKsp3bek=
-github.com/Microsoft/hcsshim v0.10.0-rc.8/go.mod h1:OEthFdQv/AD2RAdzR6Mm1N1KPCztGKDurW1Z8b8VGMM=
+github.com/Microsoft/hcsshim v0.11.1 h1:hJ3s7GbWlGK4YVV92sO88BQSyF4ZLVy7/awqOlPxFbA=
+github.com/Microsoft/hcsshim v0.11.1/go.mod h1:nFJmaO4Zr5Y7eADdFOpYswDDlNVbvcIJJNJLECr5JQg=
 github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw=
 github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/OneOfOne/xxhash v1.2.6 h1:U68crOE3y3MPttCMQGywZOLrTeF5HHJ3/vDBCJn9/bA=
-github.com/OneOfOne/xxhash v1.2.6/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
+github.com/OneOfOne/xxhash v1.2.8 h1:31czK/TI9sNkxIKfaUfGlU47BAxQ0ztGgd9vPyqimf8=
+github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0=
+github.com/Tofel/testcontainers-go v0.0.0-20231130110817-e6fbf9498b56 h1:HItfr1XKD/4xnsJE56m3uxnkMQ9lbg8xDnkf9qoZCH0=
+github.com/Tofel/testcontainers-go v0.0.0-20231130110817-e6fbf9498b56/go.mod h1:ICriE9bLX5CLxL9OFQ2N+2N+f+803LNJ1utJb1+Inx0=
 github.com/VictoriaMetrics/fastcache v1.10.0 h1:5hDJnLsKLpnUEToub7ETuRu8RCkb40woBZAUiKonXzY=
 github.com/VictoriaMetrics/fastcache v1.10.0/go.mod h1:tjiYeEfYXCqacuvYw/7UoDIeJaNxq6132xHICNP77w8=
 github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE=
@@ -177,6 +179,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkY
 github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
+github.com/avast/retry-go v3.0.0+incompatible h1:4SOWQ7Qs+oroOTQOYnAHqelpCO0biHSxpiH9JdtuBj0=
+github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY=
 github.com/avast/retry-go/v4 v4.5.1 h1:AxIx0HGi4VZ3I02jr78j5lZ3M6x1E0Ivxa6b0pUUh7o=
 github.com/avast/retry-go/v4 v4.5.1/go.mod h1:/sipNsvNB3RRuT5iNcb6h73nw3IBmXJ/H3XrCQYSOpc=
 github.com/aws/aws-sdk-go v1.22.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
@@ -304,10 +308,12 @@ github.com/cometbft/cometbft-db v0.7.0 h1:uBjbrBx4QzU0zOEnU8KxoDl18dMNgDh+zZRUE0
 github.com/cometbft/cometbft-db v0.7.0/go.mod h1:yiKJIm2WKrt6x8Cyxtq9YTEcIMPcEe4XPxhgX59Fzf0=
 github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4=
 github.com/confio/ics23/go v0.9.0/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e/mYVRak=
-github.com/containerd/containerd v1.7.3 h1:cKwYKkP1eTj54bP3wCdXXBymmKRQMrWjkLSWZZJDa8o=
-github.com/containerd/containerd v1.7.3/go.mod h1:32FOM4/O0RkNg7AjQj3hDzN9cUGtu+HMvaKUNiqCZB8=
-github.com/containerd/continuity v0.4.1 h1:wQnVrjIyQ8vhU2sgOiL5T07jo+ouqc2bnKsv5/EqGhU=
-github.com/containerd/continuity v0.4.1/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=
+github.com/containerd/containerd v1.7.7 h1:QOC2K4A42RQpcrZyptP6z9EJZnlHfHJUfZrAAHe15q4=
+github.com/containerd/containerd v1.7.7/go.mod h1:3c4XZv6VeT9qgf9GMTxNTMFxGJrGpI2vz1yk4ye+YY8=
+github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM=
+github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=
+github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
+github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
@@ -1135,6 +1141,7 @@ github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczG
 github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
@@ -1222,8 +1229,8 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/pointerstructure v1.2.0 h1:O+i9nHnXS3l/9Wu7r4NrEdwA2VFTicjUEN1uBnDo34A=
 github.com/mitchellh/pointerstructure v1.2.0/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4=
-github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo=
-github.com/moby/patternmatcher v0.5.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
+github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
+github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
 github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8=
 github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
 github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc=
@@ -1324,8 +1331,8 @@ github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
 github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
-github.com/opencontainers/image-spec v1.1.0-rc4 h1:oOxKUJWnFC4YGHCCMNql1x4YaDfYBTS5Y4x/Cgeo1E0=
-github.com/opencontainers/image-spec v1.1.0-rc4/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
+github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/cbdlwvlWt0pnFI=
+github.com/opencontainers/image-spec v1.1.0-rc5/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
 github.com/opencontainers/runc v1.1.7 h1:y2EZDS8sNng4Ksf0GUYNhKbTShZJPJg1FiXJNH/uoCk=
 github.com/opencontainers/runc v1.1.7/go.mod h1:CbUumNnWCuTGFukNXahoo/RFBZvDAgRh/smNYNOhA50=
 github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e h1:4cPxUYdgaGzZIT5/j0IfqOrrXmq6bG8AwvwisMXpdrg=
@@ -1487,7 +1494,9 @@ github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKl
 github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shirou/gopsutil/v3 v3.23.10 h1:/N42opWlYzegYaVkWejXWJpbzKv2JDy3mrgGzKsh9hM=
 github.com/shirou/gopsutil/v3 v3.23.10/go.mod h1:JIE26kpucQi+innVlAUnIEOSBhBUkirr5b44yr55+WE=
+github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
 github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
+github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
 github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
@@ -1519,8 +1528,8 @@ github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231206154215-ec1718b7df3
 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231206154215-ec1718b7df3e/go.mod h1:9YIi413QRRytafTzpWm+Z+5NWBNxSqokhKyeEZ3ynlA=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231205180940-ea2e3e916725 h1:NbhPVwxx+53WN/Uld1V6c4iLgoGvUYFOsVd2kfcexe8=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231205180940-ea2e3e916725/go.mod h1:vHrPBipRL52NdPp77KXNU2k1IoCUa1B33N9otZQPYko=
-github.com/smartcontractkit/chainlink-testing-framework v1.20.1 h1:0hxLRts4yIum52MaE95RuM2Xi1S/R0r4UFExpp00iK4=
-github.com/smartcontractkit/chainlink-testing-framework v1.20.1/go.mod h1:+FVgkz6phTc+piVT57AcQfr3I8xvZgZ1lOpRPOu/dLQ=
+github.com/smartcontractkit/chainlink-testing-framework v1.21.0 h1:MrtpGMgPpcRX06FtDEj14Vokoo6Sx8e0/D6AA9LxCgM=
+github.com/smartcontractkit/chainlink-testing-framework v1.21.0/go.mod h1:9SCqZ+lcWZNEofpPgasQ+wUF6A6fFgZvWmhqQJwFYV0=
 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 h1:FFdvEzlYwcuVHkdZ8YnZR/XomeMGbz5E2F2HZI3I3w8=
 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868/go.mod h1:Kn1Hape05UzFZ7bOUnm3GVsHzP0TNrVmpfXYNHdqGGs=
 github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306 h1:ko88+ZznniNJZbZPWAvHQU8SwKAdHngdDZ+pvVgB5ss=
@@ -1533,8 +1542,8 @@ github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-
 github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1/go.mod h1:q6f4fe39oZPdsh1i57WznEZgxd8siidMaSFq3wdPmVg=
 github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1 h1:Dai1bn+Q5cpeGMQwRdjOdVjG8mmFFROVkSKuUgBErRQ=
 github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1/go.mod h1:G5Sd/yzHWf26rQ+X0nG9E0buKPqRGPMJAfk2gwCzOOw=
-github.com/smartcontractkit/wasp v0.3.6 h1:1TLWfrTzqZwNvyyoKzPZ8FLQat2lNz640eM+mMh2YxM=
-github.com/smartcontractkit/wasp v0.3.6/go.mod h1:L/cyUGfpaWxy/2twOVJLRt2mySJEIqGrFj9nyvRLpSo=
+github.com/smartcontractkit/wasp v0.3.7 h1:3toT+iMSHJ1EKQXE+jGnxfmtLlT0gwEl1A7xGyw0NZY=
+github.com/smartcontractkit/wasp v0.3.7/go.mod h1:L/cyUGfpaWxy/2twOVJLRt2mySJEIqGrFj9nyvRLpSo=
 github.com/smartcontractkit/wsrpc v0.7.2 h1:iBXzMeg7vc5YoezIQBq896y25BARw7OKbhrb6vPbtRQ=
 github.com/smartcontractkit/wsrpc v0.7.2/go.mod h1:sj7QX2NQibhkhxTfs3KOhAj/5xwgqMipTvJVSssT9i0=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
@@ -1606,8 +1615,6 @@ github.com/teris-io/shortid v0.0.0-20201117134242-e59966efd125 h1:3SNcvBmEPE1YlB
 github.com/teris-io/shortid v0.0.0-20201117134242-e59966efd125/go.mod h1:M8agBzgqHIhgj7wEn9/0hJUZcrvt9VY+Ln+S1I5Mha0=
 github.com/test-go/testify v1.1.4 h1:Tf9lntrKUMHiXQ07qBScBTSA0dhYQlu83hswqelv1iE=
 github.com/test-go/testify v1.1.4/go.mod h1:rH7cfJo/47vWGdi4GPj16x3/t1xGOj2YxzmNQzk2ghU=
-github.com/testcontainers/testcontainers-go v0.23.0 h1:ERYTSikX01QczBLPZpqsETTBO7lInqEP349phDOVJVs=
-github.com/testcontainers/testcontainers-go v0.23.0/go.mod h1:3gzuZfb7T9qfcH2pHpV4RLlWrPjeWNQah6XlYQ32c4I=
 github.com/theodesp/go-heaps v0.0.0-20190520121037-88e35354fe0a h1:YuO+afVc3eqrjiCUizNCxI53bl/BnPiVwXqLzqYTqgU=
 github.com/theodesp/go-heaps v0.0.0-20190520121037-88e35354fe0a/go.mod h1:/sfW47zCZp9FrtGcWyo1VjbgDaodxX9ovZvgLb/MxaA=
 github.com/thlib/go-timezone-local v0.0.0-20210907160436-ef149e42d28e h1:BuzhfgfWQbX0dWzYzT1zsORLnHRv3bcRcsaUk0VmXA8=
diff --git a/integration-tests/load/vrfv2/vrfv2_test.go b/integration-tests/load/vrfv2/vrfv2_test.go
index ae109f75e28..8a0faeabb29 100644
--- a/integration-tests/load/vrfv2/vrfv2_test.go
+++ b/integration-tests/load/vrfv2/vrfv2_test.go
@@ -178,7 +178,7 @@ func TestVRFV2Performance(t *testing.T) {
 						l.Error().Err(err).Msg("Error cleaning up test environment")
 					}
 				}).
-			WithLogWatcher().
+			WithLogStream().
 			Build()
 
 		require.NoError(t, err, "error creating test env")
diff --git a/integration-tests/load/vrfv2plus/vrfv2plus_test.go b/integration-tests/load/vrfv2plus/vrfv2plus_test.go
index 4b6728440b3..68c1012987d 100644
--- a/integration-tests/load/vrfv2plus/vrfv2plus_test.go
+++ b/integration-tests/load/vrfv2plus/vrfv2plus_test.go
@@ -184,7 +184,7 @@ func TestVRFV2PlusPerformance(t *testing.T) {
 						l.Error().Err(err).Msg("Error cleaning up test environment")
 					}
 				}).
-			WithLogWatcher().
+			WithLogStream().
 			Build()
 
 		require.NoError(t, err, "error creating test env")
diff --git a/integration-tests/smoke/automation_test.go b/integration-tests/smoke/automation_test.go
index f72843e77e8..bc9f1308452 100644
--- a/integration-tests/smoke/automation_test.go
+++ b/integration-tests/smoke/automation_test.go
@@ -1097,6 +1097,7 @@ func setupAutomationTestDocker(
 			WithMockAdapter().
 			WithFunding(big.NewFloat(testConfig.ChainlinkNodeFunding)).
 			WithStandardCleanup().
+			WithLogStream().
 			Build()
 		require.NoError(t, err, "Error deploying test environment for Mercury")
 		env.ParallelTransactions(true)
diff --git a/integration-tests/smoke/cron_test.go b/integration-tests/smoke/cron_test.go
index 013e4c631c7..3eebc19f8bf 100644
--- a/integration-tests/smoke/cron_test.go
+++ b/integration-tests/smoke/cron_test.go
@@ -25,6 +25,7 @@ func TestCronBasic(t *testing.T) {
 		WithMockAdapter().
 		WithCLNodes(1).
 		WithStandardCleanup().
+		WithLogStream().
 		Build()
 	require.NoError(t, err)
 
@@ -71,6 +72,7 @@ func TestCronJobReplacement(t *testing.T) {
 		WithMockAdapter().
 		WithCLNodes(1).
 		WithStandardCleanup().
+		WithLogStream().
 		Build()
 	require.NoError(t, err)
 
diff --git a/integration-tests/smoke/flux_test.go b/integration-tests/smoke/flux_test.go
index 72dc15e7b11..5b35b0d2484 100644
--- a/integration-tests/smoke/flux_test.go
+++ b/integration-tests/smoke/flux_test.go
@@ -31,6 +31,7 @@ func TestFluxBasic(t *testing.T) {
 		WithMockAdapter().
 		WithCLNodes(3).
 		WithStandardCleanup().
+		WithLogStream().
 		Build()
 	require.NoError(t, err)
 
diff --git a/integration-tests/smoke/forwarder_ocr_test.go b/integration-tests/smoke/forwarder_ocr_test.go
index d4f9b5884a2..923ca046ece 100644
--- a/integration-tests/smoke/forwarder_ocr_test.go
+++ b/integration-tests/smoke/forwarder_ocr_test.go
@@ -26,6 +26,7 @@ func TestForwarderOCRBasic(t *testing.T) {
 		WithCLNodes(6).
 		WithFunding(big.NewFloat(.1)).
 		WithStandardCleanup().
+		WithLogStream().
 		Build()
 	require.NoError(t, err)
 
diff --git a/integration-tests/smoke/forwarders_ocr2_test.go b/integration-tests/smoke/forwarders_ocr2_test.go
index c9fe3cb11d9..bdfd65c767e 100644
--- a/integration-tests/smoke/forwarders_ocr2_test.go
+++ b/integration-tests/smoke/forwarders_ocr2_test.go
@@ -35,6 +35,7 @@ func TestForwarderOCR2Basic(t *testing.T) {
 		WithCLNodes(6).
 		WithFunding(big.NewFloat(.1)).
 		WithStandardCleanup().
+		WithLogStream().
 		Build()
 	require.NoError(t, err)
 
diff --git a/integration-tests/smoke/keeper_test.go b/integration-tests/smoke/keeper_test.go
index bcf64a5febd..336223b7a4c 100644
--- a/integration-tests/smoke/keeper_test.go
+++ b/integration-tests/smoke/keeper_test.go
@@ -1113,6 +1113,7 @@ func setupKeeperTest(t *testing.T) (
 		WithCLNodeConfig(clNodeConfig).
 		WithFunding(big.NewFloat(.5)).
 		WithStandardCleanup().
+		WithLogStream().
 		Build()
 	require.NoError(t, err, "Error deploying test environment")
 
diff --git a/integration-tests/smoke/ocr2_test.go b/integration-tests/smoke/ocr2_test.go
index 0676ed03004..8f0fbd76053 100644
--- a/integration-tests/smoke/ocr2_test.go
+++ b/integration-tests/smoke/ocr2_test.go
@@ -33,6 +33,7 @@ func TestOCRv2Basic(t *testing.T) {
 		WithCLNodes(6).
 		WithFunding(big.NewFloat(.1)).
 		WithStandardCleanup().
+		WithLogStream().
 		Build()
 	require.NoError(t, err)
 
@@ -107,6 +108,7 @@ func TestOCRv2JobReplacement(t *testing.T) {
 		WithCLNodes(6).
 		WithFunding(big.NewFloat(.1)).
 		WithStandardCleanup().
+		WithLogStream().
 		Build()
 	require.NoError(t, err)
 
diff --git a/integration-tests/smoke/ocr_test.go b/integration-tests/smoke/ocr_test.go
index 57afbdc1a4a..25192248c46 100644
--- a/integration-tests/smoke/ocr_test.go
+++ b/integration-tests/smoke/ocr_test.go
@@ -24,6 +24,7 @@ func TestOCRBasic(t *testing.T) {
 		WithCLNodes(6).
 		WithFunding(big.NewFloat(.5)).
 		WithStandardCleanup().
+		WithLogStream().
 		Build()
 	require.NoError(t, err)
 
diff --git a/integration-tests/smoke/runlog_test.go b/integration-tests/smoke/runlog_test.go
index e2cd28b3320..2fc771fb9bf 100644
--- a/integration-tests/smoke/runlog_test.go
+++ b/integration-tests/smoke/runlog_test.go
@@ -29,6 +29,7 @@ func TestRunLogBasic(t *testing.T) {
 		WithCLNodes(1).
 		WithFunding(big.NewFloat(.1)).
 		WithStandardCleanup().
+		WithLogStream().
 		Build()
 	require.NoError(t, err)
 
diff --git a/integration-tests/smoke/vrf_test.go b/integration-tests/smoke/vrf_test.go
index 9c24d97b13b..04120053745 100644
--- a/integration-tests/smoke/vrf_test.go
+++ b/integration-tests/smoke/vrf_test.go
@@ -29,6 +29,7 @@ func TestVRFBasic(t *testing.T) {
 		WithCLNodes(1).
 		WithFunding(big.NewFloat(.1)).
 		WithStandardCleanup().
+		WithLogStream().
 		Build()
 	require.NoError(t, err)
 	env.ParallelTransactions(true)
@@ -118,6 +119,7 @@ func TestVRFJobReplacement(t *testing.T) {
 		WithCLNodes(1).
 		WithFunding(big.NewFloat(.1)).
 		WithStandardCleanup().
+		WithLogStream().
 		Build()
 	require.NoError(t, err)
 	env.ParallelTransactions(true)
diff --git a/integration-tests/smoke/vrfv2_test.go b/integration-tests/smoke/vrfv2_test.go
index 4edb92e5df6..9976de03954 100644
--- a/integration-tests/smoke/vrfv2_test.go
+++ b/integration-tests/smoke/vrfv2_test.go
@@ -34,6 +34,7 @@ func TestVRFv2Basic(t *testing.T) {
 		WithCLNodes(1).
 		WithFunding(big.NewFloat(vrfv2Config.ChainlinkNodeFunding)).
 		WithStandardCleanup().
+		WithLogStream().
 		Build()
 	require.NoError(t, err, "error creating test env")
 
@@ -125,6 +126,7 @@ func TestVRFv2MultipleSendingKeys(t *testing.T) {
 		WithCLNodes(1).
 		WithFunding(big.NewFloat(vrfv2Config.ChainlinkNodeFunding)).
 		WithStandardCleanup().
+		WithLogStream().
 		Build()
 	require.NoError(t, err, "error creating test env")
 
diff --git a/integration-tests/smoke/vrfv2plus_test.go b/integration-tests/smoke/vrfv2plus_test.go
index f4f52b6ee01..69e1eb7ebde 100644
--- a/integration-tests/smoke/vrfv2plus_test.go
+++ b/integration-tests/smoke/vrfv2plus_test.go
@@ -39,6 +39,7 @@ func TestVRFv2Plus(t *testing.T) {
 		WithCLNodes(1).
 		WithFunding(big.NewFloat(vrfv2PlusConfig.ChainlinkNodeFunding)).
 		WithStandardCleanup().
+		WithLogStream().
 		Build()
 	require.NoError(t, err, "error creating test env")
 
@@ -616,6 +617,7 @@ func TestVRFv2PlusMultipleSendingKeys(t *testing.T) {
 		WithCLNodes(1).
 		WithFunding(big.NewFloat(vrfv2PlusConfig.ChainlinkNodeFunding)).
 		WithStandardCleanup().
+		WithLogStream().
 		Build()
 	require.NoError(t, err, "error creating test env")
 
@@ -706,6 +708,7 @@ func TestVRFv2PlusMigration(t *testing.T) {
 		WithCLNodes(1).
 		WithFunding(big.NewFloat(vrfv2PlusConfig.ChainlinkNodeFunding)).
 		WithStandardCleanup().
+		WithLogStream().
 		Build()
 	require.NoError(t, err, "error creating test env")
 	env.ParallelTransactions(true)
diff --git a/integration-tests/universal/log_poller/helpers.go b/integration-tests/universal/log_poller/helpers.go
index 7bf1657316f..48f34e6827c 100644
--- a/integration-tests/universal/log_poller/helpers.go
+++ b/integration-tests/universal/log_poller/helpers.go
@@ -1059,6 +1059,7 @@ func setupLogPollerTestDocker(
 		WithChainOptions(logPolllerSettingsFn).
 		EVMClientNetworkOptions(evmClientSettingsFn).
 		WithStandardCleanup().
+		WithLogStream().
 		Build()
 	require.NoError(t, err, "Error deploying test environment")
 

From d315f6e39790c8155275bca473d577682abf0dbe Mon Sep 17 00:00:00 2001
From: Jordan Krage <jmank88@gmail.com>
Date: Fri, 8 Dec 2023 06:53:40 -0600
Subject: [PATCH 099/130] go generate a mermaid flowchart for org modules
 (#11467)

---
 GNUmakefile        |  4 +++
 go.md              | 65 ++++++++++++++++++++++++++++++++++++++++++++++
 main.go            |  1 +
 tools/bin/modgraph | 46 ++++++++++++++++++++++++++++++++
 4 files changed, 116 insertions(+)
 create mode 100644 go.md
 create mode 100755 tools/bin/modgraph

diff --git a/GNUmakefile b/GNUmakefile
index 7d0753911a3..09b1dfe87a3 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -147,6 +147,10 @@ goreleaser-dev-build: ## Run goreleaser snapshot build
 goreleaser-dev-release: ## run goreleaser snapshot release
 	./tools/bin/goreleaser_wrapper release --snapshot --rm-dist --config ${GORELEASER_CONFIG}
 
+.PHONY: modgraph
+modgraph:
+	./tools/bin/modgraph > go.md
+
 help:
 	@echo ""
 	@echo "         .__           .__       .__  .__        __"
diff --git a/go.md b/go.md
new file mode 100644
index 00000000000..090221a89fd
--- /dev/null
+++ b/go.md
@@ -0,0 +1,65 @@
+# smartcontractkit Go modules
+```mermaid
+flowchart LR
+  subgraph chains
+    chainlink-cosmos
+    chainlink-evm
+    chainlink-solana
+    chainlink-starknet/relayer
+  end
+
+  subgraph products
+    chainlink-automation
+    chainlink-ccip
+    chainlink-data-streams
+    chainlink-feeds
+    chainlink-functions
+    chainlink-vrf
+  end
+
+  classDef outline stroke-dasharray:6,fill:none;
+  class chains,products outline
+
+  chainlink/v2 --> caigo
+  click caigo href "https://github.com/smartcontractkit/caigo"
+  chainlink/v2 --> chainlink-automation
+  click chainlink-automation href "https://github.com/smartcontractkit/chainlink-automation"
+  chainlink/v2 --> chainlink-common
+  click chainlink-common href "https://github.com/smartcontractkit/chainlink-common"
+  chainlink/v2 --> chainlink-cosmos
+  click chainlink-cosmos href "https://github.com/smartcontractkit/chainlink-cosmos"
+  chainlink/v2 --> chainlink-data-streams
+  click chainlink-data-streams href "https://github.com/smartcontractkit/chainlink-data-streams"
+  chainlink/v2 --> chainlink-feeds
+  click chainlink-feeds href "https://github.com/smartcontractkit/chainlink-feeds"
+  chainlink/v2 --> chainlink-solana
+  click chainlink-solana href "https://github.com/smartcontractkit/chainlink-solana"
+  chainlink/v2 --> chainlink-starknet/relayer
+  click chainlink-starknet/relayer href "https://github.com/smartcontractkit/chainlink-starknet"
+  chainlink/v2 --> chainlink-vrf
+  click chainlink-vrf href "https://github.com/smartcontractkit/chainlink-vrf"
+  chainlink/v2 --> libocr
+  click libocr href "https://github.com/smartcontractkit/libocr"
+  chainlink/v2 --> tdh2/go/ocr2/decryptionplugin
+  click tdh2/go/ocr2/decryptionplugin href "https://github.com/smartcontractkit/tdh2"
+  chainlink/v2 --> tdh2/go/tdh2
+  click tdh2/go/tdh2 href "https://github.com/smartcontractkit/tdh2"
+  chainlink/v2 --> wsrpc
+  click wsrpc href "https://github.com/smartcontractkit/wsrpc"
+  chainlink-automation --> libocr
+  chainlink-common --> libocr
+  chainlink-cosmos --> chainlink-common
+  chainlink-cosmos --> libocr
+  chainlink-data-streams --> chainlink-common
+  chainlink-data-streams --> libocr
+  chainlink-feeds --> chainlink-common
+  chainlink-feeds --> libocr
+  chainlink-solana --> chainlink-common
+  chainlink-solana --> libocr
+  chainlink-starknet/relayer --> caigo
+  chainlink-starknet/relayer --> chainlink-common
+  chainlink-starknet/relayer --> libocr
+  chainlink-vrf --> libocr
+  tdh2/go/ocr2/decryptionplugin --> libocr
+  tdh2/go/ocr2/decryptionplugin --> tdh2/go/tdh2
+```
diff --git a/main.go b/main.go
index 2a224c96d29..7e262f85f28 100644
--- a/main.go
+++ b/main.go
@@ -6,6 +6,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core"
 )
 
+//go:generate make modgraph
 func main() {
 	os.Exit(core.Main())
 }
diff --git a/tools/bin/modgraph b/tools/bin/modgraph
new file mode 100755
index 00000000000..b61264cb021
--- /dev/null
+++ b/tools/bin/modgraph
@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+
+# Generates go.md
+
+set -e
+
+echo "# smartcontractkit Go modules
+\`\`\`mermaid
+flowchart LR
+  subgraph chains
+    chainlink-cosmos
+    chainlink-evm
+    chainlink-solana
+    chainlink-starknet/relayer
+  end
+
+  subgraph products
+    chainlink-automation
+    chainlink-ccip
+    chainlink-data-streams
+    chainlink-feeds
+    chainlink-functions
+    chainlink-vrf
+  end
+
+  classDef outline stroke-dasharray:6,fill:none;
+  class chains,products outline
+"
+go mod graph | \
+  # org only
+  grep smartcontractkit.*smartcontractkit | \
+  # drop prefix
+  sed s/"github\.com\/smartcontractkit\/"/""/g | \
+  # insert edges
+  sed s/" "/" --> "/ | \
+  # drop versions
+  sed s/"@[^ ]*"/""/g | \
+  # insert links
+  sed s/"\([^ ]*\)$"/"\1\nclick \1 href \"https:\/\/github.com\/smartcontractkit\/\1\""/ | \
+  # truncate links to repo
+  sed s/"\"https:\/\/github.com\/smartcontractkit\/\([^\"\/]*\)\/.*\""/"\"https:\/\/github.com\/smartcontractkit\/\1\""/ | \
+  # dedupe lines
+  awk '!x[$0]++' | \
+  # indent
+  sed 's/^/  /'
+echo "\`\`\`"
\ No newline at end of file

From c2eb539c912469479a06a2a640acc3a1bdb270f2 Mon Sep 17 00:00:00 2001
From: Jordan Krage <jmank88@gmail.com>
Date: Fri, 8 Dec 2023 08:31:24 -0600
Subject: [PATCH 100/130] use servicetest.Run & RunHealthy (#11354)

---
 .../chains/evm/gas/arbitrum_estimator_test.go | 19 ++++-----
 .../gas/rollups/l1_gas_price_oracle_test.go   | 10 ++---
 .../evm/gas/suggested_price_estimator_test.go | 13 +++----
 .../evm/headtracker/head_broadcaster_test.go  | 11 +++---
 core/chains/evm/log/helpers_test.go           |  1 +
 core/chains/evm/log/integration_test.go       |  3 +-
 .../evm/logpoller/log_poller_internal_test.go | 13 +++----
 core/chains/evm/monitor/balance_test.go       | 18 +++------
 core/chains/evm/txmgr/broadcaster_test.go     | 14 +++----
 core/chains/evm/txmgr/confirmer_test.go       |  7 ++--
 core/chains/evm/txmgr/txmgr_test.go           |  4 +-
 core/internal/testutils/evmtest/evmtest.go    |  4 +-
 core/services/directrequest/delegate_test.go  |  7 ++--
 core/services/feeds/service_test.go           | 18 ++++-----
 .../fluxmonitorv2/flux_monitor_test.go        | 25 ++++--------
 core/services/functions/listener_test.go      | 26 +++++--------
 .../gateway/connector/connector_test.go       |  5 +--
 core/services/gateway/gateway_test.go         |  4 +-
 .../functions/handler.functions_test.go       |  4 +-
 .../gateway_integration_test.go               |  8 ++--
 .../gateway/network/wsconnection_test.go      | 10 ++---
 core/services/job/runner_integration_test.go  | 31 +++++++--------
 core/services/job/spawner_test.go             | 10 ++---
 .../keeper/registry1_1_synchronizer_test.go   | 16 +++-----
 .../keeper/registry1_2_synchronizer_test.go   | 25 +++++-------
 .../keeper/registry1_3_synchronizer_test.go   | 39 +++++++------------
 .../registry_synchronizer_helper_test.go      |  5 ++-
 core/services/keeper/upkeep_executer_test.go  |  4 +-
 core/services/nurse_test.go                   |  1 -
 core/services/ocr/config_overrider_test.go    |  8 ++--
 core/services/ocr/contract_tracker_test.go    |  8 ++--
 .../evmregistry/v21/upkeepstate/store_test.go |  9 ++---
 core/services/ocrcommon/peer_wrapper_test.go  |  7 ++--
 core/services/ocrcommon/run_saver_test.go     |  6 +--
 core/services/ocrcommon/telemetry.go          |  2 +-
 core/services/ocrcommon/telemetry_test.go     | 10 ++---
 core/services/pg/event_broadcaster_test.go    |  5 +--
 .../promreporter/prom_reporter_test.go        | 12 +++---
 core/services/relay/evm/config_poller_test.go |  8 ++--
 .../relay/evm/functions/config_poller_test.go |  9 ++---
 .../evm/functions/logpoller_wrapper_test.go   | 10 ++---
 .../relay/evm/mercury/helpers_test.go         |  5 +--
 .../evm/mercury/wsrpc/cache/cache_set_test.go | 12 +++---
 .../relay/evm/mercury/wsrpc/client_test.go    |  7 ++--
 core/services/srvctest/servicetest.go         | 18 ---------
 .../telemetry_ingress_batch_client_test.go    |  7 +---
 .../telemetry_ingress_client_test.go          |  5 +--
 core/services/vrf/delegate_test.go            | 23 ++++++-----
 .../vrf/v1/listener_v1_test_helpers.go        |  4 +-
 core/web/jobs_controller_test.go              |  1 +
 50 files changed, 214 insertions(+), 317 deletions(-)
 delete mode 100644 core/services/srvctest/servicetest.go

diff --git a/core/chains/evm/gas/arbitrum_estimator_test.go b/core/chains/evm/gas/arbitrum_estimator_test.go
index 53f81617988..9d56e2c10ad 100644
--- a/core/chains/evm/gas/arbitrum_estimator_test.go
+++ b/core/chains/evm/gas/arbitrum_estimator_test.go
@@ -15,6 +15,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas/mocks"
@@ -66,8 +67,7 @@ func TestArbitrumEstimator(t *testing.T) {
 		}).Return(zeros.Bytes(), nil)
 
 		o := gas.NewArbitrumEstimator(logger.Test(t), &arbConfig{v: maxGasLimit}, rpcClient, ethClient)
-		require.NoError(t, o.Start(testutils.Context(t)))
-		t.Cleanup(func() { assert.NoError(t, o.Close()) })
+		servicetest.RunHealthy(t, o)
 		gasPrice, chainSpecificGasLimit, err := o.GetLegacyGas(testutils.Context(t), calldata, gasLimit, maxGasPrice)
 		require.NoError(t, err)
 		// Expected price for a standard l2_suggested_estimator would be 42, but we add a fixed gasPriceBufferPercentage.
@@ -92,8 +92,7 @@ func TestArbitrumEstimator(t *testing.T) {
 			assert.Equal(t, big.NewInt(-1), blockNumber)
 		}).Return(zeros.Bytes(), nil)
 
-		require.NoError(t, o.Start(testutils.Context(t)))
-		t.Cleanup(func() { assert.NoError(t, o.Close()) })
+		servicetest.RunHealthy(t, o)
 		gasPrice, chainSpecificGasLimit, err := o.GetLegacyGas(testutils.Context(t), calldata, gasLimit, assets.NewWeiI(40))
 		require.Error(t, err)
 		assert.EqualError(t, err, "estimated gas price: 42 wei is greater than the maximum gas price configured: 40 wei")
@@ -118,8 +117,7 @@ func TestArbitrumEstimator(t *testing.T) {
 			assert.Equal(t, big.NewInt(-1), blockNumber)
 		}).Return(zeros.Bytes(), nil)
 
-		require.NoError(t, o.Start(testutils.Context(t)))
-		t.Cleanup(func() { assert.NoError(t, o.Close()) })
+		servicetest.RunHealthy(t, o)
 		gasPrice, chainSpecificGasLimit, err := o.GetLegacyGas(testutils.Context(t), calldata, gasLimit, assets.NewWeiI(110))
 		assert.EqualError(t, err, "estimated gas price: 120 wei is greater than the maximum gas price configured: 110 wei")
 		assert.Nil(t, gasPrice)
@@ -148,8 +146,7 @@ func TestArbitrumEstimator(t *testing.T) {
 			assert.Equal(t, big.NewInt(-1), blockNumber)
 		}).Return(zeros.Bytes(), nil)
 
-		require.NoError(t, o.Start(testutils.Context(t)))
-		t.Cleanup(func() { assert.NoError(t, o.Close()) })
+		servicetest.RunHealthy(t, o)
 
 		_, _, err := o.GetLegacyGas(testutils.Context(t), calldata, gasLimit, maxGasPrice)
 		assert.EqualError(t, err, "failed to estimate gas; gas price not set")
@@ -181,8 +178,7 @@ func TestArbitrumEstimator(t *testing.T) {
 		}).Return(b.Bytes(), nil)
 
 		o := gas.NewArbitrumEstimator(logger.Test(t), &arbConfig{v: maxGasLimit}, rpcClient, ethClient)
-		require.NoError(t, o.Start(testutils.Context(t)))
-		t.Cleanup(func() { assert.NoError(t, o.Close()) })
+		servicetest.RunHealthy(t, o)
 		gasPrice, chainSpecificGasLimit, err := o.GetLegacyGas(testutils.Context(t), calldata, gasLimit, maxGasPrice)
 		require.NoError(t, err)
 		require.NotNil(t, gasPrice)
@@ -216,8 +212,7 @@ func TestArbitrumEstimator(t *testing.T) {
 		}).Return(b.Bytes(), nil)
 
 		o := gas.NewArbitrumEstimator(logger.Test(t), &arbConfig{v: maxGasLimit}, rpcClient, ethClient)
-		require.NoError(t, o.Start(testutils.Context(t)))
-		t.Cleanup(func() { assert.NoError(t, o.Close()) })
+		servicetest.RunHealthy(t, o)
 		gasPrice, chainSpecificGasLimit, err := o.GetLegacyGas(testutils.Context(t), calldata, gasLimit, maxGasPrice)
 		require.Error(t, err, "expected error but got (%s, %d)", gasPrice, chainSpecificGasLimit)
 	})
diff --git a/core/chains/evm/gas/rollups/l1_gas_price_oracle_test.go b/core/chains/evm/gas/rollups/l1_gas_price_oracle_test.go
index 2defedd6b47..1a1d1ffdeee 100644
--- a/core/chains/evm/gas/rollups/l1_gas_price_oracle_test.go
+++ b/core/chains/evm/gas/rollups/l1_gas_price_oracle_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 
 	"github.com/smartcontractkit/chainlink/v2/common/config"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
@@ -50,8 +51,7 @@ func TestL1GasPriceOracle(t *testing.T) {
 		}).Return(common.BigToHash(l1BaseFee).Bytes(), nil)
 
 		oracle := NewL1GasPriceOracle(logger.Test(t), ethClient, config.ChainArbitrum)
-		require.NoError(t, oracle.Start(testutils.Context(t)))
-		t.Cleanup(func() { assert.NoError(t, oracle.Close()) })
+		servicetest.RunHealthy(t, oracle)
 
 		gasPrice, err := oracle.GasPrice(testutils.Context(t))
 		require.NoError(t, err)
@@ -72,8 +72,7 @@ func TestL1GasPriceOracle(t *testing.T) {
 		}).Return(common.BigToHash(l1BaseFee).Bytes(), nil)
 
 		oracle := NewL1GasPriceOracle(logger.Test(t), ethClient, config.ChainKroma)
-		require.NoError(t, oracle.Start(testutils.Context(t)))
-		t.Cleanup(func() { assert.NoError(t, oracle.Close()) })
+		servicetest.RunHealthy(t, oracle)
 
 		gasPrice, err := oracle.GasPrice(testutils.Context(t))
 		require.NoError(t, err)
@@ -94,8 +93,7 @@ func TestL1GasPriceOracle(t *testing.T) {
 		}).Return(common.BigToHash(l1BaseFee).Bytes(), nil)
 
 		oracle := NewL1GasPriceOracle(logger.Test(t), ethClient, config.ChainOptimismBedrock)
-		require.NoError(t, oracle.Start(testutils.Context(t)))
-		t.Cleanup(func() { assert.NoError(t, oracle.Close()) })
+		servicetest.RunHealthy(t, oracle)
 
 		gasPrice, err := oracle.GasPrice(testutils.Context(t))
 		require.NoError(t, err)
diff --git a/core/chains/evm/gas/suggested_price_estimator_test.go b/core/chains/evm/gas/suggested_price_estimator_test.go
index 304e5359107..8e45f5b759a 100644
--- a/core/chains/evm/gas/suggested_price_estimator_test.go
+++ b/core/chains/evm/gas/suggested_price_estimator_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas/mocks"
@@ -40,8 +41,7 @@ func TestSuggestedPriceEstimator(t *testing.T) {
 		})
 
 		o := gas.NewSuggestedPriceEstimator(logger.Test(t), client)
-		require.NoError(t, o.Start(testutils.Context(t)))
-		t.Cleanup(func() { assert.NoError(t, o.Close()) })
+		servicetest.RunHealthy(t, o)
 		gasPrice, chainSpecificGasLimit, err := o.GetLegacyGas(testutils.Context(t), calldata, gasLimit, maxGasPrice)
 		require.NoError(t, err)
 		assert.Equal(t, assets.NewWeiI(42), gasPrice)
@@ -57,8 +57,7 @@ func TestSuggestedPriceEstimator(t *testing.T) {
 			(*big.Int)(res).SetInt64(42)
 		})
 
-		require.NoError(t, o.Start(testutils.Context(t)))
-		t.Cleanup(func() { assert.NoError(t, o.Close()) })
+		servicetest.RunHealthy(t, o)
 		gasPrice, chainSpecificGasLimit, err := o.GetLegacyGas(testutils.Context(t), calldata, gasLimit, assets.NewWeiI(40))
 		require.Error(t, err)
 		assert.EqualError(t, err, "estimated gas price: 42 wei is greater than the maximum gas price configured: 40 wei")
@@ -75,8 +74,7 @@ func TestSuggestedPriceEstimator(t *testing.T) {
 			(*big.Int)(res).SetInt64(120)
 		})
 
-		require.NoError(t, o.Start(testutils.Context(t)))
-		t.Cleanup(func() { assert.NoError(t, o.Close()) })
+		servicetest.RunHealthy(t, o)
 		gasPrice, chainSpecificGasLimit, err := o.GetLegacyGas(testutils.Context(t), calldata, gasLimit, assets.NewWeiI(110))
 		assert.EqualError(t, err, "estimated gas price: 120 wei is greater than the maximum gas price configured: 110 wei")
 		assert.Nil(t, gasPrice)
@@ -96,8 +94,7 @@ func TestSuggestedPriceEstimator(t *testing.T) {
 
 		client.On("CallContext", mock.Anything, mock.Anything, "eth_gasPrice").Return(errors.New("kaboom"))
 
-		require.NoError(t, o.Start(testutils.Context(t)))
-		t.Cleanup(func() { assert.NoError(t, o.Close()) })
+		servicetest.RunHealthy(t, o)
 
 		_, _, err := o.GetLegacyGas(testutils.Context(t), calldata, gasLimit, maxGasPrice)
 		assert.EqualError(t, err, "failed to estimate gas; gas price not set")
diff --git a/core/chains/evm/headtracker/head_broadcaster_test.go b/core/chains/evm/headtracker/head_broadcaster_test.go
index 6fb151bfe6c..ac43c08fe87 100644
--- a/core/chains/evm/headtracker/head_broadcaster_test.go
+++ b/core/chains/evm/headtracker/head_broadcaster_test.go
@@ -11,6 +11,8 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
+
 	commonhtrk "github.com/smartcontractkit/chainlink/v2/common/headtracker"
 	commonmocks "github.com/smartcontractkit/chainlink/v2/common/types/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker"
@@ -21,7 +23,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"github.com/smartcontractkit/chainlink/v2/core/services"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
@@ -68,14 +69,14 @@ func TestHeadBroadcaster_Subscribe(t *testing.T) {
 	checker1 := &cltest.MockHeadTrackable{}
 	checker2 := &cltest.MockHeadTrackable{}
 
-	hb := headtracker.NewHeadBroadcaster(logger)
 	orm := headtracker.NewORM(db, logger, cfg.Database(), *ethClient.ConfiguredChainID())
 	hs := headtracker.NewHeadSaver(logger, orm, evmCfg.EVM(), evmCfg.EVM().HeadTracker())
 	mailMon := utils.NewMailboxMonitor(t.Name())
+	servicetest.Run(t, mailMon)
+	hb := headtracker.NewHeadBroadcaster(logger)
+	servicetest.Run(t, hb)
 	ht := headtracker.NewHeadTracker(logger, ethClient, evmCfg.EVM(), evmCfg.EVM().HeadTracker(), hb, hs, mailMon)
-	var ms services.MultiStart
-	require.NoError(t, ms.Start(testutils.Context(t), mailMon, hb, ht))
-	t.Cleanup(func() { require.NoError(t, services.CloseAll(mailMon, hb, ht)) })
+	servicetest.Run(t, ht)
 
 	latest1, unsubscribe1 := hb.Subscribe(checker1)
 	// "latest head" is nil here because we didn't receive any yet
diff --git a/core/chains/evm/log/helpers_test.go b/core/chains/evm/log/helpers_test.go
index 49f9266f705..e41f08e8d20 100644
--- a/core/chains/evm/log/helpers_test.go
+++ b/core/chains/evm/log/helpers_test.go
@@ -22,6 +22,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
+
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	evmconfig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config"
diff --git a/core/chains/evm/log/integration_test.go b/core/chains/evm/log/integration_test.go
index 2d66cdf585c..e5b6ad3caf5 100644
--- a/core/chains/evm/log/integration_test.go
+++ b/core/chains/evm/log/integration_test.go
@@ -18,6 +18,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
+
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
 	logmocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/log/mocks"
@@ -1324,7 +1325,7 @@ func TestBroadcaster_AppendLogChannel(t *testing.T) {
 	ch3 := make(chan types.Log)
 
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
-	mailMon := servicetest.Run(t, utils.NewMailboxMonitor(t.Name()))
+	mailMon := servicetest.RunHealthy(t, utils.NewMailboxMonitor(t.Name()))
 	lb := log.NewBroadcaster(nil, ethClient, nil, logger.Test(t), nil, mailMon)
 	chCombined := lb.ExportedAppendLogChannel(ch1, ch2)
 	chCombined = lb.ExportedAppendLogChannel(chCombined, ch3)
diff --git a/core/chains/evm/logpoller/log_poller_internal_test.go b/core/chains/evm/logpoller/log_poller_internal_test.go
index e3ba8b655e8..f840eefc7b8 100644
--- a/core/chains/evm/logpoller/log_poller_internal_test.go
+++ b/core/chains/evm/logpoller/log_poller_internal_test.go
@@ -22,6 +22,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
@@ -351,8 +352,7 @@ func TestLogPoller_Replay(t *testing.T) {
 		ec.On("FilterLogs", mock.Anything, mock.Anything).Return([]types.Log{log1}, nil).Maybe() // in case task gets delayed by >= 100ms
 
 		t.Cleanup(lp.reset)
-		require.NoError(t, lp.Start(ctx))
-		t.Cleanup(func() { assert.NoError(t, lp.Close()) })
+		servicetest.Run(t, lp)
 
 		select {
 		case <-ctx.Done():
@@ -389,8 +389,7 @@ func TestLogPoller_Replay(t *testing.T) {
 		ec.On("FilterLogs", mock.Anything, mock.Anything).Return([]types.Log{log1}, nil).Maybe() // in case task gets delayed by >= 100ms
 
 		t.Cleanup(lp.reset)
-		require.NoError(t, lp.Start(ctx))
-		t.Cleanup(func() { assert.NoError(t, lp.Close()) })
+		servicetest.Run(t, lp)
 
 		select {
 		case <-ctx.Done():
@@ -402,8 +401,7 @@ func TestLogPoller_Replay(t *testing.T) {
 	// ReplayAsync should return as soon as replayStart is received
 	t.Run("ReplayAsync success", func(t *testing.T) {
 		t.Cleanup(lp.reset)
-		require.NoError(t, lp.Start(testutils.Context(t)))
-		t.Cleanup(func() { assert.NoError(t, lp.Close()) })
+		servicetest.Run(t, lp)
 
 		lp.ReplayAsync(1)
 
@@ -412,8 +410,7 @@ func TestLogPoller_Replay(t *testing.T) {
 
 	t.Run("ReplayAsync error", func(t *testing.T) {
 		t.Cleanup(lp.reset)
-		require.NoError(t, lp.Start(testutils.Context(t)))
-		t.Cleanup(func() { assert.NoError(t, lp.Close()) })
+		servicetest.Run(t, lp)
 
 		anyErr := errors.New("async error")
 		observedLogs.TakeAll()
diff --git a/core/chains/evm/monitor/balance_test.go b/core/chains/evm/monitor/balance_test.go
index c2c976e78da..246d5d0759f 100644
--- a/core/chains/evm/monitor/balance_test.go
+++ b/core/chains/evm/monitor/balance_test.go
@@ -14,6 +14,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/monitor"
@@ -44,7 +45,6 @@ func TestBalanceMonitor_Start(t *testing.T) {
 		_, k0Addr := cltest.MustInsertRandomKey(t, ethKeyStore)
 
 		bm := monitor.NewBalanceMonitor(ethClient, ethKeyStore, logger.Test(t))
-		defer func() { assert.NoError(t, bm.Close()) }()
 
 		k0bal := big.NewInt(42)
 		k1bal := big.NewInt(43)
@@ -54,7 +54,7 @@ func TestBalanceMonitor_Start(t *testing.T) {
 		ethClient.On("BalanceAt", mock.Anything, k0Addr, nilBigInt).Once().Return(k0bal, nil)
 		ethClient.On("BalanceAt", mock.Anything, k1Addr, nilBigInt).Once().Return(k1bal, nil)
 
-		assert.NoError(t, bm.Start(testutils.Context(t)))
+		servicetest.RunHealthy(t, bm)
 
 		gomega.NewWithT(t).Eventually(func() *big.Int {
 			return bm.GetEthBalance(k0Addr).ToInt()
@@ -72,12 +72,11 @@ func TestBalanceMonitor_Start(t *testing.T) {
 		_, k0Addr := cltest.MustInsertRandomKey(t, ethKeyStore)
 
 		bm := monitor.NewBalanceMonitor(ethClient, ethKeyStore, logger.Test(t))
-		defer func() { assert.NoError(t, bm.Close()) }()
 		k0bal := big.NewInt(42)
 
 		ethClient.On("BalanceAt", mock.Anything, k0Addr, nilBigInt).Once().Return(k0bal, nil)
 
-		assert.NoError(t, bm.Start(testutils.Context(t)))
+		servicetest.RunHealthy(t, bm)
 
 		gomega.NewWithT(t).Eventually(func() *big.Int {
 			return bm.GetEthBalance(k0Addr).ToInt()
@@ -92,7 +91,6 @@ func TestBalanceMonitor_Start(t *testing.T) {
 		_, k0Addr := cltest.MustInsertRandomKey(t, ethKeyStore)
 
 		bm := monitor.NewBalanceMonitor(ethClient, ethKeyStore, logger.Test(t))
-		defer func() { assert.NoError(t, bm.Close()) }()
 		ctxCancelledAwaiter := cltest.NewAwaiter()
 
 		ethClient.On("BalanceAt", mock.Anything, k0Addr, nilBigInt).Once().Run(func(args mock.Arguments) {
@@ -122,13 +120,12 @@ func TestBalanceMonitor_Start(t *testing.T) {
 		_, k0Addr := cltest.MustInsertRandomKey(t, ethKeyStore)
 
 		bm := monitor.NewBalanceMonitor(ethClient, ethKeyStore, logger.Test(t))
-		defer func() { assert.NoError(t, bm.Close()) }()
 
 		ethClient.On("BalanceAt", mock.Anything, k0Addr, nilBigInt).
 			Once().
 			Return(nil, errors.New("a little easter egg for the 4chan link marines error"))
 
-		assert.NoError(t, bm.Start(testutils.Context(t)))
+		servicetest.RunHealthy(t, bm)
 
 		gomega.NewWithT(t).Consistently(func() *big.Int {
 			return bm.GetEthBalance(k0Addr).ToInt()
@@ -160,8 +157,7 @@ func TestBalanceMonitor_OnNewLongestChain_UpdatesBalance(t *testing.T) {
 		ethClient.On("BalanceAt", mock.Anything, k0Addr, nilBigInt).Once().Return(k0bal, nil)
 		ethClient.On("BalanceAt", mock.Anything, k1Addr, nilBigInt).Once().Return(k1bal, nil)
 
-		require.NoError(t, bm.Start(testutils.Context(t)))
-		defer func() { assert.NoError(t, bm.Close()) }()
+		servicetest.RunHealthy(t, bm)
 
 		ethClient.On("BalanceAt", mock.Anything, k0Addr, nilBigInt).Once().Return(k0bal, nil)
 		ethClient.On("BalanceAt", mock.Anything, k1Addr, nilBigInt).Once().Return(k1bal, nil)
@@ -205,7 +201,7 @@ func TestBalanceMonitor_FewerRPCCallsWhenBehind(t *testing.T) {
 	ethClient.On("BalanceAt", mock.Anything, mock.Anything, mock.Anything).
 		Once().
 		Return(big.NewInt(1), nil)
-	require.NoError(t, bm.Start(testutils.Context(t)))
+	servicetest.RunHealthy(t, bm)
 
 	head := cltest.Head(0)
 
@@ -234,8 +230,6 @@ func TestBalanceMonitor_FewerRPCCallsWhenBehind(t *testing.T) {
 		mockUnblocker <- time.Time{}
 	})
 
-	bm.Close()
-
 	// Make sure the BalanceAt mock wasn't called more than once
 	assert.LessOrEqual(t, callCount.Load(), int32(1))
 }
diff --git a/core/chains/evm/txmgr/broadcaster_test.go b/core/chains/evm/txmgr/broadcaster_test.go
index c6e05b0954b..21a4bd2865c 100644
--- a/core/chains/evm/txmgr/broadcaster_test.go
+++ b/core/chains/evm/txmgr/broadcaster_test.go
@@ -23,6 +23,7 @@ import (
 	"gopkg.in/guregu/null.v4"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	"github.com/smartcontractkit/chainlink-common/pkg/sqlutil"
 
 	commonclient "github.com/smartcontractkit/chainlink/v2/common/client"
@@ -59,7 +60,6 @@ func NewTestEthBroadcaster(
 	nonceAutoSync bool,
 ) *txmgr.Broadcaster {
 	t.Helper()
-	ctx := testutils.Context(t)
 
 	lggr := logger.Test(t)
 	ge := config.EVM().GasEstimator()
@@ -70,8 +70,7 @@ func NewTestEthBroadcaster(
 
 	// Mark instance as test
 	ethBroadcaster.XXXTestDisableUnstartedTxAutoProcessing()
-	require.NoError(t, ethBroadcaster.Start(ctx))
-	t.Cleanup(func() { assert.NoError(t, ethBroadcaster.Close()) })
+	servicetest.Run(t, ethBroadcaster)
 	return ethBroadcaster
 }
 
@@ -634,8 +633,7 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_OptimisticLockingOnEthTx(t *testi
 	eb.XXXTestDisableUnstartedTxAutoProcessing()
 
 	// Start instance of broadcaster
-	require.NoError(t, eb.Start(testutils.Context(t)))
-	t.Cleanup(func() { assert.NoError(t, eb.Close()) })
+	servicetest.Run(t, eb)
 
 	mustCreateUnstartedGeneratedTx(t, txStore, fromAddress, &cltest.FixtureChainID)
 
@@ -1794,8 +1792,7 @@ func TestEthBroadcaster_SyncNonce(t *testing.T) {
 		eb := txmgr.NewEvmBroadcaster(txStore, txmgr.NewEvmTxmClient(ethClient), evmTxmCfg, txmgr.NewEvmTxmFeeConfig(ge), evmcfg.EVM().Transactions(), cfg.Database().Listener(), kst, txBuilder, txNonceSyncer, lggr, checkerFactory, true)
 
 		ethClient.On("PendingNonceAt", mock.Anything, fromAddress).Return(uint64(ethNodeNonce), nil).Once()
-		require.NoError(t, eb.Start(ctx))
-		defer func() { assert.NoError(t, eb.Close()) }()
+		servicetest.Run(t, eb)
 
 		testutils.WaitForLogMessage(t, observed, "Fast-forward sequence")
 
@@ -1828,8 +1825,7 @@ func TestEthBroadcaster_SyncNonce(t *testing.T) {
 		ethClient.On("PendingNonceAt", mock.Anything, fromAddress).Return(uint64(0), errors.New("something exploded")).Once()
 		ethClient.On("PendingNonceAt", mock.Anything, fromAddress).Return(ethNodeNonce, nil)
 
-		require.NoError(t, eb.Start(ctx))
-		defer func() { assert.NoError(t, eb.Close()) }()
+		servicetest.Run(t, eb)
 
 		testutils.WaitForLogMessage(t, observed, "Fast-forward sequence")
 
diff --git a/core/chains/evm/txmgr/confirmer_test.go b/core/chains/evm/txmgr/confirmer_test.go
index 84c42cd00f1..9d909d58344 100644
--- a/core/chains/evm/txmgr/confirmer_test.go
+++ b/core/chains/evm/txmgr/confirmer_test.go
@@ -21,6 +21,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	commonclient "github.com/smartcontractkit/chainlink/v2/common/client"
 	commonfee "github.com/smartcontractkit/chainlink/v2/common/fee"
 	txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr"
@@ -1646,7 +1647,7 @@ func TestEthConfirmer_RebroadcastWhereNecessary_WithConnectivityCheck(t *testing
 		kst.On("EnabledAddressesForChain", &cltest.FixtureChainID).Return(addresses, nil).Maybe()
 		// Create confirmer with necessary state
 		ec := txmgr.NewEvmConfirmer(txStore, txmgr.NewEvmTxmClient(ethClient), ccfg.EVM(), txmgr.NewEvmTxmFeeConfig(ccfg.EVM().GasEstimator()), ccfg.EVM().Transactions(), cfg.Database(), kst, txBuilder, lggr)
-		require.NoError(t, ec.Start(testutils.Context(t)))
+		servicetest.Run(t, ec)
 		currentHead := int64(30)
 		oldEnough := int64(15)
 		nonce := int64(0)
@@ -1691,7 +1692,7 @@ func TestEthConfirmer_RebroadcastWhereNecessary_WithConnectivityCheck(t *testing
 		addresses := []gethCommon.Address{fromAddress}
 		kst.On("EnabledAddressesForChain", &cltest.FixtureChainID).Return(addresses, nil).Maybe()
 		ec := txmgr.NewEvmConfirmer(txStore, txmgr.NewEvmTxmClient(ethClient), ccfg.EVM(), txmgr.NewEvmTxmFeeConfig(ccfg.EVM().GasEstimator()), ccfg.EVM().Transactions(), cfg.Database(), kst, txBuilder, lggr)
-		require.NoError(t, ec.Start(testutils.Context(t)))
+		servicetest.Run(t, ec)
 		currentHead := int64(30)
 		oldEnough := int64(15)
 		nonce := int64(0)
@@ -3080,6 +3081,6 @@ func newEthConfirmer(t testing.TB, txStore txmgr.EvmTxStore, ethClient client.Cl
 	txBuilder := txmgr.NewEvmTxAttemptBuilder(*ethClient.ConfiguredChainID(), ge, ks, estimator)
 	ec := txmgr.NewEvmConfirmer(txStore, txmgr.NewEvmTxmClient(ethClient), txmgr.NewEvmTxmConfig(config.EVM()), txmgr.NewEvmTxmFeeConfig(ge), config.EVM().Transactions(), config.Database(), ks, txBuilder, lggr)
 	ec.SetResumeCallback(fn)
-	require.NoError(t, ec.Start(testutils.Context(t)))
+	servicetest.Run(t, ec)
 	return ec
 }
diff --git a/core/chains/evm/txmgr/txmgr_test.go b/core/chains/evm/txmgr/txmgr_test.go
index 745623ed77e..9833acfd459 100644
--- a/core/chains/evm/txmgr/txmgr_test.go
+++ b/core/chains/evm/txmgr/txmgr_test.go
@@ -21,6 +21,7 @@ import (
 	"github.com/jmoiron/sqlx"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr"
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
 	commontxmmocks "github.com/smartcontractkit/chainlink/v2/common/txmgr/types/mocks"
@@ -552,8 +553,7 @@ func TestTxm_Reset(t *testing.T) {
 		assert.EqualError(t, err, "not started")
 	})
 
-	require.NoError(t, txm.Start(testutils.Context(t)))
-	defer func() { assert.NoError(t, txm.Close()) }()
+	servicetest.Run(t, txm)
 
 	t.Run("returns no error if started", func(t *testing.T) {
 		err := txm.Reset(addr, false)
diff --git a/core/internal/testutils/evmtest/evmtest.go b/core/internal/testutils/evmtest/evmtest.go
index 423615145e5..e0a447a3274 100644
--- a/core/internal/testutils/evmtest/evmtest.go
+++ b/core/internal/testutils/evmtest/evmtest.go
@@ -15,6 +15,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"gopkg.in/guregu/null.v4"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
 
 	commonmocks "github.com/smartcontractkit/chainlink/v2/common/types/mocks"
@@ -36,7 +37,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay"
 	evmrelay "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
-	"github.com/smartcontractkit/chainlink/v2/core/services/srvctest"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -118,7 +118,7 @@ func NewChainRelayExtOpts(t testing.TB, testopts TestChainOpts) legacyevm.ChainR
 		}
 	}
 	if opts.MailMon == nil {
-		opts.MailMon = srvctest.Start(t, utils.NewMailboxMonitor(t.Name()))
+		opts.MailMon = servicetest.Run(t, utils.NewMailboxMonitor(t.Name()))
 	}
 	if testopts.GasEstimator != nil {
 		opts.GenGasEstimator = func(*big.Int) gas.EvmFeeEstimator {
diff --git a/core/services/directrequest/delegate_test.go b/core/services/directrequest/delegate_test.go
index 56c28e57458..2d5b9bef03b 100644
--- a/core/services/directrequest/delegate_test.go
+++ b/core/services/directrequest/delegate_test.go
@@ -14,6 +14,8 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/assets"
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
+
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
 	log_mocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/log/mocks"
@@ -31,7 +33,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
 	pipeline_mocks "github.com/smartcontractkit/chainlink/v2/core/services/pipeline/mocks"
 	evmrelay "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
-	"github.com/smartcontractkit/chainlink/v2/core/services/srvctest"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -43,7 +44,7 @@ func TestDelegate_ServicesForSpec(t *testing.T) {
 		c.EVM[0].MinIncomingConfirmations = ptr[uint32](1)
 	})
 	keyStore := cltest.NewKeyStore(t, db, cfg.Database())
-	mailMon := srvctest.Start(t, utils.NewMailboxMonitor(t.Name()))
+	mailMon := servicetest.Run(t, utils.NewMailboxMonitor(t.Name()))
 	relayerExtenders := evmtest.NewChainRelayExtenders(t, evmtest.TestChainOpts{DB: db, GeneralConfig: cfg, Client: ethClient, MailMon: mailMon, KeyStore: keyStore.Eth()})
 
 	lggr := logger.TestLogger(t)
@@ -80,7 +81,7 @@ func NewDirectRequestUniverseWithConfig(t *testing.T, cfg chainlink.GeneralConfi
 	runner := pipeline_mocks.NewRunner(t)
 	broadcaster.On("AddDependents", 1)
 
-	mailMon := srvctest.Start(t, utils.NewMailboxMonitor(t.Name()))
+	mailMon := servicetest.Run(t, utils.NewMailboxMonitor(t.Name()))
 
 	db := pgtest.NewSqlxDB(t)
 	keyStore := cltest.NewKeyStore(t, db, cfg.Database())
diff --git a/core/services/feeds/service_test.go b/core/services/feeds/service_test.go
index 271321a1169..bd0993825e2 100644
--- a/core/services/feeds/service_test.go
+++ b/core/services/feeds/service_test.go
@@ -9,8 +9,15 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/google/uuid"
+	"github.com/lib/pq"
 	"github.com/pkg/errors"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+	"gopkg.in/guregu/null.v4"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
@@ -36,13 +43,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 	"github.com/smartcontractkit/chainlink/v2/core/utils/crypto"
-
-	"github.com/google/uuid"
-	"github.com/lib/pq"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-	"gopkg.in/guregu/null.v4"
 )
 
 const FluxMonitorTestSpecTemplate = `
@@ -3465,9 +3465,7 @@ func Test_Service_StartStop(t *testing.T) {
 				tt.beforeFunc(svc)
 			}
 
-			require.NoError(t, svc.Start(testutils.Context(t)))
-
-			svc.Close()
+			servicetest.Run(t, svc)
 		})
 	}
 }
diff --git a/core/services/fluxmonitorv2/flux_monitor_test.go b/core/services/fluxmonitorv2/flux_monitor_test.go
index 1a14fb8bd0a..b13edcc12d8 100644
--- a/core/services/fluxmonitorv2/flux_monitor_test.go
+++ b/core/services/fluxmonitorv2/flux_monitor_test.go
@@ -21,6 +21,7 @@ import (
 	"github.com/jmoiron/sqlx"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/assets"
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
 	logmocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/log/mocks"
@@ -701,7 +702,7 @@ func TestPollingDeviationChecker_BuffersLogs(t *testing.T) {
 		Once().
 		Run(func(mock.Arguments) { readyToAssert.ItHappened() })
 
-	require.NoError(t, fm.Start(testutils.Context(t)))
+	servicetest.Run(t, fm)
 
 	var logBroadcasts []*logmocks.Broadcast
 
@@ -724,8 +725,6 @@ func TestPollingDeviationChecker_BuffersLogs(t *testing.T) {
 
 	logsAwaiter.ItHappened()
 	readyToAssert.AwaitOrFail(t)
-
-	fm.Close()
 }
 
 func TestFluxMonitor_TriggerIdleTimeThreshold(t *testing.T) {
@@ -1049,8 +1048,7 @@ func TestFluxMonitor_IdleTimerResetsOnNewRound(t *testing.T) {
 	idleDurationOccured := make(chan struct{}, 4)
 	initialPollOccurred := make(chan struct{}, 1)
 
-	require.NoError(t, fm.Start(testutils.Context(t)))
-	t.Cleanup(func() { fm.Close() })
+	servicetest.Run(t, fm)
 
 	// Initial Poll
 	roundState1 := flux_aggregator_wrapper.OracleRoundState{RoundId: 1, EligibleToSubmit: false, LatestSubmission: answerBigInt, StartedAt: now()}
@@ -1169,11 +1167,9 @@ func TestFluxMonitor_RoundTimeoutCausesPoll_timesOutAtZero(t *testing.T) {
 
 	require.NoError(t, fm.SetOracleAddress())
 	fm.ExportedRoundState(t)
-	require.NoError(t, fm.Start(testutils.Context(t)))
+	servicetest.Run(t, fm)
 
 	g.Eventually(ch).Should(gomega.BeClosed())
-
-	fm.Close()
 }
 
 func TestFluxMonitor_UsesPreviousRoundStateOnStartup_RoundTimeout(t *testing.T) {
@@ -1229,15 +1225,13 @@ func TestFluxMonitor_UsesPreviousRoundStateOnStartup_RoundTimeout(t *testing.T)
 				Run(func(mock.Arguments) { close(chRoundState) }).
 				Maybe()
 
-			require.NoError(t, fm.Start(testutils.Context(t)))
+			servicetest.Run(t, fm)
 
 			if test.expectedToSubmit {
 				g.Eventually(chRoundState).Should(gomega.BeClosed())
 			} else {
 				g.Consistently(chRoundState).ShouldNot(gomega.BeClosed())
 			}
-
-			require.NoError(t, fm.Close())
 		})
 	}
 }
@@ -1310,8 +1304,7 @@ func TestFluxMonitor_UsesPreviousRoundStateOnStartup_IdleTimer(t *testing.T) {
 				}).
 				Maybe()
 
-			require.NoError(t, fm.Start(testutils.Context(t)))
-			t.Cleanup(func() { fm.Close() })
+			servicetest.Run(t, fm)
 
 			assert.Eventually(t, func() bool { return len(initialPollOccurred) == 1 }, 3*time.Second, 10*time.Millisecond)
 
@@ -1385,7 +1378,7 @@ func TestFluxMonitor_RoundTimeoutCausesPoll_timesOutNotZero(t *testing.T) {
 		Run(func(mock.Arguments) { close(chRoundState2) }).
 		Once()
 
-	require.NoError(t, fm.Start(testutils.Context(t)))
+	servicetest.Run(t, fm)
 
 	tm.logBroadcaster.On("WasAlreadyConsumed", mock.Anything, mock.Anything).Return(false, nil)
 	tm.logBroadcaster.On("MarkConsumed", mock.Anything, mock.Anything).Return(nil)
@@ -1401,7 +1394,6 @@ func TestFluxMonitor_RoundTimeoutCausesPoll_timesOutNotZero(t *testing.T) {
 	g.Eventually(chRoundState2).Should(gomega.BeClosed())
 
 	time.Sleep(time.Duration(2*timeout) * time.Second)
-	require.NoError(t, fm.Close())
 }
 
 func TestFluxMonitor_ConsumeLogBroadcast(t *testing.T) {
@@ -1927,8 +1919,7 @@ func TestFluxMonitor_DrumbeatTicker(t *testing.T) {
 		Return(flux_aggregator_wrapper.OracleRoundState{RoundId: 4, EligibleToSubmit: false, LatestSubmission: answerBigInt, StartedAt: now()}, nil).
 		Maybe()
 
-	require.NoError(t, fm.Start(testutils.Context(t)))
-	defer func() { assert.NoError(t, fm.Close()) }()
+	servicetest.Run(t, fm)
 
 	waitTime := 15 * time.Second
 	interval := 50 * time.Millisecond
diff --git a/core/services/functions/listener_test.go b/core/services/functions/listener_test.go
index 0fcc9c65599..5020537bf61 100644
--- a/core/services/functions/listener_test.go
+++ b/core/services/functions/listener_test.go
@@ -19,6 +19,8 @@ import (
 
 	decryptionPlugin "github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
+
 	log_mocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/log/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
@@ -38,7 +40,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types"
 	evmrelay_mocks "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types/mocks"
 	s4_mocks "github.com/smartcontractkit/chainlink/v2/core/services/s4/mocks"
-	"github.com/smartcontractkit/chainlink/v2/core/services/srvctest"
 	"github.com/smartcontractkit/chainlink/v2/core/services/synchronization"
 	sync_mocks "github.com/smartcontractkit/chainlink/v2/core/services/synchronization/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/services/synchronization/telem"
@@ -81,7 +82,7 @@ func NewFunctionsListenerUniverse(t *testing.T, timeoutSec int, pruneFrequencySe
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
 	broadcaster := log_mocks.NewBroadcaster(t)
 	broadcaster.On("AddDependents", 1)
-	mailMon := srvctest.Start(t, utils.NewMailboxMonitor(t.Name()))
+	mailMon := servicetest.Run(t, utils.NewMailboxMonitor(t.Name()))
 
 	db := pgtest.NewSqlxDB(t)
 	kst := cltest.NewKeyStore(t, db, cfg.Database())
@@ -175,9 +176,8 @@ func TestFunctionsListener_HandleOracleRequestV1_Success(t *testing.T) {
 		close(doneCh)
 	}).Return(nil)
 
-	require.NoError(t, uni.service.Start(testutils.Context(t)))
+	servicetest.Run(t, uni.service)
 	<-doneCh
-	uni.service.Close()
 }
 
 func TestFunctionsListener_HandleOffchainRequest_Success(t *testing.T) {
@@ -270,9 +270,8 @@ func TestFunctionsListener_HandleOracleRequestV1_ComputationError(t *testing.T)
 		close(doneCh)
 	}).Return(nil)
 
-	require.NoError(t, uni.service.Start(testutils.Context(t)))
+	servicetest.Run(t, uni.service)
 	<-doneCh
-	uni.service.Close()
 }
 
 func TestFunctionsListener_HandleOracleRequestV1_ThresholdDecryptedSecrets(t *testing.T) {
@@ -312,9 +311,8 @@ func TestFunctionsListener_HandleOracleRequestV1_ThresholdDecryptedSecrets(t *te
 		close(doneCh)
 	}).Return(nil)
 
-	require.NoError(t, uni.service.Start(testutils.Context(t)))
+	servicetest.Run(t, uni.service)
 	<-doneCh
-	uni.service.Close()
 }
 
 func TestFunctionsListener_HandleOracleRequestV1_CBORTooBig(t *testing.T) {
@@ -339,9 +337,8 @@ func TestFunctionsListener_HandleOracleRequestV1_CBORTooBig(t *testing.T) {
 		close(doneCh)
 	}).Return(nil)
 
-	require.NoError(t, uni.service.Start(testutils.Context(t)))
+	servicetest.Run(t, uni.service)
 	<-doneCh
-	uni.service.Close()
 }
 
 func TestFunctionsListener_ReportSourceCodeDomains(t *testing.T) {
@@ -395,9 +392,8 @@ func TestFunctionsListener_PruneRequests(t *testing.T) {
 		doneCh <- true
 	})
 
-	require.NoError(t, uni.service.Start(testutils.Context(t)))
+	servicetest.Run(t, uni.service)
 	<-doneCh
-	uni.service.Close()
 }
 
 func TestFunctionsListener_TimeoutRequests(t *testing.T) {
@@ -411,9 +407,8 @@ func TestFunctionsListener_TimeoutRequests(t *testing.T) {
 		doneCh <- true
 	})
 
-	require.NoError(t, uni.service.Start(testutils.Context(t)))
+	servicetest.Run(t, uni.service)
 	<-doneCh
-	uni.service.Close()
 }
 
 func TestFunctionsListener_ORMDoesNotFreezeHandlersForever(t *testing.T) {
@@ -434,7 +429,6 @@ func TestFunctionsListener_ORMDoesNotFreezeHandlersForever(t *testing.T) {
 		ormCallExited.Done()
 	}).Return(errors.New("timeout"))
 
-	require.NoError(t, uni.service.Start(testutils.Context(t)))
+	servicetest.Run(t, uni.service)
 	ormCallExited.Wait() // should not freeze
-	uni.service.Close()
 }
diff --git a/core/services/gateway/connector/connector_test.go b/core/services/gateway/connector/connector_test.go
index 4001914524b..1c2c6d26b10 100644
--- a/core/services/gateway/connector/connector_test.go
+++ b/core/services/gateway/connector/connector_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/gateway/connector"
 	"github.com/smartcontractkit/chainlink/v2/core/services/gateway/connector/mocks"
@@ -121,8 +121,7 @@ func TestGatewayConnector_CleanStartAndClose(t *testing.T) {
 	handler.On("Start", mock.Anything).Return(nil)
 	handler.On("Close").Return(nil)
 	signer.On("Sign", mock.Anything).Return(nil, errors.New("cannot sign"))
-	require.NoError(t, connector.Start(testutils.Context(t)))
-	require.NoError(t, connector.Close())
+	servicetest.Run(t, connector)
 }
 
 func TestGatewayConnector_NewAuthHeader_SignerError(t *testing.T) {
diff --git a/core/services/gateway/gateway_test.go b/core/services/gateway/gateway_test.go
index 5fad6315a31..74d689fffe1 100644
--- a/core/services/gateway/gateway_test.go
+++ b/core/services/gateway/gateway_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/gateway"
@@ -130,8 +131,7 @@ func TestGateway_CleanStartAndClose(t *testing.T) {
 	lggr := logger.TestLogger(t)
 	gateway, err := gateway.NewGatewayFromConfig(parseTOMLConfig(t, buildConfig("")), gateway.NewHandlerFactory(nil, lggr), lggr)
 	require.NoError(t, err)
-	require.NoError(t, gateway.Start(testutils.Context(t)))
-	require.NoError(t, gateway.Close())
+	servicetest.Run(t, gateway)
 }
 
 func requireJsonRPCResult(t *testing.T, response []byte, expectedId string, expectedResult string) {
diff --git a/core/services/gateway/handlers/functions/handler.functions_test.go b/core/services/gateway/handlers/functions/handler.functions_test.go
index f36b64709a2..1d6dd109625 100644
--- a/core/services/gateway/handlers/functions/handler.functions_test.go
+++ b/core/services/gateway/handlers/functions/handler.functions_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/assets"
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/gateway/api"
@@ -97,8 +98,7 @@ func TestFunctionsHandler_CleanStartAndClose(t *testing.T) {
 	handler, err := functions.NewFunctionsHandlerFromConfig(json.RawMessage("{}"), &config.DONConfig{}, nil, nil, logger.TestLogger(t))
 	require.NoError(t, err)
 
-	require.NoError(t, handler.Start(testutils.Context(t)))
-	require.NoError(t, handler.Close())
+	servicetest.Run(t, handler)
 }
 
 func TestFunctionsHandler_HandleUserMessage_SecretsSet(t *testing.T) {
diff --git a/core/services/gateway/integration_tests/gateway_integration_test.go b/core/services/gateway/integration_tests/gateway_integration_test.go
index 310047950e6..415a8f67cf8 100644
--- a/core/services/gateway/integration_tests/gateway_integration_test.go
+++ b/core/services/gateway/integration_tests/gateway_integration_test.go
@@ -14,6 +14,7 @@ import (
 	"github.com/pelletier/go-toml/v2"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/gateway"
@@ -119,7 +120,7 @@ func TestIntegration_Gateway_NoFullNodes_BasicConnectionAndMessage(t *testing.T)
 	gatewayConfig := fmt.Sprintf(gatewayConfigTemplate, nodeKeys.Address)
 	gateway, err := gateway.NewGatewayFromConfig(parseGatewayConfig(t, gatewayConfig), gateway.NewHandlerFactory(nil, lggr), lggr)
 	require.NoError(t, err)
-	require.NoError(t, gateway.Start(testutils.Context(t)))
+	servicetest.Run(t, gateway)
 	userPort, nodePort := gateway.GetUserPort(), gateway.GetNodePort()
 	userUrl := fmt.Sprintf("http://localhost:%d/user", userPort)
 	nodeUrl := fmt.Sprintf("ws://localhost:%d/node", nodePort)
@@ -129,7 +130,7 @@ func TestIntegration_Gateway_NoFullNodes_BasicConnectionAndMessage(t *testing.T)
 	connector, err := connector.NewGatewayConnector(parseConnectorConfig(t, nodeConfigTemplate, nodeKeys.Address, nodeUrl), client, client, utils.NewRealClock(), lggr)
 	require.NoError(t, err)
 	client.connector = connector
-	require.NoError(t, connector.Start(testutils.Context(t)))
+	servicetest.Run(t, connector)
 
 	// Send requests until one of them reaches Connector
 	gomega.NewGomegaWithT(t).Eventually(func() bool {
@@ -144,7 +145,4 @@ func TestIntegration_Gateway_NoFullNodes_BasicConnectionAndMessage(t *testing.T)
 		_, _ = httpClient.Do(req) // could initially return error if Gateway is not fully initialized yet
 		return client.done.Load()
 	}, testutils.WaitTimeout(t), testutils.TestInterval).Should(gomega.Equal(true))
-
-	require.NoError(t, connector.Close())
-	require.NoError(t, gateway.Close())
 }
diff --git a/core/services/gateway/network/wsconnection_test.go b/core/services/gateway/network/wsconnection_test.go
index 5fd8aa50e33..4ded4f40b10 100644
--- a/core/services/gateway/network/wsconnection_test.go
+++ b/core/services/gateway/network/wsconnection_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/gateway/network"
@@ -30,18 +31,17 @@ func (ssl *serverSideLogic) wsHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func TestWSConnectionWrapper_ClientReconnect(t *testing.T) {
-	ctx := testutils.Context(t)
 	lggr := logger.TestLogger(t)
 	// server
 	ssl := &serverSideLogic{connWrapper: network.NewWSConnectionWrapper(lggr)}
-	require.NoError(t, ssl.connWrapper.Start(ctx))
+	servicetest.Run(t, ssl.connWrapper)
 	s := httptest.NewServer(http.HandlerFunc(ssl.wsHandler))
 	serverURL := "ws" + strings.TrimPrefix(s.URL, "http")
 	defer s.Close()
 
 	// client
 	clientConnWrapper := network.NewWSConnectionWrapper(lggr)
-	require.NoError(t, clientConnWrapper.Start(ctx))
+	servicetest.Run(t, clientConnWrapper)
 
 	// connect, write a message, disconnect
 	conn, _, err := websocket.DefaultDialer.Dial(serverURL, nil)
@@ -64,8 +64,4 @@ func TestWSConnectionWrapper_ClientReconnect(t *testing.T) {
 	require.NoError(t, writeErr)
 	<-ssl.connWrapper.ReadChannel() // consumed by server
 	conn.Close()
-
-	ssl.connWrapper.Close()
-	clientConnWrapper.Close()
-	clientConnWrapper.Close() // safe to call Close() twice
 }
diff --git a/core/services/job/runner_integration_test.go b/core/services/job/runner_integration_test.go
index ef0458312bc..0223f1a10d5 100644
--- a/core/services/job/runner_integration_test.go
+++ b/core/services/job/runner_integration_test.go
@@ -23,6 +23,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"gopkg.in/guregu/null.v4"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
+
 	"github.com/smartcontractkit/chainlink/v2/core/auth"
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
@@ -40,7 +42,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocrcommon"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
 	evmrelay "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
-	"github.com/smartcontractkit/chainlink/v2/core/services/srvctest"
 	"github.com/smartcontractkit/chainlink/v2/core/services/telemetry"
 	"github.com/smartcontractkit/chainlink/v2/core/services/webhook"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
@@ -91,8 +92,7 @@ func TestRunner(t *testing.T) {
 
 	_, placeHolderAddress := cltest.MustInsertRandomKey(t, keyStore.Eth())
 
-	require.NoError(t, runner.Start(ctx))
-	t.Cleanup(func() { assert.NoError(t, runner.Close()) })
+	servicetest.Run(t, runner)
 
 	t.Run("gets the election result winner", func(t *testing.T) {
 		var httpURL string
@@ -451,8 +451,7 @@ answer1      [type=median index=0];
 		_, err = keyStore.P2P().Create()
 		assert.NoError(t, err)
 		pw := ocrcommon.NewSingletonPeerWrapper(keyStore, config.P2P(), config.OCR(), config.Database(), db, lggr)
-		require.NoError(t, pw.Start(testutils.Context(t)))
-		t.Cleanup(func() { assert.NoError(t, pw.Close()) })
+		servicetest.Run(t, pw)
 		sd := ocr.NewDelegate(
 			db,
 			jobORM,
@@ -463,7 +462,7 @@ answer1      [type=median index=0];
 			legacyChains,
 			lggr,
 			config.Database(),
-			srvctest.Start(t, utils.NewMailboxMonitor(t.Name())),
+			servicetest.Run(t, utils.NewMailboxMonitor(t.Name())),
 		)
 		_, err = sd.ServicesForSpec(jb)
 		require.NoError(t, err)
@@ -486,8 +485,7 @@ answer1      [type=median index=0];
 
 		lggr := logger.TestLogger(t)
 		pw := ocrcommon.NewSingletonPeerWrapper(keyStore, config.P2P(), config.OCR(), config.Database(), db, lggr)
-		require.NoError(t, pw.Start(testutils.Context(t)))
-		t.Cleanup(func() { assert.NoError(t, pw.Close()) })
+		servicetest.Run(t, pw)
 		sd := ocr.NewDelegate(
 			db,
 			jobORM,
@@ -498,7 +496,7 @@ answer1      [type=median index=0];
 			legacyChains,
 			lggr,
 			config.Database(),
-			srvctest.Start(t, utils.NewMailboxMonitor(t.Name())),
+			servicetest.Run(t, utils.NewMailboxMonitor(t.Name())),
 		)
 		_, err = sd.ServicesForSpec(jb)
 		require.NoError(t, err)
@@ -515,8 +513,7 @@ answer1      [type=median index=0];
 
 		lggr := logger.TestLogger(t)
 		pw := ocrcommon.NewSingletonPeerWrapper(keyStore, config.P2P(), config.OCR(), config.Database(), db, lggr)
-		require.NoError(t, pw.Start(testutils.Context(t)))
-		t.Cleanup(func() { assert.NoError(t, pw.Close()) })
+		servicetest.Run(t, pw)
 		sd := ocr.NewDelegate(
 			db,
 			jobORM,
@@ -527,7 +524,7 @@ answer1      [type=median index=0];
 			legacyChains,
 			lggr,
 			config.Database(),
-			srvctest.Start(t, utils.NewMailboxMonitor(t.Name())),
+			servicetest.Run(t, utils.NewMailboxMonitor(t.Name())),
 		)
 		_, err = sd.ServicesForSpec(jb)
 		require.NoError(t, err)
@@ -571,8 +568,7 @@ answer1      [type=median index=0];
 
 			lggr := logger.TestLogger(t)
 			pw := ocrcommon.NewSingletonPeerWrapper(keyStore, config.P2P(), config.OCR(), config.Database(), db, lggr)
-			require.NoError(t, pw.Start(testutils.Context(t)))
-			t.Cleanup(func() { assert.NoError(t, pw.Close()) })
+			servicetest.Run(t, pw)
 			sd := ocr.NewDelegate(
 				db,
 				jobORM,
@@ -583,7 +579,7 @@ answer1      [type=median index=0];
 				legacyChains,
 				lggr,
 				config.Database(),
-				srvctest.Start(t, utils.NewMailboxMonitor(t.Name())),
+				servicetest.Run(t, utils.NewMailboxMonitor(t.Name())),
 			)
 
 			jb.OCROracleSpec.CaptureEATelemetry = tc.jbCaptureEATelemetry
@@ -616,8 +612,7 @@ answer1      [type=median index=0];
 
 		lggr := logger.TestLogger(t)
 		pw := ocrcommon.NewSingletonPeerWrapper(keyStore, config.P2P(), config.OCR(), config.Database(), db, lggr)
-		require.NoError(t, pw.Start(testutils.Context(t)))
-		t.Cleanup(func() { assert.NoError(t, pw.Close()) })
+		servicetest.Run(t, pw)
 		sd := ocr.NewDelegate(
 			db,
 			jobORM,
@@ -628,7 +623,7 @@ answer1      [type=median index=0];
 			legacyChains,
 			lggr,
 			config.Database(),
-			srvctest.Start(t, utils.NewMailboxMonitor(t.Name())),
+			servicetest.Run(t, utils.NewMailboxMonitor(t.Name())),
 		)
 		services, err := sd.ServicesForSpec(*jb)
 		require.NoError(t, err)
diff --git a/core/services/job/spawner_test.go b/core/services/job/spawner_test.go
index 0ad76491438..d639ce859af 100644
--- a/core/services/job/spawner_test.go
+++ b/core/services/job/spawner_test.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/loop"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
 	mocklp "github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller/mocks"
@@ -33,7 +34,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay"
 	evmrelay "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
 	evmrelayer "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
-	"github.com/smartcontractkit/chainlink/v2/core/services/srvctest"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 	"github.com/smartcontractkit/chainlink/v2/plugins"
 )
@@ -128,7 +128,7 @@ func TestSpawner_CreateJobDeleteJob(t *testing.T) {
 		serviceA2 := mocks.NewServiceCtx(t)
 		serviceA1.On("Start", mock.Anything).Return(nil).Once()
 		serviceA2.On("Start", mock.Anything).Return(nil).Once().Run(func(mock.Arguments) { eventuallyA.ItHappened() })
-		mailMon := srvctest.Start(t, utils.NewMailboxMonitor(t.Name()))
+		mailMon := servicetest.Run(t, utils.NewMailboxMonitor(t.Name()))
 		dA := ocr.NewDelegate(nil, orm, nil, nil, nil, monitoringEndpoint, legacyChains, logger.TestLogger(t), config.Database(), mailMon)
 		delegateA := &delegate{jobA.Type, []job.ServiceCtx{serviceA1, serviceA2}, 0, make(chan struct{}), dA}
 
@@ -187,7 +187,7 @@ func TestSpawner_CreateJobDeleteJob(t *testing.T) {
 
 		lggr := logger.TestLogger(t)
 		orm := NewTestORM(t, db, pipeline.NewORM(db, lggr, config.Database(), config.JobPipeline().MaxSuccessfulRuns()), bridges.NewORM(db, lggr, config.Database()), keyStore, config.Database())
-		mailMon := srvctest.Start(t, utils.NewMailboxMonitor(t.Name()))
+		mailMon := servicetest.Run(t, utils.NewMailboxMonitor(t.Name()))
 		d := ocr.NewDelegate(nil, orm, nil, nil, nil, monitoringEndpoint, legacyChains, logger.TestLogger(t), config.Database(), mailMon)
 		delegateA := &delegate{jobA.Type, []job.ServiceCtx{serviceA1, serviceA2}, 0, nil, d}
 		spawner := job.NewSpawner(orm, config.Database(), noopChecker{}, map[job.Type]job.Delegate{
@@ -221,7 +221,7 @@ func TestSpawner_CreateJobDeleteJob(t *testing.T) {
 
 		lggr := logger.TestLogger(t)
 		orm := NewTestORM(t, db, pipeline.NewORM(db, lggr, config.Database(), config.JobPipeline().MaxSuccessfulRuns()), bridges.NewORM(db, lggr, config.Database()), keyStore, config.Database())
-		mailMon := srvctest.Start(t, utils.NewMailboxMonitor(t.Name()))
+		mailMon := servicetest.Run(t, utils.NewMailboxMonitor(t.Name()))
 		d := ocr.NewDelegate(nil, orm, nil, nil, nil, monitoringEndpoint, legacyChains, logger.TestLogger(t), config.Database(), mailMon)
 		delegateA := &delegate{jobA.Type, []job.ServiceCtx{serviceA1, serviceA2}, 0, nil, d}
 		spawner := job.NewSpawner(orm, config.Database(), noopChecker{}, map[job.Type]job.Delegate{
@@ -299,7 +299,7 @@ func TestSpawner_CreateJobDeleteJob(t *testing.T) {
 		jobOCR2VRF := makeOCR2VRFJobSpec(t, keyStore, config, address, chain.ID(), 2)
 
 		orm := NewTestORM(t, db, pipeline.NewORM(db, lggr, config.Database(), config.JobPipeline().MaxSuccessfulRuns()), bridges.NewORM(db, lggr, config.Database()), keyStore, config.Database())
-		mailMon := srvctest.Start(t, utils.NewMailboxMonitor(t.Name()))
+		mailMon := servicetest.Run(t, utils.NewMailboxMonitor(t.Name()))
 
 		processConfig := plugins.NewRegistrarConfig(loop.GRPCOpts{}, func(name string) (*plugins.RegisteredLoop, error) { return nil, nil })
 		ocr2DelegateConfig := ocr2.NewDelegateConfig(config.OCR2(), config.Mercury(), config.Threshold(), config.Insecure(), config.JobPipeline(), config.Database(), processConfig)
diff --git a/core/services/keeper/registry1_1_synchronizer_test.go b/core/services/keeper/registry1_1_synchronizer_test.go
index 031b7a59074..fb0b1866c41 100644
--- a/core/services/keeper/registry1_1_synchronizer_test.go
+++ b/core/services/keeper/registry1_1_synchronizer_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	logmocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/log/mocks"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
@@ -217,8 +218,7 @@ func Test_RegistrySynchronizer1_1_ConfigSetLog(t *testing.T) {
 		upkeepConfig1_1,
 		0)
 
-	require.NoError(t, synchronizer.Start(testutils.Context(t)))
-	defer func() { assert.NoError(t, synchronizer.Close()) }()
+	servicetest.Run(t, synchronizer)
 	cltest.WaitForCount(t, db, "keeper_registries", 1)
 	var registry keeper.Registry
 	require.NoError(t, db.Get(&registry, `SELECT * FROM keeper_registries`))
@@ -266,8 +266,7 @@ func Test_RegistrySynchronizer1_1_KeepersUpdatedLog(t *testing.T) {
 		upkeepConfig1_1,
 		0)
 
-	require.NoError(t, synchronizer.Start(testutils.Context(t)))
-	defer func() { assert.NoError(t, synchronizer.Close()) }()
+	servicetest.Run(t, synchronizer)
 	cltest.WaitForCount(t, db, "keeper_registries", 1)
 	var registry keeper.Registry
 	require.NoError(t, db.Get(&registry, `SELECT * FROM keeper_registries`))
@@ -313,8 +312,7 @@ func Test_RegistrySynchronizer1_1_UpkeepCanceledLog(t *testing.T) {
 		upkeepConfig1_1,
 		3)
 
-	require.NoError(t, synchronizer.Start(testutils.Context(t)))
-	defer func() { require.NoError(t, synchronizer.Close()) }()
+	servicetest.Run(t, synchronizer)
 	cltest.WaitForCount(t, db, "keeper_registries", 1)
 	cltest.WaitForCount(t, db, "upkeep_registrations", 3)
 
@@ -352,8 +350,7 @@ func Test_RegistrySynchronizer1_1_UpkeepRegisteredLog(t *testing.T) {
 		upkeepConfig1_1,
 		1)
 
-	require.NoError(t, synchronizer.Start(testutils.Context(t)))
-	defer func() { assert.NoError(t, synchronizer.Close()) }()
+	servicetest.Run(t, synchronizer)
 	cltest.WaitForCount(t, db, "keeper_registries", 1)
 	cltest.WaitForCount(t, db, "upkeep_registrations", 1)
 
@@ -396,8 +393,7 @@ func Test_RegistrySynchronizer1_1_UpkeepPerformedLog(t *testing.T) {
 		upkeepConfig1_1,
 		1)
 
-	require.NoError(t, synchronizer.Start(testutils.Context(t)))
-	defer func() { assert.NoError(t, synchronizer.Close()) }()
+	servicetest.Run(t, synchronizer)
 	cltest.WaitForCount(t, db, "keeper_registries", 1)
 	cltest.WaitForCount(t, db, "upkeep_registrations", 1)
 
diff --git a/core/services/keeper/registry1_2_synchronizer_test.go b/core/services/keeper/registry1_2_synchronizer_test.go
index e7d8d6a48a2..b7456ad94e4 100644
--- a/core/services/keeper/registry1_2_synchronizer_test.go
+++ b/core/services/keeper/registry1_2_synchronizer_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	logmocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/log/mocks"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
@@ -237,8 +238,7 @@ func Test_RegistrySynchronizer1_2_ConfigSetLog(t *testing.T) {
 		2,
 		0)
 
-	require.NoError(t, synchronizer.Start(testutils.Context(t)))
-	defer func() { assert.NoError(t, synchronizer.Close()) }()
+	servicetest.Run(t, synchronizer)
 	cltest.WaitForCount(t, db, "keeper_registries", 1)
 	var registry keeper.Registry
 	require.NoError(t, db.Get(&registry, `SELECT * FROM keeper_registries`))
@@ -290,8 +290,7 @@ func Test_RegistrySynchronizer1_2_KeepersUpdatedLog(t *testing.T) {
 		2,
 		0)
 
-	require.NoError(t, synchronizer.Start(testutils.Context(t)))
-	defer func() { assert.NoError(t, synchronizer.Close()) }()
+	servicetest.Run(t, synchronizer)
 	cltest.WaitForCount(t, db, "keeper_registries", 1)
 	var registry keeper.Registry
 	require.NoError(t, db.Get(&registry, `SELECT * FROM keeper_registries`))
@@ -342,8 +341,7 @@ func Test_RegistrySynchronizer1_2_UpkeepCanceledLog(t *testing.T) {
 		2,
 		1)
 
-	require.NoError(t, synchronizer.Start(testutils.Context(t)))
-	defer func() { require.NoError(t, synchronizer.Close()) }()
+	servicetest.Run(t, synchronizer)
 	cltest.WaitForCount(t, db, "keeper_registries", 1)
 	cltest.WaitForCount(t, db, "upkeep_registrations", 3)
 
@@ -382,8 +380,7 @@ func Test_RegistrySynchronizer1_2_UpkeepRegisteredLog(t *testing.T) {
 		2,
 		1)
 
-	require.NoError(t, synchronizer.Start(testutils.Context(t)))
-	defer func() { assert.NoError(t, synchronizer.Close()) }()
+	servicetest.Run(t, synchronizer)
 	cltest.WaitForCount(t, db, "keeper_registries", 1)
 	cltest.WaitForCount(t, db, "upkeep_registrations", 1)
 
@@ -427,8 +424,7 @@ func Test_RegistrySynchronizer1_2_UpkeepPerformedLog(t *testing.T) {
 		2,
 		1)
 
-	require.NoError(t, synchronizer.Start(testutils.Context(t)))
-	defer func() { assert.NoError(t, synchronizer.Close()) }()
+	servicetest.Run(t, synchronizer)
 	cltest.WaitForCount(t, db, "keeper_registries", 1)
 	cltest.WaitForCount(t, db, "upkeep_registrations", 1)
 
@@ -482,8 +478,7 @@ func Test_RegistrySynchronizer1_2_UpkeepGasLimitSetLog(t *testing.T) {
 		2,
 		1)
 
-	require.NoError(t, synchronizer.Start(testutils.Context(t)))
-	defer func() { assert.NoError(t, synchronizer.Close()) }()
+	servicetest.Run(t, synchronizer)
 	cltest.WaitForCount(t, db, "keeper_registries", 1)
 	cltest.WaitForCount(t, db, "upkeep_registrations", 1)
 
@@ -535,8 +530,7 @@ func Test_RegistrySynchronizer1_2_UpkeepReceivedLog(t *testing.T) {
 		2,
 		1)
 
-	require.NoError(t, synchronizer.Start(testutils.Context(t)))
-	defer func() { assert.NoError(t, synchronizer.Close()) }()
+	servicetest.Run(t, synchronizer)
 	cltest.WaitForCount(t, db, "keeper_registries", 1)
 	cltest.WaitForCount(t, db, "upkeep_registrations", 1)
 
@@ -578,8 +572,7 @@ func Test_RegistrySynchronizer1_2_UpkeepMigratedLog(t *testing.T) {
 		2,
 		1)
 
-	require.NoError(t, synchronizer.Start(testutils.Context(t)))
-	defer func() { require.NoError(t, synchronizer.Close()) }()
+	servicetest.Run(t, synchronizer)
 	cltest.WaitForCount(t, db, "keeper_registries", 1)
 	cltest.WaitForCount(t, db, "upkeep_registrations", 3)
 
diff --git a/core/services/keeper/registry1_3_synchronizer_test.go b/core/services/keeper/registry1_3_synchronizer_test.go
index a0522fd717e..6e3be4ea785 100644
--- a/core/services/keeper/registry1_3_synchronizer_test.go
+++ b/core/services/keeper/registry1_3_synchronizer_test.go
@@ -12,19 +12,20 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
-	registry1_3 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/keeper_registry_wrapper1_3"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 
+	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	logmocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/log/mocks"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	registry1_3 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/keeper_registry_wrapper1_3"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
+	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keeper"
+	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 var registryConfig1_3 = registry1_3.Config{
@@ -242,8 +243,7 @@ func Test_RegistrySynchronizer1_3_ConfigSetLog(t *testing.T) {
 		2,
 		0)
 
-	require.NoError(t, synchronizer.Start(testutils.Context(t)))
-	defer func() { assert.NoError(t, synchronizer.Close()) }()
+	servicetest.Run(t, synchronizer)
 	cltest.WaitForCount(t, db, "keeper_registries", 1)
 	var registry keeper.Registry
 	require.NoError(t, db.Get(&registry, `SELECT * FROM keeper_registries`))
@@ -295,8 +295,7 @@ func Test_RegistrySynchronizer1_3_KeepersUpdatedLog(t *testing.T) {
 		2,
 		0)
 
-	require.NoError(t, synchronizer.Start(testutils.Context(t)))
-	defer func() { assert.NoError(t, synchronizer.Close()) }()
+	servicetest.Run(t, synchronizer)
 	cltest.WaitForCount(t, db, "keeper_registries", 1)
 	var registry keeper.Registry
 	require.NoError(t, db.Get(&registry, `SELECT * FROM keeper_registries`))
@@ -347,8 +346,7 @@ func Test_RegistrySynchronizer1_3_UpkeepCanceledLog(t *testing.T) {
 		2,
 		1)
 
-	require.NoError(t, synchronizer.Start(testutils.Context(t)))
-	defer func() { require.NoError(t, synchronizer.Close()) }()
+	servicetest.Run(t, synchronizer)
 	cltest.WaitForCount(t, db, "keeper_registries", 1)
 	cltest.WaitForCount(t, db, "upkeep_registrations", 3)
 
@@ -387,8 +385,7 @@ func Test_RegistrySynchronizer1_3_UpkeepRegisteredLog(t *testing.T) {
 		2,
 		1)
 
-	require.NoError(t, synchronizer.Start(testutils.Context(t)))
-	defer func() { assert.NoError(t, synchronizer.Close()) }()
+	servicetest.Run(t, synchronizer)
 	cltest.WaitForCount(t, db, "keeper_registries", 1)
 	cltest.WaitForCount(t, db, "upkeep_registrations", 1)
 
@@ -432,8 +429,7 @@ func Test_RegistrySynchronizer1_3_UpkeepPerformedLog(t *testing.T) {
 		2,
 		1)
 
-	require.NoError(t, synchronizer.Start(testutils.Context(t)))
-	defer func() { assert.NoError(t, synchronizer.Close()) }()
+	servicetest.Run(t, synchronizer)
 	cltest.WaitForCount(t, db, "keeper_registries", 1)
 	cltest.WaitForCount(t, db, "upkeep_registrations", 1)
 
@@ -487,8 +483,7 @@ func Test_RegistrySynchronizer1_3_UpkeepGasLimitSetLog(t *testing.T) {
 		2,
 		1)
 
-	require.NoError(t, synchronizer.Start(testutils.Context(t)))
-	defer func() { assert.NoError(t, synchronizer.Close()) }()
+	servicetest.Run(t, synchronizer)
 	cltest.WaitForCount(t, db, "keeper_registries", 1)
 	cltest.WaitForCount(t, db, "upkeep_registrations", 1)
 
@@ -540,8 +535,7 @@ func Test_RegistrySynchronizer1_3_UpkeepReceivedLog(t *testing.T) {
 		2,
 		1)
 
-	require.NoError(t, synchronizer.Start(testutils.Context(t)))
-	defer func() { assert.NoError(t, synchronizer.Close()) }()
+	servicetest.Run(t, synchronizer)
 	cltest.WaitForCount(t, db, "keeper_registries", 1)
 	cltest.WaitForCount(t, db, "upkeep_registrations", 1)
 
@@ -583,8 +577,7 @@ func Test_RegistrySynchronizer1_3_UpkeepMigratedLog(t *testing.T) {
 		2,
 		1)
 
-	require.NoError(t, synchronizer.Start(testutils.Context(t)))
-	defer func() { require.NoError(t, synchronizer.Close()) }()
+	servicetest.Run(t, synchronizer)
 	cltest.WaitForCount(t, db, "keeper_registries", 1)
 	cltest.WaitForCount(t, db, "upkeep_registrations", 3)
 
@@ -625,8 +618,7 @@ func Test_RegistrySynchronizer1_3_UpkeepPausedLog_UpkeepUnpausedLog(t *testing.T
 		2,
 		1)
 
-	require.NoError(t, synchronizer.Start(testutils.Context(t)))
-	defer func() { require.NoError(t, synchronizer.Close()) }()
+	servicetest.Run(t, synchronizer)
 	cltest.WaitForCount(t, db, "keeper_registries", 1)
 	cltest.WaitForCount(t, db, "upkeep_registrations", 3)
 
@@ -695,8 +687,7 @@ func Test_RegistrySynchronizer1_3_UpkeepCheckDataUpdatedLog(t *testing.T) {
 		2,
 		1)
 
-	require.NoError(t, synchronizer.Start(testutils.Context(t)))
-	defer func() { assert.NoError(t, synchronizer.Close()) }()
+	servicetest.Run(t, synchronizer)
 	cltest.WaitForCount(t, db, "keeper_registries", 1)
 	cltest.WaitForCount(t, db, "upkeep_registrations", 1)
 
diff --git a/core/services/keeper/registry_synchronizer_helper_test.go b/core/services/keeper/registry_synchronizer_helper_test.go
index 966366b1069..5ba60db3962 100644
--- a/core/services/keeper/registry_synchronizer_helper_test.go
+++ b/core/services/keeper/registry_synchronizer_helper_test.go
@@ -10,6 +10,8 @@ import (
 
 	"github.com/jmoiron/sqlx"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
+
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
 	logmocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/log/mocks"
@@ -21,7 +23,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keeper"
 	evmrelay "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
-	"github.com/smartcontractkit/chainlink/v2/core/services/srvctest"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -72,7 +73,7 @@ func setupRegistrySync(t *testing.T, version keeper.RegistryVersion) (
 	})).Maybe().Return(func() {})
 	lbMock.On("IsConnected").Return(true).Maybe()
 
-	mailMon := srvctest.Start(t, utils.NewMailboxMonitor(t.Name()))
+	mailMon := servicetest.Run(t, utils.NewMailboxMonitor(t.Name()))
 
 	orm := keeper.NewORM(db, logger.TestLogger(t), ch.Config().Database())
 	synchronizer := keeper.NewRegistrySynchronizer(keeper.RegistrySynchronizerOptions{
diff --git a/core/services/keeper/upkeep_executer_test.go b/core/services/keeper/upkeep_executer_test.go
index 7bbecafa22d..123b1dc0de1 100644
--- a/core/services/keeper/upkeep_executer_test.go
+++ b/core/services/keeper/upkeep_executer_test.go
@@ -15,6 +15,7 @@ import (
 
 	"github.com/jmoiron/sqlx"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
@@ -88,8 +89,7 @@ func setup(t *testing.T, estimator gas.EvmFeeEstimator, overrideFn func(c *chain
 	lggr := logger.TestLogger(t)
 	executer := keeper.NewUpkeepExecuter(job, orm, jpv2.Pr, ethClient, ch.HeadBroadcaster(), ch.GasEstimator(), lggr, ch.Config().Keeper(), job.KeeperSpec.FromAddress.Address())
 	upkeep := cltest.MustInsertUpkeepForRegistry(t, db, ch.Config().Database(), registry)
-	require.NoError(t, executer.Start(testutils.Context(t)))
-	t.Cleanup(func() { executer.Close() })
+	servicetest.Run(t, executer)
 	return db, cfg, ethClient, executer, registry, upkeep, job, jpv2, txm, keyStore, ch, orm
 }
 
diff --git a/core/services/nurse_test.go b/core/services/nurse_test.go
index 4e68501b74b..79f57d91235 100644
--- a/core/services/nurse_test.go
+++ b/core/services/nurse_test.go
@@ -128,7 +128,6 @@ func TestNurse(t *testing.T) {
 	n2, err := nrse.totalProfileBytes()
 	require.NoError(t, err)
 	require.Greater(t, n2, uint64(0))
-
 }
 
 func profileExists(t *testing.T, nrse *Nurse, typ string) bool {
diff --git a/core/services/ocr/config_overrider_test.go b/core/services/ocr/config_overrider_test.go
index 245d6348765..acd5245e19b 100644
--- a/core/services/ocr/config_overrider_test.go
+++ b/core/services/ocr/config_overrider_test.go
@@ -14,9 +14,9 @@ import (
 
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting/types"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/mocks"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr"
@@ -72,7 +72,7 @@ func TestIntegration_OCRConfigOverrider_EntersHibernation(t *testing.T) {
 		Run(checkFlagsAddress(t, uni.contractAddress)).
 		Return([]bool{true, true}, nil)
 
-	require.NoError(t, uni.overrider.Start(testutils.Context(t)))
+	servicetest.Run(t, uni.overrider)
 
 	// not hibernating initially
 	require.Nil(t, uni.overrider.ConfigOverride())
@@ -102,7 +102,7 @@ func Test_OCRConfigOverrider(t *testing.T) {
 			Run(checkFlagsAddress(t, uni.contractAddress)).
 			Return([]bool{true, true}, nil)
 
-		require.NoError(t, uni.overrider.Start(testutils.Context(t)))
+		servicetest.Run(t, uni.overrider)
 
 		// not hibernating initially
 		require.Nil(t, uni.overrider.ConfigOverride())
@@ -130,7 +130,7 @@ func Test_OCRConfigOverrider(t *testing.T) {
 			Run(checkFlagsAddress(t, uni.contractAddress)).
 			Return([]bool{true, false}, nil)
 
-		require.NoError(t, uni.overrider.Start(testutils.Context(t)))
+		servicetest.Run(t, uni.overrider)
 
 		// initially enters hibernation
 		expectedOverride := &ocrtypes.ConfigOverride{AlphaPPB: math.MaxUint64, DeltaC: uni.overrider.DeltaCFromAddress}
diff --git a/core/services/ocr/contract_tracker_test.go b/core/services/ocr/contract_tracker_test.go
index 5684219cf16..af65f330d66 100644
--- a/core/services/ocr/contract_tracker_test.go
+++ b/core/services/ocr/contract_tracker_test.go
@@ -15,6 +15,8 @@ import (
 	"github.com/smartcontractkit/libocr/gethwrappers/offchainaggregator"
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting/types"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
+
 	commonmocks "github.com/smartcontractkit/chainlink/v2/common/mocks"
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	evmconfig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config"
@@ -29,7 +31,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr"
 	ocrmocks "github.com/smartcontractkit/chainlink/v2/core/services/ocr/mocks"
-	"github.com/smartcontractkit/chainlink/v2/core/services/srvctest"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -83,7 +84,7 @@ func newContractTrackerUni(t *testing.T, opts ...interface{}) (uni contractTrack
 	uni.hb = commonmocks.NewHeadBroadcaster[*evmtypes.Head, common.Hash](t)
 	uni.ec = evmtest.NewEthClientMock(t)
 
-	mailMon := srvctest.Start(t, utils.NewMailboxMonitor(t.Name()))
+	mailMon := servicetest.Run(t, utils.NewMailboxMonitor(t.Name()))
 	db := pgtest.NewSqlxDB(t)
 	uni.tracker = ocr.NewOCRContractTracker(
 		contract,
@@ -148,13 +149,12 @@ func Test_OCRContractTracker_LatestBlockHeight(t *testing.T) {
 		uni.db.On("LoadLatestRoundRequested").Return(offchainaggregator.OffchainAggregatorRoundRequested{}, nil)
 		uni.lb.On("Register", uni.tracker, mock.Anything).Return(func() {})
 
-		require.NoError(t, uni.tracker.Start(testutils.Context(t)))
+		servicetest.Run(t, uni.tracker)
 
 		l, err := uni.tracker.LatestBlockHeight(testutils.Context(t))
 		require.NoError(t, err)
 
 		assert.Equal(t, uint64(42), l)
-		require.NoError(t, uni.tracker.Close())
 	})
 }
 
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/store_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/store_test.go
index 138b9ffd782..7108e1b64c4 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/store_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/store_test.go
@@ -14,6 +14,7 @@ import (
 
 	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
@@ -346,7 +347,7 @@ func TestUpkeepStateStore_SetSelectIntegration(t *testing.T) {
 			scanner := &mockScanner{}
 			store := NewUpkeepStateStore(orm, lggr, scanner)
 
-			require.NoError(t, store.Start(ctx))
+			servicetest.Run(t, store)
 
 			t.Cleanup(func() {
 				t.Log("cleaning up database")
@@ -379,8 +380,6 @@ func TestUpkeepStateStore_SetSelectIntegration(t *testing.T) {
 			observedLogs.TakeAll()
 
 			require.Equal(t, 0, observedLogs.Len())
-
-			require.NoError(t, store.Close())
 		})
 	}
 }
@@ -467,7 +466,7 @@ func TestUpkeepStateStore_Service(t *testing.T) {
 	store.retention = 500 * time.Millisecond
 	store.cleanCadence = 100 * time.Millisecond
 
-	assert.NoError(t, store.Start(ctx), "no error from starting service")
+	servicetest.Run(t, store)
 
 	// add a value to set up the test
 	require.NoError(t, store.SetUpkeepState(ctx, ocr2keepers.CheckResult{
@@ -493,8 +492,6 @@ func TestUpkeepStateStore_Service(t *testing.T) {
 	values, err = store.SelectByWorkIDs(ctx, "0x2")
 	require.NoError(t, err, "no error from selecting states")
 	require.Equal(t, []ocr2keepers.UpkeepState{ocr2keepers.UnknownState}, values, "selected values should match expected")
-
-	assert.NoError(t, store.Close(), "no error from closing service")
 }
 
 func createUpkeepIDForTest(v int64) ocr2keepers.UpkeepIdentifier {
diff --git a/core/services/ocrcommon/peer_wrapper_test.go b/core/services/ocrcommon/peer_wrapper_test.go
index 854ecb153ea..dbe22523728 100644
--- a/core/services/ocrcommon/peer_wrapper_test.go
+++ b/core/services/ocrcommon/peer_wrapper_test.go
@@ -9,6 +9,7 @@ import (
 	p2ppeer "github.com/libp2p/go-libp2p-core/peer"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
@@ -52,9 +53,8 @@ func Test_SingletonPeerWrapper_Start(t *testing.T) {
 		})
 		pw := ocrcommon.NewSingletonPeerWrapper(keyStore, cfg.P2P(), cfg.OCR(), cfg.Database(), db, logger.TestLogger(t))
 
-		require.NoError(t, pw.Start(testutils.Context(t)), "foo")
+		servicetest.Run(t, pw)
 		require.Equal(t, k.PeerID(), pw.PeerID)
-		require.NoError(t, pw.Close())
 	})
 
 	t.Run("with one p2p key and mismatching P2P.PeerID returns error", func(t *testing.T) {
@@ -89,9 +89,8 @@ func Test_SingletonPeerWrapper_Start(t *testing.T) {
 
 		pw := ocrcommon.NewSingletonPeerWrapper(keyStore, cfg.P2P(), cfg.OCR(), cfg.Database(), db, logger.TestLogger(t))
 
-		require.NoError(t, pw.Start(testutils.Context(t)), "foo")
+		servicetest.Run(t, pw)
 		require.Equal(t, k2.PeerID(), pw.PeerID)
-		require.NoError(t, pw.Close())
 	})
 
 	t.Run("with multiple p2p keys and mismatching P2P.PeerID returns error", func(t *testing.T) {
diff --git a/core/services/ocrcommon/run_saver_test.go b/core/services/ocrcommon/run_saver_test.go
index 73697d181bc..7bfe60f2a06 100644
--- a/core/services/ocrcommon/run_saver_test.go
+++ b/core/services/ocrcommon/run_saver_test.go
@@ -4,9 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
 
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline/mocks"
@@ -20,7 +19,7 @@ func TestRunSaver(t *testing.T) {
 		1000,
 		100,
 	)
-	require.NoError(t, rs.Start(testutils.Context(t)))
+	servicetest.Run(t, rs)
 	for i := 0; i < 100; i++ {
 		d := i
 		pipelineRunner.On("InsertFinishedRun", mock.Anything, mock.Anything, mock.Anything, mock.Anything).
@@ -31,5 +30,4 @@ func TestRunSaver(t *testing.T) {
 			Once()
 		rs.Save(&pipeline.Run{ID: int64(i)})
 	}
-	require.NoError(t, rs.Close())
 }
diff --git a/core/services/ocrcommon/telemetry.go b/core/services/ocrcommon/telemetry.go
index 18080fe22b6..5fbda456088 100644
--- a/core/services/ocrcommon/telemetry.go
+++ b/core/services/ocrcommon/telemetry.go
@@ -99,7 +99,7 @@ func (e *EnhancedTelemetryService[T]) Start(context.Context) error {
 
 func (e *EnhancedTelemetryService[T]) Close() error {
 	return e.StopOnce("EnhancedTelemetryService", func() error {
-		e.chDone <- struct{}{}
+		close(e.chDone)
 		e.lggr.Infof("Stopping enhanced telemetry service for job %d", e.job.ID)
 		return nil
 	})
diff --git a/core/services/ocrcommon/telemetry_test.go b/core/services/ocrcommon/telemetry_test.go
index ae58e89d22e..9c90eea180a 100644
--- a/core/services/ocrcommon/telemetry_test.go
+++ b/core/services/ocrcommon/telemetry_test.go
@@ -14,11 +14,11 @@ import (
 
 	"github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	"github.com/smartcontractkit/chainlink-common/pkg/types/mercury"
 	mercuryv1 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v1"
 	mercuryv2 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v2"
 
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
@@ -213,7 +213,7 @@ func TestSendEATelemetry(t *testing.T) {
 	lggr, _ := logger.TestLoggerObserved(t, zap.WarnLevel)
 	doneCh := make(chan struct{})
 	enhancedTelemService := NewEnhancedTelemetryService(&jb, enhancedTelemChan, doneCh, monitoringEndpoint, lggr.Named("Enhanced Telemetry Mercury"))
-	require.NoError(t, enhancedTelemService.Start(testutils.Context(t)))
+	servicetest.Run(t, enhancedTelemService)
 	trrs := pipeline.TaskRunResults{
 		pipeline.TaskRunResult{
 			Task: &pipeline.BridgeTask{
@@ -324,7 +324,7 @@ func TestCollectAndSend(t *testing.T) {
 	doneCh := make(chan struct{})
 
 	enhancedTelemService := NewEnhancedTelemetryService(&jb, enhancedTelemChan, doneCh, monitoringEndpoint, lggr.Named("Enhanced Telemetry"))
-	require.NoError(t, enhancedTelemService.Start(testutils.Context(t)))
+	servicetest.Run(t, enhancedTelemService)
 	finalResult := &pipeline.FinalResult{
 		Values:      []interface{}{"123456"},
 		AllErrors:   nil,
@@ -574,7 +574,7 @@ func TestCollectMercuryEnhancedTelemetryV1(t *testing.T) {
 		lggr:               lggr,
 		monitoringEndpoint: monitoringEndpoint,
 	}
-	require.NoError(t, e.Start(testutils.Context(t)))
+	servicetest.Run(t, &e)
 
 	wg.Add(1)
 
@@ -690,7 +690,7 @@ func TestCollectMercuryEnhancedTelemetryV2(t *testing.T) {
 		lggr:               lggr,
 		monitoringEndpoint: monitoringEndpoint,
 	}
-	require.NoError(t, e.Start(testutils.Context(t)))
+	servicetest.Run(t, &e)
 
 	wg.Add(1)
 
diff --git a/core/services/pg/event_broadcaster_test.go b/core/services/pg/event_broadcaster_test.go
index 41dcbb0176f..e8a4a1086db 100644
--- a/core/services/pg/event_broadcaster_test.go
+++ b/core/services/pg/event_broadcaster_test.go
@@ -9,8 +9,8 @@ import (
 	"github.com/onsi/gomega"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest/heavyweight"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 )
@@ -19,8 +19,7 @@ func TestEventBroadcaster(t *testing.T) {
 	config, _ := heavyweight.FullTestDBNoFixturesV2(t, nil)
 
 	eventBroadcaster := pg.NewEventBroadcaster(config.Database().URL(), 0, 0, logger.TestLogger(t), uuid.New())
-	require.NoError(t, eventBroadcaster.Start(testutils.Context(t)))
-	t.Cleanup(func() { require.NoError(t, eventBroadcaster.Close()) })
+	servicetest.Run(t, eventBroadcaster)
 
 	t.Run("doesn't broadcast unrelated events (no payload filter)", func(t *testing.T) {
 		sub, err := eventBroadcaster.Subscribe("foo", "")
diff --git a/core/services/promreporter/prom_reporter_test.go b/core/services/promreporter/prom_reporter_test.go
index 54e3a5d3fab..1cebba2faf9 100644
--- a/core/services/promreporter/prom_reporter_test.go
+++ b/core/services/promreporter/prom_reporter_test.go
@@ -7,10 +7,11 @@ import (
 	"time"
 
 	"github.com/jmoiron/sqlx"
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
+
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
@@ -76,8 +77,7 @@ func Test_PromReporter_OnNewLongestChain(t *testing.T) {
 			}).
 			Return()
 
-		require.NoError(t, reporter.Start(testutils.Context(t)))
-		defer func() { assert.NoError(t, reporter.Close()) }()
+		servicetest.Run(t, reporter)
 
 		head := newHead()
 		reporter.OnNewLongestChain(testutils.Context(t), &head)
@@ -107,8 +107,7 @@ func Test_PromReporter_OnNewLongestChain(t *testing.T) {
 			}).
 			Return()
 		reporter := promreporter.NewPromReporter(db.DB, newLegacyChainContainer(t, db), logger.TestLogger(t), backend, 10*time.Millisecond)
-		require.NoError(t, reporter.Start(testutils.Context(t)))
-		defer func() { assert.NoError(t, reporter.Close()) }()
+		servicetest.Run(t, reporter)
 
 		etx := cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, txStore, 0, fromAddress)
 		cltest.MustInsertUnconfirmedEthTxWithBroadcastLegacyAttempt(t, txStore, 1, fromAddress)
@@ -143,8 +142,7 @@ func Test_PromReporter_OnNewLongestChain(t *testing.T) {
 				subscribeCalls.Add(1)
 			}).
 			Return()
-		require.NoError(t, reporter.Start(testutils.Context(t)))
-		defer func() { assert.NoError(t, reporter.Close()) }()
+		servicetest.Run(t, reporter)
 
 		head := newHead()
 		reporter.OnNewLongestChain(testutils.Context(t), &head)
diff --git a/core/services/relay/evm/config_poller_test.go b/core/services/relay/evm/config_poller_test.go
index 0a433c3bc54..3409c2f1591 100644
--- a/core/services/relay/evm/config_poller_test.go
+++ b/core/services/relay/evm/config_poller_test.go
@@ -7,8 +7,6 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum"
-	"github.com/smartcontractkit/libocr/gethwrappers2/ocrconfigurationstoreevmsimple"
-
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
 	"github.com/ethereum/go-ethereum/common"
@@ -22,12 +20,14 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/libocr/gethwrappers2/ocr2aggregator"
+	"github.com/smartcontractkit/libocr/gethwrappers2/ocrconfigurationstoreevmsimple"
 	testoffchainaggregator2 "github.com/smartcontractkit/libocr/gethwrappers2/testocr2aggregator"
 	"github.com/smartcontractkit/libocr/offchainreporting2/reportingplugin/median"
 	confighelper2 "github.com/smartcontractkit/libocr/offchainreporting2plus/confighelper"
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 	ocrtypes2 "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmClientMocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
@@ -85,11 +85,9 @@ func TestConfigPoller(t *testing.T) {
 		db := pgtest.NewSqlxDB(t)
 		cfg := pgtest.NewQConfig(false)
 		ethClient = evmclient.NewSimulatedBackendClient(t, b, testutils.SimulatedChainID)
-		ctx := testutils.Context(t)
 		lorm := logpoller.NewORM(testutils.SimulatedChainID, db, lggr, cfg)
 		lp = logpoller.NewLogPoller(lorm, ethClient, lggr, 100*time.Millisecond, false, 1, 2, 2, 1000)
-		require.NoError(t, lp.Start(ctx))
-		t.Cleanup(func() { lp.Close() })
+		servicetest.Run(t, lp)
 	}
 
 	t.Run("LatestConfig errors if there is no config in logs and config store is unconfigured", func(t *testing.T) {
diff --git a/core/services/relay/evm/functions/config_poller_test.go b/core/services/relay/evm/functions/config_poller_test.go
index 085f0c6e317..a5e5c1f8058 100644
--- a/core/services/relay/evm/functions/config_poller_test.go
+++ b/core/services/relay/evm/functions/config_poller_test.go
@@ -20,8 +20,7 @@ import (
 	confighelper2 "github.com/smartcontractkit/libocr/offchainreporting2plus/confighelper"
 	ocrtypes2 "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
-	functionsConfig "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/functions/config"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/testhelpers"
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
@@ -29,6 +28,8 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	functionsConfig "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/functions/config"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/testhelpers"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/functions"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
@@ -78,11 +79,9 @@ func runTest(t *testing.T, pluginType functions.FunctionsPluginType, expectedDig
 	ethClient := evmclient.NewSimulatedBackendClient(t, b, big.NewInt(1337))
 	defer ethClient.Close()
 	lggr := logger.TestLogger(t)
-	ctx := testutils.Context(t)
 	lorm := logpoller.NewORM(big.NewInt(1337), db, lggr, cfg)
 	lp := logpoller.NewLogPoller(lorm, ethClient, lggr, 100*time.Millisecond, false, 1, 2, 2, 1000)
-	defer lp.Close()
-	require.NoError(t, lp.Start(ctx))
+	servicetest.Run(t, lp)
 	configPoller, err := functions.NewFunctionsConfigPoller(pluginType, lp, lggr)
 	require.NoError(t, err)
 	require.NoError(t, configPoller.UpdateRoutes(ocrAddress, ocrAddress))
diff --git a/core/services/relay/evm/functions/logpoller_wrapper_test.go b/core/services/relay/evm/functions/logpoller_wrapper_test.go
index 2108e822d5e..9df285b4c25 100644
--- a/core/services/relay/evm/functions/logpoller_wrapper_test.go
+++ b/core/services/relay/evm/functions/logpoller_wrapper_test.go
@@ -12,11 +12,11 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	lpmocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/functions/generated/functions_coordinator"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/functions/config"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types"
@@ -95,13 +95,12 @@ func TestLogPollerWrapper_SingleSubscriberEmptyEvents(t *testing.T) {
 	subscriber := newSubscriber(1)
 	lpWrapper.SubscribeToUpdates("mock_subscriber", subscriber)
 
-	require.NoError(t, lpWrapper.Start(testutils.Context(t)))
+	servicetest.Run(t, lpWrapper)
 	subscriber.updates.Wait()
 	reqs, resps, err := lpWrapper.LatestEvents()
 	require.NoError(t, err)
 	require.Equal(t, 0, len(reqs))
 	require.Equal(t, 0, len(resps))
-	lpWrapper.Close()
 }
 
 func TestLogPollerWrapper_ErrorOnZeroAddresses(t *testing.T) {
@@ -111,10 +110,9 @@ func TestLogPollerWrapper_ErrorOnZeroAddresses(t *testing.T) {
 
 	client.On("CallContract", mock.Anything, mock.Anything, mock.Anything).Return(addr(t, "00"), nil)
 
-	require.NoError(t, lpWrapper.Start(testutils.Context(t)))
+	servicetest.Run(t, lpWrapper)
 	_, _, err := lpWrapper.LatestEvents()
 	require.Error(t, err)
-	lpWrapper.Close()
 }
 
 func TestLogPollerWrapper_LatestEvents_ReorgHandling(t *testing.T) {
@@ -135,7 +133,7 @@ func TestLogPollerWrapper_LatestEvents_ReorgHandling(t *testing.T) {
 	// On the 3rd query, the original request log appears again
 	lp.On("Logs", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]logpoller.Log{mockedLog}, nil).Once()
 
-	require.NoError(t, lpWrapper.Start(testutils.Context(t)))
+	servicetest.Run(t, lpWrapper)
 	subscriber.updates.Wait()
 
 	oracleRequests, _, err := lpWrapper.LatestEvents()
diff --git a/core/services/relay/evm/mercury/helpers_test.go b/core/services/relay/evm/mercury/helpers_test.go
index 3a58a25a557..59e0e587813 100644
--- a/core/services/relay/evm/mercury/helpers_test.go
+++ b/core/services/relay/evm/mercury/helpers_test.go
@@ -17,6 +17,7 @@ import (
 	"github.com/smartcontractkit/libocr/offchainreporting2plus/chains/evmutil"
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/llo-feeds/generated/verifier"
@@ -167,13 +168,11 @@ func SetupTH(t *testing.T, feedID common.Hash) TestHarness {
 	cfg := pgtest.NewQConfig(false)
 	ethClient := evmclient.NewSimulatedBackendClient(t, b, big.NewInt(1337))
 	lggr := logger.TestLogger(t)
-	ctx := testutils.Context(t)
 	lorm := logpoller.NewORM(big.NewInt(1337), db, lggr, cfg)
 	lp := logpoller.NewLogPoller(lorm, ethClient, lggr, 100*time.Millisecond, false, 1, 2, 2, 1000)
 	eventBroadcaster := pgmocks.NewEventBroadcaster(t)
 	subscription := pgmocks.NewSubscription(t)
-	require.NoError(t, lp.Start(ctx))
-	t.Cleanup(func() { lp.Close() })
+	servicetest.Run(t, lp)
 
 	eventBroadcaster.On("Subscribe", "evm.insert_on_logs", "").Return(subscription, nil)
 
diff --git a/core/services/relay/evm/mercury/wsrpc/cache/cache_set_test.go b/core/services/relay/evm/mercury/wsrpc/cache/cache_set_test.go
index 4e19c7b56de..7d754b8326e 100644
--- a/core/services/relay/evm/mercury/wsrpc/cache/cache_set_test.go
+++ b/core/services/relay/evm/mercury/wsrpc/cache/cache_set_test.go
@@ -3,21 +3,19 @@ package cache
 import (
 	"testing"
 
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
+	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
+	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
 func Test_CacheSet(t *testing.T) {
 	lggr := logger.TestLogger(t)
 	cs := newCacheSet(lggr, Config{})
 	ctx := testutils.Context(t)
-	require.NoError(t, cs.Start(ctx))
-	t.Cleanup(func() {
-		assert.NoError(t, cs.Close())
-	})
+	servicetest.Run(t, cs)
 
 	t.Run("Get", func(t *testing.T) {
 		c := &mockClient{}
diff --git a/core/services/relay/evm/mercury/wsrpc/client_test.go b/core/services/relay/evm/mercury/wsrpc/client_test.go
index 9b0100a3cdd..f265d54879c 100644
--- a/core/services/relay/evm/mercury/wsrpc/client_test.go
+++ b/core/services/relay/evm/mercury/wsrpc/client_test.go
@@ -8,11 +8,12 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/csakey"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/wsrpc/cache"
-	mocks "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/wsrpc/mocks"
+	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/wsrpc/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/wsrpc/pb"
 )
 
@@ -162,7 +163,7 @@ func Test_Client_LatestReport(t *testing.T) {
 		// simulate start without dialling
 		require.NoError(t, c.StartOnce("Mock WSRPC Client", func() error { return nil }))
 		var err error
-		require.NoError(t, cacheSet.Start(ctx))
+		servicetest.Run(t, cacheSet)
 		c.cache, err = cacheSet.Get(ctx, c)
 		require.NoError(t, err)
 
@@ -200,7 +201,7 @@ func Test_Client_LatestReport(t *testing.T) {
 		// simulate start without dialling
 		require.NoError(t, c.StartOnce("Mock WSRPC Client", func() error { return nil }))
 		var err error
-		require.NoError(t, cacheSet.Start(ctx))
+		servicetest.Run(t, cacheSet)
 		c.cache, err = cacheSet.Get(ctx, c)
 		require.NoError(t, err)
 
diff --git a/core/services/srvctest/servicetest.go b/core/services/srvctest/servicetest.go
deleted file mode 100644
index ee888a46fa6..00000000000
--- a/core/services/srvctest/servicetest.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package srvctest
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-	"github.com/smartcontractkit/chainlink/v2/core/services"
-)
-
-// Start is test helper to automatically Start/Close a ServiceCtx along with a test.
-func Start[S services.ServiceCtx](tb testing.TB, s S) S {
-	require.NoError(tb, s.Start(testutils.Context(tb)))
-	tb.Cleanup(func() { assert.NoError(tb, s.Close()) })
-	return s
-}
diff --git a/core/services/synchronization/telemetry_ingress_batch_client_test.go b/core/services/synchronization/telemetry_ingress_batch_client_test.go
index 6dd9d401a80..c4f6417131d 100644
--- a/core/services/synchronization/telemetry_ingress_batch_client_test.go
+++ b/core/services/synchronization/telemetry_ingress_batch_client_test.go
@@ -9,8 +9,8 @@ import (
 	"github.com/onsi/gomega"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/csakey"
@@ -37,7 +37,7 @@ func TestTelemetryIngressBatchClient_HappyPath(t *testing.T) {
 	serverPubKeyHex := "33333333333"
 	sendInterval := time.Millisecond * 5
 	telemIngressClient := synchronization.NewTestTelemetryIngressBatchClient(t, url, serverPubKeyHex, csaKeystore, false, telemClient, sendInterval, false)
-	require.NoError(t, telemIngressClient.Start(testutils.Context(t)))
+	servicetest.Run(t, telemIngressClient)
 
 	// Create telemetry payloads for different contracts
 	telemPayload1 := synchronization.TelemPayload{
@@ -100,7 +100,4 @@ func TestTelemetryIngressBatchClient_HappyPath(t *testing.T) {
 	g.Eventually(func() []uint32 {
 		return []uint32{contractCounter1.Load(), contractCounter2.Load(), contractCounter3.Load()}
 	}).Should(gomega.Equal([]uint32{3, 2, 1}))
-
-	// Client should shut down
-	telemIngressClient.Close()
 }
diff --git a/core/services/synchronization/telemetry_ingress_client_test.go b/core/services/synchronization/telemetry_ingress_client_test.go
index 5a0cc23ecd0..55be107b977 100644
--- a/core/services/synchronization/telemetry_ingress_client_test.go
+++ b/core/services/synchronization/telemetry_ingress_client_test.go
@@ -9,8 +9,8 @@ import (
 	"github.com/onsi/gomega"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/csakey"
@@ -35,8 +35,7 @@ func TestTelemetryIngressClient_Send_HappyPath(t *testing.T) {
 	url := &url.URL{}
 	serverPubKeyHex := "33333333333"
 	telemIngressClient := synchronization.NewTestTelemetryIngressClient(t, url, serverPubKeyHex, csaKeystore, false, telemClient)
-	require.NoError(t, telemIngressClient.Start(testutils.Context(t)))
-	defer func() { assert.NoError(t, telemIngressClient.Close()) }()
+	servicetest.Run(t, telemIngressClient)
 
 	// Create the telemetry payload
 	telemetry := []byte("101010")
diff --git a/core/services/vrf/delegate_test.go b/core/services/vrf/delegate_test.go
index 3c297026004..d957e3c721e 100644
--- a/core/services/vrf/delegate_test.go
+++ b/core/services/vrf/delegate_test.go
@@ -6,7 +6,15 @@ import (
 	"testing"
 	"time"
 
+	"github.com/ethereum/go-ethereum/accounts/abi"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/jmoiron/sqlx"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+
+	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
@@ -32,7 +40,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
 	evmrelay "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/services/signatures/secp256k1"
-	"github.com/smartcontractkit/chainlink/v2/core/services/srvctest"
 	"github.com/smartcontractkit/chainlink/v2/core/services/vrf"
 	vrf_mocks "github.com/smartcontractkit/chainlink/v2/core/services/vrf/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/services/vrf/solidity_cross_tests"
@@ -40,13 +47,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/vrf/vrfcommon"
 	"github.com/smartcontractkit/chainlink/v2/core/testdata/testspecs"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
-
-	"github.com/ethereum/go-ethereum/accounts/abi"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
 )
 
 type vrfUniverse struct {
@@ -149,7 +149,7 @@ func setup(t *testing.T) (vrfUniverse, *v1.Listener, job.Job) {
 	cfg := configtest.NewTestGeneralConfig(t)
 	vuni := buildVrfUni(t, db, cfg)
 
-	mailMon := srvctest.Start(t, utils.NewMailboxMonitor(t.Name()))
+	mailMon := servicetest.Run(t, utils.NewMailboxMonitor(t.Name()))
 
 	vd := vrf.NewDelegate(
 		db,
@@ -176,8 +176,7 @@ func setup(t *testing.T) (vrfUniverse, *v1.Listener, job.Job) {
 	go func() {
 		listener.RunHeadListener(func() {})
 	}()
-	t.Cleanup(func() { listener.Stop(t) })
-	require.NoError(t, listener.Start(testutils.Context(t)))
+	servicetest.Run(t, listener)
 	return vuni, listener, jb
 }
 
@@ -674,7 +673,7 @@ func Test_VRFV2PlusServiceFailsWhenVRFOwnerProvided(t *testing.T) {
 	cfg := configtest.NewTestGeneralConfig(t)
 	vuni := buildVrfUni(t, db, cfg)
 
-	mailMon := srvctest.Start(t, utils.NewMailboxMonitor(t.Name()))
+	mailMon := servicetest.Run(t, utils.NewMailboxMonitor(t.Name()))
 
 	vd := vrf.NewDelegate(
 		db,
diff --git a/core/services/vrf/v1/listener_v1_test_helpers.go b/core/services/vrf/v1/listener_v1_test_helpers.go
index e9adde35b58..f9532bf83e6 100644
--- a/core/services/vrf/v1/listener_v1_test_helpers.go
+++ b/core/services/vrf/v1/listener_v1_test_helpers.go
@@ -3,6 +3,8 @@ package v1
 import (
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func (lsn *Listener) SetReqAdded(fn func()) {
@@ -10,7 +12,7 @@ func (lsn *Listener) SetReqAdded(fn func()) {
 }
 
 func (lsn *Listener) Stop(t *testing.T) {
-	lsn.ChStop <- struct{}{}
+	assert.NoError(t, lsn.Close())
 	select {
 	case <-lsn.WaitOnStop:
 	case <-time.After(time.Second):
diff --git a/core/web/jobs_controller_test.go b/core/web/jobs_controller_test.go
index 1ce4fd08a36..3beee88c2eb 100644
--- a/core/web/jobs_controller_test.go
+++ b/core/web/jobs_controller_test.go
@@ -380,6 +380,7 @@ func TestJobController_Create_HappyPath(t *testing.T) {
 func TestJobsController_Create_WebhookSpec(t *testing.T) {
 	app := cltest.NewApplicationEVMDisabled(t)
 	require.NoError(t, app.Start(testutils.Context(t)))
+	t.Cleanup(func() { assert.NoError(t, app.Stop()) })
 
 	_, fetchBridge := cltest.MustCreateBridge(t, app.GetSqlxDB(), cltest.BridgeOpts{}, app.GetConfig().Database())
 	_, submitBridge := cltest.MustCreateBridge(t, app.GetSqlxDB(), cltest.BridgeOpts{}, app.GetConfig().Database())

From dc1ffae7dbf04815219e9fc6bfa964253bfaa72c Mon Sep 17 00:00:00 2001
From: Jordan Krage <jmank88@gmail.com>
Date: Fri, 8 Dec 2023 08:31:34 -0600
Subject: [PATCH 101/130] bump go to 1.21.5 and misc deps (#11525)

---
 .tool-versions                          |  2 +-
 core/chains/evm/txmgr/confirmer_test.go | 18 +++---
 core/scripts/go.mod                     | 31 ++++-----
 core/scripts/go.sum                     | 83 ++++++++++++++-----------
 go.mod                                  | 33 +++++-----
 go.sum                                  | 83 ++++++++++++++-----------
 integration-tests/.tool-versions        |  2 +-
 integration-tests/go.mod                | 25 ++++----
 integration-tests/go.sum                | 79 ++++++++++++-----------
 9 files changed, 191 insertions(+), 165 deletions(-)

diff --git a/.tool-versions b/.tool-versions
index d78ce677cda..d8f0afd901d 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,4 +1,4 @@
-golang 1.21.4
+golang 1.21.5
 mockery 2.38.0
 nodejs 16.16.0
 postgres 13.3
diff --git a/core/chains/evm/txmgr/confirmer_test.go b/core/chains/evm/txmgr/confirmer_test.go
index 9d909d58344..3acbfe9800c 100644
--- a/core/chains/evm/txmgr/confirmer_test.go
+++ b/core/chains/evm/txmgr/confirmer_test.go
@@ -3006,12 +3006,14 @@ func TestEthConfirmer_ResumePendingRuns(t *testing.T) {
 	pgtest.MustExec(t, db, `DELETE FROM pipeline_runs`)
 
 	t.Run("processes eth_txes with receipt older than minConfirmations that reverted", func(t *testing.T) {
-		ch := make(chan interface{})
+		type data struct {
+			value any
+			error
+		}
+		ch := make(chan data)
 		nonce := evmtypes.Nonce(4)
-		var err error
-		ec := newEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, func(id uuid.UUID, value interface{}, thisErr error) error {
-			err = thisErr
-			ch <- value
+		ec := newEthConfirmer(t, txStore, ethClient, evmcfg, ethKeyStore, func(id uuid.UUID, value interface{}, err error) error {
+			ch <- data{value, err}
 			return nil
 		})
 
@@ -3038,11 +3040,11 @@ func TestEthConfirmer_ResumePendingRuns(t *testing.T) {
 
 		select {
 		case data := <-ch:
-			assert.Error(t, err)
+			assert.Error(t, data.error)
 
-			assert.EqualError(t, err, fmt.Sprintf("transaction %s reverted on-chain", etx.TxAttempts[0].Hash.String()))
+			assert.EqualError(t, data.error, fmt.Sprintf("transaction %s reverted on-chain", etx.TxAttempts[0].Hash.String()))
 
-			assert.Nil(t, data)
+			assert.Nil(t, data.value)
 
 		case <-testutils.AfterWaitTimeout(t):
 			t.Fatal("no value received")
diff --git a/core/scripts/go.mod b/core/scripts/go.mod
index 07d41c9d7e4..afaa65b38b7 100644
--- a/core/scripts/go.mod
+++ b/core/scripts/go.mod
@@ -49,7 +49,7 @@ require (
 	github.com/CosmWasm/wasmd v0.40.1 // indirect
 	github.com/CosmWasm/wasmvm v1.2.4 // indirect
 	github.com/DataDog/zstd v1.5.2 // indirect
-	github.com/Depado/ginprom v1.7.11 // indirect
+	github.com/Depado/ginprom v1.8.0 // indirect
 	github.com/Masterminds/semver/v3 v3.2.1 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/VictoriaMetrics/fastcache v1.10.0 // indirect
@@ -64,12 +64,13 @@ require (
 	github.com/btcsuite/btcd v0.23.4 // indirect
 	github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect
-	github.com/bytedance/sonic v1.9.1 // indirect
+	github.com/bytedance/sonic v1.10.1 // indirect
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
+	github.com/chenzhuoyu/iasm v0.9.0 // indirect
 	github.com/cockroachdb/errors v1.9.1 // indirect
 	github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
 	github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06 // indirect
@@ -112,32 +113,32 @@ require (
 	github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 // indirect
 	github.com/gedex/inflector v0.0.0-20170307190818-16278e9db813 // indirect
 	github.com/getsentry/sentry-go v0.19.0 // indirect
-	github.com/gin-contrib/cors v1.4.0 // indirect
+	github.com/gin-contrib/cors v1.5.0 // indirect
 	github.com/gin-contrib/expvar v0.0.1 // indirect
 	github.com/gin-contrib/sessions v0.0.5 // indirect
 	github.com/gin-contrib/size v0.0.0-20230212012657-e14a14094dc4 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/gin-gonic/gin v1.9.1 // indirect
-	github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
+	github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect
 	github.com/go-json-experiment/json v0.0.0-20231102232822-2e55bd4e08b0 // indirect
 	github.com/go-kit/kit v0.12.0 // indirect
 	github.com/go-kit/log v0.2.1 // indirect
-	github.com/go-ldap/ldap/v3 v3.4.5 // indirect
+	github.com/go-ldap/ldap/v3 v3.4.6 // indirect
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
 	github.com/go-logr/logr v1.3.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.14.0 // indirect
+	github.com/go-playground/validator/v10 v10.15.5 // indirect
 	github.com/go-stack/stack v1.8.1 // indirect
-	github.com/go-webauthn/webauthn v0.9.1 // indirect
-	github.com/go-webauthn/x v0.1.4 // indirect
+	github.com/go-webauthn/webauthn v0.9.4 // indirect
+	github.com/go-webauthn/x v0.1.5 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
 	github.com/gofrs/flock v0.8.1 // indirect
 	github.com/gogo/protobuf v1.3.3 // indirect
-	github.com/golang-jwt/jwt/v5 v5.1.0 // indirect
+	github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
 	github.com/golang/glog v1.1.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/mock v1.6.0 // indirect
@@ -193,7 +194,7 @@ require (
 	github.com/jpillora/backoff v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/compress v1.17.2 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
@@ -255,7 +256,7 @@ require (
 	github.com/scylladb/go-reflectx v1.0.1 // indirect
 	github.com/sethvargo/go-retry v0.2.4 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
-	github.com/shirou/gopsutil/v3 v3.23.10 // indirect
+	github.com/shirou/gopsutil/v3 v3.23.11 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect
 	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231206181640-faad3f11cfad // indirect
@@ -270,7 +271,7 @@ require (
 	github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	github.com/spf13/afero v1.9.3 // indirect
-	github.com/spf13/cast v1.5.1 // indirect
+	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/status-im/keycard-go v0.2.0 // indirect
@@ -288,7 +289,7 @@ require (
 	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/tyler-smith/go-bip39 v1.1.0 // indirect
-	github.com/ugorji/go/codec v1.2.11 // indirect
+	github.com/ugorji/go/codec v1.2.12 // indirect
 	github.com/ulule/limiter/v3 v3.11.2 // indirect
 	github.com/unrolled/secure v1.13.0 // indirect
 	github.com/valyala/fastjson v1.4.1 // indirect
@@ -330,7 +331,7 @@ require (
 	gopkg.in/guregu/null.v2 v2.1.2 // indirect
 	gopkg.in/guregu/null.v4 v4.0.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
-	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
diff --git a/core/scripts/go.sum b/core/scripts/go.sum
index 48b168459ba..2b0504ce5fa 100644
--- a/core/scripts/go.sum
+++ b/core/scripts/go.sum
@@ -81,7 +81,6 @@ github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg6
 github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8=
 github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
 github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg=
@@ -99,8 +98,8 @@ github.com/CosmWasm/wasmvm v1.2.4/go.mod h1:vW/E3h8j9xBQs9bCoijDuawKo9kCtxOaS8N8
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8=
 github.com/DataDog/zstd v1.5.2/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
-github.com/Depado/ginprom v1.7.11 h1:qOhxW/NJZkNkkG4TQrzAZklX8SUTjTfLA73zIUNIpww=
-github.com/Depado/ginprom v1.7.11/go.mod h1:49mxL3NTQwDrhpDbY4V1mAIB3us9B+b2hP1+ph+Sla8=
+github.com/Depado/ginprom v1.8.0 h1:zaaibRLNI1dMiiuj1MKzatm8qrcHzikMlCc1anqOdyo=
+github.com/Depado/ginprom v1.8.0/go.mod h1:XBaKzeNBqPF4vxJpNLincSQZeMDnZp1tIbU0FU0UKgg=
 github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0=
 github.com/GeertJohan/go.rice v1.0.0/go.mod h1:eH6gbSOAUv07dQuZVnBmoDP8mgsM1rtixis4Tib9if0=
 github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
@@ -193,8 +192,9 @@ github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZ
 github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8=
 github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
-github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s=
-github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
+github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
+github.com/bytedance/sonic v1.10.1 h1:7a1wuFXL1cMy7a3f7/VFcEtriuXQnUBhtoVfOZiaysc=
+github.com/bytedance/sonic v1.10.1/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
 github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
@@ -209,8 +209,11 @@ github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
-github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams=
 github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
+github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0=
+github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpVsBuRksnlj1mLy4AWzRNQYxauNi62uWcE3to6eA=
+github.com/chenzhuoyu/iasm v0.9.0 h1:9fhXjVzq5hUy2gkhhgHl95zG2cEAhw9OSGs8toWWAwo=
+github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/readline v1.5.1 h1:upd/6fQk4src78LMRzh5vItIt361/o4uq553V8B5sGI=
@@ -386,8 +389,8 @@ github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlK
 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
 github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
 github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
-github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
-github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
@@ -415,8 +418,8 @@ github.com/getsentry/sentry-go v0.12.0/go.mod h1:NSap0JBYWzHND8oMbyi0+XZhUalc1TB
 github.com/getsentry/sentry-go v0.19.0 h1:BcCH3CN5tXt5aML+gwmbFwVptLLQA+eT866fCO9wVOM=
 github.com/getsentry/sentry-go v0.19.0/go.mod h1:y3+lGEFEFexZtpbG1GUE2WD/f9zGyKYwpEqryTOC/nE=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/gin-contrib/cors v1.4.0 h1:oJ6gwtUl3lqV0WEIwM/LxPF1QZ5qe2lGWdY2+bz7y0g=
-github.com/gin-contrib/cors v1.4.0/go.mod h1:bs9pNM0x/UsmHPBWT2xZz9ROh8xYjYkiURUfmBoMlcs=
+github.com/gin-contrib/cors v1.5.0 h1:DgGKV7DDoOn36DFkNtbHrjoRiT5ExCe+PC9/xp7aKvk=
+github.com/gin-contrib/cors v1.5.0/go.mod h1:TvU7MAZ3EwrPLI2ztzTt3tqgvBCq+wn8WpZmfADjupI=
 github.com/gin-contrib/expvar v0.0.1 h1:IuU5ArEgihz50vG8Onrwz22kJr7Mcvgv9xSSpfU5g+w=
 github.com/gin-contrib/expvar v0.0.1/go.mod h1:8o2CznfQi1JjktORdHr2/abg3wSV6OCnXh0yGypvvVw=
 github.com/gin-contrib/sessions v0.0.5 h1:CATtfHmLMQrMNpJRgzjWXD7worTh7g7ritsQfmF+0jE=
@@ -430,8 +433,8 @@ github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/
 github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk=
 github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
 github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
-github.com/go-asn1-ber/asn1-ber v1.5.4 h1:vXT6d/FNDiELJnLb6hGNa309LMsrCoYFvpwHDF0+Y1A=
-github.com/go-asn1-ber/asn1-ber v1.5.4/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
+github.com/go-asn1-ber/asn1-ber v1.5.5 h1:MNHlNMBDgEKD4TcKr36vQN68BA00aDfjIt3/bD50WnA=
+github.com/go-asn1-ber/asn1-ber v1.5.5/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
 github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
 github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
@@ -452,8 +455,8 @@ github.com/go-kit/kit v0.12.0/go.mod h1:lHd+EkCZPIwYItmGDDRdhinkzX2A1sj+M9biaEai
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
 github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
 github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
-github.com/go-ldap/ldap/v3 v3.4.5 h1:ekEKmaDrpvR2yf5Nc/DClsGG9lAmdDixe44mLzlW5r8=
-github.com/go-ldap/ldap/v3 v3.4.5/go.mod h1:bMGIq3AGbytbaMwf8wdv5Phdxz0FWHTIYMSzyrYgnQs=
+github.com/go-ldap/ldap/v3 v3.4.6 h1:ert95MdbiG7aWo/oPYp9btL3KJlMPKnP58r09rI8T+A=
+github.com/go-ldap/ldap/v3 v3.4.6/go.mod h1:IGMQANNtxpsOzj7uUAMjpGBaOVTC4DYyIy8VsTdxmtc=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
@@ -477,8 +480,8 @@ github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
 github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos=
-github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js=
-github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
+github.com/go-playground/validator/v10 v10.15.5 h1:LEBecTWb/1j5TNY1YYG2RcOUN3R7NLylN+x8TTueE24=
+github.com/go-playground/validator/v10 v10.15.5/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
 github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
@@ -486,10 +489,10 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me
 github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw=
 github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
-github.com/go-webauthn/webauthn v0.9.1 h1:KuZjvUX9JTuFjB2n7kZhM6n76BClLUFbFM8SLKnrXpo=
-github.com/go-webauthn/webauthn v0.9.1/go.mod h1:m315kRGbUljOytw8b9FGWG9QzErjI5v02pNFCF3lwpI=
-github.com/go-webauthn/x v0.1.4 h1:sGmIFhcY70l6k7JIDfnjVBiAAFEssga5lXIUXe0GtAs=
-github.com/go-webauthn/x v0.1.4/go.mod h1:75Ug0oK6KYpANh5hDOanfDI+dvPWHk788naJVG/37H8=
+github.com/go-webauthn/webauthn v0.9.4 h1:YxvHSqgUyc5AK2pZbqkWWR55qKeDPhP8zLDr6lpIc2g=
+github.com/go-webauthn/webauthn v0.9.4/go.mod h1:LqupCtzSef38FcxzaklmOn7AykGKhAhr9xlRbdbgnTw=
+github.com/go-webauthn/x v0.1.5 h1:V2TCzDU2TGLd0kSZOXdrqDVV5JB9ILnKxA9S53CSBw0=
+github.com/go-webauthn/x v0.1.5/go.mod h1:qbzWwcFcv4rTwtCLOZd+icnr6B7oSsAGZJqlt8cukqY=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
 github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
@@ -511,8 +514,8 @@ github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keL
 github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
 github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
-github.com/golang-jwt/jwt/v5 v5.1.0 h1:UGKbA/IPjtS6zLcdB7i5TyACMgSbOTiR8qzXgw8HWQU=
-github.com/golang-jwt/jwt/v5 v5.1.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1Jw=
+github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo=
 github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
@@ -611,6 +614,7 @@ github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
 github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/enterprise-certificate-proxy v0.3.1 h1:SBWmZhjUDRorQxrN0nwzf+AHBxnbFjViHQS4P0yVpmQ=
@@ -867,8 +871,9 @@ github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/
 github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
-github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
+github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
+github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
@@ -1196,8 +1201,8 @@ github.com/sethvargo/go-retry v0.2.4 h1:T+jHEQy/zKJf5s95UkguisicE0zuF9y7+/vgz08O
 github.com/sethvargo/go-retry v0.2.4/go.mod h1:1afjQuvh7s4gflMObvjLPaWgluLLyhA1wmVZ6KLpICw=
 github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
 github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
-github.com/shirou/gopsutil/v3 v3.23.10 h1:/N42opWlYzegYaVkWejXWJpbzKv2JDy3mrgGzKsh9hM=
-github.com/shirou/gopsutil/v3 v3.23.10/go.mod h1:JIE26kpucQi+innVlAUnIEOSBhBUkirr5b44yr55+WE=
+github.com/shirou/gopsutil/v3 v3.23.11 h1:i3jP9NjCPUz7FiZKxlMnODZkdSIp2gnzfrvsu9CuWEQ=
+github.com/shirou/gopsutil/v3 v3.23.11/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM=
 github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
 github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
@@ -1252,8 +1257,8 @@ github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B
 github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk=
 github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA=
-github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48=
+github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0=
+github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
 github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI=
 github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA=
@@ -1332,8 +1337,8 @@ github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
-github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
-github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
+github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
+github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=
 github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/ulule/limiter/v3 v3.11.2 h1:P4yOrxoEMJbOTfRJR2OzjL90oflzYPPmWg+dvwN2tHA=
@@ -1492,7 +1497,7 @@ golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
-golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
+golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
 golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
 golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1592,7 +1597,7 @@ golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su
 golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
 golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -1698,7 +1703,6 @@ golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -1708,7 +1712,7 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
 golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
@@ -1716,7 +1720,8 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn
 golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
 golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1729,7 +1734,8 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -1964,8 +1970,8 @@ gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
-gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
-gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
+gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
+gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
 gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU=
 gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
@@ -2023,6 +2029,7 @@ modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
 modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
 nhooyr.io/websocket v1.8.6 h1:s+C3xAMLwGmlI31Nyn/eAehUlZPwfYZu2JXM621Q5/k=
 nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
+nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
 pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA=
 pgregory.net/rapid v0.5.5/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
diff --git a/go.mod b/go.mod
index f659881d1a0..40359ab16f7 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module github.com/smartcontractkit/chainlink/v2
 go 1.21.3
 
 require (
-	github.com/Depado/ginprom v1.7.11
+	github.com/Depado/ginprom v1.8.0
 	github.com/Masterminds/semver/v3 v3.2.1
 	github.com/Masterminds/sprig/v3 v3.2.3
 	github.com/avast/retry-go/v4 v4.5.1
@@ -17,12 +17,13 @@ require (
 	github.com/fxamacker/cbor/v2 v2.5.0
 	github.com/gagliardetto/solana-go v1.4.1-0.20220428092759-5250b4abbb27
 	github.com/getsentry/sentry-go v0.19.0
-	github.com/gin-contrib/cors v1.4.0
+	github.com/gin-contrib/cors v1.5.0
 	github.com/gin-contrib/expvar v0.0.1
 	github.com/gin-contrib/sessions v0.0.5
 	github.com/gin-contrib/size v0.0.0-20230212012657-e14a14094dc4
 	github.com/gin-gonic/gin v1.9.1
-	github.com/go-webauthn/webauthn v0.9.1
+	github.com/go-ldap/ldap/v3 v3.4.6
+	github.com/go-webauthn/webauthn v0.9.4
 	github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98
 	github.com/google/uuid v1.4.0
 	github.com/gorilla/securecookie v1.1.2
@@ -37,6 +38,7 @@ require (
 	github.com/jackc/pgconn v1.14.1
 	github.com/jackc/pgtype v1.14.0
 	github.com/jackc/pgx/v4 v4.18.1
+	github.com/jmoiron/sqlx v1.3.5
 	github.com/jpillora/backoff v1.0.0
 	github.com/kylelemons/godebug v1.1.0
 	github.com/leanovate/gopter v0.2.10-0.20210127095200-9abe2343507a
@@ -62,7 +64,7 @@ require (
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/rogpeppe/go-internal v1.11.0
 	github.com/scylladb/go-reflectx v1.0.1
-	github.com/shirou/gopsutil/v3 v3.23.10
+	github.com/shirou/gopsutil/v3 v3.23.11
 	github.com/shopspring/decimal v1.3.1
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704
 	github.com/smartcontractkit/chainlink-automation v1.0.1
@@ -77,11 +79,11 @@ require (
 	github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1
 	github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1
 	github.com/smartcontractkit/wsrpc v0.7.2
-	github.com/spf13/cast v1.5.1
+	github.com/spf13/cast v1.6.0
 	github.com/stretchr/testify v1.8.4
 	github.com/theodesp/go-heaps v0.0.0-20190520121037-88e35354fe0a
 	github.com/tidwall/gjson v1.17.0
-	github.com/ugorji/go/codec v1.2.11
+	github.com/ugorji/go/codec v1.2.12
 	github.com/ulule/limiter/v3 v3.11.2
 	github.com/umbracle/ethgo v0.1.3
 	github.com/unrolled/secure v1.13.0
@@ -102,7 +104,7 @@ require (
 	google.golang.org/protobuf v1.31.0
 	gopkg.in/guregu/null.v2 v2.1.2
 	gopkg.in/guregu/null.v4 v4.0.0
-	gopkg.in/natefinch/lumberjack.v2 v2.0.0
+	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 )
 
 require (
@@ -131,12 +133,13 @@ require (
 	github.com/blendle/zapdriver v1.3.1 // indirect
 	github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect
-	github.com/bytedance/sonic v1.9.1 // indirect
+	github.com/bytedance/sonic v1.10.1 // indirect
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
+	github.com/chenzhuoyu/iasm v0.9.0 // indirect
 	github.com/cockroachdb/errors v1.9.1 // indirect
 	github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
 	github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06 // indirect
@@ -170,26 +173,25 @@ require (
 	github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 // indirect
 	github.com/gedex/inflector v0.0.0-20170307190818-16278e9db813 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
+	github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect
 	github.com/go-json-experiment/json v0.0.0-20231102232822-2e55bd4e08b0 // indirect
 	github.com/go-kit/kit v0.12.0 // indirect
 	github.com/go-kit/log v0.2.1 // indirect
-	github.com/go-ldap/ldap/v3 v3.4.5
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
 	github.com/go-logr/logr v1.3.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.14.0 // indirect
+	github.com/go-playground/validator/v10 v10.15.5 // indirect
 	github.com/go-stack/stack v1.8.1 // indirect
-	github.com/go-webauthn/x v0.1.4 // indirect
+	github.com/go-webauthn/x v0.1.5 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
 	github.com/gofrs/flock v0.8.1 // indirect
 	github.com/gofrs/uuid v4.3.1+incompatible // indirect
 	github.com/gogo/protobuf v1.3.3 // indirect
-	github.com/golang-jwt/jwt/v5 v5.1.0 // indirect
+	github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
 	github.com/golang/glog v1.1.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
@@ -231,10 +233,9 @@ require (
 	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
 	github.com/jackpal/go-nat-pmp v1.0.2 // indirect
 	github.com/jmhodges/levigo v1.0.0 // indirect
-	github.com/jmoiron/sqlx v1.3.5
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/compress v1.17.2 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
diff --git a/go.sum b/go.sum
index d700ec724b9..11b377b11f8 100644
--- a/go.sum
+++ b/go.sum
@@ -81,7 +81,6 @@ github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg6
 github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8=
 github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
 github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg=
@@ -99,8 +98,8 @@ github.com/CosmWasm/wasmvm v1.2.4/go.mod h1:vW/E3h8j9xBQs9bCoijDuawKo9kCtxOaS8N8
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8=
 github.com/DataDog/zstd v1.5.2/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
-github.com/Depado/ginprom v1.7.11 h1:qOhxW/NJZkNkkG4TQrzAZklX8SUTjTfLA73zIUNIpww=
-github.com/Depado/ginprom v1.7.11/go.mod h1:49mxL3NTQwDrhpDbY4V1mAIB3us9B+b2hP1+ph+Sla8=
+github.com/Depado/ginprom v1.8.0 h1:zaaibRLNI1dMiiuj1MKzatm8qrcHzikMlCc1anqOdyo=
+github.com/Depado/ginprom v1.8.0/go.mod h1:XBaKzeNBqPF4vxJpNLincSQZeMDnZp1tIbU0FU0UKgg=
 github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0=
 github.com/GeertJohan/go.rice v1.0.0/go.mod h1:eH6gbSOAUv07dQuZVnBmoDP8mgsM1rtixis4Tib9if0=
 github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
@@ -192,8 +191,9 @@ github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZ
 github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8=
 github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
-github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s=
-github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
+github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
+github.com/bytedance/sonic v1.10.1 h1:7a1wuFXL1cMy7a3f7/VFcEtriuXQnUBhtoVfOZiaysc=
+github.com/bytedance/sonic v1.10.1/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
 github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
@@ -208,8 +208,11 @@ github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
-github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams=
 github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
+github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0=
+github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpVsBuRksnlj1mLy4AWzRNQYxauNi62uWcE3to6eA=
+github.com/chenzhuoyu/iasm v0.9.0 h1:9fhXjVzq5hUy2gkhhgHl95zG2cEAhw9OSGs8toWWAwo=
+github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/readline v1.5.1 h1:upd/6fQk4src78LMRzh5vItIt361/o4uq553V8B5sGI=
@@ -383,8 +386,8 @@ github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlK
 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
 github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
 github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
-github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
-github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
@@ -412,8 +415,8 @@ github.com/getsentry/sentry-go v0.12.0/go.mod h1:NSap0JBYWzHND8oMbyi0+XZhUalc1TB
 github.com/getsentry/sentry-go v0.19.0 h1:BcCH3CN5tXt5aML+gwmbFwVptLLQA+eT866fCO9wVOM=
 github.com/getsentry/sentry-go v0.19.0/go.mod h1:y3+lGEFEFexZtpbG1GUE2WD/f9zGyKYwpEqryTOC/nE=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/gin-contrib/cors v1.4.0 h1:oJ6gwtUl3lqV0WEIwM/LxPF1QZ5qe2lGWdY2+bz7y0g=
-github.com/gin-contrib/cors v1.4.0/go.mod h1:bs9pNM0x/UsmHPBWT2xZz9ROh8xYjYkiURUfmBoMlcs=
+github.com/gin-contrib/cors v1.5.0 h1:DgGKV7DDoOn36DFkNtbHrjoRiT5ExCe+PC9/xp7aKvk=
+github.com/gin-contrib/cors v1.5.0/go.mod h1:TvU7MAZ3EwrPLI2ztzTt3tqgvBCq+wn8WpZmfADjupI=
 github.com/gin-contrib/expvar v0.0.1 h1:IuU5ArEgihz50vG8Onrwz22kJr7Mcvgv9xSSpfU5g+w=
 github.com/gin-contrib/expvar v0.0.1/go.mod h1:8o2CznfQi1JjktORdHr2/abg3wSV6OCnXh0yGypvvVw=
 github.com/gin-contrib/sessions v0.0.5 h1:CATtfHmLMQrMNpJRgzjWXD7worTh7g7ritsQfmF+0jE=
@@ -427,8 +430,8 @@ github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/
 github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk=
 github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
 github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
-github.com/go-asn1-ber/asn1-ber v1.5.4 h1:vXT6d/FNDiELJnLb6hGNa309LMsrCoYFvpwHDF0+Y1A=
-github.com/go-asn1-ber/asn1-ber v1.5.4/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
+github.com/go-asn1-ber/asn1-ber v1.5.5 h1:MNHlNMBDgEKD4TcKr36vQN68BA00aDfjIt3/bD50WnA=
+github.com/go-asn1-ber/asn1-ber v1.5.5/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
 github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
 github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
@@ -449,8 +452,8 @@ github.com/go-kit/kit v0.12.0/go.mod h1:lHd+EkCZPIwYItmGDDRdhinkzX2A1sj+M9biaEai
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
 github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
 github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
-github.com/go-ldap/ldap/v3 v3.4.5 h1:ekEKmaDrpvR2yf5Nc/DClsGG9lAmdDixe44mLzlW5r8=
-github.com/go-ldap/ldap/v3 v3.4.5/go.mod h1:bMGIq3AGbytbaMwf8wdv5Phdxz0FWHTIYMSzyrYgnQs=
+github.com/go-ldap/ldap/v3 v3.4.6 h1:ert95MdbiG7aWo/oPYp9btL3KJlMPKnP58r09rI8T+A=
+github.com/go-ldap/ldap/v3 v3.4.6/go.mod h1:IGMQANNtxpsOzj7uUAMjpGBaOVTC4DYyIy8VsTdxmtc=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
@@ -474,8 +477,8 @@ github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
 github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos=
-github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js=
-github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
+github.com/go-playground/validator/v10 v10.15.5 h1:LEBecTWb/1j5TNY1YYG2RcOUN3R7NLylN+x8TTueE24=
+github.com/go-playground/validator/v10 v10.15.5/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
 github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
@@ -485,10 +488,10 @@ github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
-github.com/go-webauthn/webauthn v0.9.1 h1:KuZjvUX9JTuFjB2n7kZhM6n76BClLUFbFM8SLKnrXpo=
-github.com/go-webauthn/webauthn v0.9.1/go.mod h1:m315kRGbUljOytw8b9FGWG9QzErjI5v02pNFCF3lwpI=
-github.com/go-webauthn/x v0.1.4 h1:sGmIFhcY70l6k7JIDfnjVBiAAFEssga5lXIUXe0GtAs=
-github.com/go-webauthn/x v0.1.4/go.mod h1:75Ug0oK6KYpANh5hDOanfDI+dvPWHk788naJVG/37H8=
+github.com/go-webauthn/webauthn v0.9.4 h1:YxvHSqgUyc5AK2pZbqkWWR55qKeDPhP8zLDr6lpIc2g=
+github.com/go-webauthn/webauthn v0.9.4/go.mod h1:LqupCtzSef38FcxzaklmOn7AykGKhAhr9xlRbdbgnTw=
+github.com/go-webauthn/x v0.1.5 h1:V2TCzDU2TGLd0kSZOXdrqDVV5JB9ILnKxA9S53CSBw0=
+github.com/go-webauthn/x v0.1.5/go.mod h1:qbzWwcFcv4rTwtCLOZd+icnr6B7oSsAGZJqlt8cukqY=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
 github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
@@ -510,8 +513,8 @@ github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keL
 github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
 github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
-github.com/golang-jwt/jwt/v5 v5.1.0 h1:UGKbA/IPjtS6zLcdB7i5TyACMgSbOTiR8qzXgw8HWQU=
-github.com/golang-jwt/jwt/v5 v5.1.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1Jw=
+github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo=
 github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
@@ -610,6 +613,7 @@ github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
 github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs=
@@ -868,8 +872,9 @@ github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/
 github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
-github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
+github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
+github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
@@ -1199,8 +1204,8 @@ github.com/sethvargo/go-retry v0.2.4 h1:T+jHEQy/zKJf5s95UkguisicE0zuF9y7+/vgz08O
 github.com/sethvargo/go-retry v0.2.4/go.mod h1:1afjQuvh7s4gflMObvjLPaWgluLLyhA1wmVZ6KLpICw=
 github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
 github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
-github.com/shirou/gopsutil/v3 v3.23.10 h1:/N42opWlYzegYaVkWejXWJpbzKv2JDy3mrgGzKsh9hM=
-github.com/shirou/gopsutil/v3 v3.23.10/go.mod h1:JIE26kpucQi+innVlAUnIEOSBhBUkirr5b44yr55+WE=
+github.com/shirou/gopsutil/v3 v3.23.11 h1:i3jP9NjCPUz7FiZKxlMnODZkdSIp2gnzfrvsu9CuWEQ=
+github.com/shirou/gopsutil/v3 v3.23.11/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM=
 github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
 github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
@@ -1256,8 +1261,8 @@ github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk=
 github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA=
-github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48=
+github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0=
+github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
 github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI=
 github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA=
@@ -1336,8 +1341,8 @@ github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
-github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
-github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
+github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
+github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=
 github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/ulule/limiter/v3 v3.11.2 h1:P4yOrxoEMJbOTfRJR2OzjL90oflzYPPmWg+dvwN2tHA=
@@ -1497,7 +1502,7 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
-golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
+golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
 golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
 golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1598,7 +1603,7 @@ golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
 golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -1703,7 +1708,6 @@ golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -1714,7 +1718,7 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
 golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
@@ -1723,7 +1727,8 @@ golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9sn
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
 golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1738,7 +1743,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -1972,8 +1978,8 @@ gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
-gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
-gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
+gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
+gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
 gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU=
 gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
@@ -2029,6 +2035,7 @@ modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
 modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
 nhooyr.io/websocket v1.8.6 h1:s+C3xAMLwGmlI31Nyn/eAehUlZPwfYZu2JXM621Q5/k=
 nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
+nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
 pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA=
 pgregory.net/rapid v0.5.5/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
diff --git a/integration-tests/.tool-versions b/integration-tests/.tool-versions
index 47b73e9de11..ac6300f9797 100644
--- a/integration-tests/.tool-versions
+++ b/integration-tests/.tool-versions
@@ -1,4 +1,4 @@
-golang 1.21.4
+golang 1.21.5
 k3d 5.4.6
 kubectl 1.25.5
 nodejs 18.13.0
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index 2f32347bb4b..5b44209f9a6 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -95,7 +95,7 @@ require (
 	github.com/btcsuite/btcd v0.23.4 // indirect
 	github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect
-	github.com/bytedance/sonic v1.9.1 // indirect
+	github.com/bytedance/sonic v1.10.1 // indirect
 	github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b // indirect
 	github.com/c9s/goprocinfo v0.0.0-20210130143923-c95fcf8c64a8 // indirect
 	github.com/cdk8s-team/cdk8s-core-go/cdk8s/v2 v2.7.5 // indirect
@@ -105,7 +105,8 @@ require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/chai2010/gettext-go v1.0.2 // indirect
 	github.com/chaos-mesh/chaos-mesh/api/v1alpha1 v0.0.0-20220226050744-799408773657 // indirect
-	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
+	github.com/chenzhuoyu/iasm v0.9.0 // indirect
 	github.com/chzyer/readline v1.5.1 // indirect
 	github.com/cli/safeexec v1.0.0 // indirect
 	github.com/cockroachdb/errors v1.9.1 // indirect
@@ -165,12 +166,12 @@ require (
 	github.com/gin-contrib/sessions v0.0.5 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/gin-gonic/gin v1.9.1 // indirect
-	github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
+	github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect
 	github.com/go-errors/errors v1.4.2 // indirect
 	github.com/go-json-experiment/json v0.0.0-20231102232822-2e55bd4e08b0 // indirect
 	github.com/go-kit/kit v0.12.0 // indirect
 	github.com/go-kit/log v0.2.1 // indirect
-	github.com/go-ldap/ldap/v3 v3.4.5 // indirect
+	github.com/go-ldap/ldap/v3 v3.4.6 // indirect
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
 	github.com/go-logr/logr v1.3.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
@@ -186,17 +187,17 @@ require (
 	github.com/go-openapi/validate v0.22.1 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.14.0 // indirect
+	github.com/go-playground/validator/v10 v10.15.5 // indirect
 	github.com/go-stack/stack v1.8.1 // indirect
-	github.com/go-webauthn/webauthn v0.9.1 // indirect
-	github.com/go-webauthn/x v0.1.4 // indirect
+	github.com/go-webauthn/webauthn v0.9.4 // indirect
+	github.com/go-webauthn/x v0.1.5 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
 	github.com/gofrs/flock v0.8.1 // indirect
 	github.com/gogo/googleapis v1.4.1 // indirect
 	github.com/gogo/protobuf v1.3.3 // indirect
 	github.com/gogo/status v1.1.1 // indirect
-	github.com/golang-jwt/jwt/v5 v5.1.0 // indirect
+	github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
 	github.com/golang/glog v1.1.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
@@ -356,7 +357,7 @@ require (
 	github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
 	github.com/sercand/kuberesolver/v5 v5.1.1 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
-	github.com/shirou/gopsutil/v3 v3.23.10 // indirect
+	github.com/shirou/gopsutil/v3 v3.23.11 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
@@ -372,7 +373,7 @@ require (
 	github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	github.com/spf13/afero v1.9.5 // indirect
-	github.com/spf13/cast v1.5.1 // indirect
+	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/spf13/viper v1.15.0 // indirect
@@ -394,7 +395,7 @@ require (
 	github.com/tyler-smith/go-bip39 v1.1.0 // indirect
 	github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
 	github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
-	github.com/ugorji/go/codec v1.2.11 // indirect
+	github.com/ugorji/go/codec v1.2.12 // indirect
 	github.com/umbracle/fastrlp v0.0.0-20220527094140-59d5dd30e722 // indirect
 	github.com/valyala/fastjson v1.4.1 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
@@ -446,7 +447,7 @@ require (
 	gopkg.in/guregu/null.v2 v2.1.2 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
-	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index 08d02446d1d..0e29f6f6715 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -99,8 +99,6 @@ github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzS
 github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1 h1:WpB/QDNLpMw72xHJc34BNNykqSOeEJDAWkhf0u12/Jk=
 github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak=
-github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg=
 github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4=
@@ -113,8 +111,8 @@ github.com/CosmWasm/wasmvm v1.2.4/go.mod h1:vW/E3h8j9xBQs9bCoijDuawKo9kCtxOaS8N8
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8=
 github.com/DataDog/zstd v1.5.2/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
-github.com/Depado/ginprom v1.7.11 h1:qOhxW/NJZkNkkG4TQrzAZklX8SUTjTfLA73zIUNIpww=
-github.com/Depado/ginprom v1.7.11/go.mod h1:49mxL3NTQwDrhpDbY4V1mAIB3us9B+b2hP1+ph+Sla8=
+github.com/Depado/ginprom v1.8.0 h1:zaaibRLNI1dMiiuj1MKzatm8qrcHzikMlCc1anqOdyo=
+github.com/Depado/ginprom v1.8.0/go.mod h1:XBaKzeNBqPF4vxJpNLincSQZeMDnZp1tIbU0FU0UKgg=
 github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0=
 github.com/GeertJohan/go.rice v1.0.0/go.mod h1:eH6gbSOAUv07dQuZVnBmoDP8mgsM1rtixis4Tib9if0=
 github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM=
@@ -229,8 +227,9 @@ github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx2
 github.com/bxcodec/faker v2.0.1+incompatible h1:P0KUpUw5w6WJXwrPfv35oc91i4d8nf40Nwln+M/+faA=
 github.com/bxcodec/faker v2.0.1+incompatible/go.mod h1:BNzfpVdTwnFJ6GtfYTcQu6l6rHShT+veBxNCnjCx5XM=
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
-github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s=
-github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
+github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
+github.com/bytedance/sonic v1.10.1 h1:7a1wuFXL1cMy7a3f7/VFcEtriuXQnUBhtoVfOZiaysc=
+github.com/bytedance/sonic v1.10.1/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
 github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b h1:6+ZFm0flnudZzdSE0JxlhR2hKnGPcNB35BjQf4RYQDY=
 github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M=
 github.com/c9s/goprocinfo v0.0.0-20210130143923-c95fcf8c64a8 h1:SjZ2GvvOononHOpK84APFuMvxqsk3tEIaKH/z4Rpu3g=
@@ -255,8 +254,11 @@ github.com/chai2010/gettext-go v1.0.2/go.mod h1:y+wnP2cHYaVj19NZhYKAwEMH2CI1gNHe
 github.com/chaos-mesh/chaos-mesh/api/v1alpha1 v0.0.0-20220226050744-799408773657 h1:CyuI+igIjadM/GRnE2o0q+WCwipDh0n2cUYFPAvxziM=
 github.com/chaos-mesh/chaos-mesh/api/v1alpha1 v0.0.0-20220226050744-799408773657/go.mod h1:JRiumF+RFsH1mrrP8FUsi9tExPylKkO/oSRWeQEUdLE=
 github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
-github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams=
 github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
+github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0=
+github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpVsBuRksnlj1mLy4AWzRNQYxauNi62uWcE3to6eA=
+github.com/chenzhuoyu/iasm v0.9.0 h1:9fhXjVzq5hUy2gkhhgHl95zG2cEAhw9OSGs8toWWAwo=
+github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/logex v1.2.1 h1:XHDu3E6q+gdHgsdTPH6ImJMIp436vR6MPtH8gP05QzM=
 github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ=
@@ -471,8 +473,8 @@ github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+
 github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0=
 github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
 github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
-github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
-github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
@@ -502,8 +504,8 @@ github.com/getsentry/sentry-go v0.12.0/go.mod h1:NSap0JBYWzHND8oMbyi0+XZhUalc1TB
 github.com/getsentry/sentry-go v0.19.0 h1:BcCH3CN5tXt5aML+gwmbFwVptLLQA+eT866fCO9wVOM=
 github.com/getsentry/sentry-go v0.19.0/go.mod h1:y3+lGEFEFexZtpbG1GUE2WD/f9zGyKYwpEqryTOC/nE=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/gin-contrib/cors v1.4.0 h1:oJ6gwtUl3lqV0WEIwM/LxPF1QZ5qe2lGWdY2+bz7y0g=
-github.com/gin-contrib/cors v1.4.0/go.mod h1:bs9pNM0x/UsmHPBWT2xZz9ROh8xYjYkiURUfmBoMlcs=
+github.com/gin-contrib/cors v1.5.0 h1:DgGKV7DDoOn36DFkNtbHrjoRiT5ExCe+PC9/xp7aKvk=
+github.com/gin-contrib/cors v1.5.0/go.mod h1:TvU7MAZ3EwrPLI2ztzTt3tqgvBCq+wn8WpZmfADjupI=
 github.com/gin-contrib/expvar v0.0.1 h1:IuU5ArEgihz50vG8Onrwz22kJr7Mcvgv9xSSpfU5g+w=
 github.com/gin-contrib/expvar v0.0.1/go.mod h1:8o2CznfQi1JjktORdHr2/abg3wSV6OCnXh0yGypvvVw=
 github.com/gin-contrib/sessions v0.0.5 h1:CATtfHmLMQrMNpJRgzjWXD7worTh7g7ritsQfmF+0jE=
@@ -517,8 +519,8 @@ github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/
 github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
 github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
-github.com/go-asn1-ber/asn1-ber v1.5.4 h1:vXT6d/FNDiELJnLb6hGNa309LMsrCoYFvpwHDF0+Y1A=
-github.com/go-asn1-ber/asn1-ber v1.5.4/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
+github.com/go-asn1-ber/asn1-ber v1.5.5 h1:MNHlNMBDgEKD4TcKr36vQN68BA00aDfjIt3/bD50WnA=
+github.com/go-asn1-ber/asn1-ber v1.5.5/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
 github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
 github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
@@ -534,8 +536,8 @@ github.com/go-kit/kit v0.12.0 h1:e4o3o3IsBfAKQh5Qbbiqyfu97Ku7jrO/JbohvztANh4=
 github.com/go-kit/kit v0.12.0/go.mod h1:lHd+EkCZPIwYItmGDDRdhinkzX2A1sj+M9biaEaizzs=
 github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
 github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
-github.com/go-ldap/ldap/v3 v3.4.5 h1:ekEKmaDrpvR2yf5Nc/DClsGG9lAmdDixe44mLzlW5r8=
-github.com/go-ldap/ldap/v3 v3.4.5/go.mod h1:bMGIq3AGbytbaMwf8wdv5Phdxz0FWHTIYMSzyrYgnQs=
+github.com/go-ldap/ldap/v3 v3.4.6 h1:ert95MdbiG7aWo/oPYp9btL3KJlMPKnP58r09rI8T+A=
+github.com/go-ldap/ldap/v3 v3.4.6/go.mod h1:IGMQANNtxpsOzj7uUAMjpGBaOVTC4DYyIy8VsTdxmtc=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
@@ -599,8 +601,8 @@ github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
 github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
-github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js=
-github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
+github.com/go-playground/validator/v10 v10.15.5 h1:LEBecTWb/1j5TNY1YYG2RcOUN3R7NLylN+x8TTueE24=
+github.com/go-playground/validator/v10 v10.15.5/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
 github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPrFY=
 github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I=
 github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
@@ -613,10 +615,10 @@ github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEe
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 github.com/go-test/deep v1.0.4 h1:u2CU3YKy9I2pmu9pX0eq50wCgjfGIt539SqR7FbHiho=
 github.com/go-test/deep v1.0.4/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
-github.com/go-webauthn/webauthn v0.9.1 h1:KuZjvUX9JTuFjB2n7kZhM6n76BClLUFbFM8SLKnrXpo=
-github.com/go-webauthn/webauthn v0.9.1/go.mod h1:m315kRGbUljOytw8b9FGWG9QzErjI5v02pNFCF3lwpI=
-github.com/go-webauthn/x v0.1.4 h1:sGmIFhcY70l6k7JIDfnjVBiAAFEssga5lXIUXe0GtAs=
-github.com/go-webauthn/x v0.1.4/go.mod h1:75Ug0oK6KYpANh5hDOanfDI+dvPWHk788naJVG/37H8=
+github.com/go-webauthn/webauthn v0.9.4 h1:YxvHSqgUyc5AK2pZbqkWWR55qKeDPhP8zLDr6lpIc2g=
+github.com/go-webauthn/webauthn v0.9.4/go.mod h1:LqupCtzSef38FcxzaklmOn7AykGKhAhr9xlRbdbgnTw=
+github.com/go-webauthn/x v0.1.5 h1:V2TCzDU2TGLd0kSZOXdrqDVV5JB9ILnKxA9S53CSBw0=
+github.com/go-webauthn/x v0.1.5/go.mod h1:qbzWwcFcv4rTwtCLOZd+icnr6B7oSsAGZJqlt8cukqY=
 github.com/go-zookeeper/zk v1.0.3 h1:7M2kwOsc//9VeeFiPtf+uSJlVpU66x9Ba5+8XK7/TDg=
 github.com/go-zookeeper/zk v1.0.3/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
 github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0=
@@ -672,8 +674,8 @@ github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keL
 github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
 github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
-github.com/golang-jwt/jwt/v5 v5.1.0 h1:UGKbA/IPjtS6zLcdB7i5TyACMgSbOTiR8qzXgw8HWQU=
-github.com/golang-jwt/jwt/v5 v5.1.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1Jw=
+github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo=
 github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
@@ -778,6 +780,7 @@ github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
 github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/enterprise-certificate-proxy v0.3.1 h1:SBWmZhjUDRorQxrN0nwzf+AHBxnbFjViHQS4P0yVpmQ=
@@ -1084,6 +1087,7 @@ github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgo
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
 github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
 github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b h1:udzkj9S/zlT5X367kqJis0QP7YMxobob6zhzq6Yre00=
 github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b/go.mod h1:pcaDhQK0/NJZEvtCO0qQPPropqV0sJOJ6YW7X+9kRwM=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -1492,8 +1496,8 @@ github.com/sethvargo/go-retry v0.2.4 h1:T+jHEQy/zKJf5s95UkguisicE0zuF9y7+/vgz08O
 github.com/sethvargo/go-retry v0.2.4/go.mod h1:1afjQuvh7s4gflMObvjLPaWgluLLyhA1wmVZ6KLpICw=
 github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
 github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
-github.com/shirou/gopsutil/v3 v3.23.10 h1:/N42opWlYzegYaVkWejXWJpbzKv2JDy3mrgGzKsh9hM=
-github.com/shirou/gopsutil/v3 v3.23.10/go.mod h1:JIE26kpucQi+innVlAUnIEOSBhBUkirr5b44yr55+WE=
+github.com/shirou/gopsutil/v3 v3.23.11 h1:i3jP9NjCPUz7FiZKxlMnODZkdSIp2gnzfrvsu9CuWEQ=
+github.com/shirou/gopsutil/v3 v3.23.11/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM=
 github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
 github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
 github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
@@ -1560,8 +1564,8 @@ github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B
 github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM=
 github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA=
-github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48=
+github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0=
+github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
 github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI=
@@ -1647,8 +1651,8 @@ github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGr
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
-github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
+github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
+github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=
 github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/ulule/limiter/v3 v3.11.2 h1:P4yOrxoEMJbOTfRJR2OzjL90oflzYPPmWg+dvwN2tHA=
@@ -1833,7 +1837,7 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
-golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
+golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
 golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
 golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1942,7 +1946,7 @@ golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
 golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -2074,7 +2078,7 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
 golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
@@ -2083,7 +2087,8 @@ golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9sn
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
 golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -2098,7 +2103,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -2345,8 +2351,8 @@ gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
-gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
-gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
+gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
+gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
 gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU=
 gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
@@ -2402,6 +2408,7 @@ k8s.io/utils v0.0.0-20230711102312-30195339c3c7 h1:ZgnF1KZsYxWIifwSNZFZgNtWE89WI
 k8s.io/utils v0.0.0-20230711102312-30195339c3c7/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g=
 nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
+nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
 pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA=
 pgregory.net/rapid v0.5.5/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=

From f70b59604858565e15049abc6b6a81e4f9bcf295 Mon Sep 17 00:00:00 2001
From: Jordan Krage <jmank88@gmail.com>
Date: Fri, 8 Dec 2023 08:43:33 -0600
Subject: [PATCH 102/130] core/scripts/common: rm ava-labs/coreth; lint
 (#11451)

---
 .github/workflows/ci-chaincli.yml             |   4 -
 .../command/keeper/verifiable_load.go         |   2 +-
 core/scripts/chaincli/handler/debug.go        |  17 --
 core/scripts/chaincli/handler/keeper.go       |  12 +-
 .../scripts/chaincli/handler/keeper_launch.go |   2 +-
 .../handler/keeper_verifiable_load.go         |  10 +-
 .../handler/mercury_lookup_handler.go         |   2 +
 core/scripts/chaincli/handler/report.go       |  15 +-
 .../chaincli/handler/scrape_node_config.go    |   2 +-
 core/scripts/common/avalanche.go              | 265 ++++++++++++++++++
 core/scripts/common/helpers.go                |  20 +-
 core/scripts/go.mod                           |   7 +-
 core/scripts/go.sum                           |  18 +-
 13 files changed, 292 insertions(+), 84 deletions(-)
 create mode 100644 core/scripts/common/avalanche.go

diff --git a/.github/workflows/ci-chaincli.yml b/.github/workflows/ci-chaincli.yml
index fd58d08005c..8a9ab03d766 100644
--- a/.github/workflows/ci-chaincli.yml
+++ b/.github/workflows/ci-chaincli.yml
@@ -2,11 +2,7 @@ name: chaincli CI
 
 on:
   push:
-    paths:
-      - "core/scripts/chaincli/**"
   pull_request:
-    paths:
-      - "core/scripts/chaincli/**"
 
 jobs:
   golangci:
diff --git a/core/scripts/chaincli/command/keeper/verifiable_load.go b/core/scripts/chaincli/command/keeper/verifiable_load.go
index 33acf9bf3b2..ce0acddfbdb 100644
--- a/core/scripts/chaincli/command/keeper/verifiable_load.go
+++ b/core/scripts/chaincli/command/keeper/verifiable_load.go
@@ -21,7 +21,7 @@ var verifiableLoad = &cobra.Command{
 		if err != nil {
 			log.Fatal("failed to get verify flag: ", err)
 		}
-		hdlr.GetVerifiableLoadStats(cmd.Context(), csv)
+		hdlr.PrintVerifiableLoadStats(cmd.Context(), csv)
 	},
 }
 
diff --git a/core/scripts/chaincli/handler/debug.go b/core/scripts/chaincli/handler/debug.go
index fec8c6cd414..5947337b187 100644
--- a/core/scripts/chaincli/handler/debug.go
+++ b/core/scripts/chaincli/handler/debug.go
@@ -18,7 +18,6 @@ import (
 	gethcommon "github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethclient"
 
 	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"
 
@@ -317,22 +316,6 @@ func (k *Keeper) Debug(ctx context.Context, args []string) {
 	}
 }
 
-type blockSubscriber struct {
-	ethClient *ethclient.Client
-}
-
-func (bs *blockSubscriber) LatestBlock() *ocr2keepers.BlockKey {
-	header, err := bs.ethClient.HeaderByNumber(context.Background(), nil)
-	if err != nil {
-		return nil
-	}
-
-	return &ocr2keepers.BlockKey{
-		Number: ocr2keepers.BlockNumber(header.Number.Uint64()),
-		Hash:   header.Hash(),
-	}
-}
-
 func logMatchesTriggerConfig(log *types.Log, config automation_utils_2_1.LogTriggerConfig) bool {
 	if log.Topics[0] != config.Topic0 {
 		return false
diff --git a/core/scripts/chaincli/handler/keeper.go b/core/scripts/chaincli/handler/keeper.go
index 439532430ab..ad8bd93649c 100644
--- a/core/scripts/chaincli/handler/keeper.go
+++ b/core/scripts/chaincli/handler/keeper.go
@@ -435,9 +435,8 @@ func (k *Keeper) getRegistry20(ctx context.Context) (common.Address, *registry20
 	}
 	if k.cfg.RegistryConfigUpdate {
 		panic("KeeperRegistry2.0 could not be updated")
-	} else {
-		log.Println("KeeperRegistry2.0 config not updated: KEEPER_CONFIG_UPDATE=false")
 	}
+	log.Println("KeeperRegistry2.0 config not updated: KEEPER_CONFIG_UPDATE=false")
 	return registryAddr, keeperRegistry20
 }
 
@@ -453,9 +452,8 @@ func (k *Keeper) getRegistry21(ctx context.Context) (common.Address, *iregistry2
 	}
 	if k.cfg.RegistryConfigUpdate {
 		panic("KeeperRegistry2.1 could not be updated")
-	} else {
-		log.Println("KeeperRegistry2.1 config not updated: KEEPER_CONFIG_UPDATE=false")
 	}
+	log.Println("KeeperRegistry2.1 config not updated: KEEPER_CONFIG_UPDATE=false")
 	return registryAddr, keeperRegistry21
 }
 
@@ -479,9 +477,8 @@ func (k *Keeper) getRegistry12(ctx context.Context) (common.Address, *registry12
 			log.Fatalf("KeeperRegistry config update failed on registry address: %s, error is: %s", k.cfg.RegistryAddress, err.Error())
 		}
 		log.Println("KeeperRegistry config update:", k.cfg.RegistryAddress, "-", helpers.ExplorerLink(k.cfg.ChainID, transaction.Hash()))
-	} else {
-		log.Println("KeeperRegistry config not updated: KEEPER_CONFIG_UPDATE=false")
 	}
+	log.Println("KeeperRegistry config not updated: KEEPER_CONFIG_UPDATE=false")
 	return registryAddr, keeperRegistry12
 }
 
@@ -513,9 +510,8 @@ func (k *Keeper) getRegistry11(ctx context.Context) (common.Address, *registry11
 			log.Fatalf("KeeperRegistry config update failed on registry address: %s, error is %s", k.cfg.RegistryAddress, err.Error())
 		}
 		log.Println("KeeperRegistry config update:", k.cfg.RegistryAddress, "-", helpers.ExplorerLink(k.cfg.ChainID, transaction.Hash()))
-	} else {
-		log.Println("KeeperRegistry config not updated: KEEPER_CONFIG_UPDATE=false")
 	}
+	log.Println("KeeperRegistry config not updated: KEEPER_CONFIG_UPDATE=false")
 	return registryAddr, keeperRegistry11
 }
 
diff --git a/core/scripts/chaincli/handler/keeper_launch.go b/core/scripts/chaincli/handler/keeper_launch.go
index 83ee6a77129..22b67763945 100644
--- a/core/scripts/chaincli/handler/keeper_launch.go
+++ b/core/scripts/chaincli/handler/keeper_launch.go
@@ -371,7 +371,7 @@ func (k *Keeper) createOCR2KeeperJob(client cmd.HTTPClient, contractAddr, nodeAd
 	}
 
 	// Correctly assign contract version in OCR job spec.
-	var contractVersion string = "v2.0"
+	contractVersion := "v2.0"
 	if k.cfg.RegistryVersion == keeper.RegistryVersion_2_1 {
 		contractVersion = "v2.1"
 	}
diff --git a/core/scripts/chaincli/handler/keeper_verifiable_load.go b/core/scripts/chaincli/handler/keeper_verifiable_load.go
index b71a9af3387..aa62d820101 100644
--- a/core/scripts/chaincli/handler/keeper_verifiable_load.go
+++ b/core/scripts/chaincli/handler/keeper_verifiable_load.go
@@ -58,7 +58,7 @@ type upkeepStats struct {
 	SortedAllDelays []float64
 }
 
-func (k *Keeper) GetVerifiableLoadStats(ctx context.Context, csv bool) {
+func (k *Keeper) PrintVerifiableLoadStats(ctx context.Context, csv bool) {
 	var v verifiableLoad
 	var err error
 	addr := common.HexToAddress(k.cfg.VerifiableLoadContractAddress)
@@ -99,7 +99,7 @@ func (k *Keeper) GetVerifiableLoadStats(ctx context.Context, csv bool) {
 	// create a number of workers to process the upkeep ids in batch
 	for i := 0; i < workerNum; i++ {
 		wg.Add(1)
-		go k.getUpkeepInfo(idChan, resultsChan, v, opts, &wg, csv)
+		go k.fetchUpkeepInfo(idChan, resultsChan, v, opts, &wg, csv)
 	}
 
 	for _, id := range upkeepIds {
@@ -134,7 +134,7 @@ func (k *Keeper) GetVerifiableLoadStats(ctx context.Context, csv bool) {
 	log.Printf("All STATS ABOVE ARE CALCULATED AT BLOCK %d", blockNum)
 }
 
-func (k *Keeper) getUpkeepInfo(idChan chan *big.Int, resultsChan chan *upkeepInfo, v verifiableLoad, opts *bind.CallOpts, wg *sync.WaitGroup, csv bool) {
+func (k *Keeper) fetchUpkeepInfo(idChan chan *big.Int, resultsChan chan *upkeepInfo, v verifiableLoad, opts *bind.CallOpts, wg *sync.WaitGroup, csv bool) {
 	defer wg.Done()
 
 	for id := range idChan {
@@ -161,7 +161,7 @@ func (k *Keeper) getUpkeepInfo(idChan chan *big.Int, resultsChan chan *upkeepInf
 		var wg1 sync.WaitGroup
 		for i := uint16(0); i <= b; i++ {
 			wg1.Add(1)
-			go k.getBucketData(v, opts, id, i, &wg1, info)
+			go k.fetchBucketData(v, opts, id, i, &wg1, info)
 		}
 		wg1.Wait()
 
@@ -196,7 +196,7 @@ func (k *Keeper) getUpkeepInfo(idChan chan *big.Int, resultsChan chan *upkeepInf
 	}
 }
 
-func (k *Keeper) getBucketData(v verifiableLoad, opts *bind.CallOpts, id *big.Int, bucketNum uint16, wg *sync.WaitGroup, info *upkeepInfo) {
+func (k *Keeper) fetchBucketData(v verifiableLoad, opts *bind.CallOpts, id *big.Int, bucketNum uint16, wg *sync.WaitGroup, info *upkeepInfo) {
 	defer wg.Done()
 
 	var bucketDelays []*big.Int
diff --git a/core/scripts/chaincli/handler/mercury_lookup_handler.go b/core/scripts/chaincli/handler/mercury_lookup_handler.go
index 1bd4b2e183c..1165d83921d 100644
--- a/core/scripts/chaincli/handler/mercury_lookup_handler.go
+++ b/core/scripts/chaincli/handler/mercury_lookup_handler.go
@@ -218,6 +218,7 @@ func (mlh *MercuryLookupHandler) singleFeedRequest(ctx context.Context, ch chan<
 			defer func(Body io.ReadCloser) {
 				err := Body.Close()
 				if err != nil {
+					_ = "" // placate linter
 					// mlh.logger.Errorf("Encountered error when closing the body of the response in single feed: %s", err)
 				}
 			}(resp.Body)
@@ -326,6 +327,7 @@ func (mlh *MercuryLookupHandler) multiFeedsRequest(ctx context.Context, ch chan<
 			defer func(Body io.ReadCloser) {
 				err := Body.Close()
 				if err != nil {
+					_ = "" // placate linter
 					// mlh.logger.Errorf("Encountered error when closing the body of the response in the multi feed: %s", err)
 				}
 			}(resp.Body)
diff --git a/core/scripts/chaincli/handler/report.go b/core/scripts/chaincli/handler/report.go
index 622963f1ac0..10970b5f03b 100644
--- a/core/scripts/chaincli/handler/report.go
+++ b/core/scripts/chaincli/handler/report.go
@@ -235,15 +235,12 @@ func (t *OCR2Transaction) BlockNumber() (uint64, error) {
 			block, err := hexutil.DecodeUint64(blStr)
 			if err != nil {
 				return 0, fmt.Errorf("failed to parse block number: %s", err)
-			} else {
-				return block, nil
 			}
-		} else {
-			return 0, fmt.Errorf("not a string")
+			return block, nil
 		}
-	} else {
-		return 0, fmt.Errorf("not found")
+		return 0, fmt.Errorf("not a string")
 	}
+	return 0, fmt.Errorf("not found")
 }
 
 func (t *OCR2Transaction) To() *common.Address {
@@ -335,17 +332,15 @@ func (t *OCR2TransmitTx) SetStaticValues(elem *OCR2ReportDataElem) {
 	if err != nil {
 		elem.Err = err.Error()
 		return
-	} else {
-		elem.From = from.String()
 	}
+	elem.From = from.String()
 
 	block, err := t.BlockNumber()
 	if err != nil {
 		elem.Err = err.Error()
 		return
-	} else {
-		elem.BlockNumber = fmt.Sprintf("%d", block)
 	}
+	elem.BlockNumber = fmt.Sprintf("%d", block)
 
 	upkeeps, err := t.UpkeepsInTransmit()
 	if err != nil {
diff --git a/core/scripts/chaincli/handler/scrape_node_config.go b/core/scripts/chaincli/handler/scrape_node_config.go
index f00beb4b4fe..aaaf5d26477 100644
--- a/core/scripts/chaincli/handler/scrape_node_config.go
+++ b/core/scripts/chaincli/handler/scrape_node_config.go
@@ -279,5 +279,5 @@ func writeJSON(data interface{}, path string) error {
 		return err
 	}
 
-	return os.WriteFile(path, dataBytes, 0644)
+	return os.WriteFile(path, dataBytes, 0644) //nolint:gosec
 }
diff --git a/core/scripts/common/avalanche.go b/core/scripts/common/avalanche.go
new file mode 100644
index 00000000000..c9c53779905
--- /dev/null
+++ b/core/scripts/common/avalanche.go
@@ -0,0 +1,265 @@
+package common
+
+import (
+	"encoding/binary"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/rlp"
+)
+
+const (
+	// BloomByteLength represents the number of bytes used in a header log bloom.
+	BloomByteLength = 256
+
+	// BloomBitLength represents the number of bits used in a header log bloom.
+	BloomBitLength = 8 * BloomByteLength
+)
+
+// AvaBloom represents a 2048 bit bloom filter.
+type AvaBloom [BloomByteLength]byte
+
+// SetBytes sets the content of b to the given bytes.
+// It panics if d is not of suitable size.
+func (b *AvaBloom) SetBytes(d []byte) {
+	if len(b) < len(d) {
+		panic(fmt.Sprintf("bloom bytes too big %d %d", len(b), len(d)))
+	}
+	copy(b[BloomByteLength-len(d):], d)
+}
+
+// Add adds d to the filter. Future calls of Test(d) will return true.
+func (b *AvaBloom) Add(d []byte) {
+	b.add(d, make([]byte, 6))
+}
+
+// add is internal version of Add, which takes a scratch buffer for reuse (needs to be at least 6 bytes)
+func (b *AvaBloom) add(d []byte, buf []byte) {
+	i1, v1, i2, v2, i3, v3 := bloomValues(d, buf)
+	b[i1] |= v1
+	b[i2] |= v2
+	b[i3] |= v3
+}
+
+// Big converts b to a big integer.
+// Note: Converting a bloom filter to a big.Int and then calling GetBytes
+// does not return the same bytes, since big.Int will trim leading zeroes
+func (b AvaBloom) Big() *big.Int {
+	return new(big.Int).SetBytes(b[:])
+}
+
+// Bytes returns the backing byte slice of the bloom
+func (b AvaBloom) Bytes() []byte {
+	return b[:]
+}
+
+// Test checks if the given topic is present in the bloom filter
+func (b AvaBloom) Test(topic []byte) bool {
+	i1, v1, i2, v2, i3, v3 := bloomValues(topic, make([]byte, 6))
+	return v1 == v1&b[i1] &&
+		v2 == v2&b[i2] &&
+		v3 == v3&b[i3]
+}
+
+// MarshalText encodes b as a hex string with 0x prefix.
+func (b AvaBloom) MarshalText() ([]byte, error) {
+	return hexutil.Bytes(b[:]).MarshalText()
+}
+
+// UnmarshalText b as a hex string with 0x prefix.
+func (b *AvaBloom) UnmarshalText(input []byte) error {
+	return hexutil.UnmarshalFixedText("Bloom", input, b[:])
+}
+
+// bloomValues returns the bytes (index-value pairs) to set for the given data
+func bloomValues(data []byte, hashbuf []byte) (uint, byte, uint, byte, uint, byte) {
+	sha := crypto.NewKeccakState()
+	sha.Write(data)
+	sha.Read(hashbuf)
+	// The actual bits to flip
+	v1 := byte(1 << (hashbuf[1] & 0x7))
+	v2 := byte(1 << (hashbuf[3] & 0x7))
+	v3 := byte(1 << (hashbuf[5] & 0x7))
+	// The indices for the bytes to OR in
+	i1 := BloomByteLength - uint((binary.BigEndian.Uint16(hashbuf)&0x7ff)>>3) - 1
+	i2 := BloomByteLength - uint((binary.BigEndian.Uint16(hashbuf[2:])&0x7ff)>>3) - 1
+	i3 := BloomByteLength - uint((binary.BigEndian.Uint16(hashbuf[4:])&0x7ff)>>3) - 1
+
+	return i1, v1, i2, v2, i3, v3
+}
+
+// A AvaBlockNonce is a 64-bit hash which proves (combined with the
+// mix-hash) that a sufficient amount of computation has been carried
+// out on a block.
+type AvaBlockNonce [8]byte
+
+// EncodeNonce converts the given integer to a block nonce.
+func EncodeNonce(i uint64) AvaBlockNonce {
+	var n AvaBlockNonce
+	binary.BigEndian.PutUint64(n[:], i)
+	return n
+}
+
+// Uint64 returns the integer value of a block nonce.
+func (n AvaBlockNonce) Uint64() uint64 {
+	return binary.BigEndian.Uint64(n[:])
+}
+
+// MarshalText encodes n as a hex string with 0x prefix.
+func (n AvaBlockNonce) MarshalText() ([]byte, error) {
+	return hexutil.Bytes(n[:]).MarshalText()
+}
+
+// UnmarshalText implements encoding.TextUnmarshaler.
+func (n *AvaBlockNonce) UnmarshalText(input []byte) error {
+	return hexutil.UnmarshalFixedText("AvaBlockNonce", input, n[:])
+}
+
+// AvaHeader is a copy of [github.com/ava-labs/coreth/core/types.Header] to avoid importing the whole module.
+type AvaHeader struct {
+	ParentHash  common.Hash    `json:"parentHash"       gencodec:"required"`
+	UncleHash   common.Hash    `json:"sha3Uncles"       gencodec:"required"`
+	Coinbase    common.Address `json:"miner"            gencodec:"required"`
+	Root        common.Hash    `json:"stateRoot"        gencodec:"required"`
+	TxHash      common.Hash    `json:"transactionsRoot" gencodec:"required"`
+	ReceiptHash common.Hash    `json:"receiptsRoot"     gencodec:"required"`
+	Bloom       AvaBloom       `json:"logsBloom"        gencodec:"required"`
+	Difficulty  *big.Int       `json:"difficulty"       gencodec:"required"`
+	Number      *big.Int       `json:"number"           gencodec:"required"`
+	GasLimit    uint64         `json:"gasLimit"         gencodec:"required"`
+	GasUsed     uint64         `json:"gasUsed"          gencodec:"required"`
+	Time        uint64         `json:"timestamp"        gencodec:"required"`
+	Extra       []byte         `json:"extraData"        gencodec:"required"`
+	MixDigest   common.Hash    `json:"mixHash"`
+	Nonce       AvaBlockNonce  `json:"nonce"`
+	ExtDataHash common.Hash    `json:"extDataHash"      gencodec:"required"`
+
+	// BaseFee was added by EIP-1559 and is ignored in legacy headers.
+	BaseFee *big.Int `json:"baseFeePerGas" rlp:"optional"`
+
+	// ExtDataGasUsed was added by Apricot Phase 4 and is ignored in legacy
+	// headers.
+	//
+	// It is not a uint64 like GasLimit or GasUsed because it is not possible to
+	// correctly encode this field optionally with uint64.
+	ExtDataGasUsed *big.Int `json:"extDataGasUsed" rlp:"optional"`
+
+	// BlockGasCost was added by Apricot Phase 4 and is ignored in legacy
+	// headers.
+	BlockGasCost *big.Int `json:"blockGasCost" rlp:"optional"`
+}
+
+func (h *AvaHeader) UnmarshalJSON(input []byte) error {
+	type Header struct {
+		ParentHash     *common.Hash    `json:"parentHash"       gencodec:"required"`
+		UncleHash      *common.Hash    `json:"sha3Uncles"       gencodec:"required"`
+		Coinbase       *common.Address `json:"miner"            gencodec:"required"`
+		Root           *common.Hash    `json:"stateRoot"        gencodec:"required"`
+		TxHash         *common.Hash    `json:"transactionsRoot" gencodec:"required"`
+		ReceiptHash    *common.Hash    `json:"receiptsRoot"     gencodec:"required"`
+		Bloom          *AvaBloom       `json:"logsBloom"        gencodec:"required"`
+		Difficulty     *hexutil.Big    `json:"difficulty"       gencodec:"required"`
+		Number         *hexutil.Big    `json:"number"           gencodec:"required"`
+		GasLimit       *hexutil.Uint64 `json:"gasLimit"         gencodec:"required"`
+		GasUsed        *hexutil.Uint64 `json:"gasUsed"          gencodec:"required"`
+		Time           *hexutil.Uint64 `json:"timestamp"        gencodec:"required"`
+		Extra          *hexutil.Bytes  `json:"extraData"        gencodec:"required"`
+		MixDigest      *common.Hash    `json:"mixHash"`
+		Nonce          *AvaBlockNonce  `json:"nonce"`
+		ExtDataHash    *common.Hash    `json:"extDataHash"      gencodec:"required"`
+		BaseFee        *hexutil.Big    `json:"baseFeePerGas" rlp:"optional"`
+		ExtDataGasUsed *hexutil.Big    `json:"extDataGasUsed" rlp:"optional"`
+		BlockGasCost   *hexutil.Big    `json:"blockGasCost" rlp:"optional"`
+	}
+	var dec Header
+	if err := json.Unmarshal(input, &dec); err != nil {
+		return err
+	}
+	if dec.ParentHash == nil {
+		return errors.New("missing required field 'parentHash' for Header")
+	}
+	h.ParentHash = *dec.ParentHash
+	if dec.UncleHash == nil {
+		return errors.New("missing required field 'sha3Uncles' for Header")
+	}
+	h.UncleHash = *dec.UncleHash
+	if dec.Coinbase == nil {
+		return errors.New("missing required field 'miner' for Header")
+	}
+	h.Coinbase = *dec.Coinbase
+	if dec.Root == nil {
+		return errors.New("missing required field 'stateRoot' for Header")
+	}
+	h.Root = *dec.Root
+	if dec.TxHash == nil {
+		return errors.New("missing required field 'transactionsRoot' for Header")
+	}
+	h.TxHash = *dec.TxHash
+	if dec.ReceiptHash == nil {
+		return errors.New("missing required field 'receiptsRoot' for Header")
+	}
+	h.ReceiptHash = *dec.ReceiptHash
+	if dec.Bloom == nil {
+		return errors.New("missing required field 'logsBloom' for Header")
+	}
+	h.Bloom = *dec.Bloom
+	if dec.Difficulty == nil {
+		return errors.New("missing required field 'difficulty' for Header")
+	}
+	h.Difficulty = (*big.Int)(dec.Difficulty)
+	if dec.Number == nil {
+		return errors.New("missing required field 'number' for Header")
+	}
+	h.Number = (*big.Int)(dec.Number)
+	if dec.GasLimit == nil {
+		return errors.New("missing required field 'gasLimit' for Header")
+	}
+	h.GasLimit = uint64(*dec.GasLimit)
+	if dec.GasUsed == nil {
+		return errors.New("missing required field 'gasUsed' for Header")
+	}
+	h.GasUsed = uint64(*dec.GasUsed)
+	if dec.Time == nil {
+		return errors.New("missing required field 'timestamp' for Header")
+	}
+	h.Time = uint64(*dec.Time)
+	if dec.Extra == nil {
+		return errors.New("missing required field 'extraData' for Header")
+	}
+	h.Extra = *dec.Extra
+	if dec.MixDigest != nil {
+		h.MixDigest = *dec.MixDigest
+	}
+	if dec.Nonce != nil {
+		h.Nonce = *dec.Nonce
+	}
+	if dec.ExtDataHash == nil {
+		return errors.New("missing required field 'extDataHash' for Header")
+	}
+	h.ExtDataHash = *dec.ExtDataHash
+	if dec.BaseFee != nil {
+		h.BaseFee = (*big.Int)(dec.BaseFee)
+	}
+	if dec.ExtDataGasUsed != nil {
+		h.ExtDataGasUsed = (*big.Int)(dec.ExtDataGasUsed)
+	}
+	if dec.BlockGasCost != nil {
+		h.BlockGasCost = (*big.Int)(dec.BlockGasCost)
+	}
+	return nil
+}
+func (h *AvaHeader) Hash() common.Hash {
+	return rlpHash(h)
+}
+func rlpHash(x interface{}) (h common.Hash) {
+	sha := crypto.NewKeccakState()
+	sha.Reset()
+	rlp.Encode(sha, x)
+	sha.Read(h[:])
+	return h
+}
diff --git a/core/scripts/common/helpers.go b/core/scripts/common/helpers.go
index c141e8a29c4..b5a3b1ed943 100644
--- a/core/scripts/common/helpers.go
+++ b/core/scripts/common/helpers.go
@@ -12,7 +12,6 @@ import (
 	"strings"
 	"time"
 
-	avaxclient "github.com/ava-labs/coreth/ethclient"
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
@@ -34,11 +33,6 @@ type Environment struct {
 
 	Jc *rpc.Client
 
-	// AvaxEc is appropriately set if the environment is configured to interact with an avalanche
-	// chain. It should be used instead of the regular Ec field because avalanche calculates
-	// blockhashes differently and the regular Ec will give consistently incorrect results on basic
-	// queries (like e.g eth_blockByNumber).
-	AvaxEc  avaxclient.Client
 	ChainID int64
 }
 
@@ -84,12 +78,6 @@ func SetupEnv(overrideNonce bool) Environment {
 	chainID, err := strconv.ParseInt(chainIDEnv, 10, 64)
 	PanicErr(err)
 
-	var avaxClient avaxclient.Client
-	if IsAvaxNetwork(chainID) {
-		avaxClient, err = avaxclient.Dial(ethURL)
-		PanicErr(err)
-	}
-
 	// Owner key. Make sure it has eth
 	b, err := hex.DecodeString(accountKey)
 	PanicErr(err)
@@ -136,7 +124,6 @@ func SetupEnv(overrideNonce bool) Environment {
 		Owner:   owner,
 		Ec:      ec,
 		Jc:      jsonRPCClient,
-		AvaxEc:  avaxClient,
 		ChainID: chainID,
 	}
 }
@@ -485,11 +472,10 @@ func GetRlpHeaders(env Environment, blockNumbers []*big.Int, getParentBlocks boo
 		// Avalanche block headers are special, handle them by using the avalanche rpc client
 		// rather than the regular go-ethereum ethclient.
 		if IsAvaxNetwork(env.ChainID) {
+			var h AvaHeader
 			// Get child block since it's the one that has the parent hash in its header.
-			h, err := env.AvaxEc.HeaderByNumber(
-				context.Background(),
-				new(big.Int).Set(blockNum).Add(blockNum, offset),
-			)
+			nextBlockNum := new(big.Int).Set(blockNum).Add(blockNum, offset)
+			err := env.Jc.CallContext(context.Background(), &h, "eth_getBlockByNumber", hexutil.EncodeBig(nextBlockNum), false)
 			if err != nil {
 				return nil, hashes, fmt.Errorf("failed to get header: %+v", err)
 			}
diff --git a/core/scripts/go.mod b/core/scripts/go.mod
index afaa65b38b7..b7dd835cb65 100644
--- a/core/scripts/go.mod
+++ b/core/scripts/go.mod
@@ -6,7 +6,6 @@ go 1.21.3
 replace github.com/smartcontractkit/chainlink/v2 => ../../
 
 require (
-	github.com/ava-labs/coreth v0.12.1
 	github.com/avast/retry-go v3.0.0+incompatible
 	github.com/docker/docker v24.0.7+incompatible
 	github.com/docker/go-connections v0.4.0
@@ -55,7 +54,6 @@ require (
 	github.com/VictoriaMetrics/fastcache v1.10.0 // indirect
 	github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 // indirect
 	github.com/armon/go-metrics v0.4.1 // indirect
-	github.com/ava-labs/avalanchego v1.10.1 // indirect
 	github.com/avast/retry-go/v4 v4.5.1 // indirect
 	github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
@@ -63,6 +61,7 @@ require (
 	github.com/blendle/zapdriver v1.3.1 // indirect
 	github.com/btcsuite/btcd v0.23.4 // indirect
 	github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
+	github.com/btcsuite/btcd/btcutil v1.1.3 // indirect
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect
 	github.com/bytedance/sonic v1.10.1 // indirect
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
@@ -91,7 +90,6 @@ require (
 	github.com/danieljoos/wincred v1.1.2 // indirect
 	github.com/danielkov/gin-helmet v0.0.0-20171108135313-1387e224435e // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/deckarep/golang-set v1.8.0 // indirect
 	github.com/deckarep/golang-set/v2 v2.3.0 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
 	github.com/dfuse-io/logging v0.0.0-20210109005628-b97a57253f70 // indirect
@@ -141,7 +139,6 @@ require (
 	github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
 	github.com/golang/glog v1.1.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/mock v1.6.0 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
 	github.com/google/btree v1.1.2 // indirect
@@ -172,7 +169,6 @@ require (
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce // indirect
 	github.com/hdevalence/ed25519consensus v0.1.0 // indirect
-	github.com/holiman/big v0.0.0-20221017200358-a027dc42d04e // indirect
 	github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
 	github.com/holiman/uint256 v1.2.3 // indirect
 	github.com/huandu/skiplist v1.2.0 // indirect
@@ -248,7 +244,6 @@ require (
 	github.com/prometheus/prometheus v0.48.0 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
-	github.com/rjeczalik/notify v0.9.3 // indirect
 	github.com/robfig/cron/v3 v3.0.1 // indirect
 	github.com/rogpeppe/go-internal v1.11.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
diff --git a/core/scripts/go.sum b/core/scripts/go.sum
index 2b0504ce5fa..a8cf979a0e6 100644
--- a/core/scripts/go.sum
+++ b/core/scripts/go.sum
@@ -145,10 +145,6 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV
 github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA=
 github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/ava-labs/avalanchego v1.10.1 h1:lBeamJ1iNq+p2oKg2nAs+A65m8vhSDjkiTDbwzQW7kY=
-github.com/ava-labs/avalanchego v1.10.1/go.mod h1:ZvSXWlbkUKlbk3BsWx29a+8eVHe/WBsOxh55BSGoeRk=
-github.com/ava-labs/coreth v0.12.1 h1:EWSkFGHGVUxmu1pnSK/2pdcxaAVHbGspHqO3Ag+i7sA=
-github.com/ava-labs/coreth v0.12.1/go.mod h1:/5x54QlIKjlPebkdzTA5ic9wXdejbWOnQosztkv9jxo=
 github.com/avast/retry-go v3.0.0+incompatible h1:4SOWQ7Qs+oroOTQOYnAHqelpCO0biHSxpiH9JdtuBj0=
 github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY=
 github.com/avast/retry-go/v4 v4.5.1 h1:AxIx0HGi4VZ3I02jr78j5lZ3M6x1E0Ivxa6b0pUUh7o=
@@ -175,10 +171,12 @@ github.com/blendle/zapdriver v1.3.1 h1:C3dydBOWYRiOk+B8X9IVZ5IOe+7cl+tGOexN4QqHf
 github.com/blendle/zapdriver v1.3.1/go.mod h1:mdXfREi6u5MArG4j9fewC+FGnXaBR+T4Ox4J2u4eHCc=
 github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c=
 github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y=
+github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
 github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U=
 github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04=
 github.com/btcsuite/btcd/btcutil v1.1.3 h1:xfbtw8lwpp0G6NwSHb+UE67ryTFHJAiNuipusjXSohQ=
 github.com/btcsuite/btcd/btcutil v1.1.3/go.mod h1:UR7dsSJzJUfMmFiiLlIrMq1lS9jh9EdCV7FStZSnpi0=
+github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
 github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U=
 github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
 github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
@@ -309,12 +307,12 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4=
-github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo=
 github.com/deckarep/golang-set/v2 v2.3.0 h1:qs18EKUfHm2X9fA50Mr/M5hccg2tNnVqsiBImnyDs0g=
 github.com/deckarep/golang-set/v2 v2.3.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4=
+github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc=
 github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y=
 github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo=
+github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0=
 github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218=
@@ -718,8 +716,6 @@ github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce h1:7UnVY3T/ZnHUrfv
 github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
 github.com/hdevalence/ed25519consensus v0.1.0 h1:jtBwzzcHuTmFrQN6xQZn6CQEO/V9f7HsjsjeEZ6auqU=
 github.com/hdevalence/ed25519consensus v0.1.0/go.mod h1:w3BHWjwJbFU29IRHL1Iqkw3sus+7FctEyM4RqDxYNzo=
-github.com/holiman/big v0.0.0-20221017200358-a027dc42d04e h1:pIYdhNkDh+YENVNi3gto8n9hAmRxKxoar0iE6BLucjw=
-github.com/holiman/big v0.0.0-20221017200358-a027dc42d04e/go.mod h1:j9cQbcqHQujT0oKJ38PylVfqohClLr3CvDC+Qcg+lhU=
 github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao=
 github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA=
 github.com/holiman/uint256 v1.2.3 h1:K8UWO1HUJpRMXBxbmaY1Y8IAMZC/RsKB+ArEnnK4l5o=
@@ -1161,8 +1157,6 @@ github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qq
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
 github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/rjeczalik/notify v0.9.3 h1:6rJAzHTGKXGj76sbRgDiDcYj/HniypXmSJo1SWakZeY=
-github.com/rjeczalik/notify v0.9.3/go.mod h1:gF3zSOrafR9DQEWSE8TjfI9NkooDxbyT4UgRGKZA0lc=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
@@ -1631,7 +1625,6 @@ golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180926160741-c2ed4eda69e7/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -1807,7 +1800,6 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
@@ -1977,8 +1969,6 @@ gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHN
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/urfave/cli.v1 v1.20.0 h1:NdAVW6RYxDif9DhDHaAortIu956m2c0v+09AZBPTbE0=
-gopkg.in/urfave/cli.v1 v1.20.0/go.mod h1:vuBzUtMdQeixQj8LVd+/98pzhxNGQoyuPBlsXHOQNO0=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

From 23bc61e2d8dc6dc457376c56103b22255d6aeff7 Mon Sep 17 00:00:00 2001
From: Justin Kaseman <justinkaseman@live.com>
Date: Fri, 8 Dec 2023 12:02:01 -0500
Subject: [PATCH 103/130] (test): Remove unnecessary fuzzing from Functions
 OnTokenTransfer tests (#11517)

* (test): Remove unnecessary fuzzing from Functions OnTokenTransfer tests

* Update gas snapshot
---
 .../gas-snapshots/functions.gas-snapshot      | 12 ++---
 .../tests/v1_X/FunctionsSubscriptions.t.sol   | 51 ++++++-------------
 2 files changed, 22 insertions(+), 41 deletions(-)

diff --git a/contracts/gas-snapshots/functions.gas-snapshot b/contracts/gas-snapshots/functions.gas-snapshot
index 8275d9afafe..d0893969bff 100644
--- a/contracts/gas-snapshots/functions.gas-snapshot
+++ b/contracts/gas-snapshots/functions.gas-snapshot
@@ -142,11 +142,11 @@ FunctionsSubscriptions_GetSubscriptionsInRange:test_GetSubscriptionsInRange_Reve
 FunctionsSubscriptions_GetSubscriptionsInRange:test_GetSubscriptionsInRange_RevertIfStartIsAfterEnd() (gas: 13459)
 FunctionsSubscriptions_GetSubscriptionsInRange:test_GetSubscriptionsInRange_Success() (gas: 59592)
 FunctionsSubscriptions_GetTotalBalance:test_GetTotalBalance_Success() (gas: 15010)
-FunctionsSubscriptions_OnTokenTransfer:test_OnTokenTransfer_RevertIfCallerIsNoCalldata(uint96) (runs: 256, μ: 43774, ~: 45548)
-FunctionsSubscriptions_OnTokenTransfer:test_OnTokenTransfer_RevertIfCallerIsNoSubscription(uint96) (runs: 256, μ: 46286, ~: 48060)
-FunctionsSubscriptions_OnTokenTransfer:test_OnTokenTransfer_RevertIfCallerIsNotLink(uint96) (runs: 256, μ: 14295, ~: 14295)
-FunctionsSubscriptions_OnTokenTransfer:test_OnTokenTransfer_RevertIfPaused(uint96) (runs: 256, μ: 51443, ~: 53040)
-FunctionsSubscriptions_OnTokenTransfer:test_OnTokenTransfer_Success(uint96) (runs: 256, μ: 86057, ~: 89604)
+FunctionsSubscriptions_OnTokenTransfer:test_OnTokenTransfer_RevertIfCallerIsNoCalldata() (gas: 39939)
+FunctionsSubscriptions_OnTokenTransfer:test_OnTokenTransfer_RevertIfCallerIsNoSubscription() (gas: 42404)
+FunctionsSubscriptions_OnTokenTransfer:test_OnTokenTransfer_RevertIfCallerIsNotLink() (gas: 13441)
+FunctionsSubscriptions_OnTokenTransfer:test_OnTokenTransfer_RevertIfPaused() (gas: 47347)
+FunctionsSubscriptions_OnTokenTransfer:test_OnTokenTransfer_Success(uint96) (runs: 256, μ: 81598, ~: 81598)
 FunctionsSubscriptions_OracleWithdraw:test_OracleWithdraw_RevertIfAmountMoreThanBalance() (gas: 20745)
 FunctionsSubscriptions_OracleWithdraw:test_OracleWithdraw_RevertIfBalanceInvariant() (gas: 189)
 FunctionsSubscriptions_OracleWithdraw:test_OracleWithdraw_RevertIfNoAmount() (gas: 15638)
@@ -177,7 +177,7 @@ FunctionsSubscriptions_ProposeSubscriptionOwnerTransfer:test_ProposeSubscription
 FunctionsSubscriptions_ProposeSubscriptionOwnerTransfer:test_ProposeSubscriptionOwnerTransfer_Success() (gas: 68196)
 FunctionsSubscriptions_ProposeSubscriptionOwnerTransfer:test_ProposeSubscriptionOwnerTransfer_SuccessChangeProposedOwner() (gas: 82749)
 FunctionsSubscriptions_RecoverFunds:test_OwnerCancelSubscription_RevertIfNotOwner() (gas: 15554)
-FunctionsSubscriptions_RecoverFunds:test_RecoverFunds_Success(uint64) (runs: 256, μ: 41717, ~: 41721)
+FunctionsSubscriptions_RecoverFunds:test_RecoverFunds_Success() (gas: 41111)
 FunctionsSubscriptions_RemoveConsumer:test_RemoveConsumer_RevertIfInvalidConsumer() (gas: 30260)
 FunctionsSubscriptions_RemoveConsumer:test_RemoveConsumer_RevertIfNoSubscription() (gas: 15019)
 FunctionsSubscriptions_RemoveConsumer:test_RemoveConsumer_RevertIfNotAllowedSender() (gas: 57800)
diff --git a/contracts/src/v0.8/functions/tests/v1_X/FunctionsSubscriptions.t.sol b/contracts/src/v0.8/functions/tests/v1_X/FunctionsSubscriptions.t.sol
index 5a54bcc84ca..907eadacd8e 100644
--- a/contracts/src/v0.8/functions/tests/v1_X/FunctionsSubscriptions.t.sol
+++ b/contracts/src/v0.8/functions/tests/v1_X/FunctionsSubscriptions.t.sol
@@ -130,12 +130,8 @@ contract FunctionsSubscriptions_OwnerCancelSubscription is FunctionsSubscription
 contract FunctionsSubscriptions_RecoverFunds is FunctionsRouterSetup {
   event FundsRecovered(address to, uint256 amount);
 
-  function test_RecoverFunds_Success(uint64 fundsTransferred) public {
-    //amount must be less than LINK total supply
-    vm.assume(fundsTransferred < 1_000_000_000 * 1e18);
-    vm.assume(fundsTransferred > 0);
-
-    // uint256 fundsTransferred = 1 * 1e18; // 1 LINK
+  function test_RecoverFunds_Success() public {
+    uint256 fundsTransferred = 1 * 1e18; // 1 LINK
     s_linkToken.transfer(address(s_functionsRouter), fundsTransferred);
 
     // topic0 (function signature, always checked), NOT topic1 (false), NOT topic2 (false), NOT topic3 (false), and data (true).
@@ -320,58 +316,43 @@ contract FunctionsSubscriptions_OnTokenTransfer is FunctionsClientSetup {
     s_functionsRouter.addConsumer(s_subscriptionId, address(s_functionsClient));
   }
 
-  function test_OnTokenTransfer_RevertIfPaused(uint96 fundingAmount) public {
-    // Funding amount must be less than LINK total supply
+  function test_OnTokenTransfer_RevertIfPaused() public {
+    // Funding amount must be less than or equal to LINK total supply
     uint256 totalSupplyJuels = 1_000_000_000 * 1e18;
-    vm.assume(fundingAmount <= totalSupplyJuels);
-    vm.assume(fundingAmount >= 0);
-
     s_functionsRouter.pause();
     vm.expectRevert("Pausable: paused");
-    s_linkToken.transferAndCall(address(s_functionsRouter), fundingAmount, abi.encode(s_subscriptionId));
+    s_linkToken.transferAndCall(address(s_functionsRouter), totalSupplyJuels, abi.encode(s_subscriptionId));
   }
 
-  function test_OnTokenTransfer_RevertIfCallerIsNotLink(uint96 fundingAmount) public {
-    // Funding amount must be less than LINK total supply
+  function test_OnTokenTransfer_RevertIfCallerIsNotLink() public {
+    // Funding amount must be less than or equal to LINK total supply
     uint256 totalSupplyJuels = 1_000_000_000 * 1e18;
-    vm.assume(fundingAmount <= totalSupplyJuels);
-    vm.assume(fundingAmount >= 0);
-
     vm.expectRevert(FunctionsSubscriptions.OnlyCallableFromLink.selector);
-    s_functionsRouter.onTokenTransfer(address(s_functionsRouter), fundingAmount, abi.encode(s_subscriptionId));
+    s_functionsRouter.onTokenTransfer(address(s_functionsRouter), totalSupplyJuels, abi.encode(s_subscriptionId));
   }
 
-  function test_OnTokenTransfer_RevertIfCallerIsNoCalldata(uint96 fundingAmount) public {
-    // Funding amount must be less than LINK total supply
+  function test_OnTokenTransfer_RevertIfCallerIsNoCalldata() public {
+    // Funding amount must be less than or equal to LINK total supply
     uint256 totalSupplyJuels = 1_000_000_000 * 1e18;
-    vm.assume(fundingAmount <= totalSupplyJuels);
-    vm.assume(fundingAmount >= 0);
-
     vm.expectRevert(FunctionsSubscriptions.InvalidCalldata.selector);
-    s_linkToken.transferAndCall(address(s_functionsRouter), fundingAmount, new bytes(0));
+    s_linkToken.transferAndCall(address(s_functionsRouter), totalSupplyJuels, new bytes(0));
   }
 
-  function test_OnTokenTransfer_RevertIfCallerIsNoSubscription(uint96 fundingAmount) public {
-    // Funding amount must be less than LINK total supply
+  function test_OnTokenTransfer_RevertIfCallerIsNoSubscription() public {
+    // Funding amount must be less than or equal to LINK total supply
     uint256 totalSupplyJuels = 1_000_000_000 * 1e18;
-    vm.assume(fundingAmount <= totalSupplyJuels);
-    vm.assume(fundingAmount >= 0);
-
     vm.expectRevert(FunctionsSubscriptions.InvalidSubscription.selector);
     uint64 invalidSubscriptionId = 123456789;
-    s_linkToken.transferAndCall(address(s_functionsRouter), fundingAmount, abi.encode(invalidSubscriptionId));
+    s_linkToken.transferAndCall(address(s_functionsRouter), totalSupplyJuels, abi.encode(invalidSubscriptionId));
   }
 
   function test_OnTokenTransfer_Success(uint96 fundingAmount) public {
     // Funding amount must be less than LINK total supply
     uint256 totalSupplyJuels = 1_000_000_000 * 1e18;
     // Some of the total supply is already in the subscription account
-    vm.assume(fundingAmount <= totalSupplyJuels);
-    vm.assume(fundingAmount >= 0);
-
-    s_linkToken.transferAndCall(address(s_functionsRouter), fundingAmount, abi.encode(s_subscriptionId));
+    s_linkToken.transferAndCall(address(s_functionsRouter), totalSupplyJuels, abi.encode(s_subscriptionId));
     uint96 subscriptionBalanceAfter = s_functionsRouter.getSubscription(s_subscriptionId).balance;
-    assertEq(fundingAmount, subscriptionBalanceAfter);
+    assertEq(totalSupplyJuels, subscriptionBalanceAfter);
   }
 }
 

From 3babdf987179adc58948d64c7bc29978d74c06ad Mon Sep 17 00:00:00 2001
From: Lei <lei.shi@smartcontract.com>
Date: Fri, 8 Dec 2023 10:55:35 -0800
Subject: [PATCH 104/130] small improvements based on comments (#11491)

* small improvements based on comments

* add unit test
---
 .../evmregistry/v21/mercury/mercury.go        |  6 +---
 .../v21/mercury/streams/streams.go            |  7 +++--
 .../v21/mercury/streams/streams_test.go       | 28 ++++++++++++++++++-
 .../evmregistry/v21/mercury/v03/request.go    |  2 +-
 4 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/mercury.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/mercury.go
index cf6ebeafc6e..f9a3c001c66 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/mercury.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/mercury.go
@@ -105,10 +105,6 @@ type StreamsLookup struct {
 	Block    uint64
 }
 
-func (l *StreamsLookup) IsMercuryVersionUnkown() bool {
-	return l.FeedParamKey != FeedIDs
-}
-
 func (l *StreamsLookup) IsMercuryV02() bool {
 	return l.FeedParamKey == FeedIdHex && l.TimeParamKey == BlockNumber
 }
@@ -117,6 +113,6 @@ func (l *StreamsLookup) IsMercuryV03() bool {
 	return l.FeedParamKey == FeedIDs
 }
 
-func (l *StreamsLookup) IsMercuryUsingBatchPathV03() bool {
+func (l *StreamsLookup) IsMercuryV03UsingBlockNumber() bool {
 	return l.TimeParamKey == BlockNumber
 }
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams.go
index aec23431921..70db40c26bb 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams.go
@@ -131,6 +131,7 @@ func (s *streams) buildResult(ctx context.Context, i int, checkResult ocr2keeper
 	// tried to call mercury
 	lookupLggr.Infof("at block %d upkeep %s trying to DecodeStreamsLookupRequest performData=%s", block, upkeepId, hexutil.Encode(checkResults[i].PerformData))
 	streamsLookupErr, err := s.packer.DecodeStreamsLookupRequest(checkResult.PerformData)
+
 	if err != nil {
 		lookupLggr.Debugf("at block %d upkeep %s DecodeStreamsLookupRequest failed: %v", block, upkeepId, err)
 		// user contract did not revert with StreamsLookup error
@@ -144,7 +145,7 @@ func (s *streams) buildResult(ctx context.Context, i int, checkResult ocr2keeper
 		return
 	}
 
-	// mercury permission checking for v0.3 is done by mercury server
+	// mercury permission checking for v0.3 is done by mercury server, so no need to check here
 	if streamsLookupResponse.IsMercuryV02() {
 		// check permission on the registry for mercury v0.2
 		opts := s.buildCallOpts(ctx, block)
@@ -159,8 +160,8 @@ func (s *streams) buildResult(ctx context.Context, i int, checkResult ocr2keeper
 			checkResults[i].IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonMercuryAccessNotAllowed)
 			return
 		}
-	} else if streamsLookupResponse.IsMercuryVersionUnkown() {
-		// if mercury version cannot be determined, set failure reason
+	} else if !streamsLookupResponse.IsMercuryV03() {
+		// if mercury version is not v02 or v03, set failure reason
 		lookupLggr.Debugf("at block %d upkeep %s NOT allowed to query Mercury server", block, upkeepId)
 		checkResults[i].IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonInvalidRevertDataInput)
 		return
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams_test.go
index abcc37dca18..32041d0f18b 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams_test.go
@@ -11,10 +11,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/pkg/errors"
+
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
@@ -619,6 +620,31 @@ func TestStreams_StreamsLookup(t *testing.T) {
 			},
 			hasError: true,
 		},
+		{
+			name: "failure - invalid mercury version",
+			input: []ocr2keepers.CheckResult{
+				{
+					// This Perform data contains invalid FeedParamKey: {feedIdHex:RandomString [ETD-USD BTC-ETH] blockNumber 100 [48 120 48 48]}
+					PerformData: hexutil.MustDecode("0xf055e4a200000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000001c00000000000000000000000000000000000000000000000000000000000000064000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000166665656449644865783a52616e646f6d537472696e670000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000074554442d5553440000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000074254432d45544800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b626c6f636b4e756d62657200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000043078303000000000000000000000000000000000000000000000000000000000"),
+					UpkeepID:    upkeepIdentifier,
+					Trigger: ocr2keepers.Trigger{
+						BlockNumber: blockNum,
+					},
+					IneligibilityReason: uint8(encoding.UpkeepFailureReasonTargetCheckReverted),
+				},
+			},
+			expectedResults: []ocr2keepers.CheckResult{
+				{
+					PerformData: hexutil.MustDecode("0xf055e4a200000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000001c00000000000000000000000000000000000000000000000000000000000000064000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000166665656449644865783a52616e646f6d537472696e670000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000074554442d5553440000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000074254432d45544800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b626c6f636b4e756d62657200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000043078303000000000000000000000000000000000000000000000000000000000"),
+					UpkeepID:    upkeepIdentifier,
+					Trigger: ocr2keepers.Trigger{
+						BlockNumber: blockNum,
+					},
+					IneligibilityReason: uint8(mercury.MercuryUpkeepFailureReasonInvalidRevertDataInput),
+				},
+			},
+			hasError: true,
+		},
 	}
 
 	for _, tt := range tests {
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/v03/request.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/v03/request.go
index cb3c9ef3222..ea465ff8582 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/v03/request.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/v03/request.go
@@ -100,7 +100,7 @@ func (c *client) multiFeedsRequest(ctx context.Context, ch chan<- mercury.Mercur
 
 	params := fmt.Sprintf("%s=%s&%s=%s", mercury.FeedIDs, strings.Join(sl.Feeds, ","), mercury.Timestamp, sl.Time.String())
 	batchPathV03 := mercuryBatchPathV03
-	if sl.IsMercuryUsingBatchPathV03() {
+	if sl.IsMercuryV03UsingBlockNumber() {
 		batchPathV03 = mercuryBatchPathV03BlockNumber
 	}
 	reqUrl := fmt.Sprintf("%s%s%s", c.mercuryConfig.Credentials().URL, batchPathV03, params)

From dca584a801a8e45882e0dfba6d53511b13053291 Mon Sep 17 00:00:00 2001
From: Sergey Kudasov <f4hrenh9it@gmail.com>
Date: Tue, 12 Dec 2023 00:15:20 +0300
Subject: [PATCH 105/130] wrap devspace commands (#11530)

---
 .../dashboard/cmd/dashboard_deploy.go         |  2 +-
 charts/chainlink-cluster/devspace.yaml        | 24 ++++++++++++++++++-
 charts/chainlink-cluster/go.mod               |  2 +-
 .../templates/chainlink-pod-monitor.yaml      |  2 +-
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/charts/chainlink-cluster/dashboard/cmd/dashboard_deploy.go b/charts/chainlink-cluster/dashboard/cmd/dashboard_deploy.go
index 93619fe6148..b65be29501d 100644
--- a/charts/chainlink-cluster/dashboard/cmd/dashboard_deploy.go
+++ b/charts/chainlink-cluster/dashboard/cmd/dashboard_deploy.go
@@ -3,7 +3,7 @@ package main
 import (
 	"os"
 
-	"github.com/smartcontractkit/chainlink/v2/dashboard/dashboard"
+	"github.com/smartcontractkit/chainlink/charts/chainlink-cluster/dashboard/dashboard"
 	"github.com/smartcontractkit/wasp"
 )
 
diff --git a/charts/chainlink-cluster/devspace.yaml b/charts/chainlink-cluster/devspace.yaml
index f62b87edf69..186e49257a1 100644
--- a/charts/chainlink-cluster/devspace.yaml
+++ b/charts/chainlink-cluster/devspace.yaml
@@ -2,6 +2,7 @@ version: v2beta1
 name: chainlink
 
 vars:
+  NS_TTL: 72h
   DEVSPACE_IMAGE:
     source: env
 
@@ -20,7 +21,16 @@ pipelines:
       run_dependencies --all                            # 1. Deploy any projects this project needs (see "dependencies")
       ensure_pull_secrets --all                         # 2. Ensure pull secrets
       build_images --all -t $(git rev-parse --short HEAD)    # 3. Build, tag (git commit hash) and push all images (see "images")
-      create_deployments --all                          # 4. Deploy Helm charts and manifests specfied as "deployments"
+      create_deployments --all                          # 5. Deploy Helm charts and manifests specfied as "deployments"
+      kubectl annotate namespace ${DEVSPACE_NAMESPACE} janitor/ttl=${NS_TTL}
+      echo "Namespace ${DEVSPACE_NAMESPACE} will be deleted in ${NS_TTL}"
+  purge:
+    run: |-
+      kubectl delete ns ${DEVSPACE_NAMESPACE}
+
+commands:
+  connect: |-
+    sudo kubefwd svc -n ${DEVSPACE_NAMESPACE}
 
 images:
   app:
@@ -28,9 +38,21 @@ images:
     dockerfile: ../../core/chainlink.devspace.Dockerfile
     context: ../..
 
+hooks:
+  - wait:
+      running: true
+      terminatedWithCode: 0
+    container:
+      labelSelector:
+        # vars don't work here, = releaseName
+        release: "app"
+    events: ["after:deploy:app"]
+    name: "wait-for-pod-hook"
+
 # This is a list of `deployments` that DevSpace can create for this project
 deployments:
   app:
+    namespace: ${DEVSPACE_NAMESPACE}
     helm:
       releaseName: "app"
       chart:
diff --git a/charts/chainlink-cluster/go.mod b/charts/chainlink-cluster/go.mod
index 951fb1d2e3c..34ee35887b1 100644
--- a/charts/chainlink-cluster/go.mod
+++ b/charts/chainlink-cluster/go.mod
@@ -1,4 +1,4 @@
-module github.com/smartcontractkit/chainlink/v2/dashboard
+module github.com/smartcontractkit/chainlink/charts/chainlink-cluster/dashboard
 
 go 1.21
 
diff --git a/charts/chainlink-cluster/templates/chainlink-pod-monitor.yaml b/charts/chainlink-cluster/templates/chainlink-pod-monitor.yaml
index 2cd9c3df2b6..05852642a29 100644
--- a/charts/chainlink-cluster/templates/chainlink-pod-monitor.yaml
+++ b/charts/chainlink-cluster/templates/chainlink-pod-monitor.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   namespaceSelector:
     matchNames:
-      - "cl-cluster"
+      - {{ $.Release.Namespace }}
   podMetricsEndpoints:
     - port: access
   selector:

From c90bd0c36e63da6a713c24cfb7cd499b74e71c97 Mon Sep 17 00:00:00 2001
From: Jordan Krage <jmank88@gmail.com>
Date: Mon, 11 Dec 2023 16:45:19 -0600
Subject: [PATCH 106/130] go.mods: rm libp2p; rm btcd replace (#11502)

* go.mods: drop btcd replace; upgrade libp2p

* Replace deprecated call to btcd API for secp256k1 constant

* Fix comment describing sqrtPower calculation

* Change calculation of sqrtPower to standard order of operations

* rm libp2p peer & crypto uses

---------

Co-authored-by: Alex Coventry <coventry@smartcontract.com>
---
 charts/chainlink-cluster/go.mod               |   4 -
 core/internal/cltest/cltest.go                |   4 +-
 core/internal/cltest/factories.go             |   6 +-
 core/scripts/go.mod                           |  25 +--
 core/scripts/go.sum                           | 110 ++---------
 .../keystore/keys/cosmoskey/export.go         |   4 +-
 core/services/keystore/keys/csakey/export.go  |   4 +-
 .../keystore/keys/dkgencryptkey/export.go     |   4 +-
 .../keystore/keys/dkgsignkey/export.go        |   4 +-
 core/services/keystore/keys/exportutils.go    |   9 +-
 core/services/keystore/keys/ocr2key/export.go |   4 +-
 core/services/keystore/keys/ocrkey/export.go  |   4 +-
 core/services/keystore/keys/p2pkey/export.go  |  14 +-
 core/services/keystore/keys/p2pkey/key.go     |  24 +--
 .../services/keystore/keys/p2pkey/key_test.go |  21 +-
 core/services/keystore/keys/p2pkey/key_v2.go  |  46 +++--
 .../keystore/keys/p2pkey/key_v2_test.go       |  18 +-
 core/services/keystore/keys/p2pkey/peer_id.go |  23 ++-
 .../keystore/keys/p2pkey/peer_id_test.go      |   8 +-
 core/services/keystore/keys/solkey/export.go  |   4 +-
 .../services/keystore/keys/starkkey/export.go |   4 +-
 core/services/keystore/models_test.go         |   4 +-
 core/services/keystore/p2p.go                 |   2 +-
 core/services/keystore/p2p_test.go            |  32 ++-
 .../services/ocrcommon/discoverer_database.go |   8 +-
 .../ocrcommon/discoverer_database_test.go     |  19 +-
 core/services/ocrcommon/peer_wrapper.go       |  33 +---
 core/services/ocrcommon/peer_wrapper_test.go  |   6 +-
 core/services/ocrcommon/peerstore.go          | 182 ------------------
 core/services/ocrcommon/peerstore_test.go     | 101 ----------
 core/services/signatures/secp256k1/curve.go   |   2 +-
 core/services/signatures/secp256k1/field.go   |   8 +-
 core/services/signatures/secp256k1/scalar.go  |   2 +-
 core/utils/utils.go                           |  12 +-
 core/web/jobs_controller_test.go              |   6 +-
 core/web/p2p_keys_controller.go               |   6 +-
 core/web/presenters/p2p_key_test.go           |   8 +-
 core/web/resolver/mutation.go                 |   3 +-
 go.mod                                        |  27 +--
 go.sum                                        | 105 +---------
 integration-tests/go.mod                      |  25 +--
 integration-tests/go.sum                      | 105 +---------
 42 files changed, 204 insertions(+), 836 deletions(-)
 delete mode 100644 core/services/ocrcommon/peerstore.go
 delete mode 100644 core/services/ocrcommon/peerstore_test.go

diff --git a/charts/chainlink-cluster/go.mod b/charts/chainlink-cluster/go.mod
index 34ee35887b1..ae67574aa06 100644
--- a/charts/chainlink-cluster/go.mod
+++ b/charts/chainlink-cluster/go.mod
@@ -170,10 +170,6 @@ require (
 )
 
 replace (
-	// Fixes go mod tidy issue for ambiguous imports from go-ethereum
-	// See https://github.com/ugorji/go/issues/279
-	github.com/btcsuite/btcd => github.com/btcsuite/btcd v0.22.1
-
 	github.com/go-kit/log => github.com/go-kit/log v0.2.1
 
 	// replicating the replace directive on cosmos SDK
diff --git a/core/internal/cltest/cltest.go b/core/internal/cltest/cltest.go
index 8802d9c4b0d..88abc3de5c6 100644
--- a/core/internal/cltest/cltest.go
+++ b/core/internal/cltest/cltest.go
@@ -26,7 +26,6 @@ import (
 	"github.com/google/uuid"
 	"github.com/gorilla/securecookie"
 	"github.com/gorilla/sessions"
-	p2ppeer "github.com/libp2p/go-libp2p-core/peer"
 	"github.com/manyminds/api2go/jsonapi"
 	"github.com/onsi/gomega"
 	"github.com/stretchr/testify/assert"
@@ -141,11 +140,10 @@ func init() {
 		fmt.Printf("[gin] %-6s %-25s --> %s (%d handlers)\n", httpMethod, absolutePath, handlerName, nuHandlers)
 	}
 
-	defaultP2PPeerID, err := p2ppeer.Decode(configtest.DefaultPeerID)
+	err := DefaultP2PPeerID.UnmarshalString(configtest.DefaultPeerID)
 	if err != nil {
 		panic(err)
 	}
-	DefaultP2PPeerID = p2pkey.PeerID(defaultP2PPeerID)
 }
 
 func NewRandomPositiveInt64() int64 {
diff --git a/core/internal/cltest/factories.go b/core/internal/cltest/factories.go
index c169c5fd228..a76d23d3762 100644
--- a/core/internal/cltest/factories.go
+++ b/core/internal/cltest/factories.go
@@ -16,7 +16,7 @@ import (
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/google/uuid"
-	p2ppeer "github.com/libp2p/go-libp2p-core/peer"
+	ragep2ptypes "github.com/smartcontractkit/libocr/ragep2p/types"
 	"github.com/stretchr/testify/require"
 	"github.com/urfave/cli"
 	"gopkg.in/guregu/null.v4"
@@ -55,8 +55,8 @@ func NewEIP55Address() ethkey.EIP55Address {
 	return e
 }
 
-func NewPeerID() p2ppeer.ID {
-	id, err := p2ppeer.Decode("12D3KooWL3XJ9EMCyZvmmGXL2LMiVBtrVa2BuESsJiXkSj7333Jw")
+func NewPeerID() (id ragep2ptypes.PeerID) {
+	err := id.UnmarshalText([]byte("12D3KooWL3XJ9EMCyZvmmGXL2LMiVBtrVa2BuESsJiXkSj7333Jw"))
 	if err != nil {
 		panic(err)
 	}
diff --git a/core/scripts/go.mod b/core/scripts/go.mod
index b7dd835cb65..2f4d45e746f 100644
--- a/core/scripts/go.mod
+++ b/core/scripts/go.mod
@@ -59,7 +59,6 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect
 	github.com/blendle/zapdriver v1.3.1 // indirect
-	github.com/btcsuite/btcd v0.23.4 // indirect
 	github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
 	github.com/btcsuite/btcd/btcutil v1.1.3 // indirect
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect
@@ -145,7 +144,7 @@ require (
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/go-tpm v0.9.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 // indirect
+	github.com/google/pprof v0.0.0-20231023181126-ff6d637d2a7b // indirect
 	github.com/gorilla/context v1.1.1 // indirect
 	github.com/gorilla/securecookie v1.1.2 // indirect
 	github.com/gorilla/sessions v1.2.2 // indirect
@@ -174,9 +173,6 @@ require (
 	github.com/huandu/skiplist v1.2.0 // indirect
 	github.com/huin/goupnp v1.3.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/ipfs/go-cid v0.0.7 // indirect
-	github.com/ipfs/go-log v1.0.4 // indirect
-	github.com/ipfs/go-log/v2 v2.1.1 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
 	github.com/jackc/pgconn v1.14.1 // indirect
 	github.com/jackc/pgio v1.0.0 // indirect
@@ -198,9 +194,6 @@ require (
 	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/lib/pq v1.10.9 // indirect
 	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
-	github.com/libp2p/go-libp2p-core v0.8.5 // indirect
-	github.com/libp2p/go-libp2p-peerstore v0.2.7 // indirect
-	github.com/libp2p/go-openssl v0.0.7 // indirect
 	github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
@@ -208,8 +201,6 @@ require (
 	github.com/mattn/go-runewidth v0.0.14 // indirect
 	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
 	github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
-	github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 // indirect
-	github.com/minio/sha256-simd v0.1.1 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -218,14 +209,6 @@ require (
 	github.com/mostynb/zstdpool-freelist v0.0.0-20201229113212-927304c0c3b1 // indirect
 	github.com/mr-tron/base58 v1.2.0 // indirect
 	github.com/mtibben/percent v0.2.1 // indirect
-	github.com/multiformats/go-base32 v0.0.3 // indirect
-	github.com/multiformats/go-base36 v0.1.0 // indirect
-	github.com/multiformats/go-multiaddr v0.3.3 // indirect
-	github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
-	github.com/multiformats/go-multiaddr-net v0.2.0 // indirect
-	github.com/multiformats/go-multibase v0.0.3 // indirect
-	github.com/multiformats/go-multihash v0.0.14 // indirect
-	github.com/multiformats/go-varint v0.0.6 // indirect
 	github.com/mwitkow/grpc-proxy v0.0.0-20230212185441-f345521cb9c9 // indirect
 	github.com/oklog/run v1.1.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
@@ -263,8 +246,6 @@ require (
 	github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 // indirect
 	github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1 // indirect
 	github.com/smartcontractkit/wsrpc v0.7.2 // indirect
-	github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
-	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	github.com/spf13/afero v1.9.3 // indirect
 	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
@@ -335,10 +316,6 @@ require (
 )
 
 replace (
-	// Fix go mod tidy issue for ambiguous imports from go-ethereum
-	// See https://github.com/ugorji/go/issues/279
-	github.com/btcsuite/btcd => github.com/btcsuite/btcd v0.22.1
-
 	// replicating the replace directive on cosmos SDK
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 
diff --git a/core/scripts/go.sum b/core/scripts/go.sum
index a8cf979a0e6..a59590fa124 100644
--- a/core/scripts/go.sum
+++ b/core/scripts/go.sum
@@ -169,20 +169,26 @@ github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816/go.mod h1:+zsy
 github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
 github.com/blendle/zapdriver v1.3.1 h1:C3dydBOWYRiOk+B8X9IVZ5IOe+7cl+tGOexN4QqHfpE=
 github.com/blendle/zapdriver v1.3.1/go.mod h1:mdXfREi6u5MArG4j9fewC+FGnXaBR+T4Ox4J2u4eHCc=
-github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c=
-github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y=
+github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
+github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M=
+github.com/btcsuite/btcd v0.23.0/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY=
+github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA=
 github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
 github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U=
 github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04=
+github.com/btcsuite/btcd/btcutil v1.0.0/go.mod h1:Uoxwv0pqYWhD//tfTiipkxNfdhG9UrLwaeswfjfdF0A=
+github.com/btcsuite/btcd/btcutil v1.1.0/go.mod h1:5OapHB7A2hBBWLm48mmw4MOHNJCcUBTwmWH/0Jn8VHE=
 github.com/btcsuite/btcd/btcutil v1.1.3 h1:xfbtw8lwpp0G6NwSHb+UE67ryTFHJAiNuipusjXSohQ=
 github.com/btcsuite/btcd/btcutil v1.1.3/go.mod h1:UR7dsSJzJUfMmFiiLlIrMq1lS9jh9EdCV7FStZSnpi0=
 github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
 github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U=
 github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
 github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
-github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce/go.mod h1:0DVlHczLPewLcPGEIeUEzfOJhqGPQ0mJJRDBtD307+o=
+github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
 github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
+github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY=
 github.com/btcsuite/goleveldb v1.0.0/go.mod h1:QiK9vBlgftBg6rWQIj6wFzbPfRjiykIEhBH4obrXJ/I=
+github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
 github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
 github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY=
 github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs=
@@ -303,6 +309,7 @@ github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuA
 github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0=
 github.com/danielkov/gin-helmet v0.0.0-20171108135313-1387e224435e h1:5jVSh2l/ho6ajWhSPNN84eHEdq3dp0T7+f6r3Tc6hsk=
 github.com/danielkov/gin-helmet v0.0.0-20171108135313-1387e224435e/go.mod h1:IJgIiGUARc4aOr4bOQ85klmjsShkEEfiRc6q/yBSfo8=
+github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
@@ -322,10 +329,8 @@ github.com/dfuse-io/logging v0.0.0-20201110202154-26697de88c79/go.mod h1:V+ED4kT
 github.com/dfuse-io/logging v0.0.0-20210109005628-b97a57253f70 h1:CuJS05R9jmNlUK8GOxrEELPbfXm0EuGh/30LjkjN5vo=
 github.com/dfuse-io/logging v0.0.0-20210109005628-b97a57253f70/go.mod h1:EoK/8RFbMEteaCaz89uessDTnCWjbbcr+DXcBh4el5o=
 github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
-github.com/dgraph-io/badger v1.6.1/go.mod h1:FRmFw3uxvcpa8zG3Rxs0th+hCLIuaQg8HlNV5bjgnuU=
 github.com/dgraph-io/badger/v2 v2.2007.4 h1:TRWBQg8UrlUhaFdco01nO2uXwzKS7zd+HVdwV/GHc4o=
 github.com/dgraph-io/badger/v2 v2.2007.4/go.mod h1:vSw/ax2qojzbN6eXHIx6KPKtCSHJN/Uz0X0VPruTIhk=
-github.com/dgraph-io/ristretto v0.0.2/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E=
 github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E=
 github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8=
 github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA=
@@ -552,7 +557,6 @@ github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb h1:PBC98N2aIaM3XXiurYmW7fx4GZkL8feAMVq7nEjURHk=
@@ -602,14 +606,13 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 h1:pUa4ghanp6q4IJHwE9RwLgmVFfReJN+KbQ8ExNEUUoQ=
-github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
+github.com/google/pprof v0.0.0-20231023181126-ff6d637d2a7b h1:RMpPgZTSApbPf7xaVel+QkoGPRLFLrwFO89uDUHEGf0=
+github.com/google/pprof v0.0.0-20231023181126-ff6d637d2a7b/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o=
 github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
-github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -703,7 +706,6 @@ github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
-github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/golang-lru v0.6.0 h1:uL2shRDx7RTrOrTCUZEGP/wJUFiUI8QT6E7z5o8jga4=
 github.com/hashicorp/golang-lru v0.6.0/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
@@ -739,22 +741,6 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
 github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/ipfs/go-cid v0.0.5/go.mod h1:plgt+Y5MnOey4vO4UlUazGqdbEXuFYitED67FexhXog=
-github.com/ipfs/go-cid v0.0.7 h1:ysQJVJA3fNDF1qigJbsSQOdjhVLsOEoPdh0+R97k3jY=
-github.com/ipfs/go-cid v0.0.7/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I=
-github.com/ipfs/go-datastore v0.4.1/go.mod h1:SX/xMIKoCszPqp+z9JhPYCmoOoXTvaa13XEbGtsFUhA=
-github.com/ipfs/go-datastore v0.4.4/go.mod h1:SX/xMIKoCszPqp+z9JhPYCmoOoXTvaa13XEbGtsFUhA=
-github.com/ipfs/go-ds-badger v0.2.3/go.mod h1:pEYw0rgg3FIrywKKnL+Snr+w/LjJZVMTBRn4FS6UHUk=
-github.com/ipfs/go-ds-leveldb v0.4.2/go.mod h1:jpbku/YqBSsBc1qgME8BkWS4AxzF2cEu1Ii2r79Hh9s=
-github.com/ipfs/go-ipfs-delay v0.0.0-20181109222059-70721b86a9a8/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw=
-github.com/ipfs/go-log v0.0.1/go.mod h1:kL1d2/hzSpI0thNYjiKfjanbVNU+IIGA/WnNESY9leM=
-github.com/ipfs/go-log v1.0.3/go.mod h1:OsLySYkwIbiSUR/yBTdv1qPtcE4FW3WPWk/ewz9Ru+A=
-github.com/ipfs/go-log v1.0.4 h1:6nLQdX4W8P9yZZFH7mO+X/PzjN8Laozm/lMJ6esdgzY=
-github.com/ipfs/go-log v1.0.4/go.mod h1:oDCg2FkjogeFOhqqb+N39l2RpTNPL6F/StPkB3kPgcs=
-github.com/ipfs/go-log/v2 v2.0.3/go.mod h1:O7P1lJt27vWHhOwQmcFEvlmo49ry2VY2+JfBWFaa9+0=
-github.com/ipfs/go-log/v2 v2.0.5/go.mod h1:eZs4Xt4ZUJQFM3DlanGhy7TkwwawCZcSByscwkWG+dw=
-github.com/ipfs/go-log/v2 v2.1.1 h1:G4TtqN+V9y9HY9TA6BwbCVyyBZ2B9MbCjR2MtGx8FR0=
-github.com/ipfs/go-log/v2 v2.1.1/go.mod h1:2v2nsGfZsvvAJz13SyFzf9ObaqwHiHxsPLEHntrv9KM=
 github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI=
 github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0=
 github.com/iris-contrib/jade v1.1.3/go.mod h1:H/geBymxJhShH5kecoiOCSssPX7QWYH7UaeZTSWddIk=
@@ -816,9 +802,7 @@ github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk
 github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
 github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
-github.com/jbenet/go-cienv v0.1.0/go.mod h1:TqNnHUmJgXau0nCzC7kXWeotg3J9W34CUv5Djy1+FlA=
-github.com/jbenet/goprocess v0.0.0-20160826012719-b497e2f366b8/go.mod h1:Ly/wlsjFq/qrU3Rar62tu1gASgGw6chQbSh/XgIIXCY=
-github.com/jbenet/goprocess v0.1.4/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZlqdZVfqY4=
+github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=
 github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo=
@@ -875,7 +859,6 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxv
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
@@ -900,22 +883,8 @@ github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/libp2p/go-buffer-pool v0.0.1/go.mod h1:xtyIz9PMobb13WaxR6Zo1Pd1zXJKYg0a8KiIvDp3TzQ=
-github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM=
 github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8=
 github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg=
-github.com/libp2p/go-flow-metrics v0.0.3/go.mod h1:HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs=
-github.com/libp2p/go-libp2p-core v0.5.4/go.mod h1:uN7L2D4EvPCvzSH5SrhR72UWbnSGpt5/a35Sm4upn4Y=
-github.com/libp2p/go-libp2p-core v0.8.5 h1:aEgbIcPGsKy6zYcC+5AJivYFedhYa4sW7mIpWpUaLKw=
-github.com/libp2p/go-libp2p-core v0.8.5/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8=
-github.com/libp2p/go-libp2p-peerstore v0.2.7 h1:83JoLxyR9OYTnNfB5vvFqvMUv/xDNa6NoPHnENhBsGw=
-github.com/libp2p/go-libp2p-peerstore v0.2.7/go.mod h1:ss/TWTgHZTMpsU/oKVVPQCGuDHItOpf2W8RxAi50P2s=
-github.com/libp2p/go-maddr-filter v0.1.0/go.mod h1:VzZhTXkMucEGGEOSKddrwGiOv0tUhgnKqNEmIAz/bPU=
-github.com/libp2p/go-msgio v0.0.4/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
-github.com/libp2p/go-msgio v0.0.6/go.mod h1:4ecVB6d9f4BDSL5fqvPiC4A3KivjWn+Venn/1ALLMWA=
-github.com/libp2p/go-openssl v0.0.4/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
-github.com/libp2p/go-openssl v0.0.7 h1:eCAzdLejcNVBzP/iZM9vqHnQm+XyCEbSSIheIPRGNsw=
-github.com/libp2p/go-openssl v0.0.7/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
 github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8=
 github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
@@ -965,13 +934,8 @@ github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3N
 github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM=
 github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 h1:QRUSJEgZn2Snx0EmT/QLXibWjSUDjKWvXIT19NBVp94=
 github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM=
-github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 h1:lYpkrQH5ajf0OXOcUbGjvZxxijuBwbbmlSxLiuofa+g=
-github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ=
 github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g=
 github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY=
-github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
-github.com/minio/sha256-simd v0.1.1 h1:5QHSlgo3nt5yKOJrC7W8w7X+NFl8cMPZm96iu8kKUJU=
-github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
@@ -1003,39 +967,10 @@ github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7P
 github.com/mostynb/zstdpool-freelist v0.0.0-20201229113212-927304c0c3b1 h1:mPMvm6X6tf4w8y7j9YIt6V9jfWhL6QlbEc7CCmeQlWk=
 github.com/mostynb/zstdpool-freelist v0.0.0-20201229113212-927304c0c3b1/go.mod h1:ye2e/VUEtE2BHE+G/QcKkcLQVAEJoYRFj5VUOQatCRE=
 github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ=
-github.com/mr-tron/base58 v1.1.0/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8=
-github.com/mr-tron/base58 v1.1.2/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
-github.com/mr-tron/base58 v1.1.3/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
 github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs=
 github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns=
-github.com/multiformats/go-base32 v0.0.3 h1:tw5+NhuwaOjJCC5Pp82QuXbrmLzWg7uxlMFp8Nq/kkI=
-github.com/multiformats/go-base32 v0.0.3/go.mod h1:pLiuGC8y0QR3Ue4Zug5UzK9LjgbkL8NSQj0zQ5Nz/AA=
-github.com/multiformats/go-base36 v0.1.0 h1:JR6TyF7JjGd3m6FbLU2cOxhC0Li8z8dLNGQ89tUg4F4=
-github.com/multiformats/go-base36 v0.1.0/go.mod h1:kFGE83c6s80PklsHO9sRn2NCoffoRdUUOENyW/Vv6sM=
-github.com/multiformats/go-multiaddr v0.1.1/go.mod h1:aMKBKNEYmzmDmxfX88/vz+J5IU55txyt0p4aiWVohjo=
-github.com/multiformats/go-multiaddr v0.2.1/go.mod h1:s/Apk6IyxfvMjDafnhJgJ3/46z7tZ04iMk5wP4QMGGE=
-github.com/multiformats/go-multiaddr v0.2.2/go.mod h1:NtfXiOtHvghW9KojvtySjH5y0u0xW5UouOmQQrn6a3Y=
-github.com/multiformats/go-multiaddr v0.3.0/go.mod h1:dF9kph9wfJ+3VLAaeBqo9Of8x4fJxp6ggJGteB8HQTI=
-github.com/multiformats/go-multiaddr v0.3.3 h1:vo2OTSAqnENB2rLk79pLtr+uhj+VAzSe3uef5q0lRSs=
-github.com/multiformats/go-multiaddr v0.3.3/go.mod h1:lCKNGP1EQ1eZ35Za2wlqnabm9xQkib3fyB+nZXHLag0=
-github.com/multiformats/go-multiaddr-fmt v0.1.0 h1:WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E=
-github.com/multiformats/go-multiaddr-fmt v0.1.0/go.mod h1:hGtDIW4PU4BqJ50gW2quDuPVjyWNZxToGUh/HwTZYJo=
-github.com/multiformats/go-multiaddr-net v0.1.4/go.mod h1:ilNnaM9HbmVFqsb/qcNysjCu4PVONlrBZpHIrw/qQuA=
-github.com/multiformats/go-multiaddr-net v0.2.0 h1:MSXRGN0mFymt6B1yo/6BPnIRpLPEnKgQNvVfCX5VDJk=
-github.com/multiformats/go-multiaddr-net v0.2.0/go.mod h1:gGdH3UXny6U3cKKYCvpXI5rnK7YaOIEOPVDI9tsJbEA=
-github.com/multiformats/go-multibase v0.0.1/go.mod h1:bja2MqRZ3ggyXtZSEDKpl0uO/gviWFaSteVbWT51qgs=
-github.com/multiformats/go-multibase v0.0.3 h1:l/B6bJDQjvQ5G52jw4QGSYeOTZoAwIO77RblWplfIqk=
-github.com/multiformats/go-multibase v0.0.3/go.mod h1:5+1R4eQrT3PkYZ24C3W2Ue2tPwIdYQD509ZjSb5y9Oc=
-github.com/multiformats/go-multihash v0.0.8/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=
-github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
-github.com/multiformats/go-multihash v0.0.14 h1:QoBceQYQQtNUuf6s7wHxnE2c8bhbMqhfGzNI032se/I=
-github.com/multiformats/go-multihash v0.0.14/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
-github.com/multiformats/go-varint v0.0.2/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
-github.com/multiformats/go-varint v0.0.5/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
-github.com/multiformats/go-varint v0.0.6 h1:gk85QWKxh3TazbLxED/NlDVv8+q+ReFJk7Y2W/KhfNY=
-github.com/multiformats/go-varint v0.0.6/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
 github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w=
@@ -1057,6 +992,7 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
@@ -1075,7 +1011,6 @@ github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/
 github.com/opencontainers/image-spec v1.1.0-rc5/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
 github.com/opencontainers/runc v1.1.10 h1:EaL5WeO9lv9wmS6SASjszOeQdSctvpbu0DdBQBizE40=
 github.com/opencontainers/runc v1.1.10/go.mod h1:+/R6+KmDlh+hOO8NkjmgkG9Qzvypzk0yXxAPYYR65+M=
-github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
@@ -1242,8 +1177,6 @@ github.com/smartcontractkit/wsrpc v0.7.2/go.mod h1:sj7QX2NQibhkhxTfs3KOhAj/5xwgq
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
-github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 h1:RC6RW7j+1+HkWaX/Yh71Ee5ZHaHYt7ZP4sQgUrm6cDU=
-github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572/go.mod h1:w0SWMsp6j9O/dk4/ZpIhL+3CkG8ofA2vuv7k+ltqUMc=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
 github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
@@ -1292,7 +1225,7 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8=
 github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
-github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
+github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
 github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDdvS342BElfbETmL1Aiz3i2t0zfRj16Hs=
 github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48=
 github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c h1:g+WoO5jjkqGAzHWCjJB1zZfXPIAaDpzXIEJ0eS6B5Ok=
@@ -1357,8 +1290,6 @@ github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+
 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
 github.com/vertica/vertica-sql-go v1.3.3 h1:fL+FKEAEy5ONmsvya2WH5T8bhkvY27y/Ik3ReR2T+Qw=
 github.com/vertica/vertica-sql-go v1.3.3/go.mod h1:jnn2GFuv+O2Jcjktb7zyc4Utlbu9YVqpHH/lx63+1M4=
-github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1/go.mod h1:8UvriyWtv5Q5EOgjHaSseUEdkQfvwFv1I/In/O2M9gc=
-github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc/go.mod h1:bopw91TMyo8J3tvftk8xmU2kPmlrt4nScJQZU2hE5EM=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
@@ -1438,7 +1369,6 @@ go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
 go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
-go.uber.org/goleak v1.0.0/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
@@ -1455,7 +1385,6 @@ go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
 go.uber.org/zap v1.14.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
-go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
 go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ=
 go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
 go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
@@ -1463,6 +1392,7 @@ go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
 golang.org/x/arch v0.6.0 h1:S0JTfE48HbRj80+4tbvZDYsJ3tGv6BUU3XxyZ7CirAc=
 golang.org/x/arch v0.6.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
+golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -1471,14 +1401,11 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
@@ -1545,7 +1472,6 @@ golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190227160552-c95aed5357e7/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -1573,6 +1499,7 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
@@ -1664,8 +1591,10 @@ golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -1760,7 +1689,6 @@ golang.org/x/tools v0.0.0-20191010075000-0337d82405ff/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
diff --git a/core/services/keystore/keys/cosmoskey/export.go b/core/services/keystore/keys/cosmoskey/export.go
index a327b60e80a..05061ddb014 100644
--- a/core/services/keystore/keys/cosmoskey/export.go
+++ b/core/services/keystore/keys/cosmoskey/export.go
@@ -33,12 +33,12 @@ func (key Key) ToEncryptedJSON(password string, scryptParams utils.ScryptParams)
 		password,
 		scryptParams,
 		adulteratedPassword,
-		func(id string, key Key, cryptoJSON keystore.CryptoJSON) (keys.EncryptedKeyExport, error) {
+		func(id string, key Key, cryptoJSON keystore.CryptoJSON) keys.EncryptedKeyExport {
 			return keys.EncryptedKeyExport{
 				KeyType:   id,
 				PublicKey: hex.EncodeToString(key.PublicKey().Bytes()),
 				Crypto:    cryptoJSON,
-			}, nil
+			}
 		},
 	)
 }
diff --git a/core/services/keystore/keys/csakey/export.go b/core/services/keystore/keys/csakey/export.go
index a1ad499e0e4..bd0e0229edf 100644
--- a/core/services/keystore/keys/csakey/export.go
+++ b/core/services/keystore/keys/csakey/export.go
@@ -29,12 +29,12 @@ func (k KeyV2) ToEncryptedJSON(password string, scryptParams utils.ScryptParams)
 		password,
 		scryptParams,
 		adulteratedPassword,
-		func(id string, key KeyV2, cryptoJSON keystore.CryptoJSON) (keys.EncryptedKeyExport, error) {
+		func(id string, key KeyV2, cryptoJSON keystore.CryptoJSON) keys.EncryptedKeyExport {
 			return keys.EncryptedKeyExport{
 				KeyType:   id,
 				PublicKey: key.PublicKeyString(),
 				Crypto:    cryptoJSON,
-			}, nil
+			}
 		},
 	)
 }
diff --git a/core/services/keystore/keys/dkgencryptkey/export.go b/core/services/keystore/keys/dkgencryptkey/export.go
index c689c29f661..3bccf1a07ba 100644
--- a/core/services/keystore/keys/dkgencryptkey/export.go
+++ b/core/services/keystore/keys/dkgencryptkey/export.go
@@ -30,12 +30,12 @@ func (k Key) ToEncryptedJSON(password string, scryptParams utils.ScryptParams) (
 		password,
 		scryptParams,
 		adulteratedPassword,
-		func(id string, key Key, cryptoJSON keystore.CryptoJSON) (keys.EncryptedKeyExport, error) {
+		func(id string, key Key, cryptoJSON keystore.CryptoJSON) keys.EncryptedKeyExport {
 			return keys.EncryptedKeyExport{
 				KeyType:   id,
 				PublicKey: key.PublicKeyString(),
 				Crypto:    cryptoJSON,
-			}, nil
+			}
 		})
 }
 
diff --git a/core/services/keystore/keys/dkgsignkey/export.go b/core/services/keystore/keys/dkgsignkey/export.go
index 7ecada8ddc0..3c421760d63 100644
--- a/core/services/keystore/keys/dkgsignkey/export.go
+++ b/core/services/keystore/keys/dkgsignkey/export.go
@@ -31,12 +31,12 @@ func (key Key) ToEncryptedJSON(password string, scryptParams utils.ScryptParams)
 		password,
 		scryptParams,
 		adulteratedPassword,
-		func(id string, key Key, cryptoJSON keystore.CryptoJSON) (keys.EncryptedKeyExport, error) {
+		func(id string, key Key, cryptoJSON keystore.CryptoJSON) keys.EncryptedKeyExport {
 			return keys.EncryptedKeyExport{
 				KeyType:   id,
 				PublicKey: key.PublicKeyString(),
 				Crypto:    cryptoJSON,
-			}, nil
+			}
 		},
 	)
 }
diff --git a/core/services/keystore/keys/exportutils.go b/core/services/keystore/keys/exportutils.go
index 0c3e782a9a4..5d75b5076e6 100644
--- a/core/services/keystore/keys/exportutils.go
+++ b/core/services/keystore/keys/exportutils.go
@@ -3,7 +3,7 @@ package keys
 import (
 	"encoding/json"
 
-	keystore "github.com/ethereum/go-ethereum/accounts/keystore"
+	"github.com/ethereum/go-ethereum/accounts/keystore"
 	"github.com/pkg/errors"
 
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
@@ -62,7 +62,7 @@ func ToEncryptedJSON[E Encrypted, K any](
 	password string,
 	scryptParams utils.ScryptParams,
 	passwordFunc func(string) string,
-	buildExport func(id string, key K, cryptoJSON keystore.CryptoJSON) (E, error),
+	buildExport func(id string, key K, cryptoJSON keystore.CryptoJSON) E,
 ) (export []byte, err error) {
 
 	// encrypt data using prefixed password
@@ -77,10 +77,7 @@ func ToEncryptedJSON[E Encrypted, K any](
 	}
 
 	// build [E] export struct using encrypted key, identifier, and original key [K]
-	encryptedKeyExport, err := buildExport(identifier, key, cryptoJSON)
-	if err != nil {
-		return nil, errors.Wrapf(err, "could not build encrypted export for %s key", identifier)
-	}
+	encryptedKeyExport := buildExport(identifier, key, cryptoJSON)
 
 	return json.Marshal(encryptedKeyExport)
 }
diff --git a/core/services/keystore/keys/ocr2key/export.go b/core/services/keystore/keys/ocr2key/export.go
index 54e73ecf98f..5487e310462 100644
--- a/core/services/keystore/keys/ocr2key/export.go
+++ b/core/services/keystore/keys/ocr2key/export.go
@@ -66,7 +66,7 @@ func ToEncryptedJSON(key KeyBundle, password string, scryptParams utils.ScryptPa
 		password,
 		scryptParams,
 		adulteratedPassword,
-		func(id string, key KeyBundle, cryptoJSON keystore.CryptoJSON) (EncryptedOCRKeyExport, error) {
+		func(id string, key KeyBundle, cryptoJSON keystore.CryptoJSON) EncryptedOCRKeyExport {
 			pubKeyConfig := key.ConfigEncryptionPublicKey()
 			pubKey := key.OffchainPublicKey()
 			return EncryptedOCRKeyExport{
@@ -77,7 +77,7 @@ func ToEncryptedJSON(key KeyBundle, password string, scryptParams utils.ScryptPa
 				OffChainPublicKey: hex.EncodeToString(pubKey[:]),
 				ConfigPublicKey:   hex.EncodeToString(pubKeyConfig[:]),
 				Crypto:            cryptoJSON,
-			}, nil
+			}
 		},
 	)
 }
diff --git a/core/services/keystore/keys/ocrkey/export.go b/core/services/keystore/keys/ocrkey/export.go
index 9f63a3c2d9c..363f38b20ab 100644
--- a/core/services/keystore/keys/ocrkey/export.go
+++ b/core/services/keystore/keys/ocrkey/export.go
@@ -42,7 +42,7 @@ func (key KeyV2) ToEncryptedJSON(password string, scryptParams utils.ScryptParam
 		password,
 		scryptParams,
 		adulteratedPassword,
-		func(id string, key KeyV2, cryptoJSON keystore.CryptoJSON) (EncryptedOCRKeyExport, error) {
+		func(id string, key KeyV2, cryptoJSON keystore.CryptoJSON) EncryptedOCRKeyExport {
 			return EncryptedOCRKeyExport{
 				KeyType:               id,
 				ID:                    key.ID(),
@@ -50,7 +50,7 @@ func (key KeyV2) ToEncryptedJSON(password string, scryptParams utils.ScryptParam
 				OffChainPublicKey:     key.OffChainSigning.PublicKey(),
 				ConfigPublicKey:       key.PublicKeyConfig(),
 				Crypto:                cryptoJSON,
-			}, nil
+			}
 		},
 	)
 }
diff --git a/core/services/keystore/keys/p2pkey/export.go b/core/services/keystore/keys/p2pkey/export.go
index b81cf1d02d2..0db73167c4b 100644
--- a/core/services/keystore/keys/p2pkey/export.go
+++ b/core/services/keystore/keys/p2pkey/export.go
@@ -1,9 +1,7 @@
 package p2pkey
 
 import (
-	keystore "github.com/ethereum/go-ethereum/accounts/keystore"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/pkg/errors"
+	"github.com/ethereum/go-ethereum/accounts/keystore"
 
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
@@ -42,17 +40,13 @@ func (key KeyV2) ToEncryptedJSON(password string, scryptParams utils.ScryptParam
 		password,
 		scryptParams,
 		adulteratedPassword,
-		func(id string, key KeyV2, cryptoJSON keystore.CryptoJSON) (EncryptedP2PKeyExport, error) {
-			rawPubKey, err := key.GetPublic().Bytes()
-			if err != nil {
-				return EncryptedP2PKeyExport{}, errors.Wrapf(err, "could not get raw public key")
-			}
+		func(id string, key KeyV2, cryptoJSON keystore.CryptoJSON) EncryptedP2PKeyExport {
 			return EncryptedP2PKeyExport{
 				KeyType:   id,
-				PublicKey: hexutil.Encode(rawPubKey),
+				PublicKey: key.PublicKeyHex(),
 				PeerID:    key.PeerID(),
 				Crypto:    cryptoJSON,
-			}, nil
+			}
 		},
 	)
 }
diff --git a/core/services/keystore/keys/p2pkey/key.go b/core/services/keystore/keys/p2pkey/key.go
index 6a96103dacb..abf4f70294c 100644
--- a/core/services/keystore/keys/p2pkey/key.go
+++ b/core/services/keystore/keys/p2pkey/key.go
@@ -1,6 +1,7 @@
 package p2pkey
 
 import (
+	"crypto/ed25519"
 	"database/sql/driver"
 	"encoding/hex"
 	"encoding/json"
@@ -8,14 +9,14 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/accounts/keystore"
-	cryptop2p "github.com/libp2p/go-libp2p-core/crypto"
-	"github.com/libp2p/go-libp2p-core/peer"
 	"github.com/pkg/errors"
+
+	ragep2ptypes "github.com/smartcontractkit/libocr/ragep2p/types"
 )
 
-// Key represents a libp2p private key
+// Key represents a p2p private key
 type Key struct {
-	cryptop2p.PrivKey
+	PrivKey ed25519.PrivateKey
 }
 
 func (k Key) ToV2() KeyV2 {
@@ -25,7 +26,7 @@ func (k Key) ToV2() KeyV2 {
 	}
 }
 
-// PublicKeyBytes is generated using cryptop2p.PubKey.Raw()
+// PublicKeyBytes is a [ed25519.PublicKey]
 type PublicKeyBytes []byte
 
 func (pkb PublicKeyBytes) String() string {
@@ -47,7 +48,7 @@ func (pkb *PublicKeyBytes) UnmarshalJSON(input []byte) error {
 		return err
 	}
 
-	*pkb = PublicKeyBytes(result)
+	*pkb = result
 	return nil
 }
 
@@ -66,19 +67,19 @@ func (pkb PublicKeyBytes) Value() (driver.Value, error) {
 }
 
 func (k Key) GetPeerID() (PeerID, error) {
-	peerID, err := peer.IDFromPrivateKey(k)
+	peerID, err := ragep2ptypes.PeerIDFromPrivateKey(k.PrivKey)
 	if err != nil {
-		return "", errors.WithStack(err)
+		return PeerID{}, errors.WithStack(err)
 	}
 	return PeerID(peerID), err
 }
 
 func (k Key) PeerID() PeerID {
-	peerID, err := peer.IDFromPrivateKey(k)
+	peerID, err := k.GetPeerID()
 	if err != nil {
 		panic(err)
 	}
-	return PeerID(peerID)
+	return peerID
 }
 
 type EncryptedP2PKey struct {
@@ -113,7 +114,8 @@ func (ep2pk EncryptedP2PKey) Decrypt(auth string) (k Key, err error) {
 	if err != nil {
 		return k, errors.Wrapf(err, "could not decrypt P2P key %s (0x%x)", ep2pk.PeerID.String(), ep2pk.PubKey)
 	}
-	privK, err := cryptop2p.UnmarshalPrivateKey(marshalledPrivK)
+
+	privK, err := UnmarshalPrivateKey(marshalledPrivK)
 	if err != nil {
 		return k, errors.Wrapf(err, "could not unmarshal P2P private key for %s (0x%x)", ep2pk.PeerID.String(), ep2pk.PubKey)
 	}
diff --git a/core/services/keystore/keys/p2pkey/key_test.go b/core/services/keystore/keys/p2pkey/key_test.go
index fc111f14219..57490483e86 100644
--- a/core/services/keystore/keys/p2pkey/key_test.go
+++ b/core/services/keystore/keys/p2pkey/key_test.go
@@ -1,13 +1,13 @@
 package p2pkey
 
 import (
+	"crypto/ed25519"
 	"crypto/rand"
 	"encoding/hex"
 	"encoding/json"
 	"testing"
 
 	"github.com/ethereum/go-ethereum/accounts/keystore"
-	cryptop2p "github.com/libp2p/go-libp2p-core/crypto"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -15,7 +15,7 @@ import (
 )
 
 func TestP2PKeys_KeyStruct(t *testing.T) {
-	pk, _, err := cryptop2p.GenerateEd25519Key(rand.Reader)
+	_, pk, err := ed25519.GenerateKey(rand.Reader)
 	require.NoError(t, err)
 
 	k := Key{PrivKey: pk}
@@ -37,12 +37,10 @@ func TestP2PKeys_KeyStruct(t *testing.T) {
 }
 
 func TestP2PKeys_PublicKeyBytes(t *testing.T) {
-	_, pk, err := cryptop2p.GenerateEd25519Key(rand.Reader)
-	require.NoError(t, err)
-	r, err := pk.Raw()
+	pk, _, err := ed25519.GenerateKey(rand.Reader)
 	require.NoError(t, err)
 
-	pkb := PublicKeyBytes(r)
+	pkb := PublicKeyBytes(pk)
 	assert.Equal(t, hex.EncodeToString(pkb), pkb.String())
 
 	b, err := pkb.MarshalJSON()
@@ -55,7 +53,7 @@ func TestP2PKeys_PublicKeyBytes(t *testing.T) {
 	err = pkb.UnmarshalJSON([]byte(""))
 	assert.Error(t, err)
 
-	err = pkb.Scan(r)
+	err = pkb.Scan([]byte(pk))
 	assert.NoError(t, err)
 
 	err = pkb.Scan("invalid-type")
@@ -67,16 +65,15 @@ func TestP2PKeys_PublicKeyBytes(t *testing.T) {
 }
 
 func TestP2PKeys_EncryptedP2PKey(t *testing.T) {
-	privk, _, err := cryptop2p.GenerateEd25519Key(rand.Reader)
+	_, privk, err := ed25519.GenerateKey(rand.Reader)
 	require.NoError(t, err)
 
 	k := Key{PrivKey: privk}
 
-	pubkr, err := k.GetPublic().Raw()
-	require.NoError(t, err)
+	pubkr := k.PrivKey.Public().(ed25519.PublicKey)
 
 	var marshalledPrivK []byte
-	marshalledPrivK, err = cryptop2p.MarshalPrivateKey(k)
+	marshalledPrivK, err = MarshalPrivateKey(k.PrivKey)
 	require.NoError(t, err)
 	cryptoJSON, err := keystore.EncryptDataV3(marshalledPrivK, []byte(adulteratedPassword("password")), utils.FastScryptParams.N, utils.FastScryptParams.P)
 	require.NoError(t, err)
@@ -86,7 +83,7 @@ func TestP2PKeys_EncryptedP2PKey(t *testing.T) {
 	p2pk := EncryptedP2PKey{
 		ID:               1,
 		PeerID:           k.PeerID(),
-		PubKey:           pubkr,
+		PubKey:           []byte(pubkr),
 		EncryptedPrivKey: encryptedPrivKey,
 	}
 
diff --git a/core/services/keystore/keys/p2pkey/key_v2.go b/core/services/keystore/keys/p2pkey/key_v2.go
index d92302cf5f9..6af71d5e2d7 100644
--- a/core/services/keystore/keys/p2pkey/key_v2.go
+++ b/core/services/keystore/keys/p2pkey/key_v2.go
@@ -1,20 +1,24 @@
 package p2pkey
 
 import (
+	"bytes"
 	"crypto/ed25519"
 	"crypto/rand"
 	"encoding/hex"
+	"errors"
 	"fmt"
 	"math/big"
 
-	cryptop2p "github.com/libp2p/go-libp2p-core/crypto"
-	peer "github.com/libp2p/go-libp2p-core/peer"
+	"github.com/smartcontractkit/libocr/ragep2p/types"
 )
 
+var libp2pPBPrefix = []byte{0x08, 0x01, 0x12, 0x40}
+
+// Raw is an encoded protocol buffer.
 type Raw []byte
 
 func (raw Raw) Key() KeyV2 {
-	privKey, err := cryptop2p.UnmarshalPrivateKey(raw)
+	privKey, err := UnmarshalPrivateKey(raw)
 	if err != nil {
 		panic(err)
 	}
@@ -25,6 +29,17 @@ func (raw Raw) Key() KeyV2 {
 	return key
 }
 
+func UnmarshalPrivateKey(raw Raw) (ed25519.PrivateKey, error) {
+	if !bytes.HasPrefix(raw, libp2pPBPrefix) {
+		return nil, errors.New("invalid key: missing libp2p protobuf prefix")
+	}
+	return ed25519.PrivateKey(raw[len(libp2pPBPrefix):]), nil
+}
+
+func MarshalPrivateKey(key ed25519.PrivateKey) ([]byte, error) {
+	return bytes.Join([][]byte{libp2pPBPrefix, key}, nil), nil
+}
+
 func (raw Raw) String() string {
 	return "<P2P Raw Private Key>"
 }
@@ -36,12 +51,12 @@ func (raw Raw) GoString() string {
 var _ fmt.GoStringer = &KeyV2{}
 
 type KeyV2 struct {
-	cryptop2p.PrivKey
-	peerID PeerID
+	PrivKey ed25519.PrivateKey
+	peerID  PeerID
 }
 
 func NewV2() (KeyV2, error) {
-	privKey, _, err := cryptop2p.GenerateEd25519Key(rand.Reader)
+	_, privKey, err := ed25519.GenerateKey(rand.Reader)
 	if err != nil {
 		return KeyV2{}, err
 	}
@@ -52,11 +67,7 @@ func MustNewV2XXXTestingOnly(k *big.Int) KeyV2 {
 	seed := make([]byte, ed25519.SeedSize)
 	copy(seed, k.Bytes())
 	pk := ed25519.NewKeyFromSeed(seed[:])
-	p2pPrivKey, err := cryptop2p.UnmarshalEd25519PrivateKey(pk[:])
-	if err != nil {
-		panic(err)
-	}
-	key, err := fromPrivkey(p2pPrivKey)
+	key, err := fromPrivkey(pk)
 	if err != nil {
 		panic(err)
 	}
@@ -64,11 +75,11 @@ func MustNewV2XXXTestingOnly(k *big.Int) KeyV2 {
 }
 
 func (key KeyV2) ID() string {
-	return peer.ID(key.peerID).String()
+	return types.PeerID(key.peerID).String()
 }
 
 func (key KeyV2) Raw() Raw {
-	marshalledPrivK, err := cryptop2p.MarshalPrivateKey(key.PrivKey)
+	marshalledPrivK, err := MarshalPrivateKey(key.PrivKey)
 	if err != nil {
 		panic(err)
 	}
@@ -80,10 +91,7 @@ func (key KeyV2) PeerID() PeerID {
 }
 
 func (key KeyV2) PublicKeyHex() string {
-	pubKeyBytes, err := key.GetPublic().Raw()
-	if err != nil {
-		panic(err)
-	}
+	pubKeyBytes := key.PrivKey.Public().(ed25519.PublicKey)
 	return hex.EncodeToString(pubKeyBytes)
 }
 
@@ -95,8 +103,8 @@ func (key KeyV2) GoString() string {
 	return key.String()
 }
 
-func fromPrivkey(privKey cryptop2p.PrivKey) (KeyV2, error) {
-	peerID, err := peer.IDFromPrivateKey(privKey)
+func fromPrivkey(privKey ed25519.PrivateKey) (KeyV2, error) {
+	peerID, err := types.PeerIDFromPrivateKey(privKey)
 	if err != nil {
 		return KeyV2{}, err
 	}
diff --git a/core/services/keystore/keys/p2pkey/key_v2_test.go b/core/services/keystore/keys/p2pkey/key_v2_test.go
index 53c3c302384..d93678b8f2d 100644
--- a/core/services/keystore/keys/p2pkey/key_v2_test.go
+++ b/core/services/keystore/keys/p2pkey/key_v2_test.go
@@ -1,38 +1,36 @@
 package p2pkey
 
 import (
+	"crypto/ed25519"
 	"crypto/rand"
 	"encoding/hex"
 	"testing"
 
-	cryptop2p "github.com/libp2p/go-libp2p-core/crypto"
-	"github.com/libp2p/go-libp2p-core/peer"
+	ragep2ptypes "github.com/smartcontractkit/libocr/ragep2p/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 func TestP2PKeys_Raw(t *testing.T) {
-	pk, _, err := cryptop2p.GenerateEd25519Key(rand.Reader)
-	require.NoError(t, err)
-	pkr, err := pk.Raw()
+	_, pk, err := ed25519.GenerateKey(rand.Reader)
 	require.NoError(t, err)
 
-	r := Raw(pkr)
+	r := Raw(pk)
 
 	assert.Equal(t, r.String(), r.GoString())
 	assert.Equal(t, "<P2P Raw Private Key>", r.String())
 }
 
 func TestP2PKeys_KeyV2(t *testing.T) {
-	pk, _, err := cryptop2p.GenerateEd25519Key(rand.Reader)
+	_, pk, err := ed25519.GenerateKey(rand.Reader)
 	require.NoError(t, err)
 
 	k := Key{PrivKey: pk}
 	kv2 := k.ToV2()
-	pkv2, err := kv2.GetPublic().Raw()
-	require.NoError(t, err)
+
+	pkv2 := kv2.PrivKey.Public().(ed25519.PublicKey)
 
 	assert.Equal(t, kv2.String(), kv2.GoString())
-	assert.Equal(t, peer.ID(k.PeerID()).String(), kv2.ID())
+	assert.Equal(t, ragep2ptypes.PeerID(k.PeerID()).String(), kv2.ID())
 	assert.Equal(t, hex.EncodeToString(pkv2), kv2.PublicKeyHex())
 }
diff --git a/core/services/keystore/keys/p2pkey/peer_id.go b/core/services/keystore/keys/p2pkey/peer_id.go
index 2147fa97744..38fbc471b59 100644
--- a/core/services/keystore/keys/p2pkey/peer_id.go
+++ b/core/services/keystore/keys/p2pkey/peer_id.go
@@ -6,13 +6,14 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/libp2p/go-libp2p-core/peer"
 	"github.com/pkg/errors"
+
+	"github.com/smartcontractkit/libocr/ragep2p/types"
 )
 
 const peerIDPrefix = "p2p_"
 
-type PeerID peer.ID
+type PeerID types.PeerID
 
 func MakePeerID(s string) (PeerID, error) {
 	var peerID PeerID
@@ -22,15 +23,14 @@ func MakePeerID(s string) (PeerID, error) {
 func (p PeerID) String() string {
 	// Handle a zero peerID more gracefully, i.e. print it as empty string rather
 	// than `p2p_`
-	raw := p.Raw()
-	if raw == "" {
+	if p == (PeerID{}) {
 		return ""
 	}
-	return fmt.Sprintf("%s%s", peerIDPrefix, raw)
+	return fmt.Sprintf("%s%s", peerIDPrefix, p.Raw())
 }
 
 func (p PeerID) Raw() string {
-	return peer.ID(p).String()
+	return types.PeerID(p).String()
 }
 
 func (p *PeerID) UnmarshalString(s string) error {
@@ -38,6 +38,9 @@ func (p *PeerID) UnmarshalString(s string) error {
 }
 
 func (p *PeerID) MarshalText() ([]byte, error) {
+	if *p == (PeerID{}) {
+		return nil, nil
+	}
 	return []byte(p.Raw()), nil
 }
 
@@ -51,7 +54,8 @@ func (p *PeerID) UnmarshalText(bs []byte) error {
 		return nil
 	}
 
-	peerID, err := peer.Decode(input)
+	var peerID types.PeerID
+	err := peerID.UnmarshalText([]byte(input))
 	if err != nil {
 		return errors.Wrapf(err, `PeerID#UnmarshalText("%v")`, input)
 	}
@@ -60,7 +64,7 @@ func (p *PeerID) UnmarshalText(bs []byte) error {
 }
 
 func (p *PeerID) Scan(value interface{}) error {
-	*p = PeerID("")
+	*p = PeerID{}
 	switch s := value.(type) {
 	case string:
 		if s != "" {
@@ -74,7 +78,8 @@ func (p *PeerID) Scan(value interface{}) error {
 }
 
 func (p PeerID) Value() (driver.Value, error) {
-	return peer.Encode(peer.ID(p)), nil
+	b, err := types.PeerID(p).MarshalText()
+	return string(b), err
 }
 
 func (p PeerID) MarshalJSON() ([]byte, error) {
diff --git a/core/services/keystore/keys/p2pkey/peer_id_test.go b/core/services/keystore/keys/p2pkey/peer_id_test.go
index 197c54624fb..c648fec8de8 100644
--- a/core/services/keystore/keys/p2pkey/peer_id_test.go
+++ b/core/services/keystore/keys/p2pkey/peer_id_test.go
@@ -10,16 +10,16 @@ import (
 
 func TestP2PKeys_PeerID(t *testing.T) {
 	t.Run("make peer ID", func(t *testing.T) {
-		id, err := MakePeerID("11")
+		id, err := MakePeerID("12D3KooWM1111111111111111111111111111111111111111111")
 		require.NoError(t, err)
 		_, err = MakePeerID("invalid")
 		assert.Error(t, err)
 
-		assert.Equal(t, "p2p_11", id.String())
+		assert.Equal(t, "p2p_12D3KooWM1111111111111111111111111111111111111111111", id.String())
 	})
 
 	t.Run("unmarshals new ID", func(t *testing.T) {
-		id, err := MakePeerID("11")
+		id, err := MakePeerID("12D3KooWM1111111111111111111111111111111111111111111")
 		require.NoError(t, err)
 		fakeKey := MustNewV2XXXTestingOnly(big.NewInt(1))
 
@@ -30,7 +30,7 @@ func TestP2PKeys_PeerID(t *testing.T) {
 	})
 
 	t.Run("scans new ID", func(t *testing.T) {
-		id, err := MakePeerID("11")
+		id, err := MakePeerID("12D3KooWM1111111111111111111111111111111111111111111")
 		require.NoError(t, err)
 		fakeKey := MustNewV2XXXTestingOnly(big.NewInt(1))
 
diff --git a/core/services/keystore/keys/solkey/export.go b/core/services/keystore/keys/solkey/export.go
index 27f19fb5ed5..59e84136bc6 100644
--- a/core/services/keystore/keys/solkey/export.go
+++ b/core/services/keystore/keys/solkey/export.go
@@ -33,12 +33,12 @@ func (key Key) ToEncryptedJSON(password string, scryptParams utils.ScryptParams)
 		password,
 		scryptParams,
 		adulteratedPassword,
-		func(id string, key Key, cryptoJSON keystore.CryptoJSON) (keys.EncryptedKeyExport, error) {
+		func(id string, key Key, cryptoJSON keystore.CryptoJSON) keys.EncryptedKeyExport {
 			return keys.EncryptedKeyExport{
 				KeyType:   id,
 				PublicKey: hex.EncodeToString(key.pubKey),
 				Crypto:    cryptoJSON,
-			}, nil
+			}
 		},
 	)
 }
diff --git a/core/services/keystore/keys/starkkey/export.go b/core/services/keystore/keys/starkkey/export.go
index 366243a8da2..26770028ca9 100644
--- a/core/services/keystore/keys/starkkey/export.go
+++ b/core/services/keystore/keys/starkkey/export.go
@@ -31,12 +31,12 @@ func ToEncryptedJSON(key Key, password string, scryptParams utils.ScryptParams)
 		password,
 		scryptParams,
 		adulteratedPassword,
-		func(id string, key Key, cryptoJSON keystore.CryptoJSON) (keys.EncryptedKeyExport, error) {
+		func(id string, key Key, cryptoJSON keystore.CryptoJSON) keys.EncryptedKeyExport {
 			return keys.EncryptedKeyExport{
 				KeyType:   id,
 				PublicKey: key.StarkKeyStr(),
 				Crypto:    cryptoJSON,
-			}, nil
+			}
 		},
 	)
 }
diff --git a/core/services/keystore/models_test.go b/core/services/keystore/models_test.go
index f124f16d9b3..93c0f5fcb25 100644
--- a/core/services/keystore/models_test.go
+++ b/core/services/keystore/models_test.go
@@ -98,9 +98,9 @@ func TestKeyRing_Encrypt_Decrypt(t *testing.T) {
 		}
 		// compare p2p keys
 		require.Equal(t, 2, len(decryptedKeyRing.P2P))
-		require.Equal(t, originalKeyRing.P2P[p2p1.ID()].GetPublic(), decryptedKeyRing.P2P[p2p1.ID()].GetPublic())
+		require.Equal(t, originalKeyRing.P2P[p2p1.ID()].PublicKeyHex(), decryptedKeyRing.P2P[p2p1.ID()].PublicKeyHex())
 		require.Equal(t, originalKeyRing.P2P[p2p1.ID()].PeerID(), decryptedKeyRing.P2P[p2p1.ID()].PeerID())
-		require.Equal(t, originalKeyRing.P2P[p2p2.ID()].GetPublic(), decryptedKeyRing.P2P[p2p2.ID()].GetPublic())
+		require.Equal(t, originalKeyRing.P2P[p2p2.ID()].PublicKeyHex(), decryptedKeyRing.P2P[p2p2.ID()].PublicKeyHex())
 		require.Equal(t, originalKeyRing.P2P[p2p2.ID()].PeerID(), decryptedKeyRing.P2P[p2p2.ID()].PeerID())
 		// compare solana keys
 		require.Equal(t, 2, len(decryptedKeyRing.Solana))
diff --git a/core/services/keystore/p2p.go b/core/services/keystore/p2p.go
index 657dfbc8973..ee2c64c021d 100644
--- a/core/services/keystore/p2p.go
+++ b/core/services/keystore/p2p.go
@@ -160,7 +160,7 @@ func (ks *p2p) GetOrFirst(id p2pkey.PeerID) (p2pkey.KeyV2, error) {
 	if ks.isLocked() {
 		return p2pkey.KeyV2{}, ErrLocked
 	}
-	if id != "" {
+	if id != (p2pkey.PeerID{}) {
 		return ks.getByID(id)
 	} else if len(ks.keyRing.P2P) == 1 {
 		ks.logger.Warn("No P2P.PeerID set, defaulting to first key in database")
diff --git a/core/services/keystore/p2p_test.go b/core/services/keystore/p2p_test.go
index 89cab3e1621..829df9812fd 100644
--- a/core/services/keystore/p2p_test.go
+++ b/core/services/keystore/p2p_test.go
@@ -1,8 +1,10 @@
 package keystore_test
 
 import (
+	"crypto/rand"
 	"fmt"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -13,7 +15,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/p2pkey"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocrcommon"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -39,7 +40,10 @@ func Test_P2PKeyStore_E2E(t *testing.T) {
 
 	t.Run("errors when getting non-existent ID", func(t *testing.T) {
 		defer reset()
-		_, err := ks.Get("non-existent-id")
+		var nonExistent p2pkey.PeerID
+		_, err := rand.Read(nonExistent[:])
+		require.NoError(t, err)
+		_, err = ks.Get(nonExistent)
 		require.Error(t, err)
 	})
 
@@ -58,7 +62,10 @@ func Test_P2PKeyStore_E2E(t *testing.T) {
 		require.NoError(t, err)
 		exportJSON, err := ks.Export(key.PeerID(), cltest.Password)
 		require.NoError(t, err)
-		_, err = ks.Export("non-existent", cltest.Password)
+		var nonExistent p2pkey.PeerID
+		_, err = rand.Read(nonExistent[:])
+		require.NoError(t, err)
+		_, err = ks.Export(nonExistent, cltest.Password)
 		assert.Error(t, err)
 		_, err = ks.Delete(key.PeerID())
 		require.NoError(t, err)
@@ -117,14 +124,14 @@ func Test_P2PKeyStore_E2E(t *testing.T) {
 
 	t.Run("GetOrFirst", func(t *testing.T) {
 		defer reset()
-		_, err := ks.GetOrFirst("")
+		_, err := ks.GetOrFirst(p2pkey.PeerID{})
 		require.Contains(t, err.Error(), "no p2p keys exist")
-		id := p2pkey.PeerID("a0")
+		id := p2pkey.PeerID{0xa0}
 		_, err = ks.GetOrFirst(id)
 		require.Contains(t, err.Error(), fmt.Sprintf("unable to find P2P key with id %s", id))
 		k1, err := ks.Create()
 		require.NoError(t, err)
-		k2, err := ks.GetOrFirst("")
+		k2, err := ks.GetOrFirst(p2pkey.PeerID{})
 		require.NoError(t, err)
 		require.Equal(t, k1, k2)
 		k3, err := ks.GetOrFirst(k1.PeerID())
@@ -132,7 +139,7 @@ func Test_P2PKeyStore_E2E(t *testing.T) {
 		require.Equal(t, k1, k3)
 		_, err = ks.Create()
 		require.NoError(t, err)
-		_, err = ks.GetOrFirst("")
+		_, err = ks.GetOrFirst(p2pkey.PeerID{})
 		require.Contains(t, err.Error(), "multiple p2p keys found")
 		//Check for possible keys in error message
 		require.Contains(t, err.Error(), k1.ID())
@@ -147,12 +154,19 @@ func Test_P2PKeyStore_E2E(t *testing.T) {
 	t.Run("clears p2p_peers on delete", func(t *testing.T) {
 		key, err := ks.Create()
 		require.NoError(t, err)
-		p2pPeer1 := ocrcommon.P2PPeer{
+		type P2PPeer struct {
+			ID        string
+			Addr      string
+			PeerID    string
+			CreatedAt time.Time
+			UpdatedAt time.Time
+		}
+		p2pPeer1 := P2PPeer{
 			ID:     cltest.NewPeerID().String(),
 			Addr:   testutils.NewAddress().Hex(),
 			PeerID: cltest.DefaultPeerID, // different p2p key
 		}
-		p2pPeer2 := ocrcommon.P2PPeer{
+		p2pPeer2 := P2PPeer{
 			ID:     cltest.NewPeerID().String(),
 			Addr:   testutils.NewAddress().Hex(),
 			PeerID: key.PeerID().Raw(),
diff --git a/core/services/ocrcommon/discoverer_database.go b/core/services/ocrcommon/discoverer_database.go
index 0a855665575..6468a910a65 100644
--- a/core/services/ocrcommon/discoverer_database.go
+++ b/core/services/ocrcommon/discoverer_database.go
@@ -5,10 +5,10 @@ import (
 	"database/sql"
 
 	"github.com/lib/pq"
-	p2ppeer "github.com/libp2p/go-libp2p-core/peer"
 	"github.com/pkg/errors"
-	ocrnetworking "github.com/smartcontractkit/libocr/networking/types"
 	"go.uber.org/multierr"
+
+	ocrnetworking "github.com/smartcontractkit/libocr/networking/types"
 )
 
 var _ ocrnetworking.DiscovererDatabase = &DiscovererDatabase{}
@@ -18,10 +18,10 @@ type DiscovererDatabase struct {
 	peerID string
 }
 
-func NewDiscovererDatabase(db *sql.DB, peerID p2ppeer.ID) *DiscovererDatabase {
+func NewDiscovererDatabase(db *sql.DB, peerID string) *DiscovererDatabase {
 	return &DiscovererDatabase{
 		db,
-		peerID.Pretty(),
+		peerID,
 	}
 }
 
diff --git a/core/services/ocrcommon/discoverer_database_test.go b/core/services/ocrcommon/discoverer_database_test.go
index ff1a931b017..b7a79e92bce 100644
--- a/core/services/ocrcommon/discoverer_database_test.go
+++ b/core/services/ocrcommon/discoverer_database_test.go
@@ -1,16 +1,17 @@
 package ocrcommon_test
 
 import (
+	"crypto/ed25519"
 	"crypto/rand"
 	"testing"
 
-	cryptop2p "github.com/libp2p/go-libp2p-core/crypto"
-	p2ppeer "github.com/libp2p/go-libp2p-core/peer"
+	ragep2ptypes "github.com/smartcontractkit/libocr/ragep2p/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
+	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/p2pkey"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocrcommon"
 )
 
@@ -20,8 +21,8 @@ func Test_DiscovererDatabase(t *testing.T) {
 	localPeerID1 := mustRandomP2PPeerID(t)
 	localPeerID2 := mustRandomP2PPeerID(t)
 
-	dd1 := ocrcommon.NewDiscovererDatabase(db, localPeerID1)
-	dd2 := ocrcommon.NewDiscovererDatabase(db, localPeerID2)
+	dd1 := ocrcommon.NewDiscovererDatabase(db, localPeerID1.Raw())
+	dd2 := ocrcommon.NewDiscovererDatabase(db, localPeerID2.Raw())
 
 	ctx := testutils.Context(t)
 
@@ -73,7 +74,7 @@ func Test_DiscovererDatabase(t *testing.T) {
 	})
 
 	t.Run("persists data across restarts", func(t *testing.T) {
-		dd3 := ocrcommon.NewDiscovererDatabase(db, localPeerID1)
+		dd3 := ocrcommon.NewDiscovererDatabase(db, localPeerID1.Raw())
 
 		announcements, err := dd3.ReadAnnouncements(ctx, []string{"remote1"})
 		require.NoError(t, err)
@@ -83,10 +84,10 @@ func Test_DiscovererDatabase(t *testing.T) {
 	})
 }
 
-func mustRandomP2PPeerID(t *testing.T) p2ppeer.ID {
-	p2pPrivkey, _, err := cryptop2p.GenerateEd25519Key(rand.Reader)
+func mustRandomP2PPeerID(t *testing.T) p2pkey.PeerID {
+	_, p2pPrivkey, err := ed25519.GenerateKey(rand.Reader)
 	require.NoError(t, err)
-	id, err := p2ppeer.IDFromPrivateKey(p2pPrivkey)
+	id, err := ragep2ptypes.PeerIDFromPrivateKey(p2pPrivkey)
 	require.NoError(t, err)
-	return id
+	return p2pkey.PeerID(id)
 }
diff --git a/core/services/ocrcommon/peer_wrapper.go b/core/services/ocrcommon/peer_wrapper.go
index ff666eefdba..1b8ebfcdb22 100644
--- a/core/services/ocrcommon/peer_wrapper.go
+++ b/core/services/ocrcommon/peer_wrapper.go
@@ -2,15 +2,10 @@ package ocrcommon
 
 import (
 	"context"
-	"crypto/ed25519"
-	"fmt"
 	"io"
 
-	p2ppeer "github.com/libp2p/go-libp2p-core/peer"
-	"github.com/pkg/errors"
-	"go.uber.org/multierr"
-
 	"github.com/jmoiron/sqlx"
+	"github.com/pkg/errors"
 
 	ocrnetworking "github.com/smartcontractkit/libocr/networking"
 	ocr1types "github.com/smartcontractkit/libocr/offchainreporting/types"
@@ -44,14 +39,13 @@ type (
 	// SingletonPeerWrapper manages all libocr peers for the application
 	SingletonPeerWrapper struct {
 		services.StateMachine
-		keyStore      keystore.Master
-		p2pCfg        config.P2P
-		ocrCfg        PeerWrapperOCRConfig
-		dbConfig      pg.QConfig
-		db            *sqlx.DB
-		lggr          logger.Logger
-		PeerID        p2pkey.PeerID
-		pstoreWrapper *Pstorewrapper
+		keyStore keystore.Master
+		p2pCfg   config.P2P
+		ocrCfg   PeerWrapperOCRConfig
+		dbConfig pg.QConfig
+		db       *sqlx.DB
+		lggr     logger.Logger
+		PeerID   p2pkey.PeerID
 
 		// Used at shutdown to stop all of this peer's goroutines
 		peerCloser io.Closer
@@ -125,15 +119,11 @@ func (p *SingletonPeerWrapper) peerConfig() (ocrnetworking.PeerConfig, error) {
 	}
 	p.PeerID = key.PeerID()
 
-	discovererDB := NewDiscovererDatabase(p.db.DB, p2ppeer.ID(p.PeerID))
+	discovererDB := NewDiscovererDatabase(p.db.DB, p.PeerID.Raw())
 
 	config := p.p2pCfg
-	pk, err := key.PrivKey.Raw()
-	if err != nil {
-		return ocrnetworking.PeerConfig{}, fmt.Errorf("failed to get raw private key: %w", err)
-	}
 	peerConfig := ocrnetworking.PeerConfig{
-		PrivKey: ed25519.PrivateKey(pk),
+		PrivKey: key.PrivKey,
 		Logger:  commonlogger.NewOCRWrapper(p.lggr, p.ocrCfg.TraceLogging(), func(string) {}),
 
 		// V2 config
@@ -158,9 +148,6 @@ func (p *SingletonPeerWrapper) Close() error {
 		if p.peerCloser != nil {
 			err = p.peerCloser.Close()
 		}
-		if p.pstoreWrapper != nil {
-			err = multierr.Combine(err, p.pstoreWrapper.Close())
-		}
 		return err
 	})
 }
diff --git a/core/services/ocrcommon/peer_wrapper_test.go b/core/services/ocrcommon/peer_wrapper_test.go
index dbe22523728..278e0684fd2 100644
--- a/core/services/ocrcommon/peer_wrapper_test.go
+++ b/core/services/ocrcommon/peer_wrapper_test.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/consul/sdk/freeport"
-	p2ppeer "github.com/libp2p/go-libp2p-core/peer"
+	ragep2ptypes "github.com/smartcontractkit/libocr/ragep2p/types"
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
@@ -26,8 +26,8 @@ func Test_SingletonPeerWrapper_Start(t *testing.T) {
 
 	db := pgtest.NewSqlxDB(t)
 
-	peerID, err := p2ppeer.Decode(configtest.DefaultPeerID)
-	require.NoError(t, err)
+	var peerID ragep2ptypes.PeerID
+	require.NoError(t, peerID.UnmarshalText([]byte(configtest.DefaultPeerID)))
 
 	t.Run("with no p2p keys returns error", func(t *testing.T) {
 		cfg := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
diff --git a/core/services/ocrcommon/peerstore.go b/core/services/ocrcommon/peerstore.go
deleted file mode 100644
index 1d859184ab5..00000000000
--- a/core/services/ocrcommon/peerstore.go
+++ /dev/null
@@ -1,182 +0,0 @@
-package ocrcommon
-
-import (
-	"context"
-	"fmt"
-	"strings"
-	"time"
-
-	p2ppeer "github.com/libp2p/go-libp2p-core/peer"
-	p2ppeerstore "github.com/libp2p/go-libp2p-core/peerstore"
-	"github.com/libp2p/go-libp2p-peerstore/pstoremem"
-	ma "github.com/multiformats/go-multiaddr"
-	"github.com/pkg/errors"
-
-	"github.com/jmoiron/sqlx"
-
-	"github.com/smartcontractkit/chainlink-common/pkg/services"
-
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/recovery"
-	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/p2pkey"
-	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
-)
-
-type (
-	P2PPeer struct {
-		ID        string
-		Addr      string
-		PeerID    string
-		CreatedAt time.Time
-		UpdatedAt time.Time
-	}
-
-	Pstorewrapper struct {
-		services.StateMachine
-		Peerstore     p2ppeerstore.Peerstore
-		peerID        string
-		q             pg.Q
-		writeInterval time.Duration
-		ctx           context.Context
-		ctxCancel     context.CancelFunc
-		chDone        chan struct{}
-		lggr          logger.SugaredLogger
-	}
-)
-
-// NewPeerstoreWrapper creates a new database-backed peerstore wrapper scoped to the given jobID
-// Multiple peerstore wrappers should not be instantiated with the same jobID
-func NewPeerstoreWrapper(db *sqlx.DB, writeInterval time.Duration, peerID p2pkey.PeerID, lggr logger.Logger, cfg pg.QConfig) (*Pstorewrapper, error) {
-	ctx, cancel := context.WithCancel(context.Background())
-	namedLogger := lggr.Named("PeerStore")
-	q := pg.NewQ(db, namedLogger, cfg)
-
-	return &Pstorewrapper{
-		services.StateMachine{},
-		pstoremem.NewPeerstore(),
-		peerID.Raw(),
-		q,
-		writeInterval,
-		ctx,
-		cancel,
-		make(chan struct{}),
-		logger.Sugared(namedLogger),
-	}, nil
-}
-
-func (p *Pstorewrapper) Start() error {
-	return p.StartOnce("PeerStore", func() error {
-		err := p.readFromDB()
-		if err != nil {
-			return errors.Wrap(err, "could not start peerstore wrapper")
-		}
-		go p.dbLoop()
-		return nil
-	})
-}
-
-func (p *Pstorewrapper) dbLoop() {
-	defer close(p.chDone)
-	ticker := time.NewTicker(utils.WithJitter(p.writeInterval))
-	defer ticker.Stop()
-	for {
-		select {
-		case <-p.ctx.Done():
-			return
-		case <-ticker.C:
-			recovery.WrapRecover(p.lggr, func() {
-				if err := p.WriteToDB(); err != nil {
-					p.lggr.Errorw("Error writing peerstore to DB", "err", err)
-				}
-			})
-		}
-	}
-}
-
-func (p *Pstorewrapper) Close() error {
-	return p.StopOnce("PeerStore", func() error {
-		p.ctxCancel()
-		<-p.chDone
-		return p.Peerstore.Close()
-	})
-}
-
-func (p *Pstorewrapper) readFromDB() error {
-	peers, err := p.getPeers()
-	if err != nil {
-		return err
-	}
-	for _, peer := range peers {
-		peerID, err := p2ppeer.Decode(peer.ID)
-		if err != nil {
-			return errors.Wrapf(err, "unexpectedly failed to decode peer ID '%s'", peer.ID)
-		}
-		peerAddr, err := ma.NewMultiaddr(peer.Addr)
-		if err != nil {
-			return errors.Wrapf(err, "unexpectedly failed to decode peer multiaddr '%s'", peer.Addr)
-		}
-		p.Peerstore.AddAddr(peerID, peerAddr, p2ppeerstore.PermanentAddrTTL)
-	}
-	return nil
-}
-
-func (p *Pstorewrapper) getPeers() (peers []P2PPeer, err error) {
-	rows, err := p.q.WithOpts(pg.WithParentCtx(p.ctx)).Query(`SELECT id, addr FROM p2p_peers WHERE peer_id = $1`, p.peerID)
-	if err != nil {
-		return nil, errors.Wrap(err, "error querying peers")
-	}
-	defer p.lggr.ErrorIfFn(rows.Close, "Error closing p2p_peers rows")
-
-	peers = make([]P2PPeer, 0)
-
-	for rows.Next() {
-		peer := P2PPeer{}
-		if err = rows.Scan(&peer.ID, &peer.Addr); err != nil {
-			return nil, errors.Wrap(err, "unexpected error scanning row")
-		}
-		peers = append(peers, peer)
-	}
-	if err = rows.Err(); err != nil {
-		return nil, err
-	}
-
-	return peers, nil
-}
-
-func (p *Pstorewrapper) WriteToDB() error {
-	q := p.q.WithOpts(pg.WithParentCtx(p.ctx))
-	err := q.Transaction(func(tx pg.Queryer) error {
-		_, err := tx.Exec(`DELETE FROM p2p_peers WHERE peer_id = $1`, p.peerID)
-		if err != nil {
-			return errors.Wrap(err, "delete from p2p_peers failed")
-		}
-		peers := make([]P2PPeer, 0)
-		for _, pid := range p.Peerstore.PeersWithAddrs() {
-			addrs := p.Peerstore.Addrs(pid)
-			for _, addr := range addrs {
-				p := P2PPeer{
-					ID:     pid.String(),
-					Addr:   addr.String(),
-					PeerID: p.peerID,
-				}
-				peers = append(peers, p)
-			}
-		}
-		valueStrings := []string{}
-		valueArgs := []interface{}{}
-		for _, p := range peers {
-			valueStrings = append(valueStrings, "(?, ?, ?, NOW(), NOW())")
-			valueArgs = append(valueArgs, p.ID)
-			valueArgs = append(valueArgs, p.Addr)
-			valueArgs = append(valueArgs, p.PeerID)
-		}
-
-		/* #nosec G201 */
-		stmt := fmt.Sprintf("INSERT INTO p2p_peers (id, addr, peer_id, created_at, updated_at) VALUES %s", strings.Join(valueStrings, ","))
-		stmt = sqlx.Rebind(sqlx.DOLLAR, stmt)
-		_, err = tx.Exec(stmt, valueArgs...)
-		return errors.Wrap(err, "insert into p2p_peers failed")
-	})
-	return errors.Wrap(err, "could not write peers to DB")
-}
diff --git a/core/services/ocrcommon/peerstore_test.go b/core/services/ocrcommon/peerstore_test.go
deleted file mode 100644
index 6e692153564..00000000000
--- a/core/services/ocrcommon/peerstore_test.go
+++ /dev/null
@@ -1,101 +0,0 @@
-package ocrcommon_test
-
-import (
-	"testing"
-	"time"
-
-	p2ppeer "github.com/libp2p/go-libp2p-core/peer"
-	p2ppeerstore "github.com/libp2p/go-libp2p-core/peerstore"
-	ma "github.com/multiformats/go-multiaddr"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/p2pkey"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocrcommon"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
-)
-
-func Test_Peerstore_Start(t *testing.T) {
-	db := pgtest.NewSqlxDB(t)
-
-	peerID, err := p2ppeer.Decode(configtest.DefaultPeerID)
-	require.NoError(t, err)
-
-	nonExistentP2PPeerID, err := p2ppeer.Decode("12D3KooWAdCzaesXyezatDzgGvCngqsBqoUqnV9PnVc46jsVt2i9")
-	require.NoError(t, err)
-
-	err = utils.JustError(db.Exec(`INSERT INTO p2p_peers (id, addr, created_at, updated_at, peer_id) VALUES
-	(
-		'12D3KooWL1yndUw9T2oWXjhfjdwSscWA78YCpUdduA3Cnn4dCtph',
-		'/ip4/127.0.0.1/tcp/12000/p2p/12D3KooWL1yndUw9T2oWXjhfjdwSscWA78YCpUdduA3Cnn4dCtph',
-		NOW(),
-		NOW(),
-		$1
-	),
-	(
-		'12D3KooWL1yndUw9T2oWXjhfjdwSscWA78YCpUdduA3Cnn4dCtph',
-		'/ip4/127.0.0.2/tcp/12000/p2p/12D3KooWL1yndUw9T2oWXjhfjdwSscWA78YCpUdduA3Cnn4dCtph',
-		NOW(),
-		NOW(),
-		$2
-	),
-	(
-		'12D3KooWL1yndUw9T2oWXjhfjdwSscWA78YCpUdduA3Cnn4dCtph',
-		'/ip4/127.0.0.2/tcp/12000/p2p/12D3KooWL1yndUw9T2oWXjhfjdwSscWA78YCpUdduA3Cnn4dCtph',
-		NOW(),
-		NOW(),
-		$3
-	)
-	`, p2pkey.PeerID(peerID), p2pkey.PeerID(peerID), p2pkey.PeerID(nonExistentP2PPeerID)))
-	require.NoError(t, err)
-
-	cfg := configtest.NewTestGeneralConfig(t)
-	wrapper, err := ocrcommon.NewPeerstoreWrapper(db, 1*time.Second, p2pkey.PeerID(peerID), logger.TestLogger(t), cfg.Database())
-	require.NoError(t, err)
-
-	err = wrapper.Start()
-	require.NoError(t, err)
-
-	require.Equal(t, 1, wrapper.Peerstore.PeersWithAddrs().Len())
-
-	peerID, err = p2ppeer.Decode("12D3KooWL1yndUw9T2oWXjhfjdwSscWA78YCpUdduA3Cnn4dCtph")
-	require.NoError(t, err)
-
-	maddrs := wrapper.Peerstore.Addrs(peerID)
-
-	require.Len(t, maddrs, 2)
-}
-
-func Test_Peerstore_WriteToDB(t *testing.T) {
-	db := pgtest.NewSqlxDB(t)
-
-	peerID, err := p2ppeer.Decode(configtest.DefaultPeerID)
-	require.NoError(t, err)
-
-	cfg := configtest.NewTestGeneralConfig(t)
-	wrapper, err := ocrcommon.NewPeerstoreWrapper(db, 1*time.Second, p2pkey.PeerID(peerID), logger.TestLogger(t), cfg.Database())
-	require.NoError(t, err)
-
-	maddr, err := ma.NewMultiaddr("/ip4/127.0.0.2/tcp/12000/p2p/12D3KooWL1yndUw9T2oWXjhfjdwSscWA78YCpUdduA3Cnn4dCtph")
-	require.NoError(t, err)
-	newPeerID, err := p2ppeer.Decode("12D3KooWL1yndUw9T2oWXjhfjdwSscWA78YCpUdduA3Cnn4dCtph")
-	require.NoError(t, err)
-
-	wrapper.Peerstore.AddAddr(newPeerID, maddr, p2ppeerstore.PermanentAddrTTL)
-
-	err = wrapper.WriteToDB()
-	require.NoError(t, err)
-
-	var peers []ocrcommon.P2PPeer
-	err = db.Select(&peers, `SELECT * FROM p2p_peers`)
-	require.NoError(t, err)
-	require.Equal(t, 1, len(peers))
-
-	peer := peers[0]
-	require.Equal(t, "12D3KooWL1yndUw9T2oWXjhfjdwSscWA78YCpUdduA3Cnn4dCtph", peer.ID)
-	require.Equal(t, "/ip4/127.0.0.2/tcp/12000/p2p/12D3KooWL1yndUw9T2oWXjhfjdwSscWA78YCpUdduA3Cnn4dCtph", peer.Addr)
-	require.Equal(t, p2pkey.PeerID(peerID).Raw(), peer.PeerID)
-}
diff --git a/core/services/signatures/secp256k1/curve.go b/core/services/signatures/secp256k1/curve.go
index 2ed52a87cec..70187e68738 100644
--- a/core/services/signatures/secp256k1/curve.go
+++ b/core/services/signatures/secp256k1/curve.go
@@ -12,7 +12,7 @@ package secp256k1
 import (
 	"math/big"
 
-	secp256k1BTCD "github.com/btcsuite/btcd/btcec"
+	secp256k1BTCD "github.com/btcsuite/btcd/btcec/v2"
 
 	"go.dedis.ch/kyber/v3"
 )
diff --git a/core/services/signatures/secp256k1/field.go b/core/services/signatures/secp256k1/field.go
index 7cfa7af2e5c..1ff0d062f3c 100644
--- a/core/services/signatures/secp256k1/field.go
+++ b/core/services/signatures/secp256k1/field.go
@@ -137,13 +137,11 @@ func fieldSquare(y *fieldElt) *fieldElt {
 	return fieldEltFromBigInt(newFieldZero().int().Exp(y.int(), two, q))
 }
 
+func i() *big.Int { return new(big.Int) }
+
 // sqrtPower is s.t. n^sqrtPower≡sqrt(n) mod q, if n has a root at all. See
 // https://math.stackexchange.com/a/1816280, for instance
-//
-// What I'm calling sqrtPower is called q on the s256 struct. (See
-// btcec.initS256), which is confusing because the "Q" in "QPlus1Div4" refers to
-// the field characteristic
-var sqrtPower = s256.QPlus1Div4()
+var sqrtPower = i().Rsh(i().Add(q, big.NewInt(1)), 2) // (q +1)/4
 
 // maybeSqrtInField returns a square root of v, if it has any, else nil
 func maybeSqrtInField(v *fieldElt) *fieldElt {
diff --git a/core/services/signatures/secp256k1/scalar.go b/core/services/signatures/secp256k1/scalar.go
index 9d89188c4c7..d12826a8270 100644
--- a/core/services/signatures/secp256k1/scalar.go
+++ b/core/services/signatures/secp256k1/scalar.go
@@ -19,7 +19,7 @@ import (
 	"io"
 	"math/big"
 
-	secp256k1BTCD "github.com/btcsuite/btcd/btcec"
+	secp256k1BTCD "github.com/btcsuite/btcd/btcec/v2"
 	"github.com/ethereum/go-ethereum/common"
 
 	"go.dedis.ch/kyber/v3"
diff --git a/core/utils/utils.go b/core/utils/utils.go
index 0df280775b5..b887fe9a800 100644
--- a/core/utils/utils.go
+++ b/core/utils/utils.go
@@ -3,6 +3,7 @@ package utils
 
 import (
 	"context"
+	"crypto/ed25519"
 	"crypto/rand"
 	"encoding/base64"
 	"encoding/hex"
@@ -18,18 +19,17 @@ import (
 	"sync/atomic"
 	"time"
 
-	cryptop2p "github.com/libp2p/go-libp2p-core/crypto"
-	"golang.org/x/exp/constraints"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/google/uuid"
 	"github.com/jpillora/backoff"
-	"github.com/libp2p/go-libp2p-core/peer"
 	pkgerrors "github.com/pkg/errors"
 	"github.com/robfig/cron/v3"
 	"golang.org/x/crypto/bcrypt"
 	"golang.org/x/crypto/sha3"
+	"golang.org/x/exp/constraints"
+
+	ragep2ptypes "github.com/smartcontractkit/libocr/ragep2p/types"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 )
@@ -64,11 +64,11 @@ func Bytes32ToSlice(a [32]byte) (r []byte) {
 }
 
 func MustNewPeerID() string {
-	_, pubKey, err := cryptop2p.GenerateEd25519Key(rand.Reader)
+	pubKey, _, err := ed25519.GenerateKey(rand.Reader)
 	if err != nil {
 		panic(err)
 	}
-	peerID, err := peer.IDFromPublicKey(pubKey)
+	peerID, err := ragep2ptypes.PeerIDFromPublicKey(pubKey)
 	if err != nil {
 		panic(err)
 	}
diff --git a/core/web/jobs_controller_test.go b/core/web/jobs_controller_test.go
index 3beee88c2eb..27d4433b63c 100644
--- a/core/web/jobs_controller_test.go
+++ b/core/web/jobs_controller_test.go
@@ -18,8 +18,8 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/google/uuid"
 	"github.com/hashicorp/consul/sdk/freeport"
-	p2ppeer "github.com/libp2p/go-libp2p-core/peer"
 	"github.com/pelletier/go-toml"
+	ragep2ptypes "github.com/smartcontractkit/libocr/ragep2p/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
@@ -48,8 +48,8 @@ func TestJobsController_Create_ValidationFailure_OffchainReportingSpec(t *testin
 		contractAddress = cltest.NewEIP55Address()
 	)
 
-	peerID, err := p2ppeer.Decode(configtest.DefaultPeerID)
-	require.NoError(t, err)
+	var peerID ragep2ptypes.PeerID
+	require.NoError(t, peerID.UnmarshalText([]byte(configtest.DefaultPeerID)))
 	randomBytes := testutils.Random32Byte()
 
 	var tt = []struct {
diff --git a/core/web/p2p_keys_controller.go b/core/web/p2p_keys_controller.go
index c81400615b0..bbe9d83f741 100644
--- a/core/web/p2p_keys_controller.go
+++ b/core/web/p2p_keys_controller.go
@@ -29,6 +29,8 @@ func (p2pkc *P2PKeysController) Index(c *gin.Context) {
 	jsonAPIResponse(c, presenters.NewP2PKeyResources(keys), "p2pKey")
 }
 
+const keyType = "Ed25519"
+
 // Create and return a P2P key
 // Example:
 // "POST <application>/keys/p2p"
@@ -44,7 +46,7 @@ func (p2pkc *P2PKeysController) Create(c *gin.Context) {
 		"id":           key.ID(),
 		"p2pPublicKey": key.PublicKeyHex(),
 		"p2pPeerID":    key.PeerID(),
-		"p2pType":      key.Type(),
+		"p2pType":      keyType,
 	})
 	jsonAPIResponse(c, presenters.NewP2PKeyResource(key), "p2pKey")
 }
@@ -101,7 +103,7 @@ func (p2pkc *P2PKeysController) Import(c *gin.Context) {
 		"id":           key.ID(),
 		"p2pPublicKey": key.PublicKeyHex(),
 		"p2pPeerID":    key.PeerID(),
-		"p2pType":      key.Type(),
+		"p2pType":      keyType,
 	})
 
 	jsonAPIResponse(c, presenters.NewP2PKeyResource(key), "p2pKey")
diff --git a/core/web/presenters/p2p_key_test.go b/core/web/presenters/p2p_key_test.go
index 2d30f87fe18..4e7b4e954fd 100644
--- a/core/web/presenters/p2p_key_test.go
+++ b/core/web/presenters/p2p_key_test.go
@@ -1,7 +1,6 @@
 package presenters
 
 import (
-	"encoding/hex"
 	"fmt"
 	"testing"
 
@@ -16,9 +15,6 @@ func TestP2PKeyResource(t *testing.T) {
 	key := keystest.NewP2PKeyV2(t)
 	peerID := key.PeerID()
 	peerIDStr := peerID.String()
-	pubKey := key.GetPublic()
-	pubKeyBytes, err := pubKey.Raw()
-	require.NoError(t, err)
 
 	r := NewP2PKeyResource(key)
 	b, err := jsonapi.Marshal(r)
@@ -34,7 +30,7 @@ func TestP2PKeyResource(t *testing.T) {
 				"publicKey": "%s"
 			}
 		}
-	}`, key.ID(), peerIDStr, hex.EncodeToString(pubKeyBytes))
+	}`, key.ID(), peerIDStr, key.PublicKeyHex())
 
 	assert.JSONEq(t, expected, string(b))
 
@@ -52,7 +48,7 @@ func TestP2PKeyResource(t *testing.T) {
 				"publicKey": "%s"
 			}
 		}
-	}`, key.ID(), peerIDStr, hex.EncodeToString(pubKeyBytes))
+	}`, key.ID(), peerIDStr, key.PublicKeyHex())
 
 	assert.JSONEq(t, expected, string(b))
 }
diff --git a/core/web/resolver/mutation.go b/core/web/resolver/mutation.go
index 990a6c08058..996b3859a55 100644
--- a/core/web/resolver/mutation.go
+++ b/core/web/resolver/mutation.go
@@ -640,12 +640,13 @@ func (r *Resolver) CreateP2PKey(ctx context.Context) (*CreateP2PKeyPayloadResolv
 		return nil, err
 	}
 
+	const keyType = "Ed25519"
 	r.App.GetAuditLogger().Audit(audit.KeyCreated, map[string]interface{}{
 		"type":         "p2p",
 		"id":           key.ID(),
 		"p2pPublicKey": key.PublicKeyHex(),
 		"p2pPeerID":    key.PeerID(),
-		"p2pType":      key.Type(),
+		"p2pType":      keyType,
 	})
 
 	return NewCreateP2PKeyPayload(key), nil
diff --git a/go.mod b/go.mod
index 40359ab16f7..d8394633c3f 100644
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/Masterminds/semver/v3 v3.2.1
 	github.com/Masterminds/sprig/v3 v3.2.3
 	github.com/avast/retry-go/v4 v4.5.1
-	github.com/btcsuite/btcd v0.23.4
+	github.com/btcsuite/btcd/btcec/v2 v2.3.2
 	github.com/cometbft/cometbft v0.37.2
 	github.com/cosmos/cosmos-sdk v0.47.4
 	github.com/danielkov/gin-helmet v0.0.0-20171108135313-1387e224435e
@@ -24,7 +24,7 @@ require (
 	github.com/gin-gonic/gin v1.9.1
 	github.com/go-ldap/ldap/v3 v3.4.6
 	github.com/go-webauthn/webauthn v0.9.4
-	github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98
+	github.com/google/pprof v0.0.0-20231023181126-ff6d637d2a7b
 	github.com/google/uuid v1.4.0
 	github.com/gorilla/securecookie v1.1.2
 	github.com/gorilla/sessions v1.2.2
@@ -43,13 +43,10 @@ require (
 	github.com/kylelemons/godebug v1.1.0
 	github.com/leanovate/gopter v0.2.10-0.20210127095200-9abe2343507a
 	github.com/lib/pq v1.10.9
-	github.com/libp2p/go-libp2p-core v0.8.5
-	github.com/libp2p/go-libp2p-peerstore v0.2.7
 	github.com/manyminds/api2go v0.0.0-20171030193247-e7b693844a6f
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/mr-tron/base58 v1.2.0
-	github.com/multiformats/go-multiaddr v0.3.3
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/onsi/gomega v1.30.0
 	github.com/patrickmn/go-cache v2.1.0+incompatible
@@ -131,7 +128,6 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect
 	github.com/blendle/zapdriver v1.3.1 // indirect
-	github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect
 	github.com/bytedance/sonic v1.10.1 // indirect
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
@@ -223,9 +219,6 @@ require (
 	github.com/huin/goupnp v1.3.0 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/ipfs/go-cid v0.0.7 // indirect
-	github.com/ipfs/go-log v1.0.4 // indirect
-	github.com/ipfs/go-log/v2 v2.1.1 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
 	github.com/jackc/pgio v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
@@ -240,7 +233,6 @@ require (
 	github.com/kr/text v0.2.0 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
-	github.com/libp2p/go-openssl v0.0.7 // indirect
 	github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
@@ -248,8 +240,6 @@ require (
 	github.com/mattn/go-runewidth v0.0.14 // indirect
 	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
 	github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
-	github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 // indirect
-	github.com/minio/sha256-simd v0.1.1 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
@@ -257,13 +247,6 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/mostynb/zstdpool-freelist v0.0.0-20201229113212-927304c0c3b1 // indirect
 	github.com/mtibben/percent v0.2.1 // indirect
-	github.com/multiformats/go-base32 v0.0.3 // indirect
-	github.com/multiformats/go-base36 v0.1.0 // indirect
-	github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
-	github.com/multiformats/go-multiaddr-net v0.2.0 // indirect
-	github.com/multiformats/go-multibase v0.0.3 // indirect
-	github.com/multiformats/go-multihash v0.0.14 // indirect
-	github.com/multiformats/go-varint v0.0.6 // indirect
 	github.com/mwitkow/grpc-proxy v0.0.0-20230212185441-f345521cb9c9 // indirect
 	github.com/oklog/run v1.1.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
@@ -279,8 +262,6 @@ require (
 	github.com/sethvargo/go-retry v0.2.4 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
-	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	github.com/spf13/afero v1.9.3 // indirect
 	github.com/spf13/cobra v1.6.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
@@ -336,10 +317,6 @@ require (
 )
 
 replace (
-	// Fix go mod tidy issue for ambiguous imports from go-ethereum
-	// See https://github.com/ugorji/go/issues/279
-	github.com/btcsuite/btcd => github.com/btcsuite/btcd v0.22.1
-
 	// replicating the replace directive on cosmos SDK
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 
diff --git a/go.sum b/go.sum
index 11b377b11f8..d702fd37e90 100644
--- a/go.sum
+++ b/go.sum
@@ -123,7 +123,6 @@ github.com/VictoriaMetrics/fastcache v1.10.0 h1:5hDJnLsKLpnUEToub7ETuRu8RCkb40wo
 github.com/VictoriaMetrics/fastcache v1.10.0/go.mod h1:tjiYeEfYXCqacuvYw/7UoDIeJaNxq6132xHICNP77w8=
 github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE=
 github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
-github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
 github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
 github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
 github.com/alecthomas/participle/v2 v2.0.0-alpha7 h1:cK4vjj0VSgb3lN1nuKA5F7dw+1s1pWBe5bx7nNCnN+c=
@@ -173,20 +172,12 @@ github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJm
 github.com/blendle/zapdriver v1.3.1 h1:C3dydBOWYRiOk+B8X9IVZ5IOe+7cl+tGOexN4QqHfpE=
 github.com/blendle/zapdriver v1.3.1/go.mod h1:mdXfREi6u5MArG4j9fewC+FGnXaBR+T4Ox4J2u4eHCc=
 github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c=
-github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y=
 github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U=
 github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04=
 github.com/btcsuite/btcd/btcutil v1.1.2 h1:XLMbX8JQEiwMcYft2EGi8zPUkoa0abKIU6/BJSRsjzQ=
 github.com/btcsuite/btcd/btcutil v1.1.2/go.mod h1:UR7dsSJzJUfMmFiiLlIrMq1lS9jh9EdCV7FStZSnpi0=
 github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U=
 github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
-github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
-github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce/go.mod h1:0DVlHczLPewLcPGEIeUEzfOJhqGPQ0mJJRDBtD307+o=
-github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
-github.com/btcsuite/goleveldb v1.0.0/go.mod h1:QiK9vBlgftBg6rWQIj6wFzbPfRjiykIEhBH4obrXJ/I=
-github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
-github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY=
-github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs=
 github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA=
 github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8=
 github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
@@ -314,17 +305,14 @@ github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5il
 github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0=
-github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218=
 github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I=
 github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE=
 github.com/dfuse-io/logging v0.0.0-20201110202154-26697de88c79/go.mod h1:V+ED4kT/t/lKtH99JQmKIb0v9WL3VaYkJ36CfHlVECI=
 github.com/dfuse-io/logging v0.0.0-20210109005628-b97a57253f70 h1:CuJS05R9jmNlUK8GOxrEELPbfXm0EuGh/30LjkjN5vo=
 github.com/dfuse-io/logging v0.0.0-20210109005628-b97a57253f70/go.mod h1:EoK/8RFbMEteaCaz89uessDTnCWjbbcr+DXcBh4el5o=
 github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
-github.com/dgraph-io/badger v1.6.1/go.mod h1:FRmFw3uxvcpa8zG3Rxs0th+hCLIuaQg8HlNV5bjgnuU=
 github.com/dgraph-io/badger/v2 v2.2007.4 h1:TRWBQg8UrlUhaFdco01nO2uXwzKS7zd+HVdwV/GHc4o=
 github.com/dgraph-io/badger/v2 v2.2007.4/go.mod h1:vSw/ax2qojzbN6eXHIx6KPKtCSHJN/Uz0X0VPruTIhk=
-github.com/dgraph-io/ristretto v0.0.2/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E=
 github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E=
 github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8=
 github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA=
@@ -553,7 +541,6 @@ github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb h1:PBC98N2aIaM3XXiurYmW7fx4GZkL8feAMVq7nEjURHk=
@@ -603,8 +590,8 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 h1:pUa4ghanp6q4IJHwE9RwLgmVFfReJN+KbQ8ExNEUUoQ=
-github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
+github.com/google/pprof v0.0.0-20231023181126-ff6d637d2a7b h1:RMpPgZTSApbPf7xaVel+QkoGPRLFLrwFO89uDUHEGf0=
+github.com/google/pprof v0.0.0-20231023181126-ff6d637d2a7b/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o=
 github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw=
@@ -704,7 +691,6 @@ github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
-github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/golang-lru v0.6.0 h1:uL2shRDx7RTrOrTCUZEGP/wJUFiUI8QT6E7z5o8jga4=
 github.com/hashicorp/golang-lru v0.6.0/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
@@ -744,22 +730,6 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
 github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/ipfs/go-cid v0.0.5/go.mod h1:plgt+Y5MnOey4vO4UlUazGqdbEXuFYitED67FexhXog=
-github.com/ipfs/go-cid v0.0.7 h1:ysQJVJA3fNDF1qigJbsSQOdjhVLsOEoPdh0+R97k3jY=
-github.com/ipfs/go-cid v0.0.7/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I=
-github.com/ipfs/go-datastore v0.4.1/go.mod h1:SX/xMIKoCszPqp+z9JhPYCmoOoXTvaa13XEbGtsFUhA=
-github.com/ipfs/go-datastore v0.4.4/go.mod h1:SX/xMIKoCszPqp+z9JhPYCmoOoXTvaa13XEbGtsFUhA=
-github.com/ipfs/go-ds-badger v0.2.3/go.mod h1:pEYw0rgg3FIrywKKnL+Snr+w/LjJZVMTBRn4FS6UHUk=
-github.com/ipfs/go-ds-leveldb v0.4.2/go.mod h1:jpbku/YqBSsBc1qgME8BkWS4AxzF2cEu1Ii2r79Hh9s=
-github.com/ipfs/go-ipfs-delay v0.0.0-20181109222059-70721b86a9a8/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw=
-github.com/ipfs/go-log v0.0.1/go.mod h1:kL1d2/hzSpI0thNYjiKfjanbVNU+IIGA/WnNESY9leM=
-github.com/ipfs/go-log v1.0.3/go.mod h1:OsLySYkwIbiSUR/yBTdv1qPtcE4FW3WPWk/ewz9Ru+A=
-github.com/ipfs/go-log v1.0.4 h1:6nLQdX4W8P9yZZFH7mO+X/PzjN8Laozm/lMJ6esdgzY=
-github.com/ipfs/go-log v1.0.4/go.mod h1:oDCg2FkjogeFOhqqb+N39l2RpTNPL6F/StPkB3kPgcs=
-github.com/ipfs/go-log/v2 v2.0.3/go.mod h1:O7P1lJt27vWHhOwQmcFEvlmo49ry2VY2+JfBWFaa9+0=
-github.com/ipfs/go-log/v2 v2.0.5/go.mod h1:eZs4Xt4ZUJQFM3DlanGhy7TkwwawCZcSByscwkWG+dw=
-github.com/ipfs/go-log/v2 v2.1.1 h1:G4TtqN+V9y9HY9TA6BwbCVyyBZ2B9MbCjR2MtGx8FR0=
-github.com/ipfs/go-log/v2 v2.1.1/go.mod h1:2v2nsGfZsvvAJz13SyFzf9ObaqwHiHxsPLEHntrv9KM=
 github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI=
 github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0=
 github.com/iris-contrib/jade v1.1.3/go.mod h1:H/geBymxJhShH5kecoiOCSssPX7QWYH7UaeZTSWddIk=
@@ -821,9 +791,6 @@ github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk
 github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
 github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
-github.com/jbenet/go-cienv v0.1.0/go.mod h1:TqNnHUmJgXau0nCzC7kXWeotg3J9W34CUv5Djy1+FlA=
-github.com/jbenet/goprocess v0.0.0-20160826012719-b497e2f366b8/go.mod h1:Ly/wlsjFq/qrU3Rar62tu1gASgGw6chQbSh/XgIIXCY=
-github.com/jbenet/goprocess v0.1.4/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZlqdZVfqY4=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=
 github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo=
@@ -843,7 +810,6 @@ github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST
 github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc=
 github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
-github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
@@ -862,7 +828,6 @@ github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNU
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
 github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.9.7/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
@@ -880,7 +845,6 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxv
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
@@ -905,22 +869,8 @@ github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/libp2p/go-buffer-pool v0.0.1/go.mod h1:xtyIz9PMobb13WaxR6Zo1Pd1zXJKYg0a8KiIvDp3TzQ=
-github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM=
 github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8=
 github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg=
-github.com/libp2p/go-flow-metrics v0.0.3/go.mod h1:HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs=
-github.com/libp2p/go-libp2p-core v0.5.4/go.mod h1:uN7L2D4EvPCvzSH5SrhR72UWbnSGpt5/a35Sm4upn4Y=
-github.com/libp2p/go-libp2p-core v0.8.5 h1:aEgbIcPGsKy6zYcC+5AJivYFedhYa4sW7mIpWpUaLKw=
-github.com/libp2p/go-libp2p-core v0.8.5/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8=
-github.com/libp2p/go-libp2p-peerstore v0.2.7 h1:83JoLxyR9OYTnNfB5vvFqvMUv/xDNa6NoPHnENhBsGw=
-github.com/libp2p/go-libp2p-peerstore v0.2.7/go.mod h1:ss/TWTgHZTMpsU/oKVVPQCGuDHItOpf2W8RxAi50P2s=
-github.com/libp2p/go-maddr-filter v0.1.0/go.mod h1:VzZhTXkMucEGGEOSKddrwGiOv0tUhgnKqNEmIAz/bPU=
-github.com/libp2p/go-msgio v0.0.4/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
-github.com/libp2p/go-msgio v0.0.6/go.mod h1:4ecVB6d9f4BDSL5fqvPiC4A3KivjWn+Venn/1ALLMWA=
-github.com/libp2p/go-openssl v0.0.4/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
-github.com/libp2p/go-openssl v0.0.7 h1:eCAzdLejcNVBzP/iZM9vqHnQm+XyCEbSSIheIPRGNsw=
-github.com/libp2p/go-openssl v0.0.7/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
 github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8=
 github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
@@ -970,13 +920,8 @@ github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3N
 github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM=
 github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 h1:QRUSJEgZn2Snx0EmT/QLXibWjSUDjKWvXIT19NBVp94=
 github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM=
-github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 h1:lYpkrQH5ajf0OXOcUbGjvZxxijuBwbbmlSxLiuofa+g=
-github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ=
 github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g=
 github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY=
-github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
-github.com/minio/sha256-simd v0.1.1 h1:5QHSlgo3nt5yKOJrC7W8w7X+NFl8cMPZm96iu8kKUJU=
-github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
@@ -1010,39 +955,10 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY
 github.com/mostynb/zstdpool-freelist v0.0.0-20201229113212-927304c0c3b1 h1:mPMvm6X6tf4w8y7j9YIt6V9jfWhL6QlbEc7CCmeQlWk=
 github.com/mostynb/zstdpool-freelist v0.0.0-20201229113212-927304c0c3b1/go.mod h1:ye2e/VUEtE2BHE+G/QcKkcLQVAEJoYRFj5VUOQatCRE=
 github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ=
-github.com/mr-tron/base58 v1.1.0/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8=
-github.com/mr-tron/base58 v1.1.2/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
-github.com/mr-tron/base58 v1.1.3/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
 github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs=
 github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns=
-github.com/multiformats/go-base32 v0.0.3 h1:tw5+NhuwaOjJCC5Pp82QuXbrmLzWg7uxlMFp8Nq/kkI=
-github.com/multiformats/go-base32 v0.0.3/go.mod h1:pLiuGC8y0QR3Ue4Zug5UzK9LjgbkL8NSQj0zQ5Nz/AA=
-github.com/multiformats/go-base36 v0.1.0 h1:JR6TyF7JjGd3m6FbLU2cOxhC0Li8z8dLNGQ89tUg4F4=
-github.com/multiformats/go-base36 v0.1.0/go.mod h1:kFGE83c6s80PklsHO9sRn2NCoffoRdUUOENyW/Vv6sM=
-github.com/multiformats/go-multiaddr v0.1.1/go.mod h1:aMKBKNEYmzmDmxfX88/vz+J5IU55txyt0p4aiWVohjo=
-github.com/multiformats/go-multiaddr v0.2.1/go.mod h1:s/Apk6IyxfvMjDafnhJgJ3/46z7tZ04iMk5wP4QMGGE=
-github.com/multiformats/go-multiaddr v0.2.2/go.mod h1:NtfXiOtHvghW9KojvtySjH5y0u0xW5UouOmQQrn6a3Y=
-github.com/multiformats/go-multiaddr v0.3.0/go.mod h1:dF9kph9wfJ+3VLAaeBqo9Of8x4fJxp6ggJGteB8HQTI=
-github.com/multiformats/go-multiaddr v0.3.3 h1:vo2OTSAqnENB2rLk79pLtr+uhj+VAzSe3uef5q0lRSs=
-github.com/multiformats/go-multiaddr v0.3.3/go.mod h1:lCKNGP1EQ1eZ35Za2wlqnabm9xQkib3fyB+nZXHLag0=
-github.com/multiformats/go-multiaddr-fmt v0.1.0 h1:WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E=
-github.com/multiformats/go-multiaddr-fmt v0.1.0/go.mod h1:hGtDIW4PU4BqJ50gW2quDuPVjyWNZxToGUh/HwTZYJo=
-github.com/multiformats/go-multiaddr-net v0.1.4/go.mod h1:ilNnaM9HbmVFqsb/qcNysjCu4PVONlrBZpHIrw/qQuA=
-github.com/multiformats/go-multiaddr-net v0.2.0 h1:MSXRGN0mFymt6B1yo/6BPnIRpLPEnKgQNvVfCX5VDJk=
-github.com/multiformats/go-multiaddr-net v0.2.0/go.mod h1:gGdH3UXny6U3cKKYCvpXI5rnK7YaOIEOPVDI9tsJbEA=
-github.com/multiformats/go-multibase v0.0.1/go.mod h1:bja2MqRZ3ggyXtZSEDKpl0uO/gviWFaSteVbWT51qgs=
-github.com/multiformats/go-multibase v0.0.3 h1:l/B6bJDQjvQ5G52jw4QGSYeOTZoAwIO77RblWplfIqk=
-github.com/multiformats/go-multibase v0.0.3/go.mod h1:5+1R4eQrT3PkYZ24C3W2Ue2tPwIdYQD509ZjSb5y9Oc=
-github.com/multiformats/go-multihash v0.0.8/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=
-github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
-github.com/multiformats/go-multihash v0.0.14 h1:QoBceQYQQtNUuf6s7wHxnE2c8bhbMqhfGzNI032se/I=
-github.com/multiformats/go-multihash v0.0.14/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
-github.com/multiformats/go-varint v0.0.2/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
-github.com/multiformats/go-varint v0.0.5/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
-github.com/multiformats/go-varint v0.0.6 h1:gk85QWKxh3TazbLxED/NlDVv8+q+ReFJk7Y2W/KhfNY=
-github.com/multiformats/go-varint v0.0.6/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
 github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w=
@@ -1061,7 +977,6 @@ github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
@@ -1070,8 +985,6 @@ github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042
 github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
 github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4=
 github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
-github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
-github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
@@ -1084,7 +997,6 @@ github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/
 github.com/opencontainers/image-spec v1.1.0-rc5/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
 github.com/opencontainers/runc v1.1.10 h1:EaL5WeO9lv9wmS6SASjszOeQdSctvpbu0DdBQBizE40=
 github.com/opencontainers/runc v1.1.10/go.mod h1:+/R6+KmDlh+hOO8NkjmgkG9Qzvypzk0yXxAPYYR65+M=
-github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
@@ -1251,8 +1163,6 @@ github.com/smartcontractkit/wsrpc v0.7.2/go.mod h1:sj7QX2NQibhkhxTfs3KOhAj/5xwgq
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
-github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 h1:RC6RW7j+1+HkWaX/Yh71Ee5ZHaHYt7ZP4sQgUrm6cDU=
-github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572/go.mod h1:w0SWMsp6j9O/dk4/ZpIhL+3CkG8ofA2vuv7k+ltqUMc=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
 github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
@@ -1302,7 +1212,6 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8=
 github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
-github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
 github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDdvS342BElfbETmL1Aiz3i2t0zfRj16Hs=
 github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48=
 github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c h1:g+WoO5jjkqGAzHWCjJB1zZfXPIAaDpzXIEJ0eS6B5Ok=
@@ -1367,8 +1276,6 @@ github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+
 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
 github.com/vertica/vertica-sql-go v1.3.3 h1:fL+FKEAEy5ONmsvya2WH5T8bhkvY27y/Ik3ReR2T+Qw=
 github.com/vertica/vertica-sql-go v1.3.3/go.mod h1:jnn2GFuv+O2Jcjktb7zyc4Utlbu9YVqpHH/lx63+1M4=
-github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1/go.mod h1:8UvriyWtv5Q5EOgjHaSseUEdkQfvwFv1I/In/O2M9gc=
-github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc/go.mod h1:bopw91TMyo8J3tvftk8xmU2kPmlrt4nScJQZU2hE5EM=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
@@ -1448,7 +1355,6 @@ go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
 go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
-go.uber.org/goleak v1.0.0/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
@@ -1465,7 +1371,6 @@ go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
 go.uber.org/zap v1.14.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
-go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
 go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ=
 go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
 go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
@@ -1481,14 +1386,11 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
@@ -1546,7 +1448,6 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
 golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1556,7 +1457,6 @@ golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190227160552-c95aed5357e7/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -1776,7 +1676,6 @@ golang.org/x/tools v0.0.0-20191010075000-0337d82405ff/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index 5b44209f9a6..72c15a89669 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -92,7 +92,6 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect
 	github.com/blendle/zapdriver v1.3.1 // indirect
-	github.com/btcsuite/btcd v0.23.4 // indirect
 	github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect
 	github.com/bytedance/sonic v1.10.1 // indirect
@@ -207,7 +206,7 @@ require (
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/go-tpm v0.9.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 // indirect
+	github.com/google/pprof v0.0.0-20231023181126-ff6d637d2a7b // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/gorilla/context v1.1.1 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
@@ -253,9 +252,6 @@ require (
 	github.com/huin/goupnp v1.3.0 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/ipfs/go-cid v0.0.7 // indirect
-	github.com/ipfs/go-log v1.0.4 // indirect
-	github.com/ipfs/go-log/v2 v2.1.1 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
 	github.com/jackc/pgconn v1.14.1 // indirect
 	github.com/jackc/pgio v1.0.0 // indirect
@@ -279,9 +275,6 @@ require (
 	github.com/leanovate/gopter v0.2.10-0.20210127095200-9abe2343507a // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
-	github.com/libp2p/go-libp2p-core v0.8.5 // indirect
-	github.com/libp2p/go-libp2p-peerstore v0.2.7 // indirect
-	github.com/libp2p/go-openssl v0.0.7 // indirect
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
 	github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
@@ -293,8 +286,6 @@ require (
 	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
 	github.com/miekg/dns v1.1.56 // indirect
 	github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
-	github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 // indirect
-	github.com/minio/sha256-simd v1.0.1 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
@@ -310,14 +301,6 @@ require (
 	github.com/mostynb/zstdpool-freelist v0.0.0-20201229113212-927304c0c3b1 // indirect
 	github.com/mr-tron/base58 v1.2.0 // indirect
 	github.com/mtibben/percent v0.2.1 // indirect
-	github.com/multiformats/go-base32 v0.0.3 // indirect
-	github.com/multiformats/go-base36 v0.1.0 // indirect
-	github.com/multiformats/go-multiaddr v0.3.3 // indirect
-	github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
-	github.com/multiformats/go-multiaddr-net v0.2.0 // indirect
-	github.com/multiformats/go-multibase v0.0.3 // indirect
-	github.com/multiformats/go-multihash v0.0.14 // indirect
-	github.com/multiformats/go-varint v0.0.6 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
 	github.com/mwitkow/grpc-proxy v0.0.0-20230212185441-f345521cb9c9 // indirect
@@ -370,8 +353,6 @@ require (
 	github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 // indirect
 	github.com/smartcontractkit/wsrpc v0.7.2 // indirect
 	github.com/soheilhy/cmux v0.1.5 // indirect
-	github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
-	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	github.com/spf13/afero v1.9.5 // indirect
 	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
@@ -472,10 +453,6 @@ require (
 )
 
 replace (
-	// Fixes go mod tidy issue for ambiguous imports from go-ethereum
-	// See https://github.com/ugorji/go/issues/279
-	github.com/btcsuite/btcd => github.com/btcsuite/btcd v0.22.1
-
 	github.com/go-kit/log => github.com/go-kit/log v0.2.1
 
 	// replicating the replace directive on cosmos SDK
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index 0e29f6f6715..494e5c21ec9 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -145,7 +145,6 @@ github.com/VictoriaMetrics/fastcache v1.10.0 h1:5hDJnLsKLpnUEToub7ETuRu8RCkb40wo
 github.com/VictoriaMetrics/fastcache v1.10.0/go.mod h1:tjiYeEfYXCqacuvYw/7UoDIeJaNxq6132xHICNP77w8=
 github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE=
 github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
-github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
 github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
 github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
 github.com/alecthomas/participle/v2 v2.0.0-alpha7 h1:cK4vjj0VSgb3lN1nuKA5F7dw+1s1pWBe5bx7nNCnN+c=
@@ -207,20 +206,12 @@ github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJm
 github.com/blendle/zapdriver v1.3.1 h1:C3dydBOWYRiOk+B8X9IVZ5IOe+7cl+tGOexN4QqHfpE=
 github.com/blendle/zapdriver v1.3.1/go.mod h1:mdXfREi6u5MArG4j9fewC+FGnXaBR+T4Ox4J2u4eHCc=
 github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c=
-github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y=
 github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U=
 github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04=
 github.com/btcsuite/btcd/btcutil v1.1.2 h1:XLMbX8JQEiwMcYft2EGi8zPUkoa0abKIU6/BJSRsjzQ=
 github.com/btcsuite/btcd/btcutil v1.1.2/go.mod h1:UR7dsSJzJUfMmFiiLlIrMq1lS9jh9EdCV7FStZSnpi0=
 github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U=
 github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
-github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
-github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce/go.mod h1:0DVlHczLPewLcPGEIeUEzfOJhqGPQ0mJJRDBtD307+o=
-github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
-github.com/btcsuite/goleveldb v1.0.0/go.mod h1:QiK9vBlgftBg6rWQIj6wFzbPfRjiykIEhBH4obrXJ/I=
-github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
-github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY=
-github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs=
 github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA=
 github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8=
 github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
@@ -383,7 +374,6 @@ github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5il
 github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0=
-github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218=
 github.com/dennwc/varint v1.0.0 h1:kGNFFSSw8ToIy3obO/kKr8U9GZYUAxQEVuix4zfDWzE=
 github.com/dennwc/varint v1.0.0/go.mod h1:hnItb35rvZvJrbTALZtY/iQfDs48JKRG1RPpgziApxA=
 github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I=
@@ -392,10 +382,8 @@ github.com/dfuse-io/logging v0.0.0-20201110202154-26697de88c79/go.mod h1:V+ED4kT
 github.com/dfuse-io/logging v0.0.0-20210109005628-b97a57253f70 h1:CuJS05R9jmNlUK8GOxrEELPbfXm0EuGh/30LjkjN5vo=
 github.com/dfuse-io/logging v0.0.0-20210109005628-b97a57253f70/go.mod h1:EoK/8RFbMEteaCaz89uessDTnCWjbbcr+DXcBh4el5o=
 github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
-github.com/dgraph-io/badger v1.6.1/go.mod h1:FRmFw3uxvcpa8zG3Rxs0th+hCLIuaQg8HlNV5bjgnuU=
 github.com/dgraph-io/badger/v2 v2.2007.4 h1:TRWBQg8UrlUhaFdco01nO2uXwzKS7zd+HVdwV/GHc4o=
 github.com/dgraph-io/badger/v2 v2.2007.4/go.mod h1:vSw/ax2qojzbN6eXHIx6KPKtCSHJN/Uz0X0VPruTIhk=
-github.com/dgraph-io/ristretto v0.0.2/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E=
 github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E=
 github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8=
 github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA=
@@ -714,7 +702,6 @@ github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
@@ -770,8 +757,8 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 h1:pUa4ghanp6q4IJHwE9RwLgmVFfReJN+KbQ8ExNEUUoQ=
-github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
+github.com/google/pprof v0.0.0-20231023181126-ff6d637d2a7b h1:RMpPgZTSApbPf7xaVel+QkoGPRLFLrwFO89uDUHEGf0=
+github.com/google/pprof v0.0.0-20231023181126-ff6d637d2a7b/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o=
 github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw=
@@ -905,7 +892,6 @@ github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
-github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/golang-lru v0.6.0 h1:uL2shRDx7RTrOrTCUZEGP/wJUFiUI8QT6E7z5o8jga4=
 github.com/hashicorp/golang-lru v0.6.0/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
@@ -954,22 +940,6 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/ionos-cloud/sdk-go/v6 v6.1.9 h1:Iq3VIXzeEbc8EbButuACgfLMiY5TPVWUPNrF+Vsddo4=
 github.com/ionos-cloud/sdk-go/v6 v6.1.9/go.mod h1:EzEgRIDxBELvfoa/uBN0kOQaqovLjUWEB7iW4/Q+t4k=
-github.com/ipfs/go-cid v0.0.5/go.mod h1:plgt+Y5MnOey4vO4UlUazGqdbEXuFYitED67FexhXog=
-github.com/ipfs/go-cid v0.0.7 h1:ysQJVJA3fNDF1qigJbsSQOdjhVLsOEoPdh0+R97k3jY=
-github.com/ipfs/go-cid v0.0.7/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I=
-github.com/ipfs/go-datastore v0.4.1/go.mod h1:SX/xMIKoCszPqp+z9JhPYCmoOoXTvaa13XEbGtsFUhA=
-github.com/ipfs/go-datastore v0.4.4/go.mod h1:SX/xMIKoCszPqp+z9JhPYCmoOoXTvaa13XEbGtsFUhA=
-github.com/ipfs/go-ds-badger v0.2.3/go.mod h1:pEYw0rgg3FIrywKKnL+Snr+w/LjJZVMTBRn4FS6UHUk=
-github.com/ipfs/go-ds-leveldb v0.4.2/go.mod h1:jpbku/YqBSsBc1qgME8BkWS4AxzF2cEu1Ii2r79Hh9s=
-github.com/ipfs/go-ipfs-delay v0.0.0-20181109222059-70721b86a9a8/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw=
-github.com/ipfs/go-log v0.0.1/go.mod h1:kL1d2/hzSpI0thNYjiKfjanbVNU+IIGA/WnNESY9leM=
-github.com/ipfs/go-log v1.0.3/go.mod h1:OsLySYkwIbiSUR/yBTdv1qPtcE4FW3WPWk/ewz9Ru+A=
-github.com/ipfs/go-log v1.0.4 h1:6nLQdX4W8P9yZZFH7mO+X/PzjN8Laozm/lMJ6esdgzY=
-github.com/ipfs/go-log v1.0.4/go.mod h1:oDCg2FkjogeFOhqqb+N39l2RpTNPL6F/StPkB3kPgcs=
-github.com/ipfs/go-log/v2 v2.0.3/go.mod h1:O7P1lJt27vWHhOwQmcFEvlmo49ry2VY2+JfBWFaa9+0=
-github.com/ipfs/go-log/v2 v2.0.5/go.mod h1:eZs4Xt4ZUJQFM3DlanGhy7TkwwawCZcSByscwkWG+dw=
-github.com/ipfs/go-log/v2 v2.1.1 h1:G4TtqN+V9y9HY9TA6BwbCVyyBZ2B9MbCjR2MtGx8FR0=
-github.com/ipfs/go-log/v2 v2.1.1/go.mod h1:2v2nsGfZsvvAJz13SyFzf9ObaqwHiHxsPLEHntrv9KM=
 github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI=
 github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0=
 github.com/iris-contrib/jade v1.1.3/go.mod h1:H/geBymxJhShH5kecoiOCSssPX7QWYH7UaeZTSWddIk=
@@ -1026,9 +996,6 @@ github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dv
 github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
 github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
-github.com/jbenet/go-cienv v0.1.0/go.mod h1:TqNnHUmJgXau0nCzC7kXWeotg3J9W34CUv5Djy1+FlA=
-github.com/jbenet/goprocess v0.0.0-20160826012719-b497e2f366b8/go.mod h1:Ly/wlsjFq/qrU3Rar62tu1gASgGw6chQbSh/XgIIXCY=
-github.com/jbenet/goprocess v0.1.4/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZlqdZVfqY4=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=
 github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo=
@@ -1049,7 +1016,6 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
-github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@@ -1074,7 +1040,6 @@ github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dv
 github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
 github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.9.7/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
@@ -1121,22 +1086,8 @@ github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/libp2p/go-buffer-pool v0.0.1/go.mod h1:xtyIz9PMobb13WaxR6Zo1Pd1zXJKYg0a8KiIvDp3TzQ=
-github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM=
 github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8=
 github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg=
-github.com/libp2p/go-flow-metrics v0.0.3/go.mod h1:HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs=
-github.com/libp2p/go-libp2p-core v0.5.4/go.mod h1:uN7L2D4EvPCvzSH5SrhR72UWbnSGpt5/a35Sm4upn4Y=
-github.com/libp2p/go-libp2p-core v0.8.5 h1:aEgbIcPGsKy6zYcC+5AJivYFedhYa4sW7mIpWpUaLKw=
-github.com/libp2p/go-libp2p-core v0.8.5/go.mod h1:FfewUH/YpvWbEB+ZY9AQRQ4TAD8sJBt/G1rVvhz5XT8=
-github.com/libp2p/go-libp2p-peerstore v0.2.7 h1:83JoLxyR9OYTnNfB5vvFqvMUv/xDNa6NoPHnENhBsGw=
-github.com/libp2p/go-libp2p-peerstore v0.2.7/go.mod h1:ss/TWTgHZTMpsU/oKVVPQCGuDHItOpf2W8RxAi50P2s=
-github.com/libp2p/go-maddr-filter v0.1.0/go.mod h1:VzZhTXkMucEGGEOSKddrwGiOv0tUhgnKqNEmIAz/bPU=
-github.com/libp2p/go-msgio v0.0.4/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
-github.com/libp2p/go-msgio v0.0.6/go.mod h1:4ecVB6d9f4BDSL5fqvPiC4A3KivjWn+Venn/1ALLMWA=
-github.com/libp2p/go-openssl v0.0.4/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
-github.com/libp2p/go-openssl v0.0.7 h1:eCAzdLejcNVBzP/iZM9vqHnQm+XyCEbSSIheIPRGNsw=
-github.com/libp2p/go-openssl v0.0.7/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
 github.com/linode/linodego v1.23.0 h1:s0ReCZtuN9Z1IoUN9w1RLeYO1dMZUGPwOQ/IBFsBHtU=
@@ -1204,14 +1155,8 @@ github.com/miekg/dns v1.1.56/go.mod h1:cRm6Oo2C8TY9ZS/TqsSrseAcncm74lfK5G+ikN2SW
 github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM=
 github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 h1:QRUSJEgZn2Snx0EmT/QLXibWjSUDjKWvXIT19NBVp94=
 github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM=
-github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 h1:lYpkrQH5ajf0OXOcUbGjvZxxijuBwbbmlSxLiuofa+g=
-github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ=
 github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g=
 github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY=
-github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
-github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
-github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
-github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
@@ -1256,9 +1201,6 @@ github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7P
 github.com/mostynb/zstdpool-freelist v0.0.0-20201229113212-927304c0c3b1 h1:mPMvm6X6tf4w8y7j9YIt6V9jfWhL6QlbEc7CCmeQlWk=
 github.com/mostynb/zstdpool-freelist v0.0.0-20201229113212-927304c0c3b1/go.mod h1:ye2e/VUEtE2BHE+G/QcKkcLQVAEJoYRFj5VUOQatCRE=
 github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ=
-github.com/mr-tron/base58 v1.1.0/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8=
-github.com/mr-tron/base58 v1.1.2/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
-github.com/mr-tron/base58 v1.1.3/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
 github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs=
@@ -1267,32 +1209,6 @@ github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
 github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
 github.com/muesli/termenv v0.12.0 h1:KuQRUE3PgxRFWhq4gHvZtPSLCGDqM5q/cYr1pZ39ytc=
 github.com/muesli/termenv v0.12.0/go.mod h1:WCCv32tusQ/EEZ5S8oUIIrC/nIuBcxCVqlN4Xfkv+7A=
-github.com/multiformats/go-base32 v0.0.3 h1:tw5+NhuwaOjJCC5Pp82QuXbrmLzWg7uxlMFp8Nq/kkI=
-github.com/multiformats/go-base32 v0.0.3/go.mod h1:pLiuGC8y0QR3Ue4Zug5UzK9LjgbkL8NSQj0zQ5Nz/AA=
-github.com/multiformats/go-base36 v0.1.0 h1:JR6TyF7JjGd3m6FbLU2cOxhC0Li8z8dLNGQ89tUg4F4=
-github.com/multiformats/go-base36 v0.1.0/go.mod h1:kFGE83c6s80PklsHO9sRn2NCoffoRdUUOENyW/Vv6sM=
-github.com/multiformats/go-multiaddr v0.1.1/go.mod h1:aMKBKNEYmzmDmxfX88/vz+J5IU55txyt0p4aiWVohjo=
-github.com/multiformats/go-multiaddr v0.2.1/go.mod h1:s/Apk6IyxfvMjDafnhJgJ3/46z7tZ04iMk5wP4QMGGE=
-github.com/multiformats/go-multiaddr v0.2.2/go.mod h1:NtfXiOtHvghW9KojvtySjH5y0u0xW5UouOmQQrn6a3Y=
-github.com/multiformats/go-multiaddr v0.3.0/go.mod h1:dF9kph9wfJ+3VLAaeBqo9Of8x4fJxp6ggJGteB8HQTI=
-github.com/multiformats/go-multiaddr v0.3.3 h1:vo2OTSAqnENB2rLk79pLtr+uhj+VAzSe3uef5q0lRSs=
-github.com/multiformats/go-multiaddr v0.3.3/go.mod h1:lCKNGP1EQ1eZ35Za2wlqnabm9xQkib3fyB+nZXHLag0=
-github.com/multiformats/go-multiaddr-fmt v0.1.0 h1:WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E=
-github.com/multiformats/go-multiaddr-fmt v0.1.0/go.mod h1:hGtDIW4PU4BqJ50gW2quDuPVjyWNZxToGUh/HwTZYJo=
-github.com/multiformats/go-multiaddr-net v0.1.4/go.mod h1:ilNnaM9HbmVFqsb/qcNysjCu4PVONlrBZpHIrw/qQuA=
-github.com/multiformats/go-multiaddr-net v0.2.0 h1:MSXRGN0mFymt6B1yo/6BPnIRpLPEnKgQNvVfCX5VDJk=
-github.com/multiformats/go-multiaddr-net v0.2.0/go.mod h1:gGdH3UXny6U3cKKYCvpXI5rnK7YaOIEOPVDI9tsJbEA=
-github.com/multiformats/go-multibase v0.0.1/go.mod h1:bja2MqRZ3ggyXtZSEDKpl0uO/gviWFaSteVbWT51qgs=
-github.com/multiformats/go-multibase v0.0.3 h1:l/B6bJDQjvQ5G52jw4QGSYeOTZoAwIO77RblWplfIqk=
-github.com/multiformats/go-multibase v0.0.3/go.mod h1:5+1R4eQrT3PkYZ24C3W2Ue2tPwIdYQD509ZjSb5y9Oc=
-github.com/multiformats/go-multihash v0.0.8/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=
-github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
-github.com/multiformats/go-multihash v0.0.14 h1:QoBceQYQQtNUuf6s7wHxnE2c8bhbMqhfGzNI032se/I=
-github.com/multiformats/go-multihash v0.0.14/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
-github.com/multiformats/go-varint v0.0.2/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
-github.com/multiformats/go-varint v0.0.5/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
-github.com/multiformats/go-varint v0.0.6 h1:gk85QWKxh3TazbLxED/NlDVv8+q+ReFJk7Y2W/KhfNY=
-github.com/multiformats/go-varint v0.0.6/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
@@ -1316,7 +1232,6 @@ github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
@@ -1325,8 +1240,6 @@ github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042
 github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
 github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4=
 github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
-github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
-github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
@@ -1343,7 +1256,6 @@ github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e h1:4cP
 github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e/go.mod h1:DYR5Eij8rJl8h7gblRrOZ8g0kW1umSpKqYIBTgeDtLo=
 github.com/opentracing-contrib/go-stdlib v1.0.0 h1:TBS7YuVotp8myLon4Pv7BtCBzOTo1DeZCld0Z63mW2w=
 github.com/opentracing-contrib/go-stdlib v1.0.0/go.mod h1:qtI1ogk+2JhVPIXVc6q+NHziSmy2W5GbdQZFUHADCBU=
-github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
@@ -1555,8 +1467,6 @@ github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js=
 github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0=
-github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 h1:RC6RW7j+1+HkWaX/Yh71Ee5ZHaHYt7ZP4sQgUrm6cDU=
-github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572/go.mod h1:w0SWMsp6j9O/dk4/ZpIhL+3CkG8ofA2vuv7k+ltqUMc=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
 github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
@@ -1607,7 +1517,6 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8=
 github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
-github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
 github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDdvS342BElfbETmL1Aiz3i2t0zfRj16Hs=
 github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48=
 github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c h1:g+WoO5jjkqGAzHWCjJB1zZfXPIAaDpzXIEJ0eS6B5Ok=
@@ -1677,8 +1586,6 @@ github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+
 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
 github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs=
 github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI=
-github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1/go.mod h1:8UvriyWtv5Q5EOgjHaSseUEdkQfvwFv1I/In/O2M9gc=
-github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc/go.mod h1:bopw91TMyo8J3tvftk8xmU2kPmlrt4nScJQZU2hE5EM=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
@@ -1780,7 +1687,6 @@ go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
 go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
-go.uber.org/goleak v1.0.0/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
@@ -1797,7 +1703,6 @@ go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
 go.uber.org/zap v1.14.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
-go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
 go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ=
 go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
 go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
@@ -1814,16 +1719,13 @@ golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaE
 golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
@@ -1881,7 +1783,6 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
 golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1891,7 +1792,6 @@ golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190227160552-c95aed5357e7/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -2141,7 +2041,6 @@ golang.org/x/tools v0.0.0-20191010075000-0337d82405ff/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=

From 87f83c02d145dfe180e2c5a197d90b6bea1d6a87 Mon Sep 17 00:00:00 2001
From: Cedric <cedric.cordenier@smartcontract.com>
Date: Tue, 12 Dec 2023 10:52:16 +0000
Subject: [PATCH 107/130] [BCF-2760] Flakey test detection improvements
 (#11470)

* [BCF-2760] Flakey test detection improvements

* [BCF-2760] Dedupe test and subtest entries
---
 tools/flakeytests/reporter.go      |  69 +++++++--
 tools/flakeytests/reporter_test.go | 103 ++++++++++---
 tools/flakeytests/runner.go        | 222 ++++++++++++++++++++++-------
 tools/flakeytests/runner_test.go   | 106 +++++++++++---
 4 files changed, 399 insertions(+), 101 deletions(-)

diff --git a/tools/flakeytests/reporter.go b/tools/flakeytests/reporter.go
index 6696ec29a40..f17a44ef9f1 100644
--- a/tools/flakeytests/reporter.go
+++ b/tools/flakeytests/reporter.go
@@ -11,6 +11,12 @@ import (
 	"time"
 )
 
+const (
+	messageType_flakeyTest   = "flakey_test"
+	messageType_runReport    = "run_report"
+	messageType_packagePanic = "package_panic"
+)
+
 type pushRequest struct {
 	Streams []stream `json:"streams"`
 }
@@ -20,16 +26,28 @@ type stream struct {
 	Values [][]string        `json:"values"`
 }
 
+type BaseMessage struct {
+	MessageType string `json:"message_type"`
+	Context
+}
+
 type flakeyTest struct {
+	BaseMessage
 	Package    string `json:"package"`
 	TestName   string `json:"test_name"`
 	FQTestName string `json:"fq_test_name"`
-	Context
 }
 
-type numFlakes struct {
-	NumFlakes int `json:"num_flakes"`
-	Context
+type packagePanic struct {
+	BaseMessage
+	Package string `json:"package"`
+}
+
+type runReport struct {
+	BaseMessage
+	NumPackagePanics int `json:"num_package_panics"`
+	NumFlakes        int `json:"num_flakes"`
+	NumCombined      int `json:"num_combined"`
 }
 
 type Context struct {
@@ -48,17 +66,21 @@ type LokiReporter struct {
 	ctx     Context
 }
 
-func (l *LokiReporter) createRequest(flakeyTests map[string]map[string]struct{}) (pushRequest, error) {
+func (l *LokiReporter) createRequest(report *Report) (pushRequest, error) {
 	vs := [][]string{}
 	now := l.now()
 	nows := fmt.Sprintf("%d", now.UnixNano())
-	for pkg, tests := range flakeyTests {
+
+	for pkg, tests := range report.tests {
 		for t := range tests {
 			d, err := json.Marshal(flakeyTest{
+				BaseMessage: BaseMessage{
+					MessageType: messageType_flakeyTest,
+					Context:     l.ctx,
+				},
 				Package:    pkg,
 				TestName:   t,
 				FQTestName: fmt.Sprintf("%s:%s", pkg, t),
-				Context:    l.ctx,
 			})
 			if err != nil {
 				return pushRequest{}, err
@@ -67,10 +89,35 @@ func (l *LokiReporter) createRequest(flakeyTests map[string]map[string]struct{})
 		}
 	}
 
-	// Flakes are store in a map[string][]string, so to count them, we can't just do len(flakeyTests),
+	// Flakes are stored in a map[string][]string, so to count them, we can't just do len(flakeyTests),
 	// as that will get us the number of flakey packages, not the number of flakes tests.
 	// However, we do emit one log line per flakey test above, so use that to count our flakes.
-	f, err := json.Marshal(numFlakes{NumFlakes: len(vs), Context: l.ctx})
+	numFlakes := len(vs)
+
+	for pkg := range report.packagePanics {
+		d, err := json.Marshal(packagePanic{
+			BaseMessage: BaseMessage{
+				MessageType: messageType_packagePanic,
+				Context:     l.ctx,
+			},
+			Package: pkg,
+		})
+		if err != nil {
+			return pushRequest{}, err
+		}
+
+		vs = append(vs, []string{nows, string(d)})
+	}
+
+	f, err := json.Marshal(runReport{
+		BaseMessage: BaseMessage{
+			MessageType: messageType_runReport,
+			Context:     l.ctx,
+		},
+		NumFlakes:        numFlakes,
+		NumPackagePanics: len(report.packagePanics),
+		NumCombined:      numFlakes + len(report.packagePanics),
+	})
 	if err != nil {
 		return pushRequest{}, nil
 	}
@@ -120,8 +167,8 @@ func (l *LokiReporter) makeRequest(pushReq pushRequest) error {
 	return err
 }
 
-func (l *LokiReporter) Report(flakeyTests map[string]map[string]struct{}) error {
-	pushReq, err := l.createRequest(flakeyTests)
+func (l *LokiReporter) Report(report *Report) error {
+	pushReq, err := l.createRequest(report)
 	if err != nil {
 		return err
 	}
diff --git a/tools/flakeytests/reporter_test.go b/tools/flakeytests/reporter_test.go
index 9cb2c8e9f7d..15650fc7bd1 100644
--- a/tools/flakeytests/reporter_test.go
+++ b/tools/flakeytests/reporter_test.go
@@ -12,68 +12,131 @@ import (
 func TestMakeRequest_SingleTest(t *testing.T) {
 	now := time.Now()
 	ts := fmt.Sprintf("%d", now.UnixNano())
-	ft := map[string]map[string]struct{}{
-		"core/assets": map[string]struct{}{
-			"TestLink": struct{}{},
+	r := &Report{
+		tests: map[string]map[string]int{
+			"core/assets": map[string]int{
+				"TestLink": 1,
+			},
 		},
 	}
 	lr := &LokiReporter{auth: "bla", host: "bla", command: "go_core_tests", now: func() time.Time { return now }}
-	pr, err := lr.createRequest(ft)
+	pr, err := lr.createRequest(r)
 	require.NoError(t, err)
 	assert.Len(t, pr.Streams, 1)
 	assert.Equal(t, pr.Streams[0].Stream, map[string]string{"command": "go_core_tests", "app": "flakey-test-reporter"})
 	assert.ElementsMatch(t, pr.Streams[0].Values, [][]string{
-		{ts, `{"package":"core/assets","test_name":"TestLink","fq_test_name":"core/assets:TestLink","commit_sha":"","repository":"","event_type":""}`},
-		{ts, `{"num_flakes":1,"commit_sha":"","repository":"","event_type":""}`},
+		{ts, `{"message_type":"flakey_test","commit_sha":"","repository":"","event_type":"","package":"core/assets","test_name":"TestLink","fq_test_name":"core/assets:TestLink"}`},
+		{ts, `{"message_type":"run_report","commit_sha":"","repository":"","event_type":"","num_package_panics":0,"num_flakes":1,"num_combined":1}`},
 	})
 }
 
 func TestMakeRequest_MultipleTests(t *testing.T) {
 	now := time.Now()
 	ts := fmt.Sprintf("%d", now.UnixNano())
-	ft := map[string]map[string]struct{}{
-		"core/assets": map[string]struct{}{
-			"TestLink": struct{}{},
-			"TestCore": struct{}{},
+	r := &Report{
+		tests: map[string]map[string]int{
+			"core/assets": map[string]int{
+				"TestLink": 1,
+				"TestCore": 1,
+			},
 		},
 	}
 	lr := &LokiReporter{auth: "bla", host: "bla", command: "go_core_tests", now: func() time.Time { return now }}
-	pr, err := lr.createRequest(ft)
+	pr, err := lr.createRequest(r)
 	require.NoError(t, err)
 	assert.Len(t, pr.Streams, 1)
 	assert.Equal(t, pr.Streams[0].Stream, map[string]string{"command": "go_core_tests", "app": "flakey-test-reporter"})
 
 	assert.ElementsMatch(t, pr.Streams[0].Values, [][]string{
-		{ts, `{"package":"core/assets","test_name":"TestLink","fq_test_name":"core/assets:TestLink","commit_sha":"","repository":"","event_type":""}`},
-		{ts, `{"package":"core/assets","test_name":"TestCore","fq_test_name":"core/assets:TestCore","commit_sha":"","repository":"","event_type":""}`},
-		{ts, `{"num_flakes":2,"commit_sha":"","repository":"","event_type":""}`},
+		{ts, `{"message_type":"flakey_test","commit_sha":"","repository":"","event_type":"","package":"core/assets","test_name":"TestLink","fq_test_name":"core/assets:TestLink"}`},
+		{ts, `{"message_type":"flakey_test","commit_sha":"","repository":"","event_type":"","package":"core/assets","test_name":"TestCore","fq_test_name":"core/assets:TestCore"}`},
+		{ts, `{"message_type":"run_report","commit_sha":"","repository":"","event_type":"","num_package_panics":0,"num_flakes":2,"num_combined":2}`},
 	})
 }
 
 func TestMakeRequest_NoTests(t *testing.T) {
 	now := time.Now()
 	ts := fmt.Sprintf("%d", now.UnixNano())
-	ft := map[string]map[string]struct{}{}
+	r := NewReport()
 	lr := &LokiReporter{auth: "bla", host: "bla", command: "go_core_tests", now: func() time.Time { return now }}
-	pr, err := lr.createRequest(ft)
+	pr, err := lr.createRequest(r)
 	require.NoError(t, err)
 	assert.Len(t, pr.Streams, 1)
 	assert.Equal(t, pr.Streams[0].Stream, map[string]string{"command": "go_core_tests", "app": "flakey-test-reporter"})
 	assert.ElementsMatch(t, pr.Streams[0].Values, [][]string{
-		{ts, `{"num_flakes":0,"commit_sha":"","repository":"","event_type":""}`},
+		{ts, `{"message_type":"run_report","commit_sha":"","repository":"","event_type":"","num_package_panics":0,"num_flakes":0,"num_combined":0}`},
 	})
 }
 
 func TestMakeRequest_WithContext(t *testing.T) {
 	now := time.Now()
 	ts := fmt.Sprintf("%d", now.UnixNano())
-	ft := map[string]map[string]struct{}{}
+	r := NewReport()
 	lr := &LokiReporter{auth: "bla", host: "bla", command: "go_core_tests", now: func() time.Time { return now }, ctx: Context{CommitSHA: "42"}}
-	pr, err := lr.createRequest(ft)
+	pr, err := lr.createRequest(r)
 	require.NoError(t, err)
 	assert.Len(t, pr.Streams, 1)
 	assert.Equal(t, pr.Streams[0].Stream, map[string]string{"command": "go_core_tests", "app": "flakey-test-reporter"})
 	assert.ElementsMatch(t, pr.Streams[0].Values, [][]string{
-		{ts, `{"num_flakes":0,"commit_sha":"42","repository":"","event_type":""}`},
+		{ts, `{"message_type":"run_report","commit_sha":"42","repository":"","event_type":"","num_package_panics":0,"num_flakes":0,"num_combined":0}`},
 	})
 }
+
+func TestMakeRequest_Panics(t *testing.T) {
+	now := time.Now()
+	ts := fmt.Sprintf("%d", now.UnixNano())
+	r := &Report{
+		tests: map[string]map[string]int{
+			"core/assets": map[string]int{
+				"TestLink": 1,
+			},
+		},
+		packagePanics: map[string]int{
+			"core/assets": 1,
+		},
+	}
+	lr := &LokiReporter{auth: "bla", host: "bla", command: "go_core_tests", now: func() time.Time { return now }}
+	pr, err := lr.createRequest(r)
+	require.NoError(t, err)
+	assert.Len(t, pr.Streams, 1)
+	assert.Equal(t, pr.Streams[0].Stream, map[string]string{"command": "go_core_tests", "app": "flakey-test-reporter"})
+
+	assert.ElementsMatch(t, pr.Streams[0].Values, [][]string{
+		{ts, `{"message_type":"flakey_test","commit_sha":"","repository":"","event_type":"","package":"core/assets","test_name":"TestLink","fq_test_name":"core/assets:TestLink"}`},
+		{ts, `{"message_type":"package_panic","commit_sha":"","repository":"","event_type":"","package":"core/assets"}`},
+		{ts, `{"message_type":"run_report","commit_sha":"","repository":"","event_type":"","num_package_panics":1,"num_flakes":1,"num_combined":2}`},
+	})
+}
+
+func TestDedupeEntries(t *testing.T) {
+	r := &Report{
+		tests: map[string]map[string]int{
+			"core/assets": map[string]int{
+				"TestSomethingAboutAssets/test_1": 2,
+				"TestSomethingAboutAssets":        4,
+				"TestSomeOtherTest":               1,
+				"TestSomethingAboutAssets/test_2": 2,
+				"TestFinalTest/test_1":            1,
+			},
+			"core/services/important_service": map[string]int{
+				"TestAnImportantService/a_subtest": 1,
+			},
+		},
+	}
+
+	otherReport, err := dedupeEntries(r)
+	require.NoError(t, err)
+
+	expectedMap := map[string]map[string]int{
+		"core/assets": map[string]int{
+			"TestSomethingAboutAssets/test_1": 2,
+			"TestSomeOtherTest":               1,
+			"TestSomethingAboutAssets/test_2": 2,
+			"TestFinalTest/test_1":            1,
+		},
+		"core/services/important_service": map[string]int{
+			"TestAnImportantService/a_subtest": 1,
+		},
+	}
+	assert.Equal(t, expectedMap, otherReport.tests)
+}
diff --git a/tools/flakeytests/runner.go b/tools/flakeytests/runner.go
index d935000222f..97402633f38 100644
--- a/tools/flakeytests/runner.go
+++ b/tools/flakeytests/runner.go
@@ -11,6 +11,7 @@ import (
 	"os"
 	"os/exec"
 	"regexp"
+	"sort"
 	"strings"
 	"time"
 )
@@ -32,10 +33,10 @@ type tester interface {
 }
 
 type reporter interface {
-	Report(map[string]map[string]struct{}) error
+	Report(r *Report) error
 }
 
-type parseFn func(readers ...io.Reader) (map[string]map[string]int, error)
+type parseFn func(readers ...io.Reader) (*Report, error)
 
 func NewRunner(readers []io.Reader, reporter reporter, numReruns int) *Runner {
 	tc := &testCommand{
@@ -60,9 +61,14 @@ type testCommand struct {
 
 func (t *testCommand) test(pkg string, tests []string, w io.Writer) error {
 	replacedPkg := strings.Replace(pkg, t.repo, "", -1)
-	testFilter := strings.Join(tests, "|")
 	cmd := exec.Command(t.command, fmt.Sprintf(".%s", replacedPkg)) //#nosec
-	cmd.Env = append(os.Environ(), fmt.Sprintf("TEST_FLAGS=-run %s", testFilter))
+	cmd.Env = os.Environ()
+
+	if len(tests) > 0 {
+		testFilter := strings.Join(tests, "|")
+		cmd.Env = append(cmd.Env, fmt.Sprintf("TEST_FLAGS=-run %s", testFilter))
+	}
+
 	cmd.Stdout = io.MultiWriter(os.Stdout, w)
 	cmd.Stderr = io.MultiWriter(os.Stderr, w)
 	t.overrides(cmd)
@@ -84,8 +90,8 @@ func newEvent(b []byte) (*TestEvent, error) {
 	return e, err
 }
 
-func parseOutput(readers ...io.Reader) (map[string]map[string]int, error) {
-	tests := map[string]map[string]int{}
+func parseOutput(readers ...io.Reader) (*Report, error) {
+	report := NewReport()
 	for _, r := range readers {
 		s := bufio.NewScanner(r)
 		for s.Scan() {
@@ -105,24 +111,32 @@ func parseOutput(readers ...io.Reader) (map[string]map[string]int, error) {
 				return nil, err
 			}
 
-			// We're only interested in test failures, for which
-			// both Package and Test would be present.
-			if e.Package == "" || e.Test == "" {
-				continue
-			}
-
 			switch e.Action {
 			case "fail":
-				if tests[e.Package] == nil {
-					tests[e.Package] = map[string]int{}
+				// Fail logs come in two forms:
+				// - with e.Package && e.Test, in which case it indicates a test failure.
+				// - with e.Package only, which indicates that the package test has failed,
+				// or possible that there has been a panic in an out-of-process goroutine running
+				// as part of the tests.
+				//
+				// We can ignore the last case because a package failure will be accounted elsewhere, either
+				// in the form of a failing test entry, or in the form of a panic output log, covered below.
+				if e.Test == "" {
+					continue
 				}
-				tests[e.Package][e.Test]++
+
+				report.IncTest(e.Package, e.Test)
 			case "output":
 				if panicRe.MatchString(e.Output) {
-					if tests[e.Package] == nil {
-						tests[e.Package] = map[string]int{}
+					// Similar to the above, a panic can come in two forms:
+					// - attached to a test (i.e. with e.Test != ""), in which case
+					// we'll treat it like a failing test.
+					// - package-scoped, in which case we'll treat it as a package panic.
+					if e.Test != "" {
+						report.IncTest(e.Package, e.Test)
+					} else {
+						report.IncPackagePanic(e.Package)
 					}
-					tests[e.Package][e.Test]++
 				}
 			}
 		}
@@ -131,75 +145,183 @@ func parseOutput(readers ...io.Reader) (map[string]map[string]int, error) {
 			return nil, err
 		}
 	}
-	return tests, nil
+
+	return report, nil
 }
 
 type exitCoder interface {
 	ExitCode() int
 }
 
-func (r *Runner) runTests(failedTests map[string]map[string]int) (map[string]map[string]struct{}, error) {
-	suspectedFlakes := map[string]map[string]struct{}{}
+type Report struct {
+	tests         map[string]map[string]int
+	packagePanics map[string]int
+}
+
+func NewReport() *Report {
+	return &Report{
+		tests:         map[string]map[string]int{},
+		packagePanics: map[string]int{},
+	}
+}
+
+func (r *Report) HasFlakes() bool {
+	return len(r.tests) > 0 || len(r.packagePanics) > 0
+}
+
+func (r *Report) SetTest(pkg, test string, val int) {
+	if r.tests[pkg] == nil {
+		r.tests[pkg] = map[string]int{}
+	}
+	r.tests[pkg][test] = val
+}
+
+func (r *Report) IncTest(pkg string, test string) {
+	if r.tests[pkg] == nil {
+		r.tests[pkg] = map[string]int{}
+	}
+	r.tests[pkg][test]++
+}
 
-	for pkg, tests := range failedTests {
+func (r *Report) IncPackagePanic(pkg string) {
+	r.packagePanics[pkg]++
+}
+
+func (r *Runner) runTest(pkg string, tests []string) (*Report, error) {
+	var out bytes.Buffer
+	err := r.testCommand.test(pkg, tests, &out)
+	if err != nil {
+		log.Printf("Test command errored: %s\n", err)
+		// There was an error because the command failed with a non-zero
+		// exit code. This could just mean that the test failed again, so let's
+		// keep going.
+		var exErr exitCoder
+		if errors.As(err, &exErr) && exErr.ExitCode() > 0 {
+			return r.parse(&out)
+		}
+		return nil, err
+	}
+
+	return r.parse(&out)
+}
+
+func (r *Runner) runTests(rep *Report) (*Report, error) {
+	report := NewReport()
+
+	// We need to deal with two types of flakes here:
+	// - flakes where we know the test that failed; in this case, we just rerun the failing test in question
+	// - flakes where we don't know what test failed. These are flakes where a panic occurred in an out-of-process goroutine,
+	// thus failing the package as a whole. For these, we'll rerun the whole package again.
+	for pkg, tests := range rep.tests {
 		ts := []string{}
 		for test := range tests {
 			ts = append(ts, test)
 		}
 
-		log.Printf("Executing test command with parameters: pkg=%s, tests=%+v, numReruns=%d\n", pkg, ts, r.numReruns)
+		log.Printf("[FLAKEY_TEST] Executing test command with parameters: pkg=%s, tests=%+v, numReruns=%d\n", pkg, ts, r.numReruns)
 		for i := 0; i < r.numReruns; i++ {
-			var out bytes.Buffer
-
-			err := r.testCommand.test(pkg, ts, &out)
+			pr, err := r.runTest(pkg, ts)
 			if err != nil {
-				log.Printf("Test command errored: %s\n", err)
-				// There was an error because the command failed with a non-zero
-				// exit code. This could just mean that the test failed again, so let's
-				// keep going.
-				var exErr exitCoder
-				if errors.As(err, &exErr) && exErr.ExitCode() > 0 {
-					continue
+				return report, err
+			}
+
+			for t := range tests {
+				failures := pr.tests[pkg][t]
+				if failures == 0 {
+					report.SetTest(pkg, t, 1)
 				}
-				return suspectedFlakes, err
 			}
 
-			fr, err := r.parse(&out)
+		}
+	}
+
+	for pkg := range rep.packagePanics {
+		log.Printf("[PACKAGE_PANIC]: Executing test command with parameters: pkg=%s, numReruns=%d\n", pkg, r.numReruns)
+		for i := 0; i < r.numReruns; i++ {
+			pr, err := r.runTest(pkg, []string{})
 			if err != nil {
-				return nil, err
+				return report, err
 			}
 
-			for t := range tests {
-				failures := fr[pkg][t]
-				if failures == 0 {
-					if suspectedFlakes[pkg] == nil {
-						suspectedFlakes[pkg] = map[string]struct{}{}
-					}
-					suspectedFlakes[pkg][t] = struct{}{}
-				}
+			if pr.packagePanics[pkg] == 0 {
+				report.IncPackagePanic(pkg)
+			}
+		}
+	}
+
+	return report, nil
+}
+
+func isSubtest(tn string) bool {
+	return strings.Contains(tn, "/")
+}
+
+func isSubtestOf(st, mt string) bool {
+	return isSubtest(st) && strings.Contains(st, mt)
+}
+
+func dedupeEntries(report *Report) (*Report, error) {
+	out := NewReport()
+	out.packagePanics = report.packagePanics
+	for pkg, tests := range report.tests {
+		// Sort the test names
+		testNames := make([]string, 0, len(tests))
+		for t := range tests {
+			testNames = append(testNames, t)
+		}
+
+		sort.Strings(testNames)
+
+		for i, tn := range testNames {
+			// Is this the last element? If it is, then add it to the deduped set.
+			// This is because a) it's a main test, in which case we add it because
+			// it has no subtests following it, or b) it's a subtest, which we always add.
+			if i == len(testNames)-1 {
+				out.SetTest(pkg, tn, report.tests[pkg][tn])
+				continue
 			}
+
+			// Next, let's compare the current item to the next one in the alphabetical order.
+			// In all cases we want to add the current item, UNLESS the current item is a main test,
+			// and the following one is a subtest of the current item.
+			nextItem := testNames[i+1]
+			if !isSubtest(tn) && isSubtestOf(nextItem, tn) {
+				continue
+			}
+
+			out.SetTest(pkg, tn, report.tests[pkg][tn])
 		}
+
 	}
 
-	return suspectedFlakes, nil
+	return out, nil
 }
 
 func (r *Runner) Run() error {
-	failedTests, err := r.parse(r.readers...)
+	parseReport, err := r.parse(r.readers...)
 	if err != nil {
 		return err
 	}
 
-	suspectedFlakes, err := r.runTests(failedTests)
+	report, err := r.runTests(parseReport)
 	if err != nil {
 		return err
 	}
 
-	if len(suspectedFlakes) > 0 {
-		log.Printf("ERROR: Suspected flakes found: %+v\n", suspectedFlakes)
+	if report.HasFlakes() {
+		log.Printf("ERROR: Suspected flakes found: %+v\n", report)
 	} else {
 		log.Print("SUCCESS: No suspected flakes detected")
 	}
 
-	return r.reporter.Report(suspectedFlakes)
+	// Before reporting the errors, let's dedupe some entries:
+	// In actuality, a failing subtest will produce two failing test entries,
+	// namely one for the test as a whole, and one for the subtest.
+	// This leads to inaccurate metrics since a failing subtest is double-counted.
+	report, err = dedupeEntries(report)
+	if err != nil {
+		return err
+	}
+
+	return r.reporter.Report(report)
 }
diff --git a/tools/flakeytests/runner_test.go b/tools/flakeytests/runner_test.go
index 31f300dcbee..64e2a6c968a 100644
--- a/tools/flakeytests/runner_test.go
+++ b/tools/flakeytests/runner_test.go
@@ -12,16 +12,16 @@ import (
 )
 
 type mockReporter struct {
-	entries map[string]map[string]struct{}
+	report *Report
 }
 
-func (m *mockReporter) Report(entries map[string]map[string]struct{}) error {
-	m.entries = entries
+func (m *mockReporter) Report(report *Report) error {
+	m.report = report
 	return nil
 }
 
 func newMockReporter() *mockReporter {
-	return &mockReporter{entries: map[string]map[string]struct{}{}}
+	return &mockReporter{report: NewReport()}
 }
 
 func TestParser(t *testing.T) {
@@ -29,9 +29,10 @@ func TestParser(t *testing.T) {
 `
 
 	r := strings.NewReader(output)
-	ts, err := parseOutput(r)
+	pr, err := parseOutput(r)
 	require.NoError(t, err)
 
+	ts := pr.tests
 	assert.Len(t, ts, 1)
 	assert.Len(t, ts["github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"], 1)
 	assert.Equal(t, ts["github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"]["TestLink"], 1)
@@ -44,9 +45,10 @@ func TestParser_SkipsNonJSON(t *testing.T) {
 `
 
 	r := strings.NewReader(output)
-	ts, err := parseOutput(r)
+	pr, err := parseOutput(r)
 	require.NoError(t, err)
 
+	ts := pr.tests
 	assert.Len(t, ts, 1)
 	assert.Len(t, ts["github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"], 1)
 	assert.Equal(t, ts["github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"]["TestLink"], 1)
@@ -58,9 +60,10 @@ func TestParser_PanicDueToLogging(t *testing.T) {
 `
 
 	r := strings.NewReader(output)
-	ts, err := parseOutput(r)
+	pr, err := parseOutput(r)
 	require.NoError(t, err)
 
+	ts := pr.tests
 	assert.Len(t, ts, 1)
 	assert.Len(t, ts["github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"], 1)
 	assert.Equal(t, ts["github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"]["TestAssets_LinkScanValue"], 1)
@@ -85,7 +88,7 @@ func TestParser_SuccessfulOutput(t *testing.T) {
 	r := strings.NewReader(output)
 	ts, err := parseOutput(r)
 	require.NoError(t, err)
-	assert.Len(t, ts, 0)
+	assert.Len(t, ts.tests, 0)
 }
 
 type testAdapter func(string, []string, io.Writer) error
@@ -119,8 +122,8 @@ func TestRunner_WithFlake(t *testing.T) {
 	// to only report one failure (not two as expected).
 	err := r.Run()
 	require.NoError(t, err)
-	assert.Len(t, m.entries, 1)
-	_, ok := m.entries["github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"]["TestLink"]
+	assert.Len(t, m.report.tests, 1)
+	_, ok := m.report.tests["github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"]["TestLink"]
 	assert.True(t, ok)
 }
 
@@ -154,8 +157,8 @@ func TestRunner_WithFailedPackage(t *testing.T) {
 	// to only report one failure (not two as expected).
 	err := r.Run()
 	require.NoError(t, err)
-	assert.Len(t, m.entries, 1)
-	_, ok := m.entries["github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"]["TestLink"]
+	assert.Len(t, m.report.tests, 1)
+	_, ok := m.report.tests["github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"]["TestLink"]
 	assert.True(t, ok)
 }
 
@@ -180,7 +183,7 @@ func TestRunner_AllFailures(t *testing.T) {
 
 	err := r.Run()
 	require.NoError(t, err)
-	assert.Len(t, m.entries, 0)
+	assert.Len(t, m.report.tests, 0)
 }
 
 func TestRunner_RerunSuccessful(t *testing.T) {
@@ -206,7 +209,7 @@ func TestRunner_RerunSuccessful(t *testing.T) {
 
 	err := r.Run()
 	require.NoError(t, err)
-	_, ok := m.entries["github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"]["TestLink"]
+	_, ok := m.report.tests["github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"]["TestLink"]
 	assert.True(t, ok)
 }
 
@@ -228,7 +231,7 @@ func TestRunner_RootLevelTest(t *testing.T) {
 
 	err := r.Run()
 	require.NoError(t, err)
-	_, ok := m.entries["github.com/smartcontractkit/chainlink/v2/"]["TestConfigDocs"]
+	_, ok := m.report.tests["github.com/smartcontractkit/chainlink/v2/"]["TestConfigDocs"]
 	assert.True(t, ok)
 }
 
@@ -255,7 +258,7 @@ func TestRunner_RerunFailsWithNonzeroExitCode(t *testing.T) {
 
 	err := r.Run()
 	require.NoError(t, err)
-	_, ok := m.entries["github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"]["TestLink"]
+	_, ok := m.report.tests["github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"]["TestLink"]
 	assert.True(t, ok)
 }
 
@@ -295,10 +298,25 @@ func TestRunner_RerunWithNonZeroExitCodeDoesntStopCommand(t *testing.T) {
 	calls := index
 	assert.Equal(t, 4, calls)
 
-	_, ok := m.entries["github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"]["TestLink"]
+	_, ok := m.report.tests["github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"]["TestLink"]
 	assert.True(t, ok)
 }
 
+// Used for integration tests
+func TestSkippedForTests_Subtests(t *testing.T) {
+	if os.Getenv("FLAKEY_TEST_RUNNER_RUN_FIXTURE_TEST") != "1" {
+		t.Skip()
+	}
+
+	t.Run("1: should fail", func(t *testing.T) {
+		assert.False(t, true)
+	})
+
+	t.Run("2: should fail", func(t *testing.T) {
+		assert.False(t, true)
+	})
+}
+
 // Used for integration tests
 func TestSkippedForTests(t *testing.T) {
 	if os.Getenv("FLAKEY_TEST_RUNNER_RUN_FIXTURE_TEST") != "1" {
@@ -319,7 +337,51 @@ func TestSkippedForTests_Success(t *testing.T) {
 	assert.True(t, true)
 }
 
-func TestParsesPanicCorrectly(t *testing.T) {
+func TestIntegration_DealsWithSubtests(t *testing.T) {
+	if testing.Short() {
+		t.Skip()
+	}
+
+	output := `
+{"Time":"2023-09-07T15:39:46.378315+01:00","Action":"fail","Package":"github.com/smartcontractkit/chainlink/v2/tools/flakeytests/","Test":"TestSkippedForTests_Subtests/1:_should_fail","Elapsed":0}
+{"Time":"2023-09-07T15:39:46.378315+01:00","Action":"fail","Package":"github.com/smartcontractkit/chainlink/v2/tools/flakeytests/","Test":"TestSkippedForTests_Subtests","Elapsed":0}
+{"Time":"2023-09-07T15:39:46.378315+01:00","Action":"fail","Package":"github.com/smartcontractkit/chainlink/v2/tools/flakeytests/","Test":"TestSkippedForTests_Subtests/2:_should_fail","Elapsed":0}
+`
+
+	m := newMockReporter()
+	tc := &testCommand{
+		repo:    "github.com/smartcontractkit/chainlink/v2/tools/flakeytests",
+		command: "../bin/go_core_tests",
+		overrides: func(cmd *exec.Cmd) {
+			cmd.Env = append(cmd.Env, "FLAKEY_TESTRUNNER_RUN_FIXTURE_TEST=1")
+			cmd.Stdout = io.Discard
+			cmd.Stderr = io.Discard
+		},
+	}
+	r := &Runner{
+		numReruns:   2,
+		readers:     []io.Reader{strings.NewReader(output)},
+		testCommand: tc,
+		parse:       parseOutput,
+		reporter:    m,
+	}
+
+	err := r.Run()
+	require.NoError(t, err)
+	expectedTests := map[string]map[string]int{
+		"github.com/smartcontractkit/chainlink/v2/tools/flakeytests/": {
+			"TestSkippedForTests_Subtests/1:_should_fail": 1,
+			"TestSkippedForTests_Subtests/2:_should_fail": 1,
+		},
+	}
+	assert.Equal(t, expectedTests, m.report.tests)
+}
+
+func TestIntegration_ParsesPanics(t *testing.T) {
+	if testing.Short() {
+		t.Skip()
+	}
+
 	output := `{"Time":"2023-09-07T15:39:46.378315+01:00","Action":"fail","Package":"github.com/smartcontractkit/chainlink/v2/tools/flakeytests/","Test":"TestSkippedForTests","Elapsed":0}`
 
 	m := newMockReporter()
@@ -342,11 +404,15 @@ func TestParsesPanicCorrectly(t *testing.T) {
 
 	err := r.Run()
 	require.NoError(t, err)
-	_, ok := m.entries["github.com/smartcontractkit/chainlink/v2/tools/flakeytests"]["TestSkippedForTests"]
+	_, ok := m.report.tests["github.com/smartcontractkit/chainlink/v2/tools/flakeytests"]["TestSkippedForTests"]
 	assert.False(t, ok)
 }
 
 func TestIntegration(t *testing.T) {
+	if testing.Short() {
+		t.Skip()
+	}
+
 	output := `{"Time":"2023-09-07T15:39:46.378315+01:00","Action":"fail","Package":"github.com/smartcontractkit/chainlink/v2/tools/flakeytests/","Test":"TestSkippedForTests_Success","Elapsed":0}`
 
 	m := newMockReporter()
@@ -369,6 +435,6 @@ func TestIntegration(t *testing.T) {
 
 	err := r.Run()
 	require.NoError(t, err)
-	_, ok := m.entries["github.com/smartcontractkit/chainlink/v2/tools/flakeytests"]["TestSkippedForTests_Success"]
+	_, ok := m.report.tests["github.com/smartcontractkit/chainlink/v2/tools/flakeytests"]["TestSkippedForTests_Success"]
 	assert.False(t, ok)
 }

From 69dc8dfeb00e6711da1f25b9d7c7a394517aed17 Mon Sep 17 00:00:00 2001
From: Dimitris Grigoriou <dimitris.grigoriou@smartcontract.com>
Date: Tue, 12 Dec 2023 14:35:33 +0200
Subject: [PATCH 108/130] Remove core utils dependencies from common (#11425)

* Change difficulty from Big to BigInt

* Fix headtracker mock head

* Remove EsnureClosed

* Fix mock heads

* Migrate to common Mailbox

* Fix Tracker close on txm

* Change to EnsureHexPrefix

* Change names to mailbox

* Remove core/null dependency from common

* Remove core mailbox

* Fix dependencies

* Tidy

* Fix dependencies

* Change path to internal utils

* Minor fixes

* Rename MinKey function

* Update MinFunc

* Fix utils conflicts
---
 common/client/node_lifecycle.go               |   7 +-
 common/client/send_only_node_lifecycle.go     |   2 +-
 common/headtracker/head_broadcaster.go        |   6 +-
 common/headtracker/head_listener.go           |   2 +-
 common/headtracker/head_tracker.go            |  14 +-
 common/internal/utils/utils.go                |  36 ++++
 common/txmgr/broadcaster.go                   |   2 +-
 common/txmgr/confirmer.go                     |  14 +-
 common/txmgr/reaper.go                        |   2 +-
 common/txmgr/resender.go                      |   2 +-
 common/txmgr/tracker.go                       |   8 +-
 common/txmgr/txmgr.go                         |   8 +-
 common/txmgr/types/tx.go                      |   3 +-
 .../chains/evm/gas/block_history_estimator.go |   6 +-
 .../evm/headtracker/head_broadcaster_test.go  |   3 +-
 core/chains/evm/headtracker/head_tracker.go   |   5 +-
 .../evm/headtracker/head_tracker_test.go      |   9 +-
 core/chains/evm/log/broadcaster.go            |  13 +-
 core/chains/evm/log/helpers_internal_test.go  |   5 +-
 core/chains/evm/log/helpers_test.go           |   4 +-
 core/chains/evm/log/integration_test.go       |   3 +-
 core/chains/evm/txmgr/evm_tx_store.go         |   3 +-
 core/chains/legacyevm/chain.go                |   3 +-
 core/chains/legacyevm/chain_test.go           |   7 +-
 core/cmd/shell.go                             |   3 +-
 core/cmd/shell_local_test.go                  |   6 +-
 core/internal/cltest/cltest.go                |   3 +-
 core/internal/testutils/evmtest/evmtest.go    |   5 +-
 core/services/chainlink/application.go        |   3 +-
 .../relayer_chain_interoperators_test.go      |   6 +-
 core/services/directrequest/delegate.go       |  18 +-
 core/services/directrequest/delegate_test.go  |   5 +-
 core/services/functions/listener_test.go      |   4 +-
 core/services/job/runner_integration_test.go  |  12 +-
 core/services/job/spawner_test.go             |   9 +-
 core/services/keeper/delegate.go              |   6 +-
 .../keeper/registry_synchronizer_core.go      |  10 +-
 .../registry_synchronizer_helper_test.go      |   4 +-
 core/services/keeper/upkeep_executer.go       |   7 +-
 core/services/ocr/contract_tracker.go         |  10 +-
 core/services/ocr/contract_tracker_test.go    |   4 +-
 core/services/ocr/delegate.go                 |   5 +-
 core/services/ocr2/delegate.go                |   6 +-
 .../services/ocr2/plugins/functions/plugin.go |   3 +-
 core/services/pipeline/task.eth_tx.go         |   2 +-
 core/services/pipeline/task.eth_tx_test.go    |   2 +-
 core/services/promreporter/prom_reporter.go   |   7 +-
 core/services/vrf/delegate.go                 |   8 +-
 core/services/vrf/delegate_test.go            |   5 +-
 core/services/vrf/v1/listener_v1.go           |   5 +-
 core/services/vrf/v2/listener_v2.go           |   1 +
 core/services/vrf/v2/listener_v2_test.go      |   3 +-
 core/utils/mailbox.go                         | 126 ------------
 core/utils/mailbox_prom.go                    |  93 ---------
 core/utils/mailbox_test.go                    | 181 ------------------
 core/utils/utils.go                           |  21 --
 56 files changed, 200 insertions(+), 550 deletions(-)
 create mode 100644 common/internal/utils/utils.go
 delete mode 100644 core/utils/mailbox.go
 delete mode 100644 core/utils/mailbox_prom.go
 delete mode 100644 core/utils/mailbox_test.go

diff --git a/common/client/node_lifecycle.go b/common/client/node_lifecycle.go
index 5ba0bff3238..eda137d5100 100644
--- a/common/client/node_lifecycle.go
+++ b/common/client/node_lifecycle.go
@@ -12,9 +12,10 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils"
 	bigmath "github.com/smartcontractkit/chainlink-common/pkg/utils/big_math"
 
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
+	iutils "github.com/smartcontractkit/chainlink/v2/common/internal/utils"
 )
 
 var (
@@ -360,7 +361,7 @@ func (n *node[CHAIN_ID, HEAD, RPC]) unreachableLoop() {
 	lggr := logger.Named(n.lfcLog, "Unreachable")
 	lggr.Debugw("Trying to revive unreachable RPC node", "nodeState", n.State())
 
-	dialRetryBackoff := utils.NewRedialBackoff()
+	dialRetryBackoff := iutils.NewRedialBackoff()
 
 	for {
 		select {
@@ -416,7 +417,7 @@ func (n *node[CHAIN_ID, HEAD, RPC]) invalidChainIDLoop() {
 	lggr := logger.Named(n.lfcLog, "InvalidChainID")
 	lggr.Debugw(fmt.Sprintf("Periodically re-checking RPC node %s with invalid chain ID", n.String()), "nodeState", n.State())
 
-	chainIDRecheckBackoff := utils.NewRedialBackoff()
+	chainIDRecheckBackoff := iutils.NewRedialBackoff()
 
 	for {
 		select {
diff --git a/common/client/send_only_node_lifecycle.go b/common/client/send_only_node_lifecycle.go
index 4d5b102b5bd..c66d267ed42 100644
--- a/common/client/send_only_node_lifecycle.go
+++ b/common/client/send_only_node_lifecycle.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
+	"github.com/smartcontractkit/chainlink/v2/common/internal/utils"
 )
 
 // verifyLoop may only be triggered once, on Start, if initial chain ID check
diff --git a/common/headtracker/head_broadcaster.go b/common/headtracker/head_broadcaster.go
index 0e676f864fa..758a7713846 100644
--- a/common/headtracker/head_broadcaster.go
+++ b/common/headtracker/head_broadcaster.go
@@ -9,9 +9,9 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 const TrackableCallbackTimeout = 2 * time.Second
@@ -30,7 +30,7 @@ type HeadBroadcaster[H types.Head[BLOCK_HASH], BLOCK_HASH types.Hashable] struct
 	services.StateMachine
 	logger         logger.Logger
 	callbacks      callbackSet[H, BLOCK_HASH]
-	mailbox        *utils.Mailbox[H]
+	mailbox        *mailbox.Mailbox[H]
 	mutex          sync.Mutex
 	chClose        services.StopChan
 	wgDone         sync.WaitGroup
@@ -48,7 +48,7 @@ func NewHeadBroadcaster[
 	return &HeadBroadcaster[H, BLOCK_HASH]{
 		logger:    logger.Named(lggr, "HeadBroadcaster"),
 		callbacks: make(callbackSet[H, BLOCK_HASH]),
-		mailbox:   utils.NewSingleMailbox[H](),
+		mailbox:   mailbox.NewSingle[H](),
 		chClose:   make(chan struct{}),
 	}
 }
diff --git a/common/headtracker/head_listener.go b/common/headtracker/head_listener.go
index 0aebf606634..e7ea4fb51ae 100644
--- a/common/headtracker/head_listener.go
+++ b/common/headtracker/head_listener.go
@@ -14,8 +14,8 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
 	htrktypes "github.com/smartcontractkit/chainlink/v2/common/headtracker/types"
+	"github.com/smartcontractkit/chainlink/v2/common/internal/utils"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 var (
diff --git a/common/headtracker/head_tracker.go b/common/headtracker/head_tracker.go
index c977eb023cc..373aa5a958f 100644
--- a/common/headtracker/head_tracker.go
+++ b/common/headtracker/head_tracker.go
@@ -12,10 +12,10 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 
 	htrktypes "github.com/smartcontractkit/chainlink/v2/common/headtracker/types"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 var (
@@ -43,14 +43,14 @@ type HeadTracker[
 	log             logger.Logger
 	headBroadcaster types.HeadBroadcaster[HTH, BLOCK_HASH]
 	headSaver       types.HeadSaver[HTH, BLOCK_HASH]
-	mailMon         *utils.MailboxMonitor
+	mailMon         *mailbox.Monitor
 	client          htrktypes.Client[HTH, S, ID, BLOCK_HASH]
 	chainID         ID
 	config          htrktypes.Config
 	htConfig        htrktypes.HeadTrackerConfig
 
-	backfillMB   *utils.Mailbox[HTH]
-	broadcastMB  *utils.Mailbox[HTH]
+	backfillMB   *mailbox.Mailbox[HTH]
+	broadcastMB  *mailbox.Mailbox[HTH]
 	headListener types.HeadListener[HTH, BLOCK_HASH]
 	chStop       services.StopChan
 	wgDone       sync.WaitGroup
@@ -70,7 +70,7 @@ func NewHeadTracker[
 	htConfig htrktypes.HeadTrackerConfig,
 	headBroadcaster types.HeadBroadcaster[HTH, BLOCK_HASH],
 	headSaver types.HeadSaver[HTH, BLOCK_HASH],
-	mailMon *utils.MailboxMonitor,
+	mailMon *mailbox.Monitor,
 	getNilHead func() HTH,
 ) types.HeadTracker[HTH, BLOCK_HASH] {
 	chStop := make(chan struct{})
@@ -82,8 +82,8 @@ func NewHeadTracker[
 		config:          config,
 		htConfig:        htConfig,
 		log:             lggr,
-		backfillMB:      utils.NewSingleMailbox[HTH](),
-		broadcastMB:     utils.NewMailbox[HTH](HeadsBufferSize),
+		backfillMB:      mailbox.NewSingle[HTH](),
+		broadcastMB:     mailbox.New[HTH](HeadsBufferSize),
 		chStop:          chStop,
 		headListener:    NewHeadListener[HTH, S, ID, BLOCK_HASH](lggr, client, config, chStop),
 		headSaver:       headSaver,
diff --git a/common/internal/utils/utils.go b/common/internal/utils/utils.go
new file mode 100644
index 00000000000..1e285868c53
--- /dev/null
+++ b/common/internal/utils/utils.go
@@ -0,0 +1,36 @@
+package utils
+
+import (
+	"cmp"
+	"slices"
+	"time"
+
+	"github.com/jpillora/backoff"
+	"golang.org/x/exp/constraints"
+)
+
+// NewRedialBackoff is a standard backoff to use for redialling or reconnecting to
+// unreachable network endpoints
+func NewRedialBackoff() backoff.Backoff {
+	return backoff.Backoff{
+		Min:    1 * time.Second,
+		Max:    15 * time.Second,
+		Jitter: true,
+	}
+
+}
+
+// MinFunc returns the minimum value of the given element array with respect
+// to the given key function. In the event U is not a compound type (e.g a
+// struct) an identity function can be provided.
+func MinFunc[U any, T constraints.Ordered](elems []U, f func(U) T) T {
+	var min T
+	if len(elems) == 0 {
+		return min
+	}
+
+	e := slices.MinFunc(elems, func(a, b U) int {
+		return cmp.Compare(f(a), f(b))
+	})
+	return f(e)
+}
diff --git a/common/txmgr/broadcaster.go b/common/txmgr/broadcaster.go
index f10ecafc670..dba2b976c33 100644
--- a/common/txmgr/broadcaster.go
+++ b/common/txmgr/broadcaster.go
@@ -18,12 +18,12 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/chains/label"
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils"
 
 	"github.com/smartcontractkit/chainlink/v2/common/client"
 	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 const (
diff --git a/common/txmgr/confirmer.go b/common/txmgr/confirmer.go
index 95be9ad23e6..aabdf45ae32 100644
--- a/common/txmgr/confirmer.go
+++ b/common/txmgr/confirmer.go
@@ -17,13 +17,15 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/chains/label"
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 
 	"github.com/smartcontractkit/chainlink/v2/common/client"
 	commonfee "github.com/smartcontractkit/chainlink/v2/common/fee"
 	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
+	iutils "github.com/smartcontractkit/chainlink/v2/common/internal/utils"
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 const (
@@ -129,7 +131,7 @@ type Confirmer[
 	ks               txmgrtypes.KeyStore[ADDR, CHAIN_ID, SEQ]
 	enabledAddresses []ADDR
 
-	mb        *utils.Mailbox[HEAD]
+	mb        *mailbox.Mailbox[HEAD]
 	ctx       context.Context
 	ctxCancel context.CancelFunc
 	wg        sync.WaitGroup
@@ -174,7 +176,7 @@ func NewConfirmer[
 		dbConfig:         dbConfig,
 		chainID:          client.ConfiguredChainID(),
 		ks:               keystore,
-		mb:               utils.NewSingleMailbox[HEAD](),
+		mb:               mailbox.NewSingle[HEAD](),
 		isReceiptNil:     isReceiptNil,
 	}
 }
@@ -223,7 +225,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) clo
 	ec.initSync.Lock()
 	defer ec.initSync.Unlock()
 	if !ec.isStarted {
-		return fmt.Errorf("Confirmer is not started: %w", utils.ErrAlreadyStopped)
+		return fmt.Errorf("Confirmer is not started: %w", services.ErrAlreadyStopped)
 	}
 	ec.ctxCancel()
 	ec.wg.Wait()
@@ -869,7 +871,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) han
 			"err", sendError,
 			"fee", attempt.TxFee,
 			"feeLimit", etx.FeeLimit,
-			"signedRawTx", utils.AddHexPrefix(hex.EncodeToString(attempt.SignedRawTx)),
+			"signedRawTx", utils.EnsureHexPrefix(hex.EncodeToString(attempt.SignedRawTx)),
 			"blockHeight", blockHeight,
 		)
 		ec.SvcErrBuffer.Append(sendError)
@@ -1147,7 +1149,7 @@ func observeUntilTxConfirmed[
 
 			// Since a tx can have many attempts, we take the number of blocks to confirm as the block number
 			// of the receipt minus the block number of the first ever broadcast for this transaction.
-			broadcastBefore := utils.MinKey(attempt.Tx.TxAttempts, func(attempt txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) int64 {
+			broadcastBefore := iutils.MinFunc(attempt.Tx.TxAttempts, func(attempt txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) int64 {
 				if attempt.BroadcastBeforeBlockNum != nil {
 					return *attempt.BroadcastBeforeBlockNum
 				}
diff --git a/common/txmgr/reaper.go b/common/txmgr/reaper.go
index 385a9a17c3d..3ed05b2caee 100644
--- a/common/txmgr/reaper.go
+++ b/common/txmgr/reaper.go
@@ -7,10 +7,10 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils"
 
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 // Reaper handles periodic database cleanup for Txm
diff --git a/common/txmgr/resender.go b/common/txmgr/resender.go
index 06c466e1730..74cf3d1389c 100644
--- a/common/txmgr/resender.go
+++ b/common/txmgr/resender.go
@@ -8,12 +8,12 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/chains/label"
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils"
 
 	"github.com/smartcontractkit/chainlink/v2/common/client"
 	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 const (
diff --git a/common/txmgr/tracker.go b/common/txmgr/tracker.go
index 1a24dd5b5fe..3ef2fc07208 100644
--- a/common/txmgr/tracker.go
+++ b/common/txmgr/tracker.go
@@ -8,11 +8,11 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
+
 	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 const (
@@ -56,7 +56,7 @@ type Tracker[
 	txCache      map[int64]AbandonedTx[ADDR]
 	ttl          time.Duration
 	lock         sync.Mutex
-	mb           *utils.Mailbox[int64]
+	mb           *mailbox.Mailbox[int64]
 	wg           sync.WaitGroup
 	isStarted    bool
 	ctx          context.Context
@@ -85,7 +85,7 @@ func NewTracker[
 		enabledAddrs: map[ADDR]bool{},
 		txCache:      map[int64]AbandonedTx[ADDR]{},
 		ttl:          defaultTTL,
-		mb:           utils.NewSingleMailbox[int64](),
+		mb:           mailbox.NewSingle[int64](),
 		lock:         sync.Mutex{},
 		wg:           sync.WaitGroup{},
 	}
diff --git a/common/txmgr/txmgr.go b/common/txmgr/txmgr.go
index 228ab4ec8bf..e43a16b29ef 100644
--- a/common/txmgr/txmgr.go
+++ b/common/txmgr/txmgr.go
@@ -14,10 +14,12 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils"
+
 	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
+	iutils "github.com/smartcontractkit/chainlink/v2/common/internal/utils"
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 // For more information about the Txm architecture, see the design doc:
@@ -342,7 +344,7 @@ func (b *Txm[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) runLoop()
 			ctx, cancel := b.chStop.NewCtx()
 			defer cancel()
 			// Retry indefinitely on failure
-			backoff := utils.NewRedialBackoff()
+			backoff := iutils.NewRedialBackoff()
 			for {
 				select {
 				case <-time.After(backoff.Duration()):
@@ -361,7 +363,7 @@ func (b *Txm[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) runLoop()
 		go func() {
 			defer wg.Done()
 			// Retry indefinitely on failure
-			backoff := utils.NewRedialBackoff()
+			backoff := iutils.NewRedialBackoff()
 			for {
 				select {
 				case <-time.After(backoff.Duration()):
diff --git a/common/txmgr/types/tx.go b/common/txmgr/types/tx.go
index 3af43b19617..caac763fc0f 100644
--- a/common/txmgr/types/tx.go
+++ b/common/txmgr/types/tx.go
@@ -15,9 +15,10 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/sqlutil"
+	clnull "github.com/smartcontractkit/chainlink-common/pkg/utils/null"
+
 	feetypes "github.com/smartcontractkit/chainlink/v2/common/fee/types"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
-	clnull "github.com/smartcontractkit/chainlink/v2/core/null"
 )
 
 // TxStrategy controls how txes are queued and sent
diff --git a/core/chains/evm/gas/block_history_estimator.go b/core/chains/evm/gas/block_history_estimator.go
index 0ec4721b797..844b9e547f2 100644
--- a/core/chains/evm/gas/block_history_estimator.go
+++ b/core/chains/evm/gas/block_history_estimator.go
@@ -17,6 +17,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 	"github.com/smartcontractkit/chainlink-common/pkg/utils/mathutil"
 
 	"github.com/smartcontractkit/chainlink/v2/common/config"
@@ -25,7 +26,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 // MaxStartTime is the maximum amount of time we are allowed to spend
@@ -109,7 +109,7 @@ type (
 		blocks    []evmtypes.Block
 		blocksMu  sync.RWMutex
 		size      int64
-		mb        *utils.Mailbox[*evmtypes.Head]
+		mb        *mailbox.Mailbox[*evmtypes.Head]
 		wg        *sync.WaitGroup
 		ctx       context.Context
 		ctxCancel context.CancelFunc
@@ -139,7 +139,7 @@ func NewBlockHistoryEstimator(lggr logger.Logger, ethClient evmclient.Client, cf
 		blocks:    make([]evmtypes.Block, 0),
 		// Must have enough blocks for both estimator and connectivity checker
 		size:      int64(mathutil.Max(bhCfg.BlockHistorySize(), bhCfg.CheckInclusionBlocks())),
-		mb:        utils.NewSingleMailbox[*evmtypes.Head](),
+		mb:        mailbox.NewSingle[*evmtypes.Head](),
 		wg:        new(sync.WaitGroup),
 		ctx:       ctx,
 		ctxCancel: cancel,
diff --git a/core/chains/evm/headtracker/head_broadcaster_test.go b/core/chains/evm/headtracker/head_broadcaster_test.go
index ac43c08fe87..b9fab9cdd48 100644
--- a/core/chains/evm/headtracker/head_broadcaster_test.go
+++ b/core/chains/evm/headtracker/head_broadcaster_test.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 
 	commonhtrk "github.com/smartcontractkit/chainlink/v2/common/headtracker"
 	commonmocks "github.com/smartcontractkit/chainlink/v2/common/types/mocks"
@@ -71,7 +72,7 @@ func TestHeadBroadcaster_Subscribe(t *testing.T) {
 
 	orm := headtracker.NewORM(db, logger, cfg.Database(), *ethClient.ConfiguredChainID())
 	hs := headtracker.NewHeadSaver(logger, orm, evmCfg.EVM(), evmCfg.EVM().HeadTracker())
-	mailMon := utils.NewMailboxMonitor(t.Name())
+	mailMon := mailbox.NewMonitor(t.Name())
 	servicetest.Run(t, mailMon)
 	hb := headtracker.NewHeadBroadcaster(logger)
 	servicetest.Run(t, hb)
diff --git a/core/chains/evm/headtracker/head_tracker.go b/core/chains/evm/headtracker/head_tracker.go
index b86a6b5fe22..3cddfb71d09 100644
--- a/core/chains/evm/headtracker/head_tracker.go
+++ b/core/chains/evm/headtracker/head_tracker.go
@@ -9,12 +9,13 @@ import (
 	"go.uber.org/zap/zapcore"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
+
 	"github.com/smartcontractkit/chainlink/v2/common/headtracker"
 	commontypes "github.com/smartcontractkit/chainlink/v2/common/types"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	httypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker/types"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 type headTracker = headtracker.HeadTracker[*evmtypes.Head, ethereum.Subscription, *big.Int, common.Hash]
@@ -28,7 +29,7 @@ func NewHeadTracker(
 	htConfig HeadTrackerConfig,
 	headBroadcaster httypes.HeadBroadcaster,
 	headSaver httypes.HeadSaver,
-	mailMon *utils.MailboxMonitor,
+	mailMon *mailbox.Monitor,
 ) httypes.HeadTracker {
 	return headtracker.NewHeadTracker[*evmtypes.Head, ethereum.Subscription, *big.Int, common.Hash](
 		lggr,
diff --git a/core/chains/evm/headtracker/head_tracker_test.go b/core/chains/evm/headtracker/head_tracker_test.go
index 4d3cebd24e2..d8abb1328ac 100644
--- a/core/chains/evm/headtracker/head_tracker_test.go
+++ b/core/chains/evm/headtracker/head_tracker_test.go
@@ -22,6 +22,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 
 	commonmocks "github.com/smartcontractkit/chainlink/v2/common/types/mocks"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
@@ -992,7 +993,7 @@ func createHeadTracker(t *testing.T, ethClient evmclient.Client, config headtrac
 	lggr := logger.Test(t)
 	hb := headtracker.NewHeadBroadcaster(lggr)
 	hs := headtracker.NewHeadSaver(lggr, orm, config, htConfig)
-	mailMon := utils.NewMailboxMonitor(t.Name())
+	mailMon := mailbox.NewMonitor(t.Name())
 	return &headTrackerUniverse{
 		mu:              new(sync.Mutex),
 		headTracker:     headtracker.NewHeadTracker(lggr, ethClient, config, htConfig, hb, hs, mailMon),
@@ -1007,7 +1008,7 @@ func createHeadTrackerWithNeverSleeper(t *testing.T, ethClient evmclient.Client,
 	lggr := logger.Test(t)
 	hb := headtracker.NewHeadBroadcaster(lggr)
 	hs := headtracker.NewHeadSaver(lggr, orm, evmcfg.EVM(), evmcfg.EVM().HeadTracker())
-	mailMon := utils.NewMailboxMonitor(t.Name())
+	mailMon := mailbox.NewMonitor(t.Name())
 	ht := headtracker.NewHeadTracker(lggr, ethClient, evmcfg.EVM(), evmcfg.EVM().HeadTracker(), hb, hs, mailMon)
 	_, err := hs.Load(testutils.Context(t))
 	require.NoError(t, err)
@@ -1025,7 +1026,7 @@ func createHeadTrackerWithChecker(t *testing.T, ethClient evmclient.Client, conf
 	hb := headtracker.NewHeadBroadcaster(lggr)
 	hs := headtracker.NewHeadSaver(lggr, orm, config, htConfig)
 	hb.Subscribe(checker)
-	mailMon := utils.NewMailboxMonitor(t.Name())
+	mailMon := mailbox.NewMonitor(t.Name())
 	ht := headtracker.NewHeadTracker(lggr, ethClient, config, htConfig, hb, hs, mailMon)
 	return &headTrackerUniverse{
 		mu:              new(sync.Mutex),
@@ -1042,7 +1043,7 @@ type headTrackerUniverse struct {
 	headTracker     httypes.HeadTracker
 	headBroadcaster httypes.HeadBroadcaster
 	headSaver       httypes.HeadSaver
-	mailMon         *utils.MailboxMonitor
+	mailMon         *mailbox.Monitor
 }
 
 func (u *headTrackerUniverse) Backfill(ctx context.Context, head *evmtypes.Head, depth uint) error {
diff --git a/core/chains/evm/log/broadcaster.go b/core/chains/evm/log/broadcaster.go
index f4528396093..393d1c1b266 100644
--- a/core/chains/evm/log/broadcaster.go
+++ b/core/chains/evm/log/broadcaster.go
@@ -14,6 +14,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	httypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker/types"
@@ -102,11 +103,11 @@ type (
 		registrations *registrations
 		logPool       *logPool
 
-		mailMon *utils.MailboxMonitor
+		mailMon *mailbox.Monitor
 		// Use the same channel for subs/unsubs so ordering is preserved
 		// (unsubscribe must happen after subscribe)
-		changeSubscriberStatus *utils.Mailbox[changeSubscriberStatus]
-		newHeads               *utils.Mailbox[*evmtypes.Head]
+		changeSubscriberStatus *mailbox.Mailbox[changeSubscriberStatus]
+		newHeads               *mailbox.Mailbox[*evmtypes.Head]
 
 		utils.DependentAwaiter
 
@@ -165,7 +166,7 @@ const (
 var _ Broadcaster = (*broadcaster)(nil)
 
 // NewBroadcaster creates a new instance of the broadcaster
-func NewBroadcaster(orm ORM, ethClient evmclient.Client, config Config, lggr logger.Logger, highestSavedHead *evmtypes.Head, mailMon *utils.MailboxMonitor) *broadcaster {
+func NewBroadcaster(orm ORM, ethClient evmclient.Client, config Config, lggr logger.Logger, highestSavedHead *evmtypes.Head, mailMon *mailbox.Monitor) *broadcaster {
 	chStop := make(chan struct{})
 	lggr = logger.Named(lggr, "LogBroadcaster")
 	chainId := ethClient.ConfiguredChainID()
@@ -178,8 +179,8 @@ func NewBroadcaster(orm ORM, ethClient evmclient.Client, config Config, lggr log
 		registrations:          newRegistrations(lggr, *chainId),
 		logPool:                newLogPool(lggr),
 		mailMon:                mailMon,
-		changeSubscriberStatus: utils.NewHighCapacityMailbox[changeSubscriberStatus](),
-		newHeads:               utils.NewSingleMailbox[*evmtypes.Head](),
+		changeSubscriberStatus: mailbox.NewHighCapacity[changeSubscriberStatus](),
+		newHeads:               mailbox.NewSingle[*evmtypes.Head](),
 		DependentAwaiter:       utils.NewDependentAwaiter(),
 		chStop:                 chStop,
 		highestSavedHead:       highestSavedHead,
diff --git a/core/chains/evm/log/helpers_internal_test.go b/core/chains/evm/log/helpers_internal_test.go
index 38f40bd329e..4d4318cdf9d 100644
--- a/core/chains/evm/log/helpers_internal_test.go
+++ b/core/chains/evm/log/helpers_internal_test.go
@@ -4,13 +4,14 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
+
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 // NewTestBroadcaster creates a broadcaster with Pause/Resume enabled.
-func NewTestBroadcaster(orm ORM, ethClient evmclient.Client, config Config, lggr logger.Logger, highestSavedHead *evmtypes.Head, mailMon *utils.MailboxMonitor) *broadcaster {
+func NewTestBroadcaster(orm ORM, ethClient evmclient.Client, config Config, lggr logger.Logger, highestSavedHead *evmtypes.Head, mailMon *mailbox.Monitor) *broadcaster {
 	b := NewBroadcaster(orm, ethClient, config, lggr, highestSavedHead, mailMon)
 	b.testPause, b.testResume = make(chan struct{}), make(chan struct{})
 	return b
diff --git a/core/chains/evm/log/helpers_test.go b/core/chains/evm/log/helpers_test.go
index e41f08e8d20..13dfe1ffab6 100644
--- a/core/chains/evm/log/helpers_test.go
+++ b/core/chains/evm/log/helpers_test.go
@@ -22,6 +22,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
@@ -42,7 +43,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
 	evmrelay "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 type broadcasterHelper struct {
@@ -90,7 +90,7 @@ func newBroadcasterHelperWithEthClient(t *testing.T, ethClient evmclient.Client,
 	})
 	config := evmtest.NewChainScopedConfig(t, globalConfig)
 	lggr := logger.Test(t)
-	mailMon := servicetest.Run(t, utils.NewMailboxMonitor(t.Name()))
+	mailMon := servicetest.Run(t, mailbox.NewMonitor(t.Name()))
 
 	db := pgtest.NewSqlxDB(t)
 	orm := log.NewORM(db, lggr, config.Database(), cltest.FixtureChainID)
diff --git a/core/chains/evm/log/integration_test.go b/core/chains/evm/log/integration_test.go
index e5b6ad3caf5..b26e87e668c 100644
--- a/core/chains/evm/log/integration_test.go
+++ b/core/chains/evm/log/integration_test.go
@@ -18,6 +18,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
@@ -1325,7 +1326,7 @@ func TestBroadcaster_AppendLogChannel(t *testing.T) {
 	ch3 := make(chan types.Log)
 
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
-	mailMon := servicetest.RunHealthy(t, utils.NewMailboxMonitor(t.Name()))
+	mailMon := servicetest.RunHealthy(t, mailbox.NewMonitor(t.Name()))
 	lb := log.NewBroadcaster(nil, ethClient, nil, logger.Test(t), nil, mailMon)
 	chCombined := lb.ExportedAppendLogChannel(ch1, ch2)
 	chCombined = lb.ExportedAppendLogChannel(chCombined, ch3)
diff --git a/core/chains/evm/txmgr/evm_tx_store.go b/core/chains/evm/txmgr/evm_tx_store.go
index 730809e8dda..1c9868741fa 100644
--- a/core/chains/evm/txmgr/evm_tx_store.go
+++ b/core/chains/evm/txmgr/evm_tx_store.go
@@ -20,13 +20,14 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/sqlutil"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/null"
+
 	"github.com/smartcontractkit/chainlink/v2/common/txmgr"
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/label"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/null"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
diff --git a/core/chains/legacyevm/chain.go b/core/chains/legacyevm/chain.go
index 4b4c69f1ab6..18277a55d03 100644
--- a/core/chains/legacyevm/chain.go
+++ b/core/chains/legacyevm/chain.go
@@ -16,6 +16,7 @@ import (
 	common "github.com/smartcontractkit/chainlink-common/pkg/chains"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 
 	commonclient "github.com/smartcontractkit/chainlink/v2/common/client"
 	commonconfig "github.com/smartcontractkit/chainlink/v2/common/config"
@@ -164,7 +165,7 @@ type ChainOpts struct {
 	AppConfig AppConfig
 
 	EventBroadcaster pg.EventBroadcaster
-	MailMon          *utils.MailboxMonitor
+	MailMon          *mailbox.Monitor
 	GasEstimator     gas.EvmFeeEstimator
 
 	*sqlx.DB
diff --git a/core/chains/legacyevm/chain_test.go b/core/chains/legacyevm/chain_test.go
index 4fcd51c39d9..93332348aa0 100644
--- a/core/chains/legacyevm/chain_test.go
+++ b/core/chains/legacyevm/chain_test.go
@@ -8,12 +8,13 @@ import (
 
 	"github.com/jmoiron/sqlx"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
+
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func TestLegacyChains(t *testing.T) {
@@ -35,7 +36,7 @@ func TestChainOpts_Validate(t *testing.T) {
 	type fields struct {
 		AppConfig        legacyevm.AppConfig
 		EventBroadcaster pg.EventBroadcaster
-		MailMon          *utils.MailboxMonitor
+		MailMon          *mailbox.Monitor
 		DB               *sqlx.DB
 	}
 	tests := []struct {
@@ -48,7 +49,7 @@ func TestChainOpts_Validate(t *testing.T) {
 			fields: fields{
 				AppConfig:        configtest.NewTestGeneralConfig(t),
 				EventBroadcaster: pg.NewNullEventBroadcaster(),
-				MailMon:          &utils.MailboxMonitor{},
+				MailMon:          &mailbox.Monitor{},
 				DB:               pgtest.NewSqlxDB(t),
 			},
 		},
diff --git a/core/cmd/shell.go b/core/cmd/shell.go
index 2e382be4ccf..3810559cf34 100644
--- a/core/cmd/shell.go
+++ b/core/cmd/shell.go
@@ -32,6 +32,7 @@ import (
 	"github.com/jmoiron/sqlx"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/loop"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 
 	"github.com/smartcontractkit/chainlink/v2/core/build"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
@@ -153,7 +154,7 @@ func (n ChainlinkAppFactory) NewApplication(ctx context.Context, cfg chainlink.G
 	}
 
 	keyStore := keystore.New(db, utils.GetScryptParams(cfg), appLggr, cfg.Database())
-	mailMon := utils.NewMailboxMonitor(cfg.AppID().String())
+	mailMon := mailbox.NewMonitor(cfg.AppID().String())
 
 	dbListener := cfg.Database().Listener()
 	eventBroadcaster := pg.NewEventBroadcaster(cfg.Database().URL(), dbListener.MinReconnectInterval(), dbListener.MaxReconnectDuration(), appLggr, cfg.AppID())
diff --git a/core/cmd/shell_local_test.go b/core/cmd/shell_local_test.go
index fac2d7f040b..56da90d811c 100644
--- a/core/cmd/shell_local_test.go
+++ b/core/cmd/shell_local_test.go
@@ -8,6 +8,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
+
 	"github.com/smartcontractkit/chainlink/v2/common/client"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/cmd"
@@ -89,7 +91,7 @@ func TestShell_RunNodeWithPasswords(t *testing.T) {
 				ChainOpts: legacyevm.ChainOpts{
 					AppConfig:        cfg,
 					EventBroadcaster: pg.NewNullEventBroadcaster(),
-					MailMon:          &utils.MailboxMonitor{},
+					MailMon:          &mailbox.Monitor{},
 					DB:               db,
 				},
 			}
@@ -194,7 +196,7 @@ func TestShell_RunNodeWithAPICredentialsFile(t *testing.T) {
 				ChainOpts: legacyevm.ChainOpts{
 					AppConfig:        cfg,
 					EventBroadcaster: pg.NewNullEventBroadcaster(),
-					MailMon:          &utils.MailboxMonitor{},
+					MailMon:          &mailbox.Monitor{},
 					DB:               db,
 				},
 			}
diff --git a/core/internal/cltest/cltest.go b/core/internal/cltest/cltest.go
index 88abc3de5c6..dc90201890d 100644
--- a/core/internal/cltest/cltest.go
+++ b/core/internal/cltest/cltest.go
@@ -38,6 +38,7 @@ import (
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting/types"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/loop"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 
 	"github.com/smartcontractkit/chainlink/v2/common/client"
 	commonmocks "github.com/smartcontractkit/chainlink/v2/common/types/mocks"
@@ -339,7 +340,7 @@ func NewApplicationWithConfig(t testing.TB, cfg chainlink.GeneralConfig, flagsAn
 
 	keyStore := keystore.NewInMemory(db, utils.FastScryptParams, lggr, cfg.Database())
 
-	mailMon := utils.NewMailboxMonitor(cfg.AppID().String())
+	mailMon := mailbox.NewMonitor(cfg.AppID().String())
 	loopRegistry := plugins.NewLoopRegistry(lggr, nil)
 
 	mercuryPool := wsrpc.NewPool(lggr, cache.Config{
diff --git a/core/internal/testutils/evmtest/evmtest.go b/core/internal/testutils/evmtest/evmtest.go
index e0a447a3274..095ea1a35c9 100644
--- a/core/internal/testutils/evmtest/evmtest.go
+++ b/core/internal/testutils/evmtest/evmtest.go
@@ -17,6 +17,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 
 	commonmocks "github.com/smartcontractkit/chainlink/v2/common/types/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains"
@@ -65,7 +66,7 @@ type TestChainOpts struct {
 	DB             *sqlx.DB
 	TxManager      txmgr.TxManager
 	KeyStore       keystore.Eth
-	MailMon        *utils.MailboxMonitor
+	MailMon        *mailbox.Monitor
 	GasEstimator   gas.EvmFeeEstimator
 }
 
@@ -118,7 +119,7 @@ func NewChainRelayExtOpts(t testing.TB, testopts TestChainOpts) legacyevm.ChainR
 		}
 	}
 	if opts.MailMon == nil {
-		opts.MailMon = servicetest.Run(t, utils.NewMailboxMonitor(t.Name()))
+		opts.MailMon = servicetest.Run(t, mailbox.NewMonitor(t.Name()))
 	}
 	if testopts.GasEstimator != nil {
 		opts.GenGasEstimator = func(*big.Int) gas.EvmFeeEstimator {
diff --git a/core/services/chainlink/application.go b/core/services/chainlink/application.go
index 5c204d693e9..ed043086586 100644
--- a/core/services/chainlink/application.go
+++ b/core/services/chainlink/application.go
@@ -20,6 +20,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/loop"
 	commonservices "github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 	"github.com/smartcontractkit/chainlink/v2/core/static"
 
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
@@ -149,7 +150,7 @@ type ApplicationOpts struct {
 	Config                     GeneralConfig
 	Logger                     logger.Logger
 	EventBroadcaster           pg.EventBroadcaster
-	MailMon                    *utils.MailboxMonitor
+	MailMon                    *mailbox.Monitor
 	SqlxDB                     *sqlx.DB
 	KeyStore                   keystore.Master
 	RelayerChainInteroperators *CoreRelayerChainInteroperators
diff --git a/core/services/chainlink/relayer_chain_interoperators_test.go b/core/services/chainlink/relayer_chain_interoperators_test.go
index 6a5445d9f21..a0754fa0139 100644
--- a/core/services/chainlink/relayer_chain_interoperators_test.go
+++ b/core/services/chainlink/relayer_chain_interoperators_test.go
@@ -11,6 +11,8 @@ import (
 
 	commoncfg "github.com/smartcontractkit/chainlink-common/pkg/config"
 	"github.com/smartcontractkit/chainlink-common/pkg/loop"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
+
 	coscfg "github.com/smartcontractkit/chainlink-cosmos/pkg/cosmos/config"
 	solcfg "github.com/smartcontractkit/chainlink-solana/pkg/solana/config"
 	stkcfg "github.com/smartcontractkit/chainlink-starknet/relayer/pkg/chainlink/config"
@@ -206,7 +208,7 @@ func TestCoreRelayerChainInteroperators(t *testing.T) {
 					ChainOpts: legacyevm.ChainOpts{
 						AppConfig:        cfg,
 						EventBroadcaster: pg.NewNullEventBroadcaster(),
-						MailMon:          &utils.MailboxMonitor{},
+						MailMon:          &mailbox.Monitor{},
 						DB:               db,
 					},
 					CSAETHKeystore: keyStore,
@@ -280,7 +282,7 @@ func TestCoreRelayerChainInteroperators(t *testing.T) {
 					ChainOpts: legacyevm.ChainOpts{
 						AppConfig:        cfg,
 						EventBroadcaster: pg.NewNullEventBroadcaster(),
-						MailMon:          &utils.MailboxMonitor{},
+						MailMon:          &mailbox.Monitor{},
 						DB:               db,
 					},
 					CSAETHKeystore: keyStore,
diff --git a/core/services/directrequest/delegate.go b/core/services/directrequest/delegate.go
index a21029ea177..cfdf1eed116 100644
--- a/core/services/directrequest/delegate.go
+++ b/core/services/directrequest/delegate.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/assets"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
@@ -21,7 +22,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 type (
@@ -31,7 +31,7 @@ type (
 		pipelineORM    pipeline.ORM
 		chHeads        chan *evmtypes.Head
 		legacyChains   legacyevm.LegacyChainContainer
-		mailMon        *utils.MailboxMonitor
+		mailMon        *mailbox.Monitor
 	}
 
 	Config interface {
@@ -47,7 +47,7 @@ func NewDelegate(
 	pipelineRunner pipeline.Runner,
 	pipelineORM pipeline.ORM,
 	legacyChains legacyevm.LegacyChainContainer,
-	mailMon *utils.MailboxMonitor,
+	mailMon *mailbox.Monitor,
 ) *Delegate {
 	return &Delegate{
 		logger:         logger.Named("DirectRequest"),
@@ -101,8 +101,8 @@ func (d *Delegate) ServicesForSpec(jb job.Job) ([]job.ServiceCtx, error) {
 		pipelineORM:              d.pipelineORM,
 		mailMon:                  d.mailMon,
 		job:                      jb,
-		mbOracleRequests:         utils.NewHighCapacityMailbox[log.Broadcast](),
-		mbOracleCancelRequests:   utils.NewHighCapacityMailbox[log.Broadcast](),
+		mbOracleRequests:         mailbox.NewHighCapacity[log.Broadcast](),
+		mbOracleCancelRequests:   mailbox.NewHighCapacity[log.Broadcast](),
 		minIncomingConfirmations: concreteSpec.MinIncomingConfirmations.Uint32,
 		requesters:               concreteSpec.Requesters,
 		minContractPayment:       concreteSpec.MinContractPayment,
@@ -127,12 +127,12 @@ type listener struct {
 	oracle                   operator_wrapper.OperatorInterface
 	pipelineRunner           pipeline.Runner
 	pipelineORM              pipeline.ORM
-	mailMon                  *utils.MailboxMonitor
+	mailMon                  *mailbox.Monitor
 	job                      job.Job
 	runs                     sync.Map // map[string]services.StopChan
 	shutdownWaitGroup        sync.WaitGroup
-	mbOracleRequests         *utils.Mailbox[log.Broadcast]
-	mbOracleCancelRequests   *utils.Mailbox[log.Broadcast]
+	mbOracleRequests         *mailbox.Mailbox[log.Broadcast]
+	mbOracleCancelRequests   *mailbox.Mailbox[log.Broadcast]
 	minIncomingConfirmations uint32
 	requesters               models.AddressCollection
 	minContractPayment       *assets.Link
@@ -238,7 +238,7 @@ func (l *listener) processCancelOracleRequests() {
 	}
 }
 
-func (l *listener) handleReceivedLogs(mailbox *utils.Mailbox[log.Broadcast]) {
+func (l *listener) handleReceivedLogs(mailbox *mailbox.Mailbox[log.Broadcast]) {
 	for {
 		select {
 		case <-l.chStop:
diff --git a/core/services/directrequest/delegate_test.go b/core/services/directrequest/delegate_test.go
index 2d5b9bef03b..865edb1b481 100644
--- a/core/services/directrequest/delegate_test.go
+++ b/core/services/directrequest/delegate_test.go
@@ -15,6 +15,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/assets"
 	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
@@ -44,7 +45,7 @@ func TestDelegate_ServicesForSpec(t *testing.T) {
 		c.EVM[0].MinIncomingConfirmations = ptr[uint32](1)
 	})
 	keyStore := cltest.NewKeyStore(t, db, cfg.Database())
-	mailMon := servicetest.Run(t, utils.NewMailboxMonitor(t.Name()))
+	mailMon := servicetest.Run(t, mailbox.NewMonitor(t.Name()))
 	relayerExtenders := evmtest.NewChainRelayExtenders(t, evmtest.TestChainOpts{DB: db, GeneralConfig: cfg, Client: ethClient, MailMon: mailMon, KeyStore: keyStore.Eth()})
 
 	lggr := logger.TestLogger(t)
@@ -81,7 +82,7 @@ func NewDirectRequestUniverseWithConfig(t *testing.T, cfg chainlink.GeneralConfi
 	runner := pipeline_mocks.NewRunner(t)
 	broadcaster.On("AddDependents", 1)
 
-	mailMon := servicetest.Run(t, utils.NewMailboxMonitor(t.Name()))
+	mailMon := servicetest.Run(t, mailbox.NewMonitor(t.Name()))
 
 	db := pgtest.NewSqlxDB(t)
 	keyStore := cltest.NewKeyStore(t, db, cfg.Database())
diff --git a/core/services/functions/listener_test.go b/core/services/functions/listener_test.go
index 5020537bf61..07bd82ed288 100644
--- a/core/services/functions/listener_test.go
+++ b/core/services/functions/listener_test.go
@@ -20,6 +20,7 @@ import (
 	decryptionPlugin "github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 
 	log_mocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/log/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
@@ -44,7 +45,6 @@ import (
 	sync_mocks "github.com/smartcontractkit/chainlink/v2/core/services/synchronization/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/services/synchronization/telem"
 	"github.com/smartcontractkit/chainlink/v2/core/services/telemetry"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 type FunctionsListenerUniverse struct {
@@ -82,7 +82,7 @@ func NewFunctionsListenerUniverse(t *testing.T, timeoutSec int, pruneFrequencySe
 	ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
 	broadcaster := log_mocks.NewBroadcaster(t)
 	broadcaster.On("AddDependents", 1)
-	mailMon := servicetest.Run(t, utils.NewMailboxMonitor(t.Name()))
+	mailMon := servicetest.Run(t, mailbox.NewMonitor(t.Name()))
 
 	db := pgtest.NewSqlxDB(t)
 	kst := cltest.NewKeyStore(t, db, cfg.Database())
diff --git a/core/services/job/runner_integration_test.go b/core/services/job/runner_integration_test.go
index 0223f1a10d5..14a5c41b396 100644
--- a/core/services/job/runner_integration_test.go
+++ b/core/services/job/runner_integration_test.go
@@ -24,6 +24,7 @@ import (
 	"gopkg.in/guregu/null.v4"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 
 	"github.com/smartcontractkit/chainlink/v2/core/auth"
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
@@ -45,7 +46,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/telemetry"
 	"github.com/smartcontractkit/chainlink/v2/core/services/webhook"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 	"github.com/smartcontractkit/chainlink/v2/core/web"
 )
 
@@ -462,7 +462,7 @@ answer1      [type=median index=0];
 			legacyChains,
 			lggr,
 			config.Database(),
-			servicetest.Run(t, utils.NewMailboxMonitor(t.Name())),
+			servicetest.Run(t, mailbox.NewMonitor(t.Name())),
 		)
 		_, err = sd.ServicesForSpec(jb)
 		require.NoError(t, err)
@@ -496,7 +496,7 @@ answer1      [type=median index=0];
 			legacyChains,
 			lggr,
 			config.Database(),
-			servicetest.Run(t, utils.NewMailboxMonitor(t.Name())),
+			servicetest.Run(t, mailbox.NewMonitor(t.Name())),
 		)
 		_, err = sd.ServicesForSpec(jb)
 		require.NoError(t, err)
@@ -524,7 +524,7 @@ answer1      [type=median index=0];
 			legacyChains,
 			lggr,
 			config.Database(),
-			servicetest.Run(t, utils.NewMailboxMonitor(t.Name())),
+			servicetest.Run(t, mailbox.NewMonitor(t.Name())),
 		)
 		_, err = sd.ServicesForSpec(jb)
 		require.NoError(t, err)
@@ -579,7 +579,7 @@ answer1      [type=median index=0];
 				legacyChains,
 				lggr,
 				config.Database(),
-				servicetest.Run(t, utils.NewMailboxMonitor(t.Name())),
+				servicetest.Run(t, mailbox.NewMonitor(t.Name())),
 			)
 
 			jb.OCROracleSpec.CaptureEATelemetry = tc.jbCaptureEATelemetry
@@ -623,7 +623,7 @@ answer1      [type=median index=0];
 			legacyChains,
 			lggr,
 			config.Database(),
-			servicetest.Run(t, utils.NewMailboxMonitor(t.Name())),
+			servicetest.Run(t, mailbox.NewMonitor(t.Name())),
 		)
 		services, err := sd.ServicesForSpec(*jb)
 		require.NoError(t, err)
diff --git a/core/services/job/spawner_test.go b/core/services/job/spawner_test.go
index d639ce859af..b82aa73c0b5 100644
--- a/core/services/job/spawner_test.go
+++ b/core/services/job/spawner_test.go
@@ -14,6 +14,7 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/loop"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
 	mocklp "github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller/mocks"
@@ -128,7 +129,7 @@ func TestSpawner_CreateJobDeleteJob(t *testing.T) {
 		serviceA2 := mocks.NewServiceCtx(t)
 		serviceA1.On("Start", mock.Anything).Return(nil).Once()
 		serviceA2.On("Start", mock.Anything).Return(nil).Once().Run(func(mock.Arguments) { eventuallyA.ItHappened() })
-		mailMon := servicetest.Run(t, utils.NewMailboxMonitor(t.Name()))
+		mailMon := servicetest.Run(t, mailbox.NewMonitor(t.Name()))
 		dA := ocr.NewDelegate(nil, orm, nil, nil, nil, monitoringEndpoint, legacyChains, logger.TestLogger(t), config.Database(), mailMon)
 		delegateA := &delegate{jobA.Type, []job.ServiceCtx{serviceA1, serviceA2}, 0, make(chan struct{}), dA}
 
@@ -187,7 +188,7 @@ func TestSpawner_CreateJobDeleteJob(t *testing.T) {
 
 		lggr := logger.TestLogger(t)
 		orm := NewTestORM(t, db, pipeline.NewORM(db, lggr, config.Database(), config.JobPipeline().MaxSuccessfulRuns()), bridges.NewORM(db, lggr, config.Database()), keyStore, config.Database())
-		mailMon := servicetest.Run(t, utils.NewMailboxMonitor(t.Name()))
+		mailMon := servicetest.Run(t, mailbox.NewMonitor(t.Name()))
 		d := ocr.NewDelegate(nil, orm, nil, nil, nil, monitoringEndpoint, legacyChains, logger.TestLogger(t), config.Database(), mailMon)
 		delegateA := &delegate{jobA.Type, []job.ServiceCtx{serviceA1, serviceA2}, 0, nil, d}
 		spawner := job.NewSpawner(orm, config.Database(), noopChecker{}, map[job.Type]job.Delegate{
@@ -221,7 +222,7 @@ func TestSpawner_CreateJobDeleteJob(t *testing.T) {
 
 		lggr := logger.TestLogger(t)
 		orm := NewTestORM(t, db, pipeline.NewORM(db, lggr, config.Database(), config.JobPipeline().MaxSuccessfulRuns()), bridges.NewORM(db, lggr, config.Database()), keyStore, config.Database())
-		mailMon := servicetest.Run(t, utils.NewMailboxMonitor(t.Name()))
+		mailMon := servicetest.Run(t, mailbox.NewMonitor(t.Name()))
 		d := ocr.NewDelegate(nil, orm, nil, nil, nil, monitoringEndpoint, legacyChains, logger.TestLogger(t), config.Database(), mailMon)
 		delegateA := &delegate{jobA.Type, []job.ServiceCtx{serviceA1, serviceA2}, 0, nil, d}
 		spawner := job.NewSpawner(orm, config.Database(), noopChecker{}, map[job.Type]job.Delegate{
@@ -299,7 +300,7 @@ func TestSpawner_CreateJobDeleteJob(t *testing.T) {
 		jobOCR2VRF := makeOCR2VRFJobSpec(t, keyStore, config, address, chain.ID(), 2)
 
 		orm := NewTestORM(t, db, pipeline.NewORM(db, lggr, config.Database(), config.JobPipeline().MaxSuccessfulRuns()), bridges.NewORM(db, lggr, config.Database()), keyStore, config.Database())
-		mailMon := servicetest.Run(t, utils.NewMailboxMonitor(t.Name()))
+		mailMon := servicetest.Run(t, mailbox.NewMonitor(t.Name()))
 
 		processConfig := plugins.NewRegistrarConfig(loop.GRPCOpts{}, func(name string) (*plugins.RegisteredLoop, error) { return nil, nil })
 		ocr2DelegateConfig := ocr2.NewDelegateConfig(config.OCR2(), config.Mercury(), config.Threshold(), config.Insecure(), config.JobPipeline(), config.Database(), processConfig)
diff --git a/core/services/keeper/delegate.go b/core/services/keeper/delegate.go
index 0dbf584c56f..4418bea670a 100644
--- a/core/services/keeper/delegate.go
+++ b/core/services/keeper/delegate.go
@@ -5,12 +5,12 @@ import (
 
 	"github.com/jmoiron/sqlx"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 // To make sure Delegate struct implements job.Delegate interface
@@ -22,7 +22,7 @@ type Delegate struct {
 	jrm          job.ORM
 	pr           pipeline.Runner
 	legacyChains legacyevm.LegacyChainContainer
-	mailMon      *utils.MailboxMonitor
+	mailMon      *mailbox.Monitor
 }
 
 // NewDelegate is the constructor of Delegate
@@ -32,7 +32,7 @@ func NewDelegate(
 	pr pipeline.Runner,
 	logger logger.Logger,
 	legacyChains legacyevm.LegacyChainContainer,
-	mailMon *utils.MailboxMonitor,
+	mailMon *mailbox.Monitor,
 ) *Delegate {
 	return &Delegate{
 		logger:       logger,
diff --git a/core/services/keeper/registry_synchronizer_core.go b/core/services/keeper/registry_synchronizer_core.go
index db7cca1763f..f26c38fc2e1 100644
--- a/core/services/keeper/registry_synchronizer_core.go
+++ b/core/services/keeper/registry_synchronizer_core.go
@@ -10,6 +10,8 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
+
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
@@ -28,7 +30,7 @@ type RegistrySynchronizerOptions struct {
 	ORM                      ORM
 	JRM                      job.ORM
 	LogBroadcaster           log.Broadcaster
-	MailMon                  *utils.MailboxMonitor
+	MailMon                  *mailbox.Monitor
 	SyncInterval             time.Duration
 	MinIncomingConfirmations uint32
 	Logger                   logger.Logger
@@ -44,14 +46,14 @@ type RegistrySynchronizer struct {
 	job                      job.Job
 	jrm                      job.ORM
 	logBroadcaster           log.Broadcaster
-	mbLogs                   *utils.Mailbox[log.Broadcast]
+	mbLogs                   *mailbox.Mailbox[log.Broadcast]
 	minIncomingConfirmations uint32
 	effectiveKeeperAddress   common.Address
 	orm                      ORM
 	logger                   logger.SugaredLogger
 	wgDone                   sync.WaitGroup
 	syncUpkeepQueueSize      uint32 //Represents the max number of upkeeps that can be synced in parallel
-	mailMon                  *utils.MailboxMonitor
+	mailMon                  *mailbox.Monitor
 }
 
 // NewRegistrySynchronizer is the constructor of RegistrySynchronizer
@@ -63,7 +65,7 @@ func NewRegistrySynchronizer(opts RegistrySynchronizerOptions) *RegistrySynchron
 		job:                      opts.Job,
 		jrm:                      opts.JRM,
 		logBroadcaster:           opts.LogBroadcaster,
-		mbLogs:                   utils.NewMailbox[log.Broadcast](5_000), // Arbitrary limit, better to have excess capacity
+		mbLogs:                   mailbox.New[log.Broadcast](5_000), // Arbitrary limit, better to have excess capacity
 		minIncomingConfirmations: opts.MinIncomingConfirmations,
 		orm:                      opts.ORM,
 		effectiveKeeperAddress:   opts.EffectiveKeeperAddress,
diff --git a/core/services/keeper/registry_synchronizer_helper_test.go b/core/services/keeper/registry_synchronizer_helper_test.go
index 5ba60db3962..dff97202f6c 100644
--- a/core/services/keeper/registry_synchronizer_helper_test.go
+++ b/core/services/keeper/registry_synchronizer_helper_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/jmoiron/sqlx"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
@@ -23,7 +24,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keeper"
 	evmrelay "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 const syncInterval = 1000 * time.Hour // prevents sync timer from triggering during test
@@ -73,7 +73,7 @@ func setupRegistrySync(t *testing.T, version keeper.RegistryVersion) (
 	})).Maybe().Return(func() {})
 	lbMock.On("IsConnected").Return(true).Maybe()
 
-	mailMon := servicetest.Run(t, utils.NewMailboxMonitor(t.Name()))
+	mailMon := servicetest.Run(t, mailbox.NewMonitor(t.Name()))
 
 	orm := keeper.NewORM(db, logger.TestLogger(t), ch.Config().Database())
 	synchronizer := keeper.NewRegistrySynchronizer(keeper.RegistrySynchronizerOptions{
diff --git a/core/services/keeper/upkeep_executer.go b/core/services/keeper/upkeep_executer.go
index 84349ba2dca..bab2f73edfc 100644
--- a/core/services/keeper/upkeep_executer.go
+++ b/core/services/keeper/upkeep_executer.go
@@ -13,6 +13,8 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
+
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
@@ -23,7 +25,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 const (
@@ -62,7 +63,7 @@ type UpkeepExecuter struct {
 	headBroadcaster        httypes.HeadBroadcasterRegistry
 	gasEstimator           gas.EvmFeeEstimator
 	job                    job.Job
-	mailbox                *utils.Mailbox[*evmtypes.Head]
+	mailbox                *mailbox.Mailbox[*evmtypes.Head]
 	orm                    ORM
 	pr                     pipeline.Runner
 	logger                 logger.Logger
@@ -89,7 +90,7 @@ func NewUpkeepExecuter(
 		headBroadcaster:        headBroadcaster,
 		gasEstimator:           gasEstimator,
 		job:                    job,
-		mailbox:                utils.NewSingleMailbox[*evmtypes.Head](),
+		mailbox:                mailbox.NewSingle[*evmtypes.Head](),
 		config:                 config,
 		orm:                    orm,
 		pr:                     pr,
diff --git a/core/services/ocr/contract_tracker.go b/core/services/ocr/contract_tracker.go
index 4f79bcfc31a..1287e52e9b5 100644
--- a/core/services/ocr/contract_tracker.go
+++ b/core/services/ocr/contract_tracker.go
@@ -21,6 +21,7 @@ import (
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting/types"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 
 	"github.com/smartcontractkit/chainlink/v2/common/config"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
@@ -31,7 +32,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocrcommon"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 // configMailboxSanityLimit is the maximum number of configs that can be held
@@ -67,7 +67,7 @@ type (
 		q                pg.Q
 		blockTranslator  ocrcommon.BlockTranslator
 		cfg              ocrcommon.Config
-		mailMon          *utils.MailboxMonitor
+		mailMon          *mailbox.Monitor
 
 		// HeadBroadcaster
 		headBroadcaster  httypes.HeadBroadcaster
@@ -83,7 +83,7 @@ type (
 		lrrMu                sync.RWMutex
 
 		// ContractConfig
-		configsMB *utils.Mailbox[ocrtypes.ContractConfig]
+		configsMB *mailbox.Mailbox[ocrtypes.ContractConfig]
 		chConfigs chan ocrtypes.ContractConfig
 
 		// LatestBlockHeight
@@ -117,7 +117,7 @@ func NewOCRContractTracker(
 	cfg ocrcommon.Config,
 	q pg.QConfig,
 	headBroadcaster httypes.HeadBroadcaster,
-	mailMon *utils.MailboxMonitor,
+	mailMon *mailbox.Monitor,
 ) (o *OCRContractTracker) {
 	logger = logger.Named("OCRContractTracker")
 	return &OCRContractTracker{
@@ -136,7 +136,7 @@ func NewOCRContractTracker(
 		headBroadcaster:      headBroadcaster,
 		chStop:               make(services.StopChan),
 		latestRoundRequested: offchainaggregator.OffchainAggregatorRoundRequested{},
-		configsMB:            utils.NewMailbox[ocrtypes.ContractConfig](configMailboxSanityLimit),
+		configsMB:            mailbox.New[ocrtypes.ContractConfig](configMailboxSanityLimit),
 		chConfigs:            make(chan ocrtypes.ContractConfig),
 		latestBlockHeight:    -1,
 	}
diff --git a/core/services/ocr/contract_tracker_test.go b/core/services/ocr/contract_tracker_test.go
index af65f330d66..f7ebbe08481 100644
--- a/core/services/ocr/contract_tracker_test.go
+++ b/core/services/ocr/contract_tracker_test.go
@@ -16,6 +16,7 @@ import (
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting/types"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 
 	commonmocks "github.com/smartcontractkit/chainlink/v2/common/mocks"
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
@@ -31,7 +32,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr"
 	ocrmocks "github.com/smartcontractkit/chainlink/v2/core/services/ocr/mocks"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func mustNewContract(t *testing.T, address gethCommon.Address) *offchain_aggregator_wrapper.OffchainAggregator {
@@ -84,7 +84,7 @@ func newContractTrackerUni(t *testing.T, opts ...interface{}) (uni contractTrack
 	uni.hb = commonmocks.NewHeadBroadcaster[*evmtypes.Head, common.Hash](t)
 	uni.ec = evmtest.NewEthClientMock(t)
 
-	mailMon := servicetest.Run(t, utils.NewMailboxMonitor(t.Name()))
+	mailMon := servicetest.Run(t, mailbox.NewMonitor(t.Name()))
 	db := pgtest.NewSqlxDB(t)
 	uni.tracker = ocr.NewOCRContractTracker(
 		contract,
diff --git a/core/services/ocr/delegate.go b/core/services/ocr/delegate.go
index d3d133e7121..0eed680a3d8 100644
--- a/core/services/ocr/delegate.go
+++ b/core/services/ocr/delegate.go
@@ -12,6 +12,7 @@ import (
 	"github.com/jmoiron/sqlx"
 
 	commonlogger "github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 
 	"github.com/smartcontractkit/libocr/gethwrappers/offchainaggregator"
 	ocr "github.com/smartcontractkit/libocr/offchainreporting"
@@ -43,7 +44,7 @@ type Delegate struct {
 	legacyChains          legacyevm.LegacyChainContainer
 	lggr                  logger.Logger
 	cfg                   Config
-	mailMon               *utils.MailboxMonitor
+	mailMon               *mailbox.Monitor
 }
 
 var _ job.Delegate = (*Delegate)(nil)
@@ -60,7 +61,7 @@ func NewDelegate(
 	legacyChains legacyevm.LegacyChainContainer,
 	lggr logger.Logger,
 	cfg Config,
-	mailMon *utils.MailboxMonitor,
+	mailMon *mailbox.Monitor,
 ) *Delegate {
 	return &Delegate{
 		db:                    db,
diff --git a/core/services/ocr2/delegate.go b/core/services/ocr2/delegate.go
index 16f02282afb..5200866e3af 100644
--- a/core/services/ocr2/delegate.go
+++ b/core/services/ocr2/delegate.go
@@ -34,6 +34,7 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/loop"
 	"github.com/smartcontractkit/chainlink-common/pkg/loop/reportingplugins"
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
@@ -70,7 +71,6 @@ import (
 	evmrelaytypes "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types"
 	"github.com/smartcontractkit/chainlink/v2/core/services/synchronization"
 	"github.com/smartcontractkit/chainlink/v2/core/services/telemetry"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 	"github.com/smartcontractkit/chainlink/v2/plugins"
 )
 
@@ -116,7 +116,7 @@ type Delegate struct {
 	ethKs                 keystore.Eth
 	RelayGetter
 	isNewlyCreatedJob bool // Set to true if this is a new job freshly added, false if job was present already on node boot.
-	mailMon           *utils.MailboxMonitor
+	mailMon           *mailbox.Monitor
 
 	legacyChains legacyevm.LegacyChainContainer // legacy: use relayers instead
 }
@@ -226,7 +226,7 @@ func NewDelegate(
 	dkgEncryptKs keystore.DKGEncrypt,
 	ethKs keystore.Eth,
 	relayers RelayGetter,
-	mailMon *utils.MailboxMonitor,
+	mailMon *mailbox.Monitor,
 	eventBroadcaster pg.EventBroadcaster,
 ) *Delegate {
 	return &Delegate{
diff --git a/core/services/ocr2/plugins/functions/plugin.go b/core/services/ocr2/plugins/functions/plugin.go
index 61fa7f5d825..7e2b15bdccf 100644
--- a/core/services/ocr2/plugins/functions/plugin.go
+++ b/core/services/ocr2/plugins/functions/plugin.go
@@ -14,6 +14,7 @@ import (
 	libocr2 "github.com/smartcontractkit/libocr/offchainreporting2plus"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/assets"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
@@ -43,7 +44,7 @@ type FunctionsServicesConfig struct {
 	Chain             legacyevm.Chain
 	ContractID        string
 	Logger            logger.Logger
-	MailMon           *utils.MailboxMonitor
+	MailMon           *mailbox.Monitor
 	URLsMonEndpoint   commontypes.MonitoringEndpoint
 	EthKeystore       keystore.Eth
 	ThresholdKeyShare []byte
diff --git a/core/services/pipeline/task.eth_tx.go b/core/services/pipeline/task.eth_tx.go
index c421b340c91..58e9f6f2c15 100644
--- a/core/services/pipeline/task.eth_tx.go
+++ b/core/services/pipeline/task.eth_tx.go
@@ -13,11 +13,11 @@ import (
 	"go.uber.org/multierr"
 	"gopkg.in/guregu/null.v4"
 
+	clnull "github.com/smartcontractkit/chainlink-common/pkg/utils/null"
 	txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	clnull "github.com/smartcontractkit/chainlink/v2/core/null"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
diff --git a/core/services/pipeline/task.eth_tx_test.go b/core/services/pipeline/task.eth_tx_test.go
index a0ff54d4448..5f5019d1967 100644
--- a/core/services/pipeline/task.eth_tx_test.go
+++ b/core/services/pipeline/task.eth_tx_test.go
@@ -10,6 +10,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"gopkg.in/guregu/null.v4"
 
+	clnull "github.com/smartcontractkit/chainlink-common/pkg/utils/null"
 	txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr"
 	"github.com/smartcontractkit/chainlink/v2/core/chains"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
@@ -19,7 +20,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	clnull "github.com/smartcontractkit/chainlink/v2/core/null"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	keystoremocks "github.com/smartcontractkit/chainlink/v2/core/services/keystore/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
diff --git a/core/services/promreporter/prom_reporter.go b/core/services/promreporter/prom_reporter.go
index 3e1444a6da1..a302a6fa220 100644
--- a/core/services/promreporter/prom_reporter.go
+++ b/core/services/promreporter/prom_reporter.go
@@ -17,10 +17,11 @@ import (
 	"go.uber.org/multierr"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
+
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 //go:generate mockery --quiet --name PrometheusBackend --output ../../internal/mocks/ --case=underscore
@@ -31,7 +32,7 @@ type (
 		chains       legacyevm.LegacyChainContainer
 		lggr         logger.Logger
 		backend      PrometheusBackend
-		newHeads     *utils.Mailbox[*evmtypes.Head]
+		newHeads     *mailbox.Mailbox[*evmtypes.Head]
 		chStop       services.StopChan
 		wgDone       sync.WaitGroup
 		reportPeriod time.Duration
@@ -109,7 +110,7 @@ func NewPromReporter(db *sql.DB, chainContainer legacyevm.LegacyChainContainer,
 		chains:       chainContainer,
 		lggr:         lggr.Named("PromReporter"),
 		backend:      backend,
-		newHeads:     utils.NewSingleMailbox[*evmtypes.Head](),
+		newHeads:     mailbox.NewSingle[*evmtypes.Head](),
 		chStop:       chStop,
 		reportPeriod: period,
 	}
diff --git a/core/services/vrf/delegate.go b/core/services/vrf/delegate.go
index a13df71d9a3..03e40614a10 100644
--- a/core/services/vrf/delegate.go
+++ b/core/services/vrf/delegate.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/jmoiron/sqlx"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
@@ -29,7 +30,6 @@ import (
 	v1 "github.com/smartcontractkit/chainlink/v2/core/services/vrf/v1"
 	v2 "github.com/smartcontractkit/chainlink/v2/core/services/vrf/v2"
 	"github.com/smartcontractkit/chainlink/v2/core/services/vrf/vrfcommon"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 type Delegate struct {
@@ -39,7 +39,7 @@ type Delegate struct {
 	ks           keystore.Master
 	legacyChains legacyevm.LegacyChainContainer
 	lggr         logger.Logger
-	mailMon      *utils.MailboxMonitor
+	mailMon      *mailbox.Monitor
 }
 
 func NewDelegate(
@@ -50,7 +50,7 @@ func NewDelegate(
 	legacyChains legacyevm.LegacyChainContainer,
 	lggr logger.Logger,
 	cfg pg.QConfig,
-	mailMon *utils.MailboxMonitor) *Delegate {
+	mailMon *mailbox.Monitor) *Delegate {
 	return &Delegate{
 		q:            pg.NewQ(db, lggr, cfg),
 		ks:           ks,
@@ -250,7 +250,7 @@ func (d *Delegate) ServicesForSpec(jb job.Job) ([]job.ServiceCtx, error) {
 				MailMon:        d.mailMon,
 				// Note the mailbox size effectively sets a limit on how many logs we can replay
 				// in the event of a VRF outage.
-				ReqLogs:            utils.NewHighCapacityMailbox[log.Broadcast](),
+				ReqLogs:            mailbox.NewHighCapacity[log.Broadcast](),
 				ChStop:             make(chan struct{}),
 				WaitOnStop:         make(chan struct{}),
 				NewHead:            make(chan struct{}, 1),
diff --git a/core/services/vrf/delegate_test.go b/core/services/vrf/delegate_test.go
index d957e3c721e..3b643d19b0b 100644
--- a/core/services/vrf/delegate_test.go
+++ b/core/services/vrf/delegate_test.go
@@ -16,6 +16,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
@@ -149,7 +150,7 @@ func setup(t *testing.T) (vrfUniverse, *v1.Listener, job.Job) {
 	cfg := configtest.NewTestGeneralConfig(t)
 	vuni := buildVrfUni(t, db, cfg)
 
-	mailMon := servicetest.Run(t, utils.NewMailboxMonitor(t.Name()))
+	mailMon := servicetest.Run(t, mailbox.NewMonitor(t.Name()))
 
 	vd := vrf.NewDelegate(
 		db,
@@ -673,7 +674,7 @@ func Test_VRFV2PlusServiceFailsWhenVRFOwnerProvided(t *testing.T) {
 	cfg := configtest.NewTestGeneralConfig(t)
 	vuni := buildVrfUni(t, db, cfg)
 
-	mailMon := servicetest.Run(t, utils.NewMailboxMonitor(t.Name()))
+	mailMon := servicetest.Run(t, mailbox.NewMonitor(t.Name()))
 
 	vd := vrf.NewDelegate(
 		db,
diff --git a/core/services/vrf/v1/listener_v1.go b/core/services/vrf/v1/listener_v1.go
index 66a8ddcd58c..f4e813d7d61 100644
--- a/core/services/vrf/v1/listener_v1.go
+++ b/core/services/vrf/v1/listener_v1.go
@@ -17,6 +17,7 @@ import (
 	"github.com/theodesp/go-heaps/pairing"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
 	"github.com/smartcontractkit/chainlink-common/pkg/utils/mathutil"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
@@ -57,8 +58,8 @@ type Listener struct {
 	Job            job.Job
 	Q              pg.Q
 	GethKs         vrfcommon.GethKeyStore
-	MailMon        *utils.MailboxMonitor
-	ReqLogs        *utils.Mailbox[log.Broadcast]
+	MailMon        *mailbox.Monitor
+	ReqLogs        *mailbox.Mailbox[log.Broadcast]
 	ChStop         services.StopChan
 	WaitOnStop     chan struct{}
 	NewHead        chan struct{}
diff --git a/core/services/vrf/v2/listener_v2.go b/core/services/vrf/v2/listener_v2.go
index 5878bf54763..6556bbd2186 100644
--- a/core/services/vrf/v2/listener_v2.go
+++ b/core/services/vrf/v2/listener_v2.go
@@ -14,6 +14,7 @@ import (
 	"github.com/theodesp/go-heaps/pairing"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+
 	txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr"
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
diff --git a/core/services/vrf/v2/listener_v2_test.go b/core/services/vrf/v2/listener_v2_test.go
index 6192db95dfe..d8bc0a6695b 100644
--- a/core/services/vrf/v2/listener_v2_test.go
+++ b/core/services/vrf/v2/listener_v2_test.go
@@ -17,6 +17,8 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/vrf/vrfcommon"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/sqlutil"
+	clnull "github.com/smartcontractkit/chainlink-common/pkg/utils/null"
+
 	txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr"
 	txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
@@ -28,7 +30,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	clnull "github.com/smartcontractkit/chainlink/v2/core/null"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
 	"github.com/smartcontractkit/chainlink/v2/core/testdata/testspecs"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
diff --git a/core/utils/mailbox.go b/core/utils/mailbox.go
deleted file mode 100644
index 87fe1627f37..00000000000
--- a/core/utils/mailbox.go
+++ /dev/null
@@ -1,126 +0,0 @@
-package utils
-
-import (
-	"sync"
-	"sync/atomic"
-)
-
-// Mailbox contains a notify channel,
-// a mutual exclusive lock,
-// a queue of interfaces,
-// and a queue capacity.
-type Mailbox[T any] struct {
-	mu       sync.Mutex
-	chNotify chan struct{}
-	queue    []T
-	queueLen atomic.Int64 // atomic so monitor can read w/o blocking the queue
-
-	// capacity - number of items the mailbox can buffer
-	// NOTE: if the capacity is 1, it's possible that an empty Retrieve may occur after a notification.
-	capacity uint64
-	// onCloseFn is a hook used to stop monitoring, if non-nil
-	onCloseFn func()
-}
-
-// NewHighCapacityMailbox create a new mailbox with a capacity
-// that is better able to handle e.g. large log replays.
-func NewHighCapacityMailbox[T any]() *Mailbox[T] {
-	return NewMailbox[T](100_000)
-}
-
-// NewSingleMailbox returns a new Mailbox with capacity one.
-func NewSingleMailbox[T any]() *Mailbox[T] { return NewMailbox[T](1) }
-
-// NewMailbox creates a new mailbox instance. If name is non-empty, it must be unique and calling Start will launch
-// prometheus metric monitor that periodically reports mailbox load until Close() is called.
-func NewMailbox[T any](capacity uint64) *Mailbox[T] {
-	queueCap := capacity
-	if queueCap == 0 {
-		queueCap = 100
-	}
-	return &Mailbox[T]{
-		chNotify: make(chan struct{}, 1),
-		queue:    make([]T, 0, queueCap),
-		capacity: capacity,
-	}
-}
-
-// Notify returns the contents of the notify channel
-func (m *Mailbox[T]) Notify() <-chan struct{} {
-	return m.chNotify
-}
-
-func (m *Mailbox[T]) Close() error {
-	if m.onCloseFn != nil {
-		m.onCloseFn()
-	}
-	return nil
-}
-
-func (m *Mailbox[T]) onClose(fn func()) { m.onCloseFn = fn }
-
-func (m *Mailbox[T]) load() (capacity uint64, loadPercent float64) {
-	capacity = m.capacity
-	loadPercent = 100 * float64(m.queueLen.Load()) / float64(capacity)
-	return
-}
-
-// Deliver appends to the queue and returns true if the queue was full, causing a message to be dropped.
-func (m *Mailbox[T]) Deliver(x T) (wasOverCapacity bool) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	m.queue = append([]T{x}, m.queue...)
-	if uint64(len(m.queue)) > m.capacity && m.capacity > 0 {
-		m.queue = m.queue[:len(m.queue)-1]
-		wasOverCapacity = true
-	} else {
-		m.queueLen.Add(1)
-	}
-
-	select {
-	case m.chNotify <- struct{}{}:
-	default:
-	}
-	return
-}
-
-// Retrieve fetches one element from the queue.
-func (m *Mailbox[T]) Retrieve() (t T, ok bool) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	if len(m.queue) == 0 {
-		return
-	}
-	t = m.queue[len(m.queue)-1]
-	m.queue = m.queue[:len(m.queue)-1]
-	m.queueLen.Add(-1)
-	ok = true
-	return
-}
-
-// RetrieveAll fetches all elements from the queue.
-func (m *Mailbox[T]) RetrieveAll() []T {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	queue := m.queue
-	m.queue = nil
-	m.queueLen.Store(0)
-	for i, j := 0, len(queue)-1; i < j; i, j = i+1, j-1 {
-		queue[i], queue[j] = queue[j], queue[i]
-	}
-	return queue
-}
-
-// RetrieveLatestAndClear fetch the latest value (or nil), and clears the rest of the queue (if any).
-func (m *Mailbox[T]) RetrieveLatestAndClear() (t T) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	if len(m.queue) == 0 {
-		return
-	}
-	t = m.queue[0]
-	m.queue = nil
-	m.queueLen.Store(0)
-	return
-}
diff --git a/core/utils/mailbox_prom.go b/core/utils/mailbox_prom.go
deleted file mode 100644
index 33cbb2357b1..00000000000
--- a/core/utils/mailbox_prom.go
+++ /dev/null
@@ -1,93 +0,0 @@
-package utils
-
-import (
-	"context"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promauto"
-
-	"github.com/smartcontractkit/chainlink-common/pkg/services"
-)
-
-var mailboxLoad = promauto.NewGaugeVec(prometheus.GaugeOpts{
-	Name: "mailbox_load_percent",
-	Help: "Percent of mailbox capacity used",
-},
-	[]string{"appID", "name", "capacity"},
-)
-
-const mailboxPromInterval = 5 * time.Second
-
-type MailboxMonitor struct {
-	services.StateMachine
-	appID string
-
-	mailboxes sync.Map
-	stop      func()
-	done      chan struct{}
-}
-
-func NewMailboxMonitor(appID string) *MailboxMonitor {
-	return &MailboxMonitor{appID: appID}
-}
-
-func (m *MailboxMonitor) Name() string { return "MailboxMonitor" }
-
-func (m *MailboxMonitor) Start(context.Context) error {
-	return m.StartOnce("MailboxMonitor", func() error {
-		t := time.NewTicker(WithJitter(mailboxPromInterval))
-		ctx, cancel := context.WithCancel(context.Background())
-		m.stop = func() {
-			t.Stop()
-			cancel()
-		}
-		m.done = make(chan struct{})
-		go m.monitorLoop(ctx, t.C)
-		return nil
-	})
-}
-
-func (m *MailboxMonitor) Close() error {
-	return m.StopOnce("MailboxMonitor", func() error {
-		m.stop()
-		<-m.done
-		return nil
-	})
-}
-
-func (m *MailboxMonitor) HealthReport() map[string]error {
-	return map[string]error{m.Name(): m.Healthy()}
-}
-
-func (m *MailboxMonitor) monitorLoop(ctx context.Context, c <-chan time.Time) {
-	defer close(m.done)
-	for {
-		select {
-		case <-ctx.Done():
-			return
-		case <-c:
-			m.mailboxes.Range(func(k, v any) bool {
-				name, mb := k.(string), v.(mailbox)
-				c, p := mb.load()
-				capacity := strconv.FormatUint(c, 10)
-				mailboxLoad.WithLabelValues(m.appID, name, capacity).Set(p)
-				return true
-			})
-		}
-	}
-}
-
-type mailbox interface {
-	load() (capacity uint64, percent float64)
-	onClose(func())
-}
-
-func (m *MailboxMonitor) Monitor(mb mailbox, name ...string) {
-	n := strings.Join(name, ".")
-	m.mailboxes.Store(n, mb)
-	mb.onClose(func() { m.mailboxes.Delete(n) })
-}
diff --git a/core/utils/mailbox_test.go b/core/utils/mailbox_test.go
deleted file mode 100644
index c83d0035baa..00000000000
--- a/core/utils/mailbox_test.go
+++ /dev/null
@@ -1,181 +0,0 @@
-package utils
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestMailbox(t *testing.T) {
-	var (
-		expected  = []int{2, 3, 4, 5, 6, 7, 8, 9, 10, 11}
-		toDeliver = []int{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}
-	)
-
-	const capacity = 10
-	m := NewMailbox[int](capacity)
-
-	// Queue deliveries
-	for i, d := range toDeliver {
-		atCapacity := m.Deliver(d)
-		if atCapacity && i < capacity {
-			t.Errorf("mailbox at capacity %d", i)
-		} else if !atCapacity && i >= capacity {
-			t.Errorf("mailbox below capacity %d", i)
-		}
-	}
-
-	// Retrieve them
-	var recvd []int
-	chDone := make(chan struct{})
-	go func() {
-		defer close(chDone)
-		for range m.Notify() {
-			for {
-				x, exists := m.Retrieve()
-				if !exists {
-					break
-				}
-				recvd = append(recvd, x)
-			}
-		}
-	}()
-
-	close(m.chNotify)
-	<-chDone
-
-	require.Equal(t, expected, recvd)
-}
-
-func TestMailbox_RetrieveAll(t *testing.T) {
-	var (
-		expected  = []int{2, 3, 4, 5, 6, 7, 8, 9, 10, 11}
-		toDeliver = []int{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}
-	)
-
-	const capacity = 10
-	m := NewMailbox[int](capacity)
-
-	// Queue deliveries
-	for i, d := range toDeliver {
-		atCapacity := m.Deliver(d)
-		if atCapacity && i < capacity {
-			t.Errorf("mailbox at capacity %d", i)
-		} else if !atCapacity && i >= capacity {
-			t.Errorf("mailbox below capacity %d", i)
-		}
-	}
-
-	require.Equal(t, expected, m.RetrieveAll())
-}
-
-func TestMailbox_RetrieveLatestAndClear(t *testing.T) {
-	var (
-		expected  = 11
-		toDeliver = []int{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}
-	)
-
-	const capacity = 10
-	m := NewMailbox[int](capacity)
-
-	// Queue deliveries
-	for i, d := range toDeliver {
-		atCapacity := m.Deliver(d)
-		if atCapacity && i < capacity {
-			t.Errorf("mailbox at capacity %d", i)
-		} else if !atCapacity && i >= capacity {
-			t.Errorf("mailbox below capacity %d", i)
-		}
-	}
-
-	require.Equal(t, expected, m.RetrieveLatestAndClear())
-	require.Len(t, m.RetrieveAll(), 0)
-}
-
-func TestMailbox_NoEmptyReceivesWhenCapacityIsTwo(t *testing.T) {
-	m := NewMailbox[int](2)
-
-	var (
-		recvd         []int
-		emptyReceives []int
-	)
-
-	chDone := make(chan struct{})
-	go func() {
-		defer close(chDone)
-		for range m.Notify() {
-			x, exists := m.Retrieve()
-			if !exists {
-				emptyReceives = append(emptyReceives, recvd[len(recvd)-1])
-			} else {
-				recvd = append(recvd, x)
-			}
-		}
-	}()
-
-	for i := 0; i < 100000; i++ {
-		m.Deliver(i)
-	}
-	close(m.chNotify)
-
-	<-chDone
-	require.Len(t, emptyReceives, 0)
-}
-
-func TestMailbox_load(t *testing.T) {
-	for _, tt := range []struct {
-		name     string
-		capacity uint64
-		deliver  []int
-		exp      float64
-
-		retrieve int
-		exp2     float64
-
-		all bool
-	}{
-		{"single-all", 1, []int{1}, 100, 0, 100, true},
-		{"single-latest", 1, []int{1}, 100, 0, 100, false},
-		{"ten-low", 10, []int{1}, 10, 1, 0.0, false},
-		{"ten-full-all", 10, []int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, 100, 5, 50, true},
-		{"ten-full-latest", 10, []int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, 100, 5, 50, false},
-		{"ten-overflow", 10, []int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}, 100, 5, 50, false},
-		{"nine", 9, []int{1, 2, 3}, 100.0 / 3.0, 2, 100.0 / 9.0, true},
-	} {
-		t.Run(tt.name, func(t *testing.T) {
-			m := NewMailbox[int](tt.capacity)
-
-			// Queue deliveries
-			for i, d := range tt.deliver {
-				atCapacity := m.Deliver(d)
-				if atCapacity && i < int(tt.capacity) {
-					t.Errorf("mailbox at capacity %d", i)
-				} else if !atCapacity && i >= int(tt.capacity) {
-					t.Errorf("mailbox below capacity %d", i)
-				}
-			}
-			gotCap, gotLoad := m.load()
-			require.Equal(t, gotCap, tt.capacity)
-			require.Equal(t, gotLoad, tt.exp)
-
-			// Retrieve some
-			for i := 0; i < tt.retrieve; i++ {
-				_, ok := m.Retrieve()
-				require.True(t, ok)
-			}
-			gotCap, gotLoad = m.load()
-			require.Equal(t, gotCap, tt.capacity)
-			require.Equal(t, gotLoad, tt.exp2)
-
-			// Drain it
-			if tt.all {
-				m.RetrieveAll()
-			} else {
-				m.RetrieveLatestAndClear()
-			}
-			gotCap, gotLoad = m.load()
-			require.Equal(t, gotCap, tt.capacity)
-			require.Equal(t, gotLoad, 0.0)
-		})
-	}
-}
diff --git a/core/utils/utils.go b/core/utils/utils.go
index b887fe9a800..4f3f9212337 100644
--- a/core/utils/utils.go
+++ b/core/utils/utils.go
@@ -27,7 +27,6 @@ import (
 	"github.com/robfig/cron/v3"
 	"golang.org/x/crypto/bcrypt"
 	"golang.org/x/crypto/sha3"
-	"golang.org/x/exp/constraints"
 
 	ragep2ptypes "github.com/smartcontractkit/libocr/ragep2p/types"
 
@@ -879,26 +878,6 @@ func TryParseHex(s string) (b []byte, err error) {
 	return
 }
 
-// MinKey returns the minimum value of the given element array with respect
-// to the given key function. In the event U is not a compound type (e.g a
-// struct) an identity function can be provided.
-func MinKey[U any, T constraints.Ordered](elems []U, key func(U) T) T {
-	var min T
-	if len(elems) == 0 {
-		return min
-	}
-
-	min = key(elems[0])
-	for i := 1; i < len(elems); i++ {
-		v := key(elems[i])
-		if v < min {
-			min = v
-		}
-	}
-
-	return min
-}
-
 // ErrorBuffer uses joinedErrors interface to join multiple errors into a single error.
 // This is useful to track the most recent N errors in a service and flush them as a single error.
 type ErrorBuffer struct {

From ce4e85828e6228bf82a784cf53202db5e655d3ec Mon Sep 17 00:00:00 2001
From: Bartek Tofel <bartek.tofel@smartcontract.com>
Date: Tue, 12 Dec 2023 11:50:40 -0300
Subject: [PATCH 109/130] Use multiple EL clients with ocrv2 median smoke test
 (#11399)

* use multiple EL clients with ocrv2 median test

* update ethereum network component to latest

* try with latest implementation of eth clients

* change WithTestLogger() to WithTestInstance()

* fix geth backward compatibility

* run ocrv2 eth2 tests in parallel

* run also ocr1 and 2 vrf tests iwth multiple clients

* try running multipl el client tests in parallel

* fix go.sum

* fix lint

* 1. add matrix for running 4 smoke tests on different execution clients, 2. if for these tests no client is set in env var use geth

* comment out failing nethermind & besu vrf tests in the CI

* fix go.sum

* do not use negative lookahead with go test

* use faster eth2 network config

* add comment to integration tests workflow

* run only OCR and OCRv2 jobs with multiple clients, add on-demand jobs for VRF

* use latest ctf with increased network timeout

* slow down private eth networks a bit

* update CTF dep to tagged version

* disable nethermind ocr smoke tests in CI

* fix compilation errors
---
 .github/workflows/integration-tests.yml       | 67 +++++++++++++++++-
 .../on-demand-vrfv2-eth2-clients-test.yml     | 70 +++++++++++++++++++
 .../on-demand-vrfv2plus-eth2-clients-test.yml | 70 +++++++++++++++++++
 .gitignore                                    |  2 +-
 integration-tests/actions/private_network.go  | 33 +++++++++
 integration-tests/docker/test_env/cl_node.go  |  2 +-
 integration-tests/docker/test_env/test_env.go |  6 +-
 .../docker/test_env/test_env_builder.go       | 10 ++-
 integration-tests/go.mod                      |  2 +-
 integration-tests/go.sum                      |  5 +-
 integration-tests/load/vrfv2/vrfv2_test.go    |  4 +-
 .../load/vrfv2plus/vrfv2plus_test.go          |  4 +-
 .../migration/upgrade_version_test.go         |  2 +-
 integration-tests/smoke/automation_test.go    |  4 +-
 integration-tests/smoke/cron_test.go          |  4 +-
 integration-tests/smoke/flux_test.go          |  2 +-
 integration-tests/smoke/forwarder_ocr_test.go |  2 +-
 .../smoke/forwarders_ocr2_test.go             |  2 +-
 integration-tests/smoke/keeper_test.go        |  2 +-
 integration-tests/smoke/ocr2_test.go          | 10 ++-
 integration-tests/smoke/ocr_test.go           |  9 ++-
 integration-tests/smoke/runlog_test.go        |  2 +-
 integration-tests/smoke/vrf_test.go           |  4 +-
 integration-tests/smoke/vrfv2_test.go         | 11 +--
 integration-tests/smoke/vrfv2plus_test.go     | 14 ++--
 .../universal/log_poller/helpers.go           |  5 +-
 26 files changed, 303 insertions(+), 45 deletions(-)
 create mode 100644 .github/workflows/on-demand-vrfv2-eth2-clients-test.yml
 create mode 100644 .github/workflows/on-demand-vrfv2plus-eth2-clients-test.yml
 create mode 100644 integration-tests/actions/private_network.go

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 37a2718be46..6ffd1a14ff2 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -325,11 +325,73 @@ jobs:
           - name: ocr
             nodes: 1
             os: ubuntu20.04-8cores-32GB
+            run: -run TestOCRJobReplacement
+            file: ocr
             pyroscope_env: ci-smoke-ocr-evm-simulated
+          - name: ocr-geth
+            nodes: 1
+            os: ubuntu20.04-8cores-32GB
+            run: -run TestOCRBasic
+            file: ocr
+            client: geth
+            pyroscope_env: ci-smoke-ocr-evm-simulated         
+          # Uncomment, when https://smartcontract-it.atlassian.net/browse/TT-753 is DONE
+          # - name: ocr-nethermind
+          #   nodes: 1
+          #   os: ubuntu20.04-8cores-32GB
+          #   run: -run TestOCRBasic
+          #   file: ocr
+          #   client: nethermind
+          #   pyroscope_env: ci-smoke-ocr-evm-simulated                          
+          - name: ocr-besu
+            nodes: 1
+            os: ubuntu20.04-8cores-32GB
+            run: -run TestOCRBasic
+            file: ocr
+            client: besu
+            pyroscope_env: ci-smoke-ocr-evm-simulated        
+          - name: ocr-erigon
+            nodes: 1
+            os: ubuntu20.04-8cores-32GB
+            run: -run TestOCRBasic
+            file: ocr
+            client: erigon
+            pyroscope_env: ci-smoke-ocr-evm-simulated         
           - name: ocr2
             nodes: 1
             os: ubuntu20.04-8cores-32GB
+            run: -run TestOCRv2JobReplacement
+            file: ocr2
             pyroscope_env: ci-smoke-ocr2-evm-simulated
+          - name: ocr2-geth
+            nodes: 1
+            os: ubuntu20.04-8cores-32GB
+            run: -run TestOCRv2Basic
+            file: ocr2
+            client: geth
+            pyroscope_env: ci-smoke-ocr2-evm-simulated            
+          # Uncomment, when https://smartcontract-it.atlassian.net/browse/TT-753 is DONE            
+          # - name: ocr2-nethermind
+          #   nodes: 1
+          #   os: ubuntu20.04-8cores-32GB
+          #   run: -run TestOCRv2Basic
+          #   file: ocr2
+          #   client: nethermind
+          #   pyroscope_env: ci-smoke-ocr2-evm-simulated                         
+          - name: ocr2-besu
+            nodes: 1
+            os: ubuntu20.04-8cores-32GB
+            run: -run TestOCRv2Basic
+            file: ocr2
+            client: besu            
+            pyroscope_env: ci-smoke-ocr2-evm-simulated      
+          - name: ocr2-erigon
+            nodes: 1
+            os: ubuntu20.04-8cores-32GB
+            run: -run TestOCRv2Basic
+            file: ocr2
+            client: erigon            
+            pyroscope_env: ci-smoke-ocr2-evm-simulated                           
           - name: ocr2
             nodes: 1
             os: ubuntu20.04-8cores-32GB
@@ -345,12 +407,14 @@ jobs:
             pyroscope_env: ci-smoke-vrf-evm-simulated
           - name: vrfv2
             nodes: 1
+            run: -run TestVRFv2MultipleSendingKeys
+            file: vrfv2            
             os: ubuntu20.04-8cores-32GB
             pyroscope_env: ci-smoke-vrf2-evm-simulated
           - name: vrfv2plus
             nodes: 1
             os: ubuntu20.04-8cores-32GB
-            pyroscope_env: ci-smoke-vrf2plus-evm-simulated
+            pyroscope_env: ci-smoke-vrf2plus-evm-simulated                       
           - name: forwarder_ocr
             nodes: 1
             os: ubuntu20.04-8cores-32GB
@@ -435,6 +499,7 @@ jobs:
           PYROSCOPE_SERVER: ${{ matrix.product.pyroscope_env == '' && '' || !startsWith(github.ref, 'refs/tags/') && '' || secrets.QA_PYROSCOPE_INSTANCE }} # Avoid sending blank envs https://github.com/orgs/community/discussions/25725
           PYROSCOPE_ENVIRONMENT: ${{ matrix.product.pyroscope_env }}
           PYROSCOPE_KEY: ${{ secrets.QA_PYROSCOPE_KEY }}
+          ETH2_EL_CLIENT: ${{matrix.product.client}}
           LOKI_TENANT_ID: ${{ vars.LOKI_TENANT_ID }}
           LOKI_URL: ${{ secrets.LOKI_URL }}
           LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
diff --git a/.github/workflows/on-demand-vrfv2-eth2-clients-test.yml b/.github/workflows/on-demand-vrfv2-eth2-clients-test.yml
new file mode 100644
index 00000000000..3b27e4519c8
--- /dev/null
+++ b/.github/workflows/on-demand-vrfv2-eth2-clients-test.yml
@@ -0,0 +1,70 @@
+name: On Demand VRFV2 Smoke Test (Ethereum clients)
+on:
+  workflow_dispatch:
+    inputs:
+      client:
+        description: Execution client to use
+        type: choice
+        options:
+          - "geth"
+          - "nethermind"
+          - "besu"
+          - "erigon"
+      chainlinkImage:
+        description: Container image location for the Chainlink nodes
+        required: true
+        default: public.ecr.aws/chainlink/chainlink
+      chainlinkVersion:
+        description: Container image version for the Chainlink nodes
+        required: true
+        default: "2.6.0"
+      configBase64:
+        description: TOML config in base64 (Needed when overriding config or providing contract addresses for existing env)
+        required: false
+jobs:
+  vrfv2_smoke_test:
+    name: VRFV2 Smoke Test with ${{ inputs.client }} client
+    environment: integration
+    runs-on: ubuntu20.04-8cores-32GB
+    permissions:
+      checks: write
+      pull-requests: write
+      id-token: write
+      contents: read
+    env:
+      SELECTED_NETWORKS: "SIMULATED"
+      CONFIG: ${{ inputs.configBase64 }}
+      TEST_LOG_LEVEL: debug
+      REF_NAME: ${{ github.head_ref || github.ref_name }}
+      CHAINLINK_IMAGE: ${{ inputs.chainlinkImage }}
+      CHAINLINK_VERSION: ${{ inputs.chainlinkVersion }}
+    steps:      
+      - name: Setup Push Tag
+        shell: bash
+        run: |
+          echo "### chainlink image used for this test run :link:" >>$GITHUB_STEP_SUMMARY
+          echo "\`${{ inputs.chainlinkVersion }}\`" >>$GITHUB_STEP_SUMMARY
+          echo "### chainlink-tests image tag for this test run :ship:" >>$GITHUB_STEP_SUMMARY
+          echo "\`${GITHUB_SHA}\`" >>$GITHUB_STEP_SUMMARY
+      - name: Checkout code
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          fetch-depth: 0
+      - name: Run Tests
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@7d541cbbca52d45b8a718257af86d9cf49774d1f # v2.2.15
+        with:
+          test_command_to_run: cd ./integration-tests && go test -timeout 30m -count=1 -json -run TestVRFv2Basic ./smoke/vrfv2_test.go 2>&1 | tee /tmp/gotest.log | gotestfmt
+          test_download_vendor_packages_command: cd ./integration-tests && go mod download
+          cl_repo: ${{ inputs.chainlinkImage }}
+          cl_image_tag: ${{ inputs.chainlinkVersion }}
+          aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
+          artifacts_name: vrf-test-logs
+          artifacts_location: ./integration-tests/smoke/logs/
+          token: ${{ secrets.GITHUB_TOKEN }}
+          go_mod_path: ./integration-tests/go.mod
+          should_cleanup: false
+          QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
+          QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}          
+          QA_KUBECONFIG: ""
+        env:
+          ETH2_EL_CLIENT: ${{ inputs.client }}
diff --git a/.github/workflows/on-demand-vrfv2plus-eth2-clients-test.yml b/.github/workflows/on-demand-vrfv2plus-eth2-clients-test.yml
new file mode 100644
index 00000000000..331c626ba9c
--- /dev/null
+++ b/.github/workflows/on-demand-vrfv2plus-eth2-clients-test.yml
@@ -0,0 +1,70 @@
+name: On Demand VRFV2Plus Smoke Test (Ethereum clients)
+on:
+  workflow_dispatch:
+    inputs:
+      client:
+        description: Execution client to use
+        type: choice
+        options:
+          - "geth"
+          - "nethermind"
+          - "besu"
+          - "erigon"
+      chainlinkImage:
+        description: Container image location for the Chainlink nodes
+        required: true
+        default: public.ecr.aws/chainlink/chainlink
+      chainlinkVersion:
+        description: Container image version for the Chainlink nodes
+        required: true
+        default: "2.6.0"
+      configBase64:
+        description: TOML config in base64 (Needed when overriding config or providing contract addresses for existing env)
+        required: false
+jobs:
+  vrfv2plus_smoke_test:
+    name: VRFV2Plus Smoke Test with ${{ inputs.client }} client
+    environment: integration
+    runs-on: ubuntu20.04-8cores-32GB
+    permissions:
+      checks: write
+      pull-requests: write
+      id-token: write
+      contents: read
+    env:
+      SELECTED_NETWORKS: "SIMULATED"
+      CONFIG: ${{ inputs.configBase64 }}
+      TEST_LOG_LEVEL: debug
+      REF_NAME: ${{ github.head_ref || github.ref_name }}
+      CHAINLINK_IMAGE: ${{ inputs.chainlinkImage }}
+      CHAINLINK_VERSION: ${{ inputs.chainlinkVersion }}
+    steps:      
+      - name: Setup Push Tag
+        shell: bash
+        run: |
+          echo "### chainlink image used for this test run :link:" >>$GITHUB_STEP_SUMMARY
+          echo "\`${{ inputs.chainlinkVersion }}\`" >>$GITHUB_STEP_SUMMARY
+          echo "### chainlink-tests image tag for this test run :ship:" >>$GITHUB_STEP_SUMMARY
+          echo "\`${GITHUB_SHA}\`" >>$GITHUB_STEP_SUMMARY
+      - name: Checkout code
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          fetch-depth: 0
+      - name: Run Tests
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@7d541cbbca52d45b8a718257af86d9cf49774d1f # v2.2.15
+        with:
+          test_command_to_run: cd ./integration-tests && go test -timeout 30m -count=1 -json -run ^TestVRFv2Plus$/^Link_Billing$ ./smoke/vrfv2plus_test.go 2>&1 | tee /tmp/gotest.log | gotestfmt
+          test_download_vendor_packages_command: cd ./integration-tests && go mod download
+          cl_repo: ${{ inputs.chainlinkImage }}
+          cl_image_tag: ${{ inputs.chainlinkVersion }}
+          aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
+          artifacts_name: vrfplus-test-logs
+          artifacts_location: ./integration-tests/smoke/logs/
+          token: ${{ secrets.GITHUB_TOKEN }}
+          go_mod_path: ./integration-tests/go.mod
+          should_cleanup: false
+          QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
+          QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}          
+          QA_KUBECONFIG: ""
+        env:
+          ETH2_EL_CLIENT: ${{ inputs.client }}
diff --git a/.gitignore b/.gitignore
index 8d127dbb728..2f68ec2c945 100644
--- a/.gitignore
+++ b/.gitignore
@@ -84,4 +84,4 @@ go.work*
 tools/flakeytests/coverage.txt
 
 .test_summary/
-.run.id
\ No newline at end of file
+.run.id
diff --git a/integration-tests/actions/private_network.go b/integration-tests/actions/private_network.go
new file mode 100644
index 00000000000..c7556f8061b
--- /dev/null
+++ b/integration-tests/actions/private_network.go
@@ -0,0 +1,33 @@
+package actions
+
+import (
+	"errors"
+
+	"github.com/rs/zerolog"
+
+	ctf_test_env "github.com/smartcontractkit/chainlink-testing-framework/docker/test_env"
+)
+
+func EthereumNetworkConfigFromEnvOrDefault(l zerolog.Logger) (network ctf_test_env.EthereumNetwork, err error) {
+	chainConfig := ctf_test_env.EthereumChainConfig{
+		SecondsPerSlot: 8,
+		SlotsPerEpoch:  4,
+	}
+
+	ethBuilder := ctf_test_env.NewEthereumNetworkBuilder()
+	network, err = ethBuilder.
+		WithExecClientFromEnvVar().
+		WithEthereumChainConfig(chainConfig).
+		Build()
+
+	if errors.Is(err, ctf_test_env.ErrMissingExecClientEnvVar) {
+		l.Warn().Msg("No exec client env var set, will use old geth")
+		ethBuilder = ctf_test_env.NewEthereumNetworkBuilder()
+		network, err = ethBuilder.
+			WithConsensusType(ctf_test_env.ConsensusType_PoW).
+			WithExecutionLayer(ctf_test_env.ExecutionLayer_Geth).
+			Build()
+	}
+
+	return
+}
diff --git a/integration-tests/docker/test_env/cl_node.go b/integration-tests/docker/test_env/cl_node.go
index 60394256334..b79bb91c70e 100644
--- a/integration-tests/docker/test_env/cl_node.go
+++ b/integration-tests/docker/test_env/cl_node.go
@@ -112,7 +112,7 @@ func NewClNode(networks []string, imageName, imageVersion string, nodeConfig *ch
 func (n *ClNode) SetTestLogger(t *testing.T) {
 	n.l = logging.GetTestLogger(t)
 	n.t = t
-	n.PostgresDb.WithTestLogger(t)
+	n.PostgresDb.WithTestInstance(t)
 }
 
 // Restart restarts only CL node, DB container is reused
diff --git a/integration-tests/docker/test_env/test_env.go b/integration-tests/docker/test_env/test_env.go
index 15bf6641bf4..20e231e5985 100644
--- a/integration-tests/docker/test_env/test_env.go
+++ b/integration-tests/docker/test_env/test_env.go
@@ -71,11 +71,11 @@ func (te *CLClusterTestEnv) WithTestEnvConfig(cfg *TestEnvConfig) *CLClusterTest
 	return te
 }
 
-func (te *CLClusterTestEnv) WithTestLogger(t *testing.T) *CLClusterTestEnv {
+func (te *CLClusterTestEnv) WithTestInstance(t *testing.T) *CLClusterTestEnv {
 	te.t = t
 	te.l = logging.GetTestLogger(t)
 	if te.MockAdapter != nil {
-		te.MockAdapter.WithTestLogger(t)
+		te.MockAdapter.WithTestInstance(t)
 	}
 	return te
 }
@@ -90,7 +90,7 @@ func (te *CLClusterTestEnv) WithPrivateChain(evmNetworks []blockchain.EVMNetwork
 		n := evmNetwork
 		pgc := test_env.NewPrivateGethChain(&n, []string{te.Network.Name})
 		if te.t != nil {
-			pgc.GetPrimaryNode().WithTestLogger(te.t)
+			pgc.GetPrimaryNode().WithTestInstance(te.t)
 		}
 		chains = append(chains, pgc)
 		var privateChain test_env.PrivateChain
diff --git a/integration-tests/docker/test_env/test_env_builder.go b/integration-tests/docker/test_env/test_env_builder.go
index cc0499ea0ce..7358d76f2af 100644
--- a/integration-tests/docker/test_env/test_env_builder.go
+++ b/integration-tests/docker/test_env/test_env_builder.go
@@ -95,7 +95,7 @@ func (b *CLTestEnvBuilder) WithTestEnv(te *CLClusterTestEnv) (*CLTestEnvBuilder,
 
 // WithTestLogger sets the test logger to use for the test.
 // Useful for parallel tests so the logging will be separated correctly in the results views.
-func (b *CLTestEnvBuilder) WithTestLogger(t *testing.T) *CLTestEnvBuilder {
+func (b *CLTestEnvBuilder) WithTestInstance(t *testing.T) *CLTestEnvBuilder {
 	b.t = t
 	b.l = logging.GetTestLogger(t)
 	return b
@@ -220,8 +220,12 @@ func (b *CLTestEnvBuilder) Build() (*CLClusterTestEnv, error) {
 	}
 
 	var err error
+	if b.t != nil {
+		b.te.WithTestInstance(b.t)
+	}
+
 	if b.hasLogStream {
-		b.te.LogStream, err = logstream.NewLogStream(b.t, nil)
+		b.te.LogStream, err = logstream.NewLogStream(b.te.t, nil)
 		if err != nil {
 			return nil, err
 		}
@@ -241,7 +245,7 @@ func (b *CLTestEnvBuilder) Build() (*CLClusterTestEnv, error) {
 	}
 
 	if b.t != nil {
-		b.te.WithTestLogger(b.t)
+		b.te.WithTestInstance(b.t)
 	}
 
 	switch b.cleanUpType {
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index 72c15a89669..c080f617552 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -25,7 +25,7 @@ require (
 	github.com/slack-go/slack v0.12.2
 	github.com/smartcontractkit/chainlink-automation v1.0.1
 	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231206181640-faad3f11cfad
-	github.com/smartcontractkit/chainlink-testing-framework v1.21.0
+	github.com/smartcontractkit/chainlink-testing-framework v1.22.0
 	github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
 	github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000
 	github.com/smartcontractkit/libocr v0.0.0-20231130143053-c5102a9c0fb7
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index 494e5c21ec9..e8cefd67d6d 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -1411,6 +1411,7 @@ github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMT
 github.com/shirou/gopsutil/v3 v3.23.11 h1:i3jP9NjCPUz7FiZKxlMnODZkdSIp2gnzfrvsu9CuWEQ=
 github.com/shirou/gopsutil/v3 v3.23.11/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM=
 github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
+github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
 github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
 github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
 github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
@@ -1444,8 +1445,8 @@ github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231206154215-ec1718b7df3
 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231206154215-ec1718b7df3e/go.mod h1:9YIi413QRRytafTzpWm+Z+5NWBNxSqokhKyeEZ3ynlA=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231205180940-ea2e3e916725 h1:NbhPVwxx+53WN/Uld1V6c4iLgoGvUYFOsVd2kfcexe8=
 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231205180940-ea2e3e916725/go.mod h1:vHrPBipRL52NdPp77KXNU2k1IoCUa1B33N9otZQPYko=
-github.com/smartcontractkit/chainlink-testing-framework v1.21.0 h1:MrtpGMgPpcRX06FtDEj14Vokoo6Sx8e0/D6AA9LxCgM=
-github.com/smartcontractkit/chainlink-testing-framework v1.21.0/go.mod h1:9SCqZ+lcWZNEofpPgasQ+wUF6A6fFgZvWmhqQJwFYV0=
+github.com/smartcontractkit/chainlink-testing-framework v1.22.0 h1:Lur628wkrceWgcLmxGZe7Mauwxht4YO71hX9Jj5YslE=
+github.com/smartcontractkit/chainlink-testing-framework v1.22.0/go.mod h1:yu6qqrppNJfutQV37fiSs4eS0uQP5QT0ebi3tlIgWN0=
 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 h1:FFdvEzlYwcuVHkdZ8YnZR/XomeMGbz5E2F2HZI3I3w8=
 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868/go.mod h1:Kn1Hape05UzFZ7bOUnm3GVsHzP0TNrVmpfXYNHdqGGs=
 github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306 h1:ko88+ZznniNJZbZPWAvHQU8SwKAdHngdDZ+pvVgB5ss=
diff --git a/integration-tests/load/vrfv2/vrfv2_test.go b/integration-tests/load/vrfv2/vrfv2_test.go
index 8a0faeabb29..86f9b8d61f6 100644
--- a/integration-tests/load/vrfv2/vrfv2_test.go
+++ b/integration-tests/load/vrfv2/vrfv2_test.go
@@ -87,7 +87,7 @@ func TestVRFV2Performance(t *testing.T) {
 		vrfv2Config.KeyHash = cfg.ExistingEnvConfig.KeyHash
 
 		env, err = test_env.NewCLTestEnvBuilder().
-			WithTestLogger(t).
+			WithTestInstance(t).
 			WithCustomCleanup(
 				func() {
 					teardown(t, vrfv2Contracts.LoadTestConsumers[0], lc, updatedLabels, testReporter, testType, vrfv2Config)
@@ -156,7 +156,7 @@ func TestVRFV2Performance(t *testing.T) {
 		vrfv2Config.ChainlinkNodeFunding = cfg.NewEnvConfig.NodeSendingKeyFunding
 		vrfv2Config.SubscriptionFundingAmountLink = cfg.NewEnvConfig.Funding.SubFundsLink
 		env, err = test_env.NewCLTestEnvBuilder().
-			WithTestLogger(t).
+			WithTestInstance(t).
 			WithGeth().
 			WithCLNodes(1).
 			WithFunding(big.NewFloat(vrfv2Config.ChainlinkNodeFunding)).
diff --git a/integration-tests/load/vrfv2plus/vrfv2plus_test.go b/integration-tests/load/vrfv2plus/vrfv2plus_test.go
index 68c1012987d..6fe0d06e7da 100644
--- a/integration-tests/load/vrfv2plus/vrfv2plus_test.go
+++ b/integration-tests/load/vrfv2plus/vrfv2plus_test.go
@@ -89,7 +89,7 @@ func TestVRFV2PlusPerformance(t *testing.T) {
 		vrfv2PlusConfig.KeyHash = cfg.ExistingEnvConfig.KeyHash
 
 		env, err = test_env.NewCLTestEnvBuilder().
-			WithTestLogger(t).
+			WithTestInstance(t).
 			WithCustomCleanup(
 				func() {
 					teardown(t, vrfv2PlusContracts.LoadTestConsumers[0], lc, updatedLabels, testReporter, testType, vrfv2PlusConfig)
@@ -162,7 +162,7 @@ func TestVRFV2PlusPerformance(t *testing.T) {
 		vrfv2PlusConfig.SubscriptionFundingAmountLink = cfg.NewEnvConfig.Funding.SubFundsLink
 		vrfv2PlusConfig.SubscriptionFundingAmountNative = cfg.NewEnvConfig.Funding.SubFundsNative
 		env, err = test_env.NewCLTestEnvBuilder().
-			WithTestLogger(t).
+			WithTestInstance(t).
 			WithGeth().
 			WithCLNodes(1).
 			WithFunding(big.NewFloat(vrfv2PlusConfig.ChainlinkNodeFunding)).
diff --git a/integration-tests/migration/upgrade_version_test.go b/integration-tests/migration/upgrade_version_test.go
index d1f07a52b74..97db2374bf3 100644
--- a/integration-tests/migration/upgrade_version_test.go
+++ b/integration-tests/migration/upgrade_version_test.go
@@ -13,7 +13,7 @@ import (
 func TestVersionUpgrade(t *testing.T) {
 	t.Parallel()
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithGeth().
 		WithCLNodes(1).
 		Build()
diff --git a/integration-tests/smoke/automation_test.go b/integration-tests/smoke/automation_test.go
index bc9f1308452..1dbfc78ec87 100644
--- a/integration-tests/smoke/automation_test.go
+++ b/integration-tests/smoke/automation_test.go
@@ -1092,7 +1092,7 @@ func setupAutomationTestDocker(
 	clNodesCount := 5
 	if isMercuryV02 || isMercuryV03 {
 		env, err = test_env.NewCLTestEnvBuilder().
-			WithTestLogger(t).
+			WithTestInstance(t).
 			WithGeth().
 			WithMockAdapter().
 			WithFunding(big.NewFloat(testConfig.ChainlinkNodeFunding)).
@@ -1129,7 +1129,7 @@ func setupAutomationTestDocker(
 
 	} else {
 		env, err = test_env.NewCLTestEnvBuilder().
-			WithTestLogger(t).
+			WithTestInstance(t).
 			WithGeth().
 			WithMockAdapter().
 			WithCLNodes(clNodesCount).
diff --git a/integration-tests/smoke/cron_test.go b/integration-tests/smoke/cron_test.go
index 3eebc19f8bf..751c2867676 100644
--- a/integration-tests/smoke/cron_test.go
+++ b/integration-tests/smoke/cron_test.go
@@ -20,7 +20,7 @@ func TestCronBasic(t *testing.T) {
 	l := logging.GetTestLogger(t)
 
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithGeth().
 		WithMockAdapter().
 		WithCLNodes(1).
@@ -67,7 +67,7 @@ func TestCronJobReplacement(t *testing.T) {
 	l := logging.GetTestLogger(t)
 
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithGeth().
 		WithMockAdapter().
 		WithCLNodes(1).
diff --git a/integration-tests/smoke/flux_test.go b/integration-tests/smoke/flux_test.go
index 5b35b0d2484..828350a9422 100644
--- a/integration-tests/smoke/flux_test.go
+++ b/integration-tests/smoke/flux_test.go
@@ -26,7 +26,7 @@ func TestFluxBasic(t *testing.T) {
 	l := logging.GetTestLogger(t)
 
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithGeth().
 		WithMockAdapter().
 		WithCLNodes(3).
diff --git a/integration-tests/smoke/forwarder_ocr_test.go b/integration-tests/smoke/forwarder_ocr_test.go
index 923ca046ece..c71c6e31516 100644
--- a/integration-tests/smoke/forwarder_ocr_test.go
+++ b/integration-tests/smoke/forwarder_ocr_test.go
@@ -19,7 +19,7 @@ func TestForwarderOCRBasic(t *testing.T) {
 	l := logging.GetTestLogger(t)
 
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithGeth().
 		WithMockAdapter().
 		WithForwarders().
diff --git a/integration-tests/smoke/forwarders_ocr2_test.go b/integration-tests/smoke/forwarders_ocr2_test.go
index bdfd65c767e..c2e2b12e51d 100644
--- a/integration-tests/smoke/forwarders_ocr2_test.go
+++ b/integration-tests/smoke/forwarders_ocr2_test.go
@@ -24,7 +24,7 @@ func TestForwarderOCR2Basic(t *testing.T) {
 	l := logging.GetTestLogger(t)
 
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithGeth().
 		WithMockAdapter().
 		WithCLNodeConfig(node.NewConfig(node.NewBaseConfig(),
diff --git a/integration-tests/smoke/keeper_test.go b/integration-tests/smoke/keeper_test.go
index 336223b7a4c..1bc416f0456 100644
--- a/integration-tests/smoke/keeper_test.go
+++ b/integration-tests/smoke/keeper_test.go
@@ -1107,7 +1107,7 @@ func setupKeeperTest(t *testing.T) (
 	clNodeConfig.Keeper.Registry.PerformGasOverhead = &performGasOverhead
 
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithGeth().
 		WithCLNodes(5).
 		WithCLNodeConfig(clNodeConfig).
diff --git a/integration-tests/smoke/ocr2_test.go b/integration-tests/smoke/ocr2_test.go
index 8f0fbd76053..a1a37c3b18e 100644
--- a/integration-tests/smoke/ocr2_test.go
+++ b/integration-tests/smoke/ocr2_test.go
@@ -19,11 +19,15 @@ import (
 
 // Tests a basic OCRv2 median feed
 func TestOCRv2Basic(t *testing.T) {
+	t.Parallel()
 	l := logging.GetTestLogger(t)
 
+	network, err := actions.EthereumNetworkConfigFromEnvOrDefault(l)
+	require.NoError(t, err, "Error building ethereum network config")
+
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
-		WithGeth().
+		WithTestInstance(t).
+		WithPrivateEthereumNetwork(network).
 		WithMockAdapter().
 		WithCLNodeConfig(node.NewConfig(node.NewBaseConfig(),
 			node.WithOCR2(),
@@ -97,7 +101,7 @@ func TestOCRv2JobReplacement(t *testing.T) {
 	l := logging.GetTestLogger(t)
 
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithGeth().
 		WithMockAdapter().
 		WithCLNodeConfig(node.NewConfig(node.NewBaseConfig(),
diff --git a/integration-tests/smoke/ocr_test.go b/integration-tests/smoke/ocr_test.go
index 25192248c46..ba158923812 100644
--- a/integration-tests/smoke/ocr_test.go
+++ b/integration-tests/smoke/ocr_test.go
@@ -17,9 +17,12 @@ func TestOCRBasic(t *testing.T) {
 	t.Parallel()
 	l := logging.GetTestLogger(t)
 
+	network, err := actions.EthereumNetworkConfigFromEnvOrDefault(l)
+	require.NoError(t, err, "Error building ethereum network config")
+
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
-		WithGeth().
+		WithTestInstance(t).
+		WithPrivateEthereumNetwork(network).
 		WithMockAdapter().
 		WithCLNodes(6).
 		WithFunding(big.NewFloat(.5)).
@@ -66,7 +69,7 @@ func TestOCRJobReplacement(t *testing.T) {
 	l := logging.GetTestLogger(t)
 
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithGeth().
 		WithMockAdapter().
 		WithCLNodes(6).
diff --git a/integration-tests/smoke/runlog_test.go b/integration-tests/smoke/runlog_test.go
index 2fc771fb9bf..5cc21a28c2c 100644
--- a/integration-tests/smoke/runlog_test.go
+++ b/integration-tests/smoke/runlog_test.go
@@ -23,7 +23,7 @@ func TestRunLogBasic(t *testing.T) {
 	l := logging.GetTestLogger(t)
 
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithGeth().
 		WithMockAdapter().
 		WithCLNodes(1).
diff --git a/integration-tests/smoke/vrf_test.go b/integration-tests/smoke/vrf_test.go
index 04120053745..0554bd34760 100644
--- a/integration-tests/smoke/vrf_test.go
+++ b/integration-tests/smoke/vrf_test.go
@@ -24,7 +24,7 @@ func TestVRFBasic(t *testing.T) {
 	l := logging.GetTestLogger(t)
 
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithGeth().
 		WithCLNodes(1).
 		WithFunding(big.NewFloat(.1)).
@@ -114,7 +114,7 @@ func TestVRFJobReplacement(t *testing.T) {
 	l := logging.GetTestLogger(t)
 
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithGeth().
 		WithCLNodes(1).
 		WithFunding(big.NewFloat(.1)).
diff --git a/integration-tests/smoke/vrfv2_test.go b/integration-tests/smoke/vrfv2_test.go
index 9976de03954..a8edb2c51d9 100644
--- a/integration-tests/smoke/vrfv2_test.go
+++ b/integration-tests/smoke/vrfv2_test.go
@@ -24,13 +24,16 @@ func TestVRFv2Basic(t *testing.T) {
 	t.Parallel()
 	l := logging.GetTestLogger(t)
 
+	network, err := actions.EthereumNetworkConfigFromEnvOrDefault(l)
+	require.NoError(t, err, "Error building ethereum network config")
+
 	var vrfv2Config vrfv2_config.VRFV2Config
-	err := envconfig.Process("VRFV2", &vrfv2Config)
+	err = envconfig.Process("VRFV2", &vrfv2Config)
 	require.NoError(t, err)
 
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
-		WithGeth().
+		WithTestInstance(t).
+		WithPrivateEthereumNetwork(network).
 		WithCLNodes(1).
 		WithFunding(big.NewFloat(vrfv2Config.ChainlinkNodeFunding)).
 		WithStandardCleanup().
@@ -121,7 +124,7 @@ func TestVRFv2MultipleSendingKeys(t *testing.T) {
 	require.NoError(t, err)
 
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithGeth().
 		WithCLNodes(1).
 		WithFunding(big.NewFloat(vrfv2Config.ChainlinkNodeFunding)).
diff --git a/integration-tests/smoke/vrfv2plus_test.go b/integration-tests/smoke/vrfv2plus_test.go
index 69e1eb7ebde..a850cb4fe15 100644
--- a/integration-tests/smoke/vrfv2plus_test.go
+++ b/integration-tests/smoke/vrfv2plus_test.go
@@ -29,13 +29,16 @@ func TestVRFv2Plus(t *testing.T) {
 	t.Parallel()
 	l := logging.GetTestLogger(t)
 
+	network, err := actions.EthereumNetworkConfigFromEnvOrDefault(l)
+	require.NoError(t, err, "Error building ethereum network config")
+
 	var vrfv2PlusConfig vrfv2plus_config.VRFV2PlusConfig
-	err := envconfig.Process("VRFV2PLUS", &vrfv2PlusConfig)
+	err = envconfig.Process("VRFV2PLUS", &vrfv2PlusConfig)
 	require.NoError(t, err)
 
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
-		WithGeth().
+		WithTestInstance(t).
+		WithPrivateEthereumNetwork(network).
 		WithCLNodes(1).
 		WithFunding(big.NewFloat(vrfv2PlusConfig.ChainlinkNodeFunding)).
 		WithStandardCleanup().
@@ -118,6 +121,7 @@ func TestVRFv2Plus(t *testing.T) {
 			require.Equal(t, 1, w.Cmp(big.NewInt(0)), "Expected the VRF job give an answer bigger than 0")
 		}
 	})
+
 	t.Run("Native Billing", func(t *testing.T) {
 		testConfig := vrfv2PlusConfig
 		var isNativeBilling = true
@@ -612,7 +616,7 @@ func TestVRFv2PlusMultipleSendingKeys(t *testing.T) {
 	require.NoError(t, err)
 
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithGeth().
 		WithCLNodes(1).
 		WithFunding(big.NewFloat(vrfv2PlusConfig.ChainlinkNodeFunding)).
@@ -703,7 +707,7 @@ func TestVRFv2PlusMigration(t *testing.T) {
 	require.NoError(t, err)
 
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithGeth().
 		WithCLNodes(1).
 		WithFunding(big.NewFloat(vrfv2PlusConfig.ChainlinkNodeFunding)).
diff --git a/integration-tests/universal/log_poller/helpers.go b/integration-tests/universal/log_poller/helpers.go
index 48f34e6827c..1abd98632f1 100644
--- a/integration-tests/universal/log_poller/helpers.go
+++ b/integration-tests/universal/log_poller/helpers.go
@@ -1043,7 +1043,8 @@ func setupLogPollerTestDocker(
 		WithConsensusType(ctf_test_env.ConsensusType_PoS).
 		WithConsensusLayer(ctf_test_env.ConsensusLayer_Prysm).
 		WithExecutionLayer(ctf_test_env.ExecutionLayer_Geth).
-		WithBeaconChainConfig(ctf_test_env.BeaconChainConfig{
+		WithWaitingForFinalization().
+		WithEthereumChainConfig(ctf_test_env.EthereumChainConfig{
 			SecondsPerSlot: 8,
 			SlotsPerEpoch:  2,
 		}).
@@ -1051,7 +1052,7 @@ func setupLogPollerTestDocker(
 	require.NoError(t, err, "Error building ethereum network config")
 
 	env, err = test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithPrivateEthereumNetwork(cfg).
 		WithCLNodes(clNodesCount).
 		WithCLNodeConfig(clNodeConfig).

From f378e889cc4dfad3067e909402e81a7d7febbf78 Mon Sep 17 00:00:00 2001
From: Sergey Kudasov <f4hrenh9it@gmail.com>
Date: Wed, 13 Dec 2023 00:01:58 +0300
Subject: [PATCH 110/130] disable kaniko fallback, increase deploy wait timeout
 (#11548)

---
 charts/chainlink-cluster/devspace.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/charts/chainlink-cluster/devspace.yaml b/charts/chainlink-cluster/devspace.yaml
index 186e49257a1..bd50a469ded 100644
--- a/charts/chainlink-cluster/devspace.yaml
+++ b/charts/chainlink-cluster/devspace.yaml
@@ -37,11 +37,14 @@ images:
     image: ${DEVSPACE_IMAGE}
     dockerfile: ../../core/chainlink.devspace.Dockerfile
     context: ../..
+    docker:
+      disableFallback: true
 
 hooks:
   - wait:
       running: true
       terminatedWithCode: 0
+      timeout: 600
     container:
       labelSelector:
         # vars don't work here, = releaseName

From c5459c67d32f01dee129bdbf992b95235355be88 Mon Sep 17 00:00:00 2001
From: chris-de-leon-cll <147140544+chris-de-leon-cll@users.noreply.github.com>
Date: Tue, 12 Dec 2023 13:07:37 -0800
Subject: [PATCH 111/130] [DEPLOY-178]: Adds Scroll L2EP Contracts (#11405)

* Adds scroll L2EP contracts and tests

* fixes comments, adds fixed solidity compiler version, and adds scroll tech contracts as a dev dependency

* renames SCROLL_CROSS_DOMAIN_MESSENGER to i_SCROLL_CROSS_DOMAIN_MESSENGER for solhint

* removes unnecessary solhint disable rule

* moves scroll mocks from tests folder to l2ep folder

* resolve solhint errors for scroll

* proposed restructure to reduce inheritance

* removes extraneous comments from scroll contracts and refactors typeAndVersion

* use named parameters in mappings for scroll contracts

* removes extraneous empty comments from scroll contracts (again)

* removes unnecessary comment from scroll cross domain governor

* adds minor formatting updates to scroll mocks

* adds onlyL1Owner modifier back to ScrollCrossDomainGovernor

* adds style and formatting improvements

* adds formatting updates

* refactors scroll sequencer uptime feed to reduce gas and updates test suites

---------

Co-authored-by: Rens Rooimans <github@rensrooimans.nl>
---
 contracts/foundry.toml                        |   2 +-
 contracts/package.json                        |   1 +
 contracts/pnpm-lock.yaml                      |  17 +-
 .../ScrollSequencerUptimeFeedInterface.sol    |   6 +
 .../dev/scroll/ScrollCrossDomainForwarder.sol |  65 +++
 .../dev/scroll/ScrollCrossDomainGovernor.sol  |  92 ++++
 .../dev/scroll/ScrollSequencerUptimeFeed.sol  | 231 +++++++++
 .../v0.8/l2ep/dev/scroll/ScrollValidator.sol  |  77 +++
 .../MockScrollL1CrossDomainMessenger.sol      |  60 +++
 .../MockScrollL2CrossDomainMessenger.sol      |  50 ++
 .../vendor/MockScrollCrossDomainMessenger.sol | 101 ++++
 .../dev/ScrollCrossDomainForwarder.test.ts    | 259 ++++++++++
 .../dev/ScrollCrossDomainGovernor.test.ts     | 459 ++++++++++++++++++
 .../dev/ScrollSequencerUptimeFeed.test.ts     | 426 ++++++++++++++++
 .../test/v0.8/dev/ScrollValidator.test.ts     | 118 +++++
 15 files changed, 1961 insertions(+), 3 deletions(-)
 create mode 100644 contracts/src/v0.8/l2ep/dev/interfaces/ScrollSequencerUptimeFeedInterface.sol
 create mode 100644 contracts/src/v0.8/l2ep/dev/scroll/ScrollCrossDomainForwarder.sol
 create mode 100644 contracts/src/v0.8/l2ep/dev/scroll/ScrollCrossDomainGovernor.sol
 create mode 100644 contracts/src/v0.8/l2ep/dev/scroll/ScrollSequencerUptimeFeed.sol
 create mode 100644 contracts/src/v0.8/l2ep/dev/scroll/ScrollValidator.sol
 create mode 100644 contracts/src/v0.8/l2ep/test/mocks/MockScrollL1CrossDomainMessenger.sol
 create mode 100644 contracts/src/v0.8/l2ep/test/mocks/MockScrollL2CrossDomainMessenger.sol
 create mode 100644 contracts/src/v0.8/vendor/MockScrollCrossDomainMessenger.sol
 create mode 100644 contracts/test/v0.8/dev/ScrollCrossDomainForwarder.test.ts
 create mode 100644 contracts/test/v0.8/dev/ScrollCrossDomainGovernor.test.ts
 create mode 100644 contracts/test/v0.8/dev/ScrollSequencerUptimeFeed.test.ts
 create mode 100644 contracts/test/v0.8/dev/ScrollValidator.test.ts

diff --git a/contracts/foundry.toml b/contracts/foundry.toml
index cf27c0f2a8b..003c836b1f3 100644
--- a/contracts/foundry.toml
+++ b/contracts/foundry.toml
@@ -37,7 +37,7 @@ test = 'src/v0.8/automation/test'
 optimizer_runs = 1000000
 src = 'src/v0.8/l2ep'
 test = 'src/v0.8/l2ep/test'
-
+solc_version = '0.8.19'
 
 [profile.llo-feeds]
 optimizer_runs = 1000000
diff --git a/contracts/package.json b/contracts/package.json
index 2604a12bea3..abbf722140c 100644
--- a/contracts/package.json
+++ b/contracts/package.json
@@ -43,6 +43,7 @@
     "@nomiclabs/hardhat-etherscan": "^3.1.7",
     "@nomiclabs/hardhat-waffle": "2.0.6",
     "@openzeppelin/hardhat-upgrades": "1.28.0",
+    "@scroll-tech/contracts": "0.1.0",
     "@openzeppelin/test-helpers": "^0.5.16",
     "@typechain/ethers-v5": "^7.2.0",
     "@typechain/hardhat": "^7.0.0",
diff --git a/contracts/pnpm-lock.yaml b/contracts/pnpm-lock.yaml
index fbae71fb3d4..dffcb0a7c7c 100644
--- a/contracts/pnpm-lock.yaml
+++ b/contracts/pnpm-lock.yaml
@@ -55,6 +55,9 @@ devDependencies:
   '@openzeppelin/test-helpers':
     specifier: ^0.5.16
     version: 0.5.16(bn.js@4.12.0)
+  '@scroll-tech/contracts':
+    specifier: 0.1.0
+    version: 0.1.0
   '@typechain/ethers-v5':
     specifier: ^7.2.0
     version: 7.2.0(@ethersproject/abi@5.7.0)(@ethersproject/bytes@5.7.0)(@ethersproject/providers@5.7.2)(ethers@5.7.2)(typechain@8.3.2)(typescript@5.2.2)
@@ -1387,6 +1390,10 @@ packages:
       - supports-color
     dev: true
 
+  /@scroll-tech/contracts@0.1.0:
+    resolution: {integrity: sha512-aBbDOc3WB/WveZdpJYcrfvMYMz7ZTEiW8M9XMJLba8p9FAR5KGYB/cV+8+EUsq3MKt7C1BfR+WnXoTVdvwIY6w==}
+    dev: true
+
   /@scure/base@1.1.1:
     resolution: {integrity: sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==}
     dev: true
@@ -5861,7 +5868,7 @@ packages:
       heap: 0.2.6
       level-sublevel: 6.6.4
       levelup: 3.1.1
-      lodash: 4.17.21
+      lodash: 4.17.20
       lru-cache: 5.1.1
       merkle-patricia-tree: 3.0.0
       patch-package: 6.2.2
@@ -7919,6 +7926,12 @@ packages:
   /minimalistic-crypto-utils@1.0.1:
     resolution: {integrity: sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==}
 
+  /minimatch@3.0.4:
+    resolution: {integrity: sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==}
+    dependencies:
+      brace-expansion: 1.1.11
+    dev: true
+
   /minimatch@3.1.2:
     resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
     dependencies:
@@ -9232,7 +9245,7 @@ packages:
     resolution: {integrity: sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      minimatch: 3.1.2
+      minimatch: 3.0.4
     dev: true
 
   /reduce-flatten@2.0.0:
diff --git a/contracts/src/v0.8/l2ep/dev/interfaces/ScrollSequencerUptimeFeedInterface.sol b/contracts/src/v0.8/l2ep/dev/interfaces/ScrollSequencerUptimeFeedInterface.sol
new file mode 100644
index 00000000000..f0f716d6f02
--- /dev/null
+++ b/contracts/src/v0.8/l2ep/dev/interfaces/ScrollSequencerUptimeFeedInterface.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.19;
+
+interface ScrollSequencerUptimeFeedInterface {
+  function updateStatus(bool status, uint64 timestamp) external;
+}
diff --git a/contracts/src/v0.8/l2ep/dev/scroll/ScrollCrossDomainForwarder.sol b/contracts/src/v0.8/l2ep/dev/scroll/ScrollCrossDomainForwarder.sol
new file mode 100644
index 00000000000..f18f7c3270b
--- /dev/null
+++ b/contracts/src/v0.8/l2ep/dev/scroll/ScrollCrossDomainForwarder.sol
@@ -0,0 +1,65 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.19;
+
+import {TypeAndVersionInterface} from "../../../interfaces/TypeAndVersionInterface.sol";
+import {ForwarderInterface} from "../interfaces/ForwarderInterface.sol";
+
+import {CrossDomainForwarder} from "../CrossDomainForwarder.sol";
+import {CrossDomainOwnable} from "../CrossDomainOwnable.sol";
+
+import {IScrollMessenger} from "@scroll-tech/contracts/libraries/IScrollMessenger.sol";
+import {Address} from "../../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/Address.sol";
+
+/// @title ScrollCrossDomainForwarder - L1 xDomain account representation
+/// @notice L2 Contract which receives messages from a specific L1 address and transparently forwards them to the destination.
+/// @dev Any other L2 contract which uses this contract's address as a privileged position,
+/// can be considered to be owned by the `l1Owner`
+contract ScrollCrossDomainForwarder is TypeAndVersionInterface, CrossDomainForwarder {
+  // solhint-disable-next-line chainlink-solidity/all-caps-constant-storage-variables
+  string public constant override typeAndVersion = "ScrollCrossDomainForwarder 1.0.0";
+
+  address internal immutable i_scrollCrossDomainMessenger;
+
+  /// @param crossDomainMessengerAddr the xDomain bridge messenger (Scroll bridge L2) contract address
+  /// @param l1OwnerAddr the L1 owner address that will be allowed to call the forward fn
+  constructor(IScrollMessenger crossDomainMessengerAddr, address l1OwnerAddr) CrossDomainOwnable(l1OwnerAddr) {
+    // solhint-disable-next-line custom-errors
+    require(address(crossDomainMessengerAddr) != address(0), "Invalid xDomain Messenger address");
+    i_scrollCrossDomainMessenger = address(crossDomainMessengerAddr);
+  }
+
+  /// @dev forwarded only if L2 Messenger calls with `xDomainMessageSender` being the L1 owner address
+  /// @inheritdoc ForwarderInterface
+  function forward(address target, bytes memory data) external override onlyL1Owner {
+    Address.functionCall(target, data, "Forwarder call reverted");
+  }
+
+  /// @notice This is always the address of the Scroll Cross Domain Messenger contract
+  function crossDomainMessenger() external view returns (address) {
+    return address(i_scrollCrossDomainMessenger);
+  }
+
+  /// @notice The call MUST come from the L1 owner (via cross-chain message.) Reverts otherwise.
+  modifier onlyL1Owner() override {
+    // solhint-disable-next-line custom-errors
+    require(msg.sender == i_scrollCrossDomainMessenger, "Sender is not the L2 messenger");
+    // solhint-disable-next-line custom-errors
+    require(
+      IScrollMessenger(i_scrollCrossDomainMessenger).xDomainMessageSender() == l1Owner(),
+      "xDomain sender is not the L1 owner"
+    );
+    _;
+  }
+
+  /// @notice The call MUST come from the proposed L1 owner (via cross-chain message.) Reverts otherwise.
+  modifier onlyProposedL1Owner() override {
+    // solhint-disable-next-line custom-errors
+    require(msg.sender == i_scrollCrossDomainMessenger, "Sender is not the L2 messenger");
+    // solhint-disable-next-line custom-errors
+    require(
+      IScrollMessenger(i_scrollCrossDomainMessenger).xDomainMessageSender() == s_l1PendingOwner,
+      "Must be proposed L1 owner"
+    );
+    _;
+  }
+}
diff --git a/contracts/src/v0.8/l2ep/dev/scroll/ScrollCrossDomainGovernor.sol b/contracts/src/v0.8/l2ep/dev/scroll/ScrollCrossDomainGovernor.sol
new file mode 100644
index 00000000000..00ef9219b26
--- /dev/null
+++ b/contracts/src/v0.8/l2ep/dev/scroll/ScrollCrossDomainGovernor.sol
@@ -0,0 +1,92 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.19;
+
+import {TypeAndVersionInterface} from "../../../interfaces/TypeAndVersionInterface.sol";
+import {DelegateForwarderInterface} from "../interfaces/DelegateForwarderInterface.sol";
+// solhint-disable-next-line no-unused-import
+import {ForwarderInterface} from "../interfaces/ForwarderInterface.sol";
+
+import {CrossDomainForwarder} from "../CrossDomainForwarder.sol";
+import {CrossDomainOwnable} from "../CrossDomainOwnable.sol";
+
+import {IScrollMessenger} from "@scroll-tech/contracts/libraries/IScrollMessenger.sol";
+import {Address} from "../../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/Address.sol";
+
+/// @title ScrollCrossDomainGovernor - L1 xDomain account representation (with delegatecall support) for Scroll
+/// @notice L2 Contract which receives messages from a specific L1 address and transparently forwards them to the destination.
+/// @dev Any other L2 contract which uses this contract's address as a privileged position,
+/// can be considered to be simultaneously owned by the `l1Owner` and L2 `owner`
+contract ScrollCrossDomainGovernor is DelegateForwarderInterface, TypeAndVersionInterface, CrossDomainForwarder {
+  // solhint-disable-next-line chainlink-solidity/all-caps-constant-storage-variables
+  string public constant override typeAndVersion = "ScrollCrossDomainGovernor 1.0.0";
+
+  address internal immutable i_scrollCrossDomainMessenger;
+
+  /// @param crossDomainMessengerAddr the xDomain bridge messenger (Scroll bridge L2) contract address
+  /// @param l1OwnerAddr the L1 owner address that will be allowed to call the forward fn
+  constructor(IScrollMessenger crossDomainMessengerAddr, address l1OwnerAddr) CrossDomainOwnable(l1OwnerAddr) {
+    // solhint-disable-next-line custom-errors
+    require(address(crossDomainMessengerAddr) != address(0), "Invalid xDomain Messenger address");
+    i_scrollCrossDomainMessenger = address(crossDomainMessengerAddr);
+  }
+
+  /// @inheritdoc ForwarderInterface
+  /// @dev forwarded only if L2 Messenger calls with `msg.sender` being the L1 owner address, or called by the L2 owner
+  function forward(address target, bytes memory data) external override onlyLocalOrCrossDomainOwner {
+    Address.functionCall(target, data, "Governor call reverted");
+  }
+
+  /// @inheritdoc DelegateForwarderInterface
+  /// @dev forwarded only if L2 Messenger calls with `msg.sender` being the L1 owner address, or called by the L2 owner
+  function forwardDelegate(address target, bytes memory data) external override onlyLocalOrCrossDomainOwner {
+    Address.functionDelegateCall(target, data, "Governor delegatecall reverted");
+  }
+
+  /// @notice The address of the Scroll Cross Domain Messenger contract
+  function crossDomainMessenger() external view returns (address) {
+    return address(i_scrollCrossDomainMessenger);
+  }
+
+  /// @notice The call MUST come from the L1 owner (via cross-chain message.) Reverts otherwise.
+  modifier onlyL1Owner() override {
+    // solhint-disable-next-line custom-errors
+    require(msg.sender == i_scrollCrossDomainMessenger, "Sender is not the L2 messenger");
+    // solhint-disable-next-line custom-errors
+    require(
+      IScrollMessenger(i_scrollCrossDomainMessenger).xDomainMessageSender() == l1Owner(),
+      "xDomain sender is not the L1 owner"
+    );
+    _;
+  }
+
+  /// @notice The call MUST come from either the L1 owner (via cross-chain message) or the L2 owner. Reverts otherwise.
+  modifier onlyLocalOrCrossDomainOwner() {
+    // 1. The delegatecall MUST come from either the L1 owner (via cross-chain message) or the L2 owner
+    // solhint-disable-next-line custom-errors
+    require(
+      msg.sender == i_scrollCrossDomainMessenger || msg.sender == owner(),
+      "Sender is not the L2 messenger or owner"
+    );
+    // 2. The L2 Messenger's caller MUST be the L1 Owner
+    if (msg.sender == i_scrollCrossDomainMessenger) {
+      // solhint-disable-next-line custom-errors
+      require(
+        IScrollMessenger(i_scrollCrossDomainMessenger).xDomainMessageSender() == l1Owner(),
+        "xDomain sender is not the L1 owner"
+      );
+    }
+    _;
+  }
+
+  /// @notice The call MUST come from the proposed L1 owner (via cross-chain message.) Reverts otherwise.
+  modifier onlyProposedL1Owner() override {
+    // solhint-disable-next-line custom-errors
+    require(msg.sender == i_scrollCrossDomainMessenger, "Sender is not the L2 messenger");
+    // solhint-disable-next-line custom-errors
+    require(
+      IScrollMessenger(i_scrollCrossDomainMessenger).xDomainMessageSender() == s_l1PendingOwner,
+      "Must be proposed L1 owner"
+    );
+    _;
+  }
+}
diff --git a/contracts/src/v0.8/l2ep/dev/scroll/ScrollSequencerUptimeFeed.sol b/contracts/src/v0.8/l2ep/dev/scroll/ScrollSequencerUptimeFeed.sol
new file mode 100644
index 00000000000..22b5ed1e2b6
--- /dev/null
+++ b/contracts/src/v0.8/l2ep/dev/scroll/ScrollSequencerUptimeFeed.sol
@@ -0,0 +1,231 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.19;
+
+import {ScrollSequencerUptimeFeedInterface} from "../interfaces/ScrollSequencerUptimeFeedInterface.sol";
+import {AggregatorInterface} from "../../../shared/interfaces/AggregatorInterface.sol";
+import {AggregatorV3Interface} from "../../../shared/interfaces/AggregatorV3Interface.sol";
+import {AggregatorV2V3Interface} from "../../../shared/interfaces/AggregatorV2V3Interface.sol";
+import {TypeAndVersionInterface} from "../../../interfaces/TypeAndVersionInterface.sol";
+
+import {SimpleReadAccessController} from "../../../shared/access/SimpleReadAccessController.sol";
+
+import {IL2ScrollMessenger} from "@scroll-tech/contracts/L2/IL2ScrollMessenger.sol";
+
+/// @title ScrollSequencerUptimeFeed - L2 sequencer uptime status aggregator
+/// @notice L2 contract that receives status updates, and records a new answer if the status changed
+contract ScrollSequencerUptimeFeed is
+  AggregatorV2V3Interface,
+  ScrollSequencerUptimeFeedInterface,
+  TypeAndVersionInterface,
+  SimpleReadAccessController
+{
+  // solhint-disable-next-line chainlink-solidity/all-caps-constant-storage-variables
+  string public constant override typeAndVersion = "ScrollSequencerUptimeFeed 1.0.0";
+
+  /// @dev Round info (for uptime history)
+  struct Round {
+    bool status;
+    uint64 startedAt;
+    uint64 updatedAt;
+  }
+
+  /// @dev Packed state struct to save sloads
+  struct FeedState {
+    uint80 latestRoundId;
+    bool latestStatus;
+    uint64 startedAt;
+    uint64 updatedAt;
+  }
+
+  /// @notice Sender is not the L2 messenger
+  error InvalidSender();
+  /// @notice Replacement for AggregatorV3Interface "No data present"
+  error NoDataPresent();
+
+  event L1SenderTransferred(address indexed from, address indexed to);
+  /// @dev Emitted when an `updateStatus` call is ignored due to unchanged status or stale timestamp
+  event UpdateIgnored(bool latestStatus, uint64 latestTimestamp, bool incomingStatus, uint64 incomingTimestamp);
+  /// @dev Emitted when a updateStatus is called without the status changing
+  event RoundUpdated(int256 status, uint64 updatedAt);
+
+  // solhint-disable-next-line chainlink-solidity/all-caps-constant-storage-variables
+  uint8 public constant override decimals = 0;
+  // solhint-disable-next-line chainlink-solidity/all-caps-constant-storage-variables
+  string public constant override description = "L2 Sequencer Uptime Status Feed";
+  // solhint-disable-next-line chainlink-solidity/all-caps-constant-storage-variables
+  uint256 public constant override version = 1;
+
+  /// @dev L1 address
+  address private s_l1Sender;
+  /// @dev s_latestRoundId == 0 means this contract is uninitialized.
+  FeedState private s_feedState = FeedState({latestRoundId: 0, latestStatus: false, startedAt: 0, updatedAt: 0});
+  mapping(uint80 roundId => Round round) private s_rounds;
+
+  // solhint-disable-next-line chainlink-solidity/prefix-immutable-variables-with-i
+  IL2ScrollMessenger private immutable s_l2CrossDomainMessenger;
+
+  /// @param l1SenderAddress Address of the L1 contract that is permissioned to call this contract
+  /// @param l2CrossDomainMessengerAddr Address of the L2CrossDomainMessenger contract
+  /// @param initialStatus The initial status of the feed
+  constructor(address l1SenderAddress, address l2CrossDomainMessengerAddr, bool initialStatus) {
+    _setL1Sender(l1SenderAddress);
+    s_l2CrossDomainMessenger = IL2ScrollMessenger(l2CrossDomainMessengerAddr);
+
+    // Initialise roundId == 1 as the first round
+    _recordRound(1, initialStatus, uint64(block.timestamp));
+  }
+
+  /// @notice Check if a roundId is valid in this current contract state
+  /// @dev Mainly used for AggregatorV2V3Interface functions
+  /// @param roundId Round ID to check
+  function _isValidRound(uint256 roundId) private view returns (bool) {
+    return roundId > 0 && roundId <= type(uint80).max && s_feedState.latestRoundId >= roundId;
+  }
+
+  /// @return L1 sender address
+  function l1Sender() public view virtual returns (address) {
+    return s_l1Sender;
+  }
+
+  /// @notice Set the allowed L1 sender for this contract to a new L1 sender
+  /// @dev Can be disabled by setting the L1 sender as `address(0)`. Accessible only by owner.
+  /// @param to new L1 sender that will be allowed to call `updateStatus` on this contract
+  function transferL1Sender(address to) external virtual onlyOwner {
+    _setL1Sender(to);
+  }
+
+  /// @notice internal method that stores the L1 sender
+  function _setL1Sender(address to) private {
+    address from = s_l1Sender;
+    if (from != to) {
+      s_l1Sender = to;
+      emit L1SenderTransferred(from, to);
+    }
+  }
+
+  /// @dev Returns an AggregatorV2V3Interface compatible answer from status flag
+  /// @param status The status flag to convert to an aggregator-compatible answer
+  function _getStatusAnswer(bool status) private pure returns (int256) {
+    return status ? int256(1) : int256(0);
+  }
+
+  /// @notice Helper function to record a round and set the latest feed state.
+  /// @param roundId The round ID to record
+  /// @param status Sequencer status
+  /// @param timestamp The L1 block timestamp of status update
+  function _recordRound(uint80 roundId, bool status, uint64 timestamp) private {
+    s_feedState = FeedState(roundId, status, timestamp, uint64(block.timestamp));
+    s_rounds[roundId] = Round(status, timestamp, uint64(block.timestamp));
+
+    emit NewRound(roundId, msg.sender, timestamp);
+    emit AnswerUpdated(_getStatusAnswer(status), roundId, timestamp);
+  }
+
+  /// @notice Helper function to update when a round was last updated
+  /// @param roundId The round ID to update
+  /// @param status Sequencer status
+  function _updateRound(uint80 roundId, bool status) private {
+    s_feedState.updatedAt = uint64(block.timestamp);
+    s_rounds[roundId].updatedAt = uint64(block.timestamp);
+    emit RoundUpdated(_getStatusAnswer(status), uint64(block.timestamp));
+  }
+
+  /// @notice Record a new status and timestamp if it has changed since the last round.
+  /// @dev This function will revert if not called from `l1Sender` via the L1->L2 messenger.
+  ///
+  /// @param status Sequencer status
+  /// @param timestamp Block timestamp of status update
+  function updateStatus(bool status, uint64 timestamp) external override {
+    FeedState memory feedState = s_feedState;
+
+    if (
+      msg.sender != address(s_l2CrossDomainMessenger) || s_l2CrossDomainMessenger.xDomainMessageSender() != s_l1Sender
+    ) {
+      revert InvalidSender();
+    }
+
+    // Ignore if latest recorded timestamp is newer
+    if (feedState.startedAt > timestamp) {
+      emit UpdateIgnored(feedState.latestStatus, feedState.startedAt, status, timestamp);
+      return;
+    }
+
+    if (feedState.latestStatus == status) {
+      _updateRound(feedState.latestRoundId, status);
+    } else {
+      feedState.latestRoundId += 1;
+      _recordRound(feedState.latestRoundId, status, timestamp);
+    }
+  }
+
+  /// @inheritdoc AggregatorInterface
+  function latestAnswer() external view override checkAccess returns (int256) {
+    return _getStatusAnswer(s_feedState.latestStatus);
+  }
+
+  /// @inheritdoc AggregatorInterface
+  function latestTimestamp() external view override checkAccess returns (uint256) {
+    return s_feedState.startedAt;
+  }
+
+  /// @inheritdoc AggregatorInterface
+  function latestRound() external view override checkAccess returns (uint256) {
+    return s_feedState.latestRoundId;
+  }
+
+  /// @inheritdoc AggregatorInterface
+  function getAnswer(uint256 roundId) external view override checkAccess returns (int256) {
+    if (!_isValidRound(roundId)) {
+      revert NoDataPresent();
+    }
+
+    return _getStatusAnswer(s_rounds[uint80(roundId)].status);
+  }
+
+  /// @inheritdoc AggregatorInterface
+  function getTimestamp(uint256 roundId) external view override checkAccess returns (uint256) {
+    if (!_isValidRound(roundId)) {
+      revert NoDataPresent();
+    }
+
+    return s_rounds[uint80(roundId)].startedAt;
+  }
+
+  /// @inheritdoc AggregatorV3Interface
+  function getRoundData(
+    uint80 _roundId
+  )
+    public
+    view
+    override
+    checkAccess
+    returns (uint80 roundId, int256 answer, uint256 startedAt, uint256 updatedAt, uint80 answeredInRound)
+  {
+    if (!_isValidRound(_roundId)) {
+      revert NoDataPresent();
+    }
+
+    Round memory round = s_rounds[_roundId];
+
+    return (_roundId, _getStatusAnswer(round.status), uint256(round.startedAt), uint256(round.updatedAt), _roundId);
+  }
+
+  /// @inheritdoc AggregatorV3Interface
+  function latestRoundData()
+    external
+    view
+    override
+    checkAccess
+    returns (uint80 roundId, int256 answer, uint256 startedAt, uint256 updatedAt, uint80 answeredInRound)
+  {
+    FeedState memory feedState = s_feedState;
+
+    return (
+      feedState.latestRoundId,
+      _getStatusAnswer(feedState.latestStatus),
+      feedState.startedAt,
+      feedState.updatedAt,
+      feedState.latestRoundId
+    );
+  }
+}
diff --git a/contracts/src/v0.8/l2ep/dev/scroll/ScrollValidator.sol b/contracts/src/v0.8/l2ep/dev/scroll/ScrollValidator.sol
new file mode 100644
index 00000000000..31a5f0764ef
--- /dev/null
+++ b/contracts/src/v0.8/l2ep/dev/scroll/ScrollValidator.sol
@@ -0,0 +1,77 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.19;
+
+import {AggregatorValidatorInterface} from "../../../shared/interfaces/AggregatorValidatorInterface.sol";
+import {TypeAndVersionInterface} from "../../../interfaces/TypeAndVersionInterface.sol";
+import {ScrollSequencerUptimeFeedInterface} from "../interfaces/ScrollSequencerUptimeFeedInterface.sol";
+
+import {SimpleWriteAccessController} from "../../../shared/access/SimpleWriteAccessController.sol";
+
+import {IL1ScrollMessenger} from "@scroll-tech/contracts/L1/IL1ScrollMessenger.sol";
+
+/// @title ScrollValidator - makes cross chain call to update the Sequencer Uptime Feed on L2
+contract ScrollValidator is TypeAndVersionInterface, AggregatorValidatorInterface, SimpleWriteAccessController {
+  // solhint-disable-next-line chainlink-solidity/prefix-immutable-variables-with-i
+  address public immutable L1_CROSS_DOMAIN_MESSENGER_ADDRESS;
+  // solhint-disable-next-line chainlink-solidity/prefix-immutable-variables-with-i
+  address public immutable L2_UPTIME_FEED_ADDR;
+
+  // solhint-disable-next-line chainlink-solidity/all-caps-constant-storage-variables
+  string public constant override typeAndVersion = "ScrollValidator 1.0.0";
+  int256 private constant ANSWER_SEQ_OFFLINE = 1;
+  uint32 private s_gasLimit;
+
+  /// @notice emitted when gas cost to spend on L2 is updated
+  /// @param gasLimit updated gas cost
+  event GasLimitUpdated(uint32 gasLimit);
+
+  /// @param l1CrossDomainMessengerAddress address the L1CrossDomainMessenger contract address
+  /// @param l2UptimeFeedAddr the address of the ScrollSequencerUptimeFeed contract address
+  /// @param gasLimit the gasLimit to use for sending a message from L1 to L2
+  constructor(address l1CrossDomainMessengerAddress, address l2UptimeFeedAddr, uint32 gasLimit) {
+    // solhint-disable-next-line custom-errors
+    require(l1CrossDomainMessengerAddress != address(0), "Invalid xDomain Messenger address");
+    // solhint-disable-next-line custom-errors
+    require(l2UptimeFeedAddr != address(0), "Invalid ScrollSequencerUptimeFeed contract address");
+    L1_CROSS_DOMAIN_MESSENGER_ADDRESS = l1CrossDomainMessengerAddress;
+    L2_UPTIME_FEED_ADDR = l2UptimeFeedAddr;
+    s_gasLimit = gasLimit;
+  }
+
+  /// @notice sets the new gas cost to spend when sending cross chain message
+  /// @param gasLimit the updated gas cost
+  function setGasLimit(uint32 gasLimit) external onlyOwner {
+    s_gasLimit = gasLimit;
+    emit GasLimitUpdated(gasLimit);
+  }
+
+  /// @notice fetches the gas cost of sending a cross chain message
+  function getGasLimit() external view returns (uint32) {
+    return s_gasLimit;
+  }
+
+  /// @notice validate method sends an xDomain L2 tx to update Uptime Feed contract on L2.
+  /// @dev A message is sent using the L1CrossDomainMessenger. This method is accessed controlled.
+  /// @param currentAnswer new aggregator answer - value of 1 considers the sequencer offline.
+  function validate(
+    uint256 /* previousRoundId */,
+    int256 /* previousAnswer */,
+    uint256 /* currentRoundId */,
+    int256 currentAnswer
+  ) external override checkAccess returns (bool) {
+    // Make the xDomain call
+    IL1ScrollMessenger(L1_CROSS_DOMAIN_MESSENGER_ADDRESS).sendMessage(
+      L2_UPTIME_FEED_ADDR,
+      0,
+      abi.encodeWithSelector(
+        ScrollSequencerUptimeFeedInterface.updateStatus.selector,
+        currentAnswer == ANSWER_SEQ_OFFLINE,
+        uint64(block.timestamp)
+      ),
+      s_gasLimit
+    );
+
+    // return success
+    return true;
+  }
+}
diff --git a/contracts/src/v0.8/l2ep/test/mocks/MockScrollL1CrossDomainMessenger.sol b/contracts/src/v0.8/l2ep/test/mocks/MockScrollL1CrossDomainMessenger.sol
new file mode 100644
index 00000000000..e63847d6557
--- /dev/null
+++ b/contracts/src/v0.8/l2ep/test/mocks/MockScrollL1CrossDomainMessenger.sol
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.9;
+
+import {IL1ScrollMessenger} from "@scroll-tech/contracts/L1/IL1ScrollMessenger.sol";
+
+contract MockScrollL1CrossDomainMessenger is IL1ScrollMessenger {
+  uint256 private s_nonce;
+
+  function xDomainMessageSender() public pure returns (address) {
+    return address(0);
+  }
+
+  function sendMessage(
+    address _target,
+    uint256 _value,
+    bytes calldata _message,
+    uint256 _gasLimit
+  ) external payable override {
+    emit SentMessage(msg.sender, _target, _value, s_nonce, _gasLimit, _message);
+    s_nonce++;
+  }
+
+  function sendMessage(
+    address _target,
+    uint256 _value,
+    bytes calldata _message,
+    uint256 _gasLimit,
+    address
+  ) external payable override {
+    emit SentMessage(msg.sender, _target, _value, s_nonce, _gasLimit, _message);
+    s_nonce++;
+  }
+
+  function relayMessageWithProof(
+    address from,
+    address to,
+    uint256 value,
+    uint256 nonce,
+    bytes memory message,
+    L2MessageProof memory proof
+  ) external override {}
+
+  function replayMessage(
+    address from,
+    address to,
+    uint256 value,
+    uint256 messageNonce,
+    bytes memory message,
+    uint32 newGasLimit,
+    address refundAddress
+  ) external payable override {}
+
+  function dropMessage(
+    address from,
+    address to,
+    uint256 value,
+    uint256 messageNonce,
+    bytes memory message
+  ) external override {}
+}
diff --git a/contracts/src/v0.8/l2ep/test/mocks/MockScrollL2CrossDomainMessenger.sol b/contracts/src/v0.8/l2ep/test/mocks/MockScrollL2CrossDomainMessenger.sol
new file mode 100644
index 00000000000..f63faa35179
--- /dev/null
+++ b/contracts/src/v0.8/l2ep/test/mocks/MockScrollL2CrossDomainMessenger.sol
@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.9;
+
+import {IL2ScrollMessenger} from "@scroll-tech/contracts/L2/IL2ScrollMessenger.sol";
+
+contract MockScrollL2CrossDomainMessenger is IL2ScrollMessenger {
+  uint256 private s_nonce;
+  address private s_sender;
+
+  function xDomainMessageSender() public view returns (address) {
+    return s_sender;
+  }
+
+  function sendMessage(
+    address _target,
+    uint256 _value,
+    bytes calldata _message,
+    uint256 _gasLimit
+  ) external payable override {
+    emit SentMessage(msg.sender, _target, _value, s_nonce, _gasLimit, _message);
+    s_nonce++;
+  }
+
+  function sendMessage(
+    address _target,
+    uint256 _value,
+    bytes calldata _message,
+    uint256 _gasLimit,
+    address
+  ) external payable override {
+    emit SentMessage(msg.sender, _target, _value, s_nonce, _gasLimit, _message);
+    s_nonce++;
+  }
+
+  function relayMessage(
+    address from,
+    address to,
+    uint256 value,
+    uint256 nonce,
+    bytes calldata message
+  ) external override {}
+
+  /// Needed for testing
+  function setSender(address newSender) external {
+    s_sender = newSender;
+  }
+
+  /// Needed for testing
+  receive() external payable {}
+}
diff --git a/contracts/src/v0.8/vendor/MockScrollCrossDomainMessenger.sol b/contracts/src/v0.8/vendor/MockScrollCrossDomainMessenger.sol
new file mode 100644
index 00000000000..bb5390b945d
--- /dev/null
+++ b/contracts/src/v0.8/vendor/MockScrollCrossDomainMessenger.sol
@@ -0,0 +1,101 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.16;
+
+import "./openzeppelin-solidity/v4.8.3/contracts/utils/Address.sol";
+
+/// sourced from: https://github.com/scroll-tech/scroll/blob/develop/contracts/src/libraries/IScrollMessenger.sol
+interface IScrollMessenger {
+  /// **********
+  /// * Events *
+  /// **********
+
+  /// @notice Emitted when a cross domain message is sent.
+  /// @param sender The address of the sender who initiates the message.
+  /// @param target The address of target contract to call.
+  /// @param value The amount of value passed to the target contract.
+  /// @param messageNonce The nonce of the message.
+  /// @param gasLimit The optional gas limit passed to L1 or L2.
+  /// @param message The calldata passed to the target contract.
+  event SentMessage(
+    address indexed sender,
+    address indexed target,
+    uint256 value,
+    uint256 messageNonce,
+    uint256 gasLimit,
+    bytes message
+  );
+
+  /// @notice Emitted when a cross domain message is relayed successfully.
+  /// @param messageHash The hash of the message.
+  event RelayedMessage(bytes32 indexed messageHash);
+
+  /// @notice Emitted when a cross domain message is failed to relay.
+  /// @param messageHash The hash of the message.
+  event FailedRelayedMessage(bytes32 indexed messageHash);
+
+  ///  *************************
+  ///  * Public View Functions *
+  ///  *************************
+
+  /// @notice Return the sender of a cross domain message.
+  function xDomainMessageSender() external view returns (address);
+
+  /// *****************************
+  /// * Public Mutating Functions *
+  /// *****************************
+
+  /// @notice Send cross chain message from L1 to L2 or L2 to L1.
+  /// @param target The address of account who receive the message.
+  /// @param value The amount of ether passed when call target contract.
+  /// @param message The content of the message.
+  /// @param gasLimit Gas limit required to complete the message relay on corresponding chain.
+  function sendMessage(address target, uint256 value, bytes calldata message, uint256 gasLimit) external payable;
+
+  /// @notice Send cross chain message from L1 to L2 or L2 to L1.
+  /// @param target The address of account who receive the message.
+  /// @param value The amount of ether passed when call target contract.
+  /// @param message The content of the message.
+  /// @param gasLimit Gas limit required to complete the message relay on corresponding chain.
+  /// @param refundAddress The address of account who will receive the refunded fee.
+  function sendMessage(
+    address target,
+    uint256 value,
+    bytes calldata message,
+    uint256 gasLimit,
+    address refundAddress
+  ) external payable;
+}
+
+contract MockScrollCrossDomainMessenger is IScrollMessenger {
+  address internal mockMessageSender;
+
+  constructor(address sender) {
+    mockMessageSender = sender;
+  }
+
+  function xDomainMessageSender() external view override returns (address) {
+    return mockMessageSender;
+  }
+
+  function _setMockMessageSender(address sender) external {
+    mockMessageSender = sender;
+  }
+
+  /// *****************************
+  /// * Public Mutating Functions *
+  /// *****************************
+
+  /// @notice Send cross chain message from L1 to L2 or L2 to L1.
+  /// @param _target The address of account who receive the message.
+  /// @param _message The content of the message.
+  function sendMessage(address _target, uint256, bytes calldata _message, uint256) external payable override {
+    Address.functionCall(_target, _message, "sendMessage reverted");
+  }
+
+  /// @notice Send cross chain message from L1 to L2 or L2 to L1.
+  /// @param _target The address of account who receive the message.
+  /// @param _message The content of the message.
+  function sendMessage(address _target, uint256, bytes calldata _message, uint256, address) external payable override {
+    Address.functionCall(_target, _message, "sendMessage reverted");
+  }
+}
diff --git a/contracts/test/v0.8/dev/ScrollCrossDomainForwarder.test.ts b/contracts/test/v0.8/dev/ScrollCrossDomainForwarder.test.ts
new file mode 100644
index 00000000000..923d41326ae
--- /dev/null
+++ b/contracts/test/v0.8/dev/ScrollCrossDomainForwarder.test.ts
@@ -0,0 +1,259 @@
+import { ethers } from 'hardhat'
+import { assert, expect } from 'chai'
+import { Contract, ContractFactory } from 'ethers'
+import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers'
+import { publicAbi } from '../../test-helpers/helpers'
+
+let owner: SignerWithAddress
+let stranger: SignerWithAddress
+let l1OwnerAddress: string
+let newL1OwnerAddress: string
+let forwarderFactory: ContractFactory
+let greeterFactory: ContractFactory
+let crossDomainMessengerFactory: ContractFactory
+let crossDomainMessenger: Contract
+let forwarder: Contract
+let greeter: Contract
+
+before(async () => {
+  const accounts = await ethers.getSigners()
+  owner = accounts[0]
+  stranger = accounts[1]
+
+  // forwarder config
+  l1OwnerAddress = owner.address
+  newL1OwnerAddress = stranger.address
+
+  // Contract factories
+  forwarderFactory = await ethers.getContractFactory(
+    'src/v0.8/l2ep/dev/scroll/ScrollCrossDomainForwarder.sol:ScrollCrossDomainForwarder',
+    owner,
+  )
+  greeterFactory = await ethers.getContractFactory(
+    'src/v0.8/tests/Greeter.sol:Greeter',
+    owner,
+  )
+  crossDomainMessengerFactory = await ethers.getContractFactory(
+    'src/v0.8/vendor/MockScrollCrossDomainMessenger.sol:MockScrollCrossDomainMessenger',
+  )
+})
+
+describe('ScrollCrossDomainForwarder', () => {
+  beforeEach(async () => {
+    crossDomainMessenger =
+      await crossDomainMessengerFactory.deploy(l1OwnerAddress)
+    forwarder = await forwarderFactory.deploy(
+      crossDomainMessenger.address,
+      l1OwnerAddress,
+    )
+    greeter = await greeterFactory.deploy(forwarder.address)
+  })
+
+  it('has a limited public interface [ @skip-coverage ]', async () => {
+    publicAbi(forwarder, [
+      'typeAndVersion',
+      'crossDomainMessenger',
+      'forward',
+      'l1Owner',
+      'transferL1Ownership',
+      'acceptL1Ownership',
+      // ConfirmedOwner methods:
+      'owner',
+      'transferOwnership',
+      'acceptOwnership',
+    ])
+  })
+
+  describe('#constructor', () => {
+    it('should set the owner correctly', async () => {
+      const response = await forwarder.owner()
+      assert.equal(response, owner.address)
+    })
+
+    it('should set the l1Owner correctly', async () => {
+      const response = await forwarder.l1Owner()
+      assert.equal(response, l1OwnerAddress)
+    })
+
+    it('should set the crossdomain messenger correctly', async () => {
+      const response = await forwarder.crossDomainMessenger()
+      assert.equal(response, crossDomainMessenger.address)
+    })
+
+    it('should set the typeAndVersion correctly', async () => {
+      const response = await forwarder.typeAndVersion()
+      assert.equal(response, 'ScrollCrossDomainForwarder 1.0.0')
+    })
+  })
+
+  describe('#forward', () => {
+    it('should not be callable by unknown address', async () => {
+      await expect(
+        forwarder.connect(stranger).forward(greeter.address, '0x'),
+      ).to.be.revertedWith('Sender is not the L2 messenger')
+    })
+
+    it('should be callable by crossdomain messenger address / L1 owner', async () => {
+      const newGreeting = 'hello'
+      const setGreetingData = greeterFactory.interface.encodeFunctionData(
+        'setGreeting',
+        [newGreeting],
+      )
+      const forwardData = forwarderFactory.interface.encodeFunctionData(
+        'forward',
+        [greeter.address, setGreetingData],
+      )
+      await crossDomainMessenger // Simulate cross-chain message
+        .connect(stranger)
+        ['sendMessage(address,uint256,bytes,uint256)'](
+          forwarder.address, // target
+          0, // value
+          forwardData, // message
+          0, // gasLimit
+        )
+
+      const updatedGreeting = await greeter.greeting()
+      assert.equal(updatedGreeting, newGreeting)
+    })
+
+    it('should revert when contract call reverts', async () => {
+      const setGreetingData = greeterFactory.interface.encodeFunctionData(
+        'setGreeting',
+        [''],
+      )
+      const forwardData = forwarderFactory.interface.encodeFunctionData(
+        'forward',
+        [greeter.address, setGreetingData],
+      )
+      await expect(
+        crossDomainMessenger // Simulate cross-chain message
+          .connect(stranger)
+          ['sendMessage(address,uint256,bytes,uint256)'](
+            forwarder.address, // target
+            0, // value
+            forwardData, // message
+            0, // gasLimit
+          ),
+      ).to.be.revertedWith('Invalid greeting length')
+    })
+  })
+
+  describe('#transferL1Ownership', () => {
+    it('should not be callable by non-owners', async () => {
+      await expect(
+        forwarder.connect(stranger).transferL1Ownership(stranger.address),
+      ).to.be.revertedWith('Sender is not the L2 messenger')
+    })
+
+    it('should not be callable by L2 owner', async () => {
+      const forwarderOwner = await forwarder.owner()
+      assert.equal(forwarderOwner, owner.address)
+
+      await expect(
+        forwarder.connect(owner).transferL1Ownership(stranger.address),
+      ).to.be.revertedWith('Sender is not the L2 messenger')
+    })
+
+    it('should be callable by current L1 owner', async () => {
+      const currentL1Owner = await forwarder.l1Owner()
+      const forwardData = forwarderFactory.interface.encodeFunctionData(
+        'transferL1Ownership',
+        [newL1OwnerAddress],
+      )
+
+      await expect(
+        crossDomainMessenger // Simulate cross-chain message
+          .connect(stranger)
+          ['sendMessage(address,uint256,bytes,uint256)'](
+            forwarder.address, // target
+            0, // value
+            forwardData, // message
+            0, // gasLimit
+          ),
+      )
+        .to.emit(forwarder, 'L1OwnershipTransferRequested')
+        .withArgs(currentL1Owner, newL1OwnerAddress)
+    })
+
+    it('should be callable by current L1 owner to zero address', async () => {
+      const currentL1Owner = await forwarder.l1Owner()
+      const forwardData = forwarderFactory.interface.encodeFunctionData(
+        'transferL1Ownership',
+        [ethers.constants.AddressZero],
+      )
+
+      await expect(
+        crossDomainMessenger // Simulate cross-chain message
+          .connect(stranger)
+          ['sendMessage(address,uint256,bytes,uint256)'](
+            forwarder.address, // target
+            0, // value
+            forwardData, // message
+            0, // gasLimit
+          ),
+      )
+        .to.emit(forwarder, 'L1OwnershipTransferRequested')
+        .withArgs(currentL1Owner, ethers.constants.AddressZero)
+    })
+  })
+
+  describe('#acceptL1Ownership', () => {
+    it('should not be callable by non pending-owners', async () => {
+      const forwardData = forwarderFactory.interface.encodeFunctionData(
+        'acceptL1Ownership',
+        [],
+      )
+      await expect(
+        crossDomainMessenger // Simulate cross-chain message
+          .connect(stranger)
+          ['sendMessage(address,uint256,bytes,uint256)'](
+            forwarder.address, // target
+            0, // value
+            forwardData, // message
+            0, // gasLimit
+          ),
+      ).to.be.revertedWith('Must be proposed L1 owner')
+    })
+
+    it('should be callable by pending L1 owner', async () => {
+      const currentL1Owner = await forwarder.l1Owner()
+
+      // Transfer ownership
+      const forwardTransferData = forwarderFactory.interface.encodeFunctionData(
+        'transferL1Ownership',
+        [newL1OwnerAddress],
+      )
+      await crossDomainMessenger // Simulate cross-chain message
+        .connect(stranger)
+        ['sendMessage(address,uint256,bytes,uint256)'](
+          forwarder.address, // target
+          0, // value
+          forwardTransferData, // message
+          0, // gasLimit
+        )
+
+      const forwardAcceptData = forwarderFactory.interface.encodeFunctionData(
+        'acceptL1Ownership',
+        [],
+      )
+      // Simulate cross-chain message from another sender
+      await crossDomainMessenger._setMockMessageSender(newL1OwnerAddress)
+
+      await expect(
+        crossDomainMessenger // Simulate cross-chain message
+          .connect(stranger)
+          ['sendMessage(address,uint256,bytes,uint256)'](
+            forwarder.address, // target
+            0, // value
+            forwardAcceptData, // message
+            0, // gasLimit
+          ),
+      )
+        .to.emit(forwarder, 'L1OwnershipTransferred')
+        .withArgs(currentL1Owner, newL1OwnerAddress)
+
+      const updatedL1Owner = await forwarder.l1Owner()
+      assert.equal(updatedL1Owner, newL1OwnerAddress)
+    })
+  })
+})
diff --git a/contracts/test/v0.8/dev/ScrollCrossDomainGovernor.test.ts b/contracts/test/v0.8/dev/ScrollCrossDomainGovernor.test.ts
new file mode 100644
index 00000000000..adb78c26248
--- /dev/null
+++ b/contracts/test/v0.8/dev/ScrollCrossDomainGovernor.test.ts
@@ -0,0 +1,459 @@
+import { ethers } from 'hardhat'
+import { assert, expect } from 'chai'
+import etherslib, { Contract, ContractFactory } from 'ethers'
+import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers'
+import { publicAbi, stripHexPrefix } from '../../test-helpers/helpers'
+
+let owner: SignerWithAddress
+let stranger: SignerWithAddress
+let l1OwnerAddress: string
+let newL1OwnerAddress: string
+let governorFactory: ContractFactory
+let greeterFactory: ContractFactory
+let multisendFactory: ContractFactory
+let crossDomainMessengerFactory: ContractFactory
+let crossDomainMessenger: Contract
+let governor: Contract
+let greeter: Contract
+let multisend: Contract
+
+before(async () => {
+  const accounts = await ethers.getSigners()
+  owner = accounts[0]
+  stranger = accounts[1]
+
+  // governor config
+  l1OwnerAddress = owner.address
+  newL1OwnerAddress = stranger.address
+
+  // Contract factories
+  governorFactory = await ethers.getContractFactory(
+    'src/v0.8/l2ep/dev/scroll/ScrollCrossDomainGovernor.sol:ScrollCrossDomainGovernor',
+    owner,
+  )
+  greeterFactory = await ethers.getContractFactory(
+    'src/v0.8/tests/Greeter.sol:Greeter',
+    owner,
+  )
+  multisendFactory = await ethers.getContractFactory(
+    'src/v0.8/vendor/MultiSend.sol:MultiSend',
+    owner,
+  )
+  crossDomainMessengerFactory = await ethers.getContractFactory(
+    'src/v0.8/vendor/MockScrollCrossDomainMessenger.sol:MockScrollCrossDomainMessenger',
+  )
+})
+
+describe('ScrollCrossDomainGovernor', () => {
+  beforeEach(async () => {
+    crossDomainMessenger =
+      await crossDomainMessengerFactory.deploy(l1OwnerAddress)
+    governor = await governorFactory.deploy(
+      crossDomainMessenger.address,
+      l1OwnerAddress,
+    )
+    greeter = await greeterFactory.deploy(governor.address)
+    multisend = await multisendFactory.deploy()
+  })
+
+  it('has a limited public interface [ @skip-coverage ]', async () => {
+    publicAbi(governor, [
+      'typeAndVersion',
+      'crossDomainMessenger',
+      'forward',
+      'forwardDelegate',
+      'l1Owner',
+      'transferL1Ownership',
+      'acceptL1Ownership',
+      // ConfirmedOwner methods:
+      'owner',
+      'transferOwnership',
+      'acceptOwnership',
+    ])
+  })
+
+  describe('#constructor', () => {
+    it('should set the owner correctly', async () => {
+      const response = await governor.owner()
+      assert.equal(response, owner.address)
+    })
+
+    it('should set the l1Owner correctly', async () => {
+      const response = await governor.l1Owner()
+      assert.equal(response, l1OwnerAddress)
+    })
+
+    it('should set the crossdomain messenger correctly', async () => {
+      const response = await governor.crossDomainMessenger()
+      assert.equal(response, crossDomainMessenger.address)
+    })
+
+    it('should set the typeAndVersion correctly', async () => {
+      const response = await governor.typeAndVersion()
+      assert.equal(response, 'ScrollCrossDomainGovernor 1.0.0')
+    })
+  })
+
+  describe('#forward', () => {
+    it('should not be callable by unknown address', async () => {
+      await expect(
+        governor.connect(stranger).forward(greeter.address, '0x'),
+      ).to.be.revertedWith('Sender is not the L2 messenger')
+    })
+
+    it('should be callable by crossdomain messenger address / L1 owner', async () => {
+      const newGreeting = 'hello'
+      const setGreetingData = greeterFactory.interface.encodeFunctionData(
+        'setGreeting',
+        [newGreeting],
+      )
+      const forwardData = governorFactory.interface.encodeFunctionData(
+        'forward',
+        [greeter.address, setGreetingData],
+      )
+      await crossDomainMessenger // Simulate cross-chain message
+        .connect(stranger)
+        ['sendMessage(address,uint256,bytes,uint256)'](
+          governor.address, // target
+          0, // value
+          forwardData, // message
+          0, // gasLimit
+        )
+
+      const updatedGreeting = await greeter.greeting()
+      assert.equal(updatedGreeting, newGreeting)
+    })
+
+    it('should be callable by L2 owner', async () => {
+      const newGreeting = 'hello'
+      const setGreetingData = greeterFactory.interface.encodeFunctionData(
+        'setGreeting',
+        [newGreeting],
+      )
+      await governor.connect(owner).forward(greeter.address, setGreetingData)
+
+      const updatedGreeting = await greeter.greeting()
+      assert.equal(updatedGreeting, newGreeting)
+    })
+
+    it('should revert when contract call reverts', async () => {
+      const setGreetingData = greeterFactory.interface.encodeFunctionData(
+        'setGreeting',
+        [''],
+      )
+      const forwardData = governorFactory.interface.encodeFunctionData(
+        'forward',
+        [greeter.address, setGreetingData],
+      )
+      await expect(
+        crossDomainMessenger // Simulate cross-chain message
+          .connect(stranger)
+          ['sendMessage(address,uint256,bytes,uint256)'](
+            governor.address, // target
+            0, // value
+            forwardData, // message
+            0, // gasLimit
+          ),
+      ).to.be.revertedWith('Invalid greeting length')
+    })
+  })
+
+  describe('#forwardDelegate', () => {
+    it('should not be callable by unknown address', async () => {
+      await expect(
+        governor.connect(stranger).forwardDelegate(multisend.address, '0x'),
+      ).to.be.revertedWith('Sender is not the L2 messenger')
+    })
+
+    it('should be callable by crossdomain messenger address / L1 owner', async () => {
+      const calls = [
+        {
+          to: greeter.address,
+          data: greeterFactory.interface.encodeFunctionData('setGreeting', [
+            'foo',
+          ]),
+          value: 0,
+        },
+        {
+          to: greeter.address,
+          data: greeterFactory.interface.encodeFunctionData('setGreeting', [
+            'bar',
+          ]),
+          value: 0,
+        },
+      ]
+      const multisendData = encodeMultisendData(multisend.interface, calls)
+      const forwardData = governorFactory.interface.encodeFunctionData(
+        'forwardDelegate',
+        [multisend.address, multisendData],
+      )
+
+      await crossDomainMessenger // Simulate cross-chain message
+        .connect(stranger)
+        ['sendMessage(address,uint256,bytes,uint256)'](
+          governor.address, // target
+          0, // value
+          forwardData, // message
+          0, // gasLimit
+        )
+
+      const updatedGreeting = await greeter.greeting()
+      assert.equal(updatedGreeting, 'bar')
+    })
+
+    it('should be callable by L2 owner', async () => {
+      const calls = [
+        {
+          to: greeter.address,
+          data: greeterFactory.interface.encodeFunctionData('setGreeting', [
+            'foo',
+          ]),
+          value: 0,
+        },
+        {
+          to: greeter.address,
+          data: greeterFactory.interface.encodeFunctionData('setGreeting', [
+            'bar',
+          ]),
+          value: 0,
+        },
+      ]
+      const multisendData = encodeMultisendData(multisend.interface, calls)
+      await governor
+        .connect(owner)
+        .forwardDelegate(multisend.address, multisendData)
+
+      const updatedGreeting = await greeter.greeting()
+      assert.equal(updatedGreeting, 'bar')
+    })
+
+    it('should revert batch when one call fails', async () => {
+      const calls = [
+        {
+          to: greeter.address,
+          data: greeterFactory.interface.encodeFunctionData('setGreeting', [
+            'foo',
+          ]),
+          value: 0,
+        },
+        {
+          to: greeter.address,
+          data: greeterFactory.interface.encodeFunctionData('setGreeting', [
+            '', // should revert
+          ]),
+          value: 0,
+        },
+      ]
+      const multisendData = encodeMultisendData(multisend.interface, calls)
+      const forwardData = governorFactory.interface.encodeFunctionData(
+        'forwardDelegate',
+        [multisend.address, multisendData],
+      )
+
+      await expect(
+        crossDomainMessenger // Simulate cross-chain message
+          .connect(stranger)
+          ['sendMessage(address,uint256,bytes,uint256)'](
+            governor.address, // target
+            0, // value
+            forwardData, // message
+            0, // gasLimit
+          ),
+      ).to.be.revertedWith('Governor delegatecall reverted')
+
+      const greeting = await greeter.greeting()
+      assert.equal(greeting, '') // Unchanged
+    })
+
+    it('should bubble up revert when contract call reverts', async () => {
+      const triggerRevertData =
+        greeterFactory.interface.encodeFunctionData('triggerRevert')
+      const forwardData = governorFactory.interface.encodeFunctionData(
+        'forwardDelegate',
+        [greeter.address, triggerRevertData],
+      )
+
+      await expect(
+        crossDomainMessenger // Simulate cross-chain message
+          .connect(stranger)
+          ['sendMessage(address,uint256,bytes,uint256)'](
+            governor.address, // target
+            0, // value
+            forwardData, // message
+            0, // gasLimit
+          ),
+      ).to.be.revertedWith('Greeter: revert triggered')
+    })
+  })
+
+  describe('#transferL1Ownership', () => {
+    it('should not be callable by non-owners', async () => {
+      await expect(
+        governor.connect(stranger).transferL1Ownership(stranger.address),
+      ).to.be.revertedWith('Sender is not the L2 messenger')
+    })
+
+    it('should not be callable by L2 owner', async () => {
+      const governorOwner = await governor.owner()
+      assert.equal(governorOwner, owner.address)
+
+      await expect(
+        governor.connect(owner).transferL1Ownership(stranger.address),
+      ).to.be.revertedWith('Sender is not the L2 messenger')
+    })
+
+    it('should be callable by current L1 owner', async () => {
+      const currentL1Owner = await governor.l1Owner()
+      const forwardData = governorFactory.interface.encodeFunctionData(
+        'transferL1Ownership',
+        [newL1OwnerAddress],
+      )
+
+      await expect(
+        crossDomainMessenger // Simulate cross-chain message
+          .connect(stranger)
+          ['sendMessage(address,uint256,bytes,uint256)'](
+            governor.address, // target
+            0, // value
+            forwardData, // message
+            0, // gasLimit
+          ),
+      )
+        .to.emit(governor, 'L1OwnershipTransferRequested')
+        .withArgs(currentL1Owner, newL1OwnerAddress)
+    })
+
+    it('should be callable by current L1 owner to zero address', async () => {
+      const currentL1Owner = await governor.l1Owner()
+      const forwardData = governorFactory.interface.encodeFunctionData(
+        'transferL1Ownership',
+        [ethers.constants.AddressZero],
+      )
+
+      await expect(
+        crossDomainMessenger // Simulate cross-chain message
+          .connect(stranger)
+          ['sendMessage(address,uint256,bytes,uint256)'](
+            governor.address, // target
+            0, // value
+            forwardData, // message
+            0, // gasLimit
+          ),
+      )
+        .to.emit(governor, 'L1OwnershipTransferRequested')
+        .withArgs(currentL1Owner, ethers.constants.AddressZero)
+    })
+  })
+
+  describe('#acceptL1Ownership', () => {
+    it('should not be callable by non pending-owners', async () => {
+      const forwardData = governorFactory.interface.encodeFunctionData(
+        'acceptL1Ownership',
+        [],
+      )
+      await expect(
+        crossDomainMessenger // Simulate cross-chain message
+          .connect(stranger)
+          ['sendMessage(address,uint256,bytes,uint256)'](
+            governor.address, // target
+            0, // value
+            forwardData, // message
+            0, // gasLimit
+          ),
+      ).to.be.revertedWith('Must be proposed L1 owner')
+    })
+
+    it('should be callable by pending L1 owner', async () => {
+      const currentL1Owner = await governor.l1Owner()
+
+      // Transfer ownership
+      const forwardTransferData = governorFactory.interface.encodeFunctionData(
+        'transferL1Ownership',
+        [newL1OwnerAddress],
+      )
+      await crossDomainMessenger // Simulate cross-chain message
+        .connect(stranger)
+        ['sendMessage(address,uint256,bytes,uint256)'](
+          governor.address, // target
+          0, // value
+          forwardTransferData, // message
+          0, // gasLimit
+        )
+
+      const forwardAcceptData = governorFactory.interface.encodeFunctionData(
+        'acceptL1Ownership',
+        [],
+      )
+      // Simulate cross-chain message from another sender
+      await crossDomainMessenger._setMockMessageSender(newL1OwnerAddress)
+
+      await expect(
+        crossDomainMessenger // Simulate cross-chain message
+          .connect(stranger)
+          ['sendMessage(address,uint256,bytes,uint256)'](
+            governor.address, // target
+            0, // value
+            forwardAcceptData, // message
+            0, // gasLimit
+          ),
+      )
+        .to.emit(governor, 'L1OwnershipTransferred')
+        .withArgs(currentL1Owner, newL1OwnerAddress)
+
+      const updatedL1Owner = await governor.l1Owner()
+      assert.equal(updatedL1Owner, newL1OwnerAddress)
+    })
+  })
+})
+
+// Multisend contract helpers
+
+/**
+ * Encodes an underlying transaction for the Multisend contract
+ *
+ * @param operation 0 for CALL, 1 for DELEGATECALL
+ * @param to tx target address
+ * @param value tx value
+ * @param data tx data
+ */
+export function encodeTxData(
+  operation: number,
+  to: string,
+  value: number,
+  data: string,
+): string {
+  const dataBuffer = Buffer.from(stripHexPrefix(data), 'hex')
+  const types = ['uint8', 'address', 'uint256', 'uint256', 'bytes']
+  const values = [operation, to, value, dataBuffer.length, dataBuffer]
+  const encoded = ethers.utils.solidityPack(types, values)
+  return stripHexPrefix(encoded)
+}
+
+/**
+ * Encodes a Multisend call
+ *
+ * @param MultisendInterface Ethers Interface object of the Multisend contract
+ * @param transactions one or more transactions to include in the Multisend call
+ * @param to tx target address
+ * @param value tx value
+ * @param data tx data
+ */
+export function encodeMultisendData(
+  MultisendInterface: etherslib.utils.Interface,
+  transactions: { to: string; value: number; data: string }[],
+): string {
+  let nestedTransactionData = '0x'
+  for (const transaction of transactions) {
+    nestedTransactionData += encodeTxData(
+      0,
+      transaction.to,
+      transaction.value,
+      transaction.data,
+    )
+  }
+  const encodedMultisendFnData = MultisendInterface.encodeFunctionData(
+    'multiSend',
+    [nestedTransactionData],
+  )
+  return encodedMultisendFnData
+}
diff --git a/contracts/test/v0.8/dev/ScrollSequencerUptimeFeed.test.ts b/contracts/test/v0.8/dev/ScrollSequencerUptimeFeed.test.ts
new file mode 100644
index 00000000000..b294032e73d
--- /dev/null
+++ b/contracts/test/v0.8/dev/ScrollSequencerUptimeFeed.test.ts
@@ -0,0 +1,426 @@
+import { ethers, network } from 'hardhat'
+import { BigNumber, Contract } from 'ethers'
+import { expect } from 'chai'
+import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers'
+
+describe('ScrollSequencerUptimeFeed', () => {
+  let l2CrossDomainMessenger: Contract
+  let scrollUptimeFeed: Contract
+  let uptimeFeedConsumer: Contract
+  let deployer: SignerWithAddress
+  let l1Owner: SignerWithAddress
+  let l2Messenger: SignerWithAddress
+  let dummy: SignerWithAddress
+  const gasUsedDeviation = 100
+  const initialStatus = 0
+
+  before(async () => {
+    const accounts = await ethers.getSigners()
+    deployer = accounts[0]
+    l1Owner = accounts[1]
+    dummy = accounts[3]
+
+    const l2CrossDomainMessengerFactory = await ethers.getContractFactory(
+      'src/v0.8/l2ep/test/mocks/MockScrollL2CrossDomainMessenger.sol:MockScrollL2CrossDomainMessenger',
+      deployer,
+    )
+
+    l2CrossDomainMessenger = await l2CrossDomainMessengerFactory.deploy()
+
+    // Pretend we're on L2
+    await network.provider.request({
+      method: 'hardhat_impersonateAccount',
+      params: [l2CrossDomainMessenger.address],
+    })
+    l2Messenger = await ethers.getSigner(l2CrossDomainMessenger.address)
+    // Credit the L2 messenger with some ETH
+    await dummy.sendTransaction({
+      to: l2Messenger.address,
+      value: ethers.utils.parseEther('10'),
+    })
+  })
+
+  beforeEach(async () => {
+    const scrollSequencerStatusRecorderFactory =
+      await ethers.getContractFactory(
+        'src/v0.8/l2ep/dev/scroll/ScrollSequencerUptimeFeed.sol:ScrollSequencerUptimeFeed',
+        deployer,
+      )
+    scrollUptimeFeed = await scrollSequencerStatusRecorderFactory.deploy(
+      l1Owner.address,
+      l2CrossDomainMessenger.address,
+      initialStatus,
+    )
+
+    // Set mock sender in mock L2 messenger contract
+    await l2CrossDomainMessenger.setSender(l1Owner.address)
+
+    // Mock consumer
+    const statusFeedConsumerFactory = await ethers.getContractFactory(
+      'src/v0.8/tests/FeedConsumer.sol:FeedConsumer',
+      deployer,
+    )
+    uptimeFeedConsumer = await statusFeedConsumerFactory.deploy(
+      scrollUptimeFeed.address,
+    )
+  })
+
+  describe('constructor', () => {
+    it('should have been deployed with the correct initial state', async () => {
+      const l1Sender = await scrollUptimeFeed.l1Sender()
+      expect(l1Sender).to.equal(l1Owner.address)
+      const { roundId, answer } = await scrollUptimeFeed.latestRoundData()
+      expect(roundId).to.equal(1)
+      expect(answer).to.equal(initialStatus)
+    })
+  })
+
+  describe('#updateStatus', () => {
+    it('should revert if called by an address that is not the L2 Cross Domain Messenger', async () => {
+      const timestamp = await scrollUptimeFeed.latestTimestamp()
+      expect(
+        scrollUptimeFeed.connect(dummy).updateStatus(true, timestamp),
+      ).to.be.revertedWith('InvalidSender')
+    })
+
+    it('should revert if called by an address that is not the L2 Cross Domain Messenger and is not the L1 sender', async () => {
+      const timestamp = await scrollUptimeFeed.latestTimestamp()
+      await l2CrossDomainMessenger.setSender(dummy.address)
+      expect(
+        scrollUptimeFeed.connect(dummy).updateStatus(true, timestamp),
+      ).to.be.revertedWith('InvalidSender')
+    })
+
+    it(`should update status when status has not changed and incoming timestamp is the same as latest`, async () => {
+      const timestamp = await scrollUptimeFeed.latestTimestamp()
+      let tx = await scrollUptimeFeed
+        .connect(l2Messenger)
+        .updateStatus(true, timestamp)
+      await expect(tx)
+        .to.emit(scrollUptimeFeed, 'AnswerUpdated')
+        .withArgs(1, 2 /** roundId */, timestamp)
+      expect(await scrollUptimeFeed.latestAnswer()).to.equal(1)
+
+      const latestRoundBeforeUpdate = await scrollUptimeFeed.latestRoundData()
+
+      tx = await scrollUptimeFeed
+        .connect(l2Messenger)
+        .updateStatus(true, timestamp.add(200))
+
+      // Submit another status update with the same status
+      const latestBlock = await ethers.provider.getBlock('latest')
+
+      await expect(tx)
+        .to.emit(scrollUptimeFeed, 'RoundUpdated')
+        .withArgs(1, latestBlock.timestamp)
+      expect(await scrollUptimeFeed.latestAnswer()).to.equal(1)
+      expect(await scrollUptimeFeed.latestTimestamp()).to.equal(timestamp)
+
+      // Verify that latest round has been properly updated
+      const latestRoundDataAfterUpdate =
+        await scrollUptimeFeed.latestRoundData()
+      expect(latestRoundDataAfterUpdate.roundId).to.equal(
+        latestRoundBeforeUpdate.roundId,
+      )
+      expect(latestRoundDataAfterUpdate.answer).to.equal(
+        latestRoundBeforeUpdate.answer,
+      )
+      expect(latestRoundDataAfterUpdate.startedAt).to.equal(
+        latestRoundBeforeUpdate.startedAt,
+      )
+      expect(latestRoundDataAfterUpdate.answeredInRound).to.equal(
+        latestRoundBeforeUpdate.answeredInRound,
+      )
+      expect(latestRoundDataAfterUpdate.updatedAt).to.equal(
+        latestBlock.timestamp,
+      )
+    })
+
+    it(`should update status when status has changed and incoming timestamp is newer than the latest`, async () => {
+      let timestamp = await scrollUptimeFeed.latestTimestamp()
+      let tx = await scrollUptimeFeed
+        .connect(l2Messenger)
+        .updateStatus(true, timestamp)
+      await expect(tx)
+        .to.emit(scrollUptimeFeed, 'AnswerUpdated')
+        .withArgs(1, 2 /** roundId */, timestamp)
+      expect(await scrollUptimeFeed.latestAnswer()).to.equal(1)
+
+      // Submit another status update, different status, newer timestamp should update
+      timestamp = timestamp.add(2000)
+      tx = await scrollUptimeFeed
+        .connect(l2Messenger)
+        .updateStatus(false, timestamp)
+      await expect(tx)
+        .to.emit(scrollUptimeFeed, 'AnswerUpdated')
+        .withArgs(0, 3 /** roundId */, timestamp)
+      expect(await scrollUptimeFeed.latestAnswer()).to.equal(0)
+      expect(await scrollUptimeFeed.latestTimestamp()).to.equal(timestamp)
+    })
+
+    it(`should update status when status has changed and incoming timestamp is the same as latest`, async () => {
+      const timestamp = await scrollUptimeFeed.latestTimestamp()
+      let tx = await scrollUptimeFeed
+        .connect(l2Messenger)
+        .updateStatus(true, timestamp)
+      await expect(tx)
+        .to.emit(scrollUptimeFeed, 'AnswerUpdated')
+        .withArgs(1, 2 /** roundId */, timestamp)
+      expect(await scrollUptimeFeed.latestAnswer()).to.equal(1)
+
+      // Submit another status update, different status, same timestamp should update
+      tx = await scrollUptimeFeed
+        .connect(l2Messenger)
+        .updateStatus(false, timestamp)
+      await expect(tx)
+        .to.emit(scrollUptimeFeed, 'AnswerUpdated')
+        .withArgs(0, 3 /** roundId */, timestamp)
+      expect(await scrollUptimeFeed.latestAnswer()).to.equal(0)
+      expect(await scrollUptimeFeed.latestTimestamp()).to.equal(timestamp)
+    })
+
+    it('should ignore out-of-order updates', async () => {
+      const timestamp = (await scrollUptimeFeed.latestTimestamp()).add(10_000)
+      // Update status
+      let tx = await scrollUptimeFeed
+        .connect(l2Messenger)
+        .updateStatus(true, timestamp)
+      await expect(tx)
+        .to.emit(scrollUptimeFeed, 'AnswerUpdated')
+        .withArgs(1, 2 /** roundId */, timestamp)
+      expect(await scrollUptimeFeed.latestAnswer()).to.equal(1)
+
+      // Update with different status, but stale timestamp, should be ignored
+      const staleTimestamp = timestamp.sub(1000)
+      tx = await scrollUptimeFeed
+        .connect(l2Messenger)
+        .updateStatus(false, staleTimestamp)
+      await expect(tx)
+        .to.not.emit(scrollUptimeFeed, 'AnswerUpdated')
+        .withArgs(1, 2 /** roundId */, timestamp)
+      await expect(tx).to.emit(scrollUptimeFeed, 'UpdateIgnored')
+    })
+  })
+
+  describe('AggregatorV3Interface', () => {
+    it('should return valid answer from getRoundData and latestRoundData', async () => {
+      let [roundId, answer, startedAt, updatedAt, answeredInRound] =
+        await scrollUptimeFeed.latestRoundData()
+      expect(roundId).to.equal(1)
+      expect(answer).to.equal(0)
+      expect(answeredInRound).to.equal(roundId)
+      expect(startedAt).to.equal(updatedAt)
+
+      // Submit status update with different status and newer timestamp, should update
+      const timestamp = (startedAt as BigNumber).add(1000)
+      await scrollUptimeFeed.connect(l2Messenger).updateStatus(true, timestamp)
+      ;[roundId, answer, startedAt, updatedAt, answeredInRound] =
+        await scrollUptimeFeed.getRoundData(2)
+      expect(roundId).to.equal(2)
+      expect(answer).to.equal(1)
+      expect(answeredInRound).to.equal(roundId)
+      expect(startedAt).to.equal(timestamp)
+      expect(updatedAt.lte(startedAt)).to.be.true
+
+      // Check that last round is still returning the correct data
+      ;[roundId, answer, startedAt, updatedAt, answeredInRound] =
+        await scrollUptimeFeed.getRoundData(1)
+      expect(roundId).to.equal(1)
+      expect(answer).to.equal(0)
+      expect(answeredInRound).to.equal(roundId)
+      expect(startedAt).to.equal(updatedAt)
+
+      // Assert latestRoundData corresponds to latest round id
+      expect(await scrollUptimeFeed.getRoundData(2)).to.deep.equal(
+        await scrollUptimeFeed.latestRoundData(),
+      )
+    })
+
+    it('should revert from #getRoundData when round does not yet exist (future roundId)', async () => {
+      expect(scrollUptimeFeed.getRoundData(2)).to.be.revertedWith(
+        'NoDataPresent()',
+      )
+    })
+
+    it('should revert from #getAnswer when round does not yet exist (future roundId)', async () => {
+      expect(scrollUptimeFeed.getAnswer(2)).to.be.revertedWith(
+        'NoDataPresent()',
+      )
+    })
+
+    it('should revert from #getTimestamp when round does not yet exist (future roundId)', async () => {
+      expect(scrollUptimeFeed.getTimestamp(2)).to.be.revertedWith(
+        'NoDataPresent()',
+      )
+    })
+  })
+
+  describe('Protect reads on AggregatorV2V3Interface functions', () => {
+    it('should disallow reads on AggregatorV2V3Interface functions when consuming contract is not whitelisted', async () => {
+      // Sanity - consumer is not whitelisted
+      expect(await scrollUptimeFeed.checkEnabled()).to.be.true
+      expect(
+        await scrollUptimeFeed.hasAccess(uptimeFeedConsumer.address, '0x00'),
+      ).to.be.false
+
+      // Assert reads are not possible from consuming contract
+      await expect(uptimeFeedConsumer.latestAnswer()).to.be.revertedWith(
+        'No access',
+      )
+      await expect(uptimeFeedConsumer.latestRoundData()).to.be.revertedWith(
+        'No access',
+      )
+    })
+
+    it('should allow reads on AggregatorV2V3Interface functions when consuming contract is whitelisted', async () => {
+      // Whitelist consumer
+      await scrollUptimeFeed.addAccess(uptimeFeedConsumer.address)
+      // Sanity - consumer is whitelisted
+      expect(await scrollUptimeFeed.checkEnabled()).to.be.true
+      expect(
+        await scrollUptimeFeed.hasAccess(uptimeFeedConsumer.address, '0x00'),
+      ).to.be.true
+
+      // Assert reads are possible from consuming contract
+      expect(await uptimeFeedConsumer.latestAnswer()).to.be.equal('0')
+      const [roundId, answer] = await uptimeFeedConsumer.latestRoundData()
+      expect(roundId).to.equal(1)
+      expect(answer).to.equal(0)
+    })
+  })
+
+  describe('Gas costs', () => {
+    it('should consume a known amount of gas for updates @skip-coverage', async () => {
+      // Sanity - start at flag = 0 (`false`)
+      expect(await scrollUptimeFeed.latestAnswer()).to.equal(0)
+      let timestamp = await scrollUptimeFeed.latestTimestamp()
+
+      // Gas for no update
+      timestamp = timestamp.add(1000)
+      const _noUpdateTx = await scrollUptimeFeed
+        .connect(l2Messenger)
+        .updateStatus(false, timestamp)
+      const noUpdateTx = await _noUpdateTx.wait(1)
+      // Assert no update
+      expect(await scrollUptimeFeed.latestAnswer()).to.equal(0)
+      expect(noUpdateTx.cumulativeGasUsed.toNumber()).to.be.closeTo(
+        38594,
+        gasUsedDeviation,
+      )
+
+      // Gas for update
+      timestamp = timestamp.add(1000)
+      const _updateTx = await scrollUptimeFeed
+        .connect(l2Messenger)
+        .updateStatus(true, timestamp)
+      const updateTx = await _updateTx.wait(1)
+      // Assert update
+      expect(await scrollUptimeFeed.latestAnswer()).to.equal(1)
+      expect(updateTx.cumulativeGasUsed.toNumber()).to.be.closeTo(
+        58458,
+        gasUsedDeviation,
+      )
+    })
+
+    describe('Aggregator interface', () => {
+      beforeEach(async () => {
+        const timestamp = (await scrollUptimeFeed.latestTimestamp()).add(1000)
+        // Initialise a round
+        await scrollUptimeFeed
+          .connect(l2Messenger)
+          .updateStatus(true, timestamp)
+      })
+
+      it('should consume a known amount of gas for getRoundData(uint80) @skip-coverage', async () => {
+        const _tx = await l2Messenger.sendTransaction(
+          await scrollUptimeFeed
+            .connect(l2Messenger)
+            .populateTransaction.getRoundData(1),
+        )
+        const tx = await _tx.wait(1)
+        expect(tx.cumulativeGasUsed.toNumber()).to.be.closeTo(
+          30952,
+          gasUsedDeviation,
+        )
+      })
+
+      it('should consume a known amount of gas for latestRoundData() @skip-coverage', async () => {
+        const _tx = await l2Messenger.sendTransaction(
+          await scrollUptimeFeed
+            .connect(l2Messenger)
+            .populateTransaction.latestRoundData(),
+        )
+        const tx = await _tx.wait(1)
+        expect(tx.cumulativeGasUsed.toNumber()).to.be.closeTo(
+          28523,
+          gasUsedDeviation,
+        )
+      })
+
+      it('should consume a known amount of gas for latestAnswer() @skip-coverage', async () => {
+        const _tx = await l2Messenger.sendTransaction(
+          await scrollUptimeFeed
+            .connect(l2Messenger)
+            .populateTransaction.latestAnswer(),
+        )
+        const tx = await _tx.wait(1)
+        expect(tx.cumulativeGasUsed.toNumber()).to.be.closeTo(
+          28229,
+          gasUsedDeviation,
+        )
+      })
+
+      it('should consume a known amount of gas for latestTimestamp() @skip-coverage', async () => {
+        const _tx = await l2Messenger.sendTransaction(
+          await scrollUptimeFeed
+            .connect(l2Messenger)
+            .populateTransaction.latestTimestamp(),
+        )
+        const tx = await _tx.wait(1)
+        expect(tx.cumulativeGasUsed.toNumber()).to.be.closeTo(
+          28129,
+          gasUsedDeviation,
+        )
+      })
+
+      it('should consume a known amount of gas for latestRound() @skip-coverage', async () => {
+        const _tx = await l2Messenger.sendTransaction(
+          await scrollUptimeFeed
+            .connect(l2Messenger)
+            .populateTransaction.latestRound(),
+        )
+        const tx = await _tx.wait(1)
+        expect(tx.cumulativeGasUsed.toNumber()).to.be.closeTo(
+          28145,
+          gasUsedDeviation,
+        )
+      })
+
+      it('should consume a known amount of gas for getAnswer(roundId) @skip-coverage', async () => {
+        const _tx = await l2Messenger.sendTransaction(
+          await scrollUptimeFeed
+            .connect(l2Messenger)
+            .populateTransaction.getAnswer(1),
+        )
+        const tx = await _tx.wait(1)
+        expect(tx.cumulativeGasUsed.toNumber()).to.be.closeTo(
+          30682,
+          gasUsedDeviation,
+        )
+      })
+
+      it('should consume a known amount of gas for getTimestamp(roundId) @skip-coverage', async () => {
+        const _tx = await l2Messenger.sendTransaction(
+          await scrollUptimeFeed
+            .connect(l2Messenger)
+            .populateTransaction.getTimestamp(1),
+        )
+        const tx = await _tx.wait(1)
+        expect(tx.cumulativeGasUsed.toNumber()).to.be.closeTo(
+          30570,
+          gasUsedDeviation,
+        )
+      })
+    })
+  })
+})
diff --git a/contracts/test/v0.8/dev/ScrollValidator.test.ts b/contracts/test/v0.8/dev/ScrollValidator.test.ts
new file mode 100644
index 00000000000..866d52b202f
--- /dev/null
+++ b/contracts/test/v0.8/dev/ScrollValidator.test.ts
@@ -0,0 +1,118 @@
+import { ethers } from 'hardhat'
+import { BigNumber, Contract, ContractFactory } from 'ethers'
+import { expect } from 'chai'
+import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers'
+
+describe('ScrollValidator', () => {
+  const GAS_LIMIT = BigNumber.from(1_900_000)
+  /** Fake L2 target */
+  const L2_SEQ_STATUS_RECORDER_ADDRESS =
+    '0x491B1dDA0A8fa069bbC1125133A975BF4e85a91b'
+  let scrollValidator: Contract
+  let scrollUptimeFeedFactory: ContractFactory
+  let mockScrollL1CrossDomainMessenger: Contract
+  let deployer: SignerWithAddress
+  let eoaValidator: SignerWithAddress
+
+  before(async () => {
+    const accounts = await ethers.getSigners()
+    deployer = accounts[0]
+    eoaValidator = accounts[1]
+  })
+
+  beforeEach(async () => {
+    // Required for building the calldata
+    scrollUptimeFeedFactory = await ethers.getContractFactory(
+      'src/v0.8/l2ep/dev/scroll/ScrollSequencerUptimeFeed.sol:ScrollSequencerUptimeFeed',
+      deployer,
+    )
+
+    // Scroll Messenger contract on L1
+    const mockScrollL1CrossDomainMessengerFactory =
+      await ethers.getContractFactory(
+        'src/v0.8/l2ep/test/mocks/MockScrollL1CrossDomainMessenger.sol:MockScrollL1CrossDomainMessenger',
+      )
+    mockScrollL1CrossDomainMessenger =
+      await mockScrollL1CrossDomainMessengerFactory.deploy()
+
+    // Contract under test
+    const scrollValidatorFactory = await ethers.getContractFactory(
+      'src/v0.8/l2ep/dev/scroll/ScrollValidator.sol:ScrollValidator',
+      deployer,
+    )
+
+    scrollValidator = await scrollValidatorFactory.deploy(
+      mockScrollL1CrossDomainMessenger.address,
+      L2_SEQ_STATUS_RECORDER_ADDRESS,
+      GAS_LIMIT,
+    )
+  })
+
+  describe('#setGasLimit', () => {
+    it('correctly updates the gas limit', async () => {
+      const newGasLimit = BigNumber.from(2_000_000)
+      const tx = await scrollValidator.setGasLimit(newGasLimit)
+      await tx.wait()
+      const currentGasLimit = await scrollValidator.getGasLimit()
+      expect(currentGasLimit).to.equal(newGasLimit)
+    })
+  })
+
+  describe('#validate', () => {
+    it('reverts if called by account with no access', async () => {
+      await expect(
+        scrollValidator.connect(eoaValidator).validate(0, 0, 1, 1),
+      ).to.be.revertedWith('No access')
+    })
+
+    it('posts sequencer status when there is not status change', async () => {
+      await scrollValidator.addAccess(eoaValidator.address)
+
+      const currentBlock = await ethers.provider.getBlock('latest')
+      const futureTimestamp = currentBlock.timestamp + 5000
+
+      await ethers.provider.send('evm_setNextBlockTimestamp', [futureTimestamp])
+      const sequencerStatusRecorderCallData =
+        scrollUptimeFeedFactory.interface.encodeFunctionData('updateStatus', [
+          false,
+          futureTimestamp,
+        ])
+
+      await expect(scrollValidator.connect(eoaValidator).validate(0, 0, 0, 0))
+        .to.emit(mockScrollL1CrossDomainMessenger, 'SentMessage')
+        .withArgs(
+          scrollValidator.address, // sender
+          L2_SEQ_STATUS_RECORDER_ADDRESS, // target
+          0, // value
+          0, // nonce
+          GAS_LIMIT, // gas limit
+          sequencerStatusRecorderCallData, // message
+        )
+    })
+
+    it('post sequencer offline', async () => {
+      await scrollValidator.addAccess(eoaValidator.address)
+
+      const currentBlock = await ethers.provider.getBlock('latest')
+      const futureTimestamp = currentBlock.timestamp + 10000
+
+      await ethers.provider.send('evm_setNextBlockTimestamp', [futureTimestamp])
+      const sequencerStatusRecorderCallData =
+        scrollUptimeFeedFactory.interface.encodeFunctionData('updateStatus', [
+          true,
+          futureTimestamp,
+        ])
+
+      await expect(scrollValidator.connect(eoaValidator).validate(0, 0, 1, 1))
+        .to.emit(mockScrollL1CrossDomainMessenger, 'SentMessage')
+        .withArgs(
+          scrollValidator.address, // sender
+          L2_SEQ_STATUS_RECORDER_ADDRESS, // target
+          0, // value
+          0, // nonce
+          GAS_LIMIT, // gas limit
+          sequencerStatusRecorderCallData, // message
+        )
+    })
+  })
+})

From fdb4aa77c203690836c4c2102a5bc9cdddcb7c91 Mon Sep 17 00:00:00 2001
From: Domino Valdano <2644901+reductionista@users.noreply.github.com>
Date: Tue, 12 Dec 2023 13:11:14 -0800
Subject: [PATCH 112/130] Handle edge case involving blocks not being found in
 the db (#11298)

If there is a backfill followed by an error, logs get written to the
db but no blocks. This will make the logpoller (or backup log poller)
rely on the chain next time instead of the db to determine
lastFinalizedBlock, which could result in a gap in logs processed.
Fixing this by writing the last block in the backfil to the db along
with the logs. Its lastFinalizedBlock field will be set to its own
block number + 1, so if the db crashes it should start by pulling
the logs from that one.
---
 core/chains/evm/logpoller/log_poller.go      | 2 +-
 core/chains/evm/logpoller/log_poller_test.go | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/chains/evm/logpoller/log_poller.go b/core/chains/evm/logpoller/log_poller.go
index fb380f84b2c..1cf1cf42beb 100644
--- a/core/chains/evm/logpoller/log_poller.go
+++ b/core/chains/evm/logpoller/log_poller.go
@@ -679,7 +679,7 @@ func (lp *logPoller) backfill(ctx context.Context, start, end int64) error {
 		}
 
 		lp.lggr.Debugw("Backfill found logs", "from", from, "to", to, "logs", len(gethLogs), "blocks", blocks)
-		err = lp.orm.InsertLogs(convertLogs(gethLogs, blocks, lp.lggr, lp.ec.ConfiguredChainID()), pg.WithParentCtx(ctx))
+		err = lp.orm.InsertLogsWithBlock(convertLogs(gethLogs, blocks, lp.lggr, lp.ec.ConfiguredChainID()), blocks[len(blocks)-1], pg.WithParentCtx(ctx))
 		if err != nil {
 			lp.lggr.Warnw("Unable to insert logs, retrying", "err", err, "from", from, "to", to)
 			return err
diff --git a/core/chains/evm/logpoller/log_poller_test.go b/core/chains/evm/logpoller/log_poller_test.go
index 82447bdb5f4..6c4dd381b54 100644
--- a/core/chains/evm/logpoller/log_poller_test.go
+++ b/core/chains/evm/logpoller/log_poller_test.go
@@ -965,8 +965,8 @@ func TestLogPoller_PollAndSaveLogs(t *testing.T) {
 			lgs, err = th.ORM.SelectLogsByBlockRange(11, 17)
 			require.NoError(t, err)
 			assert.Equal(t, 7, len(lgs))
-			th.assertHaveCanonical(t, 15, 16)
-			th.assertDontHave(t, 11, 14) // Do not expect to save backfilled blocks.
+			th.assertHaveCanonical(t, 14, 16) // Should have last finalized block plus unfinalized blocks
+			th.assertDontHave(t, 11, 13)      // Should not have older finalized blocks
 
 			// Verify that a custom block timestamp will get written to db correctly also
 			b, err = th.Client.BlockByNumber(testutils.Context(t), nil)
@@ -1057,8 +1057,8 @@ func TestLogPoller_PollAndSaveLogsDeepReorg(t *testing.T) {
 			require.NoError(t, err)
 			assert.Equal(t, hexutil.MustDecode(`0x0000000000000000000000000000000000000000000000000000000000000002`), lgs[0].Data)
 			th.assertHaveCanonical(t, 1, 1)
-			th.assertDontHave(t, 2, 5) // These blocks are backfilled
-			th.assertHaveCanonical(t, 6, 10)
+			th.assertDontHave(t, 2, 3) // These blocks are backfilled
+			th.assertHaveCanonical(t, 5, 10)
 		})
 	}
 }

From ec3b4d89ce2b9a7a4d09a5812771a4f470415aff Mon Sep 17 00:00:00 2001
From: Dimitris Grigoriou <dimitris.grigoriou@smartcontract.com>
Date: Tue, 12 Dec 2023 23:18:34 +0200
Subject: [PATCH 113/130] Remove big from core utils (#11511)

* Change difficulty from Big to BigInt

* Fix headtracker mock head

* Remove EsnureClosed

* Fix mock heads

* Migrate to common Mailbox

* Fix Tracker close on txm

* Change to EnsureHexPrefix

* Change names to mailbox

* Remove core/null dependency from common

* Remove core mailbox

* Fix dependencies

* Tidy

* Fix dependencies

* Change path to internal utils

* Minor fixes

* Implement skeleton interfaces, structs, & methods for ChainReader EVM POC

- Read ChainReader config in from RelayConfig
- Add some initialization and validation relay skeletons

- Use medianProviderWrapper instead of passing medianContract separately

This avoids us having to modify the signature of NewMedianFactory, which
would require further modifications to all non-evm repos and chainlink-relay

- Add chain_reader_test.go with some basic relay tests

Co-authored-by: Jordan Krage <jmank88@gmail.com>

- Add chain reader config validation
- Add chain reader config validation tests
- Add config for chain reader median contract to cr validation testcases
- Add unimplemented Encode(), Decode(), GetMaxEncodingSize(), GetMaxDecodingSize()
- Add ChainReader() method to mock provider for plugin test
- Rename relaymercury.ChainReader to MercuryChainReader, resolve name collisions
- Add tests for errors during ChainReader construction
- Propagate InvalidConfig & any other errors back to client

We should ignore Unimplemented until node ops have been given ample time to migrate to the new job spec
(including a section for ChainReader config) so that we can remove the old product-specific
MedianContract component from MedianProvider. All other errors we can immediately start passing back
to the client, letting the core node decide how to handle them (eg. displaying an "invalid job spec"
message to the UI if the RelayConfig was invalid or the ContractID missing)

* Update relay versions

* Big migration

* Simplify chain reader config validation

* Rename MinKey function

* Remove big from utils

* Fix dependencies

* Minor fixes

* Fix merge conflicts

* Minor fixes

---------

Co-authored-by: Domino Valdano <2644901+reductionista@users.noreply.github.com>
Co-authored-by: ilija <pavlovicilija42@gmail.com>
---
 core/chains/evm/assets/assets.go              |  6 +-
 core/chains/evm/assets/wei.go                 | 10 +--
 core/chains/evm/client/chain_id_sub.go        |  4 +-
 core/chains/evm/client/chain_id_sub_test.go   |  4 +-
 core/chains/evm/client/client.go              |  5 +-
 core/chains/evm/client/node_lifecycle.go      |  5 +-
 core/chains/evm/client/pool.go                |  2 +-
 core/chains/evm/client/rpc_client.go          |  5 +-
 .../evm/client/send_only_node_lifecycle.go    |  2 +-
 .../evm/client/simulated_backend_client.go    |  8 +--
 core/chains/evm/config/config_test.go         | 16 ++---
 core/chains/evm/config/toml/config.go         |  8 +--
 core/chains/evm/config/toml/defaults.go       | 14 ++--
 core/chains/evm/forwarders/forwarder.go       |  4 +-
 .../evm/forwarders/forwarder_manager.go       |  7 +-
 .../evm/forwarders/forwarder_manager_test.go  | 12 ++--
 core/chains/evm/forwarders/mocks/orm.go       | 29 ++++----
 core/chains/evm/forwarders/orm.go             | 14 ++--
 core/chains/evm/forwarders/orm_test.go        |  4 +-
 .../evm/gas/block_history_estimator_test.go   | 15 ++--
 .../evm/headtracker/head_broadcaster_test.go  |  5 +-
 .../evm/headtracker/head_tracker_test.go      |  9 +--
 core/chains/evm/headtracker/heads_test.go     |  5 +-
 core/chains/evm/headtracker/orm.go            |  6 +-
 core/chains/evm/log/orm.go                    |  7 +-
 core/chains/evm/logpoller/log_poller.go       |  3 +-
 core/chains/evm/logpoller/log_poller_test.go  |  5 +-
 core/chains/evm/logpoller/models.go           |  6 +-
 .../evm/logpoller/observability_test.go       |  3 +-
 core/chains/evm/logpoller/orm.go              | 16 ++---
 core/chains/evm/logpoller/orm_test.go         | 69 ++++++++++---------
 core/chains/evm/logpoller/query.go            |  4 +-
 core/chains/evm/logpoller/query_test.go       |  3 +-
 core/chains/evm/txmgr/broadcaster_test.go     |  3 +-
 core/chains/evm/txmgr/evm_tx_store.go         |  6 +-
 core/chains/evm/txmgr/resender_test.go        |  4 +-
 core/chains/evm/txmgr/tracker_test.go         |  6 +-
 core/chains/evm/txmgr/txmgr_test.go           |  5 +-
 core/chains/evm/types/models.go               |  5 +-
 core/chains/evm/types/types.go                |  3 +-
 core/{utils => chains/evm/utils/big}/big.go   | 21 +++---
 .../evm/utils/big}/big_test.go                | 14 ++--
 core/chains/evm/utils/utils.go                | 37 ++++++++++
 core/chains/legacyevm/chain.go                |  4 +-
 core/cmd/blocks_commands_test.go              |  4 +-
 core/cmd/eth_keys_commands_test.go            |  3 +-
 core/cmd/evm_chains_commands_test.go          |  6 +-
 core/cmd/evm_transaction_commands.go          |  3 +-
 core/cmd/forwarders_commands.go               |  4 +-
 core/cmd/forwarders_commands_test.go          |  3 +-
 core/cmd/ocr2vrf_configure_commands.go        |  3 +-
 core/cmd/shell_local.go                       |  3 +-
 core/internal/cltest/cltest.go                | 21 +++---
 core/internal/cltest/factories.go             | 17 ++---
 core/internal/cltest/simulated_backend.go     |  6 +-
 core/internal/features/features_test.go       |  5 +-
 .../features/ocr2/features_ocr2_test.go       |  4 +-
 .../testutils/configtest/general_config.go    |  8 +--
 core/internal/testutils/evmtest/evmtest.go    |  6 +-
 core/internal/testutils/evmtest/v2/evmtest.go |  4 +-
 core/scripts/functions/src/fetching.go        |  3 +-
 core/services/blockhashstore/delegate_test.go | 10 +--
 core/services/blockhashstore/validate_test.go |  4 +-
 .../blockheaderfeeder/validate_test.go        |  6 +-
 core/services/chainlink/config.go             |  4 +-
 core/services/chainlink/config_test.go        | 11 +--
 .../relayer_chain_interoperators_test.go      |  6 +-
 core/services/directrequest/delegate_test.go  |  4 +-
 core/services/directrequest/validate.go       |  4 +-
 core/services/feeds/service.go                |  4 +-
 core/services/feeds/service_test.go           |  4 +-
 core/services/fluxmonitorv2/orm_test.go       |  4 +-
 core/services/job/job_orm_test.go             | 14 ++--
 core/services/job/mocks/orm.go                | 15 ++--
 core/services/job/models.go                   | 29 ++++----
 core/services/job/orm.go                      |  6 +-
 core/services/keeper/integration_test.go      |  8 +--
 core/services/keeper/models.go                |  9 +--
 core/services/keeper/models_test.go           |  4 +-
 core/services/keeper/orm.go                   | 10 +--
 core/services/keeper/orm_test.go              | 13 ++--
 .../keeper/registry1_1_synchronizer_test.go   |  4 +-
 .../keeper/registry1_3_synchronizer_test.go   |  6 +-
 .../registry_synchronizer_process_logs.go     | 20 +++---
 .../keeper/registry_synchronizer_sync.go      | 17 ++---
 .../keeper/registry_synchronizer_sync_test.go |  4 +-
 core/services/keeper/upkeep_executer_test.go  | 15 ++--
 .../keeper/upkeep_executer_unit_test.go       |  4 +-
 core/services/keystore/eth_test.go            |  3 +-
 core/services/keystore/keys/ethkey/models.go  |  4 +-
 core/services/ocr/database.go                 |  6 +-
 core/services/ocr2/delegate_test.go           |  4 +-
 .../evmregistry/v20/registry_test.go          |  6 +-
 .../v21/logprovider/recoverer_test.go         |  4 +-
 .../evmregistry/v21/registry_test.go          |  6 +-
 .../evmregistry/v21/upkeepstate/orm.go        | 12 ++--
 .../evmregistry/v21/upkeepstate/orm_test.go   |  4 +-
 .../evmregistry/v21/upkeepstate/store.go      |  3 +-
 .../plugins/ocr2keeper/integration_test.go    |  4 +-
 .../internal/ocr2vrf_integration_test.go      |  3 +-
 .../ocr2/plugins/s4/integration_test.go       |  6 +-
 core/services/ocr2/plugins/s4/messages.go     |  6 +-
 core/services/ocr2/plugins/s4/plugin.go       |  4 +-
 core/services/ocr2/plugins/s4/plugin_test.go  |  8 +--
 core/services/ocrcommon/telemetry_test.go     |  5 +-
 core/services/pipeline/orm_test.go            |  5 +-
 .../promreporter/prom_reporter_test.go        |  3 +-
 core/services/relay/evm/median_test.go        |  4 +-
 .../relay/evm/relayer_extender_test.go        |  4 +-
 core/services/relay/evm/types/types.go        |  4 +-
 core/services/relay/evm/types/types_test.go   |  2 +-
 core/services/s4/address_range.go             | 28 ++++----
 core/services/s4/address_range_test.go        |  8 +--
 core/services/s4/in_memory_orm.go             |  6 +-
 core/services/s4/in_memory_orm_test.go        | 16 ++---
 core/services/s4/mocks/orm.go                 | 15 ++--
 core/services/s4/orm.go                       | 10 +--
 core/services/s4/postgres_orm.go              |  4 +-
 core/services/s4/postgres_orm_test.go         |  4 +-
 core/services/s4/storage.go                   |  7 +-
 core/services/s4/storage_test.go              |  9 +--
 core/services/vrf/delegate_test.go            |  2 +-
 core/services/vrf/v1/integration_test.go      |  6 +-
 .../vrf/v2/integration_helpers_test.go        |  5 +-
 core/services/vrf/v2/integration_v2_test.go   |  3 +-
 .../vrf/v2/listener_v2_log_listener_test.go   |  5 +-
 core/store/migrate/migrate_test.go            |  8 +--
 core/store/models/common.go                   |  4 +-
 core/web/eth_keys_controller.go               |  4 +-
 core/web/evm_chains_controller_test.go        | 10 +--
 core/web/evm_forwarders_controller.go         |  4 +-
 core/web/evm_forwarders_controller_test.go    |  5 +-
 core/web/evm_transfer_controller_test.go      | 18 ++---
 core/web/loader/loader_test.go                |  5 +-
 core/web/presenters/eth_key.go                |  8 +--
 core/web/presenters/eth_key_test.go           |  8 +--
 core/web/presenters/eth_tx.go                 |  8 +--
 core/web/presenters/evm_forwarder.go          |  4 +-
 core/web/presenters/job.go                    | 16 ++---
 core/web/presenters/job_test.go               |  8 +--
 core/web/replay_controller.go                 |  8 +--
 core/web/resolver/chain_test.go               |  6 +-
 core/web/resolver/eth_key_test.go             | 22 +++---
 core/web/resolver/eth_transaction_test.go     |  4 +-
 core/web/resolver/node_test.go                |  4 +-
 core/web/resolver/spec_test.go                | 18 ++---
 integration-tests/client/chainlink_models.go  |  6 +-
 integration-tests/types/config/node/core.go   |  5 +-
 148 files changed, 636 insertions(+), 550 deletions(-)
 rename core/{utils => chains/evm/utils/big}/big.go (91%)
 rename core/{utils => chains/evm/utils/big}/big_test.go (95%)
 create mode 100644 core/chains/evm/utils/utils.go

diff --git a/core/chains/evm/assets/assets.go b/core/chains/evm/assets/assets.go
index 377e92a855a..738ba5c817b 100644
--- a/core/chains/evm/assets/assets.go
+++ b/core/chains/evm/assets/assets.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/assets"
 	"github.com/smartcontractkit/chainlink-common/pkg/utils/bytes"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 
 	"github.com/shopspring/decimal"
 )
@@ -108,10 +108,10 @@ func (e *Eth) ToInt() *big.Int {
 
 // Scan reads the database value and returns an instance.
 func (e *Eth) Scan(value interface{}) error {
-	return (*utils.Big)(e).Scan(value)
+	return (*ubig.Big)(e).Scan(value)
 }
 
 // Value returns the Eth value for serialization to database.
 func (e Eth) Value() (driver.Value, error) {
-	return (utils.Big)(e).Value()
+	return (ubig.Big)(e).Value()
 }
diff --git a/core/chains/evm/assets/wei.go b/core/chains/evm/assets/wei.go
index be0143b3a86..8bacabfdb4a 100644
--- a/core/chains/evm/assets/wei.go
+++ b/core/chains/evm/assets/wei.go
@@ -11,7 +11,7 @@ import (
 	"golang.org/x/exp/constraints"
 
 	bigmath "github.com/smartcontractkit/chainlink-common/pkg/utils/big_math"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 )
 
 const (
@@ -58,10 +58,10 @@ func suffixExp(suf string) int32 {
 	}
 }
 
-// Wei extends utils.Big to implement encoding.TextMarshaler and
+// Wei extends ubig.Big to implement encoding.TextMarshaler and
 // encoding.TextUnmarshaler with support for unit suffixes, as well as
 // additional functions
-type Wei utils.Big
+type Wei ubig.Big
 
 func MaxWei(w, x *Wei) *Wei {
 	return NewWei(bigmath.Max(w.ToInt(), x.ToInt()))
@@ -271,10 +271,10 @@ func (w *Wei) AddPercentage(percentage uint16) *Wei {
 
 // Scan reads the database value and returns an instance.
 func (w *Wei) Scan(value interface{}) error {
-	return (*utils.Big)(w).Scan(value)
+	return (*ubig.Big)(w).Scan(value)
 }
 
 // Value returns this instance serialized for database storage.
 func (w Wei) Value() (driver.Value, error) {
-	return (utils.Big)(w).Value()
+	return (ubig.Big)(w).Value()
 }
diff --git a/core/chains/evm/client/chain_id_sub.go b/core/chains/evm/client/chain_id_sub.go
index 8ea4e207970..c3162b300c7 100644
--- a/core/chains/evm/client/chain_id_sub.go
+++ b/core/chains/evm/client/chain_id_sub.go
@@ -6,7 +6,7 @@ import (
 	"github.com/ethereum/go-ethereum"
 
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 )
 
 var _ ethereum.Subscription = &chainIDSubForwarder{}
@@ -64,7 +64,7 @@ func (c *chainIDSubForwarder) forwardLoop() {
 			return
 
 		case h := <-c.srcCh:
-			h.EVMChainID = utils.NewBig(c.chainID)
+			h.EVMChainID = ubig.New(c.chainID)
 			select {
 			case c.destCh <- h:
 			case <-c.unSub:
diff --git a/core/chains/evm/client/chain_id_sub_test.go b/core/chains/evm/client/chain_id_sub_test.go
index 211ba812fbe..c71b45c489e 100644
--- a/core/chains/evm/client/chain_id_sub_test.go
+++ b/core/chains/evm/client/chain_id_sub_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 )
 
 type mockSubscription struct {
@@ -111,7 +111,7 @@ func TestChainIDSubForwarder(t *testing.T) {
 		forwarder.srcCh <- head
 		receivedHead := <-ch
 		assert.Equal(t, head, receivedHead)
-		assert.Equal(t, utils.NewBig(chainID), receivedHead.EVMChainID)
+		assert.Equal(t, ubig.New(chainID), receivedHead.EVMChainID)
 
 		expectedErr := errors.New("error")
 		sub.Errors <- expectedErr
diff --git a/core/chains/evm/client/client.go b/core/chains/evm/client/client.go
index 688cc3c9bea..b85331a62a1 100644
--- a/core/chains/evm/client/client.go
+++ b/core/chains/evm/client/client.go
@@ -14,6 +14,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/common/config"
 	htrktypes "github.com/smartcontractkit/chainlink/v2/common/headtracker/types"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 
 	"github.com/ethereum/go-ethereum"
@@ -286,7 +287,7 @@ func (client *client) HeadByNumber(ctx context.Context, number *big.Int) (head *
 		err = ethereum.NotFound
 		return
 	}
-	head.EVMChainID = utils.NewBig(client.ConfiguredChainID())
+	head.EVMChainID = ubig.New(client.ConfiguredChainID())
 	return
 }
 
@@ -299,7 +300,7 @@ func (client *client) HeadByHash(ctx context.Context, hash common.Hash) (head *e
 		err = ethereum.NotFound
 		return
 	}
-	head.EVMChainID = utils.NewBig(client.ConfiguredChainID())
+	head.EVMChainID = ubig.New(client.ConfiguredChainID())
 	return
 }
 
diff --git a/core/chains/evm/client/node_lifecycle.go b/core/chains/evm/client/node_lifecycle.go
index f838325a646..4e984de00f0 100644
--- a/core/chains/evm/client/node_lifecycle.go
+++ b/core/chains/evm/client/node_lifecycle.go
@@ -12,10 +12,11 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	cutils "github.com/smartcontractkit/chainlink-common/pkg/utils"
 	bigmath "github.com/smartcontractkit/chainlink-common/pkg/utils/big_math"
 
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils"
 )
 
 var (
@@ -50,7 +51,7 @@ func zombieNodeCheckInterval(noNewHeadsThreshold time.Duration) time.Duration {
 	if interval <= 0 || interval > queryTimeout {
 		interval = queryTimeout
 	}
-	return utils.WithJitter(interval)
+	return cutils.WithJitter(interval)
 }
 
 func (n *node) setLatestReceived(blockNumber int64, totalDifficulty *big.Int) {
diff --git a/core/chains/evm/client/pool.go b/core/chains/evm/client/pool.go
index 6c36cc3e987..afe592533c3 100644
--- a/core/chains/evm/client/pool.go
+++ b/core/chains/evm/client/pool.go
@@ -17,10 +17,10 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils"
 
 	"github.com/smartcontractkit/chainlink/v2/common/config"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 var (
diff --git a/core/chains/evm/client/rpc_client.go b/core/chains/evm/client/rpc_client.go
index 01851c4ae90..3cc90c4d8d9 100644
--- a/core/chains/evm/client/rpc_client.go
+++ b/core/chains/evm/client/rpc_client.go
@@ -24,6 +24,7 @@ import (
 	commontypes "github.com/smartcontractkit/chainlink/v2/common/types"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -491,7 +492,7 @@ func (r *rpcClient) BlockByNumber(ctx context.Context, number *big.Int) (head *e
 		err = ethereum.NotFound
 		return
 	}
-	head.EVMChainID = utils.NewBig(r.chainID)
+	head.EVMChainID = ubig.New(r.chainID)
 	return
 }
 
@@ -504,7 +505,7 @@ func (r *rpcClient) BlockByHash(ctx context.Context, hash common.Hash) (head *ev
 		err = ethereum.NotFound
 		return
 	}
-	head.EVMChainID = utils.NewBig(r.chainID)
+	head.EVMChainID = ubig.New(r.chainID)
 	return
 }
 
diff --git a/core/chains/evm/client/send_only_node_lifecycle.go b/core/chains/evm/client/send_only_node_lifecycle.go
index 9d704e49389..127a5c6678c 100644
--- a/core/chains/evm/client/send_only_node_lifecycle.go
+++ b/core/chains/evm/client/send_only_node_lifecycle.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils"
 )
 
 // verifyLoop may only be triggered once, on Start, if initial chain ID check
diff --git a/core/chains/evm/client/simulated_backend_client.go b/core/chains/evm/client/simulated_backend_client.go
index 293bf64badc..bd2e959d9bc 100644
--- a/core/chains/evm/client/simulated_backend_client.go
+++ b/core/chains/evm/client/simulated_backend_client.go
@@ -23,7 +23,7 @@ import (
 
 	commonclient "github.com/smartcontractkit/chainlink/v2/common/client"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 )
 
 func init() {
@@ -197,7 +197,7 @@ func (c *SimulatedBackendClient) HeadByNumber(ctx context.Context, n *big.Int) (
 		return nil, ethereum.NotFound
 	}
 	return &evmtypes.Head{
-		EVMChainID: utils.NewBigI(c.chainId.Int64()),
+		EVMChainID: ubig.NewI(c.chainId.Int64()),
 		Hash:       header.Hash(),
 		Number:     header.Number.Int64(),
 		ParentHash: header.ParentHash,
@@ -214,7 +214,7 @@ func (c *SimulatedBackendClient) HeadByHash(ctx context.Context, h common.Hash)
 		return nil, ethereum.NotFound
 	}
 	return &evmtypes.Head{
-		EVMChainID: utils.NewBigI(c.chainId.Int64()),
+		EVMChainID: ubig.NewI(c.chainId.Int64()),
 		Hash:       header.Hash(),
 		Number:     header.Number.Int64(),
 		ParentHash: header.ParentHash,
@@ -302,7 +302,7 @@ func (c *SimulatedBackendClient) SubscribeNewHead(
 			case h := <-ch:
 				var head *evmtypes.Head
 				if h != nil {
-					head = &evmtypes.Head{Difficulty: h.Difficulty, Timestamp: time.Unix(int64(h.Time), 0), Number: h.Number.Int64(), Hash: h.Hash(), ParentHash: h.ParentHash, Parent: lastHead, EVMChainID: utils.NewBig(c.chainId)}
+					head = &evmtypes.Head{Difficulty: h.Difficulty, Timestamp: time.Unix(int64(h.Time), 0), Number: h.Number.Int64(), Hash: h.Hash(), ParentHash: h.ParentHash, Parent: lastHead, EVMChainID: ubig.New(c.chainId)}
 					lastHead = head
 				}
 				select {
diff --git a/core/chains/evm/config/config_test.go b/core/chains/evm/config/config_test.go
index d34d1eae63e..0127328239a 100644
--- a/core/chains/evm/config/config_test.go
+++ b/core/chains/evm/config/config_test.go
@@ -14,6 +14,7 @@ import (
 	commonconfig "github.com/smartcontractkit/chainlink/v2/common/config"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/config"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
@@ -21,13 +22,12 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func TestChainScopedConfig(t *testing.T) {
 	t.Parallel()
 	gcfg := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
-		id := utils.NewBig(big.NewInt(rand.Int63()))
+		id := ubig.New(big.NewInt(rand.Int63()))
 		c.EVM[0] = &toml.EVMConfig{
 			ChainID: id,
 			Chain: toml.Defaults(id, &toml.Chain{
@@ -38,7 +38,7 @@ func TestChainScopedConfig(t *testing.T) {
 	cfg := evmtest.NewChainScopedConfig(t, gcfg)
 
 	overrides := func(c *chainlink.Config, s *chainlink.Secrets) {
-		id := utils.NewBig(big.NewInt(rand.Int63()))
+		id := ubig.New(big.NewInt(rand.Int63()))
 		c.EVM[0] = &toml.EVMConfig{
 			ChainID: id,
 			Chain: toml.Defaults(id, &toml.Chain{
@@ -65,7 +65,7 @@ func TestChainScopedConfig(t *testing.T) {
 		t.Run("uses customer configured value when set", func(t *testing.T) {
 			var override uint32 = 10
 			gasBumpOverrides := func(c *chainlink.Config, s *chainlink.Secrets) {
-				id := utils.NewBig(big.NewInt(rand.Int63()))
+				id := ubig.New(big.NewInt(rand.Int63()))
 				c.EVM[0] = &toml.EVMConfig{
 					ChainID: id,
 					Chain: toml.Defaults(id, &toml.Chain{
@@ -292,7 +292,7 @@ func TestChainScopedConfig_GasEstimator(t *testing.T) {
 func TestChainScopedConfig_BSCDefaults(t *testing.T) {
 	chainID := big.NewInt(56)
 	gcfg := configtest.NewGeneralConfig(t, func(c *chainlink.Config, secrets *chainlink.Secrets) {
-		id := utils.NewBig(chainID)
+		id := ubig.New(chainID)
 		cfg := toml.Defaults(id)
 		c.EVM[0] = &toml.EVMConfig{
 			ChainID: id,
@@ -344,7 +344,7 @@ func TestChainScopedConfig_Profiles(t *testing.T) {
 			t.Parallel()
 
 			gcfg := configtest.NewGeneralConfig(t, func(c *chainlink.Config, secrets *chainlink.Secrets) {
-				id := utils.NewBigI(tt.chainID)
+				id := ubig.NewI(tt.chainID)
 				cfg := toml.Defaults(id)
 				c.EVM[0] = &toml.EVMConfig{
 					ChainID: id,
@@ -379,7 +379,7 @@ func TestChainScopedConfig_HeadTracker(t *testing.T) {
 func Test_chainScopedConfig_Validate(t *testing.T) {
 	configWithChains := func(t *testing.T, id int64, chains ...*toml.Chain) config.AppConfig {
 		return configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
-			chainID := utils.NewBigI(id)
+			chainID := ubig.NewI(id)
 			c.EVM[0] = &toml.EVMConfig{ChainID: chainID, Enabled: ptr(true), Chain: toml.Defaults(chainID, chains...),
 				Nodes: toml.EVMNodes{{
 					Name:    ptr("fake"),
@@ -462,7 +462,7 @@ func Test_chainScopedConfig_Validate(t *testing.T) {
 
 func TestNodePoolConfig(t *testing.T) {
 	gcfg := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
-		id := utils.NewBig(big.NewInt(rand.Int63()))
+		id := ubig.New(big.NewInt(rand.Int63()))
 		c.EVM[0] = &toml.EVMConfig{
 			ChainID: id,
 			Chain:   toml.Defaults(id, &toml.Chain{}),
diff --git a/core/chains/evm/config/toml/config.go b/core/chains/evm/config/toml/config.go
index 9e51d5be790..16ad74dbca2 100644
--- a/core/chains/evm/config/toml/config.go
+++ b/core/chains/evm/config/toml/config.go
@@ -19,10 +19,10 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 	configutils "github.com/smartcontractkit/chainlink/v2/core/utils/config"
 )
 
@@ -161,7 +161,7 @@ func (cs EVMConfigs) NodeStatus(name string) (commontypes.NodeStatus, error) {
 	return commontypes.NodeStatus{}, fmt.Errorf("node %s: %w", name, chains.ErrNotFound)
 }
 
-func legacyNode(n *Node, chainID *utils.Big) (v2 types.Node) {
+func legacyNode(n *Node, chainID *big.Big) (v2 types.Node) {
 	v2.Name = *n.Name
 	v2.EVMChainID = *chainID
 	if n.HTTPURL != nil {
@@ -215,7 +215,7 @@ func (cs EVMConfigs) Nodes(chainID relay.ChainID) (ns []types.Node, err error) {
 			continue
 		}
 
-		ns = append(ns, legacyNode(n, utils.NewBigI(evmID)))
+		ns = append(ns, legacyNode(n, big.NewI(evmID)))
 	}
 	return
 }
@@ -268,7 +268,7 @@ func (ns *EVMNodes) SetFrom(fs *EVMNodes) {
 }
 
 type EVMConfig struct {
-	ChainID *utils.Big
+	ChainID *big.Big
 	Enabled *bool
 	Chain
 	Nodes EVMNodes
diff --git a/core/chains/evm/config/toml/defaults.go b/core/chains/evm/config/toml/defaults.go
index d362e9ac3dc..27127993d8a 100644
--- a/core/chains/evm/config/toml/defaults.go
+++ b/core/chains/evm/config/toml/defaults.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/smartcontractkit/chainlink/v2/common/config"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	configutils "github.com/smartcontractkit/chainlink/v2/core/utils/config"
 )
 
@@ -21,7 +21,7 @@ var (
 	defaultNames = map[string]string{}
 
 	// DefaultIDs is the set of chain ids which have defaults.
-	DefaultIDs []*utils.Big
+	DefaultIDs []*big.Big
 )
 
 func init() {
@@ -36,7 +36,7 @@ func init() {
 			log.Fatalf("failed to read %q: %v", path, err)
 		}
 		var config = struct {
-			ChainID *utils.Big
+			ChainID *big.Big
 			Chain
 		}{}
 
@@ -61,13 +61,13 @@ func init() {
 		defaults[id] = config.Chain
 		defaultNames[id] = strings.ReplaceAll(strings.TrimSuffix(fe.Name(), ".toml"), "_", " ")
 	}
-	slices.SortFunc(DefaultIDs, func(a, b *utils.Big) int {
+	slices.SortFunc(DefaultIDs, func(a, b *big.Big) int {
 		return a.Cmp(b)
 	})
 }
 
 // DefaultsNamed returns the default Chain values, optionally for the given chainID, as well as a name if the chainID is known.
-func DefaultsNamed(chainID *utils.Big) (c Chain, name string) {
+func DefaultsNamed(chainID *big.Big) (c Chain, name string) {
 	c.SetFrom(&fallback)
 	if chainID == nil {
 		return
@@ -82,7 +82,7 @@ func DefaultsNamed(chainID *utils.Big) (c Chain, name string) {
 
 // Defaults returns a Chain based on the defaults for chainID and fields from with, applied in order so later Chains
 // override earlier ones.
-func Defaults(chainID *utils.Big, with ...*Chain) Chain {
+func Defaults(chainID *big.Big, with ...*Chain) Chain {
 	c, _ := DefaultsNamed(chainID)
 	for _, w := range with {
 		c.SetFrom(w)
@@ -90,7 +90,7 @@ func Defaults(chainID *utils.Big, with ...*Chain) Chain {
 	return c
 }
 
-func ChainTypeForID(chainID *utils.Big) (config.ChainType, bool) {
+func ChainTypeForID(chainID *big.Big) (config.ChainType, bool) {
 	s := chainID.String()
 	if d, ok := defaults[s]; ok {
 		if d.ChainType == nil {
diff --git a/core/chains/evm/forwarders/forwarder.go b/core/chains/evm/forwarders/forwarder.go
index 0221c39e0a6..a0f6334a2c7 100644
--- a/core/chains/evm/forwarders/forwarder.go
+++ b/core/chains/evm/forwarders/forwarder.go
@@ -5,14 +5,14 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 )
 
 // Forwarder is the struct for Forwarder Addresses
 type Forwarder struct {
 	ID         int64
 	Address    common.Address
-	EVMChainID utils.Big
+	EVMChainID big.Big
 	CreatedAt  time.Time
 	UpdatedAt  time.Time
 }
diff --git a/core/chains/evm/forwarders/forwarder_manager.go b/core/chains/evm/forwarders/forwarder_manager.go
index eaf0c32afe3..03792966fef 100644
--- a/core/chains/evm/forwarders/forwarder_manager.go
+++ b/core/chains/evm/forwarders/forwarder_manager.go
@@ -14,15 +14,16 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils"
 
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmlogpoller "github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/authorized_forwarder"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/authorized_receiver"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/offchain_aggregator_wrapper"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 var forwardABI = evmtypes.MustGetABI(authorized_forwarder.AuthorizedForwarderABI).Methods["forward"]
@@ -79,7 +80,7 @@ func (f *FwdMgr) Start(ctx context.Context) error {
 		f.logger.Debug("Initializing EVM forwarder manager")
 		chainId := f.evmClient.ConfiguredChainID()
 
-		fwdrs, err := f.ORM.FindForwardersByChain(utils.Big(*chainId))
+		fwdrs, err := f.ORM.FindForwardersByChain(big.Big(*chainId))
 		if err != nil {
 			return errors.Wrapf(err, "Failed to retrieve forwarders for chain %d", chainId)
 		}
@@ -112,7 +113,7 @@ func FilterName(addr common.Address) string {
 
 func (f *FwdMgr) ForwarderFor(addr common.Address) (forwarder common.Address, err error) {
 	// Gets forwarders for current chain.
-	fwdrs, err := f.ORM.FindForwardersByChain(utils.Big(*f.evmClient.ConfiguredChainID()))
+	fwdrs, err := f.ORM.FindForwardersByChain(big.Big(*f.evmClient.ConfiguredChainID()))
 	if err != nil {
 		return common.Address{}, err
 	}
diff --git a/core/chains/evm/forwarders/forwarder_manager_test.go b/core/chains/evm/forwarders/forwarder_manager_test.go
index 1da638e743d..5ef150aa5c3 100644
--- a/core/chains/evm/forwarders/forwarder_manager_test.go
+++ b/core/chains/evm/forwarders/forwarder_manager_test.go
@@ -12,10 +12,13 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils"
+
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/forwarders"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/authorized_forwarder"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/authorized_receiver"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/operator_wrapper"
@@ -24,7 +27,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 var GetAuthorisedSendersABI = evmtypes.MustGetABI(authorized_receiver.AuthorizedReceiverABI).Methods["getAuthorizedSenders"]
@@ -62,9 +64,9 @@ func TestFwdMgr_MaybeForwardTransaction(t *testing.T) {
 	fwdMgr := forwarders.NewFwdMgr(db, evmClient, lp, lggr, evmcfg.EVM(), evmcfg.Database())
 	fwdMgr.ORM = forwarders.NewORM(db, logger.Test(t), cfg.Database())
 
-	fwd, err := fwdMgr.ORM.CreateForwarder(forwarderAddr, utils.Big(*testutils.FixtureChainID))
+	fwd, err := fwdMgr.ORM.CreateForwarder(forwarderAddr, ubig.Big(*testutils.FixtureChainID))
 	require.NoError(t, err)
-	lst, err := fwdMgr.ORM.FindForwardersByChain(utils.Big(*testutils.FixtureChainID))
+	lst, err := fwdMgr.ORM.FindForwardersByChain(ubig.Big(*testutils.FixtureChainID))
 	require.NoError(t, err)
 	require.Equal(t, len(lst), 1)
 	require.Equal(t, lst[0].Address, forwarderAddr)
@@ -115,9 +117,9 @@ func TestFwdMgr_AccountUnauthorizedToForward_SkipsForwarding(t *testing.T) {
 	fwdMgr := forwarders.NewFwdMgr(db, evmClient, lp, lggr, evmcfg.EVM(), evmcfg.Database())
 	fwdMgr.ORM = forwarders.NewORM(db, logger.Test(t), cfg.Database())
 
-	_, err = fwdMgr.ORM.CreateForwarder(forwarderAddr, utils.Big(*testutils.FixtureChainID))
+	_, err = fwdMgr.ORM.CreateForwarder(forwarderAddr, ubig.Big(*testutils.FixtureChainID))
 	require.NoError(t, err)
-	lst, err := fwdMgr.ORM.FindForwardersByChain(utils.Big(*testutils.FixtureChainID))
+	lst, err := fwdMgr.ORM.FindForwardersByChain(ubig.Big(*testutils.FixtureChainID))
 	require.NoError(t, err)
 	require.Equal(t, len(lst), 1)
 	require.Equal(t, lst[0].Address, forwarderAddr)
diff --git a/core/chains/evm/forwarders/mocks/orm.go b/core/chains/evm/forwarders/mocks/orm.go
index c06a04b8eb1..691fbce8e9c 100644
--- a/core/chains/evm/forwarders/mocks/orm.go
+++ b/core/chains/evm/forwarders/mocks/orm.go
@@ -4,12 +4,13 @@ package mocks
 
 import (
 	common "github.com/ethereum/go-ethereum/common"
+	big "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
+
 	forwarders "github.com/smartcontractkit/chainlink/v2/core/chains/evm/forwarders"
+
 	mock "github.com/stretchr/testify/mock"
 
 	pg "github.com/smartcontractkit/chainlink/v2/core/services/pg"
-
-	utils "github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 // ORM is an autogenerated mock type for the ORM type
@@ -18,7 +19,7 @@ type ORM struct {
 }
 
 // CreateForwarder provides a mock function with given fields: addr, evmChainId
-func (_m *ORM) CreateForwarder(addr common.Address, evmChainId utils.Big) (forwarders.Forwarder, error) {
+func (_m *ORM) CreateForwarder(addr common.Address, evmChainId big.Big) (forwarders.Forwarder, error) {
 	ret := _m.Called(addr, evmChainId)
 
 	if len(ret) == 0 {
@@ -27,16 +28,16 @@ func (_m *ORM) CreateForwarder(addr common.Address, evmChainId utils.Big) (forwa
 
 	var r0 forwarders.Forwarder
 	var r1 error
-	if rf, ok := ret.Get(0).(func(common.Address, utils.Big) (forwarders.Forwarder, error)); ok {
+	if rf, ok := ret.Get(0).(func(common.Address, big.Big) (forwarders.Forwarder, error)); ok {
 		return rf(addr, evmChainId)
 	}
-	if rf, ok := ret.Get(0).(func(common.Address, utils.Big) forwarders.Forwarder); ok {
+	if rf, ok := ret.Get(0).(func(common.Address, big.Big) forwarders.Forwarder); ok {
 		r0 = rf(addr, evmChainId)
 	} else {
 		r0 = ret.Get(0).(forwarders.Forwarder)
 	}
 
-	if rf, ok := ret.Get(1).(func(common.Address, utils.Big) error); ok {
+	if rf, ok := ret.Get(1).(func(common.Address, big.Big) error); ok {
 		r1 = rf(addr, evmChainId)
 	} else {
 		r1 = ret.Error(1)
@@ -101,7 +102,7 @@ func (_m *ORM) FindForwarders(offset int, limit int) ([]forwarders.Forwarder, in
 }
 
 // FindForwardersByChain provides a mock function with given fields: evmChainId
-func (_m *ORM) FindForwardersByChain(evmChainId utils.Big) ([]forwarders.Forwarder, error) {
+func (_m *ORM) FindForwardersByChain(evmChainId big.Big) ([]forwarders.Forwarder, error) {
 	ret := _m.Called(evmChainId)
 
 	if len(ret) == 0 {
@@ -110,10 +111,10 @@ func (_m *ORM) FindForwardersByChain(evmChainId utils.Big) ([]forwarders.Forward
 
 	var r0 []forwarders.Forwarder
 	var r1 error
-	if rf, ok := ret.Get(0).(func(utils.Big) ([]forwarders.Forwarder, error)); ok {
+	if rf, ok := ret.Get(0).(func(big.Big) ([]forwarders.Forwarder, error)); ok {
 		return rf(evmChainId)
 	}
-	if rf, ok := ret.Get(0).(func(utils.Big) []forwarders.Forwarder); ok {
+	if rf, ok := ret.Get(0).(func(big.Big) []forwarders.Forwarder); ok {
 		r0 = rf(evmChainId)
 	} else {
 		if ret.Get(0) != nil {
@@ -121,7 +122,7 @@ func (_m *ORM) FindForwardersByChain(evmChainId utils.Big) ([]forwarders.Forward
 		}
 	}
 
-	if rf, ok := ret.Get(1).(func(utils.Big) error); ok {
+	if rf, ok := ret.Get(1).(func(big.Big) error); ok {
 		r1 = rf(evmChainId)
 	} else {
 		r1 = ret.Error(1)
@@ -131,7 +132,7 @@ func (_m *ORM) FindForwardersByChain(evmChainId utils.Big) ([]forwarders.Forward
 }
 
 // FindForwardersInListByChain provides a mock function with given fields: evmChainId, addrs
-func (_m *ORM) FindForwardersInListByChain(evmChainId utils.Big, addrs []common.Address) ([]forwarders.Forwarder, error) {
+func (_m *ORM) FindForwardersInListByChain(evmChainId big.Big, addrs []common.Address) ([]forwarders.Forwarder, error) {
 	ret := _m.Called(evmChainId, addrs)
 
 	if len(ret) == 0 {
@@ -140,10 +141,10 @@ func (_m *ORM) FindForwardersInListByChain(evmChainId utils.Big, addrs []common.
 
 	var r0 []forwarders.Forwarder
 	var r1 error
-	if rf, ok := ret.Get(0).(func(utils.Big, []common.Address) ([]forwarders.Forwarder, error)); ok {
+	if rf, ok := ret.Get(0).(func(big.Big, []common.Address) ([]forwarders.Forwarder, error)); ok {
 		return rf(evmChainId, addrs)
 	}
-	if rf, ok := ret.Get(0).(func(utils.Big, []common.Address) []forwarders.Forwarder); ok {
+	if rf, ok := ret.Get(0).(func(big.Big, []common.Address) []forwarders.Forwarder); ok {
 		r0 = rf(evmChainId, addrs)
 	} else {
 		if ret.Get(0) != nil {
@@ -151,7 +152,7 @@ func (_m *ORM) FindForwardersInListByChain(evmChainId utils.Big, addrs []common.
 		}
 	}
 
-	if rf, ok := ret.Get(1).(func(utils.Big, []common.Address) error); ok {
+	if rf, ok := ret.Get(1).(func(big.Big, []common.Address) error); ok {
 		r1 = rf(evmChainId, addrs)
 	} else {
 		r1 = ret.Error(1)
diff --git a/core/chains/evm/forwarders/orm.go b/core/chains/evm/forwarders/orm.go
index 104e2574252..2a455360190 100644
--- a/core/chains/evm/forwarders/orm.go
+++ b/core/chains/evm/forwarders/orm.go
@@ -8,18 +8,18 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 //go:generate mockery --quiet --name ORM --output ./mocks/ --case=underscore
 
 type ORM interface {
-	CreateForwarder(addr common.Address, evmChainId utils.Big) (fwd Forwarder, err error)
+	CreateForwarder(addr common.Address, evmChainId big.Big) (fwd Forwarder, err error)
 	FindForwarders(offset, limit int) ([]Forwarder, int, error)
-	FindForwardersByChain(evmChainId utils.Big) ([]Forwarder, error)
+	FindForwardersByChain(evmChainId big.Big) ([]Forwarder, error)
 	DeleteForwarder(id int64, cleanup func(tx pg.Queryer, evmChainId int64, addr common.Address) error) error
-	FindForwardersInListByChain(evmChainId utils.Big, addrs []common.Address) ([]Forwarder, error)
+	FindForwardersInListByChain(evmChainId big.Big, addrs []common.Address) ([]Forwarder, error)
 }
 
 type orm struct {
@@ -33,7 +33,7 @@ func NewORM(db *sqlx.DB, lggr logger.Logger, cfg pg.QConfig) *orm {
 }
 
 // CreateForwarder creates the Forwarder address associated with the current EVM chain id.
-func (o *orm) CreateForwarder(addr common.Address, evmChainId utils.Big) (fwd Forwarder, err error) {
+func (o *orm) CreateForwarder(addr common.Address, evmChainId big.Big) (fwd Forwarder, err error) {
 	sql := `INSERT INTO evm.forwarders (address, evm_chain_id, created_at, updated_at) VALUES ($1, $2, now(), now()) RETURNING *`
 	err = o.q.Get(&fwd, sql, addr, evmChainId)
 	return fwd, err
@@ -93,13 +93,13 @@ func (o *orm) FindForwarders(offset, limit int) (fwds []Forwarder, count int, er
 }
 
 // FindForwardersByChain returns all forwarder addresses for a chain.
-func (o *orm) FindForwardersByChain(evmChainId utils.Big) (fwds []Forwarder, err error) {
+func (o *orm) FindForwardersByChain(evmChainId big.Big) (fwds []Forwarder, err error) {
 	sql := `SELECT * FROM evm.forwarders where evm_chain_id = $1 ORDER BY created_at DESC, id DESC`
 	err = o.q.Select(&fwds, sql, evmChainId)
 	return
 }
 
-func (o *orm) FindForwardersInListByChain(evmChainId utils.Big, addrs []common.Address) ([]Forwarder, error) {
+func (o *orm) FindForwardersInListByChain(evmChainId big.Big, addrs []common.Address) ([]Forwarder, error) {
 	var fwdrs []Forwarder
 
 	arg := map[string]interface{}{
diff --git a/core/chains/evm/forwarders/orm_test.go b/core/chains/evm/forwarders/orm_test.go
index ba9664c196a..e95ac3778c6 100644
--- a/core/chains/evm/forwarders/orm_test.go
+++ b/core/chains/evm/forwarders/orm_test.go
@@ -10,10 +10,10 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 
 	"github.com/jmoiron/sqlx"
 )
@@ -42,7 +42,7 @@ func Test_DeleteForwarder(t *testing.T) {
 	addr := testutils.NewAddress()
 	chainID := testutils.FixtureChainID
 
-	fwd, err := orm.CreateForwarder(addr, *utils.NewBig(chainID))
+	fwd, err := orm.CreateForwarder(addr, *big.New(chainID))
 	require.NoError(t, err)
 	assert.Equal(t, addr, fwd.Address)
 
diff --git a/core/chains/evm/gas/block_history_estimator_test.go b/core/chains/evm/gas/block_history_estimator_test.go
index d3edf212b6a..43ea3e0bb79 100644
--- a/core/chains/evm/gas/block_history_estimator_test.go
+++ b/core/chains/evm/gas/block_history_estimator_test.go
@@ -25,6 +25,7 @@ import (
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
@@ -429,7 +430,7 @@ func TestBlockHistoryEstimator_FetchBlocks(t *testing.T) {
 			elems[1].Result = &b42
 		})
 
-		head := evmtypes.NewHead(big.NewInt(44), b44.Hash, b43.Hash, uint64(time.Now().Unix()), utils.NewBig(&cltest.FixtureChainID))
+		head := evmtypes.NewHead(big.NewInt(44), b44.Hash, b43.Hash, uint64(time.Now().Unix()), ubig.New(&cltest.FixtureChainID))
 		err = bhe.FetchBlocks(testutils.Context(t), &head)
 		require.NoError(t, err)
 
@@ -493,8 +494,8 @@ func TestBlockHistoryEstimator_FetchBlocks(t *testing.T) {
 			elems[1].Result = &b2
 		})
 
-		head2 := evmtypes.NewHead(big.NewInt(2), b2.Hash, b1.Hash, uint64(time.Now().Unix()), utils.NewBig(&cltest.FixtureChainID))
-		head3 := evmtypes.NewHead(big.NewInt(3), b3.Hash, b2.Hash, uint64(time.Now().Unix()), utils.NewBig(&cltest.FixtureChainID))
+		head2 := evmtypes.NewHead(big.NewInt(2), b2.Hash, b1.Hash, uint64(time.Now().Unix()), ubig.New(&cltest.FixtureChainID))
+		head3 := evmtypes.NewHead(big.NewInt(3), b3.Hash, b2.Hash, uint64(time.Now().Unix()), ubig.New(&cltest.FixtureChainID))
 		head3.Parent = &head2
 		err := bhe.FetchBlocks(testutils.Context(t), &head3)
 		require.NoError(t, err)
@@ -546,8 +547,8 @@ func TestBlockHistoryEstimator_FetchBlocks(t *testing.T) {
 		gas.SetRollingBlockHistory(bhe, blocks)
 
 		// RE-ORG, head2 and head3 have different hash than saved b2 and b3
-		head2 := evmtypes.NewHead(big.NewInt(2), utils.NewHash(), b1.Hash, uint64(time.Now().Unix()), utils.NewBig(&cltest.FixtureChainID))
-		head3 := evmtypes.NewHead(big.NewInt(3), utils.NewHash(), head2.Hash, uint64(time.Now().Unix()), utils.NewBig(&cltest.FixtureChainID))
+		head2 := evmtypes.NewHead(big.NewInt(2), utils.NewHash(), b1.Hash, uint64(time.Now().Unix()), ubig.New(&cltest.FixtureChainID))
+		head3 := evmtypes.NewHead(big.NewInt(3), utils.NewHash(), head2.Hash, uint64(time.Now().Unix()), ubig.New(&cltest.FixtureChainID))
 		head3.Parent = &head2
 
 		ethClient.On("BatchCallContext", mock.Anything, mock.MatchedBy(func(b []rpc.BatchElem) bool {
@@ -617,8 +618,8 @@ func TestBlockHistoryEstimator_FetchBlocks(t *testing.T) {
 		gas.SetRollingBlockHistory(bhe, blocks)
 
 		// head2 and head3 have identical hash to saved blocks
-		head2 := evmtypes.NewHead(big.NewInt(2), b2.Hash, b1.Hash, uint64(time.Now().Unix()), utils.NewBig(&cltest.FixtureChainID))
-		head3 := evmtypes.NewHead(big.NewInt(3), b3.Hash, head2.Hash, uint64(time.Now().Unix()), utils.NewBig(&cltest.FixtureChainID))
+		head2 := evmtypes.NewHead(big.NewInt(2), b2.Hash, b1.Hash, uint64(time.Now().Unix()), ubig.New(&cltest.FixtureChainID))
+		head3 := evmtypes.NewHead(big.NewInt(3), b3.Hash, head2.Hash, uint64(time.Now().Unix()), ubig.New(&cltest.FixtureChainID))
 		head3.Parent = &head2
 
 		err := bhe.FetchBlocks(testutils.Context(t), &head3)
diff --git a/core/chains/evm/headtracker/head_broadcaster_test.go b/core/chains/evm/headtracker/head_broadcaster_test.go
index b9fab9cdd48..21c864eda69 100644
--- a/core/chains/evm/headtracker/head_broadcaster_test.go
+++ b/core/chains/evm/headtracker/head_broadcaster_test.go
@@ -19,6 +19,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker/types"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
@@ -84,7 +85,7 @@ func TestHeadBroadcaster_Subscribe(t *testing.T) {
 	assert.Equal(t, (*evmtypes.Head)(nil), latest1)
 
 	headers := <-chchHeaders
-	h := evmtypes.Head{Number: 1, Hash: utils.NewHash(), ParentHash: utils.NewHash(), EVMChainID: utils.NewBig(&cltest.FixtureChainID)}
+	h := evmtypes.Head{Number: 1, Hash: utils.NewHash(), ParentHash: utils.NewHash(), EVMChainID: big.New(&cltest.FixtureChainID)}
 	headers <- &h
 	g.Eventually(checker1.OnNewLongestChainCount).Should(gomega.Equal(int32(1)))
 
@@ -95,7 +96,7 @@ func TestHeadBroadcaster_Subscribe(t *testing.T) {
 
 	unsubscribe1()
 
-	headers <- &evmtypes.Head{Number: 2, Hash: utils.NewHash(), ParentHash: h.Hash, EVMChainID: utils.NewBig(&cltest.FixtureChainID)}
+	headers <- &evmtypes.Head{Number: 2, Hash: utils.NewHash(), ParentHash: h.Hash, EVMChainID: big.New(&cltest.FixtureChainID)}
 	g.Eventually(checker2.OnNewLongestChainCount).Should(gomega.Equal(int32(1)))
 }
 
diff --git a/core/chains/evm/headtracker/head_tracker_test.go b/core/chains/evm/headtracker/head_tracker_test.go
index d8abb1328ac..67e76aee52b 100644
--- a/core/chains/evm/headtracker/head_tracker_test.go
+++ b/core/chains/evm/headtracker/head_tracker_test.go
@@ -29,6 +29,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker"
 	httypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker/types"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
@@ -258,7 +259,7 @@ func TestHeadTracker_CallsHeadTrackableCallbacks(t *testing.T) {
 	assert.Equal(t, int32(0), checker.OnNewLongestChainCount())
 
 	headers := <-chchHeaders
-	headers.TrySend(&evmtypes.Head{Number: 1, Hash: utils.NewHash(), EVMChainID: utils.NewBig(&cltest.FixtureChainID)})
+	headers.TrySend(&evmtypes.Head{Number: 1, Hash: utils.NewHash(), EVMChainID: ubig.New(&cltest.FixtureChainID)})
 	g.Eventually(checker.OnNewLongestChainCount).Should(gomega.Equal(int32(1)))
 
 	ht.Stop(t)
@@ -719,7 +720,7 @@ func TestHeadTracker_Backfill(t *testing.T) {
 		ParentHash: gethCommon.BigToHash(big.NewInt(0)),
 		Time:       now,
 	}
-	head0 := evmtypes.NewHead(gethHead0.Number, utils.NewHash(), gethHead0.ParentHash, gethHead0.Time, utils.NewBig(&cltest.FixtureChainID))
+	head0 := evmtypes.NewHead(gethHead0.Number, utils.NewHash(), gethHead0.ParentHash, gethHead0.Time, ubig.New(&cltest.FixtureChainID))
 
 	h1 := *cltest.Head(1)
 	h1.ParentHash = head0.Hash
@@ -729,7 +730,7 @@ func TestHeadTracker_Backfill(t *testing.T) {
 		ParentHash: utils.NewHash(),
 		Time:       now,
 	}
-	head8 := evmtypes.NewHead(gethHead8.Number, utils.NewHash(), gethHead8.ParentHash, gethHead8.Time, utils.NewBig(&cltest.FixtureChainID))
+	head8 := evmtypes.NewHead(gethHead8.Number, utils.NewHash(), gethHead8.ParentHash, gethHead8.Time, ubig.New(&cltest.FixtureChainID))
 
 	h9 := *cltest.Head(9)
 	h9.ParentHash = head8.Hash
@@ -739,7 +740,7 @@ func TestHeadTracker_Backfill(t *testing.T) {
 		ParentHash: h9.Hash,
 		Time:       now,
 	}
-	head10 := evmtypes.NewHead(gethHead10.Number, utils.NewHash(), gethHead10.ParentHash, gethHead10.Time, utils.NewBig(&cltest.FixtureChainID))
+	head10 := evmtypes.NewHead(gethHead10.Number, utils.NewHash(), gethHead10.ParentHash, gethHead10.Time, ubig.New(&cltest.FixtureChainID))
 
 	h11 := *cltest.Head(11)
 	h11.ParentHash = head10.Hash
diff --git a/core/chains/evm/headtracker/heads_test.go b/core/chains/evm/headtracker/heads_test.go
index 7da6b1cc9ba..11c1bfd4f7a 100644
--- a/core/chains/evm/headtracker/heads_test.go
+++ b/core/chains/evm/headtracker/heads_test.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
@@ -77,11 +78,11 @@ func TestHeads_AddHeads(t *testing.T) {
 	var parentHash common.Hash
 	for i := 0; i < 5; i++ {
 		hash := utils.NewHash()
-		h := evmtypes.NewHead(big.NewInt(int64(i)), hash, parentHash, uint64(time.Now().Unix()), utils.NewBigI(0))
+		h := evmtypes.NewHead(big.NewInt(int64(i)), hash, parentHash, uint64(time.Now().Unix()), ubig.NewI(0))
 		testHeads = append(testHeads, &h)
 		if i == 2 {
 			// uncled block
-			h := evmtypes.NewHead(big.NewInt(int64(i)), uncleHash, parentHash, uint64(time.Now().Unix()), utils.NewBigI(0))
+			h := evmtypes.NewHead(big.NewInt(int64(i)), uncleHash, parentHash, uint64(time.Now().Unix()), ubig.NewI(0))
 			testHeads = append(testHeads, &h)
 		}
 		parentHash = hash
diff --git a/core/chains/evm/headtracker/orm.go b/core/chains/evm/headtracker/orm.go
index 88d569b9a21..859f6764b63 100644
--- a/core/chains/evm/headtracker/orm.go
+++ b/core/chains/evm/headtracker/orm.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 type ORM interface {
@@ -32,11 +32,11 @@ type ORM interface {
 
 type orm struct {
 	q       pg.Q
-	chainID utils.Big
+	chainID ubig.Big
 }
 
 func NewORM(db *sqlx.DB, lggr logger.Logger, cfg pg.QConfig, chainID big.Int) ORM {
-	return &orm{pg.NewQ(db, logger.Named(lggr, "HeadTrackerORM"), cfg), utils.Big(chainID)}
+	return &orm{pg.NewQ(db, logger.Named(lggr, "HeadTrackerORM"), cfg), ubig.Big(chainID)}
 }
 
 func (orm *orm) IdempotentInsertHead(ctx context.Context, head *evmtypes.Head) error {
diff --git a/core/chains/evm/log/orm.go b/core/chains/evm/log/orm.go
index a2bcab6e785..3feb4bb836b 100644
--- a/core/chains/evm/log/orm.go
+++ b/core/chains/evm/log/orm.go
@@ -12,6 +12,7 @@ import (
 	"github.com/jmoiron/sqlx"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
@@ -48,13 +49,13 @@ type ORM interface {
 
 type orm struct {
 	q          pg.Q
-	evmChainID utils.Big
+	evmChainID ubig.Big
 }
 
 var _ ORM = (*orm)(nil)
 
 func NewORM(db *sqlx.DB, lggr logger.Logger, cfg pg.QConfig, evmChainID big.Int) *orm {
-	return &orm{pg.NewQ(db, lggr, cfg), *utils.NewBig(&evmChainID)}
+	return &orm{pg.NewQ(db, lggr, cfg), *ubig.New(&evmChainID)}
 }
 
 func (o *orm) WasBroadcastConsumed(blockHash common.Hash, logIndex uint, jobID int32, qopts ...pg.QOpt) (consumed bool, err error) {
@@ -128,7 +129,7 @@ func (o *orm) MarkBroadcastsConsumed(blockHashes []common.Hash, blockNumbers []u
 		BlockNumber uint64      `db:"blockNumber"`
 		LogIndex    uint        `db:"logIndex"`
 		JobID       int32       `db:"jobID"`
-		ChainID     utils.Big   `db:"chainID"`
+		ChainID     ubig.Big    `db:"chainID"`
 	}
 	inputs := make([]input, len(blockHashes))
 	query := `
diff --git a/core/chains/evm/logpoller/log_poller.go b/core/chains/evm/logpoller/log_poller.go
index 1cf1cf42beb..77b80253591 100644
--- a/core/chains/evm/logpoller/log_poller.go
+++ b/core/chains/evm/logpoller/log_poller.go
@@ -26,6 +26,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
@@ -608,7 +609,7 @@ func convertLogs(logs []types.Log, blocks []LogPollerBlock, lggr logger.Logger,
 			blockTimestamp = blocks[i].BlockTimestamp
 		}
 		lgs = append(lgs, Log{
-			EvmChainId: utils.NewBig(chainID),
+			EvmChainId: ubig.New(chainID),
 			LogIndex:   int64(l.Index),
 			BlockHash:  l.BlockHash,
 			// We assume block numbers fit in int64
diff --git a/core/chains/evm/logpoller/log_poller_test.go b/core/chains/evm/logpoller/log_poller_test.go
index 6c4dd381b54..ed2d617065b 100644
--- a/core/chains/evm/logpoller/log_poller_test.go
+++ b/core/chains/evm/logpoller/log_poller_test.go
@@ -30,6 +30,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/log_emitter"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest/heavyweight"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
@@ -62,7 +63,7 @@ func populateDatabase(t testing.TB, o *logpoller.DbORM, chainID *big.Int) (commo
 			blockTimestamp := startDate.Add(time.Duration(j*1000) * time.Hour)
 
 			logs = append(logs, logpoller.Log{
-				EvmChainId:     utils.NewBig(chainID),
+				EvmChainId:     ubig.New(chainID),
 				LogIndex:       1,
 				BlockHash:      common.HexToHash(fmt.Sprintf("0x%d", i+(1000*j))),
 				BlockNumber:    blockNumber,
@@ -1341,7 +1342,7 @@ func TestNotifyAfterInsert(t *testing.T) {
 	require.NoError(t, err)
 
 	log := logpoller.Log{
-		EvmChainId:     utils.NewBig(chainID),
+		EvmChainId:     ubig.New(chainID),
 		LogIndex:       10,
 		BlockHash:      testutils.Random32Byte(),
 		BlockNumber:    100,
diff --git a/core/chains/evm/logpoller/models.go b/core/chains/evm/logpoller/models.go
index 87ddd079a5b..c5d6f5eab1c 100644
--- a/core/chains/evm/logpoller/models.go
+++ b/core/chains/evm/logpoller/models.go
@@ -7,13 +7,13 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/lib/pq"
 
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 )
 
 // LogPollerBlock represents an unfinalized block
 // used for reorg detection when polling.
 type LogPollerBlock struct {
-	EvmChainId *utils.Big
+	EvmChainId *big.Big
 	BlockHash  common.Hash
 	// Note geth uses int64 internally https://github.com/ethereum/go-ethereum/blob/f66f1a16b3c480d3a43ac7e8a09ab3e362e96ae4/eth/filters/api.go#L340
 	BlockNumber          int64
@@ -24,7 +24,7 @@ type LogPollerBlock struct {
 
 // Log represents an EVM log.
 type Log struct {
-	EvmChainId     *utils.Big
+	EvmChainId     *big.Big
 	LogIndex       int64
 	BlockHash      common.Hash
 	BlockNumber    int64
diff --git a/core/chains/evm/logpoller/observability_test.go b/core/chains/evm/logpoller/observability_test.go
index 76575f46ca4..749934dc4b5 100644
--- a/core/chains/evm/logpoller/observability_test.go
+++ b/core/chains/evm/logpoller/observability_test.go
@@ -16,6 +16,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus/testutil"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
@@ -126,7 +127,7 @@ func generateRandomLogs(chainId, count int) []Log {
 	logs := make([]Log, count)
 	for i := range logs {
 		logs[i] = Log{
-			EvmChainId:     utils.NewBigI(int64(chainId)),
+			EvmChainId:     ubig.NewI(int64(chainId)),
 			LogIndex:       int64(i + 1),
 			BlockHash:      utils.RandomBytes32(),
 			BlockNumber:    int64(i + 1),
diff --git a/core/chains/evm/logpoller/orm.go b/core/chains/evm/logpoller/orm.go
index c24d423b253..663c56d10ed 100644
--- a/core/chains/evm/logpoller/orm.go
+++ b/core/chains/evm/logpoller/orm.go
@@ -12,8 +12,8 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 // ORM represents the persistent data access layer used by the log poller. At this moment, it's a bit leaky abstraction, because
@@ -119,7 +119,7 @@ func (o *DbORM) InsertFilter(filter Filter, qopts ...pg.QOpt) (err error) {
 // DeleteFilter removes all events,address pairs associated with the Filter
 func (o *DbORM) DeleteFilter(name string, qopts ...pg.QOpt) error {
 	q := o.q.WithOpts(qopts...)
-	return q.ExecQ(`DELETE FROM evm.log_poller_filters WHERE name = $1 AND evm_chain_id = $2`, name, utils.NewBig(o.chainID))
+	return q.ExecQ(`DELETE FROM evm.log_poller_filters WHERE name = $1 AND evm_chain_id = $2`, name, ubig.New(o.chainID))
 }
 
 // LoadFiltersForChain returns all filters for this chain
@@ -131,7 +131,7 @@ func (o *DbORM) LoadFilters(qopts ...pg.QOpt) (map[string]Filter, error) {
 			ARRAY_AGG(DISTINCT event)::BYTEA[] AS event_sigs,
 			MAX(retention) AS retention
 		FROM evm.log_poller_filters WHERE evm_chain_id = $1
-		GROUP BY name`, utils.NewBig(o.chainID))
+		GROUP BY name`, ubig.New(o.chainID))
 	filters := make(map[string]Filter)
 	for _, filter := range rows {
 		filters[filter.Name] = filter
@@ -143,7 +143,7 @@ func (o *DbORM) LoadFilters(qopts ...pg.QOpt) (map[string]Filter, error) {
 func (o *DbORM) SelectBlockByHash(hash common.Hash, qopts ...pg.QOpt) (*LogPollerBlock, error) {
 	q := o.q.WithOpts(qopts...)
 	var b LogPollerBlock
-	if err := q.Get(&b, `SELECT * FROM evm.log_poller_blocks WHERE block_hash = $1 AND evm_chain_id = $2`, hash, utils.NewBig(o.chainID)); err != nil {
+	if err := q.Get(&b, `SELECT * FROM evm.log_poller_blocks WHERE block_hash = $1 AND evm_chain_id = $2`, hash, ubig.New(o.chainID)); err != nil {
 		return nil, err
 	}
 	return &b, nil
@@ -152,7 +152,7 @@ func (o *DbORM) SelectBlockByHash(hash common.Hash, qopts ...pg.QOpt) (*LogPolle
 func (o *DbORM) SelectBlockByNumber(n int64, qopts ...pg.QOpt) (*LogPollerBlock, error) {
 	q := o.q.WithOpts(qopts...)
 	var b LogPollerBlock
-	if err := q.Get(&b, `SELECT * FROM evm.log_poller_blocks WHERE block_number = $1 AND evm_chain_id = $2`, n, utils.NewBig(o.chainID)); err != nil {
+	if err := q.Get(&b, `SELECT * FROM evm.log_poller_blocks WHERE block_number = $1 AND evm_chain_id = $2`, n, ubig.New(o.chainID)); err != nil {
 		return nil, err
 	}
 	return &b, nil
@@ -161,7 +161,7 @@ func (o *DbORM) SelectBlockByNumber(n int64, qopts ...pg.QOpt) (*LogPollerBlock,
 func (o *DbORM) SelectLatestBlock(qopts ...pg.QOpt) (*LogPollerBlock, error) {
 	q := o.q.WithOpts(qopts...)
 	var b LogPollerBlock
-	if err := q.Get(&b, `SELECT * FROM evm.log_poller_blocks WHERE evm_chain_id = $1 ORDER BY block_number DESC LIMIT 1`, utils.NewBig(o.chainID)); err != nil {
+	if err := q.Get(&b, `SELECT * FROM evm.log_poller_blocks WHERE evm_chain_id = $1 ORDER BY block_number DESC LIMIT 1`, ubig.New(o.chainID)); err != nil {
 		return nil, err
 	}
 	return &b, nil
@@ -191,7 +191,7 @@ func (o *DbORM) SelectLatestLogByEventSigWithConfs(eventSig common.Hash, address
 // DeleteBlocksBefore delete all blocks before and including end.
 func (o *DbORM) DeleteBlocksBefore(end int64, qopts ...pg.QOpt) error {
 	q := o.q.WithOpts(qopts...)
-	_, err := q.Exec(`DELETE FROM evm.log_poller_blocks WHERE block_number <= $1 AND evm_chain_id = $2`, end, utils.NewBig(o.chainID))
+	_, err := q.Exec(`DELETE FROM evm.log_poller_blocks WHERE block_number <= $1 AND evm_chain_id = $2`, end, ubig.New(o.chainID))
 	return err
 }
 
@@ -241,7 +241,7 @@ func (o *DbORM) DeleteExpiredLogs(qopts ...pg.QOpt) error {
 		) DELETE FROM evm.logs l USING r
 			WHERE l.evm_chain_id = $1 AND l.address=r.address AND l.event_sig=r.event
 			AND l.created_at <= STATEMENT_TIMESTAMP() - (r.retention / 10^9 * interval '1 second')`, // retention is in nanoseconds (time.Duration aka BIGINT)
-		utils.NewBig(o.chainID))
+		ubig.New(o.chainID))
 }
 
 // InsertLogs is idempotent to support replays.
diff --git a/core/chains/evm/logpoller/orm_test.go b/core/chains/evm/logpoller/orm_test.go
index 2a6ebb2c04e..3c54b3cf654 100644
--- a/core/chains/evm/logpoller/orm_test.go
+++ b/core/chains/evm/logpoller/orm_test.go
@@ -18,6 +18,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest/heavyweight"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
@@ -37,7 +38,7 @@ func GenLog(chainID *big.Int, logIndex int64, blockNum int64, blockHash string,
 
 func GenLogWithTimestamp(chainID *big.Int, logIndex int64, blockNum int64, blockHash string, topic1 []byte, address common.Address, blockTimestamp time.Time) logpoller.Log {
 	return logpoller.Log{
-		EvmChainId:     utils.NewBig(chainID),
+		EvmChainId:     ubig.New(chainID),
 		LogIndex:       logIndex,
 		BlockHash:      common.HexToHash(blockHash),
 		BlockNumber:    blockNum,
@@ -52,7 +53,7 @@ func GenLogWithTimestamp(chainID *big.Int, logIndex int64, blockNum int64, block
 
 func GenLogWithData(chainID *big.Int, address common.Address, eventSig common.Hash, logIndex int64, blockNum int64, data []byte) logpoller.Log {
 	return logpoller.Log{
-		EvmChainId:     utils.NewBig(chainID),
+		EvmChainId:     ubig.New(chainID),
 		LogIndex:       logIndex,
 		BlockHash:      utils.RandomBytes32(),
 		BlockNumber:    blockNum,
@@ -219,7 +220,7 @@ func TestORM(t *testing.T) {
 	topic2 := common.HexToHash("0x1600")
 	require.NoError(t, o1.InsertLogs([]logpoller.Log{
 		{
-			EvmChainId:  utils.NewBig(th.ChainID),
+			EvmChainId:  ubig.New(th.ChainID),
 			LogIndex:    1,
 			BlockHash:   common.HexToHash("0x1234"),
 			BlockNumber: int64(10),
@@ -230,7 +231,7 @@ func TestORM(t *testing.T) {
 			Data:        []byte("hello"),
 		},
 		{
-			EvmChainId:  utils.NewBig(th.ChainID),
+			EvmChainId:  ubig.New(th.ChainID),
 			LogIndex:    2,
 			BlockHash:   common.HexToHash("0x1234"),
 			BlockNumber: int64(11),
@@ -241,7 +242,7 @@ func TestORM(t *testing.T) {
 			Data:        []byte("hello"),
 		},
 		{
-			EvmChainId:  utils.NewBig(th.ChainID),
+			EvmChainId:  ubig.New(th.ChainID),
 			LogIndex:    3,
 			BlockHash:   common.HexToHash("0x1234"),
 			BlockNumber: int64(12),
@@ -252,7 +253,7 @@ func TestORM(t *testing.T) {
 			Data:        []byte("hello"),
 		},
 		{
-			EvmChainId:  utils.NewBig(th.ChainID),
+			EvmChainId:  ubig.New(th.ChainID),
 			LogIndex:    4,
 			BlockHash:   common.HexToHash("0x1234"),
 			BlockNumber: int64(13),
@@ -263,7 +264,7 @@ func TestORM(t *testing.T) {
 			Data:        []byte("hello"),
 		},
 		{
-			EvmChainId:  utils.NewBig(th.ChainID),
+			EvmChainId:  ubig.New(th.ChainID),
 			LogIndex:    5,
 			BlockHash:   common.HexToHash("0x1234"),
 			BlockNumber: int64(14),
@@ -274,7 +275,7 @@ func TestORM(t *testing.T) {
 			Data:        []byte("hello2"),
 		},
 		{
-			EvmChainId:  utils.NewBig(th.ChainID),
+			EvmChainId:  ubig.New(th.ChainID),
 			LogIndex:    6,
 			BlockHash:   common.HexToHash("0x1234"),
 			BlockNumber: int64(15),
@@ -285,7 +286,7 @@ func TestORM(t *testing.T) {
 			Data:        []byte("hello2"),
 		},
 		{
-			EvmChainId:  utils.NewBig(th.ChainID),
+			EvmChainId:  ubig.New(th.ChainID),
 			LogIndex:    7,
 			BlockHash:   common.HexToHash("0x1237"),
 			BlockNumber: int64(16),
@@ -296,7 +297,7 @@ func TestORM(t *testing.T) {
 			Data:        []byte("hello short retention"),
 		},
 		{
-			EvmChainId:  utils.NewBig(th.ChainID),
+			EvmChainId:  ubig.New(th.ChainID),
 			LogIndex:    8,
 			BlockHash:   common.HexToHash("0x1238"),
 			BlockNumber: int64(17),
@@ -451,7 +452,7 @@ func insertLogsTopicValueRange(t *testing.T, chainID *big.Int, o *logpoller.DbOR
 	var lgs []logpoller.Log
 	for i := start; i <= stop; i++ {
 		lgs = append(lgs, logpoller.Log{
-			EvmChainId:  utils.NewBig(chainID),
+			EvmChainId:  ubig.New(chainID),
 			LogIndex:    int64(i),
 			BlockHash:   common.HexToHash("0x1234"),
 			BlockNumber: int64(blockNumber),
@@ -536,7 +537,7 @@ func TestORM_SelectIndexedLogsByTxHash(t *testing.T) {
 	require.NoError(t, o1.InsertBlock(common.HexToHash("0x1"), 1, time.Now(), 0))
 	logs := []logpoller.Log{
 		{
-			EvmChainId:  utils.NewBig(th.ChainID),
+			EvmChainId:  ubig.New(th.ChainID),
 			LogIndex:    int64(0),
 			BlockHash:   common.HexToHash("0x1"),
 			BlockNumber: int64(1),
@@ -547,7 +548,7 @@ func TestORM_SelectIndexedLogsByTxHash(t *testing.T) {
 			Data:        logpoller.EvmWord(1).Bytes(),
 		},
 		{
-			EvmChainId:  utils.NewBig(th.ChainID),
+			EvmChainId:  ubig.New(th.ChainID),
 			LogIndex:    int64(1),
 			BlockHash:   common.HexToHash("0x1"),
 			BlockNumber: int64(1),
@@ -559,7 +560,7 @@ func TestORM_SelectIndexedLogsByTxHash(t *testing.T) {
 		},
 		// Different txHash
 		{
-			EvmChainId:  utils.NewBig(th.ChainID),
+			EvmChainId:  ubig.New(th.ChainID),
 			LogIndex:    int64(2),
 			BlockHash:   common.HexToHash("0x1"),
 			BlockNumber: int64(1),
@@ -571,7 +572,7 @@ func TestORM_SelectIndexedLogsByTxHash(t *testing.T) {
 		},
 		// Different eventSig
 		{
-			EvmChainId:  utils.NewBig(th.ChainID),
+			EvmChainId:  ubig.New(th.ChainID),
 			LogIndex:    int64(3),
 			BlockHash:   common.HexToHash("0x1"),
 			BlockNumber: int64(1),
@@ -600,7 +601,7 @@ func TestORM_DataWords(t *testing.T) {
 	require.NoError(t, o1.InsertBlock(common.HexToHash("0x1"), 1, time.Now(), 0))
 	require.NoError(t, o1.InsertLogs([]logpoller.Log{
 		{
-			EvmChainId:  utils.NewBig(th.ChainID),
+			EvmChainId:  ubig.New(th.ChainID),
 			LogIndex:    int64(0),
 			BlockHash:   common.HexToHash("0x1"),
 			BlockNumber: int64(1),
@@ -612,7 +613,7 @@ func TestORM_DataWords(t *testing.T) {
 		},
 		{
 			// In block 2, unconfirmed to start
-			EvmChainId:  utils.NewBig(th.ChainID),
+			EvmChainId:  ubig.New(th.ChainID),
 			LogIndex:    int64(1),
 			BlockHash:   common.HexToHash("0x2"),
 			BlockNumber: int64(2),
@@ -667,7 +668,7 @@ func TestORM_SelectLogsWithSigsByBlockRangeFilter(t *testing.T) {
 	sourceAddr := common.HexToAddress("0x12345")
 	inputLogs := []logpoller.Log{
 		{
-			EvmChainId:  utils.NewBig(th.ChainID),
+			EvmChainId:  ubig.New(th.ChainID),
 			LogIndex:    1,
 			BlockHash:   common.HexToHash("0x1234"),
 			BlockNumber: int64(10),
@@ -678,7 +679,7 @@ func TestORM_SelectLogsWithSigsByBlockRangeFilter(t *testing.T) {
 			Data:        []byte("hello1"),
 		},
 		{
-			EvmChainId:  utils.NewBig(th.ChainID),
+			EvmChainId:  ubig.New(th.ChainID),
 			LogIndex:    2,
 			BlockHash:   common.HexToHash("0x1235"),
 			BlockNumber: int64(11),
@@ -689,7 +690,7 @@ func TestORM_SelectLogsWithSigsByBlockRangeFilter(t *testing.T) {
 			Data:        []byte("hello2"),
 		},
 		{
-			EvmChainId:  utils.NewBig(th.ChainID),
+			EvmChainId:  ubig.New(th.ChainID),
 			LogIndex:    3,
 			BlockHash:   common.HexToHash("0x1236"),
 			BlockNumber: int64(12),
@@ -700,7 +701,7 @@ func TestORM_SelectLogsWithSigsByBlockRangeFilter(t *testing.T) {
 			Data:        []byte("hello3"),
 		},
 		{
-			EvmChainId:  utils.NewBig(th.ChainID),
+			EvmChainId:  ubig.New(th.ChainID),
 			LogIndex:    4,
 			BlockHash:   common.HexToHash("0x1237"),
 			BlockNumber: int64(13),
@@ -711,7 +712,7 @@ func TestORM_SelectLogsWithSigsByBlockRangeFilter(t *testing.T) {
 			Data:        []byte("hello4"),
 		},
 		{
-			EvmChainId:  utils.NewBig(th.ChainID),
+			EvmChainId:  ubig.New(th.ChainID),
 			LogIndex:    5,
 			BlockHash:   common.HexToHash("0x1238"),
 			BlockNumber: int64(14),
@@ -722,7 +723,7 @@ func TestORM_SelectLogsWithSigsByBlockRangeFilter(t *testing.T) {
 			Data:        []byte("hello5"),
 		},
 		{
-			EvmChainId:  utils.NewBig(th.ChainID),
+			EvmChainId:  ubig.New(th.ChainID),
 			LogIndex:    6,
 			BlockHash:   common.HexToHash("0x1239"),
 			BlockNumber: int64(15),
@@ -827,7 +828,7 @@ func BenchmarkLogs(b *testing.B) {
 	addr := common.HexToAddress("0x1234")
 	for i := 0; i < 10_000; i++ {
 		lgs = append(lgs, logpoller.Log{
-			EvmChainId:  utils.NewBig(th.ChainID),
+			EvmChainId:  ubig.New(th.ChainID),
 			LogIndex:    int64(i),
 			BlockHash:   common.HexToHash("0x1"),
 			BlockNumber: 1,
@@ -866,7 +867,7 @@ func TestSelectLogsWithSigsExcluding(t *testing.T) {
 	//Insert two logs that mimics an oracle request from 2 different addresses (matching will be on topic index 1)
 	require.NoError(t, orm.InsertLogs([]logpoller.Log{
 		{
-			EvmChainId:     (*utils.Big)(th.ChainID),
+			EvmChainId:     (*ubig.Big)(th.ChainID),
 			LogIndex:       1,
 			BlockHash:      common.HexToHash("0x1"),
 			BlockNumber:    1,
@@ -878,7 +879,7 @@ func TestSelectLogsWithSigsExcluding(t *testing.T) {
 			Data:           []byte("requestID-A1"),
 		},
 		{
-			EvmChainId:     (*utils.Big)(th.ChainID),
+			EvmChainId:     (*ubig.Big)(th.ChainID),
 			LogIndex:       2,
 			BlockHash:      common.HexToHash("0x1"),
 			BlockNumber:    1,
@@ -907,7 +908,7 @@ func TestSelectLogsWithSigsExcluding(t *testing.T) {
 	//Insert a log that mimics response for requestID-A1
 	require.NoError(t, orm.InsertLogs([]logpoller.Log{
 		{
-			EvmChainId:     (*utils.Big)(th.ChainID),
+			EvmChainId:     (*ubig.Big)(th.ChainID),
 			LogIndex:       3,
 			BlockHash:      common.HexToHash("0x2"),
 			BlockNumber:    2,
@@ -935,7 +936,7 @@ func TestSelectLogsWithSigsExcluding(t *testing.T) {
 	//Insert 3 request from addressC (matching will be on topic index 3)
 	require.NoError(t, orm.InsertLogs([]logpoller.Log{
 		{
-			EvmChainId:     (*utils.Big)(th.ChainID),
+			EvmChainId:     (*ubig.Big)(th.ChainID),
 			LogIndex:       5,
 			BlockHash:      common.HexToHash("0x2"),
 			BlockNumber:    3,
@@ -947,7 +948,7 @@ func TestSelectLogsWithSigsExcluding(t *testing.T) {
 			Data:           []byte("requestID-C1"),
 		},
 		{
-			EvmChainId:     (*utils.Big)(th.ChainID),
+			EvmChainId:     (*ubig.Big)(th.ChainID),
 			LogIndex:       6,
 			BlockHash:      common.HexToHash("0x2"),
 			BlockNumber:    3,
@@ -958,7 +959,7 @@ func TestSelectLogsWithSigsExcluding(t *testing.T) {
 			TxHash:         common.HexToHash("0x0002"),
 			Data:           []byte("requestID-C2"),
 		}, {
-			EvmChainId:     (*utils.Big)(th.ChainID),
+			EvmChainId:     (*ubig.Big)(th.ChainID),
 			LogIndex:       7,
 			BlockHash:      common.HexToHash("0x2"),
 			BlockNumber:    3,
@@ -983,7 +984,7 @@ func TestSelectLogsWithSigsExcluding(t *testing.T) {
 	//Fulfill requestID-C2
 	require.NoError(t, orm.InsertLogs([]logpoller.Log{
 		{
-			EvmChainId:     (*utils.Big)(th.ChainID),
+			EvmChainId:     (*ubig.Big)(th.ChainID),
 			LogIndex:       8,
 			BlockHash:      common.HexToHash("0x3"),
 			BlockNumber:    3,
@@ -1006,7 +1007,7 @@ func TestSelectLogsWithSigsExcluding(t *testing.T) {
 	//Fulfill requestID-C3
 	require.NoError(t, orm.InsertLogs([]logpoller.Log{
 		{
-			EvmChainId:     (*utils.Big)(th.ChainID),
+			EvmChainId:     (*ubig.Big)(th.ChainID),
 			LogIndex:       9,
 			BlockHash:      common.HexToHash("0x3"),
 			BlockNumber:    3,
@@ -1041,7 +1042,7 @@ func TestSelectLogsWithSigsExcluding(t *testing.T) {
 	//Fulfill requestID-C3
 	require.NoError(t, orm.InsertLogs([]logpoller.Log{
 		{
-			EvmChainId:     (*utils.Big)(th.ChainID),
+			EvmChainId:     (*ubig.Big)(th.ChainID),
 			LogIndex:       10,
 			BlockHash:      common.HexToHash("0x2"),
 			BlockNumber:    10,
@@ -1533,7 +1534,7 @@ func Benchmark_LogsDataWordBetween(b *testing.B) {
 		data = append(data, logpoller.EvmWord(uint64(numberOfMessagesPerReport*(i+1))).Bytes()...)
 
 		dbLogs = append(dbLogs, logpoller.Log{
-			EvmChainId:     utils.NewBig(chainId),
+			EvmChainId:     ubig.New(chainId),
 			LogIndex:       int64(i + 1),
 			BlockHash:      utils.RandomBytes32(),
 			BlockNumber:    int64(i + 1),
diff --git a/core/chains/evm/logpoller/query.go b/core/chains/evm/logpoller/query.go
index b7fbfade680..a37b15b2b2d 100644
--- a/core/chains/evm/logpoller/query.go
+++ b/core/chains/evm/logpoller/query.go
@@ -9,7 +9,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/lib/pq"
 
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 )
 
 type bytesProducer interface {
@@ -34,7 +34,7 @@ type queryArgs struct {
 func newQueryArgs(chainId *big.Int) *queryArgs {
 	return &queryArgs{
 		args: map[string]interface{}{
-			"evm_chain_id": utils.NewBig(chainId),
+			"evm_chain_id": ubig.New(chainId),
 		},
 		err: []error{},
 	}
diff --git a/core/chains/evm/logpoller/query_test.go b/core/chains/evm/logpoller/query_test.go
index e38aeb05819..bc2b20c85c2 100644
--- a/core/chains/evm/logpoller/query_test.go
+++ b/core/chains/evm/logpoller/query_test.go
@@ -8,6 +8,7 @@ import (
 	"github.com/lib/pq"
 	"github.com/stretchr/testify/require"
 
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
@@ -22,7 +23,7 @@ func Test_QueryArgs(t *testing.T) {
 			name:      "valid arguments",
 			queryArgs: newQueryArgs(big.NewInt(20)).withAddress(utils.ZeroAddress),
 			want: map[string]interface{}{
-				"evm_chain_id": utils.NewBigI(20),
+				"evm_chain_id": ubig.NewI(20),
 				"address":      utils.ZeroAddress,
 			},
 		},
diff --git a/core/chains/evm/txmgr/broadcaster_test.go b/core/chains/evm/txmgr/broadcaster_test.go
index 21a4bd2865c..b9e8fe99e31 100644
--- a/core/chains/evm/txmgr/broadcaster_test.go
+++ b/core/chains/evm/txmgr/broadcaster_test.go
@@ -37,6 +37,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest/heavyweight"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
@@ -1897,7 +1898,7 @@ func Test_NextNonce(t *testing.T) {
 	ethClient.On("PendingNonceAt", mock.Anything, addr1).Return(uint64(randNonce), nil).Once()
 	eb := NewTestEthBroadcaster(t, txStore, ethClient, ks, evmcfg, checkerFactory, false)
 	ctx := testutils.Context(t)
-	cltest.MustInsertRandomKey(t, ks, *utils.NewBig(testutils.FixtureChainID))
+	cltest.MustInsertRandomKey(t, ks, *ubig.New(testutils.FixtureChainID))
 
 	nonce, err := eb.GetNextSequence(ctx, addr1)
 	require.NoError(t, err)
diff --git a/core/chains/evm/txmgr/evm_tx_store.go b/core/chains/evm/txmgr/evm_tx_store.go
index 1c9868741fa..bb2a30e51dd 100644
--- a/core/chains/evm/txmgr/evm_tx_store.go
+++ b/core/chains/evm/txmgr/evm_tx_store.go
@@ -28,8 +28,8 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/label"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 var (
@@ -177,7 +177,7 @@ type DbEthTx struct {
 	Subject           uuid.NullUUID
 	PipelineTaskRunID uuid.NullUUID
 	MinConfirmations  null.Uint32
-	EVMChainID        utils.Big
+	EVMChainID        ubig.Big
 	// TransmitChecker defines the check that should be performed before a transaction is submitted on
 	// chain.
 	TransmitChecker    *sqlutil.JSON
@@ -210,7 +210,7 @@ func (db *DbEthTx) FromTx(tx *Tx) {
 	db.CallbackCompleted = tx.CallbackCompleted
 
 	if tx.ChainID != nil {
-		db.EVMChainID = *utils.NewBig(tx.ChainID)
+		db.EVMChainID = *ubig.New(tx.ChainID)
 	}
 	if tx.Sequence != nil {
 		n := tx.Sequence.Int64()
diff --git a/core/chains/evm/txmgr/resender_test.go b/core/chains/evm/txmgr/resender_test.go
index 0e86c0d4f8c..f6b0e3e29c7 100644
--- a/core/chains/evm/txmgr/resender_test.go
+++ b/core/chains/evm/txmgr/resender_test.go
@@ -16,6 +16,7 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
@@ -23,7 +24,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func Test_EthResender_resendUnconfirmed(t *testing.T) {
@@ -109,7 +109,7 @@ func Test_EthResender_alertUnconfirmed(t *testing.T) {
 	delay := models.MustNewDuration(1 * time.Nanosecond)
 	cfg := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
 		c.EVM[0] = &toml.EVMConfig{
-			Chain: toml.Defaults(utils.NewBig(big.NewInt(0)), &toml.Chain{
+			Chain: toml.Defaults(ubig.New(big.NewInt(0)), &toml.Chain{
 				Transactions: toml.Transactions{ResendAfterThreshold: delay},
 			}),
 		}
diff --git a/core/chains/evm/txmgr/tracker_test.go b/core/chains/evm/txmgr/tracker_test.go
index a31187f04e8..3e0bef51568 100644
--- a/core/chains/evm/txmgr/tracker_test.go
+++ b/core/chains/evm/txmgr/tracker_test.go
@@ -7,12 +7,12 @@ import (
 	"time"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/require"
@@ -33,8 +33,8 @@ func newTestEvmTrackerSetup(t *testing.T) (*txmgr.Tracker, txmgr.TestEvmTxStore,
 
 func generateEnabledAddresses(t *testing.T, keyStore keystore.Eth, chainID *big.Int) []common.Address {
 	var enabledAddresses []common.Address
-	_, addr1 := cltest.MustInsertRandomKey(t, keyStore, *utils.NewBigI(chainID.Int64()))
-	_, addr2 := cltest.MustInsertRandomKey(t, keyStore, *utils.NewBigI(chainID.Int64()))
+	_, addr1 := cltest.MustInsertRandomKey(t, keyStore, *ubig.NewI(chainID.Int64()))
+	_, addr2 := cltest.MustInsertRandomKey(t, keyStore, *ubig.NewI(chainID.Int64()))
 	enabledAddresses = append(enabledAddresses, addr1, addr2)
 	return enabledAddresses
 }
diff --git a/core/chains/evm/txmgr/txmgr_test.go b/core/chains/evm/txmgr/txmgr_test.go
index 9833acfd459..df913a41905 100644
--- a/core/chains/evm/txmgr/txmgr_test.go
+++ b/core/chains/evm/txmgr/txmgr_test.go
@@ -33,6 +33,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
@@ -206,7 +207,7 @@ func TestTxm_CreateTransaction(t *testing.T) {
 		require.Error(t, err)
 		assert.Contains(t, err.Error(), fmt.Sprintf("no eth key exists with address %s", rndAddr.String()))
 
-		_, otherAddress := cltest.MustInsertRandomKey(t, kst.Eth(), *utils.NewBigI(1337))
+		_, otherAddress := cltest.MustInsertRandomKey(t, kst.Eth(), *ubig.NewI(1337))
 
 		_, err = txm.CreateTransaction(testutils.Context(t), txmgr.TxRequest{
 			FromAddress:    otherAddress,
@@ -301,7 +302,7 @@ func TestTxm_CreateTransaction(t *testing.T) {
 		// Create mock forwarder, mock authorizedsenders call.
 		form := forwarders.NewORM(db, logger.Test(t), cfg.Database())
 		fwdrAddr := testutils.NewAddress()
-		fwdr, err := form.CreateForwarder(fwdrAddr, utils.Big(cltest.FixtureChainID))
+		fwdr, err := form.CreateForwarder(fwdrAddr, ubig.Big(cltest.FixtureChainID))
 		require.NoError(t, err)
 		require.Equal(t, fwdr.Address, fwdrAddr)
 
diff --git a/core/chains/evm/types/models.go b/core/chains/evm/types/models.go
index 314180a7e98..b7c1e5b56d5 100644
--- a/core/chains/evm/types/models.go
+++ b/core/chains/evm/types/models.go
@@ -20,6 +20,7 @@ import (
 	commontypes "github.com/smartcontractkit/chainlink/v2/common/types"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/types/internal/blocks"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/null"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
@@ -32,7 +33,7 @@ type Head struct {
 	L1BlockNumber    null.Int64
 	ParentHash       common.Hash
 	Parent           *Head
-	EVMChainID       *utils.Big
+	EVMChainID       *ubig.Big
 	Timestamp        time.Time
 	CreatedAt        time.Time
 	BaseFeePerGas    *assets.Wei
@@ -47,7 +48,7 @@ var _ commontypes.Head[common.Hash] = &Head{}
 var _ htrktypes.Head[common.Hash, *big.Int] = &Head{}
 
 // NewHead returns a Head instance.
-func NewHead(number *big.Int, blockHash common.Hash, parentHash common.Hash, timestamp uint64, chainID *utils.Big) Head {
+func NewHead(number *big.Int, blockHash common.Hash, parentHash common.Hash, timestamp uint64, chainID *ubig.Big) Head {
 	return Head{
 		Number:     number.Int64(),
 		Hash:       blockHash,
diff --git a/core/chains/evm/types/types.go b/core/chains/evm/types/types.go
index d0e7292b204..aa43806da1f 100644
--- a/core/chains/evm/types/types.go
+++ b/core/chains/evm/types/types.go
@@ -13,6 +13,7 @@ import (
 	"gopkg.in/guregu/null.v4"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
@@ -26,7 +27,7 @@ type Configs interface {
 
 type Node struct {
 	Name       string
-	EVMChainID utils.Big
+	EVMChainID ubig.Big
 	WSURL      null.String
 	HTTPURL    null.String
 	SendOnly   bool
diff --git a/core/utils/big.go b/core/chains/evm/utils/big/big.go
similarity index 91%
rename from core/utils/big.go
rename to core/chains/evm/utils/big/big.go
index 69fab223de7..f0ff475a7e7 100644
--- a/core/utils/big.go
+++ b/core/chains/evm/utils/big/big.go
@@ -1,4 +1,4 @@
-package utils
+package big
 
 import (
 	"database/sql/driver"
@@ -10,6 +10,7 @@ import (
 
 	bigmath "github.com/smartcontractkit/chainlink-common/pkg/utils/big_math"
 	"github.com/smartcontractkit/chainlink-common/pkg/utils/bytes"
+	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 const base10 = 10
@@ -50,8 +51,8 @@ func (b *BigFloat) Value() *big.Float {
 // Big stores large integers and can deserialize a variety of inputs.
 type Big big.Int
 
-// NewBig constructs a Big from *big.Int.
-func NewBig(i *big.Int) *Big {
+// New constructs a Big from *big.Int.
+func New(i *big.Int) *Big {
 	if i != nil {
 		var b big.Int
 		b.Set(i)
@@ -60,9 +61,9 @@ func NewBig(i *big.Int) *Big {
 	return nil
 }
 
-// NewBigI constructs a Big from int64.
-func NewBigI(i int64) *Big {
-	return NewBig(big.NewInt(i))
+// NewI constructs a Big from int64.
+func NewI(i int64) *Big {
+	return New(big.NewInt(i))
 }
 
 // MarshalText marshals this instance to base 10 number as string.
@@ -83,7 +84,7 @@ func (b Big) MarshalJSON() ([]byte, error) {
 func (b *Big) UnmarshalText(input []byte) error {
 	input = bytes.TrimQuotes(input)
 	str := string(input)
-	if HasHexPrefix(str) {
+	if utils.HasHexPrefix(str) {
 		decoded, err := hexutil.DecodeBig(str)
 		if err != nil {
 			return err
@@ -174,15 +175,15 @@ func (b *Big) Int64() int64 {
 
 // Add returns the sum of b and c
 func (b *Big) Add(c *Big) *Big {
-	return NewBig(bigmath.Add(b.ToInt(), c.ToInt()))
+	return New(bigmath.Add(b.ToInt(), c.ToInt()))
 }
 
 // Sub returns the differencs between b and c
 func (b *Big) Sub(c *Big) *Big {
-	return NewBig(bigmath.Sub(b.ToInt(), c.ToInt()))
+	return New(bigmath.Sub(b.ToInt(), c.ToInt()))
 }
 
 // Sub returns b % c
 func (b *Big) Mod(c *Big) *Big {
-	return NewBig(bigmath.Mod(b.ToInt(), c.ToInt()))
+	return New(bigmath.Mod(b.ToInt(), c.ToInt()))
 }
diff --git a/core/utils/big_test.go b/core/chains/evm/utils/big/big_test.go
similarity index 95%
rename from core/utils/big_test.go
rename to core/chains/evm/utils/big/big_test.go
index e46d46a0651..c4774cf1988 100644
--- a/core/utils/big_test.go
+++ b/core/chains/evm/utils/big/big_test.go
@@ -1,4 +1,4 @@
-package utils
+package big
 
 import (
 	"encoding/json"
@@ -198,15 +198,15 @@ func TestBig_Scan(t *testing.T) {
 		input interface{}
 		want  *Big
 	}{
-		{"zero string", "0", NewBig(big.NewInt(0))},
-		{"one string", "1", NewBig(big.NewInt(1))},
+		{"zero string", "0", New(big.NewInt(0))},
+		{"one string", "1", New(big.NewInt(1))},
 		{
 			"large string",
 			"115792089237316195423570985008687907853269984665640564039457584007913129639935",
-			NewBig(uint256Max),
+			New(uint256Max),
 		},
-		{"zero as bytes", []uint8{48}, NewBig(big.NewInt(0))},
-		{"small number as bytes", []uint8{49, 52}, NewBig(big.NewInt(14))},
+		{"zero as bytes", []uint8{48}, New(big.NewInt(0))},
+		{"small number as bytes", []uint8{49, 52}, New(big.NewInt(14))},
 		{
 			"max number as bytes",
 			[]uint8{
@@ -216,7 +216,7 @@ func TestBig_Scan(t *testing.T) {
 				48, 51, 57, 52, 53, 55, 53, 56, 52, 48, 48, 55, 57, 49, 51, 49, 50, 57,
 				54, 51, 57, 57, 51, 53,
 			},
-			NewBig(uint256Max),
+			New(uint256Max),
 		},
 	}
 	for _, test := range tests {
diff --git a/core/chains/evm/utils/utils.go b/core/chains/evm/utils/utils.go
new file mode 100644
index 00000000000..abcea77124a
--- /dev/null
+++ b/core/chains/evm/utils/utils.go
@@ -0,0 +1,37 @@
+package utils
+
+import (
+	"time"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/jpillora/backoff"
+	"golang.org/x/crypto/sha3"
+)
+
+// MustHash returns the keccak256 hash, or panics on failure.
+func MustHash(in string) common.Hash {
+	out, err := Keccak256([]byte(in))
+	if err != nil {
+		panic(err)
+	}
+	return common.BytesToHash(out)
+}
+
+// Keccak256 is a simplified interface for the legacy SHA3 implementation that
+// Ethereum uses.
+func Keccak256(in []byte) ([]byte, error) {
+	hash := sha3.NewLegacyKeccak256()
+	_, err := hash.Write(in)
+	return hash.Sum(nil), err
+}
+
+// NewRedialBackoff is a standard backoff to use for redialling or reconnecting to
+// unreachable network endpoints
+func NewRedialBackoff() backoff.Backoff {
+	return backoff.Backoff{
+		Min:    1 * time.Second,
+		Max:    15 * time.Second,
+		Jitter: true,
+	}
+
+}
diff --git a/core/chains/legacyevm/chain.go b/core/chains/legacyevm/chain.go
index 18277a55d03..ef84573cd09 100644
--- a/core/chains/legacyevm/chain.go
+++ b/core/chains/legacyevm/chain.go
@@ -33,11 +33,11 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/monitor"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/config"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 //go:generate mockery --quiet --name Chain --output ./mocks/ --case=underscore
@@ -127,7 +127,7 @@ type chain struct {
 }
 
 type errChainDisabled struct {
-	ChainID *utils.Big
+	ChainID *ubig.Big
 }
 
 func (e errChainDisabled) Error() string {
diff --git a/core/cmd/blocks_commands_test.go b/core/cmd/blocks_commands_test.go
index d0c0e118f9d..30540748cb1 100644
--- a/core/cmd/blocks_commands_test.go
+++ b/core/cmd/blocks_commands_test.go
@@ -8,15 +8,15 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/urfave/cli"
 
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func Test_ReplayFromBlock(t *testing.T) {
 	t.Parallel()
 
 	app := startNewApplicationV2(t, func(c *chainlink.Config, s *chainlink.Secrets) {
-		c.EVM[0].ChainID = (*utils.Big)(big.NewInt(5))
+		c.EVM[0].ChainID = (*ubig.Big)(big.NewInt(5))
 		c.EVM[0].Enabled = ptr(true)
 	})
 
diff --git a/core/cmd/eth_keys_commands_test.go b/core/cmd/eth_keys_commands_test.go
index 3eb45e27bd0..7c85b779ecc 100644
--- a/core/cmd/eth_keys_commands_test.go
+++ b/core/cmd/eth_keys_commands_test.go
@@ -14,6 +14,7 @@ import (
 
 	commonassets "github.com/smartcontractkit/chainlink-common/pkg/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/cmd"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
@@ -39,7 +40,7 @@ func TestEthKeysPresenter_RenderTable(t *testing.T) {
 		isDisabled     = true
 		createdAt      = time.Now()
 		updatedAt      = time.Now().Add(time.Second)
-		maxGasPriceWei = utils.NewBigI(12345)
+		maxGasPriceWei = ubig.NewI(12345)
 		bundleID       = cltest.DefaultOCRKeyBundleID
 		buffer         = bytes.NewBufferString("")
 		r              = cmd.RendererTable{Writer: buffer}
diff --git a/core/cmd/evm_chains_commands_test.go b/core/cmd/evm_chains_commands_test.go
index b4891271210..fa6d7bb519c 100644
--- a/core/cmd/evm_chains_commands_test.go
+++ b/core/cmd/evm_chains_commands_test.go
@@ -8,15 +8,15 @@ import (
 	"github.com/stretchr/testify/require"
 
 	client2 "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/cmd"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
-func newRandChainID() *utils.Big {
-	return utils.NewBig(testutils.NewRandomEVMChainID())
+func newRandChainID() *big.Big {
+	return big.New(testutils.NewRandomEVMChainID())
 }
 
 func TestShell_IndexEVMChains(t *testing.T) {
diff --git a/core/cmd/evm_transaction_commands.go b/core/cmd/evm_transaction_commands.go
index d702bc3b799..a1a11ab9b37 100644
--- a/core/cmd/evm_transaction_commands.go
+++ b/core/cmd/evm_transaction_commands.go
@@ -11,6 +11,7 @@ import (
 	"go.uber.org/multierr"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 	"github.com/smartcontractkit/chainlink/v2/core/utils/stringutils"
@@ -186,7 +187,7 @@ func (s *Shell) SendEther(c *cli.Context) (err error) {
 		DestinationAddress: destinationAddress,
 		FromAddress:        fromAddress,
 		Amount:             amount,
-		EVMChainID:         (*utils.Big)(evmChainID),
+		EVMChainID:         (*ubig.Big)(evmChainID),
 		AllowHigherAmounts: c.IsSet("force"),
 	}
 
diff --git a/core/cmd/forwarders_commands.go b/core/cmd/forwarders_commands.go
index 51e90a4390c..a870d4714c7 100644
--- a/core/cmd/forwarders_commands.go
+++ b/core/cmd/forwarders_commands.go
@@ -14,7 +14,7 @@ import (
 	"github.com/urfave/cli"
 	"go.uber.org/multierr"
 
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/web"
 	"github.com/smartcontractkit/chainlink/v2/core/web/presenters"
 )
@@ -136,7 +136,7 @@ func (s *Shell) TrackForwarder(c *cli.Context) (err error) {
 	}
 
 	request, err := json.Marshal(web.TrackEVMForwarderRequest{
-		EVMChainID: (*utils.Big)(chainID),
+		EVMChainID: (*ubig.Big)(chainID),
 		Address:    address,
 	})
 	if err != nil {
diff --git a/core/cmd/forwarders_commands_test.go b/core/cmd/forwarders_commands_test.go
index 179216b8e41..5946d31dc3d 100644
--- a/core/cmd/forwarders_commands_test.go
+++ b/core/cmd/forwarders_commands_test.go
@@ -10,6 +10,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/urfave/cli"
 
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/cmd"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
@@ -23,7 +24,7 @@ func TestEVMForwarderPresenter_RenderTable(t *testing.T) {
 	var (
 		id         = "1"
 		address    = utils.RandomAddress()
-		evmChainID = utils.NewBigI(4)
+		evmChainID = big.NewI(4)
 		createdAt  = time.Now()
 		updatedAt  = time.Now().Add(time.Second)
 		buffer     = bytes.NewBufferString("")
diff --git a/core/cmd/ocr2vrf_configure_commands.go b/core/cmd/ocr2vrf_configure_commands.go
index cf014d5e5dc..06f26ddb6a4 100644
--- a/core/cmd/ocr2vrf_configure_commands.go
+++ b/core/cmd/ocr2vrf_configure_commands.go
@@ -17,6 +17,7 @@ import (
 	"github.com/jmoiron/sqlx"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/forwarders"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/authorized_forwarder"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
@@ -342,7 +343,7 @@ func (s *Shell) authorizeForwarder(c *cli.Context, db *sqlx.DB, lggr logger.Logg
 
 	// Create forwarder for management in forwarder_manager.go.
 	orm := forwarders.NewORM(db, lggr, s.Config.Database())
-	_, err = orm.CreateForwarder(common.HexToAddress(forwarderAddress), *utils.NewBigI(chainID))
+	_, err = orm.CreateForwarder(common.HexToAddress(forwarderAddress), *ubig.NewI(chainID))
 	if err != nil {
 		return err
 	}
diff --git a/core/cmd/shell_local.go b/core/cmd/shell_local.go
index a1f7fdb857c..e4c29a0e5c2 100644
--- a/core/cmd/shell_local.go
+++ b/core/cmd/shell_local.go
@@ -38,6 +38,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/chaintype"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
@@ -855,7 +856,7 @@ func randomizeTestDBSequences(db *sqlx.DB) error {
 		}
 
 		var randNum *big.Int
-		randNum, err = crand.Int(crand.Reader, utils.NewBigI(10000).ToInt())
+		randNum, err = crand.Int(crand.Reader, ubig.NewI(10000).ToInt())
 		if err != nil {
 			return fmt.Errorf("%s: failed to generate random number", failedToRandomizeTestDBSequencesError{})
 		}
diff --git a/core/internal/cltest/cltest.go b/core/internal/cltest/cltest.go
index dc90201890d..c5e1fc5e4d0 100644
--- a/core/internal/cltest/cltest.go
+++ b/core/internal/cltest/cltest.go
@@ -51,6 +51,7 @@ import (
 	httypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker/types"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/cmd"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
@@ -232,10 +233,10 @@ func NewApplicationWithKey(t *testing.T, flagsAndDeps ...interface{}) *TestAppli
 func NewApplicationWithConfigAndKey(t testing.TB, c chainlink.GeneralConfig, flagsAndDeps ...interface{}) *TestApplication {
 	app := NewApplicationWithConfig(t, c, flagsAndDeps...)
 
-	chainID := *utils.NewBig(&FixtureChainID)
+	chainID := *ubig.New(&FixtureChainID)
 	for _, dep := range flagsAndDeps {
 		switch v := dep.(type) {
-		case *utils.Big:
+		case *ubig.Big:
 			chainID = *v
 		}
 	}
@@ -255,7 +256,7 @@ func NewApplicationWithConfigAndKey(t testing.TB, c chainlink.GeneralConfig, fla
 	return app
 }
 
-func setKeys(t testing.TB, app *TestApplication, flagsAndDeps ...interface{}) (chainID utils.Big) {
+func setKeys(t testing.TB, app *TestApplication, flagsAndDeps ...interface{}) (chainID ubig.Big) {
 	require.NoError(t, app.KeyStore.Unlock(Password))
 
 	for _, dep := range flagsAndDeps {
@@ -993,13 +994,13 @@ func Head(val interface{}) *evmtypes.Head {
 	time := uint64(0)
 	switch t := val.(type) {
 	case int:
-		h = evmtypes.NewHead(big.NewInt(int64(t)), utils.NewHash(), utils.NewHash(), time, utils.NewBig(&FixtureChainID))
+		h = evmtypes.NewHead(big.NewInt(int64(t)), utils.NewHash(), utils.NewHash(), time, ubig.New(&FixtureChainID))
 	case uint64:
-		h = evmtypes.NewHead(big.NewInt(int64(t)), utils.NewHash(), utils.NewHash(), time, utils.NewBig(&FixtureChainID))
+		h = evmtypes.NewHead(big.NewInt(int64(t)), utils.NewHash(), utils.NewHash(), time, ubig.New(&FixtureChainID))
 	case int64:
-		h = evmtypes.NewHead(big.NewInt(t), utils.NewHash(), utils.NewHash(), time, utils.NewBig(&FixtureChainID))
+		h = evmtypes.NewHead(big.NewInt(t), utils.NewHash(), utils.NewHash(), time, ubig.New(&FixtureChainID))
 	case *big.Int:
-		h = evmtypes.NewHead(t, utils.NewHash(), utils.NewHash(), time, utils.NewBig(&FixtureChainID))
+		h = evmtypes.NewHead(t, utils.NewHash(), utils.NewHash(), time, ubig.New(&FixtureChainID))
 	default:
 		panic(fmt.Sprintf("Could not convert %v of type %T to Head", val, val))
 	}
@@ -1009,7 +1010,7 @@ func Head(val interface{}) *evmtypes.Head {
 func HeadWithHash(n int64, hash common.Hash) *evmtypes.Head {
 	var h evmtypes.Head
 	time := uint64(0)
-	h = evmtypes.NewHead(big.NewInt(n), hash, utils.NewHash(), time, utils.NewBig(&FixtureChainID))
+	h = evmtypes.NewHead(big.NewInt(n), hash, utils.NewHash(), time, ubig.New(&FixtureChainID))
 	return &h
 
 }
@@ -1390,7 +1391,7 @@ func (b *Blocks) NewHead(number uint64) *evmtypes.Head {
 		ParentHash: parent.Hash,
 		Parent:     parent,
 		Timestamp:  time.Unix(parent.Number+1, 0),
-		EVMChainID: utils.NewBig(&FixtureChainID),
+		EVMChainID: ubig.New(&FixtureChainID),
 	}
 	return head
 }
@@ -1429,7 +1430,7 @@ func NewBlocks(t *testing.T, numHashes int) *Blocks {
 		hash := utils.NewHash()
 		hashes = append(hashes, hash)
 
-		heads[i] = &evmtypes.Head{Hash: hash, Number: i, Timestamp: time.Unix(i, 0), EVMChainID: utils.NewBig(&FixtureChainID)}
+		heads[i] = &evmtypes.Head{Hash: hash, Number: i, Timestamp: time.Unix(i, 0), EVMChainID: ubig.New(&FixtureChainID)}
 		if i > 0 {
 			parent := heads[i-1]
 			heads[i].Parent = parent
diff --git a/core/internal/cltest/factories.go b/core/internal/cltest/factories.go
index a76d23d3762..bece916ecc5 100644
--- a/core/internal/cltest/factories.go
+++ b/core/internal/cltest/factories.go
@@ -32,6 +32,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/flux_aggregator_wrapper"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
@@ -240,12 +241,12 @@ type RandomKey struct {
 	Nonce    int64
 	Disabled bool
 
-	chainIDs []utils.Big // nil: Fixture, set empty for none
+	chainIDs []ubig.Big // nil: Fixture, set empty for none
 }
 
 func (r RandomKey) MustInsert(t testing.TB, keystore keystore.Eth) (ethkey.KeyV2, common.Address) {
 	if r.chainIDs == nil {
-		r.chainIDs = []utils.Big{*utils.NewBig(&FixtureChainID)}
+		r.chainIDs = []ubig.Big{*ubig.New(&FixtureChainID)}
 	}
 
 	key := MustGenerateRandomKey(t)
@@ -272,7 +273,7 @@ func (r RandomKey) MustInsertWithState(t testing.TB, keystore keystore.Eth) (eth
 // MustInsertRandomKey inserts a randomly generated (not cryptographically secure) key for testing.
 // By default, it is enabled for the fixture chain. Pass chainIDs to override.
 // Use MustInsertRandomKeyNoChains for a key associate with no chains.
-func MustInsertRandomKey(t testing.TB, keystore keystore.Eth, chainIDs ...utils.Big) (ethkey.KeyV2, common.Address) {
+func MustInsertRandomKey(t testing.TB, keystore keystore.Eth, chainIDs ...ubig.Big) (ethkey.KeyV2, common.Address) {
 	r := RandomKey{}
 	if len(chainIDs) > 0 {
 		r.chainIDs = chainIDs
@@ -281,7 +282,7 @@ func MustInsertRandomKey(t testing.TB, keystore keystore.Eth, chainIDs ...utils.
 }
 
 func MustInsertRandomKeyNoChains(t testing.TB, keystore keystore.Eth) (ethkey.KeyV2, common.Address) {
-	return RandomKey{chainIDs: []utils.Big{}}.MustInsert(t, keystore)
+	return RandomKey{chainIDs: []ubig.Big{}}.MustInsert(t, keystore)
 }
 
 func MustInsertRandomKeyReturningState(t testing.TB, keystore keystore.Eth) (ethkey.State, common.Address) {
@@ -299,7 +300,7 @@ func MustGenerateRandomKeyState(_ testing.TB) ethkey.State {
 }
 
 func MustInsertHead(t *testing.T, db *sqlx.DB, cfg pg.QConfig, number int64) evmtypes.Head {
-	h := evmtypes.NewHead(big.NewInt(number), utils.NewHash(), utils.NewHash(), 0, utils.NewBig(&FixtureChainID))
+	h := evmtypes.NewHead(big.NewInt(number), utils.NewHash(), utils.NewHash(), 0, ubig.New(&FixtureChainID))
 	horm := headtracker.NewORM(db, logger.TestLogger(t), cfg, FixtureChainID)
 
 	err := horm.IdempotentInsertHead(testutils.Context(t), &h)
@@ -347,7 +348,7 @@ NOW(),NOW(),$1,'{}',false,$2,$3,0,0,0,0,0,0,0,0,0
 
 func MakeDirectRequestJobSpec(t *testing.T) *job.Job {
 	t.Helper()
-	drs := &job.DirectRequestSpec{EVMChainID: (*utils.Big)(testutils.FixtureChainID)}
+	drs := &job.DirectRequestSpec{EVMChainID: (*ubig.Big)(testutils.FixtureChainID)}
 	spec := &job.Job{
 		Type:              job.DirectRequest,
 		SchemaVersion:     1,
@@ -391,7 +392,7 @@ func MustInsertKeeperJob(t *testing.T, db *sqlx.DB, korm keeper.ORM, from ethkey
 }
 
 func MustInsertKeeperRegistry(t *testing.T, db *sqlx.DB, korm keeper.ORM, ethKeyStore keystore.Eth, keeperIndex, numKeepers, blockCountPerTurn int32) (keeper.Registry, job.Job) {
-	key, _ := MustInsertRandomKey(t, ethKeyStore, *utils.NewBig(testutils.SimulatedChainID))
+	key, _ := MustInsertRandomKey(t, ethKeyStore, *ubig.New(testutils.SimulatedChainID))
 	from := key.EIP55Address
 	t.Helper()
 	contractAddress := NewEIP55Address()
@@ -415,7 +416,7 @@ func MustInsertKeeperRegistry(t *testing.T, db *sqlx.DB, korm keeper.ORM, ethKey
 
 func MustInsertUpkeepForRegistry(t *testing.T, db *sqlx.DB, cfg pg.QConfig, registry keeper.Registry) keeper.UpkeepRegistration {
 	korm := keeper.NewORM(db, logger.TestLogger(t), cfg)
-	upkeepID := utils.NewBigI(int64(mathrand.Uint32()))
+	upkeepID := ubig.NewI(int64(mathrand.Uint32()))
 	upkeep := keeper.UpkeepRegistration{
 		UpkeepID:   upkeepID,
 		ExecuteGas: uint32(150_000),
diff --git a/core/internal/cltest/simulated_backend.go b/core/internal/cltest/simulated_backend.go
index 010478837da..0aecc7f8324 100644
--- a/core/internal/cltest/simulated_backend.go
+++ b/core/internal/cltest/simulated_backend.go
@@ -11,12 +11,12 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func NewSimulatedBackend(t *testing.T, alloc core.GenesisAlloc, gasLimit uint32) *backends.SimulatedBackend {
@@ -39,7 +39,7 @@ func NewApplicationWithConfigV2OnSimulatedBlockchain(
 	}
 
 	require.Zero(t, evmtest.MustGetDefaultChainID(t, cfg.EVMConfigs()).Cmp(testutils.SimulatedChainID))
-	chainID := utils.NewBig(testutils.SimulatedChainID)
+	chainID := big.New(testutils.SimulatedChainID)
 	client := client.NewSimulatedBackendClient(t, backend, testutils.SimulatedChainID)
 	eventBroadcaster := pg.NewEventBroadcaster(cfg.Database().URL(), 0, 0, logger.TestLogger(t), uuid.New())
 
@@ -64,7 +64,7 @@ func NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(
 	}
 
 	require.Zero(t, evmtest.MustGetDefaultChainID(t, cfg.EVMConfigs()).Cmp(testutils.SimulatedChainID))
-	chainID := utils.NewBig(testutils.SimulatedChainID)
+	chainID := big.New(testutils.SimulatedChainID)
 	client := client.NewSimulatedBackendClient(t, backend, testutils.SimulatedChainID)
 	eventBroadcaster := pg.NewEventBroadcaster(cfg.Database().URL(), 0, 0, logger.TestLogger(t), uuid.New())
 
diff --git a/core/internal/features/features_test.go b/core/internal/features/features_test.go
index 7b29fdae4fa..f115a3f8858 100644
--- a/core/internal/features/features_test.go
+++ b/core/internal/features/features_test.go
@@ -46,6 +46,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/forwarders"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/authorized_forwarder"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/consumer_wrapper"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/flags_wrapper"
@@ -771,7 +772,7 @@ func setupForwarderEnabledNode(t *testing.T, owner *bind.TransactOpts, portV2 in
 
 	// add forwarder address to be tracked in db
 	forwarderORM := forwarders.NewORM(app.GetSqlxDB(), logger.TestLogger(t), config.Database())
-	chainID := utils.Big(*b.Blockchain().Config().ChainID)
+	chainID := ubig.Big(*b.Blockchain().Config().ChainID)
 	_, err = forwarderORM.CreateForwarder(forwarder, chainID)
 	require.NoError(t, err)
 
@@ -1277,7 +1278,7 @@ func TestIntegration_BlockHistoryEstimator(t *testing.T) {
 		Transactions: cltest.LegacyTransactionsFromGasPrices(48_000_000_000, 49_000_000_000, 31_000_000_000),
 	}
 
-	evmChainID := utils.NewBig(evmtest.MustGetDefaultChainID(t, cfg.EVMConfigs()))
+	evmChainID := ubig.New(evmtest.MustGetDefaultChainID(t, cfg.EVMConfigs()))
 	h40 := evmtypes.Head{Hash: utils.NewHash(), Number: 40, EVMChainID: evmChainID}
 	h41 := evmtypes.Head{Hash: b41.Hash, ParentHash: h40.Hash, Number: 41, EVMChainID: evmChainID}
 	h42 := evmtypes.Head{Hash: b42.Hash, ParentHash: h41.Hash, Number: 42, EVMChainID: evmChainID}
diff --git a/core/internal/features/ocr2/features_ocr2_test.go b/core/internal/features/ocr2/features_ocr2_test.go
index 295bb7fb14a..70d4b0d79fd 100644
--- a/core/internal/features/ocr2/features_ocr2_test.go
+++ b/core/internal/features/ocr2/features_ocr2_test.go
@@ -37,6 +37,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/forwarders"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/authorized_forwarder"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/link_token_interface"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
@@ -51,7 +52,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocrbootstrap"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 type ocr2Node struct {
@@ -170,7 +170,7 @@ func setupNodeOCR2(
 
 		// add forwarder address to be tracked in db
 		forwarderORM := forwarders.NewORM(app.GetSqlxDB(), logger.TestLogger(t), config.Database())
-		chainID := utils.Big(*b.Blockchain().Config().ChainID)
+		chainID := ubig.Big(*b.Blockchain().Config().ChainID)
 		_, err2 = forwarderORM.CreateForwarder(faddr, chainID)
 		require.NoError(t, err2)
 
diff --git a/core/internal/testutils/configtest/general_config.go b/core/internal/testutils/configtest/general_config.go
index f076521b71c..c414c973160 100644
--- a/core/internal/testutils/configtest/general_config.go
+++ b/core/internal/testutils/configtest/general_config.go
@@ -10,11 +10,11 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmcfg "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	"github.com/smartcontractkit/chainlink/v2/core/store/dialects"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 const DefaultPeerID = "12D3KooWPjceQrSwdWXPyLLeABRXmuqt69Rg3sBYbU1Nft9HyQ6X"
@@ -64,7 +64,7 @@ func overrides(c *chainlink.Config, s *chainlink.Secrets) {
 	c.WebServer.ListenIP = &testIP
 	c.WebServer.TLS.ListenIP = &testIP
 
-	chainID := utils.NewBigI(evmclient.NullClientChainID)
+	chainID := big.NewI(evmclient.NullClientChainID)
 	c.EVM = append(c.EVM, &evmcfg.EVMConfig{
 		ChainID: chainID,
 		Chain:   evmcfg.Defaults(chainID),
@@ -95,7 +95,7 @@ func NewGeneralConfigSimulated(t testing.TB, overrideFn func(*chainlink.Config,
 // simulated is a config override func that appends the simulated EVM chain (testutils.SimulatedChainID),
 // or replaces the null chain (client.NullClientChainID) if that is the only entry.
 func simulated(c *chainlink.Config, s *chainlink.Secrets) {
-	chainID := utils.NewBig(testutils.SimulatedChainID)
+	chainID := big.New(testutils.SimulatedChainID)
 	enabled := true
 	cfg := evmcfg.EVMConfig{
 		ChainID: chainID,
@@ -103,7 +103,7 @@ func simulated(c *chainlink.Config, s *chainlink.Secrets) {
 		Enabled: &enabled,
 		Nodes:   evmcfg.EVMNodes{&validTestNode},
 	}
-	if len(c.EVM) == 1 && c.EVM[0].ChainID.Cmp(utils.NewBigI(client.NullClientChainID)) == 0 {
+	if len(c.EVM) == 1 && c.EVM[0].ChainID.Cmp(big.NewI(client.NullClientChainID)) == 0 {
 		c.EVM[0] = &cfg // replace null, if only entry
 	} else {
 		c.EVM = append(c.EVM, &cfg)
diff --git a/core/internal/testutils/evmtest/evmtest.go b/core/internal/testutils/evmtest/evmtest.go
index 095ea1a35c9..eb1a03530ae 100644
--- a/core/internal/testutils/evmtest/evmtest.go
+++ b/core/internal/testutils/evmtest/evmtest.go
@@ -31,6 +31,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
@@ -38,7 +39,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay"
 	evmrelay "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func NewChainScopedConfig(t testing.TB, cfg legacyevm.AppConfig) evmconfig.ChainScopedConfig {
@@ -46,7 +46,7 @@ func NewChainScopedConfig(t testing.TB, cfg legacyevm.AppConfig) evmconfig.Chain
 	if len(cfg.EVMConfigs()) > 0 {
 		evmCfg = cfg.EVMConfigs()[0]
 	} else {
-		var chainID = (*utils.Big)(testutils.FixtureChainID)
+		var chainID = (*ubig.Big)(testutils.FixtureChainID)
 		evmCfg = &evmtoml.EVMConfig{
 			ChainID: chainID,
 			Chain:   evmtoml.Defaults(chainID),
@@ -267,7 +267,7 @@ func (mo *TestConfigs) NodeStatusesPaged(offset int, limit int, chainIDs ...stri
 	return
 }
 
-func legacyNode(n *evmtoml.Node, chainID *utils.Big) (v2 evmtypes.Node) {
+func legacyNode(n *evmtoml.Node, chainID *ubig.Big) (v2 evmtypes.Node) {
 	v2.Name = *n.Name
 	v2.EVMChainID = *chainID
 	if n.HTTPURL != nil {
diff --git a/core/internal/testutils/evmtest/v2/evmtest.go b/core/internal/testutils/evmtest/v2/evmtest.go
index fa22588c8fb..22b2bc5e0ca 100644
--- a/core/internal/testutils/evmtest/v2/evmtest.go
+++ b/core/internal/testutils/evmtest/v2/evmtest.go
@@ -5,9 +5,9 @@ import (
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func ChainEthMainnet(t *testing.T) config.ChainScopedConfig      { return scopedConfig(t, 1) }
@@ -16,7 +16,7 @@ func ChainArbitrumMainnet(t *testing.T) config.ChainScopedConfig { return scoped
 func ChainArbitrumRinkeby(t *testing.T) config.ChainScopedConfig { return scopedConfig(t, 421611) }
 
 func scopedConfig(t *testing.T, chainID int64) config.ChainScopedConfig {
-	id := utils.NewBigI(chainID)
+	id := big.NewI(chainID)
 	evmCfg := toml.EVMConfig{ChainID: id, Chain: toml.Defaults(id)}
 	return config.NewTOMLChainScopedConfig(configtest.NewTestGeneralConfig(t), &evmCfg, logger.TestLogger(t))
 }
diff --git a/core/scripts/functions/src/fetching.go b/core/scripts/functions/src/fetching.go
index 0b22a93252d..9be624a40b6 100644
--- a/core/scripts/functions/src/fetching.go
+++ b/core/scripts/functions/src/fetching.go
@@ -11,7 +11,6 @@ import (
 	"github.com/urfave/cli"
 
 	helpers "github.com/smartcontractkit/chainlink/core/scripts/common"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 	"github.com/smartcontractkit/chainlink/v2/core/web/presenters"
 )
 
@@ -114,7 +113,7 @@ func findEvmOCR2Bundle(ocr2Bundles []ocr2Bundle) int {
 
 func findFirstGoodEthKeyAddress(chainID int64, ethKeys []presenters.ETHKeyResource) (string, error) {
 	for _, ethKey := range ethKeys {
-		if ethKey.EVMChainID.Equal(utils.NewBigI(chainID)) && !ethKey.Disabled {
+		if ethKey.EVMChainID.Equal(ubig.NewI(chainID)) && !ethKey.Disabled {
 			if ethKey.EthBalance.IsZero() {
 				fmt.Println("WARN: selected ETH address has zero balance", ethKey.Address)
 			}
diff --git a/core/services/blockhashstore/delegate_test.go b/core/services/blockhashstore/delegate_test.go
index 0096ac5ca9e..6fffcfdd493 100644
--- a/core/services/blockhashstore/delegate_test.go
+++ b/core/services/blockhashstore/delegate_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	mocklp "github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller/mocks"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
@@ -26,7 +27,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
 	evmrelay "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func TestDelegate_JobType(t *testing.T) {
@@ -90,7 +90,7 @@ func TestDelegate_ServicesForSpec(t *testing.T) {
 	defaultWaitBlocks := (int32)(testData.legacyChains.Slice()[0].Config().EVM().FinalityDepth())
 
 	t.Run("happy", func(t *testing.T) {
-		spec := job.Job{BlockhashStoreSpec: &job.BlockhashStoreSpec{WaitBlocks: defaultWaitBlocks, EVMChainID: (*utils.Big)(testutils.FixtureChainID)}}
+		spec := job.Job{BlockhashStoreSpec: &job.BlockhashStoreSpec{WaitBlocks: defaultWaitBlocks, EVMChainID: (*big.Big)(testutils.FixtureChainID)}}
 		services, err := delegate.ServicesForSpec(spec)
 
 		require.NoError(t, err)
@@ -107,7 +107,7 @@ func TestDelegate_ServicesForSpec(t *testing.T) {
 			CoordinatorV1Address:     &coordinatorV1,
 			CoordinatorV2Address:     &coordinatorV2,
 			CoordinatorV2PlusAddress: &coordinatorV2Plus,
-			EVMChainID:               (*utils.Big)(testutils.FixtureChainID),
+			EVMChainID:               (*big.Big)(testutils.FixtureChainID),
 		}}
 		services, err := delegate.ServicesForSpec(spec)
 
@@ -123,7 +123,7 @@ func TestDelegate_ServicesForSpec(t *testing.T) {
 
 	t.Run("wrong EVMChainID", func(t *testing.T) {
 		spec := job.Job{BlockhashStoreSpec: &job.BlockhashStoreSpec{
-			EVMChainID: utils.NewBigI(123),
+			EVMChainID: big.NewI(123),
 		}}
 		_, err := delegate.ServicesForSpec(spec)
 		assert.Error(t, err)
@@ -152,7 +152,7 @@ func TestDelegate_StartStop(t *testing.T) {
 		WaitBlocks: defaultWaitBlocks,
 		PollPeriod: time.Second,
 		RunTimeout: testutils.WaitTimeout(t),
-		EVMChainID: (*utils.Big)(testutils.FixtureChainID),
+		EVMChainID: (*big.Big)(testutils.FixtureChainID),
 	}}
 	services, err := delegate.ServicesForSpec(spec)
 
diff --git a/core/services/blockhashstore/validate_test.go b/core/services/blockhashstore/validate_test.go
index 0b7110a7528..48487bb5489 100644
--- a/core/services/blockhashstore/validate_test.go
+++ b/core/services/blockhashstore/validate_test.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func TestValidate(t *testing.T) {
@@ -49,7 +49,7 @@ fromAddresses = ["0x469aA2CD13e037DC5236320783dCfd0e641c0559"]`,
 					os.BlockhashStoreSpec.BlockhashStoreAddress)
 				require.Equal(t, 23*time.Second, os.BlockhashStoreSpec.PollPeriod)
 				require.Equal(t, 7*time.Second, os.BlockhashStoreSpec.RunTimeout)
-				require.Equal(t, utils.NewBigI(4), os.BlockhashStoreSpec.EVMChainID)
+				require.Equal(t, big.NewI(4), os.BlockhashStoreSpec.EVMChainID)
 				require.Equal(t, fromAddresses,
 					os.BlockhashStoreSpec.FromAddresses)
 			},
diff --git a/core/services/blockheaderfeeder/validate_test.go b/core/services/blockheaderfeeder/validate_test.go
index c58058d1620..cdab0322a40 100644
--- a/core/services/blockheaderfeeder/validate_test.go
+++ b/core/services/blockheaderfeeder/validate_test.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func TestValidate(t *testing.T) {
@@ -59,7 +59,7 @@ storeBlockhashesBatchSize = 10
 					os.BlockHeaderFeederSpec.BatchBlockhashStoreAddress)
 				require.Equal(t, 23*time.Second, os.BlockHeaderFeederSpec.PollPeriod)
 				require.Equal(t, 7*time.Second, os.BlockHeaderFeederSpec.RunTimeout)
-				require.Equal(t, utils.NewBigI(4), os.BlockHeaderFeederSpec.EVMChainID)
+				require.Equal(t, big.NewI(4), os.BlockHeaderFeederSpec.EVMChainID)
 				require.Equal(t, fromAddresses,
 					os.BlockHeaderFeederSpec.FromAddresses)
 				require.Equal(t, uint16(20),
@@ -86,7 +86,7 @@ fromAddresses = ["0x469aA2CD13e037DC5236320783dCfd0e641c0559"]
 				require.Equal(t, int32(256), os.BlockHeaderFeederSpec.WaitBlocks)
 				require.Equal(t, 15*time.Second, os.BlockHeaderFeederSpec.PollPeriod)
 				require.Equal(t, 30*time.Second, os.BlockHeaderFeederSpec.RunTimeout)
-				require.Equal(t, utils.NewBigI(4), os.BlockHeaderFeederSpec.EVMChainID)
+				require.Equal(t, big.NewI(4), os.BlockHeaderFeederSpec.EVMChainID)
 				require.Equal(t, fromAddresses,
 					os.BlockHeaderFeederSpec.FromAddresses)
 				require.Equal(t, uint16(100),
diff --git a/core/services/chainlink/config.go b/core/services/chainlink/config.go
index b2f60384ec8..192fbb311d3 100644
--- a/core/services/chainlink/config.go
+++ b/core/services/chainlink/config.go
@@ -28,9 +28,9 @@ import (
 // When adding a new field:
 //   - consider including a unit suffix with the field name
 //   - TOML is limited to int64/float64, so fields requiring greater range/precision must use non-standard types
-//     implementing encoding.TextMarshaler/TextUnmarshaler, like utils.Big and decimal.Decimal
+//     implementing encoding.TextMarshaler/TextUnmarshaler, like big.Big and decimal.Decimal
 //   - std lib types that don't implement encoding.TextMarshaler/TextUnmarshaler (time.Duration, url.URL, big.Int) won't
-//     work as expected, and require wrapper types. See models.Duration, models.URL, utils.Big.
+//     work as expected, and require wrapper types. See models.Duration, models.URL, big.Big.
 type Config struct {
 	toml.Core
 
diff --git a/core/services/chainlink/config_test.go b/core/services/chainlink/config_test.go
index 6453fe05e00..85a4c99b862 100644
--- a/core/services/chainlink/config_test.go
+++ b/core/services/chainlink/config_test.go
@@ -26,6 +26,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmcfg "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	legacy "github.com/smartcontractkit/chainlink/v2/core/config"
 	"github.com/smartcontractkit/chainlink/v2/core/config/toml"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
@@ -95,7 +96,7 @@ var (
 		},
 		EVM: []*evmcfg.EVMConfig{
 			{
-				ChainID: utils.NewBigI(1),
+				ChainID: big.NewI(1),
 				Chain: evmcfg.Chain{
 					FinalityDepth:      ptr[uint32](26),
 					FinalityTagEnabled: ptr[bool](false),
@@ -112,7 +113,7 @@ var (
 					},
 				}},
 			{
-				ChainID: utils.NewBigI(42),
+				ChainID: big.NewI(42),
 				Chain: evmcfg.Chain{
 					GasEstimator: evmcfg.GasEstimator{
 						PriceDefault: assets.NewWeiI(math.MaxInt64),
@@ -125,7 +126,7 @@ var (
 					},
 				}},
 			{
-				ChainID: utils.NewBigI(137),
+				ChainID: big.NewI(137),
 				Chain: evmcfg.Chain{
 					GasEstimator: evmcfg.GasEstimator{
 						Mode: ptr("FixedPrice"),
@@ -463,7 +464,7 @@ func TestConfig_Marshal(t *testing.T) {
 	}
 	full.EVM = []*evmcfg.EVMConfig{
 		{
-			ChainID: utils.NewBigI(1),
+			ChainID: big.NewI(1),
 			Enabled: ptr(false),
 			Chain: evmcfg.Chain{
 				AutoCreateKey: ptr(false),
@@ -1466,7 +1467,7 @@ func assertValidationError(t *testing.T, invalid interface{ Validate() error },
 
 func TestConfig_setDefaults(t *testing.T) {
 	var c Config
-	c.EVM = evmcfg.EVMConfigs{{ChainID: utils.NewBigI(99999133712345)}}
+	c.EVM = evmcfg.EVMConfigs{{ChainID: big.NewI(99999133712345)}}
 	c.Cosmos = coscfg.TOMLConfigs{{ChainID: ptr("unknown cosmos chain")}}
 	c.Solana = solana.TOMLConfigs{{ChainID: ptr("unknown solana chain")}}
 	c.Starknet = stkcfg.TOMLConfigs{{ChainID: ptr("unknown starknet chain")}}
diff --git a/core/services/chainlink/relayer_chain_interoperators_test.go b/core/services/chainlink/relayer_chain_interoperators_test.go
index a0754fa0139..d89fbce12db 100644
--- a/core/services/chainlink/relayer_chain_interoperators_test.go
+++ b/core/services/chainlink/relayer_chain_interoperators_test.go
@@ -18,6 +18,7 @@ import (
 	stkcfg "github.com/smartcontractkit/chainlink-starknet/relayer/pkg/chainlink/config"
 
 	"github.com/smartcontractkit/chainlink-solana/pkg/solana"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
@@ -31,12 +32,11 @@ import (
 
 	evmcfg "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func TestCoreRelayerChainInteroperators(t *testing.T) {
 
-	evmChainID1, evmChainID2 := utils.NewBig(big.NewInt(1)), utils.NewBig(big.NewInt(2))
+	evmChainID1, evmChainID2 := ubig.New(big.NewInt(1)), ubig.New(big.NewInt(2))
 	solanaChainID1, solanaChainID2 := "solana-id-1", "solana-id-2"
 	starknetChainID1, starknetChainID2 := "starknet-id-1", "starknet-id-2"
 	cosmosChainID1, cosmosChainID2 := "cosmos-id-1", "cosmos-id-2"
@@ -71,7 +71,7 @@ func TestCoreRelayerChainInteroperators(t *testing.T) {
 			Chain:   cfg,
 			Nodes:   evmcfg.EVMNodes{&node1_1, &node1_2},
 		}
-		id2 := utils.NewBig(big.NewInt(2))
+		id2 := ubig.New(big.NewInt(2))
 		c.EVM = append(c.EVM, &evmcfg.EVMConfig{
 			ChainID: evmChainID2,
 			Chain:   evmcfg.Defaults(id2),
diff --git a/core/services/directrequest/delegate_test.go b/core/services/directrequest/delegate_test.go
index 865edb1b481..be61cde4d60 100644
--- a/core/services/directrequest/delegate_test.go
+++ b/core/services/directrequest/delegate_test.go
@@ -20,6 +20,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
 	log_mocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/log/mocks"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/operator_wrapper"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
@@ -34,7 +35,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
 	pipeline_mocks "github.com/smartcontractkit/chainlink/v2/core/services/pipeline/mocks"
 	evmrelay "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func TestDelegate_ServicesForSpec(t *testing.T) {
@@ -59,7 +59,7 @@ func TestDelegate_ServicesForSpec(t *testing.T) {
 	})
 
 	t.Run("Spec with DirectRequestSpec", func(t *testing.T) {
-		spec := job.Job{DirectRequestSpec: &job.DirectRequestSpec{EVMChainID: (*utils.Big)(testutils.FixtureChainID)}, PipelineSpec: &pipeline.Spec{}}
+		spec := job.Job{DirectRequestSpec: &job.DirectRequestSpec{EVMChainID: (*ubig.Big)(testutils.FixtureChainID)}, PipelineSpec: &pipeline.Spec{}}
 		services, err := delegate.ServicesForSpec(spec)
 		require.NoError(t, err)
 		assert.Len(t, services, 1)
diff --git a/core/services/directrequest/validate.go b/core/services/directrequest/validate.go
index bc31f09b685..271e720660f 100644
--- a/core/services/directrequest/validate.go
+++ b/core/services/directrequest/validate.go
@@ -5,18 +5,18 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/assets"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/null"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 type DirectRequestToml struct {
 	ContractAddress          ethkey.EIP55Address      `toml:"contractAddress"`
 	Requesters               models.AddressCollection `toml:"requesters"`
 	MinContractPayment       *assets.Link             `toml:"minContractPaymentLinkJuels"`
-	EVMChainID               *utils.Big               `toml:"evmChainID"`
+	EVMChainID               *big.Big                 `toml:"evmChainID"`
 	MinIncomingConfirmations null.Uint32              `toml:"minIncomingConfirmations"`
 }
 
diff --git a/core/services/feeds/service.go b/core/services/feeds/service.go
index ea6e6cae5ab..a1b4e9b2837 100644
--- a/core/services/feeds/service.go
+++ b/core/services/feeds/service.go
@@ -19,6 +19,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	pb "github.com/smartcontractkit/chainlink/v2/core/services/feeds/proto"
@@ -32,7 +33,6 @@ import (
 	ocr2 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/validate"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocrbootstrap"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 	"github.com/smartcontractkit/chainlink/v2/core/utils/crypto"
 )
 
@@ -1073,7 +1073,7 @@ func (s *service) findExistingJobForOCR2(j *job.Job, qopts pg.QOpt) (int32, erro
 // findExistingJobForOCRFlux looks for existing job for OCR or flux
 func (s *service) findExistingJobForOCRFlux(j *job.Job, qopts pg.QOpt) (int32, error) {
 	var address ethkey.EIP55Address
-	var evmChainID *utils.Big
+	var evmChainID *big.Big
 
 	switch j.Type {
 	case job.OffchainReporting:
diff --git a/core/services/feeds/service_test.go b/core/services/feeds/service_test.go
index bd0993825e2..d37393eba9e 100644
--- a/core/services/feeds/service_test.go
+++ b/core/services/feeds/service_test.go
@@ -19,6 +19,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
@@ -41,7 +42,6 @@ import (
 	evmrelay "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/services/versioning"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 	"github.com/smartcontractkit/chainlink/v2/core/utils/crypto"
 )
 
@@ -1543,7 +1543,7 @@ func Test_Service_ListSpecsByJobProposalIDs(t *testing.T) {
 }
 
 func Test_Service_ApproveSpec(t *testing.T) {
-	var evmChainID *utils.Big
+	var evmChainID *big.Big
 	address := ethkey.EIP55AddressFromAddress(common.Address{})
 	externalJobID := uuid.New()
 
diff --git a/core/services/fluxmonitorv2/orm_test.go b/core/services/fluxmonitorv2/orm_test.go
index 6e06a1e65b8..bcbec4363e2 100644
--- a/core/services/fluxmonitorv2/orm_test.go
+++ b/core/services/fluxmonitorv2/orm_test.go
@@ -14,6 +14,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	txmmocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr/mocks"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
@@ -22,7 +23,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/fluxmonitorv2"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func TestORM_MostRecentFluxMonitorRoundID(t *testing.T) {
@@ -159,7 +159,7 @@ func makeJob(t *testing.T) *job.Job {
 			IdleTimerDisabled: false,
 			CreatedAt:         time.Now(),
 			UpdatedAt:         time.Now(),
-			EVMChainID:        (*utils.Big)(testutils.FixtureChainID),
+			EVMChainID:        (*big.Big)(testutils.FixtureChainID),
 		},
 	}
 }
diff --git a/core/services/job/job_orm_test.go b/core/services/job/job_orm_test.go
index 21035140f54..c0622ba8066 100644
--- a/core/services/job/job_orm_test.go
+++ b/core/services/job/job_orm_test.go
@@ -19,6 +19,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	evmcfg "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
@@ -41,7 +42,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/vrf/vrfcommon"
 	"github.com/smartcontractkit/chainlink/v2/core/services/webhook"
 	"github.com/smartcontractkit/chainlink/v2/core/testdata/testspecs"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 const mercuryOracleTOML = `name = 'LINK / ETH | 0x0000000000000000000000000000000000000000000000000000000000000001 | verifier_proxy 0x0000000000000000000000000000000000000001'
@@ -695,7 +695,7 @@ func TestORM_CreateJob_EVMChainID_Validation(t *testing.T) {
 }
 
 func TestORM_CreateJob_OCR_DuplicatedContractAddress(t *testing.T) {
-	customChainID := utils.NewBig(testutils.NewRandomEVMChainID())
+	customChainID := big.New(testutils.NewRandomEVMChainID())
 
 	config := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
 		enabled := true
@@ -764,7 +764,7 @@ func TestORM_CreateJob_OCR_DuplicatedContractAddress(t *testing.T) {
 }
 
 func TestORM_CreateJob_OCR2_DuplicatedContractAddress(t *testing.T) {
-	customChainID := utils.NewBig(testutils.NewRandomEVMChainID())
+	customChainID := big.New(testutils.NewRandomEVMChainID())
 
 	config := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
 		enabled := true
@@ -825,7 +825,7 @@ func TestORM_CreateJob_OCR2_DuplicatedContractAddress(t *testing.T) {
 }
 
 func TestORM_CreateJob_OCR2_Sending_Keys_Transmitter_Keys_Validations(t *testing.T) {
-	customChainID := utils.NewBig(testutils.NewRandomEVMChainID())
+	customChainID := big.New(testutils.NewRandomEVMChainID())
 
 	config := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
 		enabled := true
@@ -1021,7 +1021,7 @@ func Test_FindJob(t *testing.T) {
 	// Create a config with multiple EVM chains. The test fixtures already load 1337
 	// Additional chains will need additional fixture statements to add a chain to evm_chains.
 	config := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
-		chainID := utils.NewBigI(1337)
+		chainID := big.NewI(1337)
 		enabled := true
 		c.EVM = append(c.EVM, &evmcfg.EVMConfig{
 			ChainID: chainID,
@@ -1154,7 +1154,7 @@ func Test_FindJob(t *testing.T) {
 
 		assert.Equal(t, job.ID, jbID)
 
-		_, err2 = orm.FindJobIDByAddress("not-existing", utils.NewBigI(0))
+		_, err2 = orm.FindJobIDByAddress("not-existing", big.NewI(0))
 		require.Error(t, err2)
 		require.ErrorIs(t, err2, sql.ErrNoRows)
 	})
@@ -1222,7 +1222,7 @@ func Test_FindJobsByPipelineSpecIDs(t *testing.T) {
 
 	jb, err := directrequest.ValidatedDirectRequestSpec(testspecs.GetDirectRequestSpec())
 	require.NoError(t, err)
-	jb.DirectRequestSpec.EVMChainID = utils.NewBigI(0)
+	jb.DirectRequestSpec.EVMChainID = big.NewI(0)
 
 	err = orm.CreateJob(&jb)
 	require.NoError(t, err)
diff --git a/core/services/job/mocks/orm.go b/core/services/job/mocks/orm.go
index 66602c60053..062c6e936bc 100644
--- a/core/services/job/mocks/orm.go
+++ b/core/services/job/mocks/orm.go
@@ -3,9 +3,10 @@
 package mocks
 
 import (
-	context "context"
-
 	common "github.com/ethereum/go-ethereum/common"
+	big "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
+
+	context "context"
 
 	ethkey "github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
 
@@ -17,8 +18,6 @@ import (
 
 	pipeline "github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
 
-	utils "github.com/smartcontractkit/chainlink/v2/core/utils"
-
 	uuid "github.com/google/uuid"
 )
 
@@ -223,7 +222,7 @@ func (_m *ORM) FindJobByExternalJobID(_a0 uuid.UUID, qopts ...pg.QOpt) (job.Job,
 }
 
 // FindJobIDByAddress provides a mock function with given fields: address, evmChainID, qopts
-func (_m *ORM) FindJobIDByAddress(address ethkey.EIP55Address, evmChainID *utils.Big, qopts ...pg.QOpt) (int32, error) {
+func (_m *ORM) FindJobIDByAddress(address ethkey.EIP55Address, evmChainID *big.Big, qopts ...pg.QOpt) (int32, error) {
 	_va := make([]interface{}, len(qopts))
 	for _i := range qopts {
 		_va[_i] = qopts[_i]
@@ -239,16 +238,16 @@ func (_m *ORM) FindJobIDByAddress(address ethkey.EIP55Address, evmChainID *utils
 
 	var r0 int32
 	var r1 error
-	if rf, ok := ret.Get(0).(func(ethkey.EIP55Address, *utils.Big, ...pg.QOpt) (int32, error)); ok {
+	if rf, ok := ret.Get(0).(func(ethkey.EIP55Address, *big.Big, ...pg.QOpt) (int32, error)); ok {
 		return rf(address, evmChainID, qopts...)
 	}
-	if rf, ok := ret.Get(0).(func(ethkey.EIP55Address, *utils.Big, ...pg.QOpt) int32); ok {
+	if rf, ok := ret.Get(0).(func(ethkey.EIP55Address, *big.Big, ...pg.QOpt) int32); ok {
 		r0 = rf(address, evmChainID, qopts...)
 	} else {
 		r0 = ret.Get(0).(int32)
 	}
 
-	if rf, ok := ret.Get(1).(func(ethkey.EIP55Address, *utils.Big, ...pg.QOpt) error); ok {
+	if rf, ok := ret.Get(1).(func(ethkey.EIP55Address, *big.Big, ...pg.QOpt) error); ok {
 		r1 = rf(address, evmChainID, qopts...)
 	} else {
 		r1 = ret.Error(1)
diff --git a/core/services/job/models.go b/core/services/job/models.go
index 18a0cb79e2a..b21ecc12e72 100644
--- a/core/services/job/models.go
+++ b/core/services/job/models.go
@@ -20,6 +20,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	clnull "github.com/smartcontractkit/chainlink/v2/core/null"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
@@ -246,7 +247,7 @@ type OCROracleSpec struct {
 	ContractConfigTrackerSubscribeInterval models.Interval      `toml:"contractConfigTrackerSubscribeInterval"`
 	ContractConfigTrackerPollInterval      models.Interval      `toml:"contractConfigTrackerPollInterval"`
 	ContractConfigConfirmations            uint16               `toml:"contractConfigConfirmations"`
-	EVMChainID                             *utils.Big           `toml:"evmChainID" db:"evm_chain_id"`
+	EVMChainID                             *big.Big             `toml:"evmChainID" db:"evm_chain_id"`
 	DatabaseTimeout                        *models.Interval     `toml:"databaseTimeout"`
 	ObservationGracePeriod                 *models.Interval     `toml:"observationGracePeriod"`
 	ContractTransmitterTransmitTimeout     *models.Interval     `toml:"contractTransmitterTransmitTimeout"`
@@ -434,7 +435,7 @@ type DirectRequestSpec struct {
 	MinIncomingConfirmations clnull.Uint32            `toml:"minIncomingConfirmations"`
 	Requesters               models.AddressCollection `toml:"requesters"`
 	MinContractPayment       *commonassets.Link       `toml:"minContractPaymentLinkJuels"`
-	EVMChainID               *utils.Big               `toml:"evmChainID"`
+	EVMChainID               *big.Big                 `toml:"evmChainID"`
 	CreatedAt                time.Time                `toml:"-"`
 	UpdatedAt                time.Time                `toml:"-"`
 }
@@ -475,9 +476,9 @@ type FluxMonitorSpec struct {
 	DrumbeatRandomDelay time.Duration
 	DrumbeatEnabled     bool
 	MinPayment          *commonassets.Link
-	EVMChainID          *utils.Big `toml:"evmChainID"`
-	CreatedAt           time.Time  `toml:"-"`
-	UpdatedAt           time.Time  `toml:"-"`
+	EVMChainID          *big.Big  `toml:"evmChainID"`
+	CreatedAt           time.Time `toml:"-"`
+	UpdatedAt           time.Time `toml:"-"`
 }
 
 type KeeperSpec struct {
@@ -485,7 +486,7 @@ type KeeperSpec struct {
 	ContractAddress          ethkey.EIP55Address `toml:"contractAddress"`
 	MinIncomingConfirmations *uint32             `toml:"minIncomingConfirmations"`
 	FromAddress              ethkey.EIP55Address `toml:"fromAddress"`
-	EVMChainID               *utils.Big          `toml:"evmChainID"`
+	EVMChainID               *big.Big            `toml:"evmChainID"`
 	CreatedAt                time.Time           `toml:"-"`
 	UpdatedAt                time.Time           `toml:"-"`
 }
@@ -512,7 +513,7 @@ type VRFSpec struct {
 	CoordinatorAddress       ethkey.EIP55Address   `toml:"coordinatorAddress"`
 	PublicKey                secp256k1.PublicKey   `toml:"publicKey"`
 	MinIncomingConfirmations uint32                `toml:"minIncomingConfirmations"`
-	EVMChainID               *utils.Big            `toml:"evmChainID"`
+	EVMChainID               *big.Big              `toml:"evmChainID"`
 	FromAddresses            []ethkey.EIP55Address `toml:"fromAddresses"`
 	PollPeriod               time.Duration         `toml:"pollPeriod"`          // For v2 jobs
 	RequestedConfsDelay      int64                 `toml:"requestedConfsDelay"` // For v2 jobs. Optional, defaults to 0 if not provided.
@@ -586,7 +587,7 @@ type BlockhashStoreSpec struct {
 	RunTimeout time.Duration `toml:"runTimeout"`
 
 	// EVMChainID defines the chain ID for monitoring and storing of blockhashes.
-	EVMChainID *utils.Big `toml:"evmChainID"`
+	EVMChainID *big.Big `toml:"evmChainID"`
 
 	// FromAddress is the sender address that should be used to store blockhashes.
 	FromAddresses []ethkey.EIP55Address `toml:"fromAddresses"`
@@ -635,7 +636,7 @@ type BlockHeaderFeederSpec struct {
 	RunTimeout time.Duration `toml:"runTimeout"`
 
 	// EVMChainID defines the chain ID for monitoring and storing of blockhashes.
-	EVMChainID *utils.Big `toml:"evmChainID"`
+	EVMChainID *big.Big `toml:"evmChainID"`
 
 	// FromAddress is the sender address that should be used to store blockhashes.
 	FromAddresses []ethkey.EIP55Address `toml:"fromAddresses"`
@@ -662,11 +663,11 @@ type LegacyGasStationServerSpec struct {
 	ForwarderAddress ethkey.EIP55Address `toml:"forwarderAddress"`
 
 	// EVMChainID defines the chain ID from which the meta-transaction request originates.
-	EVMChainID *utils.Big `toml:"evmChainID"`
+	EVMChainID *big.Big `toml:"evmChainID"`
 
 	// CCIPChainSelector is the CCIP chain selector that corresponds to EVMChainID param.
 	// This selector is equivalent to (source) chainID specified in SendTransaction request
-	CCIPChainSelector *utils.Big `toml:"ccipChainSelector"`
+	CCIPChainSelector *big.Big `toml:"ccipChainSelector"`
 
 	// FromAddress is the sender address that should be used to send meta-transactions
 	FromAddresses []ethkey.EIP55Address `toml:"fromAddresses"`
@@ -699,10 +700,10 @@ type LegacyGasStationSidecarSpec struct {
 	RunTimeout time.Duration `toml:"runTimeout"`
 
 	// EVMChainID defines the chain ID for the on-chain events tracked by sidecar
-	EVMChainID *utils.Big `toml:"evmChainID"`
+	EVMChainID *big.Big `toml:"evmChainID"`
 
 	// CCIPChainSelector is the CCIP chain selector that corresponds to EVMChainID param
-	CCIPChainSelector *utils.Big `toml:"ccipChainSelector"`
+	CCIPChainSelector *big.Big `toml:"ccipChainSelector"`
 
 	// CreatedAt is the time this job was created.
 	CreatedAt time.Time `toml:"-"`
@@ -772,7 +773,7 @@ type EALSpec struct {
 	ForwarderAddress ethkey.EIP55Address `toml:"forwarderAddress"`
 
 	// EVMChainID defines the chain ID from which the meta-transaction request originates.
-	EVMChainID *utils.Big `toml:"evmChainID"`
+	EVMChainID *big.Big `toml:"evmChainID"`
 
 	// FromAddress is the sender address that should be used to send meta-transactions
 	FromAddresses []ethkey.EIP55Address `toml:"fromAddresses"`
diff --git a/core/services/job/orm.go b/core/services/job/orm.go
index 482d3d851e4..b2cf2b2af4b 100644
--- a/core/services/job/orm.go
+++ b/core/services/job/orm.go
@@ -22,6 +22,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
 	evmconfig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/config"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/null"
@@ -32,7 +33,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 var (
@@ -52,7 +52,7 @@ type ORM interface {
 	FindJobTx(ctx context.Context, id int32) (Job, error)
 	FindJob(ctx context.Context, id int32) (Job, error)
 	FindJobByExternalJobID(uuid uuid.UUID, qopts ...pg.QOpt) (Job, error)
-	FindJobIDByAddress(address ethkey.EIP55Address, evmChainID *utils.Big, qopts ...pg.QOpt) (int32, error)
+	FindJobIDByAddress(address ethkey.EIP55Address, evmChainID *big.Big, qopts ...pg.QOpt) (int32, error)
 	FindOCR2JobIDByAddress(contractID string, feedID *common.Hash, qopts ...pg.QOpt) (int32, error)
 	FindJobIDsWithBridge(name string) ([]int32, error)
 	DeleteJob(id int32, qopts ...pg.QOpt) error
@@ -832,7 +832,7 @@ func (o *orm) FindJobByExternalJobID(externalJobID uuid.UUID, qopts ...pg.QOpt)
 }
 
 // FindJobIDByAddress - finds a job id by contract address. Currently only OCR and FM jobs are supported
-func (o *orm) FindJobIDByAddress(address ethkey.EIP55Address, evmChainID *utils.Big, qopts ...pg.QOpt) (jobID int32, err error) {
+func (o *orm) FindJobIDByAddress(address ethkey.EIP55Address, evmChainID *big.Big, qopts ...pg.QOpt) (jobID int32, err error) {
 	q := o.q.WithOpts(qopts...)
 	err = q.Transaction(func(tx pg.Queryer) error {
 		stmt := `
diff --git a/core/services/keeper/integration_test.go b/core/services/keeper/integration_test.go
index 29a0b68702d..c35ebc81b7f 100644
--- a/core/services/keeper/integration_test.go
+++ b/core/services/keeper/integration_test.go
@@ -19,6 +19,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/forwarders"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/authorized_forwarder"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/basic_upkeep_contract"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/keeper_registry_logic1_3"
@@ -36,7 +37,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/keeper"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 	webpresenters "github.com/smartcontractkit/chainlink/v2/core/web/presenters"
 )
 
@@ -405,7 +405,7 @@ func TestKeeperForwarderEthIntegration(t *testing.T) {
 			c.EVM[0].MinIncomingConfirmations = ptr[uint32](1)    // disable reorg protection for this test
 			c.EVM[0].HeadTracker.MaxBufferSize = ptr[uint32](100) // helps prevent missed heads
 			c.EVM[0].Transactions.ForwardersEnabled = ptr(true)   // Enable Operator Forwarder flow
-			c.EVM[0].ChainID = (*utils.Big)(testutils.SimulatedChainID)
+			c.EVM[0].ChainID = (*ubig.Big)(testutils.SimulatedChainID)
 		})
 		scopedConfig := evmtest.NewChainScopedConfig(t, config)
 		korm := keeper.NewORM(db, logger.TestLogger(t), scopedConfig.Database())
@@ -414,7 +414,7 @@ func TestKeeperForwarderEthIntegration(t *testing.T) {
 		require.NoError(t, app.Start(testutils.Context(t)))
 
 		forwarderORM := forwarders.NewORM(db, logger.TestLogger(t), config.Database())
-		chainID := utils.Big(*backend.ConfiguredChainID())
+		chainID := ubig.Big(*backend.ConfiguredChainID())
 		_, err = forwarderORM.CreateForwarder(fwdrAddress, chainID)
 		require.NoError(t, err)
 
@@ -431,7 +431,7 @@ func TestKeeperForwarderEthIntegration(t *testing.T) {
 			KeeperSpec: &job.KeeperSpec{
 				FromAddress:     nodeAddressEIP55,
 				ContractAddress: regAddrEIP55,
-				EVMChainID:      (*utils.Big)(testutils.SimulatedChainID),
+				EVMChainID:      (*ubig.Big)(testutils.SimulatedChainID),
 			},
 			SchemaVersion:     1,
 			ForwardingAllowed: true,
diff --git a/core/services/keeper/models.go b/core/services/keeper/models.go
index fd5538b6047..8f72f0b22c9 100644
--- a/core/services/keeper/models.go
+++ b/core/services/keeper/models.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/pkg/errors"
 
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/null"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
@@ -34,7 +35,7 @@ type UpkeepRegistration struct {
 	LastRunBlockHeight  int64
 	RegistryID          int64
 	Registry            Registry
-	UpkeepID            *utils.Big
+	UpkeepID            *big.Big
 	LastKeeperIndex     null.Int64
 	PositioningConstant int32
 }
@@ -60,16 +61,16 @@ func (upkeep UpkeepRegistration) PrettyID() string {
 	return NewUpkeepIdentifier(upkeep.UpkeepID).String()
 }
 
-func NewUpkeepIdentifier(i *utils.Big) *UpkeepIdentifier {
+func NewUpkeepIdentifier(i *big.Big) *UpkeepIdentifier {
 	val := UpkeepIdentifier(*i)
 	return &val
 }
 
-type UpkeepIdentifier utils.Big
+type UpkeepIdentifier big.Big
 
 // String produces a hex encoded value, zero padded, prefixed with UpkeepPrefix
 func (ui UpkeepIdentifier) String() string {
-	val := utils.Big(ui)
+	val := big.Big(ui)
 	result, err := utils.Uint256ToBytes(val.ToInt())
 	if err != nil {
 		panic(errors.Wrap(err, "invariant, invalid upkeepID"))
diff --git a/core/services/keeper/models_test.go b/core/services/keeper/models_test.go
index ad81f47d8ee..729d1bbf231 100644
--- a/core/services/keeper/models_test.go
+++ b/core/services/keeper/models_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 )
 
 func TestUpkeepIdentifer_String(t *testing.T) {
@@ -26,7 +26,7 @@ func TestUpkeepIdentifer_String(t *testing.T) {
 				return
 			}
 
-			result := NewUpkeepIdentifier(utils.NewBig(o)).String()
+			result := NewUpkeepIdentifier(ubig.New(o)).String()
 			require.Equal(t, test.hex, result)
 		})
 	}
diff --git a/core/services/keeper/orm.go b/core/services/keeper/orm.go
index 91883f8056c..fc8770cd864 100644
--- a/core/services/keeper/orm.go
+++ b/core/services/keeper/orm.go
@@ -7,10 +7,10 @@ import (
 	"github.com/lib/pq"
 	"github.com/pkg/errors"
 
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 // ORM implements ORM layer using PostgreSQL
@@ -86,7 +86,7 @@ RETURNING *
 }
 
 // UpdateUpkeepLastKeeperIndex updates the last keeper index for an upkeep
-func (korm ORM) UpdateUpkeepLastKeeperIndex(jobID int32, upkeepID *utils.Big, fromAddress ethkey.EIP55Address) error {
+func (korm ORM) UpdateUpkeepLastKeeperIndex(jobID int32, upkeepID *big.Big, fromAddress ethkey.EIP55Address) error {
 	_, err := korm.q.Exec(`
 	UPDATE upkeep_registrations
 	SET
@@ -98,7 +98,7 @@ func (korm ORM) UpdateUpkeepLastKeeperIndex(jobID int32, upkeepID *utils.Big, fr
 }
 
 // BatchDeleteUpkeepsForJob deletes all upkeeps by the given IDs for the job with the given ID
-func (korm ORM) BatchDeleteUpkeepsForJob(jobID int32, upkeepIDs []utils.Big) (int64, error) {
+func (korm ORM) BatchDeleteUpkeepsForJob(jobID int32, upkeepIDs []big.Big) (int64, error) {
 	strIds := []string{}
 	for _, upkeepID := range upkeepIDs {
 		strIds = append(strIds, upkeepID.String())
@@ -202,7 +202,7 @@ func loadUpkeepsRegistry(q pg.Queryer, upkeeps []UpkeepRegistration) error {
 	return nil
 }
 
-func (korm ORM) AllUpkeepIDsForRegistry(regID int64) (upkeeps []utils.Big, err error) {
+func (korm ORM) AllUpkeepIDsForRegistry(regID int64) (upkeeps []big.Big, err error) {
 	err = korm.q.Select(&upkeeps, `
 SELECT upkeep_id
 FROM upkeep_registrations
@@ -212,7 +212,7 @@ WHERE registry_id = $1
 }
 
 // SetLastRunInfoForUpkeepOnJob sets the last run block height and the associated keeper index only if the new block height is greater than the previous.
-func (korm ORM) SetLastRunInfoForUpkeepOnJob(jobID int32, upkeepID *utils.Big, height int64, fromAddress ethkey.EIP55Address, qopts ...pg.QOpt) (int64, error) {
+func (korm ORM) SetLastRunInfoForUpkeepOnJob(jobID int32, upkeepID *big.Big, height int64, fromAddress ethkey.EIP55Address, qopts ...pg.QOpt) (int64, error) {
 	res, err := korm.q.WithOpts(qopts...).Exec(`
 	UPDATE upkeep_registrations
 	SET last_run_block_height = $1,
diff --git a/core/services/keeper/orm_test.go b/core/services/keeper/orm_test.go
index d67baa09a06..e5b56e9511e 100644
--- a/core/services/keeper/orm_test.go
+++ b/core/services/keeper/orm_test.go
@@ -15,6 +15,7 @@ import (
 	"github.com/jmoiron/sqlx"
 
 	evmconfig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
@@ -45,7 +46,7 @@ func setupKeeperDB(t *testing.T) (
 
 func newUpkeep(registry keeper.Registry, upkeepID int64) keeper.UpkeepRegistration {
 	return keeper.UpkeepRegistration{
-		UpkeepID:   utils.NewBigI(upkeepID),
+		UpkeepID:   ubig.NewI(upkeepID),
 		ExecuteGas: executeGas,
 		Registry:   registry,
 		RegistryID: registry.ID,
@@ -103,7 +104,7 @@ func TestKeeperDB_UpsertUpkeep(t *testing.T) {
 
 	registry, _ := cltest.MustInsertKeeperRegistry(t, db, orm, ethKeyStore, 0, 1, 20)
 	upkeep := keeper.UpkeepRegistration{
-		UpkeepID:            utils.NewBigI(0),
+		UpkeepID:            ubig.NewI(0),
 		ExecuteGas:          executeGas,
 		Registry:            registry,
 		RegistryID:          registry.ID,
@@ -139,7 +140,7 @@ func TestKeeperDB_BatchDeleteUpkeepsForJob(t *testing.T) {
 	registry, job := cltest.MustInsertKeeperRegistry(t, db, orm, ethKeyStore, 0, 1, 20)
 
 	expectedUpkeepID := cltest.MustInsertUpkeepForRegistry(t, db, config.Database(), registry).UpkeepID
-	var upkeepIDs []utils.Big
+	var upkeepIDs []ubig.Big
 	for i := 0; i < 2; i++ {
 		upkeep := cltest.MustInsertUpkeepForRegistry(t, db, config.Database(), registry)
 		upkeepIDs = append(upkeepIDs, *upkeep.UpkeepID)
@@ -180,7 +181,7 @@ func TestKeeperDB_EligibleUpkeeps_Shuffle(t *testing.T) {
 	assert.NoError(t, err)
 
 	require.Len(t, eligibleUpkeeps, 100)
-	shuffled := [100]*utils.Big{}
+	shuffled := [100]*ubig.Big{}
 	for i := 0; i < 100; i++ {
 		shuffled[i] = eligibleUpkeeps[i].UpkeepID
 	}
@@ -372,8 +373,8 @@ func TestKeeperDB_AllUpkeepIDsForRegistry(t *testing.T) {
 	require.NoError(t, err)
 	// No upkeeps returned
 	require.Len(t, upkeepIDs, 2)
-	require.Contains(t, upkeepIDs, *utils.NewBig(big.NewInt(3)))
-	require.Contains(t, upkeepIDs, *utils.NewBig(big.NewInt(8)))
+	require.Contains(t, upkeepIDs, *ubig.New(big.NewInt(3)))
+	require.Contains(t, upkeepIDs, *ubig.New(big.NewInt(8)))
 }
 
 func TestKeeperDB_UpdateUpkeepLastKeeperIndex(t *testing.T) {
diff --git a/core/services/keeper/registry1_1_synchronizer_test.go b/core/services/keeper/registry1_1_synchronizer_test.go
index fb0b1866c41..a4f03d4d34a 100644
--- a/core/services/keeper/registry1_1_synchronizer_test.go
+++ b/core/services/keeper/registry1_1_synchronizer_test.go
@@ -16,6 +16,7 @@ import (
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	logmocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/log/mocks"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	registry1_1 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/keeper_registry_wrapper1_1"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
@@ -24,7 +25,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keeper"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 var registryConfig1_1 = registry1_1.GetConfig{
@@ -123,7 +123,7 @@ func Test_RegistrySynchronizer1_1_Start(t *testing.T) {
 func Test_RegistrySynchronizer_CalcPositioningConstant(t *testing.T) {
 	t.Parallel()
 	for _, upkeepID := range []int64{0, 1, 100, 10_000} {
-		_, err := keeper.CalcPositioningConstant(utils.NewBigI(upkeepID), cltest.NewEIP55Address())
+		_, err := keeper.CalcPositioningConstant(ubig.NewI(upkeepID), cltest.NewEIP55Address())
 		require.NoError(t, err)
 	}
 }
diff --git a/core/services/keeper/registry1_3_synchronizer_test.go b/core/services/keeper/registry1_3_synchronizer_test.go
index 6e3be4ea785..77bb873e1d0 100644
--- a/core/services/keeper/registry1_3_synchronizer_test.go
+++ b/core/services/keeper/registry1_3_synchronizer_test.go
@@ -17,6 +17,7 @@ import (
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	logmocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/log/mocks"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	registry1_3 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/keeper_registry_wrapper1_3"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
@@ -25,7 +26,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keeper"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 var registryConfig1_3 = registry1_3.Config{
@@ -654,7 +654,7 @@ func Test_RegistrySynchronizer1_3_UpkeepPausedLog_UpkeepUnpausedLog(t *testing.T
 
 	cltest.WaitForCount(t, db, "upkeep_registrations", 3)
 	var upkeep keeper.UpkeepRegistration
-	err := db.Get(&upkeep, `SELECT * FROM upkeep_registrations WHERE upkeep_id = $1`, utils.NewBig(upkeepId))
+	err := db.Get(&upkeep, `SELECT * FROM upkeep_registrations WHERE upkeep_id = $1`, ubig.New(upkeepId))
 	require.NoError(t, err)
 
 	require.Equal(t, upkeepId.String(), upkeep.UpkeepID.String())
@@ -714,7 +714,7 @@ func Test_RegistrySynchronizer1_3_UpkeepCheckDataUpdatedLog(t *testing.T) {
 
 	g.Eventually(func() []byte {
 		var upkeep keeper.UpkeepRegistration
-		err := db.Get(&upkeep, `SELECT * FROM upkeep_registrations WHERE upkeep_id = $1`, utils.NewBig(upkeepId))
+		err := db.Get(&upkeep, `SELECT * FROM upkeep_registrations WHERE upkeep_id = $1`, ubig.New(upkeepId))
 		require.NoError(t, err)
 		return upkeep.CheckData
 	}, testutils.WaitTimeout(t), cltest.DBPollingInterval).Should(gomega.Equal(newCheckData))
diff --git a/core/services/keeper/registry_synchronizer_process_logs.go b/core/services/keeper/registry_synchronizer_process_logs.go
index 9e1aa3b410b..7b82f49ae4c 100644
--- a/core/services/keeper/registry_synchronizer_process_logs.go
+++ b/core/services/keeper/registry_synchronizer_process_logs.go
@@ -7,11 +7,11 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	registry1_1 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/keeper_registry_wrapper1_1"
 	registry1_2 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/keeper_registry_wrapper1_2"
 	registry1_3 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/keeper_registry_wrapper1_3"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func (rs *RegistrySynchronizer) processLogs() {
@@ -109,7 +109,7 @@ func (rs *RegistrySynchronizer) handleUpkeepCancelled(broadcast log.Broadcast) e
 		return errors.Wrap(err, "Unable to fetch cancelled upkeep ID from log")
 	}
 
-	affected, err := rs.orm.BatchDeleteUpkeepsForJob(rs.job.ID, []utils.Big{*utils.NewBig(cancelledID)})
+	affected, err := rs.orm.BatchDeleteUpkeepsForJob(rs.job.ID, []big.Big{*big.New(cancelledID)})
 	if err != nil {
 		return errors.Wrap(err, "unable to batch delete upkeeps")
 	}
@@ -130,7 +130,7 @@ func (rs *RegistrySynchronizer) handleUpkeepRegistered(broadcast log.Broadcast)
 		return errors.Wrap(err, "Unable to fetch upkeep ID from registration log")
 	}
 
-	err = rs.syncUpkeep(&rs.registryWrapper, registry, utils.NewBig(upkeepID))
+	err = rs.syncUpkeep(&rs.registryWrapper, registry, big.New(upkeepID))
 	if err != nil {
 		return errors.Wrapf(err, "failed to sync upkeep, log: %v", broadcast.String())
 	}
@@ -144,7 +144,7 @@ func (rs *RegistrySynchronizer) handleUpkeepPerformed(broadcast log.Broadcast) e
 	if err != nil {
 		return errors.Wrap(err, "Unable to fetch upkeep ID from performed log")
 	}
-	rowsAffected, err := rs.orm.SetLastRunInfoForUpkeepOnJob(rs.job.ID, utils.NewBig(log.UpkeepID), int64(broadcast.RawLog().BlockNumber), ethkey.EIP55AddressFromAddress(log.FromKeeper))
+	rowsAffected, err := rs.orm.SetLastRunInfoForUpkeepOnJob(rs.job.ID, big.New(log.UpkeepID), int64(broadcast.RawLog().BlockNumber), ethkey.EIP55AddressFromAddress(log.FromKeeper))
 	if err != nil {
 		return errors.Wrap(err, "failed to set last run to 0")
 	}
@@ -171,7 +171,7 @@ func (rs *RegistrySynchronizer) handleUpkeepGasLimitSet(broadcast log.Broadcast)
 		return errors.Wrap(err, "Unable to fetch upkeep ID from gas limit set log")
 	}
 
-	err = rs.syncUpkeep(&rs.registryWrapper, registry, utils.NewBig(upkeepID))
+	err = rs.syncUpkeep(&rs.registryWrapper, registry, big.New(upkeepID))
 	if err != nil {
 		return errors.Wrapf(err, "failed to sync upkeep, log: %v", broadcast.String())
 	}
@@ -191,7 +191,7 @@ func (rs *RegistrySynchronizer) handleUpkeepReceived(broadcast log.Broadcast) er
 		return errors.Wrap(err, "Unable to fetch upkeep ID from received log")
 	}
 
-	err = rs.syncUpkeep(&rs.registryWrapper, registry, utils.NewBig(upkeepID))
+	err = rs.syncUpkeep(&rs.registryWrapper, registry, big.New(upkeepID))
 	if err != nil {
 		return errors.Wrapf(err, "failed to sync upkeep, log: %v", broadcast.String())
 	}
@@ -206,7 +206,7 @@ func (rs *RegistrySynchronizer) handleUpkeepMigrated(broadcast log.Broadcast) er
 		return errors.Wrap(err, "Unable to fetch migrated upkeep ID from log")
 	}
 
-	affected, err := rs.orm.BatchDeleteUpkeepsForJob(rs.job.ID, []utils.Big{*utils.NewBig(migratedID)})
+	affected, err := rs.orm.BatchDeleteUpkeepsForJob(rs.job.ID, []big.Big{*big.New(migratedID)})
 	if err != nil {
 		return errors.Wrap(err, "unable to batch delete upkeeps")
 	}
@@ -222,7 +222,7 @@ func (rs *RegistrySynchronizer) handleUpkeepPaused(broadcast log.Broadcast) erro
 		return errors.Wrap(err, "Unable to fetch upkeep ID from upkeep paused log")
 	}
 
-	_, err = rs.orm.BatchDeleteUpkeepsForJob(rs.job.ID, []utils.Big{*utils.NewBig(pausedUpkeepId)})
+	_, err = rs.orm.BatchDeleteUpkeepsForJob(rs.job.ID, []big.Big{*big.New(pausedUpkeepId)})
 	if err != nil {
 		return errors.Wrap(err, "unable to batch delete upkeeps")
 	}
@@ -243,7 +243,7 @@ func (rs *RegistrySynchronizer) handleUpkeepUnpaused(broadcast log.Broadcast) er
 		return errors.Wrap(err, "Unable to fetch upkeep ID from upkeep unpaused log")
 	}
 
-	err = rs.syncUpkeep(&rs.registryWrapper, registry, utils.NewBig(unpausedUpkeepId))
+	err = rs.syncUpkeep(&rs.registryWrapper, registry, big.New(unpausedUpkeepId))
 	if err != nil {
 		return errors.Wrapf(err, "failed to sync upkeep, log: %s", broadcast.String())
 	}
@@ -264,7 +264,7 @@ func (rs *RegistrySynchronizer) handleUpkeepCheckDataUpdated(broadcast log.Broad
 		return errors.Wrap(err, "Unable to parse update log from upkeep check data updated log")
 	}
 
-	err = rs.syncUpkeep(&rs.registryWrapper, registry, utils.NewBig(updateLog.UpkeepID))
+	err = rs.syncUpkeep(&rs.registryWrapper, registry, big.New(updateLog.UpkeepID))
 	if err != nil {
 		return errors.Wrapf(err, "unable to update check data for upkeep %s", updateLog.UpkeepID.String())
 	}
diff --git a/core/services/keeper/registry_synchronizer_sync.go b/core/services/keeper/registry_synchronizer_sync.go
index 649ccd94066..f90e0bc85d7 100644
--- a/core/services/keeper/registry_synchronizer_sync.go
+++ b/core/services/keeper/registry_synchronizer_sync.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/pkg/errors"
 
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
@@ -53,15 +54,15 @@ func (rs *RegistrySynchronizer) fullSyncUpkeeps(reg Registry) error {
 	}
 
 	activeSet := make(map[string]bool)
-	allActiveUpkeeps := make([]utils.Big, 0)
+	allActiveUpkeeps := make([]big.Big, 0)
 	for _, upkeepID := range activeUpkeepIDs {
 		activeSet[upkeepID.String()] = true
-		allActiveUpkeeps = append(allActiveUpkeeps, *utils.NewBig(upkeepID))
+		allActiveUpkeeps = append(allActiveUpkeeps, *big.New(upkeepID))
 	}
 	rs.batchSyncUpkeepsOnRegistry(reg, allActiveUpkeeps)
 
 	// All upkeeps in existingUpkeepIDs, not in activeUpkeepIDs should be deleted
-	canceled := make([]utils.Big, 0)
+	canceled := make([]big.Big, 0)
 	for _, upkeepID := range existingUpkeepIDs {
 		if _, found := activeSet[upkeepID.ToInt().String()]; !found {
 			canceled = append(canceled, upkeepID)
@@ -75,7 +76,7 @@ func (rs *RegistrySynchronizer) fullSyncUpkeeps(reg Registry) error {
 
 // batchSyncUpkeepsOnRegistry syncs <syncUpkeepQueueSize> upkeeps at a time in parallel
 // for all the IDs within newUpkeeps slice
-func (rs *RegistrySynchronizer) batchSyncUpkeepsOnRegistry(reg Registry, newUpkeeps []utils.Big) {
+func (rs *RegistrySynchronizer) batchSyncUpkeepsOnRegistry(reg Registry, newUpkeeps []big.Big) {
 	wg := sync.WaitGroup{}
 	wg.Add(len(newUpkeeps))
 	chSyncUpkeepQueue := make(chan struct{}, rs.syncUpkeepQueueSize)
@@ -93,7 +94,7 @@ func (rs *RegistrySynchronizer) batchSyncUpkeepsOnRegistry(reg Registry, newUpke
 	wg.Wait()
 }
 
-func (rs *RegistrySynchronizer) syncUpkeepWithCallback(getter upkeepGetter, registry Registry, upkeepID *utils.Big, doneCallback func()) {
+func (rs *RegistrySynchronizer) syncUpkeepWithCallback(getter upkeepGetter, registry Registry, upkeepID *big.Big, doneCallback func()) {
 	defer doneCallback()
 
 	if err := rs.syncUpkeep(getter, registry, upkeepID); err != nil {
@@ -104,7 +105,7 @@ func (rs *RegistrySynchronizer) syncUpkeepWithCallback(getter upkeepGetter, regi
 	}
 }
 
-func (rs *RegistrySynchronizer) syncUpkeep(getter upkeepGetter, registry Registry, upkeepID *utils.Big) error {
+func (rs *RegistrySynchronizer) syncUpkeep(getter upkeepGetter, registry Registry, upkeepID *big.Big) error {
 	upkeep, err := getter.GetUpkeep(nil, upkeepID.ToInt())
 	if err != nil {
 		return errors.Wrap(err, "failed to get upkeep config")
@@ -173,9 +174,9 @@ func (rs *RegistrySynchronizer) newRegistryFromChain() (Registry, error) {
 
 // CalcPositioningConstant calculates a positioning constant.
 // The positioning constant is fixed because upkeepID and registryAddress are immutable
-func CalcPositioningConstant(upkeepID *utils.Big, registryAddress ethkey.EIP55Address) (int32, error) {
+func CalcPositioningConstant(upkeepID *big.Big, registryAddress ethkey.EIP55Address) (int32, error) {
 	upkeepBytes := make([]byte, binary.MaxVarintLen64)
-	binary.PutVarint(upkeepBytes, upkeepID.Mod(utils.NewBigI(math.MaxInt64)).Int64())
+	binary.PutVarint(upkeepBytes, upkeepID.Mod(big.NewI(math.MaxInt64)).Int64())
 	bytesToHash := utils.ConcatBytes(upkeepBytes, registryAddress.Bytes())
 	checksum, err := utils.Keccak256(bytesToHash)
 	if err != nil {
diff --git a/core/services/keeper/registry_synchronizer_sync_test.go b/core/services/keeper/registry_synchronizer_sync_test.go
index 10a51679c5e..e6f42a83201 100644
--- a/core/services/keeper/registry_synchronizer_sync_test.go
+++ b/core/services/keeper/registry_synchronizer_sync_test.go
@@ -10,10 +10,10 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zapcore"
 
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 // GetUpkeepFailure implements the upkeepGetter interface with an induced error and nil
@@ -42,7 +42,7 @@ func TestSyncUpkeepWithCallback_UpkeepNotFound(t *testing.T) {
 		t.FailNow()
 	}
 
-	id := utils.NewBig(o)
+	id := ubig.New(o)
 	count := 0
 	doneFunc := func() {
 		count++
diff --git a/core/services/keeper/upkeep_executer_test.go b/core/services/keeper/upkeep_executer_test.go
index 123b1dc0de1..61ccca956f4 100644
--- a/core/services/keeper/upkeep_executer_test.go
+++ b/core/services/keeper/upkeep_executer_test.go
@@ -23,6 +23,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	txmmocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr/mocks"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
@@ -39,7 +40,7 @@ import (
 )
 
 func newHead() evmtypes.Head {
-	return evmtypes.NewHead(big.NewInt(20), utils.NewHash(), utils.NewHash(), 1000, utils.NewBigI(0))
+	return evmtypes.NewHead(big.NewInt(20), utils.NewHash(), utils.NewHash(), 1000, ubig.NewI(0))
 }
 
 func mockEstimator(t *testing.T) gas.EvmFeeEstimator {
@@ -128,7 +129,7 @@ func Test_UpkeepExecuter_PerformsUpkeep_Happy(t *testing.T) {
 	t.Run("runs upkeep on triggering block number", func(t *testing.T) {
 		db, config, ethMock, executer, registry, upkeep, job, jpv2, txm, _, _, _ := setup(t, mockEstimator(t),
 			func(c *chainlink.Config, s *chainlink.Secrets) {
-				c.EVM[0].ChainID = (*utils.Big)(testutils.SimulatedChainID)
+				c.EVM[0].ChainID = (*ubig.Big)(testutils.SimulatedChainID)
 			})
 
 		gasLimit := 5_000_000 + config.Keeper().Registry().PerformGasOverhead()
@@ -173,7 +174,7 @@ func Test_UpkeepExecuter_PerformsUpkeep_Happy(t *testing.T) {
 		runTest := func(t *testing.T, eip1559 bool) {
 			db, config, ethMock, executer, registry, upkeep, job, jpv2, txm, _, _, _ := setup(t, mockEstimator(t), func(c *chainlink.Config, s *chainlink.Secrets) {
 				c.EVM[0].GasEstimator.EIP1559DynamicFees = &eip1559
-				c.EVM[0].ChainID = (*utils.Big)(testutils.SimulatedChainID)
+				c.EVM[0].ChainID = (*ubig.Big)(testutils.SimulatedChainID)
 			})
 
 			gasLimit := 5_000_000 + config.Keeper().Registry().PerformGasOverhead()
@@ -226,7 +227,7 @@ func Test_UpkeepExecuter_PerformsUpkeep_Happy(t *testing.T) {
 
 	t.Run("errors if submission key not found", func(t *testing.T) {
 		_, _, ethMock, executer, registry, _, job, jpv2, _, keyStore, _, _ := setup(t, mockEstimator(t), func(c *chainlink.Config, s *chainlink.Secrets) {
-			c.EVM[0].ChainID = (*utils.Big)(testutils.SimulatedChainID)
+			c.EVM[0].ChainID = (*ubig.Big)(testutils.SimulatedChainID)
 		})
 
 		// replace expected key with random one
@@ -263,7 +264,7 @@ func Test_UpkeepExecuter_PerformsUpkeep_Happy(t *testing.T) {
 
 		registry, jb := cltest.MustInsertKeeperRegistry(t, db, orm, keyStore.Eth(), 0, 1, 20)
 		// change chain ID to non-configured chain
-		jb.KeeperSpec.EVMChainID = (*utils.Big)(big.NewInt(999))
+		jb.KeeperSpec.EVMChainID = (*ubig.Big)(big.NewInt(999))
 		cltest.MustInsertUpkeepForRegistry(t, db, ch.Config().Database(), registry)
 		lggr := logger.TestLogger(t)
 		executer := keeper.NewUpkeepExecuter(jb, orm, jpv2.Pr, ethMock, ch.HeadBroadcaster(), ch.GasEstimator(), lggr, ch.Config().Keeper(), jb.KeeperSpec.FromAddress.Address())
@@ -278,7 +279,7 @@ func Test_UpkeepExecuter_PerformsUpkeep_Happy(t *testing.T) {
 
 	t.Run("triggers if heads are skipped but later heads arrive within range", func(t *testing.T) {
 		db, config, ethMock, executer, registry, upkeep, job, jpv2, txm, _, _, _ := setup(t, mockEstimator(t), func(c *chainlink.Config, s *chainlink.Secrets) {
-			c.EVM[0].ChainID = (*utils.Big)(testutils.SimulatedChainID)
+			c.EVM[0].ChainID = (*ubig.Big)(testutils.SimulatedChainID)
 		})
 
 		etxs := []cltest.Awaiter{
@@ -321,7 +322,7 @@ func Test_UpkeepExecuter_PerformsUpkeep_Error(t *testing.T) {
 
 	db, _, ethMock, executer, registry, _, _, _, _, _, _, _ := setup(t, mockEstimator(t),
 		func(c *chainlink.Config, s *chainlink.Secrets) {
-			c.EVM[0].ChainID = (*utils.Big)(testutils.SimulatedChainID)
+			c.EVM[0].ChainID = (*ubig.Big)(testutils.SimulatedChainID)
 		})
 
 	var wasCalled atomic.Bool
diff --git a/core/services/keeper/upkeep_executer_unit_test.go b/core/services/keeper/upkeep_executer_unit_test.go
index a8fc46319cd..8589720ca5f 100644
--- a/core/services/keeper/upkeep_executer_unit_test.go
+++ b/core/services/keeper/upkeep_executer_unit_test.go
@@ -7,11 +7,11 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 type registry struct {
@@ -34,7 +34,7 @@ func TestBuildJobSpec(t *testing.T) {
 			ContractAddress: contract,
 		}}
 
-	upkeepID := utils.NewBigI(4)
+	upkeepID := big.NewI(4)
 	upkeep := UpkeepRegistration{
 		Registry: Registry{
 			FromAddress:     from,
diff --git a/core/services/keystore/eth_test.go b/core/services/keystore/eth_test.go
index 42d6c575376..3935a44558b 100644
--- a/core/services/keystore/eth_test.go
+++ b/core/services/keystore/eth_test.go
@@ -14,6 +14,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
@@ -673,7 +674,7 @@ func Test_EthKeyStore_Delete(t *testing.T) {
 
 	_, addr1 := cltest.MustInsertRandomKey(t, ks)
 	_, addr2 := cltest.MustInsertRandomKey(t, ks)
-	cltest.MustInsertRandomKey(t, ks, *utils.NewBig(testutils.SimulatedChainID))
+	cltest.MustInsertRandomKey(t, ks, *ubig.New(testutils.SimulatedChainID))
 	require.NoError(t, ks.Add(addr1, testutils.SimulatedChainID))
 	require.NoError(t, ks.Enable(addr1, testutils.SimulatedChainID))
 
diff --git a/core/services/keystore/keys/ethkey/models.go b/core/services/keystore/keys/ethkey/models.go
index b90503c3ed6..df4c474b7b9 100644
--- a/core/services/keystore/keys/ethkey/models.go
+++ b/core/services/keystore/keys/ethkey/models.go
@@ -3,13 +3,13 @@ package ethkey
 import (
 	"time"
 
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 )
 
 type State struct {
 	ID         int32
 	Address    EIP55Address
-	EVMChainID utils.Big
+	EVMChainID big.Big
 	Disabled   bool
 	CreatedAt  time.Time
 	UpdatedAt  time.Time
diff --git a/core/services/ocr/database.go b/core/services/ocr/database.go
index 524dfa0e7bb..cec9596bb91 100644
--- a/core/services/ocr/database.go
+++ b/core/services/ocr/database.go
@@ -15,9 +15,9 @@ import (
 	"github.com/smartcontractkit/libocr/gethwrappers/offchainaggregator"
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting/types"
 
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 type db struct {
@@ -161,7 +161,7 @@ func (d *db) WriteConfig(ctx context.Context, c ocrtypes.ContractConfig) error {
 }
 
 func (d *db) StorePendingTransmission(ctx context.Context, k ocrtypes.ReportTimestamp, p ocrtypes.PendingTransmission) error {
-	median := utils.NewBig(p.Median)
+	median := big.New(p.Median)
 	var rs [][]byte
 	var ss [][]byte
 	// Note: p.Rs and p.Ss are of type [][32]byte.
@@ -232,7 +232,7 @@ WHERE ocr_oracle_spec_id = $1 AND config_digest = $2
 		k := ocrtypes.ReportTimestamp{}
 		p := ocrtypes.PendingTransmission{}
 
-		var median utils.Big
+		var median big.Big
 		var rs [][]byte
 		var ss [][]byte
 		var vs []byte
diff --git a/core/services/ocr2/delegate_test.go b/core/services/ocr2/delegate_test.go
index b55e128119d..3da0c9cbfd6 100644
--- a/core/services/ocr2/delegate_test.go
+++ b/core/services/ocr2/delegate_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
 	evmcfg "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
 	txmmocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr/mocks"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
@@ -23,11 +24,10 @@ import (
 	ocr2validate "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/validate"
 	evmrelay "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/testdata/testspecs"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func TestGetEVMEffectiveTransmitterID(t *testing.T) {
-	customChainID := utils.NewBig(testutils.NewRandomEVMChainID())
+	customChainID := big.New(testutils.NewRandomEVMChainID())
 
 	config := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
 		enabled := true
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/registry_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/registry_test.go
index 0e0ceba7160..51448db35cf 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/registry_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/registry_test.go
@@ -16,8 +16,8 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller/mocks"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func TestGetActiveUpkeepKeys(t *testing.T) {
@@ -176,8 +176,8 @@ func TestPollLogs(t *testing.T) {
 				InputStart: 250,
 				InputEnd:   500,
 				OutputLogs: []logpoller.Log{
-					{EvmChainId: utils.NewBig(big.NewInt(5)), LogIndex: 1},
-					{EvmChainId: utils.NewBig(big.NewInt(6)), LogIndex: 2},
+					{EvmChainId: ubig.New(big.NewInt(5)), LogIndex: 1},
+					{EvmChainId: ubig.New(big.NewInt(6)), LogIndex: 2},
 				},
 				OutputErr: nil,
 			},
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/recoverer_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/recoverer_test.go
index 89b19b4a819..65fe3c85fb8 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/recoverer_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider/recoverer_test.go
@@ -21,12 +21,12 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	lpmocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func TestLogRecoverer_GetRecoverables(t *testing.T) {
@@ -1023,7 +1023,7 @@ func TestLogRecoverer_GetProposalData(t *testing.T) {
 				LogsWithSigsFn: func(start, end int64, eventSigs []common.Hash, address common.Address, qopts ...pg.QOpt) ([]logpoller.Log, error) {
 					return []logpoller.Log{
 						{
-							EvmChainId:     utils.NewBig(big.NewInt(1)),
+							EvmChainId:     ubig.New(big.NewInt(1)),
 							LogIndex:       3,
 							BlockHash:      [32]byte{1},
 							BlockNumber:    80,
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/registry_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/registry_test.go
index f3e4402092c..0d097ceadb4 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/registry_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/registry_test.go
@@ -19,6 +19,7 @@ import (
 	types3 "github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker/types"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller/mocks"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_utils_2_1"
 	iregistry21 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/i_keeper_registry_master_wrapper_2_1"
@@ -27,7 +28,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/logprovider"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func TestPollLogs(t *testing.T) {
@@ -132,8 +132,8 @@ func TestPollLogs(t *testing.T) {
 				InputStart: 250,
 				InputEnd:   500,
 				OutputLogs: []logpoller.Log{
-					{EvmChainId: utils.NewBig(big.NewInt(5)), LogIndex: 1},
-					{EvmChainId: utils.NewBig(big.NewInt(6)), LogIndex: 2},
+					{EvmChainId: ubig.New(big.NewInt(5)), LogIndex: 1},
+					{EvmChainId: ubig.New(big.NewInt(6)), LogIndex: 2},
 				},
 				OutputErr: nil,
 			},
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/orm.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/orm.go
index c918ad595fa..a5bd738de4c 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/orm.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/orm.go
@@ -7,18 +7,18 @@ import (
 	"github.com/jmoiron/sqlx"
 	"github.com/lib/pq"
 
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 type orm struct {
-	chainID *utils.Big
+	chainID *ubig.Big
 	q       pg.Q
 }
 
 type persistedStateRecord struct {
-	UpkeepID            *utils.Big
+	UpkeepID            *ubig.Big
 	WorkID              string
 	CompletionState     uint8
 	BlockNumber         int64
@@ -29,7 +29,7 @@ type persistedStateRecord struct {
 // NewORM creates an ORM scoped to chainID.
 func NewORM(chainID *big.Int, db *sqlx.DB, lggr logger.Logger, cfg pg.QConfig) *orm {
 	return &orm{
-		chainID: utils.NewBig(chainID),
+		chainID: ubig.New(chainID),
 		q:       pg.NewQ(db, lggr.Named("ORM"), cfg),
 	}
 }
@@ -43,12 +43,12 @@ func (o *orm) BatchInsertRecords(state []persistedStateRecord, qopts ...pg.QOpt)
 	}
 
 	type row struct {
-		EvmChainId          *utils.Big
+		EvmChainId          *ubig.Big
 		WorkId              string
 		CompletionState     uint8
 		BlockNumber         int64
 		InsertedAt          time.Time
-		UpkeepId            *utils.Big
+		UpkeepId            *ubig.Big
 		IneligibilityReason uint8
 	}
 
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/orm_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/orm_test.go
index 54ca7285dd0..bfd131b5055 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/orm_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/orm_test.go
@@ -9,10 +9,10 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zapcore"
 
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func TestInsertSelectDelete(t *testing.T) {
@@ -23,7 +23,7 @@ func TestInsertSelectDelete(t *testing.T) {
 
 	inserted := []persistedStateRecord{
 		{
-			UpkeepID:            utils.NewBig(big.NewInt(2)),
+			UpkeepID:            ubig.New(big.NewInt(2)),
 			WorkID:              "0x1",
 			CompletionState:     100,
 			BlockNumber:         2,
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/store.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/store.go
index 4a4de5ea1ad..19b3c46f502 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/store.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/store.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
@@ -225,7 +226,7 @@ func (u *upkeepStateStore) upsertStateRecord(ctx context.Context, workID string,
 	u.cache[workID] = record
 
 	u.pendingRecords = append(u.pendingRecords, persistedStateRecord{
-		UpkeepID:            utils.NewBig(upkeepID),
+		UpkeepID:            ubig.New(upkeepID),
 		WorkID:              record.workID,
 		CompletionState:     uint8(record.state),
 		IneligibilityReason: reason,
diff --git a/core/services/ocr2/plugins/ocr2keeper/integration_test.go b/core/services/ocr2/plugins/ocr2keeper/integration_test.go
index 58c1e38e017..6674b0828b1 100644
--- a/core/services/ocr2/plugins/ocr2keeper/integration_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/integration_test.go
@@ -37,6 +37,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/forwarders"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/config/toml"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/authorized_forwarder"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/basic_upkeep_contract"
@@ -60,7 +61,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 const (
@@ -448,7 +448,7 @@ func setupForwarderForNode(
 
 	// add forwarder address to be tracked in db
 	forwarderORM := forwarders.NewORM(app.GetSqlxDB(), logger.TestLogger(t), app.GetConfig().Database())
-	chainID := utils.Big(*backend.Blockchain().Config().ChainID)
+	chainID := ubig.Big(*backend.Blockchain().Config().ChainID)
 	_, err = forwarderORM.CreateForwarder(faddr, chainID)
 	require.NoError(t, err)
 
diff --git a/core/services/ocr2/plugins/ocr2vrf/internal/ocr2vrf_integration_test.go b/core/services/ocr2/plugins/ocr2vrf/internal/ocr2vrf_integration_test.go
index 4a583e5db3f..c559fb27fb7 100644
--- a/core/services/ocr2/plugins/ocr2vrf/internal/ocr2vrf_integration_test.go
+++ b/core/services/ocr2/plugins/ocr2vrf/internal/ocr2vrf_integration_test.go
@@ -33,6 +33,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/forwarders"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/authorized_forwarder"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/link_token_interface"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/mock_v3_aggregator_contract"
@@ -285,7 +286,7 @@ func setupNodeOCR2(
 
 		// Add the forwarder to the node's forwarder manager.
 		forwarderORM := forwarders.NewORM(app.GetSqlxDB(), logger.TestLogger(t), config.Database())
-		chainID := utils.Big(*b.Blockchain().Config().ChainID)
+		chainID := ubig.Big(*b.Blockchain().Config().ChainID)
 		_, err = forwarderORM.CreateForwarder(faddr, chainID)
 		require.NoError(t, err)
 		effectiveTransmitter = faddr
diff --git a/core/services/ocr2/plugins/s4/integration_test.go b/core/services/ocr2/plugins/s4/integration_test.go
index 54f0f02ad98..8efe38f8e2d 100644
--- a/core/services/ocr2/plugins/s4/integration_test.go
+++ b/core/services/ocr2/plugins/s4/integration_test.go
@@ -9,6 +9,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
@@ -16,7 +17,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/s4"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	s4_svc "github.com/smartcontractkit/chainlink/v2/core/services/s4"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 
 	commonlogger "github.com/smartcontractkit/chainlink-common/pkg/logger"
 
@@ -357,14 +357,14 @@ func TestS4Integration_RandomState(t *testing.T) {
 
 	type user struct {
 		privateKey *ecdsa.PrivateKey
-		address    *utils.Big
+		address    *big.Big
 	}
 
 	nUsers := 100
 	users := make([]user, nUsers)
 	for i := 0; i < nUsers; i++ {
 		pk, addr := testutils.NewPrivateKeyAndAddress(t)
-		users[i] = user{pk, utils.NewBig(addr.Big())}
+		users[i] = user{pk, big.New(addr.Big())}
 	}
 
 	// generating test records
diff --git a/core/services/ocr2/plugins/s4/messages.go b/core/services/ocr2/plugins/s4/messages.go
index 8f3a64f4e23..c9695d2db76 100644
--- a/core/services/ocr2/plugins/s4/messages.go
+++ b/core/services/ocr2/plugins/s4/messages.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"math/big"
 
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/services/s4"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 
 	"github.com/ethereum/go-ethereum/common"
 	"google.golang.org/protobuf/proto"
@@ -58,8 +58,8 @@ func UnmarshalRows(data []byte) ([]*Row, error) {
 	return rows.Rows, nil
 }
 
-func UnmarshalAddress(address []byte) *utils.Big {
-	return utils.NewBig(new(big.Int).SetBytes(address))
+func UnmarshalAddress(address []byte) *ubig.Big {
+	return ubig.New(new(big.Int).SetBytes(address))
 }
 
 func (row *Row) VerifySignature() error {
diff --git a/core/services/ocr2/plugins/s4/plugin.go b/core/services/ocr2/plugins/s4/plugin.go
index 68bd9fd2142..fcb025b21cd 100644
--- a/core/services/ocr2/plugins/s4/plugin.go
+++ b/core/services/ocr2/plugins/s4/plugin.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"time"
 
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/services/s4"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 
 	"github.com/pkg/errors"
 	"github.com/smartcontractkit/libocr/commontypes"
@@ -123,7 +123,7 @@ func (c *plugin) Observation(ctx context.Context, ts types.ReportTimestamp, quer
 			c.logger.Error("ORM GetSnapshot error", commontypes.LogFields{"err": err})
 		} else {
 			type rkey struct {
-				address *utils.Big
+				address *big.Big
 				slotID  uint
 			}
 
diff --git a/core/services/ocr2/plugins/s4/plugin_test.go b/core/services/ocr2/plugins/s4/plugin_test.go
index e2b5d21b847..e0aa84183e1 100644
--- a/core/services/ocr2/plugins/s4/plugin_test.go
+++ b/core/services/ocr2/plugins/s4/plugin_test.go
@@ -5,13 +5,13 @@ import (
 	"testing"
 	"time"
 
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/s4"
 	s4_svc "github.com/smartcontractkit/chainlink/v2/core/services/s4"
 	s4_mocks "github.com/smartcontractkit/chainlink/v2/core/services/s4/mocks"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 
 	commonlogger "github.com/smartcontractkit/chainlink-common/pkg/logger"
 
@@ -51,7 +51,7 @@ func generateTestRows(t *testing.T, n int, ttl time.Duration) []*s4.Row {
 func generateTestOrmRow(t *testing.T, ttl time.Duration, version uint64, confimed bool) *s4_svc.Row {
 	priv, addr := testutils.NewPrivateKeyAndAddress(t)
 	row := &s4_svc.Row{
-		Address:    utils.NewBig(addr.Big()),
+		Address:    big.New(addr.Big()),
 		SlotId:     0,
 		Version:    version,
 		Confirmed:  confimed,
@@ -296,7 +296,7 @@ func TestPlugin_Query(t *testing.T) {
 		for i := 0; i < 256; i++ {
 			var thisAddress common.Address
 			thisAddress[0] = byte(i)
-			ormRows[i].Address = utils.NewBig(thisAddress.Big())
+			ormRows[i].Address = big.New(thisAddress.Big())
 		}
 		versions := rowsToShapshotRows(ormRows)
 
@@ -322,7 +322,7 @@ func TestPlugin_Query(t *testing.T) {
 			assert.Len(t, qq.Rows, 16)
 			for _, r := range qq.Rows {
 				thisAddress := s4.UnmarshalAddress(r.Address)
-				assert.True(t, ar.Contains((*utils.Big)(thisAddress)))
+				assert.True(t, ar.Contains((*big.Big)(thisAddress)))
 			}
 
 			ar.Advance()
diff --git a/core/services/ocrcommon/telemetry_test.go b/core/services/ocrcommon/telemetry_test.go
index 9c90eea180a..7627a627dea 100644
--- a/core/services/ocrcommon/telemetry_test.go
+++ b/core/services/ocrcommon/telemetry_test.go
@@ -19,6 +19,7 @@ import (
 	mercuryv1 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v1"
 	mercuryv2 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v2"
 
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
@@ -147,7 +148,7 @@ func TestGetChainID(t *testing.T) {
 	}
 
 	j.Type = job.Type(pipeline.OffchainReportingJobType)
-	j.OCROracleSpec.EVMChainID = (*utils.Big)(big.NewInt(1234567890))
+	j.OCROracleSpec.EVMChainID = (*ubig.Big)(big.NewInt(1234567890))
 	assert.Equal(t, "1234567890", e.getChainID())
 
 	j.Type = job.Type(pipeline.OffchainReporting2JobType)
@@ -206,7 +207,7 @@ func TestSendEATelemetry(t *testing.T) {
 		OCROracleSpec: &job.OCROracleSpec{
 			ContractAddress:    ethkey.EIP55AddressFromAddress(feedAddress),
 			CaptureEATelemetry: true,
-			EVMChainID:         (*utils.Big)(big.NewInt(9)),
+			EVMChainID:         (*ubig.Big)(big.NewInt(9)),
 		},
 	}
 
diff --git a/core/services/pipeline/orm_test.go b/core/services/pipeline/orm_test.go
index dcbbfd9c97e..92a6c25da39 100644
--- a/core/services/pipeline/orm_test.go
+++ b/core/services/pipeline/orm_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/jmoiron/sqlx"
 
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest/heavyweight"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
@@ -531,7 +532,7 @@ func Test_GetUnfinishedRuns_Keepers(t *testing.T) {
 			FromAddress:     cltest.NewEIP55Address(),
 			CreatedAt:       timestamp,
 			UpdatedAt:       timestamp,
-			EVMChainID:      (*utils.Big)(&cltest.FixtureChainID),
+			EVMChainID:      (*big.Big)(&cltest.FixtureChainID),
 		},
 		ExternalJobID: uuid.MustParse("0EEC7E1D-D0D2-476C-A1A8-72DFB6633F46"),
 		PipelineSpec: &pipeline.Spec{
@@ -630,7 +631,7 @@ func Test_GetUnfinishedRuns_DirectRequest(t *testing.T) {
 			ContractAddress: cltest.NewEIP55Address(),
 			CreatedAt:       timestamp,
 			UpdatedAt:       timestamp,
-			EVMChainID:      (*utils.Big)(&cltest.FixtureChainID),
+			EVMChainID:      (*big.Big)(&cltest.FixtureChainID),
 		},
 		ExternalJobID: uuid.MustParse("0EEC7E1D-D0D2-476C-A1A8-72DFB6633F46"),
 		PipelineSpec: &pipeline.Spec{
diff --git a/core/services/promreporter/prom_reporter_test.go b/core/services/promreporter/prom_reporter_test.go
index 1cebba2faf9..7b9930e4daa 100644
--- a/core/services/promreporter/prom_reporter_test.go
+++ b/core/services/promreporter/prom_reporter_test.go
@@ -16,6 +16,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/mocks"
@@ -29,7 +30,7 @@ import (
 )
 
 func newHead() evmtypes.Head {
-	return evmtypes.Head{Number: 42, EVMChainID: utils.NewBigI(0)}
+	return evmtypes.Head{Number: 42, EVMChainID: ubig.NewI(0)}
 }
 
 func newLegacyChainContainer(t *testing.T, db *sqlx.DB) legacyevm.LegacyChainContainer {
diff --git a/core/services/relay/evm/median_test.go b/core/services/relay/evm/median_test.go
index 4286290d289..9c474006aa7 100644
--- a/core/services/relay/evm/median_test.go
+++ b/core/services/relay/evm/median_test.go
@@ -9,11 +9,11 @@ import (
 
 	commontypes "github.com/smartcontractkit/chainlink-common/pkg/types"
 
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func TestNewMedianProvider(t *testing.T) {
@@ -37,7 +37,7 @@ func TestNewMedianProvider(t *testing.T) {
 	})
 
 	t.Run("invalid contractID", func(t *testing.T) {
-		relayConfig := evmtypes.RelayConfig{ChainID: utils.NewBig(chainID)}
+		relayConfig := evmtypes.RelayConfig{ChainID: big.New(chainID)}
 		rc, err2 := json.Marshal(&relayConfig)
 		require.NoError(t, err2)
 		rargsBadContractID := commontypes.RelayArgs{ContractID: "NotAContractID", RelayConfig: rc}
diff --git a/core/services/relay/evm/relayer_extender_test.go b/core/services/relay/evm/relayer_extender_test.go
index 3f4a3749ac8..af15461aee9 100644
--- a/core/services/relay/evm/relayer_extender_test.go
+++ b/core/services/relay/evm/relayer_extender_test.go
@@ -10,6 +10,7 @@ import (
 	evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
@@ -17,7 +18,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	evmrelay "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func TestChainRelayExtenders(t *testing.T) {
@@ -28,7 +28,7 @@ func TestChainRelayExtenders(t *testing.T) {
 		one := uint32(1)
 		c.EVM[0].MinIncomingConfirmations = &one
 		t := true
-		c.EVM = append(c.EVM, &toml.EVMConfig{ChainID: utils.NewBig(newId), Enabled: &t, Chain: toml.Defaults(nil)})
+		c.EVM = append(c.EVM, &toml.EVMConfig{ChainID: ubig.New(newId), Enabled: &t, Chain: toml.Defaults(nil)})
 	})
 	db := pgtest.NewSqlxDB(t)
 	kst := cltest.NewKeyStore(t, db, cfg.Database())
diff --git a/core/services/relay/evm/types/types.go b/core/services/relay/evm/types/types.go
index 24afb65c55a..129ccb4a5e6 100644
--- a/core/services/relay/evm/types/types.go
+++ b/core/services/relay/evm/types/types.go
@@ -17,7 +17,7 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
 	commontypes "github.com/smartcontractkit/chainlink-common/pkg/types"
 
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 )
 
 type ChainReaderConfig struct {
@@ -47,7 +47,7 @@ const (
 )
 
 type RelayConfig struct {
-	ChainID                *utils.Big         `json:"chainID"`
+	ChainID                *big.Big           `json:"chainID"`
 	FromBlock              uint64             `json:"fromBlock"`
 	EffectiveTransmitterID null.String        `json:"effectiveTransmitterID"`
 	ConfigContractAddress  *common.Address    `json:"configContractAddress"`
diff --git a/core/services/relay/evm/types/types_test.go b/core/services/relay/evm/types/types_test.go
index dec368614ec..6952c35a706 100644
--- a/core/services/relay/evm/types/types_test.go
+++ b/core/services/relay/evm/types/types_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
-// ChainID   *utils.Big `json:"chainID"`
+// ChainID   *big.Big   `json:"chainID"`
 // FromBlock uint64     `json:"fromBlock"`
 
 // // Contract-specific
diff --git a/core/services/s4/address_range.go b/core/services/s4/address_range.go
index 679bb3b846a..e7b60ecb479 100644
--- a/core/services/s4/address_range.go
+++ b/core/services/s4/address_range.go
@@ -5,23 +5,23 @@ import (
 	"errors"
 	"math/big"
 
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
-
 	"github.com/ethereum/go-ethereum/common"
+
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 )
 
 // AddressRange represents a range of Ethereum addresses.
 type AddressRange struct {
 	// MinAddress (inclusive).
-	MinAddress *utils.Big
+	MinAddress *ubig.Big
 	// MaxAddress (inclusive).
-	MaxAddress *utils.Big
+	MaxAddress *ubig.Big
 }
 
 var (
 	ErrInvalidIntervals = errors.New("invalid intervals value")
-	MinAddress          = utils.NewBig(common.BytesToAddress(bytes.Repeat([]byte{0x00}, common.AddressLength)).Big())
-	MaxAddress          = utils.NewBig(common.BytesToAddress(bytes.Repeat([]byte{0xff}, common.AddressLength)).Big())
+	MinAddress          = ubig.New(common.BytesToAddress(bytes.Repeat([]byte{0x00}, common.AddressLength)).Big())
+	MaxAddress          = ubig.New(common.BytesToAddress(bytes.Repeat([]byte{0xff}, common.AddressLength)).Big())
 )
 
 // NewFullAddressRange creates AddressRange for all address space: 0x00..-0xFF..
@@ -33,7 +33,7 @@ func NewFullAddressRange() *AddressRange {
 }
 
 // NewSingleAddressRange creates AddressRange for a single address.
-func NewSingleAddressRange(address *utils.Big) (*AddressRange, error) {
+func NewSingleAddressRange(address *ubig.Big) (*AddressRange, error) {
 	if address == nil || address.Cmp(MinAddress) < 0 || address.Cmp(MaxAddress) > 0 {
 		return nil, errors.New("invalid address")
 	}
@@ -56,12 +56,12 @@ func NewInitialAddressRangeForIntervals(intervals uint) (*AddressRange, error) {
 	}
 
 	divisor := big.NewInt(int64(intervals))
-	maxPlusOne := MaxAddress.Add(utils.NewBigI(1))
-	interval := utils.NewBig(new(big.Int).Div(maxPlusOne.ToInt(), divisor))
+	maxPlusOne := MaxAddress.Add(ubig.NewI(1))
+	interval := ubig.New(new(big.Int).Div(maxPlusOne.ToInt(), divisor))
 
 	return &AddressRange{
 		MinAddress: MinAddress,
-		MaxAddress: MinAddress.Add(interval).Sub(utils.NewBigI(1)),
+		MaxAddress: MinAddress.Add(interval).Sub(ubig.NewI(1)),
 	}, nil
 }
 
@@ -80,7 +80,7 @@ func (r *AddressRange) Advance() {
 
 	if r.MinAddress.Cmp(MaxAddress) >= 0 {
 		r.MinAddress = MinAddress
-		r.MaxAddress = MinAddress.Add(interval).Sub(utils.NewBigI(1))
+		r.MaxAddress = MinAddress.Add(interval).Sub(ubig.NewI(1))
 	}
 
 	if r.MaxAddress.Cmp(MaxAddress) > 0 {
@@ -89,7 +89,7 @@ func (r *AddressRange) Advance() {
 }
 
 // Contains returns true if the given address belongs to the range.
-func (r *AddressRange) Contains(address *utils.Big) bool {
+func (r *AddressRange) Contains(address *ubig.Big) bool {
 	if r == nil {
 		return false
 	}
@@ -97,9 +97,9 @@ func (r *AddressRange) Contains(address *utils.Big) bool {
 }
 
 // Interval returns the interval between max and min address plus one.
-func (r *AddressRange) Interval() *utils.Big {
+func (r *AddressRange) Interval() *ubig.Big {
 	if r == nil {
 		return nil
 	}
-	return r.MaxAddress.Sub(r.MinAddress).Add(utils.NewBigI(1))
+	return r.MaxAddress.Sub(r.MinAddress).Add(ubig.NewI(1))
 }
diff --git a/core/services/s4/address_range_test.go b/core/services/s4/address_range_test.go
index bbd4d3baa54..2b12acd08eb 100644
--- a/core/services/s4/address_range_test.go
+++ b/core/services/s4/address_range_test.go
@@ -3,8 +3,8 @@ package s4_test
 import (
 	"testing"
 
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/services/s4"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -26,7 +26,7 @@ func TestAddressRange_NewFullAddressRange(t *testing.T) {
 func TestAddressRange_NewSingleAddressRange(t *testing.T) {
 	t.Parallel()
 
-	addr := utils.NewBigI(0x123)
+	addr := big.NewI(0x123)
 	sar, err := s4.NewSingleAddressRange(addr)
 	assert.NoError(t, err)
 	assert.Equal(t, addr, sar.MinAddress)
@@ -94,10 +94,10 @@ func TestAddressRange_Contains(t *testing.T) {
 	assert.NoError(t, err)
 	assert.True(t, r.Contains(r.MinAddress))
 	assert.True(t, r.Contains(r.MaxAddress))
-	assert.False(t, r.Contains(r.MaxAddress.Add(utils.NewBigI(1))))
+	assert.False(t, r.Contains(r.MaxAddress.Add(big.NewI(1))))
 
 	r.Advance()
 	assert.True(t, r.Contains(r.MinAddress))
 	assert.True(t, r.Contains(r.MaxAddress))
-	assert.False(t, r.Contains(r.MinAddress.Sub(utils.NewBigI(1))))
+	assert.False(t, r.Contains(r.MinAddress.Sub(big.NewI(1))))
 }
diff --git a/core/services/s4/in_memory_orm.go b/core/services/s4/in_memory_orm.go
index bb67d2d63a4..28b50ce430c 100644
--- a/core/services/s4/in_memory_orm.go
+++ b/core/services/s4/in_memory_orm.go
@@ -5,8 +5,8 @@ import (
 	"sync"
 	"time"
 
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 type key struct {
@@ -32,7 +32,7 @@ func NewInMemoryORM() ORM {
 	}
 }
 
-func (o *inMemoryOrm) Get(address *utils.Big, slotId uint, qopts ...pg.QOpt) (*Row, error) {
+func (o *inMemoryOrm) Get(address *big.Big, slotId uint, qopts ...pg.QOpt) (*Row, error) {
 	o.mu.RLock()
 	defer o.mu.RUnlock()
 
@@ -103,7 +103,7 @@ func (o *inMemoryOrm) GetSnapshot(addressRange *AddressRange, qopts ...pg.QOpt)
 	for _, mrow := range o.rows {
 		if mrow.Row.Expiration > now {
 			rows = append(rows, &SnapshotRow{
-				Address:    utils.NewBig(mrow.Row.Address.ToInt()),
+				Address:    big.New(mrow.Row.Address.ToInt()),
 				SlotId:     mrow.Row.SlotId,
 				Version:    mrow.Row.Version,
 				Expiration: mrow.Row.Expiration,
diff --git a/core/services/s4/in_memory_orm_test.go b/core/services/s4/in_memory_orm_test.go
index 68bff00634f..318db5f1a44 100644
--- a/core/services/s4/in_memory_orm_test.go
+++ b/core/services/s4/in_memory_orm_test.go
@@ -4,9 +4,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/services/s4"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/assert"
@@ -21,7 +21,7 @@ func TestInMemoryORM(t *testing.T) {
 	signature := testutils.Random32Byte()
 	expiration := time.Now().Add(time.Minute).UnixMilli()
 	row := &s4.Row{
-		Address:    utils.NewBig(address.Big()),
+		Address:    big.New(address.Big()),
 		SlotId:     slotId,
 		Payload:    payload[:],
 		Version:    3,
@@ -33,7 +33,7 @@ func TestInMemoryORM(t *testing.T) {
 	orm := s4.NewInMemoryORM()
 
 	t.Run("row not found", func(t *testing.T) {
-		_, err := orm.Get(utils.NewBig(address.Big()), slotId)
+		_, err := orm.Get(big.New(address.Big()), slotId)
 		assert.ErrorIs(t, err, s4.ErrNotFound)
 	})
 
@@ -41,7 +41,7 @@ func TestInMemoryORM(t *testing.T) {
 		err := orm.Update(row)
 		assert.NoError(t, err)
 
-		e, err := orm.Get(utils.NewBig(address.Big()), slotId)
+		e, err := orm.Get(big.New(address.Big()), slotId)
 		assert.NoError(t, err)
 		assert.Equal(t, row, e)
 	})
@@ -59,7 +59,7 @@ func TestInMemoryORM(t *testing.T) {
 		err = orm.Update(row)
 		assert.NoError(t, err)
 
-		e, err := orm.Get(utils.NewBig(address.Big()), slotId)
+		e, err := orm.Get(big.New(address.Big()), slotId)
 		assert.NoError(t, err)
 		assert.Equal(t, row, e)
 	})
@@ -76,7 +76,7 @@ func TestInMemoryORM_DeleteExpired(t *testing.T) {
 		thisAddress[0] = byte(i)
 
 		row := &s4.Row{
-			Address:    utils.NewBig(thisAddress.Big()),
+			Address:    big.New(thisAddress.Big()),
 			SlotId:     1,
 			Payload:    []byte{},
 			Version:    1,
@@ -109,7 +109,7 @@ func TestInMemoryORM_GetUnconfirmedRows(t *testing.T) {
 		thisAddress[0] = byte(i)
 
 		row := &s4.Row{
-			Address:    utils.NewBig(thisAddress.Big()),
+			Address:    big.New(thisAddress.Big()),
 			SlotId:     1,
 			Payload:    []byte{},
 			Version:    1,
@@ -139,7 +139,7 @@ func TestInMemoryORM_GetSnapshot(t *testing.T) {
 		thisAddress[0] = byte(i)
 
 		row := &s4.Row{
-			Address:    utils.NewBig(thisAddress.Big()),
+			Address:    big.New(thisAddress.Big()),
 			SlotId:     1,
 			Payload:    []byte{},
 			Version:    uint64(i),
diff --git a/core/services/s4/mocks/orm.go b/core/services/s4/mocks/orm.go
index 706c1194293..3b8cac8e76d 100644
--- a/core/services/s4/mocks/orm.go
+++ b/core/services/s4/mocks/orm.go
@@ -3,13 +3,14 @@
 package mocks
 
 import (
+	big "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
+	mock "github.com/stretchr/testify/mock"
+
 	pg "github.com/smartcontractkit/chainlink/v2/core/services/pg"
+
 	s4 "github.com/smartcontractkit/chainlink/v2/core/services/s4"
-	mock "github.com/stretchr/testify/mock"
 
 	time "time"
-
-	utils "github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 // ORM is an autogenerated mock type for the ORM type
@@ -53,7 +54,7 @@ func (_m *ORM) DeleteExpired(limit uint, utcNow time.Time, qopts ...pg.QOpt) (in
 }
 
 // Get provides a mock function with given fields: address, slotId, qopts
-func (_m *ORM) Get(address *utils.Big, slotId uint, qopts ...pg.QOpt) (*s4.Row, error) {
+func (_m *ORM) Get(address *big.Big, slotId uint, qopts ...pg.QOpt) (*s4.Row, error) {
 	_va := make([]interface{}, len(qopts))
 	for _i := range qopts {
 		_va[_i] = qopts[_i]
@@ -69,10 +70,10 @@ func (_m *ORM) Get(address *utils.Big, slotId uint, qopts ...pg.QOpt) (*s4.Row,
 
 	var r0 *s4.Row
 	var r1 error
-	if rf, ok := ret.Get(0).(func(*utils.Big, uint, ...pg.QOpt) (*s4.Row, error)); ok {
+	if rf, ok := ret.Get(0).(func(*big.Big, uint, ...pg.QOpt) (*s4.Row, error)); ok {
 		return rf(address, slotId, qopts...)
 	}
-	if rf, ok := ret.Get(0).(func(*utils.Big, uint, ...pg.QOpt) *s4.Row); ok {
+	if rf, ok := ret.Get(0).(func(*big.Big, uint, ...pg.QOpt) *s4.Row); ok {
 		r0 = rf(address, slotId, qopts...)
 	} else {
 		if ret.Get(0) != nil {
@@ -80,7 +81,7 @@ func (_m *ORM) Get(address *utils.Big, slotId uint, qopts ...pg.QOpt) (*s4.Row,
 		}
 	}
 
-	if rf, ok := ret.Get(1).(func(*utils.Big, uint, ...pg.QOpt) error); ok {
+	if rf, ok := ret.Get(1).(func(*big.Big, uint, ...pg.QOpt) error); ok {
 		r1 = rf(address, slotId, qopts...)
 	} else {
 		r1 = ret.Error(1)
diff --git a/core/services/s4/orm.go b/core/services/s4/orm.go
index 1e0227b1191..59f3410e143 100644
--- a/core/services/s4/orm.go
+++ b/core/services/s4/orm.go
@@ -3,13 +3,13 @@ package s4
 import (
 	"time"
 
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 // Row represents a data row persisted by ORM.
 type Row struct {
-	Address    *utils.Big
+	Address    *big.Big
 	SlotId     uint
 	Payload    []byte
 	Version    uint64
@@ -20,7 +20,7 @@ type Row struct {
 
 // SnapshotRow(s) are returned by GetSnapshot function.
 type SnapshotRow struct {
-	Address    *utils.Big
+	Address    *big.Big
 	SlotId     uint
 	Version    uint64
 	Expiration int64
@@ -35,7 +35,7 @@ type ORM interface {
 	// Get reads a row for the given address and slotId combination.
 	// If such row does not exist, ErrNotFound is returned.
 	// There is no filter on Expiration.
-	Get(address *utils.Big, slotId uint, qopts ...pg.QOpt) (*Row, error)
+	Get(address *big.Big, slotId uint, qopts ...pg.QOpt) (*Row, error)
 
 	// Update inserts or updates the row identified by (Address, SlotId) pair.
 	// When updating, the new row must have greater or equal version,
@@ -59,7 +59,7 @@ type ORM interface {
 
 func (r Row) Clone() *Row {
 	clone := Row{
-		Address:    utils.NewBig(r.Address.ToInt()),
+		Address:    big.New(r.Address.ToInt()),
 		SlotId:     r.SlotId,
 		Payload:    make([]byte, len(r.Payload)),
 		Version:    r.Version,
diff --git a/core/services/s4/postgres_orm.go b/core/services/s4/postgres_orm.go
index 1f91270fd08..dba98b64aa6 100644
--- a/core/services/s4/postgres_orm.go
+++ b/core/services/s4/postgres_orm.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 
 	"github.com/jmoiron/sqlx"
 	"github.com/pkg/errors"
@@ -34,7 +34,7 @@ func NewPostgresORM(db *sqlx.DB, lggr logger.Logger, cfg pg.QConfig, tableName,
 	}
 }
 
-func (o orm) Get(address *utils.Big, slotId uint, qopts ...pg.QOpt) (*Row, error) {
+func (o orm) Get(address *big.Big, slotId uint, qopts ...pg.QOpt) (*Row, error) {
 	row := &Row{}
 	q := o.q.WithOpts(qopts...)
 
diff --git a/core/services/s4/postgres_orm_test.go b/core/services/s4/postgres_orm_test.go
index c233fe2361a..4d07524b4ea 100644
--- a/core/services/s4/postgres_orm_test.go
+++ b/core/services/s4/postgres_orm_test.go
@@ -6,12 +6,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/s4"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -36,7 +36,7 @@ func generateTestRows(t *testing.T, n int) []*s4.Row {
 	rows := make([]*s4.Row, n)
 	for i := 0; i < n; i++ {
 		row := &s4.Row{
-			Address:    utils.NewBig(testutils.NewAddress().Big()),
+			Address:    big.New(testutils.NewAddress().Big()),
 			SlotId:     1,
 			Payload:    cltest.MustRandomBytes(t, 32),
 			Version:    1 + uint64(i),
diff --git a/core/services/s4/storage.go b/core/services/s4/storage.go
index 65aa2f4bab5..7c9a92d1f68 100644
--- a/core/services/s4/storage.go
+++ b/core/services/s4/storage.go
@@ -3,6 +3,7 @@ package s4
 import (
 	"context"
 
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
@@ -92,7 +93,7 @@ func (s *storage) Get(ctx context.Context, key *Key) (*Record, *Metadata, error)
 		return nil, nil, ErrSlotIdTooBig
 	}
 
-	bigAddress := utils.NewBig(key.Address.Big())
+	bigAddress := big.New(key.Address.Big())
 	row, err := s.orm.Get(bigAddress, key.SlotId, pg.WithParentCtx(ctx))
 	if err != nil {
 		return nil, nil, err
@@ -118,7 +119,7 @@ func (s *storage) Get(ctx context.Context, key *Key) (*Record, *Metadata, error)
 }
 
 func (s *storage) List(ctx context.Context, address common.Address) ([]*SnapshotRow, error) {
-	bigAddress := utils.NewBig(address.Big())
+	bigAddress := big.New(address.Big())
 	sar, err := NewSingleAddressRange(bigAddress)
 	if err != nil {
 		return nil, err
@@ -148,7 +149,7 @@ func (s *storage) Put(ctx context.Context, key *Key, record *Record, signature [
 	}
 
 	row := &Row{
-		Address:    utils.NewBig(key.Address.Big()),
+		Address:    big.New(key.Address.Big()),
 		SlotId:     key.SlotId,
 		Payload:    make([]byte, len(record.Payload)),
 		Version:    key.Version,
diff --git a/core/services/s4/storage_test.go b/core/services/s4/storage_test.go
index 11a8f6544ce..86161f298e4 100644
--- a/core/services/s4/storage_test.go
+++ b/core/services/s4/storage_test.go
@@ -4,6 +4,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/s4"
@@ -51,7 +52,7 @@ func TestStorage_Errors(t *testing.T) {
 			SlotId:  1,
 			Version: 0,
 		}
-		ormMock.On("Get", utils.NewBig(key.Address.Big()), uint(key.SlotId), mock.Anything).Return(nil, s4.ErrNotFound)
+		ormMock.On("Get", big.New(key.Address.Big()), uint(key.SlotId), mock.Anything).Return(nil, s4.ErrNotFound)
 		_, _, err := storage.Get(testutils.Context(t), key)
 		assert.ErrorIs(t, err, s4.ErrNotFound)
 	})
@@ -179,8 +180,8 @@ func TestStorage_PutAndGet(t *testing.T) {
 	assert.NoError(t, err)
 
 	ormMock.On("Update", mock.Anything, mock.Anything).Return(nil)
-	ormMock.On("Get", utils.NewBig(key.Address.Big()), uint(2), mock.Anything).Return(&s4.Row{
-		Address:    utils.NewBig(key.Address.Big()),
+	ormMock.On("Get", big.New(key.Address.Big()), uint(2), mock.Anything).Return(&s4.Row{
+		Address:    big.New(key.Address.Big()),
 		SlotId:     key.SlotId,
 		Version:    key.Version,
 		Payload:    record.Payload,
@@ -217,7 +218,7 @@ func TestStorage_List(t *testing.T) {
 		},
 	}
 
-	addressRange, err := s4.NewSingleAddressRange(utils.NewBig(address.Big()))
+	addressRange, err := s4.NewSingleAddressRange(big.New(address.Big()))
 	assert.NoError(t, err)
 	ormMock.On("GetSnapshot", addressRange, mock.Anything).Return(ormRows, nil)
 
diff --git a/core/services/vrf/delegate_test.go b/core/services/vrf/delegate_test.go
index 3b643d19b0b..663080c86a0 100644
--- a/core/services/vrf/delegate_test.go
+++ b/core/services/vrf/delegate_test.go
@@ -15,8 +15,8 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
-
 	"github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
+
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks"
diff --git a/core/services/vrf/v1/integration_test.go b/core/services/vrf/v1/integration_test.go
index a7dca56776f..3e9cfbe0870 100644
--- a/core/services/vrf/v1/integration_test.go
+++ b/core/services/vrf/v1/integration_test.go
@@ -16,6 +16,7 @@ import (
 	"gopkg.in/guregu/null.v4"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/solidity_vrf_coordinator_interface"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest/heavyweight"
@@ -29,7 +30,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/vrf/vrftesthelpers"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
 	"github.com/smartcontractkit/chainlink/v2/core/testdata/testspecs"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func TestIntegration_VRF_JPV2(t *testing.T) {
@@ -47,7 +47,7 @@ func TestIntegration_VRF_JPV2(t *testing.T) {
 		t.Run(test.name, func(t *testing.T) {
 			config, _ := heavyweight.FullTestDBV2(t, func(c *chainlink.Config, s *chainlink.Secrets) {
 				c.EVM[0].GasEstimator.EIP1559DynamicFees = &test.eip1559
-				c.EVM[0].ChainID = (*utils.Big)(testutils.SimulatedChainID)
+				c.EVM[0].ChainID = (*ubig.Big)(testutils.SimulatedChainID)
 			})
 			key1 := cltest.MustGenerateRandomKey(t)
 			key2 := cltest.MustGenerateRandomKey(t)
@@ -134,7 +134,7 @@ func TestIntegration_VRF_WithBHS(t *testing.T) {
 		c.Feature.LogPoller = ptr(true)
 		c.EVM[0].FinalityDepth = ptr[uint32](2)
 		c.EVM[0].LogPollInterval = models.MustNewDuration(time.Second)
-		c.EVM[0].ChainID = (*utils.Big)(testutils.SimulatedChainID)
+		c.EVM[0].ChainID = (*ubig.Big)(testutils.SimulatedChainID)
 	})
 	key := cltest.MustGenerateRandomKey(t)
 	cu := vrftesthelpers.NewVRFCoordinatorUniverse(t, key)
diff --git a/core/services/vrf/v2/integration_helpers_test.go b/core/services/vrf/v2/integration_helpers_test.go
index 03d96cadf20..d8a7da70a86 100644
--- a/core/services/vrf/v2/integration_helpers_test.go
+++ b/core/services/vrf/v2/integration_helpers_test.go
@@ -21,6 +21,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
 	v2 "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/vrf_consumer_v2_upgradeable_example"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/vrf_external_sub_owner_example"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/vrfv2_transparent_upgradeable_proxy"
@@ -540,7 +541,7 @@ func testSingleConsumerHappyPathBatchFulfillment(
 		})(c, s)
 		c.EVM[0].GasEstimator.LimitDefault = ptr[uint32](5_000_000)
 		c.EVM[0].MinIncomingConfirmations = ptr[uint32](2)
-		c.EVM[0].ChainID = (*utils.Big)(testutils.SimulatedChainID)
+		c.EVM[0].ChainID = (*ubig.Big)(testutils.SimulatedChainID)
 		c.Feature.LogPoller = ptr(true)
 		c.EVM[0].LogPollInterval = models.MustNewDuration(1 * time.Second)
 	})
@@ -1645,7 +1646,7 @@ func testMaliciousConsumer(
 		c.EVM[0].GasEstimator.PriceMax = assets.GWei(1)
 		c.EVM[0].GasEstimator.PriceDefault = assets.GWei(1)
 		c.EVM[0].GasEstimator.FeeCapDefault = assets.GWei(1)
-		c.EVM[0].ChainID = (*utils.Big)(testutils.SimulatedChainID)
+		c.EVM[0].ChainID = (*ubig.Big)(testutils.SimulatedChainID)
 		c.Feature.LogPoller = ptr(true)
 		c.EVM[0].LogPollInterval = models.MustNewDuration(1 * time.Second)
 	})
diff --git a/core/services/vrf/v2/integration_v2_test.go b/core/services/vrf/v2/integration_v2_test.go
index fa95b694f98..8d6354c4fd8 100644
--- a/core/services/vrf/v2/integration_v2_test.go
+++ b/core/services/vrf/v2/integration_v2_test.go
@@ -40,6 +40,7 @@ import (
 	evmlogger "github.com/smartcontractkit/chainlink/v2/core/chains/evm/log"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/batch_blockhash_store"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/batch_vrf_coordinator_v2"
@@ -2057,7 +2058,7 @@ func TestStartingCountsV1(t *testing.T) {
 	md2, err := json.Marshal(&m2)
 	md2SQL := sqlutil.JSON(md2)
 	require.NoError(t, err)
-	chainID := utils.NewBig(testutils.SimulatedChainID)
+	chainID := ubig.New(testutils.SimulatedChainID)
 	confirmedTxes := []txmgr.Tx{
 		{
 			Sequence:           &n1,
diff --git a/core/services/vrf/v2/listener_v2_log_listener_test.go b/core/services/vrf/v2/listener_v2_log_listener_test.go
index 11b299abc40..6f5177c230a 100644
--- a/core/services/vrf/v2/listener_v2_log_listener_test.go
+++ b/core/services/vrf/v2/listener_v2_log_listener_test.go
@@ -21,6 +21,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	evmmocks "github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/log_emitter"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/vrf_coordinator_v2"
@@ -761,8 +762,8 @@ func TestUpdateLastProcessedBlock_UnfulfilledNFulfilledVRFReqs(t *testing.T) {
  * TestGetUnfulfilled_UnfulfilledNFulfilledVRFReqs
  */
 
-func SetupGetUnfulfilledTH(t *testing.T) (*listenerV2, *utils.Big) {
-	chainID := utils.NewBig(big.NewInt(12345))
+func SetupGetUnfulfilledTH(t *testing.T) (*listenerV2, *ubig.Big) {
+	chainID := ubig.New(big.NewInt(12345))
 	lggr := logger.TestLogger(t)
 	j, err := vrfcommon.ValidatedVRFSpec(testspecs.GenerateVRFSpec(testspecs.VRFSpecParams{
 		RequestedConfsDelay: 10,
diff --git a/core/store/migrate/migrate_test.go b/core/store/migrate/migrate_test.go
index 43ddd41d56f..10c698e96fd 100644
--- a/core/store/migrate/migrate_test.go
+++ b/core/store/migrate/migrate_test.go
@@ -16,6 +16,7 @@ import (
 
 	evmcfg "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/config/env"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest/heavyweight"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
@@ -29,7 +30,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay"
 	"github.com/smartcontractkit/chainlink/v2/core/store/migrate"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 var migrationDir = "migrations"
@@ -417,7 +417,7 @@ func TestMigrate(t *testing.T) {
 
 func TestSetMigrationENVVars(t *testing.T) {
 	t.Run("ValidEVMConfig", func(t *testing.T) {
-		chainID := utils.NewBig(big.NewInt(1337))
+		chainID := ubig.New(big.NewInt(1337))
 		testConfig := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
 			evmEnabled := true
 			c.EVM = evmcfg.EVMConfigs{&evmcfg.EVMConfig{
@@ -433,7 +433,7 @@ func TestSetMigrationENVVars(t *testing.T) {
 	})
 
 	t.Run("EVMConfigMissing", func(t *testing.T) {
-		chainID := utils.NewBig(big.NewInt(1337))
+		chainID := ubig.New(big.NewInt(1337))
 		testConfig := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) { c.EVM = nil })
 
 		require.NoError(t, migrate.SetMigrationENVVars(testConfig))
@@ -535,7 +535,7 @@ func BenchmarkBackfillingRecordsWithMigration202(b *testing.B) {
 		var blocks []logpoller.LogPollerBlock
 		for i := 0; i < maxLogsSize; i++ {
 			blocks = append(blocks, logpoller.LogPollerBlock{
-				EvmChainId:           utils.NewBigI(int64(j + 1)),
+				EvmChainId:           ubig.NewI(int64(j + 1)),
 				BlockHash:            testutils.Random32Byte(),
 				BlockNumber:          int64(i + 1000),
 				FinalizedBlockNumber: 0,
diff --git a/core/store/models/common.go b/core/store/models/common.go
index 10f391861e1..93cc708fe0b 100644
--- a/core/store/models/common.go
+++ b/core/store/models/common.go
@@ -18,7 +18,7 @@ import (
 	"go.uber.org/multierr"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 )
 
 // CronParser is the global parser for crontabs.
@@ -365,7 +365,7 @@ type SendEtherRequest struct {
 	DestinationAddress common.Address `json:"address"`
 	FromAddress        common.Address `json:"from"`
 	Amount             assets.Eth     `json:"amount"`
-	EVMChainID         *utils.Big     `json:"evmChainID"`
+	EVMChainID         *big.Big       `json:"evmChainID"`
 	AllowHigherAmounts bool           `json:"allowHigherAmounts"`
 	SkipWaitTxAttempt  bool           `json:"skipWaitTxAttempt"`
 	WaitAttemptTimeout *time.Duration `json:"waitAttemptTimeout"`
diff --git a/core/web/eth_keys_controller.go b/core/web/eth_keys_controller.go
index d99992c0f56..fe76e8863ef 100644
--- a/core/web/eth_keys_controller.go
+++ b/core/web/eth_keys_controller.go
@@ -11,6 +11,7 @@ import (
 
 	commonassets "github.com/smartcontractkit/chainlink-common/pkg/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/config/toml"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
@@ -19,7 +20,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
 	evmrelay "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 	"github.com/smartcontractkit/chainlink/v2/core/web/presenters"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -393,7 +393,7 @@ func (ekc *ETHKeysController) getLinkBalance(ctx context.Context, state ethkey.S
 // gets the key specific max gas price from the chain config and sets it on the
 // resource.
 func (ekc *ETHKeysController) setKeyMaxGasPriceWei(price *assets.Wei) presenters.NewETHKeyOption {
-	return presenters.SetETHKeyMaxGasPriceWei(utils.NewBig(price.ToInt()))
+	return presenters.SetETHKeyMaxGasPriceWei(ubig.New(price.ToInt()))
 }
 
 func (ekc *ETHKeysController) getKeyMaxGasPriceWei(state ethkey.State, keyAddress common.Address) *assets.Wei {
diff --git a/core/web/evm_chains_controller_test.go b/core/web/evm_chains_controller_test.go
index 3d5a4e3eedd..ea3d5476cec 100644
--- a/core/web/evm_chains_controller_test.go
+++ b/core/web/evm_chains_controller_test.go
@@ -12,12 +12,12 @@ import (
 	"github.com/stretchr/testify/require"
 
 	evmcfg "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 	"github.com/smartcontractkit/chainlink/v2/core/web"
 	"github.com/smartcontractkit/chainlink/v2/core/web/presenters"
 )
@@ -25,7 +25,7 @@ import (
 func Test_EVMChainsController_Show(t *testing.T) {
 	t.Parallel()
 
-	validId := utils.NewBig(testutils.NewRandomEVMChainID())
+	validId := ubig.New(testutils.NewRandomEVMChainID())
 
 	testCases := []struct {
 		name           string
@@ -111,9 +111,9 @@ func Test_EVMChainsController_Index(t *testing.T) {
 	})
 
 	configuredChains := evmcfg.EVMConfigs{
-		{ChainID: utils.NewBig(chainIDs[0]), Chain: evmcfg.Defaults(nil)},
+		{ChainID: ubig.New(chainIDs[0]), Chain: evmcfg.Defaults(nil)},
 		{
-			ChainID: utils.NewBig(chainIDs[1]),
+			ChainID: ubig.New(chainIDs[1]),
 			Chain: evmcfg.Defaults(nil, &evmcfg.Chain{
 				RPCBlockQueryDelay: ptr[uint16](13),
 				GasEstimator: evmcfg.GasEstimator{
@@ -126,7 +126,7 @@ func Test_EVMChainsController_Index(t *testing.T) {
 			}),
 		},
 		{
-			ChainID: utils.NewBig(chainIDs[2]),
+			ChainID: ubig.New(chainIDs[2]),
 			Chain: evmcfg.Defaults(nil, &evmcfg.Chain{
 				RPCBlockQueryDelay: ptr[uint16](5),
 				GasEstimator: evmcfg.GasEstimator{
diff --git a/core/web/evm_forwarders_controller.go b/core/web/evm_forwarders_controller.go
index 6228723506d..56d1285c88e 100644
--- a/core/web/evm_forwarders_controller.go
+++ b/core/web/evm_forwarders_controller.go
@@ -8,10 +8,10 @@ import (
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/forwarders"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/logger/audit"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 	"github.com/smartcontractkit/chainlink/v2/core/utils/stringutils"
 	"github.com/smartcontractkit/chainlink/v2/core/web/presenters"
 
@@ -43,7 +43,7 @@ func (cc *EVMForwardersController) Index(c *gin.Context, size, page, offset int)
 
 // TrackEVMForwarderRequest is a JSONAPI request for creating an EVM forwarder.
 type TrackEVMForwarderRequest struct {
-	EVMChainID *utils.Big     `json:"evmChainId"`
+	EVMChainID *ubig.Big      `json:"evmChainId"`
 	Address    common.Address `json:"address"`
 }
 
diff --git a/core/web/evm_forwarders_controller_test.go b/core/web/evm_forwarders_controller_test.go
index 31e49f20ecc..49671157cbd 100644
--- a/core/web/evm_forwarders_controller_test.go
+++ b/core/web/evm_forwarders_controller_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	evmcfg "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
@@ -42,7 +43,7 @@ func setupEVMForwardersControllerTest(t *testing.T, overrideFn func(c *chainlink
 func Test_EVMForwardersController_Track(t *testing.T) {
 	t.Parallel()
 
-	chainId := utils.NewBig(testutils.NewRandomEVMChainID())
+	chainId := big.New(testutils.NewRandomEVMChainID())
 	controller := setupEVMForwardersControllerTest(t, func(c *chainlink.Config, s *chainlink.Secrets) {
 		c.EVM = evmcfg.EVMConfigs{
 			{ChainID: chainId, Enabled: ptr(true), Chain: evmcfg.Defaults(chainId)},
@@ -79,7 +80,7 @@ func Test_EVMForwardersController_Track(t *testing.T) {
 func Test_EVMForwardersController_Index(t *testing.T) {
 	t.Parallel()
 
-	chainId := utils.NewBig(testutils.NewRandomEVMChainID())
+	chainId := big.New(testutils.NewRandomEVMChainID())
 	controller := setupEVMForwardersControllerTest(t, func(c *chainlink.Config, s *chainlink.Secrets) {
 		c.EVM = evmcfg.EVMConfigs{
 			{ChainID: chainId, Enabled: ptr(true), Chain: evmcfg.Defaults(chainId)},
diff --git a/core/web/evm_transfer_controller_test.go b/core/web/evm_transfer_controller_test.go
index c41219e1894..dd083a8cd63 100644
--- a/core/web/evm_transfer_controller_test.go
+++ b/core/web/evm_transfer_controller_test.go
@@ -13,13 +13,13 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 	"github.com/smartcontractkit/chainlink/v2/core/web"
 	"github.com/smartcontractkit/chainlink/v2/core/web/presenters"
 
@@ -55,7 +55,7 @@ func TestTransfersController_CreateSuccess_From(t *testing.T) {
 		FromAddress:        key.Address,
 		Amount:             amount,
 		SkipWaitTxAttempt:  true,
-		EVMChainID:         utils.NewBig(evmtest.MustGetDefaultChainID(t, app.Config.EVMConfigs())),
+		EVMChainID:         ubig.New(evmtest.MustGetDefaultChainID(t, app.Config.EVMConfigs())),
 	}
 
 	body, err := json.Marshal(&request)
@@ -96,7 +96,7 @@ func TestTransfersController_CreateSuccess_From_WEI(t *testing.T) {
 		FromAddress:        key.Address,
 		Amount:             amount,
 		SkipWaitTxAttempt:  true,
-		EVMChainID:         utils.NewBig(evmtest.MustGetDefaultChainID(t, app.Config.EVMConfigs())),
+		EVMChainID:         ubig.New(evmtest.MustGetDefaultChainID(t, app.Config.EVMConfigs())),
 	}
 
 	body, err := json.Marshal(&request)
@@ -142,7 +142,7 @@ func TestTransfersController_CreateSuccess_From_BalanceMonitorDisabled(t *testin
 		FromAddress:        key.Address,
 		Amount:             amount,
 		SkipWaitTxAttempt:  true,
-		EVMChainID:         utils.NewBig(evmtest.MustGetDefaultChainID(t, app.Config.EVMConfigs())),
+		EVMChainID:         ubig.New(evmtest.MustGetDefaultChainID(t, app.Config.EVMConfigs())),
 	}
 
 	body, err := json.Marshal(&request)
@@ -172,7 +172,7 @@ func TestTransfersController_TransferZeroAddressError(t *testing.T) {
 		DestinationAddress: common.HexToAddress("0xFA01FA015C8A5332987319823728982379128371"),
 		FromAddress:        common.HexToAddress("0x0000000000000000000000000000000000000000"),
 		Amount:             amount,
-		EVMChainID:         utils.NewBig(evmtest.MustGetDefaultChainID(t, app.Config.EVMConfigs())),
+		EVMChainID:         ubig.New(evmtest.MustGetDefaultChainID(t, app.Config.EVMConfigs())),
 	}
 
 	body, err := json.Marshal(&request)
@@ -207,7 +207,7 @@ func TestTransfersController_TransferBalanceToLowError(t *testing.T) {
 		DestinationAddress: common.HexToAddress("0xFA01FA015C8A5332987319823728982379128371"),
 		Amount:             amount,
 		AllowHigherAmounts: false,
-		EVMChainID:         utils.NewBig(evmtest.MustGetDefaultChainID(t, app.Config.EVMConfigs())),
+		EVMChainID:         ubig.New(evmtest.MustGetDefaultChainID(t, app.Config.EVMConfigs())),
 	}
 
 	body, err := json.Marshal(&request)
@@ -245,7 +245,7 @@ func TestTransfersController_TransferBalanceToLowError_ZeroBalance(t *testing.T)
 		DestinationAddress: common.HexToAddress("0xFA01FA015C8A5332987319823728982379128371"),
 		Amount:             amount,
 		AllowHigherAmounts: false,
-		EVMChainID:         utils.NewBig(evmtest.MustGetDefaultChainID(t, app.Config.EVMConfigs())),
+		EVMChainID:         ubig.New(evmtest.MustGetDefaultChainID(t, app.Config.EVMConfigs())),
 	}
 
 	body, err := json.Marshal(&request)
@@ -288,7 +288,7 @@ func TestTransfersController_CreateSuccess_eip1559(t *testing.T) {
 	config := configtest.NewGeneralConfig(t, func(c *chainlink.Config, s *chainlink.Secrets) {
 		c.EVM[0].GasEstimator.EIP1559DynamicFees = ptr(true)
 		c.EVM[0].GasEstimator.Mode = ptr("FixedPrice")
-		c.EVM[0].ChainID = (*utils.Big)(testutils.FixtureChainID)
+		c.EVM[0].ChainID = (*ubig.Big)(testutils.FixtureChainID)
 		// NOTE: FallbackPollInterval is used in this test to quickly create TxAttempts
 		// Testing triggers requires committing transactions and does not work with transactional tests
 		c.Database.Listener.FallbackPollInterval = models.MustNewDuration(time.Second)
@@ -308,7 +308,7 @@ func TestTransfersController_CreateSuccess_eip1559(t *testing.T) {
 		FromAddress:        key.Address,
 		Amount:             amount,
 		WaitAttemptTimeout: &timeout,
-		EVMChainID:         utils.NewBig(evmtest.MustGetDefaultChainID(t, config.EVMConfigs())),
+		EVMChainID:         ubig.New(evmtest.MustGetDefaultChainID(t, config.EVMConfigs())),
 	}
 
 	body, err := json.Marshal(&request)
diff --git a/core/web/loader/loader_test.go b/core/web/loader/loader_test.go
index 9bd1feb05bf..cbd73a575a9 100644
--- a/core/web/loader/loader_test.go
+++ b/core/web/loader/loader_test.go
@@ -17,6 +17,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	evmtxmgrmocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr/mocks"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	coremocks "github.com/smartcontractkit/chainlink/v2/core/internal/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/evmtest"
@@ -35,9 +36,9 @@ func TestLoader_Chains(t *testing.T) {
 	app := coremocks.NewApplication(t)
 	ctx := InjectDataloader(testutils.Context(t), app)
 
-	one := utils.NewBigI(1)
+	one := ubig.NewI(1)
 	chain := toml.EVMConfig{ChainID: one, Chain: toml.Defaults(one)}
-	two := utils.NewBigI(2)
+	two := ubig.NewI(2)
 	chain2 := toml.EVMConfig{ChainID: two, Chain: toml.Defaults(two)}
 	evmORM := evmtest.NewTestConfigs(&chain, &chain2)
 	app.On("EVMORM").Return(evmORM)
diff --git a/core/web/presenters/eth_key.go b/core/web/presenters/eth_key.go
index 3d952dabeda..d661d4334cd 100644
--- a/core/web/presenters/eth_key.go
+++ b/core/web/presenters/eth_key.go
@@ -5,22 +5,22 @@ import (
 
 	commonassets "github.com/smartcontractkit/chainlink-common/pkg/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 // ETHKeyResource represents a ETH key JSONAPI resource. It holds the hex
 // representation of the address plus its ETH & LINK balances
 type ETHKeyResource struct {
 	JAID
-	EVMChainID     utils.Big          `json:"evmChainID"`
+	EVMChainID     big.Big            `json:"evmChainID"`
 	Address        string             `json:"address"`
 	EthBalance     *assets.Eth        `json:"ethBalance"`
 	LinkBalance    *commonassets.Link `json:"linkBalance"`
 	Disabled       bool               `json:"disabled"`
 	CreatedAt      time.Time          `json:"createdAt"`
 	UpdatedAt      time.Time          `json:"updatedAt"`
-	MaxGasPriceWei *utils.Big         `json:"maxGasPriceWei"`
+	MaxGasPriceWei *big.Big           `json:"maxGasPriceWei"`
 }
 
 // GetName implements the api2go EntityNamer interface
@@ -69,7 +69,7 @@ func SetETHKeyLinkBalance(linkBalance *commonassets.Link) NewETHKeyOption {
 	}
 }
 
-func SetETHKeyMaxGasPriceWei(maxGasPriceWei *utils.Big) NewETHKeyOption {
+func SetETHKeyMaxGasPriceWei(maxGasPriceWei *big.Big) NewETHKeyOption {
 	return func(r *ETHKeyResource) {
 		r.MaxGasPriceWei = maxGasPriceWei
 	}
diff --git a/core/web/presenters/eth_key_test.go b/core/web/presenters/eth_key_test.go
index 85d005cf610..8be13de74a1 100644
--- a/core/web/presenters/eth_key_test.go
+++ b/core/web/presenters/eth_key_test.go
@@ -7,8 +7,8 @@ import (
 
 	commonassets "github.com/smartcontractkit/chainlink-common/pkg/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/manyminds/api2go/jsonapi"
@@ -31,7 +31,7 @@ func TestETHKeyResource(t *testing.T) {
 
 	state := ethkey.State{
 		ID:         1,
-		EVMChainID: *utils.NewBigI(42),
+		EVMChainID: *big.NewI(42),
 		Address:    eip55address,
 		CreatedAt:  now,
 		UpdatedAt:  now,
@@ -41,12 +41,12 @@ func TestETHKeyResource(t *testing.T) {
 	r := NewETHKeyResource(key, state,
 		SetETHKeyEthBalance(assets.NewEth(1)),
 		SetETHKeyLinkBalance(commonassets.NewLinkFromJuels(1)),
-		SetETHKeyMaxGasPriceWei(utils.NewBigI(12345)),
+		SetETHKeyMaxGasPriceWei(big.NewI(12345)),
 	)
 
 	assert.Equal(t, assets.NewEth(1), r.EthBalance)
 	assert.Equal(t, commonassets.NewLinkFromJuels(1), r.LinkBalance)
-	assert.Equal(t, utils.NewBigI(12345), r.MaxGasPriceWei)
+	assert.Equal(t, big.NewI(12345), r.MaxGasPriceWei)
 
 	b, err := jsonapi.Marshal(r)
 	require.NoError(t, err)
diff --git a/core/web/presenters/eth_tx.go b/core/web/presenters/eth_tx.go
index 2c2b5b90ff2..f944a99213f 100644
--- a/core/web/presenters/eth_tx.go
+++ b/core/web/presenters/eth_tx.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 )
 
 // EthTxResource represents a Ethereum Transaction JSONAPI resource.
@@ -25,7 +25,7 @@ type EthTxResource struct {
 	SentAt     string          `json:"sentAt"`
 	To         *common.Address `json:"to"`
 	Value      string          `json:"value"`
-	EVMChainID utils.Big       `json:"evmChainID"`
+	EVMChainID big.Big         `json:"evmChainID"`
 }
 
 // GetName implements the api2go EntityNamer interface
@@ -50,7 +50,7 @@ func NewEthTxResource(tx txmgr.Tx) EthTxResource {
 	}
 
 	if tx.ChainID != nil {
-		r.EVMChainID = *utils.NewBig(tx.ChainID)
+		r.EVMChainID = *big.New(tx.ChainID)
 	}
 	return r
 }
@@ -65,7 +65,7 @@ func NewEthTxResourceFromAttempt(txa txmgr.TxAttempt) EthTxResource {
 	r.Hex = hexutil.Encode(txa.SignedRawTx)
 
 	if txa.Tx.ChainID != nil {
-		r.EVMChainID = *utils.NewBig(txa.Tx.ChainID)
+		r.EVMChainID = *big.New(txa.Tx.ChainID)
 	}
 
 	if tx.Sequence != nil {
diff --git a/core/web/presenters/evm_forwarder.go b/core/web/presenters/evm_forwarder.go
index c91bfc088f1..43c27644850 100644
--- a/core/web/presenters/evm_forwarder.go
+++ b/core/web/presenters/evm_forwarder.go
@@ -6,14 +6,14 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/forwarders"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 )
 
 // EVMForwarderResource is an EVM forwarder JSONAPI resource.
 type EVMForwarderResource struct {
 	JAID
 	Address    common.Address `json:"address"`
-	EVMChainID utils.Big      `json:"evmChainId"`
+	EVMChainID big.Big        `json:"evmChainId"`
 	CreatedAt  time.Time      `json:"createdAt"`
 	UpdatedAt  time.Time      `json:"updatedAt"`
 }
diff --git a/core/web/presenters/job.go b/core/web/presenters/job.go
index 9b0a3cb3425..a2a9e70c793 100644
--- a/core/web/presenters/job.go
+++ b/core/web/presenters/job.go
@@ -9,6 +9,7 @@ import (
 
 	commonassets "github.com/smartcontractkit/chainlink-common/pkg/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	clnull "github.com/smartcontractkit/chainlink/v2/core/null"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
@@ -16,7 +17,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay"
 	"github.com/smartcontractkit/chainlink/v2/core/services/signatures/secp256k1"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 // JobSpecType defines the the the spec type of the job
@@ -49,7 +49,7 @@ type DirectRequestSpec struct {
 	Initiator                string                   `json:"initiator"`
 	CreatedAt                time.Time                `json:"createdAt"`
 	UpdatedAt                time.Time                `json:"updatedAt"`
-	EVMChainID               *utils.Big               `json:"evmChainID"`
+	EVMChainID               *big.Big                 `json:"evmChainID"`
 }
 
 // NewDirectRequestSpec initializes a new DirectRequestSpec from a
@@ -84,7 +84,7 @@ type FluxMonitorSpec struct {
 	MinPayment          *commonassets.Link  `json:"minPayment"`
 	CreatedAt           time.Time           `json:"createdAt"`
 	UpdatedAt           time.Time           `json:"updatedAt"`
-	EVMChainID          *utils.Big          `json:"evmChainID"`
+	EVMChainID          *big.Big            `json:"evmChainID"`
 }
 
 // NewFluxMonitorSpec initializes a new DirectFluxMonitorSpec from a
@@ -131,7 +131,7 @@ type OffChainReportingSpec struct {
 	ContractConfigConfirmations            uint16               `json:"contractConfigConfirmations"`
 	CreatedAt                              time.Time            `json:"createdAt"`
 	UpdatedAt                              time.Time            `json:"updatedAt"`
-	EVMChainID                             *utils.Big           `json:"evmChainID"`
+	EVMChainID                             *big.Big             `json:"evmChainID"`
 	DatabaseTimeout                        *models.Interval     `json:"databaseTimeout"`
 	ObservationGracePeriod                 *models.Interval     `json:"observationGracePeriod"`
 	ContractTransmitterTransmitTimeout     *models.Interval     `json:"contractTransmitterTransmitTimeout"`
@@ -220,7 +220,7 @@ type KeeperSpec struct {
 	FromAddress     ethkey.EIP55Address `json:"fromAddress"`
 	CreatedAt       time.Time           `json:"createdAt"`
 	UpdatedAt       time.Time           `json:"updatedAt"`
-	EVMChainID      *utils.Big          `json:"evmChainID"`
+	EVMChainID      *big.Big            `json:"evmChainID"`
 }
 
 // NewKeeperSpec generates a new KeeperSpec from a job.KeeperSpec
@@ -275,7 +275,7 @@ type VRFSpec struct {
 	MinIncomingConfirmations      uint32                `json:"confirmations"`
 	CreatedAt                     time.Time             `json:"createdAt"`
 	UpdatedAt                     time.Time             `json:"updatedAt"`
-	EVMChainID                    *utils.Big            `json:"evmChainID"`
+	EVMChainID                    *big.Big              `json:"evmChainID"`
 	ChunkSize                     uint32                `json:"chunkSize"`
 	RequestTimeout                models.Duration       `json:"requestTimeout"`
 	BackoffInitialDelay           models.Duration       `json:"backoffInitialDelay"`
@@ -317,7 +317,7 @@ type BlockhashStoreSpec struct {
 	TrustedBlockhashStoreBatchSize int32                 `json:"trustedBlockhashStoreBatchSize"`
 	PollPeriod                     time.Duration         `json:"pollPeriod"`
 	RunTimeout                     time.Duration         `json:"runTimeout"`
-	EVMChainID                     *utils.Big            `json:"evmChainID"`
+	EVMChainID                     *big.Big              `json:"evmChainID"`
 	FromAddresses                  []ethkey.EIP55Address `json:"fromAddresses"`
 	CreatedAt                      time.Time             `json:"createdAt"`
 	UpdatedAt                      time.Time             `json:"updatedAt"`
@@ -353,7 +353,7 @@ type BlockHeaderFeederSpec struct {
 	BatchBlockhashStoreAddress ethkey.EIP55Address   `json:"batchBlockhashStoreAddress"`
 	PollPeriod                 time.Duration         `json:"pollPeriod"`
 	RunTimeout                 time.Duration         `json:"runTimeout"`
-	EVMChainID                 *utils.Big            `json:"evmChainID"`
+	EVMChainID                 *big.Big              `json:"evmChainID"`
 	FromAddresses              []ethkey.EIP55Address `json:"fromAddresses"`
 	GetBlockhashesBatchSize    uint16                `json:"getBlockhashesBatchSize"`
 	StoreBlockhashesBatchSize  uint16                `json:"storeBlockhashesBatchSize"`
diff --git a/core/web/presenters/job_test.go b/core/web/presenters/job_test.go
index 260cce0caf6..a5d6db0df18 100644
--- a/core/web/presenters/job_test.go
+++ b/core/web/presenters/job_test.go
@@ -14,12 +14,12 @@ import (
 	"gopkg.in/guregu/null.v4"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/assets"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	clnull "github.com/smartcontractkit/chainlink/v2/core/null"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 	"github.com/smartcontractkit/chainlink/v2/core/web/presenters"
 )
 
@@ -29,7 +29,7 @@ func TestJob(t *testing.T) {
 	contractAddress, err := ethkey.NewEIP55Address("0x9E40733cC9df84636505f4e6Db28DCa0dC5D1bba")
 	require.NoError(t, err)
 	cronSchedule := "0 0 0 1 1 *"
-	evmChainID := utils.NewBigI(42)
+	evmChainID := big.NewI(42)
 	fromAddress, err := ethkey.NewEIP55Address("0xa8037A20989AFcBC51798de9762b351D63ff462e")
 	require.NoError(t, err)
 
@@ -484,7 +484,7 @@ func TestJob(t *testing.T) {
 					BlockhashStoreAddress:          contractAddress,
 					PollPeriod:                     25 * time.Second,
 					RunTimeout:                     10 * time.Second,
-					EVMChainID:                     utils.NewBigI(4),
+					EVMChainID:                     big.NewI(4),
 					FromAddresses:                  []ethkey.EIP55Address{fromAddress},
 					TrustedBlockhashStoreAddress:   &trustedBlockhashStoreAddress,
 					TrustedBlockhashStoreBatchSize: trustedBlockhashStoreBatchSize,
@@ -564,7 +564,7 @@ func TestJob(t *testing.T) {
 					BatchBlockhashStoreAddress: batchBHSAddress,
 					PollPeriod:                 25 * time.Second,
 					RunTimeout:                 10 * time.Second,
-					EVMChainID:                 utils.NewBigI(4),
+					EVMChainID:                 big.NewI(4),
 					FromAddresses:              []ethkey.EIP55Address{fromAddress},
 					GetBlockhashesBatchSize:    5,
 					StoreBlockhashesBatchSize:  10,
diff --git a/core/web/replay_controller.go b/core/web/replay_controller.go
index 5006b68c845..84c54e3836e 100644
--- a/core/web/replay_controller.go
+++ b/core/web/replay_controller.go
@@ -7,8 +7,8 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/pkg/errors"
 
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 type ReplayController struct {
@@ -64,14 +64,14 @@ func (bdc *ReplayController) ReplayFromBlock(c *gin.Context) {
 
 	response := ReplayResponse{
 		Message:    "Replay started",
-		EVMChainID: utils.NewBig(chainID),
+		EVMChainID: big.New(chainID),
 	}
 	jsonAPIResponse(c, &response, "response")
 }
 
 type ReplayResponse struct {
-	Message    string     `json:"message"`
-	EVMChainID *utils.Big `json:"evmChainID"`
+	Message    string   `json:"message"`
+	EVMChainID *big.Big `json:"evmChainID"`
 }
 
 // GetID returns the jsonapi ID.
diff --git a/core/web/resolver/chain_test.go b/core/web/resolver/chain_test.go
index c3cafd329b4..700963cd4da 100644
--- a/core/web/resolver/chain_test.go
+++ b/core/web/resolver/chain_test.go
@@ -9,12 +9,12 @@ import (
 	"github.com/stretchr/testify/require"
 
 	evmtoml "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 )
 
 func TestResolver_Chains(t *testing.T) {
 	var (
-		chainID = *utils.NewBigI(1)
+		chainID = *big.NewI(1)
 		query   = `
 			query GetChains {
 				chains {
@@ -100,7 +100,7 @@ ResendAfterThreshold = '1h0m0s'
 
 func TestResolver_Chain(t *testing.T) {
 	var (
-		chainID = *utils.NewBigI(1)
+		chainID = *big.NewI(1)
 		query   = `
 			query GetChain {
 				chain(id: "1") {
diff --git a/core/web/resolver/eth_key_test.go b/core/web/resolver/eth_key_test.go
index ea106a4b30c..1874e4c68e0 100644
--- a/core/web/resolver/eth_key_test.go
+++ b/core/web/resolver/eth_key_test.go
@@ -14,12 +14,12 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config"
 	mocks2 "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
 
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
 	evmrelay "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 type mockEvmConfig struct {
@@ -80,13 +80,13 @@ func TestResolver_ETHKeys(t *testing.T) {
 				states := []ethkey.State{
 					{
 						Address:    ethkey.MustEIP55Address(address.Hex()),
-						EVMChainID: *utils.NewBigI(12),
+						EVMChainID: *big.NewI(12),
 						Disabled:   false,
 						CreatedAt:  f.Timestamp(),
 						UpdatedAt:  f.Timestamp(),
 					},
 				}
-				chainID := *utils.NewBigI(12)
+				chainID := *big.NewI(12)
 				linkAddr := common.HexToAddress("0x5431F5F973781809D18643b87B44921b11355d81")
 
 				cfg := configtest.NewGeneralConfig(t, nil)
@@ -139,13 +139,13 @@ func TestResolver_ETHKeys(t *testing.T) {
 				states := []ethkey.State{
 					{
 						Address:    ethkey.MustEIP55Address(address.Hex()),
-						EVMChainID: *utils.NewBigI(12),
+						EVMChainID: *big.NewI(12),
 						Disabled:   false,
 						CreatedAt:  f.Timestamp(),
 						UpdatedAt:  f.Timestamp(),
 					},
 				}
-				chainID := *utils.NewBigI(12)
+				chainID := *big.NewI(12)
 				f.Mocks.legacyEVMChains.On("Get", states[0].EVMChainID.String()).Return(nil, evmrelay.ErrNoChains)
 				f.Mocks.ethKs.On("GetStatesForKeys", keys).Return(states, nil)
 				f.Mocks.ethKs.On("Get", keys[0].Address.Hex()).Return(keys[0], nil)
@@ -225,7 +225,7 @@ func TestResolver_ETHKeys(t *testing.T) {
 				states := []ethkey.State{
 					{
 						Address:    ethkey.MustEIP55Address(address.Hex()),
-						EVMChainID: *utils.NewBigI(12),
+						EVMChainID: *big.NewI(12),
 						Disabled:   false,
 						CreatedAt:  f.Timestamp(),
 						UpdatedAt:  f.Timestamp(),
@@ -257,7 +257,7 @@ func TestResolver_ETHKeys(t *testing.T) {
 				states := []ethkey.State{
 					{
 						Address:    ethkey.MustEIP55Address(address.Hex()),
-						EVMChainID: *utils.NewBigI(12),
+						EVMChainID: *big.NewI(12),
 						Disabled:   false,
 						CreatedAt:  f.Timestamp(),
 						UpdatedAt:  f.Timestamp(),
@@ -288,13 +288,13 @@ func TestResolver_ETHKeys(t *testing.T) {
 				states := []ethkey.State{
 					{
 						Address:    ethkey.MustEIP55Address(address.Hex()),
-						EVMChainID: *utils.NewBigI(12),
+						EVMChainID: *big.NewI(12),
 						Disabled:   false,
 						CreatedAt:  f.Timestamp(),
 						UpdatedAt:  f.Timestamp(),
 					},
 				}
-				chainID := *utils.NewBigI(12)
+				chainID := *big.NewI(12)
 				linkAddr := common.HexToAddress("0x5431F5F973781809D18643b87B44921b11355d81")
 
 				f.Mocks.ethKs.On("GetStatesForKeys", keys).Return(states, nil)
@@ -342,13 +342,13 @@ func TestResolver_ETHKeys(t *testing.T) {
 				states := []ethkey.State{
 					{
 						Address:    ethkey.EIP55AddressFromAddress(address),
-						EVMChainID: *utils.NewBigI(12),
+						EVMChainID: *big.NewI(12),
 						Disabled:   false,
 						CreatedAt:  f.Timestamp(),
 						UpdatedAt:  f.Timestamp(),
 					},
 				}
-				chainID := *utils.NewBigI(12)
+				chainID := *big.NewI(12)
 				linkAddr := common.HexToAddress("0x5431F5F973781809D18643b87B44921b11355d81")
 
 				f.Mocks.ethKs.On("GetStatesForKeys", keys).Return(states, nil)
diff --git a/core/web/resolver/eth_transaction_test.go b/core/web/resolver/eth_transaction_test.go
index a719c838e81..238aa9d1679 100644
--- a/core/web/resolver/eth_transaction_test.go
+++ b/core/web/resolver/eth_transaction_test.go
@@ -15,7 +15,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 )
 
 func TestResolver_EthTransaction(t *testing.T) {
@@ -54,7 +54,7 @@ func TestResolver_EthTransaction(t *testing.T) {
 		"hash": "0x5431F5F973781809D18643b87B44921b11355d81",
 	}
 	hash := common.HexToHash("0x5431F5F973781809D18643b87B44921b11355d81")
-	chainID := *utils.NewBigI(22)
+	chainID := *ubig.NewI(22)
 	gError := errors.New("error")
 
 	testCases := []GQLTestCase{
diff --git a/core/web/resolver/node_test.go b/core/web/resolver/node_test.go
index 24a31b986f1..a209a60fc3c 100644
--- a/core/web/resolver/node_test.go
+++ b/core/web/resolver/node_test.go
@@ -8,16 +8,16 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 func TestResolver_Nodes(t *testing.T) {
 	t.Parallel()
 
 	var (
-		chainID = *utils.NewBigI(1)
+		chainID = *big.NewI(1)
 
 		query = `
 			query GetNodes {
diff --git a/core/web/resolver/spec_test.go b/core/web/resolver/spec_test.go
index ef89dafa048..277aac851a6 100644
--- a/core/web/resolver/spec_test.go
+++ b/core/web/resolver/spec_test.go
@@ -13,13 +13,13 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	clnull "github.com/smartcontractkit/chainlink/v2/core/null"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay"
 	"github.com/smartcontractkit/chainlink/v2/core/services/signatures/secp256k1"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 // Specs are only embedded on the job and are not fetchable by it's own id, so
@@ -95,7 +95,7 @@ func TestResolver_DirectRequestSpec(t *testing.T) {
 					DirectRequestSpec: &job.DirectRequestSpec{
 						ContractAddress:          contractAddress,
 						CreatedAt:                f.Timestamp(),
-						EVMChainID:               utils.NewBigI(42),
+						EVMChainID:               ubig.NewI(42),
 						MinIncomingConfirmations: clnull.NewUint32(1, true),
 						MinContractPayment:       commonassets.NewLinkFromJuels(1000),
 						Requesters:               models.AddressCollection{requesterAddress},
@@ -160,7 +160,7 @@ func TestResolver_FluxMonitorSpec(t *testing.T) {
 					FluxMonitorSpec: &job.FluxMonitorSpec{
 						ContractAddress:   contractAddress,
 						CreatedAt:         f.Timestamp(),
-						EVMChainID:        utils.NewBigI(42),
+						EVMChainID:        ubig.NewI(42),
 						DrumbeatEnabled:   false,
 						IdleTimerDisabled: false,
 						IdleTimerPeriod:   time.Duration(1 * time.Hour),
@@ -227,7 +227,7 @@ func TestResolver_FluxMonitorSpec(t *testing.T) {
 					FluxMonitorSpec: &job.FluxMonitorSpec{
 						ContractAddress:     contractAddress,
 						CreatedAt:           f.Timestamp(),
-						EVMChainID:          utils.NewBigI(42),
+						EVMChainID:          ubig.NewI(42),
 						DrumbeatEnabled:     true,
 						DrumbeatRandomDelay: time.Duration(1 * time.Second),
 						DrumbeatSchedule:    "CRON_TZ=UTC 0 0 1 1 *",
@@ -310,7 +310,7 @@ func TestResolver_KeeperSpec(t *testing.T) {
 					KeeperSpec: &job.KeeperSpec{
 						ContractAddress: contractAddress,
 						CreatedAt:       f.Timestamp(),
-						EVMChainID:      utils.NewBigI(42),
+						EVMChainID:      ubig.NewI(42),
 						FromAddress:     ethkey.EIP55AddressFromAddress(fromAddress),
 					},
 				}, nil)
@@ -381,7 +381,7 @@ func TestResolver_OCRSpec(t *testing.T) {
 						ObservationGracePeriod:                 models.NewInterval(4 * time.Second),
 						ContractTransmitterTransmitTimeout:     models.NewInterval(555 * time.Millisecond),
 						CreatedAt:                              f.Timestamp(),
-						EVMChainID:                             utils.NewBigI(42),
+						EVMChainID:                             ubig.NewI(42),
 						IsBootstrapPeer:                        false,
 						EncryptedOCRKeyBundleID:                &keyBundleID,
 						ObservationTimeout:                     models.Interval(2 * time.Minute),
@@ -584,7 +584,7 @@ func TestResolver_VRFSpec(t *testing.T) {
 						MinIncomingConfirmations:      1,
 						CoordinatorAddress:            coordinatorAddress,
 						CreatedAt:                     f.Timestamp(),
-						EVMChainID:                    utils.NewBigI(42),
+						EVMChainID:                    ubig.NewI(42),
 						FromAddresses:                 []ethkey.EIP55Address{fromAddress1, fromAddress2},
 						PollPeriod:                    1 * time.Minute,
 						PublicKey:                     pubKey,
@@ -745,7 +745,7 @@ func TestResolver_BlockhashStoreSpec(t *testing.T) {
 						CoordinatorV2Address:           &coordinatorV2Address,
 						CoordinatorV2PlusAddress:       &coordinatorV2PlusAddress,
 						CreatedAt:                      f.Timestamp(),
-						EVMChainID:                     utils.NewBigI(42),
+						EVMChainID:                     ubig.NewI(42),
 						FromAddresses:                  []ethkey.EIP55Address{fromAddress1, fromAddress2},
 						PollPeriod:                     1 * time.Minute,
 						RunTimeout:                     37 * time.Second,
@@ -849,7 +849,7 @@ func TestResolver_BlockHeaderFeederSpec(t *testing.T) {
 						CoordinatorV2Address:       &coordinatorV2Address,
 						CoordinatorV2PlusAddress:   &coordinatorV2PlusAddress,
 						CreatedAt:                  f.Timestamp(),
-						EVMChainID:                 utils.NewBigI(42),
+						EVMChainID:                 ubig.NewI(42),
 						FromAddresses:              []ethkey.EIP55Address{fromAddress},
 						PollPeriod:                 1 * time.Minute,
 						RunTimeout:                 37 * time.Second,
diff --git a/integration-tests/client/chainlink_models.go b/integration-tests/client/chainlink_models.go
index abc6ef30e41..e6e1de25e41 100644
--- a/integration-tests/client/chainlink_models.go
+++ b/integration-tests/client/chainlink_models.go
@@ -8,8 +8,8 @@ import (
 
 	"gopkg.in/guregu/null.v4"
 
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
-	"github.com/smartcontractkit/chainlink/v2/core/utils"
 )
 
 // EIServiceConfig represents External Initiator service config
@@ -1420,6 +1420,6 @@ type ReplayResponseData struct {
 }
 
 type ReplayResponseAttributes struct {
-	Message    string     `json:"message"`
-	EVMChainID *utils.Big `json:"evmChainID"`
+	Message    string   `json:"message"`
+	EVMChainID *big.Big `json:"evmChainID"`
 }
diff --git a/integration-tests/types/config/node/core.go b/integration-tests/types/config/node/core.go
index 0337274bb1c..7436c05a107 100644
--- a/integration-tests/types/config/node/core.go
+++ b/integration-tests/types/config/node/core.go
@@ -16,6 +16,7 @@ import (
 	"github.com/smartcontractkit/chainlink-testing-framework/utils/ptr"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	evmcfg "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
+	ubig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/config/toml"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
@@ -162,7 +163,7 @@ func SetChainConfig(
 		}
 		cfg.EVM = evmcfg.EVMConfigs{
 			{
-				ChainID: utils.NewBig(big.NewInt(chain.ChainID)),
+				ChainID: ubig.New(big.NewInt(chain.ChainID)),
 				Chain:   chainConfig,
 				Nodes:   nodes,
 			},
@@ -179,7 +180,7 @@ func WithPrivateEVMs(networks []blockchain.EVMNetwork) NodeConfigOpt {
 	var evmConfigs []*evmcfg.EVMConfig
 	for _, network := range networks {
 		evmConfigs = append(evmConfigs, &evmcfg.EVMConfig{
-			ChainID: utils.NewBig(big.NewInt(network.ChainID)),
+			ChainID: ubig.New(big.NewInt(network.ChainID)),
 			Chain: evmcfg.Chain{
 				AutoCreateKey:      ptr.Ptr(true),
 				FinalityDepth:      ptr.Ptr[uint32](50),

From be23511bc4f8761188b6b450637f611ba7b5aee9 Mon Sep 17 00:00:00 2001
From: Jordan Krage <jmank88@gmail.com>
Date: Tue, 12 Dec 2023 15:24:26 -0600
Subject: [PATCH 114/130] bump toml/v2 and prometheus to latest patch (#11541)

Co-authored-by: Vyzaldy Sanchez <vyzaldysanchez@gmail.com>
---
 core/scripts/go.mod      | 4 ++--
 core/scripts/go.sum      | 8 ++++----
 go.mod                   | 4 ++--
 go.sum                   | 8 ++++----
 integration-tests/go.mod | 4 ++--
 integration-tests/go.sum | 8 ++++----
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/core/scripts/go.mod b/core/scripts/go.mod
index 2f4d45e746f..c5327596272 100644
--- a/core/scripts/go.mod
+++ b/core/scripts/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/manyminds/api2go v0.0.0-20171030193247-e7b693844a6f
 	github.com/montanaflynn/stats v0.7.1
 	github.com/olekukonko/tablewriter v0.0.5
-	github.com/pelletier/go-toml/v2 v2.1.0
+	github.com/pelletier/go-toml/v2 v2.1.1
 	github.com/pkg/errors v0.9.1
 	github.com/shopspring/decimal v1.3.1
 	github.com/smartcontractkit/chainlink-automation v1.0.1
@@ -224,7 +224,7 @@ require (
 	github.com/prometheus/client_model v0.5.0 // indirect
 	github.com/prometheus/common v0.45.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
-	github.com/prometheus/prometheus v0.48.0 // indirect
+	github.com/prometheus/prometheus v0.48.1 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/robfig/cron/v3 v3.0.1 // indirect
diff --git a/core/scripts/go.sum b/core/scripts/go.sum
index a59590fa124..28750a076d5 100644
--- a/core/scripts/go.sum
+++ b/core/scripts/go.sum
@@ -1029,8 +1029,8 @@ github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/9
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
-github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
-github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
+github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI=
+github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
 github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o=
 github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 h1:hDSdbBuw3Lefr6R18ax0tZ2BJeNB3NehB3trOwYBsdU=
 github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
@@ -1076,8 +1076,8 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
 github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
 github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
-github.com/prometheus/prometheus v0.48.0 h1:yrBloImGQ7je4h8M10ujGh4R6oxYQJQKlMuETwNskGk=
-github.com/prometheus/prometheus v0.48.0/go.mod h1:SRw624aMAxTfryAcP8rOjg4S/sHHaetx2lyJJ2nM83g=
+github.com/prometheus/prometheus v0.48.1 h1:CTszphSNTXkuCG6O0IfpKdHcJkvvnAAE1GbELKS+NFk=
+github.com/prometheus/prometheus v0.48.1/go.mod h1:SRw624aMAxTfryAcP8rOjg4S/sHHaetx2lyJJ2nM83g=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ=
 github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc=
diff --git a/go.mod b/go.mod
index d8394633c3f..e7b93c40bdb 100644
--- a/go.mod
+++ b/go.mod
@@ -51,13 +51,13 @@ require (
 	github.com/onsi/gomega v1.30.0
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/pelletier/go-toml v1.9.5
-	github.com/pelletier/go-toml/v2 v2.1.0
+	github.com/pelletier/go-toml/v2 v2.1.1
 	github.com/pkg/errors v0.9.1
 	github.com/pressly/goose/v3 v3.16.0
 	github.com/prometheus/client_golang v1.17.0
 	github.com/prometheus/client_model v0.5.0
 	github.com/prometheus/common v0.45.0
-	github.com/prometheus/prometheus v0.48.0
+	github.com/prometheus/prometheus v0.48.1
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/rogpeppe/go-internal v1.11.0
 	github.com/scylladb/go-reflectx v1.0.1
diff --git a/go.sum b/go.sum
index d702fd37e90..e9a7f0267ad 100644
--- a/go.sum
+++ b/go.sum
@@ -1015,8 +1015,8 @@ github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/9
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
-github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
-github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
+github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI=
+github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
 github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o=
 github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 h1:hDSdbBuw3Lefr6R18ax0tZ2BJeNB3NehB3trOwYBsdU=
 github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
@@ -1062,8 +1062,8 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
 github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
 github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
-github.com/prometheus/prometheus v0.48.0 h1:yrBloImGQ7je4h8M10ujGh4R6oxYQJQKlMuETwNskGk=
-github.com/prometheus/prometheus v0.48.0/go.mod h1:SRw624aMAxTfryAcP8rOjg4S/sHHaetx2lyJJ2nM83g=
+github.com/prometheus/prometheus v0.48.1 h1:CTszphSNTXkuCG6O0IfpKdHcJkvvnAAE1GbELKS+NFk=
+github.com/prometheus/prometheus v0.48.1/go.mod h1:SRw624aMAxTfryAcP8rOjg4S/sHHaetx2lyJJ2nM83g=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ=
 github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc=
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index c080f617552..84da65e9a5d 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -18,7 +18,7 @@ require (
 	github.com/lib/pq v1.10.9
 	github.com/manifoldco/promptui v0.9.0
 	github.com/onsi/gomega v1.30.0
-	github.com/pelletier/go-toml/v2 v2.1.0
+	github.com/pelletier/go-toml/v2 v2.1.1
 	github.com/rs/zerolog v1.30.0
 	github.com/scylladb/go-reflectx v1.0.1
 	github.com/segmentio/ksuid v1.0.4
@@ -330,7 +330,7 @@ require (
 	github.com/prometheus/common/sigv4 v0.1.0 // indirect
 	github.com/prometheus/exporter-toolkit v0.10.1-0.20230714054209-2f4150c63f97 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
-	github.com/prometheus/prometheus v0.48.0 // indirect
+	github.com/prometheus/prometheus v0.48.1 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/robfig/cron/v3 v3.0.1 // indirect
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index e8cefd67d6d..854978e3353 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -1278,8 +1278,8 @@ github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/9
 github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
-github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
+github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI=
+github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
 github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
 github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o=
@@ -1341,8 +1341,8 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
 github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
-github.com/prometheus/prometheus v0.48.0 h1:yrBloImGQ7je4h8M10ujGh4R6oxYQJQKlMuETwNskGk=
-github.com/prometheus/prometheus v0.48.0/go.mod h1:SRw624aMAxTfryAcP8rOjg4S/sHHaetx2lyJJ2nM83g=
+github.com/prometheus/prometheus v0.48.1 h1:CTszphSNTXkuCG6O0IfpKdHcJkvvnAAE1GbELKS+NFk=
+github.com/prometheus/prometheus v0.48.1/go.mod h1:SRw624aMAxTfryAcP8rOjg4S/sHHaetx2lyJJ2nM83g=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/pyroscope-io/client v0.7.1 h1:yFRhj3vbgjBxehvxQmedmUWJQ4CAfCHhn+itPsuWsHw=
 github.com/pyroscope-io/client v0.7.1/go.mod h1:4h21iOU4pUOq0prKyDlvYRL+SCKsBc5wKiEtV+rJGqU=

From 769357f079025ebae68d12d26bb0fcb5a35d6261 Mon Sep 17 00:00:00 2001
From: ferglor <19188060+ferglor@users.noreply.github.com>
Date: Tue, 12 Dec 2023 21:34:28 +0000
Subject: [PATCH 115/130] Change keepers to use the default contract
 transmitter (#11308)

* Switch keepers to use the default contract transmitter
Pass the gas limit into the transmitter constructor so we can specify the automation gas limit
Update tests

* Fix streams import

* Clean up function calls

* Remove pipeline runner dependency for automation

* Use contractTransmitterOpts to specify a pluginGasLimit

* Make the pluginGasLimit a pointer

* Clean up the pipeline transmitter

* Attempt to listen for transmits
Clean up linter
Extract function
Intentionally fail test
Rework transmit listen
Try filtering for transmits
Update test

* Revert "Attempt to listen for transmits"

This reverts commit 198e6669a6f64768c84acb82e01b2773c89426ce.

* Listen for performed events

* Goimports

* Add wrapper function that lets us specify a count of performed

* Update integration test

* Pass the configWatcher as a parameter to indicate that its required
---
 core/services/ocr2/delegate.go                |  4 +-
 .../plugins/ocr2keeper/integration_21_test.go | 93 +++++++-----------
 .../plugins/ocr2keeper/integration_test.go    | 19 ----
 core/services/ocr2/plugins/ocr2keeper/util.go | 14 +--
 .../ocrcommon/transmitter_pipeline.go         | 97 -------------------
 .../ocrcommon/transmitter_pipeline_test.go    | 77 ---------------
 core/services/relay/evm/evm.go                | 63 ++----------
 core/services/relay/evm/ocr2keeper.go         | 25 +++--
 core/services/relay/evm/ocr2vrf.go            |  4 +-
 9 files changed, 67 insertions(+), 329 deletions(-)
 delete mode 100644 core/services/ocrcommon/transmitter_pipeline.go
 delete mode 100644 core/services/ocrcommon/transmitter_pipeline_test.go

diff --git a/core/services/ocr2/delegate.go b/core/services/ocr2/delegate.go
index 5200866e3af..1b7be2b7f0e 100644
--- a/core/services/ocr2/delegate.go
+++ b/core/services/ocr2/delegate.go
@@ -1084,7 +1084,7 @@ func (d *Delegate) newServicesOCR2Keepers21(
 		return nil, fmt.Errorf("keeper2 services: failed to get chain %s: %w", rid.ChainID, err2)
 	}
 
-	keeperProvider, services, err2 := ocr2keeper.EVMDependencies21(jb, d.db, lggr, chain, d.pipelineRunner, mc, kb, d.cfg.Database())
+	keeperProvider, services, err2 := ocr2keeper.EVMDependencies21(jb, d.db, lggr, chain, mc, kb, d.cfg.Database(), d.ethKs)
 	if err2 != nil {
 		return nil, errors.Wrap(err2, "could not build dependencies for ocr2 keepers")
 	}
@@ -1201,7 +1201,7 @@ func (d *Delegate) newServicesOCR2Keepers20(
 		return nil, fmt.Errorf("keepers2.0 services: failed to get chain (%s): %w", rid.ChainID, err2)
 	}
 
-	keeperProvider, rgstry, encoder, logProvider, err2 := ocr2keeper.EVMDependencies20(jb, d.db, lggr, chain, d.pipelineRunner)
+	keeperProvider, rgstry, encoder, logProvider, err2 := ocr2keeper.EVMDependencies20(jb, d.db, lggr, chain, d.ethKs)
 	if err2 != nil {
 		return nil, errors.Wrap(err2, "could not build dependencies for ocr2 keepers")
 	}
diff --git a/core/services/ocr2/plugins/ocr2keeper/integration_21_test.go b/core/services/ocr2/plugins/ocr2keeper/integration_21_test.go
index c2b6612f664..81a35a5ced2 100644
--- a/core/services/ocr2/plugins/ocr2keeper/integration_21_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/integration_21_test.go
@@ -54,7 +54,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams"
-	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
 )
 
@@ -117,7 +116,7 @@ func TestIntegration_KeeperPluginConditionalUpkeep(t *testing.T) {
 	require.NoError(t, err)
 	registry := deployKeeper21Registry(t, steve, backend, linkAddr, linkFeedAddr, gasFeedAddr)
 
-	nodes, _ := setupNodes(t, nodeKeys, registry, backend, steve)
+	setupNodes(t, nodeKeys, registry, backend, steve)
 
 	<-time.After(time.Second * 5)
 
@@ -160,8 +159,6 @@ func TestIntegration_KeeperPluginConditionalUpkeep(t *testing.T) {
 	}
 	g.Eventually(receivedBytes, testutils.WaitTimeout(t), cltest.DBPollingInterval).Should(gomega.Equal(payload1))
 
-	checkPipelineRuns(t, nodes, 1)
-
 	// change payload
 	_, err = upkeepContract.SetBytesToSend(carrol, payload2)
 	require.NoError(t, err)
@@ -204,7 +201,7 @@ func TestIntegration_KeeperPluginLogUpkeep(t *testing.T) {
 	require.NoError(t, err)
 
 	registry := deployKeeper21Registry(t, steve, backend, linkAddr, linkFeedAddr, gasFeedAddr)
-	nodes, _ := setupNodes(t, nodeKeys, registry, backend, steve)
+	setupNodes(t, nodeKeys, registry, backend, steve)
 	upkeeps := 1
 
 	_, err = linkToken.Transfer(sergey, carrol.From, big.NewInt(0).Mul(oneHunEth, big.NewInt(int64(upkeeps+1))))
@@ -228,35 +225,36 @@ func TestIntegration_KeeperPluginLogUpkeep(t *testing.T) {
 	g.Eventually(listener, testutils.WaitTimeout(t), cltest.DBPollingInterval).Should(gomega.BeTrue())
 	done()
 
-	runs := checkPipelineRuns(t, nodes, 1)
-
 	t.Run("recover logs", func(t *testing.T) {
-
 		addr, contract := addrs[0], contracts[0]
 		upkeepID := registerUpkeep(t, registry, addr, carrol, steve, backend)
 		backend.Commit()
 		t.Logf("Registered new upkeep %s for address %s", upkeepID.String(), addr.String())
 		// Emit 100 logs in a burst
-		emits := 100
+		recoverEmits := 100
 		i := 0
 		emitEvents(testutils.Context(t), t, 100, []*log_upkeep_counter_wrapper.LogUpkeepCounter{contract}, carrol, func() {
 			i++
-			if i%(emits/4) == 0 {
+			if i%(recoverEmits/4) == 0 {
 				backend.Commit()
 				time.Sleep(time.Millisecond * 250) // otherwise we get "invalid transaction nonce" errors
 			}
 		})
-		// Mine enough blocks to ensre these logs don't fall into log provider range
+
+		beforeDummyBlocks := backend.Blockchain().CurrentBlock().Number.Uint64()
+
+		// Mine enough blocks to ensure these logs don't fall into log provider range
 		dummyBlocks := 500
 		for i := 0; i < dummyBlocks; i++ {
 			backend.Commit()
 			time.Sleep(time.Millisecond * 10)
 		}
-		t.Logf("Mined %d blocks, waiting for logs to be recovered", dummyBlocks)
 
-		expectedPostRecover := runs + emits
-		waitPipelineRuns(t, nodes, expectedPostRecover, testutils.WaitTimeout(t), cltest.DBPollingInterval)
+		t.Logf("Mined %d blocks, waiting for logs to be recovered", dummyBlocks)
 
+		listener, done := listenPerformedN(t, backend, registry, ids, int64(beforeDummyBlocks), recoverEmits)
+		g.Eventually(listener, testutils.WaitTimeout(t), cltest.DBPollingInterval).Should(gomega.BeTrue())
+		done()
 	})
 }
 
@@ -296,7 +294,7 @@ func TestIntegration_KeeperPluginLogUpkeep_Retry(t *testing.T) {
 
 	registry := deployKeeper21Registry(t, registryOwner, backend, linkAddr, linkFeedAddr, gasFeedAddr)
 
-	nodes, mercuryServer := setupNodes(t, nodeKeys, registry, backend, registryOwner)
+	_, mercuryServer := setupNodes(t, nodeKeys, registry, backend, registryOwner)
 
 	const upkeepCount = 10
 	const mercuryFailCount = upkeepCount * 3 * 2
@@ -374,39 +372,6 @@ func TestIntegration_KeeperPluginLogUpkeep_Retry(t *testing.T) {
 	g.Eventually(listener, testutils.WaitTimeout(t)-(5*time.Second), cltest.DBPollingInterval).Should(gomega.BeTrue())
 
 	done()
-
-	_ = checkPipelineRuns(t, nodes, 1*len(nodes)) // TODO: TBD
-}
-
-func waitPipelineRuns(t *testing.T, nodes []Node, n int, timeout, interval time.Duration) {
-	ctx, cancel := context.WithTimeout(testutils.Context(t), timeout)
-	defer cancel()
-	var allRuns []pipeline.Run
-	for len(allRuns) < n && ctx.Err() == nil {
-		allRuns = []pipeline.Run{}
-		for _, node := range nodes {
-			runs, err := node.App.PipelineORM().GetAllRuns()
-			require.NoError(t, err)
-			allRuns = append(allRuns, runs...)
-		}
-		time.Sleep(interval)
-	}
-	runs := len(allRuns)
-	t.Logf("found %d pipeline runs", runs)
-	require.GreaterOrEqual(t, runs, n)
-}
-
-func checkPipelineRuns(t *testing.T, nodes []Node, n int) int {
-	var allRuns []pipeline.Run
-	for _, node := range nodes {
-		runs, err2 := node.App.PipelineORM().GetAllRuns()
-		require.NoError(t, err2)
-		allRuns = append(allRuns, runs...)
-	}
-	runs := len(allRuns)
-	t.Logf("found %d pipeline runs", runs)
-	require.GreaterOrEqual(t, runs, n)
-	return runs
 }
 
 func emitEvents(ctx context.Context, t *testing.T, n int, contracts []*log_upkeep_counter_wrapper.LogUpkeepCounter, carrol *bind.TransactOpts, afterEmit func()) {
@@ -424,32 +389,32 @@ func mapListener(m *sync.Map, n int) func() bool {
 	return func() bool {
 		count := 0
 		m.Range(func(key, value interface{}) bool {
-			count++
+			count += value.(int)
 			return true
 		})
 		return count > n
 	}
 }
 
-func listenPerformed(t *testing.T, backend *backends.SimulatedBackend, registry *iregistry21.IKeeperRegistryMaster, ids []*big.Int, startBlock int64) (func() bool, func()) {
+func listenPerformedN(t *testing.T, backend *backends.SimulatedBackend, registry *iregistry21.IKeeperRegistryMaster, ids []*big.Int, startBlock int64, count int) (func() bool, func()) {
 	cache := &sync.Map{}
 	ctx, cancel := context.WithCancel(testutils.Context(t))
 	start := startBlock
 
 	go func() {
 		for ctx.Err() == nil {
-			bl := backend.Blockchain().CurrentBlock().Number.Uint64()
+			currentBlock := backend.Blockchain().CurrentBlock().Number.Uint64()
 
-			sc := make([]bool, len(ids))
-			for i := range sc {
-				sc[i] = true
+			success := make([]bool, len(ids))
+			for i := range success {
+				success[i] = true
 			}
 
 			iter, err := registry.FilterUpkeepPerformed(&bind.FilterOpts{
 				Start:   uint64(start),
-				End:     &bl,
+				End:     &currentBlock,
 				Context: ctx,
-			}, ids, sc)
+			}, ids, success)
 
 			if ctx.Err() != nil {
 				return
@@ -460,7 +425,15 @@ func listenPerformed(t *testing.T, backend *backends.SimulatedBackend, registry
 			for iter.Next() {
 				if iter.Event != nil {
 					t.Logf("[automation-ocr3 | EvmRegistry] upkeep performed event emitted for id %s", iter.Event.Id.String())
-					cache.Store(iter.Event.Id.String(), true)
+
+					//cache.Store(iter.Event.Id.String(), true)
+					count, ok := cache.Load(iter.Event.Id.String())
+					if !ok {
+						cache.Store(iter.Event.Id.String(), 1)
+						continue
+					}
+					countI := count.(int)
+					cache.Store(iter.Event.Id.String(), countI+1)
 				}
 			}
 
@@ -470,7 +443,11 @@ func listenPerformed(t *testing.T, backend *backends.SimulatedBackend, registry
 		}
 	}()
 
-	return mapListener(cache, 0), cancel
+	return mapListener(cache, count), cancel
+}
+
+func listenPerformed(t *testing.T, backend *backends.SimulatedBackend, registry *iregistry21.IKeeperRegistryMaster, ids []*big.Int, startBlock int64) (func() bool, func()) {
+	return listenPerformedN(t, backend, registry, ids, startBlock, 0)
 }
 
 func setupNodes(t *testing.T, nodeKeys [5]ethkey.KeyV2, registry *iregistry21.IKeeperRegistryMaster, backend *backends.SimulatedBackend, usr *bind.TransactOpts) ([]Node, *SimulatedMercuryServer) {
diff --git a/core/services/ocr2/plugins/ocr2keeper/integration_test.go b/core/services/ocr2/plugins/ocr2keeper/integration_test.go
index 6674b0828b1..d0a93f77631 100644
--- a/core/services/ocr2/plugins/ocr2keeper/integration_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/integration_test.go
@@ -58,7 +58,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/validate"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocrbootstrap"
-	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
 )
@@ -411,15 +410,6 @@ func TestIntegration_KeeperPluginBasic(t *testing.T) {
 	}
 	g.Eventually(receivedBytes, testutils.WaitTimeout(t), cltest.DBPollingInterval).Should(gomega.Equal(payload1))
 
-	// check pipeline runs
-	var allRuns []pipeline.Run
-	for _, node := range nodes {
-		runs, err2 := node.App.PipelineORM().GetAllRuns()
-		require.NoError(t, err2)
-		allRuns = append(allRuns, runs...)
-	}
-	require.GreaterOrEqual(t, len(allRuns), 1)
-
 	// change payload
 	_, err = upkeepContract.SetBytesToSend(carrol, payload2)
 	require.NoError(t, err)
@@ -683,15 +673,6 @@ func TestIntegration_KeeperPluginForwarderEnabled(t *testing.T) {
 	}
 	g.Eventually(receivedBytes, testutils.WaitTimeout(t), cltest.DBPollingInterval).Should(gomega.Equal(payload1))
 
-	// check pipeline runs
-	var allRuns []pipeline.Run
-	for _, node := range nodes {
-		runs, err2 := node.App.PipelineORM().GetAllRuns()
-		require.NoError(t, err2)
-		allRuns = append(allRuns, runs...)
-	}
-	require.GreaterOrEqual(t, len(allRuns), 1)
-
 	// change payload
 	_, err = upkeepContract.SetBytesToSend(carrol, payload2)
 	require.NoError(t, err)
diff --git a/core/services/ocr2/plugins/ocr2keeper/util.go b/core/services/ocr2/plugins/ocr2keeper/util.go
index 76e5bb6e00e..c3c60ad58b1 100644
--- a/core/services/ocr2/plugins/ocr2keeper/util.go
+++ b/core/services/ocr2/plugins/ocr2keeper/util.go
@@ -17,13 +17,13 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
+	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/models"
 	evmregistry20 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20"
 	evmregistry21 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21"
 	evmregistry21transmit "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/transmit"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
-	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
 	evmrelay "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm"
 )
 
@@ -43,9 +43,9 @@ var (
 	ErrNoChainFromSpec = fmt.Errorf("could not create chain from spec")
 )
 
-func EVMProvider(db *sqlx.DB, chain legacyevm.Chain, lggr logger.Logger, spec job.Job, pr pipeline.Runner) (evmrelay.OCR2KeeperProvider, error) {
+func EVMProvider(db *sqlx.DB, chain legacyevm.Chain, lggr logger.Logger, spec job.Job, ethKeystore keystore.Eth) (evmrelay.OCR2KeeperProvider, error) {
 	oSpec := spec.OCR2OracleSpec
-	ocr2keeperRelayer := evmrelay.NewOCR2KeeperRelayer(db, chain, pr, spec, lggr.Named("OCR2KeeperRelayer"))
+	ocr2keeperRelayer := evmrelay.NewOCR2KeeperRelayer(db, chain, lggr.Named("OCR2KeeperRelayer"), ethKeystore)
 
 	keeperProvider, err := ocr2keeperRelayer.NewOCR2KeeperProvider(
 		types.RelayArgs{
@@ -71,7 +71,7 @@ func EVMDependencies20(
 	db *sqlx.DB,
 	lggr logger.Logger,
 	chain legacyevm.Chain,
-	pr pipeline.Runner,
+	ethKeystore keystore.Eth,
 ) (evmrelay.OCR2KeeperProvider, *evmregistry20.EvmRegistry, Encoder20, *evmregistry20.LogProvider, error) {
 	var err error
 
@@ -79,7 +79,7 @@ func EVMDependencies20(
 	var registry *evmregistry20.EvmRegistry
 
 	// the provider will be returned as a dependency
-	if keeperProvider, err = EVMProvider(db, chain, lggr, spec, pr); err != nil {
+	if keeperProvider, err = EVMProvider(db, chain, lggr, spec, ethKeystore); err != nil {
 		return nil, nil, nil, nil, err
 	}
 
@@ -112,17 +112,17 @@ func EVMDependencies21(
 	db *sqlx.DB,
 	lggr logger.Logger,
 	chain legacyevm.Chain,
-	pr pipeline.Runner,
 	mc *models.MercuryCredentials,
 	keyring ocrtypes.OnchainKeyring,
 	dbCfg pg.QConfig,
+	ethKeystore keystore.Eth,
 ) (evmrelay.OCR2KeeperProvider, evmregistry21.AutomationServices, error) {
 	var err error
 	var keeperProvider evmrelay.OCR2KeeperProvider
 
 	oSpec := spec.OCR2OracleSpec
 	// the provider will be returned as a dependency
-	if keeperProvider, err = EVMProvider(db, chain, lggr, spec, pr); err != nil {
+	if keeperProvider, err = EVMProvider(db, chain, lggr, spec, ethKeystore); err != nil {
 		return nil, nil, err
 	}
 
diff --git a/core/services/ocrcommon/transmitter_pipeline.go b/core/services/ocrcommon/transmitter_pipeline.go
deleted file mode 100644
index e62f745a941..00000000000
--- a/core/services/ocrcommon/transmitter_pipeline.go
+++ /dev/null
@@ -1,97 +0,0 @@
-package ocrcommon
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/pkg/errors"
-
-	"github.com/smartcontractkit/chainlink/v2/common/txmgr/types"
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/job"
-	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
-)
-
-const txObservationSource = `
-    transmit_tx [type=ethtx
-                 minConfirmations=0
-                 to="$(jobSpec.contractAddress)"
-                 from="[$(jobSpec.fromAddress)]"
-                 evmChainID="$(jobSpec.evmChainID)"
-                 data="$(jobSpec.data)"
-                 gasLimit="$(jobSpec.gasLimit)"
-                 forwardingAllowed="$(jobSpec.forwardingAllowed)"
-                 transmitChecker="$(jobSpec.transmitChecker)"]
-    transmit_tx
-`
-
-type pipelineTransmitter struct {
-	lgr                         logger.Logger
-	fromAddress                 common.Address
-	gasLimit                    uint32
-	effectiveTransmitterAddress common.Address
-	strategy                    types.TxStrategy
-	checker                     txmgr.TransmitCheckerSpec
-	pr                          pipeline.Runner
-	spec                        job.Job
-	chainID                     string
-}
-
-// NewPipelineTransmitter creates a new eth transmitter using the job pipeline mechanism
-func NewPipelineTransmitter(
-	lgr logger.Logger,
-	fromAddress common.Address,
-	gasLimit uint32,
-	effectiveTransmitterAddress common.Address,
-	strategy types.TxStrategy,
-	checker txmgr.TransmitCheckerSpec,
-	pr pipeline.Runner,
-	spec job.Job,
-	chainID string,
-) Transmitter {
-	return &pipelineTransmitter{
-		lgr:                         lgr,
-		fromAddress:                 fromAddress,
-		gasLimit:                    gasLimit,
-		effectiveTransmitterAddress: effectiveTransmitterAddress,
-		strategy:                    strategy,
-		checker:                     checker,
-		pr:                          pr,
-		spec:                        spec,
-		chainID:                     chainID,
-	}
-}
-
-func (t *pipelineTransmitter) CreateEthTransaction(ctx context.Context, toAddress common.Address, payload []byte, _ *txmgr.TxMeta) error {
-	// t.strategy is ignored currently as pipeline does not support passing this (sc-55115)
-	vars := pipeline.NewVarsFrom(map[string]interface{}{
-		"jobSpec": map[string]interface{}{
-			"contractAddress":   toAddress.String(),
-			"fromAddress":       t.fromAddress.String(),
-			"gasLimit":          t.gasLimit,
-			"evmChainID":        t.chainID,
-			"forwardingAllowed": t.spec.ForwardingAllowed,
-			"data":              payload,
-			"transmitChecker":   t.checker,
-		},
-	})
-
-	t.spec.PipelineSpec.DotDagSource = txObservationSource
-	run := pipeline.NewRun(*t.spec.PipelineSpec, vars)
-
-	if _, err := t.pr.Run(ctx, run, t.lgr, true, nil); err != nil {
-		return errors.Wrap(err, "Skipped OCR transmission")
-	}
-
-	if run.State != pipeline.RunStatusCompleted {
-		return fmt.Errorf("unexpected pipeline run state: %s with fatal errors %w", run.State, run.FatalErrors.ToError())
-	}
-
-	return nil
-}
-
-func (t *pipelineTransmitter) FromAddress() common.Address {
-	return t.effectiveTransmitterAddress
-}
diff --git a/core/services/ocrcommon/transmitter_pipeline_test.go b/core/services/ocrcommon/transmitter_pipeline_test.go
deleted file mode 100644
index e0114d0aa0d..00000000000
--- a/core/services/ocrcommon/transmitter_pipeline_test.go
+++ /dev/null
@@ -1,77 +0,0 @@
-package ocrcommon_test
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-
-	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
-	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/job"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocrcommon"
-	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
-	pipelinemocks "github.com/smartcontractkit/chainlink/v2/core/services/pipeline/mocks"
-)
-
-func Test_PipelineTransmitter_CreateEthTransaction(t *testing.T) {
-	t.Parallel()
-
-	lggr := logger.TestLogger(t)
-	db := pgtest.NewSqlxDB(t)
-	cfg := configtest.NewTestGeneralConfig(t)
-	ethKeyStore := cltest.NewKeyStore(t, db, cfg.Database()).Eth()
-
-	_, fromAddress := cltest.MustInsertRandomKey(t, ethKeyStore)
-
-	chainID := "12345"
-	gasLimit := uint32(1000)
-	effectiveTransmitterAddress := fromAddress
-	toAddress := testutils.NewAddress()
-	payload := []byte{1, 2, 3}
-	strategy := newMockTxStrategy(t)
-	checker := txmgr.TransmitCheckerSpec{CheckerType: txmgr.TransmitCheckerTypeSimulate}
-	runner := pipelinemocks.NewRunner(t)
-
-	transmitter := ocrcommon.NewPipelineTransmitter(
-		lggr,
-		fromAddress,
-		gasLimit,
-		effectiveTransmitterAddress,
-		strategy,
-		checker,
-		runner,
-		job.Job{
-			PipelineSpec: &pipeline.Spec{},
-		},
-		chainID,
-	)
-
-	runner.On("Run", mock.Anything, mock.AnythingOfType("*pipeline.Run"), mock.Anything, mock.Anything, mock.Anything).
-		Return(false, nil).
-		Run(func(args mock.Arguments) {
-			run := args.Get(1).(*pipeline.Run)
-			require.Equal(t, map[string]interface{}{
-				"jobSpec": map[string]interface{}{
-					"contractAddress":   toAddress.String(),
-					"fromAddress":       fromAddress.String(),
-					"gasLimit":          gasLimit,
-					"evmChainID":        chainID,
-					"forwardingAllowed": false,
-					"data":              payload,
-					"transmitChecker":   checker,
-				},
-			}, run.Inputs.Val)
-
-			save := args.Get(3).(bool)
-			require.True(t, save)
-
-			run.State = pipeline.RunStatusCompleted
-		}).Once()
-
-	require.NoError(t, transmitter.CreateEthTransaction(testutils.Context(t), toAddress, payload, nil))
-}
diff --git a/core/services/relay/evm/evm.go b/core/services/relay/evm/evm.go
index aea704adacf..83540e22bb7 100644
--- a/core/services/relay/evm/evm.go
+++ b/core/services/relay/evm/evm.go
@@ -27,13 +27,11 @@ import (
 	txm "github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
 	mercuryconfig "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/mercury/config"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocrcommon"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
-	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/functions"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury"
 	mercuryutils "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/utils"
@@ -373,7 +371,12 @@ func newConfigProvider(lggr logger.Logger, chain legacyevm.Chain, opts *types.Re
 	return newConfigWatcher(lggr, aggregatorAddress, contractABI, offchainConfigDigester, cp, chain, relayConfig.FromBlock, opts.New), nil
 }
 
-func newContractTransmitter(lggr logger.Logger, rargs commontypes.RelayArgs, transmitterID string, configWatcher *configWatcher, ethKeystore keystore.Eth) (*contractTransmitter, error) {
+type configTransmitterOpts struct {
+	// override the gas limit default provided in the config watcher
+	pluginGasLimit *uint32
+}
+
+func newContractTransmitter(lggr logger.Logger, rargs commontypes.RelayArgs, transmitterID string, ethKeystore keystore.Eth, configWatcher *configWatcher, opts configTransmitterOpts) (*contractTransmitter, error) {
 	var relayConfig types.RelayConfig
 	if err := json.Unmarshal(rargs.RelayConfig, &relayConfig); err != nil {
 		return nil, err
@@ -415,6 +418,9 @@ func newContractTransmitter(lggr logger.Logger, rargs commontypes.RelayArgs, tra
 	if ocr2Limit != nil {
 		gasLimit = *ocr2Limit
 	}
+	if opts.pluginGasLimit != nil {
+		gasLimit = *opts.pluginGasLimit
+	}
 
 	transmitter, err := ocrcommon.NewTransmitter(
 		configWatcher.chain.TxManager(),
@@ -442,55 +448,6 @@ func newContractTransmitter(lggr logger.Logger, rargs commontypes.RelayArgs, tra
 	)
 }
 
-func newPipelineContractTransmitter(lggr logger.Logger, rargs commontypes.RelayArgs, transmitterID string, pluginGasLimit *uint32, configWatcher *configWatcher, spec job.Job, pr pipeline.Runner) (*contractTransmitter, error) {
-	var relayConfig types.RelayConfig
-	if err := json.Unmarshal(rargs.RelayConfig, &relayConfig); err != nil {
-		return nil, err
-	}
-
-	if !relayConfig.EffectiveTransmitterID.Valid {
-		return nil, pkgerrors.New("EffectiveTransmitterID must be specified")
-	}
-	effectiveTransmitterAddress := common.HexToAddress(relayConfig.EffectiveTransmitterID.String)
-	transmitterAddress := common.HexToAddress(transmitterID)
-	scoped := configWatcher.chain.Config()
-	strategy := txmgrcommon.NewQueueingTxStrategy(rargs.ExternalJobID, scoped.OCR2().DefaultTransactionQueueDepth(), scoped.Database().DefaultQueryTimeout())
-
-	var checker txm.TransmitCheckerSpec
-	if configWatcher.chain.Config().OCR2().SimulateTransactions() {
-		checker.CheckerType = txm.TransmitCheckerTypeSimulate
-	}
-
-	gasLimit := configWatcher.chain.Config().EVM().GasEstimator().LimitDefault()
-	ocr2Limit := configWatcher.chain.Config().EVM().GasEstimator().LimitJobType().OCR2()
-	if ocr2Limit != nil {
-		gasLimit = *ocr2Limit
-	}
-	if pluginGasLimit != nil {
-		gasLimit = *pluginGasLimit
-	}
-
-	return NewOCRContractTransmitter(
-		configWatcher.contractAddress,
-		configWatcher.chain.Client(),
-		configWatcher.contractABI,
-		ocrcommon.NewPipelineTransmitter(
-			lggr,
-			transmitterAddress,
-			gasLimit,
-			effectiveTransmitterAddress,
-			strategy,
-			checker,
-			pr,
-			spec,
-			configWatcher.chain.ID().String(),
-		),
-		configWatcher.chain.LogPoller(),
-		lggr,
-		nil,
-	)
-}
-
 func (r *Relayer) NewMedianProvider(rargs commontypes.RelayArgs, pargs commontypes.PluginArgs) (commontypes.MedianProvider, error) {
 	lggr := r.lggr.Named("MedianProvider").Named(rargs.ExternalJobID.String())
 	relayOpts := types.NewRelayOpts(rargs)
@@ -513,7 +470,7 @@ func (r *Relayer) NewMedianProvider(rargs commontypes.RelayArgs, pargs commontyp
 	}
 
 	reportCodec := evmreportcodec.ReportCodec{}
-	contractTransmitter, err := newContractTransmitter(lggr, rargs, pargs.TransmitterID, configWatcher, r.ks.Eth())
+	contractTransmitter, err := newContractTransmitter(lggr, rargs, pargs.TransmitterID, r.ks.Eth(), configWatcher, configTransmitterOpts{})
 	if err != nil {
 		return nil, err
 	}
diff --git a/core/services/relay/evm/ocr2keeper.go b/core/services/relay/evm/ocr2keeper.go
index abc03c7abb1..55c4d78e7b4 100644
--- a/core/services/relay/evm/ocr2keeper.go
+++ b/core/services/relay/evm/ocr2keeper.go
@@ -22,8 +22,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
-	"github.com/smartcontractkit/chainlink/v2/core/services/job"
-	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
+	"github.com/smartcontractkit/chainlink/v2/core/services/keystore"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types"
 )
 
@@ -51,21 +50,19 @@ type OCR2KeeperRelayer interface {
 
 // ocr2keeperRelayer is the relayer with added DKG and OCR2Keeper provider functions.
 type ocr2keeperRelayer struct {
-	db    *sqlx.DB
-	chain legacyevm.Chain
-	pr    pipeline.Runner
-	spec  job.Job
-	lggr  logger.Logger
+	db          *sqlx.DB
+	chain       legacyevm.Chain
+	lggr        logger.Logger
+	ethKeystore keystore.Eth
 }
 
 // NewOCR2KeeperRelayer is the constructor of ocr2keeperRelayer
-func NewOCR2KeeperRelayer(db *sqlx.DB, chain legacyevm.Chain, pr pipeline.Runner, spec job.Job, lggr logger.Logger) OCR2KeeperRelayer {
+func NewOCR2KeeperRelayer(db *sqlx.DB, chain legacyevm.Chain, lggr logger.Logger, ethKeystore keystore.Eth) OCR2KeeperRelayer {
 	return &ocr2keeperRelayer{
-		db:    db,
-		chain: chain,
-		pr:    pr,
-		spec:  spec,
-		lggr:  lggr,
+		db:          db,
+		chain:       chain,
+		lggr:        lggr,
+		ethKeystore: ethKeystore,
 	}
 }
 
@@ -76,7 +73,7 @@ func (r *ocr2keeperRelayer) NewOCR2KeeperProvider(rargs commontypes.RelayArgs, p
 	}
 
 	gasLimit := cfgWatcher.chain.Config().EVM().OCR2().Automation().GasLimit()
-	contractTransmitter, err := newPipelineContractTransmitter(r.lggr, rargs, pargs.TransmitterID, &gasLimit, cfgWatcher, r.spec, r.pr)
+	contractTransmitter, err := newContractTransmitter(r.lggr, rargs, pargs.TransmitterID, r.ethKeystore, cfgWatcher, configTransmitterOpts{pluginGasLimit: &gasLimit})
 	if err != nil {
 		return nil, err
 	}
diff --git a/core/services/relay/evm/ocr2vrf.go b/core/services/relay/evm/ocr2vrf.go
index 39d0503b8b1..1e05f89d9de 100644
--- a/core/services/relay/evm/ocr2vrf.go
+++ b/core/services/relay/evm/ocr2vrf.go
@@ -67,7 +67,7 @@ func (r *ocr2vrfRelayer) NewDKGProvider(rargs commontypes.RelayArgs, pargs commo
 	if err != nil {
 		return nil, err
 	}
-	contractTransmitter, err := newContractTransmitter(r.lggr, rargs, pargs.TransmitterID, configWatcher, r.ethKeystore)
+	contractTransmitter, err := newContractTransmitter(r.lggr, rargs, pargs.TransmitterID, r.ethKeystore, configWatcher, configTransmitterOpts{})
 	if err != nil {
 		return nil, err
 	}
@@ -90,7 +90,7 @@ func (r *ocr2vrfRelayer) NewOCR2VRFProvider(rargs commontypes.RelayArgs, pargs c
 	if err != nil {
 		return nil, err
 	}
-	contractTransmitter, err := newContractTransmitter(r.lggr, rargs, pargs.TransmitterID, configWatcher, r.ethKeystore)
+	contractTransmitter, err := newContractTransmitter(r.lggr, rargs, pargs.TransmitterID, r.ethKeystore, configWatcher, configTransmitterOpts{})
 	if err != nil {
 		return nil, err
 	}

From dc7c3de8573140aa75aa1b961e547f0dfb3cc36b Mon Sep 17 00:00:00 2001
From: Connor Stein <connor.stein@mail.mcgill.ca>
Date: Tue, 12 Dec 2023 17:11:55 -0500
Subject: [PATCH 116/130] Standardize LP filter logging (#11515)

* Standardize logs

* Comments

* More PR review

* More

* Fix test
---
 core/chains/evm/logpoller/log_poller.go           | 15 +++++++++------
 .../evm/logpoller/log_poller_internal_test.go     |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/chains/evm/logpoller/log_poller.go b/core/chains/evm/logpoller/log_poller.go
index 77b80253591..991cc8d4309 100644
--- a/core/chains/evm/logpoller/log_poller.go
+++ b/core/chains/evm/logpoller/log_poller.go
@@ -217,6 +217,7 @@ func (filter *Filter) Contains(other *Filter) bool {
 // Generally speaking this is harmless. We enforce that EventSigs and Addresses are non-empty,
 // which means that anonymous events are not supported and log.Topics >= 1 always (log.Topics[0] is the event signature).
 // The filter may be unregistered later by Filter.Name
+// Warnings/debug information is keyed by filter name.
 func (lp *logPoller) RegisterFilter(filter Filter, qopts ...pg.QOpt) error {
 	if len(filter.Addresses) == 0 {
 		return errors.Errorf("at least one address must be specified")
@@ -242,33 +243,35 @@ func (lp *logPoller) RegisterFilter(filter Filter, qopts ...pg.QOpt) error {
 	if existingFilter, ok := lp.filters[filter.Name]; ok {
 		if existingFilter.Contains(&filter) {
 			// Nothing new in this Filter
+			lp.lggr.Warnw("Filter already present, no-op", "name", filter.Name, "filter", filter)
 			return nil
 		}
-		lp.lggr.Warnw("Updating existing filter with more events or addresses", "filter", filter)
-	} else {
-		lp.lggr.Debugw("Creating new filter", "filter", filter)
+		lp.lggr.Warnw("Updating existing filter with more events or addresses", "name", filter.Name, "filter", filter)
 	}
 
 	if err := lp.orm.InsertFilter(filter, qopts...); err != nil {
-		return errors.Wrap(err, "RegisterFilter failed to save filter to db")
+		return errors.Wrap(err, "error inserting filter")
 	}
 	lp.filters[filter.Name] = filter
 	lp.filterDirty = true
 	return nil
 }
 
+// UnregisterFilter will remove the filter with the given name.
+// If the name does not exist, it will log an error but not return an error.
+// Warnings/debug information is keyed by filter name.
 func (lp *logPoller) UnregisterFilter(name string, qopts ...pg.QOpt) error {
 	lp.filterMu.Lock()
 	defer lp.filterMu.Unlock()
 
 	_, ok := lp.filters[name]
 	if !ok {
-		lp.lggr.Errorf("Filter %s not found", name)
+		lp.lggr.Warnw("Filter not found", "name", name)
 		return nil
 	}
 
 	if err := lp.orm.DeleteFilter(name, qopts...); err != nil {
-		return errors.Wrapf(err, "Failed to delete filter %s", name)
+		return errors.Wrap(err, "error deleting filter")
 	}
 	delete(lp.filters, name)
 	lp.filterDirty = true
diff --git a/core/chains/evm/logpoller/log_poller_internal_test.go b/core/chains/evm/logpoller/log_poller_internal_test.go
index f840eefc7b8..09e1deb864f 100644
--- a/core/chains/evm/logpoller/log_poller_internal_test.go
+++ b/core/chains/evm/logpoller/log_poller_internal_test.go
@@ -57,7 +57,7 @@ func TestLogPoller_RegisterFilter(t *testing.T) {
 	a1 := common.HexToAddress("0x2ab9a2dc53736b361b72d900cdf9f78f9406fbbb")
 	a2 := common.HexToAddress("0x2ab9a2dc53736b361b72d900cdf9f78f9406fbbc")
 
-	lggr, observedLogs := logger.TestObserved(t, zapcore.ErrorLevel)
+	lggr, observedLogs := logger.TestObserved(t, zapcore.WarnLevel)
 	chainID := testutils.NewRandomEVMChainID()
 	db := pgtest.NewSqlxDB(t)
 

From 67764ce485aed42d84515d77448017e0754f815c Mon Sep 17 00:00:00 2001
From: Rens Rooimans <github@rensrooimans.nl>
Date: Wed, 13 Dec 2023 10:37:42 +0100
Subject: [PATCH 117/130] bump Foundry to the December release (#11540)

---
 .github/workflows/solidity-foundry.yml | 2 +-
 contracts/GNUmakefile                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/solidity-foundry.yml b/.github/workflows/solidity-foundry.yml
index 7f6fa4f482e..b629106972e 100644
--- a/.github/workflows/solidity-foundry.yml
+++ b/.github/workflows/solidity-foundry.yml
@@ -58,7 +58,7 @@ jobs:
         uses: foundry-rs/foundry-toolchain@v1
         with:
           # Has to match the `make foundry` version.
-          version: nightly-09fe3e041369a816365a020f715ad6f94dbce9f2
+          version: nightly-5b7e4cb3c882b28f3c32ba580de27ce7381f415a
 
       - name: Run Forge build
         if: needs.changes.outputs.changes == 'true'
diff --git a/contracts/GNUmakefile b/contracts/GNUmakefile
index f5be193249c..8ec536d520f 100644
--- a/contracts/GNUmakefile
+++ b/contracts/GNUmakefile
@@ -43,7 +43,7 @@ mockery: $(mockery) ## Install mockery.
 
 .PHONY: foundry
 foundry: ## Install foundry.
-	foundryup --version nightly-09fe3e041369a816365a020f715ad6f94dbce9f2
+	foundryup --version nightly-5b7e4cb3c882b28f3c32ba580de27ce7381f415a
 
 .PHONY: foundry-refresh
 foundry-refresh: foundry

From 20d612952816e27971dc7c1deae5d780c44ed04d Mon Sep 17 00:00:00 2001
From: Adam Hamrick <adam.hamrick@smartcontract.com>
Date: Wed, 13 Dec 2023 09:20:12 -0500
Subject: [PATCH 118/130] Removes Optimism Goerli from Scheduled Tests (#11559)

* Removes Optimism Goerli from Scheduled Tests

* Missed a spot
---
 .github/workflows/live-testnet-tests.yml | 57 +-----------------------
 1 file changed, 2 insertions(+), 55 deletions(-)

diff --git a/.github/workflows/live-testnet-tests.yml b/.github/workflows/live-testnet-tests.yml
index 2e9809505f2..d060b5c510d 100644
--- a/.github/workflows/live-testnet-tests.yml
+++ b/.github/workflows/live-testnet-tests.yml
@@ -33,9 +33,6 @@ env:
   BSC_TESTNET_URLS: ${{ secrets.QA_BSC_TESTNET_URLS }}
   BSC_TESTNET_HTTP_URLS: ${{ secrets.QA_BSC_TESTNET_HTTP_URLS }}
 
-  OPTIMISM_GOERLI_URLS: ${{ secrets.QA_OPTIMISM_GOERLI_URLS }}
-  OPTIMISM_GOERLI_HTTP_URLS: ${{ secrets.QA_OPTIMISM_GOERLI_HTTP_URLS }}
-
   OPTIMISM_SEPOLIA_URLS: ${{ secrets.QA_OPTIMISM_SEPOLIA_URLS }}
   OPTIMISM_SEPOLIA_HTTP_URLS: ${{ secrets.QA_OPTIMISM_SEPOLIA_HTTP_URLS }}
 
@@ -147,7 +144,7 @@ jobs:
       id-token: write
       contents: read
     runs-on: ubuntu-latest
-    needs: [sepolia-smoke-tests, bsc-testnet-tests, optimism-goerli-smoke-tests, optimism-sepolia-smoke-tests, arbitrum-sepolia-smoke-tests, base-goerli-smoke-tests, base-sepolia-smoke-tests, polygon-mumbai-smoke-tests, avalanche-fuji-smoke-tests, fantom-testnet-smoke-tests, celo-alfajores-smoke-tests, scroll-sepolia-smoke-tests, linea-goerli-smoke-tests]
+    needs: [sepolia-smoke-tests, bsc-testnet-tests, optimism-sepolia-smoke-tests, arbitrum-sepolia-smoke-tests, base-goerli-smoke-tests, base-sepolia-smoke-tests, polygon-mumbai-smoke-tests, avalanche-fuji-smoke-tests, fantom-testnet-smoke-tests, celo-alfajores-smoke-tests, scroll-sepolia-smoke-tests, linea-goerli-smoke-tests]
     steps:
       - name: Debug Result
         run: echo ${{ join(needs.*.result, ',') }}
@@ -208,7 +205,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        network: [Sepolia, Optimism Goerli, Optimism Sepolia, Arbitrum Sepolia, Base Goerli, Base Sepolia, Polygon Mumbai, Avalanche Fuji, Fantom Testnet, Celo Alfajores, Scroll Sepolia, Linea Goerli]
+        network: [Sepolia, Optimism Sepolia, Arbitrum Sepolia, Base Goerli, Base Sepolia, Polygon Mumbai, Avalanche Fuji, Fantom Testnet, Celo Alfajores, Scroll Sepolia, Linea Goerli]
     steps:
       - name: Get Results
         id: test-results
@@ -391,56 +388,6 @@ jobs:
           QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
           QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
 
-  optimism-goerli-smoke-tests:
-    environment: integration
-    permissions:
-      checks: write
-      pull-requests: write
-      id-token: write
-      contents: read
-    needs: [build-chainlink, build-tests]
-    env:
-      SELECTED_NETWORKS: OPTIMISM_GOERLI
-    strategy:
-      fail-fast: false
-      max-parallel: 1
-      matrix:
-        include: # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#example-adding-configurations
-          - product: OCR
-            test: TestOCRBasic
-          - product: Automation Conditional
-            test: TestAutomationBasic/registry_2_1_conditional
-          - product: Automation Log Trigger
-            test: TestAutomationBasic/registry_2_1_logtrigger
-    name: Optimism Goerli ${{ matrix.product }} Tests
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download Tests Binary
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
-        with:
-          name: tests
-      - name: Run Tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests-binary@912bed7e07a1df4d06ea53a031e9773bb65dc7bd # v2.3.0
-        env:
-          PYROSCOPE_SERVER: ${{ secrets.QA_PYROSCOPE_INSTANCE }}
-          PYROSCOPE_ENVIRONMENT: ci-smoke-${{ matrix.product }}-optimism-goerli
-          PYROSCOPE_KEY: ${{ secrets.QA_PYROSCOPE_KEY }}
-        with:
-          test_command_to_run: ./tests -test.timeout 30m -test.count=1 -test.parallel=1 -test.run ${{ matrix.test }}
-          binary_name: tests
-          cl_repo: ${{ env.CHAINLINK_IMAGE }}
-          cl_image_tag: ${{ github.sha }}
-          aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
-          dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }}
-          dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }}
-          artifacts_location: ./logs
-          token: ${{ secrets.GITHUB_TOKEN }}
-          cache_key_id: core-e2e-${{ env.MOD_CACHE_VERSION }}
-          cache_restore_only: "true"
-          QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
-          QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
-          QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
-
   optimism-sepolia-smoke-tests:
     environment: integration
     permissions:

From 8c3f9f718d91fb9d897841aaa71dd01eaec5e0d1 Mon Sep 17 00:00:00 2001
From: Jordan Krage <jmank88@gmail.com>
Date: Wed, 13 Dec 2023 08:35:28 -0600
Subject: [PATCH 119/130] fix health monitoring (#11558)

---
 core/chains/evm/gas/models.go              |  31 +++-
 core/chains/evm/gas/models_test.go         |  71 +++++----
 core/chains/evm/txmgr/broadcaster_test.go  |  12 +-
 core/chains/evm/txmgr/confirmer_test.go    |  13 +-
 core/services/chainlink/relayer_factory.go |   6 +-
 core/services/relay/evm/evm.go             |   4 +-
 core/web/health_controller.go              |  11 +-
 core/web/health_controller_test.go         |  70 ++++++++-
 core/web/testdata/body/health.json         | 166 +++++++++++++++++++++
 9 files changed, 333 insertions(+), 51 deletions(-)
 create mode 100644 core/web/testdata/body/health.json

diff --git a/core/chains/evm/gas/models.go b/core/chains/evm/gas/models.go
index c7476d58ba4..8d977df0991 100644
--- a/core/chains/evm/gas/models.go
+++ b/core/chains/evm/gas/models.go
@@ -71,19 +71,31 @@ func NewEstimator(lggr logger.Logger, ethClient evmclient.Client, cfg Config, ge
 	if rollups.IsRollupWithL1Support(cfg.ChainType()) {
 		l1Oracle = rollups.NewL1GasPriceOracle(lggr, ethClient, cfg.ChainType())
 	}
+	var newEstimator func(logger.Logger) EvmEstimator
 	switch s {
 	case "Arbitrum":
-		return NewWrappedEvmEstimator(NewArbitrumEstimator(lggr, geCfg, ethClient, ethClient), df, l1Oracle)
+		newEstimator = func(l logger.Logger) EvmEstimator {
+			return NewArbitrumEstimator(lggr, geCfg, ethClient, ethClient)
+		}
 	case "BlockHistory":
-		return NewWrappedEvmEstimator(NewBlockHistoryEstimator(lggr, ethClient, cfg, geCfg, bh, *ethClient.ConfiguredChainID()), df, l1Oracle)
+		newEstimator = func(l logger.Logger) EvmEstimator {
+			return NewBlockHistoryEstimator(lggr, ethClient, cfg, geCfg, bh, *ethClient.ConfiguredChainID())
+		}
 	case "FixedPrice":
-		return NewWrappedEvmEstimator(NewFixedPriceEstimator(geCfg, bh, lggr), df, l1Oracle)
+		newEstimator = func(l logger.Logger) EvmEstimator {
+			return NewFixedPriceEstimator(geCfg, bh, lggr)
+		}
 	case "L2Suggested", "SuggestedPrice":
-		return NewWrappedEvmEstimator(NewSuggestedPriceEstimator(lggr, ethClient), df, l1Oracle)
+		newEstimator = func(l logger.Logger) EvmEstimator {
+			return NewSuggestedPriceEstimator(lggr, ethClient)
+		}
 	default:
 		lggr.Warnf("GasEstimator: unrecognised mode '%s', falling back to FixedPriceEstimator", s)
-		return NewWrappedEvmEstimator(NewFixedPriceEstimator(geCfg, bh, lggr), df, l1Oracle)
+		newEstimator = func(l logger.Logger) EvmEstimator {
+			return NewFixedPriceEstimator(geCfg, bh, lggr)
+		}
 	}
+	return NewWrappedEvmEstimator(lggr, newEstimator, df, l1Oracle)
 }
 
 // DynamicFee encompasses both FeeCap and TipCap for EIP1559 transactions
@@ -150,6 +162,7 @@ func (fee EvmFee) ValidDynamic() bool {
 // WrappedEvmEstimator provides a struct that wraps the EVM specific dynamic and legacy estimators into one estimator that conforms to the generic FeeEstimator
 type WrappedEvmEstimator struct {
 	services.StateMachine
+	lggr logger.Logger
 	EvmEstimator
 	EIP1559Enabled bool
 	l1Oracle       rollups.L1Oracle
@@ -157,16 +170,18 @@ type WrappedEvmEstimator struct {
 
 var _ EvmFeeEstimator = (*WrappedEvmEstimator)(nil)
 
-func NewWrappedEvmEstimator(e EvmEstimator, eip1559Enabled bool, l1Oracle rollups.L1Oracle) EvmFeeEstimator {
+func NewWrappedEvmEstimator(lggr logger.Logger, newEstimator func(logger.Logger) EvmEstimator, eip1559Enabled bool, l1Oracle rollups.L1Oracle) EvmFeeEstimator {
+	lggr = logger.Named(lggr, "WrappedEvmEstimator")
 	return &WrappedEvmEstimator{
-		EvmEstimator:   e,
+		lggr:           lggr,
+		EvmEstimator:   newEstimator(lggr),
 		EIP1559Enabled: eip1559Enabled,
 		l1Oracle:       l1Oracle,
 	}
 }
 
 func (e *WrappedEvmEstimator) Name() string {
-	return fmt.Sprintf("WrappedEvmEstimator(%s)", e.EvmEstimator.Name())
+	return e.lggr.Name()
 }
 
 func (e *WrappedEvmEstimator) Start(ctx context.Context) error {
diff --git a/core/chains/evm/gas/models_test.go b/core/chains/evm/gas/models_test.go
index a2dce58ee3f..95a7a471eba 100644
--- a/core/chains/evm/gas/models_test.go
+++ b/core/chains/evm/gas/models_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas/mocks"
@@ -27,39 +28,41 @@ func TestWrappedEvmEstimator(t *testing.T) {
 		FeeCap: assets.NewWeiI(20),
 		TipCap: assets.NewWeiI(1),
 	}
-
-	e := mocks.NewEvmEstimator(t)
-	e.On("GetDynamicFee", mock.Anything, mock.Anything, mock.Anything).
+	est := mocks.NewEvmEstimator(t)
+	est.On("GetDynamicFee", mock.Anything, mock.Anything, mock.Anything).
 		Return(dynamicFee, gasLimit, nil).Twice()
-	e.On("GetLegacyGas", mock.Anything, mock.Anything, mock.Anything, mock.Anything).
+	est.On("GetLegacyGas", mock.Anything, mock.Anything, mock.Anything, mock.Anything).
 		Return(legacyFee, gasLimit, nil).Twice()
-	e.On("BumpDynamicFee", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).
+	est.On("BumpDynamicFee", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).
 		Return(dynamicFee, gasLimit, nil).Once()
-	e.On("BumpLegacyGas", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).
+	est.On("BumpLegacyGas", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).
 		Return(legacyFee, gasLimit, nil).Once()
+	getRootEst := func(logger.Logger) gas.EvmEstimator { return est }
 
-	mockEvmEstimatorName := "MockEstimator"
-	mockEstimatorName := "WrappedEvmEstimator(MockEstimator)"
+	mockEstimatorName := "WrappedEvmEstimator"
+	mockEvmEstimatorName := "WrappedEvmEstimator.MockEstimator"
 
 	// L1Oracle returns the correct L1Oracle interface
 	t.Run("L1Oracle", func(t *testing.T) {
+		lggr := logger.Test(t)
 		// expect nil
-		estimator := gas.NewWrappedEvmEstimator(e, false, nil)
+		estimator := gas.NewWrappedEvmEstimator(lggr, getRootEst, false, nil)
 		l1Oracle := estimator.L1Oracle()
 		assert.Nil(t, l1Oracle)
 
 		// expect l1Oracle
 		oracle := rollupMocks.NewL1Oracle(t)
-		estimator = gas.NewWrappedEvmEstimator(e, false, oracle)
+		estimator = gas.NewWrappedEvmEstimator(lggr, getRootEst, false, oracle)
 		l1Oracle = estimator.L1Oracle()
 		assert.Equal(t, oracle, l1Oracle)
 	})
 
 	// GetFee returns gas estimation based on configuration value
 	t.Run("GetFee", func(t *testing.T) {
+		lggr := logger.Test(t)
 		// expect legacy fee data
 		dynamicFees := false
-		estimator := gas.NewWrappedEvmEstimator(e, dynamicFees, nil)
+		estimator := gas.NewWrappedEvmEstimator(lggr, getRootEst, dynamicFees, nil)
 		fee, max, err := estimator.GetFee(ctx, nil, 0, nil)
 		require.NoError(t, err)
 		assert.Equal(t, gasLimit, max)
@@ -69,7 +72,7 @@ func TestWrappedEvmEstimator(t *testing.T) {
 
 		// expect dynamic fee data
 		dynamicFees = true
-		estimator = gas.NewWrappedEvmEstimator(e, dynamicFees, nil)
+		estimator = gas.NewWrappedEvmEstimator(lggr, getRootEst, dynamicFees, nil)
 		fee, max, err = estimator.GetFee(ctx, nil, 0, nil)
 		require.NoError(t, err)
 		assert.Equal(t, gasLimit, max)
@@ -80,8 +83,9 @@ func TestWrappedEvmEstimator(t *testing.T) {
 
 	// BumpFee returns bumped fee type based on original fee calculation
 	t.Run("BumpFee", func(t *testing.T) {
+		lggr := logger.Test(t)
 		dynamicFees := false
-		estimator := gas.NewWrappedEvmEstimator(e, dynamicFees, nil)
+		estimator := gas.NewWrappedEvmEstimator(lggr, getRootEst, dynamicFees, nil)
 
 		// expect legacy fee data
 		fee, max, err := estimator.BumpFee(ctx, gas.EvmFee{Legacy: assets.NewWeiI(0)}, 0, nil, nil)
@@ -114,11 +118,12 @@ func TestWrappedEvmEstimator(t *testing.T) {
 	})
 
 	t.Run("GetMaxCost", func(t *testing.T) {
+		lggr := logger.Test(t)
 		val := assets.NewEthValue(1)
 
 		// expect legacy fee data
 		dynamicFees := false
-		estimator := gas.NewWrappedEvmEstimator(e, dynamicFees, nil)
+		estimator := gas.NewWrappedEvmEstimator(lggr, getRootEst, dynamicFees, nil)
 		total, err := estimator.GetMaxCost(ctx, val, nil, gasLimit, nil)
 		require.NoError(t, err)
 		fee := new(big.Int).Mul(legacyFee.ToInt(), big.NewInt(int64(gasLimit)))
@@ -126,7 +131,7 @@ func TestWrappedEvmEstimator(t *testing.T) {
 
 		// expect dynamic fee data
 		dynamicFees = true
-		estimator = gas.NewWrappedEvmEstimator(e, dynamicFees, nil)
+		estimator = gas.NewWrappedEvmEstimator(lggr, getRootEst, dynamicFees, nil)
 		total, err = estimator.GetMaxCost(ctx, val, nil, gasLimit, nil)
 		require.NoError(t, err)
 		fee = new(big.Int).Mul(dynamicFee.FeeCap.ToInt(), big.NewInt(int64(gasLimit)))
@@ -134,33 +139,38 @@ func TestWrappedEvmEstimator(t *testing.T) {
 	})
 
 	t.Run("Name", func(t *testing.T) {
-		evmEstimator := mocks.NewEvmEstimator(t)
-		oracle := rollupMocks.NewL1Oracle(t)
+		lggr := logger.Test(t)
 
+		oracle := rollupMocks.NewL1Oracle(t)
+		evmEstimator := mocks.NewEvmEstimator(t)
 		evmEstimator.On("Name").Return(mockEvmEstimatorName, nil).Once()
 
-		estimator := gas.NewWrappedEvmEstimator(evmEstimator, false, oracle)
-		name := estimator.Name()
-		require.Equal(t, mockEstimatorName, name)
+		estimator := gas.NewWrappedEvmEstimator(lggr, func(logger.Logger) gas.EvmEstimator {
+			return evmEstimator
+		}, false, oracle)
+
+		require.Equal(t, mockEstimatorName, estimator.Name())
+		require.Equal(t, mockEvmEstimatorName, evmEstimator.Name())
 	})
 
 	t.Run("Start and stop calls both EVM estimator and L1Oracle", func(t *testing.T) {
-		evmEstimator := mocks.NewEvmEstimator(t)
+		lggr := logger.Test(t)
 		oracle := rollupMocks.NewL1Oracle(t)
+		evmEstimator := mocks.NewEvmEstimator(t)
 
-		evmEstimator.On("Name").Return(mockEvmEstimatorName, nil).Times(4)
 		evmEstimator.On("Start", mock.Anything).Return(nil).Twice()
 		evmEstimator.On("Close").Return(nil).Twice()
 		oracle.On("Start", mock.Anything).Return(nil).Once()
 		oracle.On("Close").Return(nil).Once()
+		getEst := func(logger.Logger) gas.EvmEstimator { return evmEstimator }
 
-		estimator := gas.NewWrappedEvmEstimator(evmEstimator, false, nil)
+		estimator := gas.NewWrappedEvmEstimator(lggr, getEst, false, nil)
 		err := estimator.Start(ctx)
 		require.NoError(t, err)
 		err = estimator.Close()
 		require.NoError(t, err)
 
-		estimator = gas.NewWrappedEvmEstimator(evmEstimator, false, oracle)
+		estimator = gas.NewWrappedEvmEstimator(lggr, getEst, false, oracle)
 		err = estimator.Start(ctx)
 		require.NoError(t, err)
 		err = estimator.Close()
@@ -168,22 +178,25 @@ func TestWrappedEvmEstimator(t *testing.T) {
 	})
 
 	t.Run("Read calls both EVM estimator and L1Oracle", func(t *testing.T) {
+		lggr := logger.Test(t)
 		evmEstimator := mocks.NewEvmEstimator(t)
 		oracle := rollupMocks.NewL1Oracle(t)
 
 		evmEstimator.On("Ready").Return(nil).Twice()
 		oracle.On("Ready").Return(nil).Once()
+		getEst := func(logger.Logger) gas.EvmEstimator { return evmEstimator }
 
-		estimator := gas.NewWrappedEvmEstimator(evmEstimator, false, nil)
+		estimator := gas.NewWrappedEvmEstimator(lggr, getEst, false, nil)
 		err := estimator.Ready()
 		require.NoError(t, err)
 
-		estimator = gas.NewWrappedEvmEstimator(evmEstimator, false, oracle)
+		estimator = gas.NewWrappedEvmEstimator(lggr, getEst, false, oracle)
 		err = estimator.Ready()
 		require.NoError(t, err)
 	})
 
 	t.Run("HealthReport merges report from EVM estimator and L1Oracle", func(t *testing.T) {
+		lggr := logger.Test(t)
 		evmEstimator := mocks.NewEvmEstimator(t)
 		oracle := rollupMocks.NewL1Oracle(t)
 
@@ -192,17 +205,17 @@ func TestWrappedEvmEstimator(t *testing.T) {
 		oracleKey := "oracle"
 		oracleError := errors.New("oracle error")
 
-		evmEstimator.On("Name").Return(mockEvmEstimatorName, nil).Twice()
 		evmEstimator.On("HealthReport").Return(map[string]error{evmEstimatorKey: evmEstimatorError}).Twice()
 		oracle.On("HealthReport").Return(map[string]error{oracleKey: oracleError}).Once()
+		getEst := func(logger.Logger) gas.EvmEstimator { return evmEstimator }
 
-		estimator := gas.NewWrappedEvmEstimator(evmEstimator, false, nil)
+		estimator := gas.NewWrappedEvmEstimator(lggr, getEst, false, nil)
 		report := estimator.HealthReport()
 		require.True(t, errors.Is(report[evmEstimatorKey], evmEstimatorError))
 		require.Nil(t, report[oracleKey])
 		require.NotNil(t, report[mockEstimatorName])
 
-		estimator = gas.NewWrappedEvmEstimator(evmEstimator, false, oracle)
+		estimator = gas.NewWrappedEvmEstimator(lggr, getEst, false, oracle)
 		report = estimator.HealthReport()
 		require.True(t, errors.Is(report[evmEstimatorKey], evmEstimatorError))
 		require.True(t, errors.Is(report[oracleKey], oracleError))
diff --git a/core/chains/evm/txmgr/broadcaster_test.go b/core/chains/evm/txmgr/broadcaster_test.go
index b9e8fe99e31..f676d3d18e2 100644
--- a/core/chains/evm/txmgr/broadcaster_test.go
+++ b/core/chains/evm/txmgr/broadcaster_test.go
@@ -64,7 +64,9 @@ func NewTestEthBroadcaster(
 
 	lggr := logger.Test(t)
 	ge := config.EVM().GasEstimator()
-	estimator := gas.NewWrappedEvmEstimator(gas.NewFixedPriceEstimator(config.EVM().GasEstimator(), ge.BlockHistory(), lggr), ge.EIP1559DynamicFees(), nil)
+	estimator := gas.NewWrappedEvmEstimator(lggr, func(lggr logger.Logger) gas.EvmEstimator {
+		return gas.NewFixedPriceEstimator(config.EVM().GasEstimator(), ge.BlockHistory(), lggr)
+	}, ge.EIP1559DynamicFees(), nil)
 	txBuilder := txmgr.NewEvmTxAttemptBuilder(*ethClient.ConfiguredChainID(), ge, keyStore, estimator)
 	txNonceSyncer := txmgr.NewNonceSyncer(txStore, lggr, ethClient)
 	ethBroadcaster := txmgr.NewEvmBroadcaster(txStore, txmgr.NewEvmTxmClient(ethClient), txmgr.NewEvmTxmConfig(config.EVM()), txmgr.NewEvmTxmFeeConfig(config.EVM().GasEstimator()), config.EVM().Transactions(), config.Database().Listener(), keyStore, txBuilder, txNonceSyncer, lggr, checkerFactory, nonceAutoSync)
@@ -1134,7 +1136,9 @@ func TestEthBroadcaster_ProcessUnstartedEthTxs_Errors(t *testing.T) {
 				// same as the parent test, but callback is set by ctor
 				t.Run("callback set by ctor", func(t *testing.T) {
 					lggr := logger.Test(t)
-					estimator := gas.NewWrappedEvmEstimator(gas.NewFixedPriceEstimator(evmcfg.EVM().GasEstimator(), evmcfg.EVM().GasEstimator().BlockHistory(), lggr), evmcfg.EVM().GasEstimator().EIP1559DynamicFees(), nil)
+					estimator := gas.NewWrappedEvmEstimator(lggr, func(lggr logger.Logger) gas.EvmEstimator {
+						return gas.NewFixedPriceEstimator(evmcfg.EVM().GasEstimator(), evmcfg.EVM().GasEstimator().BlockHistory(), lggr)
+					}, evmcfg.EVM().GasEstimator().EIP1559DynamicFees(), nil)
 					txBuilder := txmgr.NewEvmTxAttemptBuilder(*ethClient.ConfiguredChainID(), evmcfg.EVM().GasEstimator(), ethKeyStore, estimator)
 					localNextNonce = getLocalNextNonce(t, eb, fromAddress)
 					ethClient.On("PendingNonceAt", mock.Anything, fromAddress).Return(uint64(localNextNonce), nil).Once()
@@ -1759,7 +1763,9 @@ func TestEthBroadcaster_SyncNonce(t *testing.T) {
 
 	ethNodeNonce := uint64(22)
 
-	estimator := gas.NewWrappedEvmEstimator(gas.NewFixedPriceEstimator(evmcfg.EVM().GasEstimator(), evmcfg.EVM().GasEstimator().BlockHistory(), lggr), evmcfg.EVM().GasEstimator().EIP1559DynamicFees(), nil)
+	estimator := gas.NewWrappedEvmEstimator(lggr, func(lggr logger.Logger) gas.EvmEstimator {
+		return gas.NewFixedPriceEstimator(evmcfg.EVM().GasEstimator(), evmcfg.EVM().GasEstimator().BlockHistory(), lggr)
+	}, evmcfg.EVM().GasEstimator().EIP1559DynamicFees(), nil)
 	checkerFactory := &testCheckerFactory{}
 
 	ge := evmcfg.EVM().GasEstimator()
diff --git a/core/chains/evm/txmgr/confirmer_test.go b/core/chains/evm/txmgr/confirmer_test.go
index 3acbfe9800c..30b2a391a7f 100644
--- a/core/chains/evm/txmgr/confirmer_test.go
+++ b/core/chains/evm/txmgr/confirmer_test.go
@@ -122,9 +122,10 @@ func TestEthConfirmer_Lifecycle(t *testing.T) {
 	cltest.MustInsertRandomKey(t, ethKeyStore)
 	cltest.MustInsertRandomKey(t, ethKeyStore)
 	estimator := gasmocks.NewEvmEstimator(t)
+	newEst := func(logger.Logger) gas.EvmEstimator { return estimator }
 	lggr := logger.Test(t)
 	ge := config.EVM().GasEstimator()
-	feeEstimator := gas.NewWrappedEvmEstimator(estimator, ge.EIP1559DynamicFees(), nil)
+	feeEstimator := gas.NewWrappedEvmEstimator(lggr, newEst, ge.EIP1559DynamicFees(), nil)
 	txBuilder := txmgr.NewEvmTxAttemptBuilder(*ethClient.ConfiguredChainID(), ge, ethKeyStore, feeEstimator)
 	ec := txmgr.NewEvmConfirmer(txStore, txmgr.NewEvmTxmClient(ethClient), txmgr.NewEvmTxmConfig(config.EVM()), txmgr.NewEvmTxmFeeConfig(ge), config.EVM().Transactions(), config.Database(), ethKeyStore, txBuilder, lggr)
 	ctx := testutils.Context(t)
@@ -1639,9 +1640,10 @@ func TestEthConfirmer_RebroadcastWhereNecessary_WithConnectivityCheck(t *testing
 		kst := ksmocks.NewEth(t)
 
 		estimator := gasmocks.NewEvmEstimator(t)
+		newEst := func(logger.Logger) gas.EvmEstimator { return estimator }
 		estimator.On("BumpLegacyGas", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, uint32(0), pkgerrors.Wrapf(commonfee.ErrConnectivity, "transaction..."))
 		ge := ccfg.EVM().GasEstimator()
-		feeEstimator := gas.NewWrappedEvmEstimator(estimator, ge.EIP1559DynamicFees(), nil)
+		feeEstimator := gas.NewWrappedEvmEstimator(lggr, newEst, ge.EIP1559DynamicFees(), nil)
 		txBuilder := txmgr.NewEvmTxAttemptBuilder(*ethClient.ConfiguredChainID(), ge, kst, feeEstimator)
 		addresses := []gethCommon.Address{fromAddress}
 		kst.On("EnabledAddressesForChain", &cltest.FixtureChainID).Return(addresses, nil).Maybe()
@@ -1685,9 +1687,10 @@ func TestEthConfirmer_RebroadcastWhereNecessary_WithConnectivityCheck(t *testing
 
 		estimator := gasmocks.NewEvmEstimator(t)
 		estimator.On("BumpDynamicFee", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(gas.DynamicFee{}, uint32(0), pkgerrors.Wrapf(commonfee.ErrConnectivity, "transaction..."))
+		newEst := func(logger.Logger) gas.EvmEstimator { return estimator }
 		// Create confirmer with necessary state
 		ge := ccfg.EVM().GasEstimator()
-		feeEstimator := gas.NewWrappedEvmEstimator(estimator, ge.EIP1559DynamicFees(), nil)
+		feeEstimator := gas.NewWrappedEvmEstimator(lggr, newEst, ge.EIP1559DynamicFees(), nil)
 		txBuilder := txmgr.NewEvmTxAttemptBuilder(*ethClient.ConfiguredChainID(), ge, kst, feeEstimator)
 		addresses := []gethCommon.Address{fromAddress}
 		kst.On("EnabledAddressesForChain", &cltest.FixtureChainID).Return(addresses, nil).Maybe()
@@ -3079,7 +3082,9 @@ func ptr[T any](t T) *T { return &t }
 func newEthConfirmer(t testing.TB, txStore txmgr.EvmTxStore, ethClient client.Client, config evmconfig.ChainScopedConfig, ks keystore.Eth, fn txmgrcommon.ResumeCallback) *txmgr.Confirmer {
 	lggr := logger.Test(t)
 	ge := config.EVM().GasEstimator()
-	estimator := gas.NewWrappedEvmEstimator(gas.NewFixedPriceEstimator(ge, ge.BlockHistory(), lggr), ge.EIP1559DynamicFees(), nil)
+	estimator := gas.NewWrappedEvmEstimator(lggr, func(lggr logger.Logger) gas.EvmEstimator {
+		return gas.NewFixedPriceEstimator(ge, ge.BlockHistory(), lggr)
+	}, ge.EIP1559DynamicFees(), nil)
 	txBuilder := txmgr.NewEvmTxAttemptBuilder(*ethClient.ConfiguredChainID(), ge, ks, estimator)
 	ec := txmgr.NewEvmConfirmer(txStore, txmgr.NewEvmTxmClient(ethClient), txmgr.NewEvmTxmConfig(config.EVM()), txmgr.NewEvmTxmFeeConfig(ge), config.EVM().Transactions(), config.Database(), ks, txBuilder, lggr)
 	ec.SetResumeCallback(fn)
diff --git a/core/services/chainlink/relayer_factory.go b/core/services/chainlink/relayer_factory.go
index 4ed73d8e53b..b4bd530d080 100644
--- a/core/services/chainlink/relayer_factory.go
+++ b/core/services/chainlink/relayer_factory.go
@@ -45,9 +45,11 @@ func (r *RelayerFactory) NewEVM(ctx context.Context, config EVMFactoryConfig) (m
 
 	relayers := make(map[relay.ID]evmrelay.LoopRelayAdapter)
 
+	lggr := r.Logger.Named("EVM")
+
 	// override some common opts with the factory values. this seems weird... maybe other signatures should change, or this should take a different type...
 	ccOpts := legacyevm.ChainRelayExtenderConfig{
-		Logger:    r.Logger.Named("EVM"),
+		Logger:    lggr,
 		KeyStore:  config.CSAETHKeystore.Eth(),
 		ChainOpts: config.ChainOpts,
 	}
@@ -71,7 +73,7 @@ func (r *RelayerFactory) NewEVM(ctx context.Context, config EVMFactoryConfig) (m
 			EventBroadcaster: ccOpts.EventBroadcaster,
 			MercuryPool:      r.MercuryPool,
 		}
-		relayer, err2 := evmrelay.NewRelayer(r.Logger.Named("EVM").Named(relayID.ChainID), chain, relayerOpts)
+		relayer, err2 := evmrelay.NewRelayer(lggr.Named(relayID.ChainID), chain, relayerOpts)
 		if err2 != nil {
 			err = errors.Join(err, err2)
 			continue
diff --git a/core/services/relay/evm/evm.go b/core/services/relay/evm/evm.go
index 83540e22bb7..303cdd3ba0e 100644
--- a/core/services/relay/evm/evm.go
+++ b/core/services/relay/evm/evm.go
@@ -13,6 +13,7 @@ import (
 	"github.com/jmoiron/sqlx"
 	pkgerrors "github.com/pkg/errors"
 	"go.uber.org/multierr"
+	"golang.org/x/exp/maps"
 
 	"github.com/smartcontractkit/libocr/gethwrappers2/ocr2aggregator"
 	"github.com/smartcontractkit/libocr/offchainreporting2/reportingplugin/median"
@@ -121,11 +122,12 @@ func (r *Relayer) Close() error {
 
 // Ready does noop: always ready
 func (r *Relayer) Ready() error {
-	return nil
+	return r.chain.Ready()
 }
 
 func (r *Relayer) HealthReport() (report map[string]error) {
 	report = make(map[string]error)
+	maps.Copy(report, r.chain.HealthReport())
 	return
 }
 
diff --git a/core/web/health_controller.go b/core/web/health_controller.go
index d6a7edb2340..d6490e5542a 100644
--- a/core/web/health_controller.go
+++ b/core/web/health_controller.go
@@ -1,7 +1,10 @@
 package web
 
 import (
+	"cmp"
 	"net/http"
+	"slices"
+	"testing"
 
 	"github.com/gin-gonic/gin"
 
@@ -94,6 +97,12 @@ func (hc *HealthController) Health(c *gin.Context) {
 		})
 	}
 
+	if testing.Testing() {
+		slices.SortFunc(checks, func(a, b presenters.Check) int {
+			return cmp.Compare(a.Name, b.Name)
+		})
+	}
+
 	// return a json description of all the checks
-	jsonAPIResponse(c, checks, "checks")
+	jsonAPIResponseWithStatus(c, checks, "checks", status)
 }
diff --git a/core/web/health_controller_test.go b/core/web/health_controller_test.go
index d380b279d00..7e7c42141ca 100644
--- a/core/web/health_controller_test.go
+++ b/core/web/health_controller_test.go
@@ -1,15 +1,19 @@
 package web_test
 
 import (
+	"bytes"
+	_ "embed"
+	"encoding/json"
+	"io"
 	"net/http"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/services/mocks"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 func TestHealthController_Readyz(t *testing.T) {
@@ -47,3 +51,63 @@ func TestHealthController_Readyz(t *testing.T) {
 		})
 	}
 }
+
+func TestHealthController_Health_status(t *testing.T) {
+	var tt = []struct {
+		name   string
+		ready  bool
+		status int
+	}{
+		{
+			name:   "not ready",
+			ready:  false,
+			status: http.StatusServiceUnavailable,
+		},
+		{
+			name:   "ready",
+			ready:  true,
+			status: http.StatusOK,
+		},
+	}
+	for _, tc := range tt {
+		t.Run(tc.name, func(t *testing.T) {
+			app := cltest.NewApplicationWithKey(t)
+			healthChecker := new(mocks.Checker)
+			healthChecker.On("Start").Return(nil).Once()
+			healthChecker.On("IsHealthy").Return(tc.ready, nil).Once()
+			healthChecker.On("Close").Return(nil).Once()
+
+			app.HealthChecker = healthChecker
+			require.NoError(t, app.Start(testutils.Context(t)))
+
+			client := app.NewHTTPClient(nil)
+			resp, cleanup := client.Get("/health")
+			t.Cleanup(cleanup)
+			assert.Equal(t, tc.status, resp.StatusCode)
+		})
+	}
+}
+
+var (
+	//go:embed testdata/body/health.json
+	healthJSON string
+)
+
+func TestHealthController_Health_body(t *testing.T) {
+	app := cltest.NewApplicationWithKey(t)
+	require.NoError(t, app.Start(testutils.Context(t)))
+
+	client := app.NewHTTPClient(nil)
+	resp, cleanup := client.Get("/health")
+	t.Cleanup(cleanup)
+	assert.Equal(t, http.StatusServiceUnavailable, resp.StatusCode)
+	body, err := io.ReadAll(resp.Body)
+	require.NoError(t, err)
+
+	// pretty print for comparison
+	var b bytes.Buffer
+	require.NoError(t, json.Indent(&b, body, "", "  "))
+	body = b.Bytes()
+
+	assert.Equal(t, healthJSON, string(body))
+}
diff --git a/core/web/testdata/body/health.json b/core/web/testdata/body/health.json
new file mode 100644
index 00000000000..d8418560543
--- /dev/null
+++ b/core/web/testdata/body/health.json
@@ -0,0 +1,166 @@
+{
+  "data": [
+    {
+      "type": "checks",
+      "id": "EVM.0",
+      "attributes": {
+        "name": "EVM.0",
+        "status": "passing",
+        "output": ""
+      }
+    },
+    {
+      "type": "checks",
+      "id": "EVM.0.BalanceMonitor",
+      "attributes": {
+        "name": "EVM.0.BalanceMonitor",
+        "status": "passing",
+        "output": ""
+      }
+    },
+    {
+      "type": "checks",
+      "id": "EVM.0.HeadBroadcaster",
+      "attributes": {
+        "name": "EVM.0.HeadBroadcaster",
+        "status": "passing",
+        "output": ""
+      }
+    },
+    {
+      "type": "checks",
+      "id": "EVM.0.HeadTracker",
+      "attributes": {
+        "name": "EVM.0.HeadTracker",
+        "status": "passing",
+        "output": ""
+      }
+    },
+    {
+      "type": "checks",
+      "id": "EVM.0.HeadTracker.HeadListener",
+      "attributes": {
+        "name": "EVM.0.HeadTracker.HeadListener",
+        "status": "failing",
+        "output": "Listener is not connected"
+      }
+    },
+    {
+      "type": "checks",
+      "id": "EVM.0.LogBroadcaster",
+      "attributes": {
+        "name": "EVM.0.LogBroadcaster",
+        "status": "passing",
+        "output": ""
+      }
+    },
+    {
+      "type": "checks",
+      "id": "EVM.0.Txm",
+      "attributes": {
+        "name": "EVM.0.Txm",
+        "status": "passing",
+        "output": ""
+      }
+    },
+    {
+      "type": "checks",
+      "id": "EVM.0.Txm.BlockHistoryEstimator",
+      "attributes": {
+        "name": "EVM.0.Txm.BlockHistoryEstimator",
+        "status": "passing",
+        "output": ""
+      }
+    },
+    {
+      "type": "checks",
+      "id": "EVM.0.Txm.Broadcaster",
+      "attributes": {
+        "name": "EVM.0.Txm.Broadcaster",
+        "status": "passing",
+        "output": ""
+      }
+    },
+    {
+      "type": "checks",
+      "id": "EVM.0.Txm.Confirmer",
+      "attributes": {
+        "name": "EVM.0.Txm.Confirmer",
+        "status": "passing",
+        "output": ""
+      }
+    },
+    {
+      "type": "checks",
+      "id": "EVM.0.Txm.WrappedEvmEstimator",
+      "attributes": {
+        "name": "EVM.0.Txm.WrappedEvmEstimator",
+        "status": "passing",
+        "output": ""
+      }
+    },
+    {
+      "type": "checks",
+      "id": "JobSpawner",
+      "attributes": {
+        "name": "JobSpawner",
+        "status": "passing",
+        "output": ""
+      }
+    },
+    {
+      "type": "checks",
+      "id": "Mercury.WSRPCPool",
+      "attributes": {
+        "name": "Mercury.WSRPCPool",
+        "status": "passing",
+        "output": ""
+      }
+    },
+    {
+      "type": "checks",
+      "id": "Monitor",
+      "attributes": {
+        "name": "Monitor",
+        "status": "passing",
+        "output": ""
+      }
+    },
+    {
+      "type": "checks",
+      "id": "PipelineORM",
+      "attributes": {
+        "name": "PipelineORM",
+        "status": "passing",
+        "output": ""
+      }
+    },
+    {
+      "type": "checks",
+      "id": "PipelineRunner",
+      "attributes": {
+        "name": "PipelineRunner",
+        "status": "passing",
+        "output": ""
+      }
+    },
+    {
+      "type": "checks",
+      "id": "PromReporter",
+      "attributes": {
+        "name": "PromReporter",
+        "status": "passing",
+        "output": ""
+      }
+    },
+    {
+      "type": "checks",
+      "id": "TelemetryManager",
+      "attributes": {
+        "name": "TelemetryManager",
+        "status": "passing",
+        "output": ""
+      }
+    }
+  ]
+}
\ No newline at end of file

From be1e4362598b4dabcf0b4f793722730c56c2f81a Mon Sep 17 00:00:00 2001
From: Gabriel Paradiso <gabriel.paradiso@smartcontract.com>
Date: Wed, 13 Dec 2023 15:49:01 +0100
Subject: [PATCH 120/130] [FUN-990] s4 observability improvements (#11512)

* chore: count s4 number of updates performed by nodes

* chore: add storage total use and slots occupied

* chore: add plugin side of counting updates

* fix: modify total size counter to use snapshot len

* chore: take into account the payload size for total size

* chore: fix lint errors

* fix: fetch only payload_size, reword metrics help

* chore: remove don_id label

* chore: remove don_id for consistency
---
 core/services/functions/connector_handler.go | 10 ++++++++
 core/services/ocr2/plugins/s4/plugin.go      | 27 +++++++++++++++++---
 core/services/s4/orm.go                      | 11 ++++----
 core/services/s4/postgres_orm.go             |  2 +-
 core/services/s4/postgres_orm_test.go        |  1 +
 5 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/core/services/functions/connector_handler.go b/core/services/functions/connector_handler.go
index 5496bbdefc1..1594dc6eb56 100644
--- a/core/services/functions/connector_handler.go
+++ b/core/services/functions/connector_handler.go
@@ -13,6 +13,8 @@ import (
 
 	ethCommon "github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/assets"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
@@ -57,6 +59,13 @@ var (
 	_ connector.GatewayConnectorHandler = &functionsConnectorHandler{}
 )
 
+var (
+	promStorageUserUpdatesCount = promauto.NewCounterVec(prometheus.CounterOpts{
+		Name: "storage_user_updates",
+		Help: "Number of storage updates performed by users",
+	}, []string{})
+)
+
 // internal request ID is a hash of (sender, requestID)
 func InternalId(sender []byte, requestId []byte) RequestID {
 	return RequestID(crypto.Keccak256Hash(append(sender, requestId...)).Bytes())
@@ -185,6 +194,7 @@ func (h *functionsConnectorHandler) handleSecretsSet(ctx context.Context, gatewa
 		err = h.storage.Put(ctx, &key, &record, request.Signature)
 		if err == nil {
 			response.Success = true
+			promStorageUserUpdatesCount.WithLabelValues().Inc()
 		} else {
 			response.ErrorMessage = fmt.Sprintf("Failed to set secret: %v", err)
 		}
diff --git a/core/services/ocr2/plugins/s4/plugin.go b/core/services/ocr2/plugins/s4/plugin.go
index fcb025b21cd..677743c091d 100644
--- a/core/services/ocr2/plugins/s4/plugin.go
+++ b/core/services/ocr2/plugins/s4/plugin.go
@@ -4,13 +4,28 @@ import (
 	"context"
 	"time"
 
+	"github.com/pkg/errors"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
+
+	"github.com/smartcontractkit/libocr/commontypes"
+	"github.com/smartcontractkit/libocr/offchainreporting2plus/types"
+
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 	"github.com/smartcontractkit/chainlink/v2/core/services/s4"
+)
 
-	"github.com/pkg/errors"
-	"github.com/smartcontractkit/libocr/commontypes"
-	"github.com/smartcontractkit/libocr/offchainreporting2plus/types"
+var (
+	promStoragePluginUpdatesCount = promauto.NewCounterVec(prometheus.CounterOpts{
+		Name: "storage_plugin_updates",
+		Help: "Number of storage updates fetched from other nodes",
+	}, []string{})
+
+	promStorageTotalByteSize = promauto.NewGaugeVec(prometheus.GaugeOpts{
+		Name: "storage_total_byte_size",
+		Help: "Current byte size of data stored in S4",
+	}, []string{})
 )
 
 type plugin struct {
@@ -59,6 +74,7 @@ func (c *plugin) Query(ctx context.Context, ts types.ReportTimestamp) (types.Que
 		return nil, errors.Wrap(err, "failed to GetVersions in Query()")
 	}
 
+	var storageTotalByteSize uint64
 	rows := make([]*SnapshotRow, len(snapshot))
 	for i, v := range snapshot {
 		rows[i] = &SnapshotRow{
@@ -66,6 +82,8 @@ func (c *plugin) Query(ctx context.Context, ts types.ReportTimestamp) (types.Que
 			Slotid:  uint32(v.SlotId),
 			Version: v.Version,
 		}
+
+		storageTotalByteSize += v.PayloadSize
 	}
 
 	queryBytes, err := MarshalQuery(rows, c.addressRange)
@@ -76,6 +94,8 @@ func (c *plugin) Query(ctx context.Context, ts types.ReportTimestamp) (types.Que
 	promReportingPluginsQueryRowsCount.WithLabelValues(c.config.ProductName).Set(float64(len(rows)))
 	promReportingPluginsQueryByteSize.WithLabelValues(c.config.ProductName).Set(float64(len(queryBytes)))
 
+	promStorageTotalByteSize.WithLabelValues().Set(float64(storageTotalByteSize))
+
 	c.addressRange.Advance()
 
 	c.logger.Debug("S4StorageReporting Query", commontypes.LogFields{
@@ -268,6 +288,7 @@ func (c *plugin) ShouldAcceptFinalizedReport(ctx context.Context, ts types.Repor
 			c.logger.Error("Failed to Update a row in ShouldAcceptFinalizedReport()", commontypes.LogFields{"err": err})
 			continue
 		}
+		promStoragePluginUpdatesCount.WithLabelValues().Inc()
 	}
 
 	c.logger.Debug("S4StorageReporting ShouldAcceptFinalizedReport", commontypes.LogFields{
diff --git a/core/services/s4/orm.go b/core/services/s4/orm.go
index 59f3410e143..4d3cee9312a 100644
--- a/core/services/s4/orm.go
+++ b/core/services/s4/orm.go
@@ -20,11 +20,12 @@ type Row struct {
 
 // SnapshotRow(s) are returned by GetSnapshot function.
 type SnapshotRow struct {
-	Address    *big.Big
-	SlotId     uint
-	Version    uint64
-	Expiration int64
-	Confirmed  bool
+	Address     *big.Big
+	SlotId      uint
+	Version     uint64
+	Expiration  int64
+	Confirmed   bool
+	PayloadSize uint64
 }
 
 //go:generate mockery --quiet --name ORM --output ./mocks/ --case=underscore
diff --git a/core/services/s4/postgres_orm.go b/core/services/s4/postgres_orm.go
index dba98b64aa6..1f92f2e1281 100644
--- a/core/services/s4/postgres_orm.go
+++ b/core/services/s4/postgres_orm.go
@@ -90,7 +90,7 @@ func (o orm) GetSnapshot(addressRange *AddressRange, qopts ...pg.QOpt) ([]*Snaps
 	q := o.q.WithOpts(qopts...)
 	rows := make([]*SnapshotRow, 0)
 
-	stmt := fmt.Sprintf(`SELECT address, slot_id, version, expiration, confirmed FROM %s WHERE namespace = $1 AND address >= $2 AND address <= $3;`, o.tableName)
+	stmt := fmt.Sprintf(`SELECT address, slot_id, version, expiration, confirmed, octet_length(payload) AS payload_size FROM %s WHERE namespace = $1 AND address >= $2 AND address <= $3;`, o.tableName)
 	if err := q.Select(&rows, stmt, o.namespace, addressRange.MinAddress, addressRange.MaxAddress); err != nil {
 		if !errors.Is(err, sql.ErrNoRows) {
 			return nil, err
diff --git a/core/services/s4/postgres_orm_test.go b/core/services/s4/postgres_orm_test.go
index 4d07524b4ea..d26f082ce5b 100644
--- a/core/services/s4/postgres_orm_test.go
+++ b/core/services/s4/postgres_orm_test.go
@@ -181,6 +181,7 @@ func TestPostgresORM_GetSnapshot(t *testing.T) {
 				assert.Equal(t, snapshotRow.Version, sr.Version)
 				assert.Equal(t, snapshotRow.Expiration, sr.Expiration)
 				assert.Equal(t, snapshotRow.Confirmed, sr.Confirmed)
+				assert.Equal(t, snapshotRow.PayloadSize, uint64(len(sr.Payload)))
 			}
 		})
 

From 91870ca09ec9a9c0269c0e31daa741ea2775ff76 Mon Sep 17 00:00:00 2001
From: Adam Hamrick <adam.hamrick@smartcontract.com>
Date: Wed, 13 Dec 2023 10:04:45 -0500
Subject: [PATCH 121/130] [TT-367] [TT-745] Quick and Dirty OCRv2 Soak Test
 (#11487)

* Quick and Dirty OCRv2 Soak Test

* Enable version in on-demand action

* Remove inputs

* Default input

* Fix echos

* Debug

* Bash shell

* Increment another way

* No 2130 silly

* When did incrementing get hard?

* Cleanup debug

* Include in reporter

* Fix version input

* Instantiate map

* Fix OCR2 job names

* Change default intpus

* Bridge work

* Build pair IDs properly

* Cleanup paths

* Build more bridges

* Fix configuration

* Fix config build

* Fix import
---
 .github/workflows/on-demand-ocr-soak-test.yml |  45 ++-
 integration-tests/actions/ocr2_helpers.go     | 146 +++++++--
 .../actions/ocr2_helpers_local.go             |   9 +-
 integration-tests/actions/ocr_helpers.go      |   2 +-
 .../actions/ocr_helpers_local.go              |   2 +-
 integration-tests/client/chainlink.go         |   9 +-
 .../contracts/contract_deployer.go            |  20 ++
 integration-tests/load/README.md              |  17 +-
 integration-tests/load/ocr/README.md          |  15 +-
 integration-tests/load/ocr/ocr_test.go        |   5 +-
 integration-tests/load/ocr/vu.go              |   1 +
 integration-tests/scripts/entrypoint          |   4 +
 integration-tests/testreporters/ocr.go        |   7 +-
 integration-tests/testsetups/ocr.go           | 298 +++++++++++++-----
 14 files changed, 447 insertions(+), 133 deletions(-)

diff --git a/.github/workflows/on-demand-ocr-soak-test.yml b/.github/workflows/on-demand-ocr-soak-test.yml
index 567d9510de9..a4289dd0129 100644
--- a/.github/workflows/on-demand-ocr-soak-test.yml
+++ b/.github/workflows/on-demand-ocr-soak-test.yml
@@ -55,18 +55,16 @@ on:
         description: Container image version for the Chainlink nodes
         required: true
         default: "2.7.0"
-      testDuration:
-        description: Duration of the test (time string)
-        required: false
-        default: 15m
-      chainlinkNodeFunding:
-        description: How much to fund each Chainlink node (in ETH)
-        required: false
-        default: ".001"
-      timeBetweenRounds:
-        description: How long to wait before starting a new round
+      ocrVersion:
+        description: Version of OCR to Use
+        type: choice
+        options:
+          - 1
+          - 2
+      testInputs:
+        description: Duration;Funding;TimeBetweenRounds
         required: false
-        default: 1m
+        default: "10m;.1;1m"
 
 jobs:
   ocr_soak_test:
@@ -84,9 +82,7 @@ jobs:
       SELECTED_NETWORKS: ${{ inputs.network }}
       SLACK_API_KEY: ${{ secrets.QA_SLACK_API_KEY }}
       SLACK_CHANNEL: ${{ secrets.QA_SLACK_CHANNEL }}
-      OCR_TEST_DURATION: ${{ inputs.testDuration }}
-      OCR_CHAINLINK_NODE_FUNDING: ${{ inputs.chainlinkNodeFunding }}
-      OCR_TIME_BETWEEN_ROUNDS: ${{ inputs.timeBetweenRounds }}
+      OCR_VERSION: ${{ inputs.ocrVersion }}
       TEST_LOG_LEVEL: debug
       REF_NAME: ${{ github.head_ref || github.ref_name }}
       ENV_JOB_IMAGE_BASE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink-tests
@@ -101,6 +97,7 @@ jobs:
         continue-on-error: true
       - name: Get Inputs
         run: |
+          # Mask the sensitive inputs
           EVM_URLS=$(jq -r '.inputs.wsURL' $GITHUB_EVENT_PATH)
           EVM_HTTP_URLS=$(jq -r '.inputs.httpURL' $GITHUB_EVENT_PATH)
           EVM_KEYS=$(jq -r '.inputs.fundingPrivateKey' $GITHUB_EVENT_PATH)
@@ -115,6 +112,26 @@ jobs:
           echo EVM_HTTP_URLS=$EVM_HTTP_URLS >> $GITHUB_ENV
           echo EVM_KEYS=$EVM_KEYS >> $GITHUB_ENV
           echo SLACK_USER=$SLACK_USER >> $GITHUB_ENV
+
+          # Read in our test inputs
+          IFS=';' read -ra parts <<< "${{ inputs.testInputs }}"
+          index=0
+          for part in "${parts[@]}"; do
+              # A little hacky, but good enough for this
+              if [ $index -eq 0 ]; then
+                  echo "OCR_TEST_DURATION=$part"
+                  echo "OCR_TEST_DURATION=$part" >> $GITHUB_ENV
+              elif [ $index -eq 1 ]; then
+                  echo "OCR_CHAINLINK_NODE_FUNDING=$part"
+                  echo "OCR_CHAINLINK_NODE_FUNDING=$part" >> $GITHUB_ENV
+              elif [ $index -eq 2 ]; then
+                  echo "OCR_TIME_BETWEEN_ROUNDS=$part"
+                  echo "OCR_TIME_BETWEEN_ROUNDS=$part" >> $GITHUB_ENV
+              else
+                  echo "Additional Unregistered Input: $part"
+              fi
+              ((index+=1))
+          done
       - name: Checkout the repo
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
diff --git a/integration-tests/actions/ocr2_helpers.go b/integration-tests/actions/ocr2_helpers.go
index 02ce73e813e..c4bc30c7c5e 100644
--- a/integration-tests/actions/ocr2_helpers.go
+++ b/integration-tests/actions/ocr2_helpers.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/google/uuid"
 	"github.com/lib/pq"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
@@ -23,6 +24,7 @@ import (
 	ctfClient "github.com/smartcontractkit/chainlink-testing-framework/client"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/chaintype"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/testhelpers"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
 
 	"github.com/smartcontractkit/chainlink/integration-tests/client"
@@ -104,12 +106,15 @@ func ConfigureOCRv2AggregatorContracts(
 }
 
 // BuildMedianOCR2Config builds a default OCRv2 config for the given chainlink nodes for a standard median aggregation job
-func BuildMedianOCR2Config(workerNodes []*client.ChainlinkK8sClient) (*contracts.OCRv2Config, error) {
+func BuildMedianOCR2Config(
+	workerNodes []*client.ChainlinkK8sClient,
+	ocrOffchainOptions contracts.OffchainOptions,
+) (*contracts.OCRv2Config, error) {
 	S, oracleIdentities, err := GetOracleIdentities(workerNodes)
 	if err != nil {
 		return nil, err
 	}
-	signerKeys, transmitterAccounts, f_, onchainConfig, offchainConfigVersion, offchainConfig, err := confighelper.ContractSetConfigArgsForTests(
+	signerKeys, transmitterAccounts, f_, _, offchainConfigVersion, offchainConfig, err := confighelper.ContractSetConfigArgsForTests(
 		30*time.Second,   // deltaProgress time.Duration,
 		30*time.Second,   // deltaResend time.Duration,
 		10*time.Second,   // deltaRound time.Duration,
@@ -149,6 +154,8 @@ func BuildMedianOCR2Config(workerNodes []*client.ChainlinkK8sClient) (*contracts
 		transmitterAddresses = append(transmitterAddresses, common.HexToAddress(string(account)))
 	}
 
+	onchainConfig, err := testhelpers.GenerateDefaultOCR2OnchainConfig(ocrOffchainOptions.MinimumAnswer, ocrOffchainOptions.MaximumAnswer)
+
 	return &contracts.OCRv2Config{
 		Signers:               signerAddresses,
 		Transmitters:          transmitterAddresses,
@@ -156,7 +163,7 @@ func BuildMedianOCR2Config(workerNodes []*client.ChainlinkK8sClient) (*contracts
 		OnchainConfig:         onchainConfig,
 		OffchainConfigVersion: offchainConfigVersion,
 		OffchainConfig:        []byte(fmt.Sprintf("0x%s", offchainConfig)),
-	}, nil
+	}, err
 }
 
 // GetOracleIdentities retrieves all chainlink nodes' OCR2 config identities with defaul key index
@@ -257,7 +264,6 @@ func CreateOCRv2Jobs(
 	bootstrapNode *client.ChainlinkK8sClient,
 	workerChainlinkNodes []*client.ChainlinkK8sClient,
 	mockserver *ctfClient.MockserverClient,
-	mockServerPath string, // Path on the mock server for the Chainlink nodes to query
 	mockServerValue int, // Value to get from the mock server when querying the path
 	chainId uint64, // EVM chain ID
 	forwardingAllowed bool,
@@ -268,20 +274,28 @@ func CreateOCRv2Jobs(
 		return err
 	}
 	p2pV2Bootstrapper := fmt.Sprintf("%s@%s:%d", bootstrapP2PIds.Data[0].Attributes.PeerID, bootstrapNode.InternalIP(), 6690)
-	// Set the value for the jobs to report on
-	err = mockserver.SetValuePath(mockServerPath, mockServerValue)
-	if err != nil {
-		return err
-	}
+	mockJuelsPath := "ocr2/juelsPerFeeCoinSource"
 	// Set the juelsPerFeeCoinSource config value
-	err = mockserver.SetValuePath(fmt.Sprintf("%s/juelsPerFeeCoinSource", mockServerPath), mockServerValue)
+	err = mockserver.SetValuePath(mockJuelsPath, mockServerValue)
 	if err != nil {
 		return err
 	}
 
+	// Create the juels bridge for each node only once
+	juelsBridge := &client.BridgeTypeAttributes{
+		Name: "juels",
+		URL:  fmt.Sprintf("%s/%s", mockserver.Config.ClusterURL, mockJuelsPath),
+	}
+	for _, chainlinkNode := range workerChainlinkNodes {
+		err = chainlinkNode.MustCreateBridge(juelsBridge)
+		if err != nil {
+			return fmt.Errorf("failed creating bridge %s on CL node : %w", juelsBridge.Name, err)
+		}
+	}
+
 	for _, ocrInstance := range ocrInstances {
 		bootstrapSpec := &client.OCR2TaskJobSpec{
-			Name:    "ocr2 bootstrap node",
+			Name:    fmt.Sprintf("ocr2-bootstrap-%s", ocrInstance.Address()),
 			JobType: "bootstrap",
 			OCR2OracleSpec: job.OCR2OracleSpec{
 				ContractID: ocrInstance.Address(),
@@ -289,7 +303,7 @@ func CreateOCRv2Jobs(
 				RelayConfig: map[string]interface{}{
 					"chainID": chainId,
 				},
-				MonitoringEndpoint:                null.StringFrom(fmt.Sprintf("%s/%s", mockserver.Config.ClusterURL, mockServerPath)),
+				MonitoringEndpoint:                null.StringFrom(fmt.Sprintf("%s/%s", mockserver.Config.ClusterURL, "ocr2")),
 				ContractConfigTrackerPollInterval: *models.NewInterval(15 * time.Second),
 			},
 		}
@@ -309,25 +323,22 @@ func CreateOCRv2Jobs(
 			}
 			nodeOCRKeyId := nodeOCRKeys.Data[0].ID
 
-			bta := &client.BridgeTypeAttributes{
-				Name: mockServerPath,
-				URL:  fmt.Sprintf("%s/%s", mockserver.Config.ClusterURL, mockServerPath),
+			nodeContractPairID, err := BuildOCR2NodeContractPairID(chainlinkNode, ocrInstance)
+			if err != nil {
+				return err
 			}
-			juelsBridge := &client.BridgeTypeAttributes{
-				Name: "juels",
-				URL:  fmt.Sprintf("%s/%s/juelsPerFeeCoinSource", mockserver.Config.ClusterURL, mockServerPath),
+			bta := &client.BridgeTypeAttributes{
+				Name: nodeContractPairID,
+				URL:  fmt.Sprintf("%s/%s", mockserver.Config.ClusterURL, strings.TrimPrefix(nodeContractPairID, "/")),
 			}
+
 			err = chainlinkNode.MustCreateBridge(bta)
 			if err != nil {
-				return fmt.Errorf("creating bridge job have failed: %w", err)
-			}
-			err = chainlinkNode.MustCreateBridge(juelsBridge)
-			if err != nil {
-				return fmt.Errorf("creating bridge job have failed: %w", err)
+				return fmt.Errorf("failed creating bridge %s on CL node: %w", bta.Name, err)
 			}
 
 			ocrSpec := &client.OCR2TaskJobSpec{
-				Name:              "ocr2",
+				Name:              fmt.Sprintf("ocr2-%s", uuid.NewString()),
 				JobType:           "offchainreporting2",
 				MaxTaskDuration:   "1m",
 				ObservationSource: client.ObservationSourceSpecBridge(bta),
@@ -379,3 +390,90 @@ func StartNewOCR2Round(
 	}
 	return nil
 }
+
+// SetOCR2AdapterResponse sets a single adapter response that correlates with an ocr contract and a chainlink node
+// used for OCR2 tests
+func SetOCR2AdapterResponse(
+	response int,
+	ocrInstance contracts.OffchainAggregatorV2,
+	chainlinkNode *client.ChainlinkK8sClient,
+	mockserver *ctfClient.MockserverClient,
+) error {
+	nodeContractPairID, err := BuildOCR2NodeContractPairID(chainlinkNode, ocrInstance)
+	if err != nil {
+		return err
+	}
+	path := fmt.Sprintf("/%s", nodeContractPairID)
+	err = mockserver.SetValuePath(path, response)
+	if err != nil {
+		return fmt.Errorf("setting mockserver value path failed: %w", err)
+	}
+	return nil
+}
+
+// SetOCR2AllAdapterResponsesToTheSameValue sets the mock responses in mockserver that are read by chainlink nodes
+// to simulate different adapters. This sets all adapter responses for each node and contract to the same response
+// used for OCR2 tests
+func SetOCR2AllAdapterResponsesToTheSameValue(
+	response int,
+	ocrInstances []contracts.OffchainAggregatorV2,
+	chainlinkNodes []*client.ChainlinkK8sClient,
+	mockserver *ctfClient.MockserverClient,
+) error {
+	eg := &errgroup.Group{}
+	for _, o := range ocrInstances {
+		ocrInstance := o
+		for _, n := range chainlinkNodes {
+			node := n
+			eg.Go(func() error {
+				return SetOCR2AdapterResponse(response, ocrInstance, node, mockserver)
+			})
+		}
+	}
+	return eg.Wait()
+}
+
+// SetOCR2AllAdapterResponsesToDifferentValues sets the mock responses in mockserver that are read by chainlink nodes
+// to simulate different adapters. This sets all adapter responses for each node and contract to different responses
+// used for OCR2 tests
+func SetOCR2AllAdapterResponsesToDifferentValues(
+	responses []int,
+	ocrInstances []contracts.OffchainAggregatorV2,
+	chainlinkNodes []*client.ChainlinkK8sClient,
+	mockserver *ctfClient.MockserverClient,
+) error {
+	if len(responses) != len(ocrInstances)*len(chainlinkNodes) {
+		return fmt.Errorf(
+			"amount of responses %d should be equal to the amount of OCR instances %d times the amount of Chainlink nodes %d",
+			len(responses), len(ocrInstances), len(chainlinkNodes),
+		)
+	}
+	eg := &errgroup.Group{}
+	for _, o := range ocrInstances {
+		ocrInstance := o
+		for ni := 1; ni < len(chainlinkNodes); ni++ {
+			nodeIndex := ni
+			eg.Go(func() error {
+				return SetOCR2AdapterResponse(responses[nodeIndex-1], ocrInstance, chainlinkNodes[nodeIndex], mockserver)
+			})
+		}
+	}
+	return eg.Wait()
+}
+
+// BuildOCR2NodeContractPairID builds a UUID based on a related pair of a Chainlink node and OCRv2 contract
+func BuildOCR2NodeContractPairID(node *client.ChainlinkK8sClient, ocrInstance contracts.OffchainAggregatorV2) (string, error) {
+	if node == nil {
+		return "", fmt.Errorf("chainlink node is nil")
+	}
+	if ocrInstance == nil {
+		return "", fmt.Errorf("OCR Instance is nil")
+	}
+	nodeAddress, err := node.PrimaryEthAddress()
+	if err != nil {
+		return "", fmt.Errorf("getting chainlink node's primary ETH address failed: %w", err)
+	}
+	shortNodeAddr := nodeAddress[2:12]
+	shortOCRAddr := ocrInstance.Address()[2:12]
+	return strings.ToLower(fmt.Sprintf("node_%s_contract_%s", shortNodeAddr, shortOCRAddr)), nil
+}
diff --git a/integration-tests/actions/ocr2_helpers_local.go b/integration-tests/actions/ocr2_helpers_local.go
index e1b470bd0d4..4a08921b8d1 100644
--- a/integration-tests/actions/ocr2_helpers_local.go
+++ b/integration-tests/actions/ocr2_helpers_local.go
@@ -20,12 +20,13 @@ import (
 
 	"github.com/smartcontractkit/chainlink-testing-framework/docker/test_env"
 
-	"github.com/smartcontractkit/chainlink/integration-tests/client"
-	"github.com/smartcontractkit/chainlink/integration-tests/contracts"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/chaintype"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/testhelpers"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
+
+	"github.com/smartcontractkit/chainlink/integration-tests/client"
+	"github.com/smartcontractkit/chainlink/integration-tests/contracts"
 )
 
 func CreateOCRv2JobsLocal(
@@ -95,11 +96,11 @@ func CreateOCRv2JobsLocal(
 			}
 			err = chainlinkNode.MustCreateBridge(bta)
 			if err != nil {
-				return fmt.Errorf("creating bridge job have failed: %w", err)
+				return fmt.Errorf("creating bridge on CL node failed: %w", err)
 			}
 			err = chainlinkNode.MustCreateBridge(juelsBridge)
 			if err != nil {
-				return fmt.Errorf("creating bridge job have failed: %w", err)
+				return fmt.Errorf("creating bridge on CL node failed: %w", err)
 			}
 
 			ocrSpec := &client.OCR2TaskJobSpec{
diff --git a/integration-tests/actions/ocr_helpers.go b/integration-tests/actions/ocr_helpers.go
index 4f713dcdd6d..17e536ec839 100644
--- a/integration-tests/actions/ocr_helpers.go
+++ b/integration-tests/actions/ocr_helpers.go
@@ -236,7 +236,7 @@ func CreateOCRJobs(
 			}
 			err = node.MustCreateBridge(bta)
 			if err != nil {
-				return fmt.Errorf("creating bridge job have failed: %w", err)
+				return fmt.Errorf("creating bridge on CL node failed: %w", err)
 			}
 
 			bootstrapPeers := []*client.ChainlinkClient{bootstrapNode.ChainlinkClient}
diff --git a/integration-tests/actions/ocr_helpers_local.go b/integration-tests/actions/ocr_helpers_local.go
index fb0fd0bd47d..e9cad3f67ea 100644
--- a/integration-tests/actions/ocr_helpers_local.go
+++ b/integration-tests/actions/ocr_helpers_local.go
@@ -196,7 +196,7 @@ func CreateOCRJobsLocal(
 			}
 			err = node.MustCreateBridge(bta)
 			if err != nil {
-				return fmt.Errorf("creating bridge job have failed: %w", err)
+				return fmt.Errorf("creating bridge on CL node failed: %w", err)
 			}
 
 			bootstrapPeers := []*client.ChainlinkClient{bootstrapNode}
diff --git a/integration-tests/client/chainlink.go b/integration-tests/client/chainlink.go
index 16299a1ac8a..56670812fbc 100644
--- a/integration-tests/client/chainlink.go
+++ b/integration-tests/client/chainlink.go
@@ -267,6 +267,7 @@ func (c *ChainlinkClient) DeleteSpec(id string) (*http.Response, error) {
 // MustCreateBridge creates a bridge on the Chainlink node based on the provided attributes and returns error if
 // the request is unsuccessful
 func (c *ChainlinkClient) MustCreateBridge(bta *BridgeTypeAttributes) error {
+	c.l.Debug().Str(NodeURL, c.Config.URL).Str("Name", bta.Name).Msg("Creating Bridge")
 	resp, err := c.CreateBridge(bta)
 	if err != nil {
 		return err
@@ -275,7 +276,7 @@ func (c *ChainlinkClient) MustCreateBridge(bta *BridgeTypeAttributes) error {
 }
 
 func (c *ChainlinkClient) CreateBridge(bta *BridgeTypeAttributes) (*http.Response, error) {
-	c.l.Info().Str(NodeURL, c.Config.URL).Str("Name", bta.Name).Msg("Creating Bridge")
+	c.l.Debug().Str(NodeURL, c.Config.URL).Str("Name", bta.Name).Msg("Creating Bridge")
 	resp, err := c.APIClient.R().
 		SetBody(bta).
 		Post("/v2/bridge_types")
@@ -288,7 +289,7 @@ func (c *ChainlinkClient) CreateBridge(bta *BridgeTypeAttributes) (*http.Respons
 // ReadBridge reads a bridge from the Chainlink node based on the provided name
 func (c *ChainlinkClient) ReadBridge(name string) (*BridgeType, *http.Response, error) {
 	bt := BridgeType{}
-	c.l.Info().Str(NodeURL, c.Config.URL).Str("Name", name).Msg("Reading Bridge")
+	c.l.Debug().Str(NodeURL, c.Config.URL).Str("Name", name).Msg("Reading Bridge")
 	resp, err := c.APIClient.R().
 		SetPathParams(map[string]string{
 			"name": name,
@@ -304,7 +305,7 @@ func (c *ChainlinkClient) ReadBridge(name string) (*BridgeType, *http.Response,
 // ReadBridges reads bridges from the Chainlink node
 func (c *ChainlinkClient) ReadBridges() (*Bridges, *resty.Response, error) {
 	result := &Bridges{}
-	c.l.Info().Str(NodeURL, c.Config.URL).Msg("Getting all bridges")
+	c.l.Debug().Str(NodeURL, c.Config.URL).Msg("Getting all bridges")
 	resp, err := c.APIClient.R().
 		SetResult(&result).
 		Get("/v2/bridge_types")
@@ -316,7 +317,7 @@ func (c *ChainlinkClient) ReadBridges() (*Bridges, *resty.Response, error) {
 
 // DeleteBridge deletes a bridge on the Chainlink node based on the provided name
 func (c *ChainlinkClient) DeleteBridge(name string) (*http.Response, error) {
-	c.l.Info().Str(NodeURL, c.Config.URL).Str("Name", name).Msg("Deleting Bridge")
+	c.l.Debug().Str(NodeURL, c.Config.URL).Str("Name", name).Msg("Deleting Bridge")
 	resp, err := c.APIClient.R().
 		SetPathParams(map[string]string{
 			"name": name,
diff --git a/integration-tests/contracts/contract_deployer.go b/integration-tests/contracts/contract_deployer.go
index 528f07ec68e..464ae7a340b 100644
--- a/integration-tests/contracts/contract_deployer.go
+++ b/integration-tests/contracts/contract_deployer.go
@@ -135,6 +135,7 @@ type ContractDeployer interface {
 	DeployOffchainAggregatorEventsMock() (OffchainAggregatorEventsMock, error)
 	DeployMockAggregatorProxy(aggregatorAddr string) (MockAggregatorProxy, error)
 	DeployOffchainAggregatorV2(linkAddr string, offchainOptions OffchainOptions) (OffchainAggregatorV2, error)
+	LoadOffChainAggregatorV2(address *common.Address) (OffchainAggregatorV2, error)
 	DeployKeeperRegistryCheckUpkeepGasUsageWrapper(keeperRegistryAddr string) (KeeperRegistryCheckUpkeepGasUsageWrapper, error)
 	DeployKeeperRegistry11Mock() (KeeperRegistry11Mock, error)
 	DeployKeeperRegistrar12Mock() (KeeperRegistrar12Mock, error)
@@ -1584,6 +1585,25 @@ func (e *EthereumContractDeployer) DeployOffchainAggregatorV2(
 	}, err
 }
 
+// LoadOffChainAggregatorV2 loads an already deployed offchain aggregator v2 contract
+func (e *EthereumContractDeployer) LoadOffChainAggregatorV2(address *common.Address) (OffchainAggregatorV2, error) {
+	instance, err := e.client.LoadContract("OffChainAggregatorV2", *address, func(
+		address common.Address,
+		backend bind.ContractBackend,
+	) (interface{}, error) {
+		return ocr2aggregator.NewOCR2Aggregator(address, backend)
+	})
+	if err != nil {
+		return nil, err
+	}
+	return &EthereumOffchainAggregatorV2{
+		client:   e.client,
+		contract: instance.(*ocr2aggregator.OCR2Aggregator),
+		address:  address,
+		l:        e.l,
+	}, err
+}
+
 func (e *EthereumContractDeployer) DeployMercuryVerifierContract(verifierProxyAddr common.Address) (MercuryVerifier, error) {
 	address, _, instance, err := e.client.DeployContract("Mercury Verifier", func(
 		auth *bind.TransactOpts,
diff --git a/integration-tests/load/README.md b/integration-tests/load/README.md
index 1ed1ee8b94e..3738a1d9ace 100644
--- a/integration-tests/load/README.md
+++ b/integration-tests/load/README.md
@@ -1,9 +1,11 @@
-## Performance tests for CL jobs
+# Performance tests for CL jobs
 
 This folder container performance e2e tests for different job types, currently implemented:
+
 - VRFv2
 
 All the tests have 4 groups:
+
 - one product soak
 - one product load
 - multiple product instances soak
@@ -12,11 +14,13 @@ All the tests have 4 groups:
 When you develop an e2e performance suite for a new product you can implement the tests one by one to answer the questions:
 
 What are performance characteristics of a one instance of a product (jobs + contracts):
+
 - is our product stable at all, no memory leaks, no flaking performance under some RPS? (test #1)
 - what are the limits for one product instance, figuring out the max/optimal performance params by increasing RPS and varying configuration (test #2)
 - update test #1 with optimal params and workload to constantly run in CI
 
 What are performance and capacity characteristics of Chainlink node(s) that run multiple products of the same type simultaneously:
+
 - how many products of the same type we can run at once at a stable load with optimal configuration? (test #3)
 - what are the limits if we add more and more products of the same type, each product have a stable RPS, we vary only amount of products
 - update test #3 with optimal params and workload to constantly run in CI
@@ -24,9 +28,9 @@ What are performance and capacity characteristics of Chainlink node(s) that run
 Implementing test #1 is **mandatory** for each product.
 Tests #2,#3,#4 are optional if you need to figure out your product scaling or node/cluster capacity.
 
-
 ## Usage
-```
+
+```sh
 export LOKI_TOKEN=...
 export LOKI_URL=...
 
@@ -34,10 +38,12 @@ go test -v -run TestVRFV2Load/vrfv2_soak_test
 ```
 
 ### Dashboards
+
 Each product has its own generated dashboard in `cmd/dashboard.go`
 
 Deploying dashboard:
-```
+
+```sh
 export GRAFANA_URL=...
 export GRAFANA_TOKEN=...
 export DATA_SOURCE_NAME=grafanacloud-logs
@@ -56,8 +62,9 @@ If you need to assert some metrics in `Prometheus/Loki`, here is an [example](ht
 Do not mix workload logic with assertions, separate them.
 
 ### Implementation
+
 To implement a standard e2e performance suite for a new product please look at `gun.go` and `vu.go`.
 
 Gun should be working with one instance of your product.
 
-VU(Virtual user) creates a new instance of your product and works with it in `Call()`
\ No newline at end of file
+VU(Virtual user) creates a new instance of your product and works with it in `Call()`
diff --git a/integration-tests/load/ocr/README.md b/integration-tests/load/ocr/README.md
index 61951ba700f..3c231b50278 100644
--- a/integration-tests/load/ocr/README.md
+++ b/integration-tests/load/ocr/README.md
@@ -1,12 +1,21 @@
-### OCR Load tests
+# OCR Load tests
 
 ## Setup
+
 These tests can connect to any cluster create with [chainlink-cluster](../../../charts/chainlink-cluster/README.md)
 
+<<<<<<< HEAD
+Create your cluster
+
+```sh
+kubectl create ns my-cluster
+devspace use namespace my-cluster
+=======
 Create your cluster, if you already have one just use `kubefwd`
 ```
 kubectl create ns cl-cluster
 devspace use namespace cl-cluster
+>>>>>>> 06656fac80999d1539e16951a54b87c6df13a9c7
 devspace deploy
 sudo kubefwd svc -n cl-cluster
 ```
@@ -17,7 +26,7 @@ If you haven't changed anything in [devspace.yaml](../../../charts/chainlink-clu
 
 ## Usage
 
-```
+```sh
 export LOKI_TOKEN=...
 export LOKI_URL=...
 
@@ -25,4 +34,4 @@ go test -v -run TestOCRLoad
 go test -v -run TestOCRVolume
 ```
 
-Check test configuration [here](config.toml)
\ No newline at end of file
+Check test configuration [here](config.toml)
diff --git a/integration-tests/load/ocr/ocr_test.go b/integration-tests/load/ocr/ocr_test.go
index 13aea441b2a..49e624ecd89 100644
--- a/integration-tests/load/ocr/ocr_test.go
+++ b/integration-tests/load/ocr/ocr_test.go
@@ -3,12 +3,13 @@ package ocr
 import (
 	"testing"
 
-	"github.com/smartcontractkit/chainlink/integration-tests/k8s"
+	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/wasp"
-	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-testing-framework/logging"
+
+	"github.com/smartcontractkit/chainlink/integration-tests/k8s"
 )
 
 var (
diff --git a/integration-tests/load/ocr/vu.go b/integration-tests/load/ocr/vu.go
index a905ec011df..96be77c701a 100644
--- a/integration-tests/load/ocr/vu.go
+++ b/integration-tests/load/ocr/vu.go
@@ -13,6 +13,7 @@ import (
 	"go.uber.org/ratelimit"
 
 	client2 "github.com/smartcontractkit/chainlink-testing-framework/client"
+
 	"github.com/smartcontractkit/chainlink/integration-tests/actions"
 	"github.com/smartcontractkit/chainlink/integration-tests/client"
 	"github.com/smartcontractkit/chainlink/integration-tests/contracts"
diff --git a/integration-tests/scripts/entrypoint b/integration-tests/scripts/entrypoint
index cb5c98fde6a..d2297abaa98 100755
--- a/integration-tests/scripts/entrypoint
+++ b/integration-tests/scripts/entrypoint
@@ -24,6 +24,7 @@ echo "Test exit code: ${exit_code}"
 # 3 is the code for an interrupted test, we only want to restart the test when the test is interrupted and in a state 
 # that it can recover from. Otherwise we mark the test as "passed" as far as K8s is concerned so it doesn't restart it.
 if [ $exit_code -eq 3 ]; then
+echo "Test was interrupted, exiting with 1 exit code to trigger K8s to restart"
   exit 1  # Exiting with non-zero status to trigger pod restart
 fi
 
@@ -38,3 +39,6 @@ fi
 if [ -n "${UPLOAD_MEM_PROFILE}" ]; then
     upload_to_slack memprofile.out "MEM Profile for ${TEST_NAME}"
 fi
+
+echo "Exiting with 0 exit code as test is either completed, or failed and cannot be restarted"
+exit 0
\ No newline at end of file
diff --git a/integration-tests/testreporters/ocr.go b/integration-tests/testreporters/ocr.go
index abbb261fa74..31f5eeab1b9 100644
--- a/integration-tests/testreporters/ocr.go
+++ b/integration-tests/testreporters/ocr.go
@@ -21,6 +21,7 @@ import (
 type OCRSoakTestReporter struct {
 	StartTime         time.Time
 	AnomaliesDetected bool
+	OCRVersion        string
 
 	anomalies   [][]string
 	timeLine    [][]string
@@ -159,7 +160,7 @@ func (o *OCRSoakTestReporter) SetNamespace(namespace string) {
 
 // WriteReport writes OCR Soak test report to a CSV file and final report
 func (o *OCRSoakTestReporter) WriteReport(folderLocation string) error {
-	log.Debug().Msg("Writing OCR Soak Test Report")
+	log.Debug().Msgf("Writing OCRv%s Soak Test Report", o.OCRVersion)
 	reportLocation := filepath.Join(folderLocation, "./ocr_soak_report.csv")
 	o.csvLocation = reportLocation
 	ocrReportFile, err := os.Create(reportLocation)
@@ -170,7 +171,7 @@ func (o *OCRSoakTestReporter) WriteReport(folderLocation string) error {
 
 	ocrReportWriter := csv.NewWriter(ocrReportFile)
 
-	err = ocrReportWriter.Write([]string{"OCR Soak Test Report"})
+	err = ocrReportWriter.Write([]string{fmt.Sprintf("OCRv%s Soak Test Report", o.OCRVersion)})
 	if err != nil {
 		return err
 	}
@@ -240,7 +241,7 @@ func (o *OCRSoakTestReporter) SendSlackNotification(t *testing.T, slackClient *s
 	}
 
 	testFailed := t.Failed()
-	headerText := ":white_check_mark: OCR Soak Test PASSED :white_check_mark:"
+	headerText := fmt.Sprintf(":white_check_mark: OCRv%s Soak Test PASSED :white_check_mark:", o.OCRVersion)
 	if testFailed {
 		headerText = ":x: OCR Soak Test FAILED :x:"
 	} else if o.AnomaliesDetected {
diff --git a/integration-tests/testsetups/ocr.go b/integration-tests/testsetups/ocr.go
index a35d915ea92..f7e0e65d36d 100644
--- a/integration-tests/testsetups/ocr.go
+++ b/integration-tests/testsetups/ocr.go
@@ -25,6 +25,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/libocr/gethwrappers/offchainaggregator"
+	"github.com/smartcontractkit/libocr/gethwrappers2/ocr2aggregator"
 
 	"github.com/smartcontractkit/chainlink-testing-framework/blockchain"
 	ctfClient "github.com/smartcontractkit/chainlink-testing-framework/client"
@@ -72,12 +73,16 @@ type OCRSoakTest struct {
 	ocrRoundStates []*testreporters.OCRRoundState
 	testIssues     []*testreporters.TestIssue
 
-	ocrInstances   []contracts.OffchainAggregator
-	ocrInstanceMap map[string]contracts.OffchainAggregator // address : instance
+	ocrV1Instances   []contracts.OffchainAggregator
+	ocrV1InstanceMap map[string]contracts.OffchainAggregator // address : instance
+
+	ocrV2Instances   []contracts.OffchainAggregatorV2
+	ocrV2InstanceMap map[string]contracts.OffchainAggregatorV2 // address : instance
 }
 
 // OCRSoakTestInputs define required inputs to run an OCR soak test
 type OCRSoakTestInputs struct {
+	OCRVersion              string        `envconfig:"OCR_VERSION" default:"1"`             // Version of OCR to use (1 or 2)
 	TestDuration            time.Duration `envconfig:"TEST_DURATION" default:"15m"`         // How long to run the test for
 	NumberOfContracts       int           `envconfig:"NUMBER_CONTRACTS" default:"2"`        // Number of OCR contracts to launch
 	ChainlinkNodeFunding    float64       `envconfig:"CHAINLINK_NODE_FUNDING" default:".1"` // Amount of native currency to fund each chainlink node with
@@ -86,6 +91,7 @@ type OCRSoakTestInputs struct {
 }
 
 func (i OCRSoakTestInputs) setForRemoteRunner() {
+	os.Setenv("TEST_OCR_VERSION", i.OCRVersion)
 	os.Setenv("TEST_OCR_TEST_DURATION", i.TestDuration.String())
 	os.Setenv("TEST_OCR_NUMBER_CONTRACTS", fmt.Sprint(i.NumberOfContracts))
 	os.Setenv("TEST_OCR_CHAINLINK_NODE_FUNDING", strconv.FormatFloat(i.ChainlinkNodeFunding, 'f', -1, 64))
@@ -113,14 +119,16 @@ func NewOCRSoakTest(t *testing.T, forwarderFlow bool) (*OCRSoakTest, error) {
 		Inputs:                &testInputs,
 		OperatorForwarderFlow: forwarderFlow,
 		TestReporter: testreporters.OCRSoakTestReporter{
-			StartTime: time.Now(),
+			OCRVersion: testInputs.OCRVersion,
+			StartTime:  time.Now(),
 		},
-		t:              t,
-		startTime:      time.Now(),
-		timeLeft:       testInputs.TestDuration,
-		log:            logging.GetTestLogger(t),
-		ocrRoundStates: make([]*testreporters.OCRRoundState, 0),
-		ocrInstanceMap: make(map[string]contracts.OffchainAggregator),
+		t:                t,
+		startTime:        time.Now(),
+		timeLeft:         testInputs.TestDuration,
+		log:              logging.GetTestLogger(t),
+		ocrRoundStates:   make([]*testreporters.OCRRoundState, 0),
+		ocrV1InstanceMap: make(map[string]contracts.OffchainAggregator),
+		ocrV2InstanceMap: make(map[string]contracts.OffchainAggregatorV2),
 	}
 	return test, test.ensureInputValues()
 }
@@ -128,7 +136,7 @@ func NewOCRSoakTest(t *testing.T, forwarderFlow bool) (*OCRSoakTest, error) {
 // DeployEnvironment deploys the test environment, starting all Chainlink nodes and other components for the test
 func (o *OCRSoakTest) DeployEnvironment(customChainlinkNetworkTOML string) {
 	network := networks.MustGetSelectedNetworksFromEnv()[0] // Environment currently being used to soak test on
-	nsPre := "soak-ocr-"
+	nsPre := fmt.Sprintf("soak-ocr-v%s-", o.Inputs.OCRVersion)
 	if o.OperatorForwarderFlow {
 		nsPre = fmt.Sprintf("%sforwarder-", nsPre)
 	}
@@ -140,9 +148,15 @@ func (o *OCRSoakTest) DeployEnvironment(customChainlinkNetworkTOML string) {
 		PreventPodEviction: true,
 	}
 
+	var conf string
+	if o.Inputs.OCRVersion == "1" {
+		conf = config.BaseOCR1Config
+	} else if o.Inputs.OCRVersion == "2" {
+		conf = config.BaseOCR2Config
+	}
 	cd := chainlink.New(0, map[string]any{
 		"replicas": 6,
-		"toml":     networks.AddNetworkDetailedConfig(config.BaseOCR1Config, customChainlinkNetworkTOML, network),
+		"toml":     networks.AddNetworkDetailedConfig(conf, customChainlinkNetworkTOML, network),
 		"db": map[string]any{
 			"stateful": true, // stateful DB by default for soak tests
 		},
@@ -228,7 +242,7 @@ func (o *OCRSoakTest) Setup() {
 			err = o.chainClient.WaitForEvents()
 		}
 
-		o.ocrInstances = actions.DeployOCRContractsForwarderFlow(
+		o.ocrV1Instances = actions.DeployOCRContractsForwarderFlow(
 			o.t,
 			o.Inputs.NumberOfContracts,
 			linkTokenContract,
@@ -237,8 +251,8 @@ func (o *OCRSoakTest) Setup() {
 			authorizedForwarders,
 			o.chainClient,
 		)
-	} else {
-		o.ocrInstances, err = actions.DeployOCRContracts(
+	} else if o.Inputs.OCRVersion == "1" {
+		o.ocrV1Instances, err = actions.DeployOCRContracts(
 			o.Inputs.NumberOfContracts,
 			linkTokenContract,
 			contractDeployer,
@@ -246,13 +260,41 @@ func (o *OCRSoakTest) Setup() {
 			o.chainClient,
 		)
 		require.NoError(o.t, err)
+	} else if o.Inputs.OCRVersion == "2" {
+		var transmitters []string
+		for _, node := range o.workerNodes {
+			nodeAddress, err := node.PrimaryEthAddress()
+			require.NoError(o.t, err, "Error getting node's primary ETH address")
+			transmitters = append(transmitters, nodeAddress)
+		}
+		ocrOffchainOptions := contracts.DefaultOffChainAggregatorOptions()
+		o.ocrV2Instances, err = actions.DeployOCRv2Contracts(
+			o.Inputs.NumberOfContracts,
+			linkTokenContract,
+			contractDeployer,
+			transmitters,
+			o.chainClient,
+			ocrOffchainOptions,
+		)
+		require.NoError(o.t, err, "Error deploying OCRv2 contracts")
+		contractConfig, err := actions.BuildMedianOCR2Config(o.workerNodes, ocrOffchainOptions)
+		require.NoError(o.t, err, "Error building median config")
+		err = actions.ConfigureOCRv2AggregatorContracts(o.chainClient, contractConfig, o.ocrV2Instances)
+		require.NoError(o.t, err, "Error configuring OCRv2 aggregator contracts")
 	}
 
 	err = o.chainClient.WaitForEvents()
 	require.NoError(o.t, err, "Error waiting for OCR contracts to be deployed")
-	for _, ocrInstance := range o.ocrInstances {
-		o.ocrInstanceMap[ocrInstance.Address()] = ocrInstance
+	if o.Inputs.OCRVersion == "1" {
+		for _, ocrInstance := range o.ocrV1Instances {
+			o.ocrV1InstanceMap[ocrInstance.Address()] = ocrInstance
+		}
+	} else if o.Inputs.OCRVersion == "2" {
+		for _, ocrInstance := range o.ocrV2Instances {
+			o.ocrV2InstanceMap[ocrInstance.Address()] = ocrInstance
+		}
 	}
+
 	o.log.Info().Msg("OCR Soak Test Setup Complete")
 }
 
@@ -266,15 +308,19 @@ func (o *OCRSoakTest) Run() {
 
 	startingValue := 5
 	if o.OperatorForwarderFlow {
-		actions.CreateOCRJobsWithForwarder(o.t, o.ocrInstances, o.bootstrapNode, o.workerNodes, startingValue, o.mockServer, o.chainClient.GetChainID().String())
-	} else {
-		err := actions.CreateOCRJobs(o.ocrInstances, o.bootstrapNode, o.workerNodes, startingValue, o.mockServer, o.chainClient.GetChainID().String())
+		actions.CreateOCRJobsWithForwarder(o.t, o.ocrV1Instances, o.bootstrapNode, o.workerNodes, startingValue, o.mockServer, o.chainClient.GetChainID().String())
+	} else if o.Inputs.OCRVersion == "1" {
+		err := actions.CreateOCRJobs(o.ocrV1Instances, o.bootstrapNode, o.workerNodes, startingValue, o.mockServer, o.chainClient.GetChainID().String())
+		require.NoError(o.t, err, "Error creating OCR jobs")
+	} else if o.Inputs.OCRVersion == "2" {
+		err := actions.CreateOCRv2Jobs(o.ocrV2Instances, o.bootstrapNode, o.workerNodes, o.mockServer, startingValue, o.chainClient.GetChainID().Uint64(), o.OperatorForwarderFlow)
 		require.NoError(o.t, err, "Error creating OCR jobs")
 	}
 
 	o.log.Info().
 		Str("Test Duration", o.Inputs.TestDuration.Truncate(time.Second).String()).
-		Int("Number of OCR Contracts", len(o.ocrInstances)).
+		Int("Number of OCR Contracts", o.Inputs.NumberOfContracts).
+		Str("OCR Version", o.Inputs.OCRVersion).
 		Msg("Starting OCR Soak Test")
 
 	o.testLoop(o.Inputs.TestDuration, startingValue)
@@ -306,6 +352,7 @@ type OCRSoakTestState struct {
 	TimeRunning          time.Duration                  `toml:"timeRunning"`
 	TestDuration         time.Duration                  `toml:"testDuration"`
 	OCRContractAddresses []string                       `toml:"ocrContractAddresses"`
+	OCRVersion           string                         `toml:"ocrVersion"`
 
 	BootStrapNodeURL string   `toml:"bootstrapNodeURL"`
 	WorkerNodeURLs   []string `toml:"workerNodeURLs"`
@@ -315,10 +362,7 @@ type OCRSoakTestState struct {
 
 // SaveState saves the current state of the test to a TOML file
 func (o *OCRSoakTest) SaveState() error {
-	ocrAddresses := make([]string, len(o.ocrInstances))
-	for i, ocrInstance := range o.ocrInstances {
-		ocrAddresses[i] = ocrInstance.Address()
-	}
+	ocrAddresses := o.getContractAddressesString()
 	workerNodeURLs := make([]string, len(o.workerNodes))
 	for i, workerNode := range o.workerNodes {
 		workerNodeURLs[i] = workerNode.URL()
@@ -333,6 +377,7 @@ func (o *OCRSoakTest) SaveState() error {
 		TimeRunning:          time.Since(o.startTime),
 		TestDuration:         o.Inputs.TestDuration,
 		OCRContractAddresses: ocrAddresses,
+		OCRVersion:           o.Inputs.OCRVersion,
 
 		ChainURL:         o.chainClient.GetNetworkConfig().URL,
 		MockServerURL:    "http://mockserver:1080", // TODO: Make this dynamic
@@ -378,7 +423,8 @@ func (o *OCRSoakTest) LoadState() error {
 
 	o.namespace = testState.Namespace
 	o.TestReporter = testreporters.OCRSoakTestReporter{
-		StartTime: testState.StartTime,
+		OCRVersion: testState.OCRVersion,
+		StartTime:  testState.StartTime,
 	}
 	o.ocrRoundStates = testState.OCRRoundStates
 	o.testIssues = testState.TestIssues
@@ -386,6 +432,7 @@ func (o *OCRSoakTest) LoadState() error {
 	o.timeLeft = testState.TestDuration - testState.TimeRunning
 	o.startTime = testState.StartTime
 	o.startingBlockNum = testState.StartingBlockNum
+	o.Inputs.OCRVersion = testState.OCRVersion
 
 	network := networks.MustGetSelectedNetworksFromEnv()[0]
 	o.chainClient, err = blockchain.ConnectEVMClient(network, o.log)
@@ -405,15 +452,28 @@ func (o *OCRSoakTest) LoadState() error {
 		return err
 	}
 
-	o.ocrInstances = make([]contracts.OffchainAggregator, len(testState.OCRContractAddresses))
-	for i, addr := range testState.OCRContractAddresses {
-		address := common.HexToAddress(addr)
-		instance, err := contractDeployer.LoadOffChainAggregator(&address)
-		if err != nil {
-			return err
+	if testState.OCRVersion == "1" {
+		o.ocrV1Instances = make([]contracts.OffchainAggregator, len(testState.OCRContractAddresses))
+		for i, addr := range testState.OCRContractAddresses {
+			address := common.HexToAddress(addr)
+			instance, err := contractDeployer.LoadOffChainAggregator(&address)
+			if err != nil {
+				return err
+			}
+			o.ocrV1Instances[i] = instance
+		}
+	} else if testState.OCRVersion == "2" {
+		o.ocrV2Instances = make([]contracts.OffchainAggregatorV2, len(testState.OCRContractAddresses))
+		for i, addr := range testState.OCRContractAddresses {
+			address := common.HexToAddress(addr)
+			instance, err := contractDeployer.LoadOffChainAggregatorV2(&address)
+			if err != nil {
+				return err
+			}
+			o.ocrV2Instances[i] = instance
 		}
-		o.ocrInstances[i] = instance
 	}
+
 	o.mockServer, err = ctfClient.ConnectMockServerURL(testState.MockServerURL)
 	if err != nil {
 		return err
@@ -432,16 +492,30 @@ func (o *OCRSoakTest) Resume() {
 		Str("Time Left", o.timeLeft.String()).
 		Msg("Resuming OCR Soak Test")
 
-	ocrAddresses := make([]common.Address, len(o.ocrInstances))
-	for i, ocrInstance := range o.ocrInstances {
-		ocrAddresses[i] = common.HexToAddress(ocrInstance.Address())
-	}
-	contractABI, err := offchainaggregator.OffchainAggregatorMetaData.GetAbi()
-	require.NoError(o.t, err, "Error retrieving OCR contract ABI")
-	o.filterQuery = geth.FilterQuery{
-		Addresses: ocrAddresses,
-		Topics:    [][]common.Hash{{contractABI.Events["AnswerUpdated"].ID}},
-		FromBlock: big.NewInt(0).SetUint64(o.startingBlockNum),
+	ocrAddresses := make([]common.Address, o.Inputs.NumberOfContracts)
+
+	if o.Inputs.OCRVersion == "1" {
+		for i, ocrInstance := range o.ocrV1Instances {
+			ocrAddresses[i] = common.HexToAddress(ocrInstance.Address())
+		}
+		contractABI, err := offchainaggregator.OffchainAggregatorMetaData.GetAbi()
+		require.NoError(o.t, err, "Error retrieving OCR contract ABI")
+		o.filterQuery = geth.FilterQuery{
+			Addresses: ocrAddresses,
+			Topics:    [][]common.Hash{{contractABI.Events["AnswerUpdated"].ID}},
+			FromBlock: big.NewInt(0).SetUint64(o.startingBlockNum),
+		}
+	} else if o.Inputs.OCRVersion == "2" {
+		for i, ocrInstance := range o.ocrV2Instances {
+			ocrAddresses[i] = common.HexToAddress(ocrInstance.Address())
+		}
+		contractABI, err := ocr2aggregator.AggregatorInterfaceMetaData.GetAbi()
+		require.NoError(o.t, err, "Error retrieving OCR contract ABI")
+		o.filterQuery = geth.FilterQuery{
+			Addresses: ocrAddresses,
+			Topics:    [][]common.Hash{{contractABI.Events["AnswerUpdated"].ID}},
+			FromBlock: big.NewInt(0).SetUint64(o.startingBlockNum),
+		}
 	}
 
 	startingValue := 5
@@ -449,7 +523,7 @@ func (o *OCRSoakTest) Resume() {
 
 	o.log.Info().Msg("Test Complete, collecting on-chain events")
 
-	err = o.collectEvents()
+	err := o.collectEvents()
 	o.log.Error().Err(err).Interface("Query", o.filterQuery).Msg("Error collecting on-chain events, expect malformed report")
 	o.TestReporter.RecordEvents(o.ocrRoundStates, o.testIssues)
 }
@@ -537,10 +611,7 @@ func (o *OCRSoakTest) complete() {
 
 // setFilterQuery to look for all events that happened
 func (o *OCRSoakTest) setFilterQuery() {
-	ocrAddresses := make([]common.Address, len(o.ocrInstances))
-	for i, ocrInstance := range o.ocrInstances {
-		ocrAddresses[i] = common.HexToAddress(ocrInstance.Address())
-	}
+	ocrAddresses := o.getContractAddresses()
 	contractABI, err := offchainaggregator.OffchainAggregatorMetaData.GetAbi()
 	require.NoError(o.t, err, "Error retrieving OCR contract ABI")
 	o.filterQuery = geth.FilterQuery{
@@ -570,21 +641,39 @@ func (o *OCRSoakTest) observeOCREvents() error {
 		for {
 			select {
 			case event := <-eventLogs:
-				answerUpdated, err := o.ocrInstances[0].ParseEventAnswerUpdated(event)
-				if err != nil {
-					o.log.Warn().
-						Err(err).
+				if o.Inputs.OCRVersion == "1" {
+					answerUpdated, err := o.ocrV1Instances[0].ParseEventAnswerUpdated(event)
+					if err != nil {
+						o.log.Warn().
+							Err(err).
+							Str("Address", event.Address.Hex()).
+							Uint64("Block Number", event.BlockNumber).
+							Msg("Error parsing event as AnswerUpdated")
+						continue
+					}
+					o.log.Info().
 						Str("Address", event.Address.Hex()).
 						Uint64("Block Number", event.BlockNumber).
-						Msg("Error parsing event as AnswerUpdated")
-					continue
+						Uint64("Round ID", answerUpdated.RoundId.Uint64()).
+						Int64("Answer", answerUpdated.Current.Int64()).
+						Msg("Answer Updated Event")
+				} else if o.Inputs.OCRVersion == "2" {
+					answerUpdated, err := o.ocrV2Instances[0].ParseEventAnswerUpdated(event)
+					if err != nil {
+						o.log.Warn().
+							Err(err).
+							Str("Address", event.Address.Hex()).
+							Uint64("Block Number", event.BlockNumber).
+							Msg("Error parsing event as AnswerUpdated")
+						continue
+					}
+					o.log.Info().
+						Str("Address", event.Address.Hex()).
+						Uint64("Block Number", event.BlockNumber).
+						Uint64("Round ID", answerUpdated.RoundId.Uint64()).
+						Int64("Answer", answerUpdated.Current.Int64()).
+						Msg("Answer Updated Event")
 				}
-				o.log.Info().
-					Str("Address", event.Address.Hex()).
-					Uint64("Block Number", event.BlockNumber).
-					Uint64("Round ID", answerUpdated.RoundId.Uint64()).
-					Int64("Answer", answerUpdated.Current.Int64()).
-					Msg("Answer Updated Event")
 			case err = <-eventSub.Err():
 				backoff := time.Second
 				for err != nil {
@@ -614,7 +703,12 @@ func (o *OCRSoakTest) triggerNewRound(newValue int) error {
 		o.ocrRoundStates[len(o.ocrRoundStates)-1].EndTime = time.Now()
 	}
 
-	err := actions.SetAllAdapterResponsesToTheSameValue(newValue, o.ocrInstances, o.workerNodes, o.mockServer)
+	var err error
+	if o.Inputs.OCRVersion == "1" {
+		err = actions.SetAllAdapterResponsesToTheSameValue(newValue, o.ocrV1Instances, o.workerNodes, o.mockServer)
+	} else if o.Inputs.OCRVersion == "2" {
+		err = actions.SetOCR2AllAdapterResponsesToTheSameValue(newValue, o.ocrV2Instances, o.workerNodes, o.mockServer)
+	}
 	if err != nil {
 		return err
 	}
@@ -624,9 +718,16 @@ func (o *OCRSoakTest) triggerNewRound(newValue int) error {
 		Answer:      int64(newValue),
 		FoundEvents: make(map[string][]*testreporters.FoundEvent),
 	}
-	for _, ocrInstance := range o.ocrInstances {
-		expectedState.FoundEvents[ocrInstance.Address()] = make([]*testreporters.FoundEvent, 0)
+	if o.Inputs.OCRVersion == "1" {
+		for _, ocrInstance := range o.ocrV1Instances {
+			expectedState.FoundEvents[ocrInstance.Address()] = make([]*testreporters.FoundEvent, 0)
+		}
+	} else if o.Inputs.OCRVersion == "2" {
+		for _, ocrInstance := range o.ocrV2Instances {
+			expectedState.FoundEvents[ocrInstance.Address()] = make([]*testreporters.FoundEvent, 0)
+		}
 	}
+
 	o.ocrRoundStates = append(o.ocrRoundStates, expectedState)
 	o.log.Info().
 		Int("Value", newValue).
@@ -662,17 +763,31 @@ func (o *OCRSoakTest) collectEvents() error {
 
 	sortedFoundEvents := make([]*testreporters.FoundEvent, 0)
 	for _, event := range contractEvents {
-		answerUpdated, err := o.ocrInstances[0].ParseEventAnswerUpdated(event)
-		if err != nil {
-			return fmt.Errorf("error parsing EventAnswerUpdated for event: %v, %w", event, err)
+		if o.Inputs.OCRVersion == "1" {
+			answerUpdated, err := o.ocrV1Instances[0].ParseEventAnswerUpdated(event)
+			if err != nil {
+				return fmt.Errorf("error parsing EventAnswerUpdated for event: %v, %w", event, err)
+			}
+			sortedFoundEvents = append(sortedFoundEvents, &testreporters.FoundEvent{
+				StartTime:   time.Unix(answerUpdated.UpdatedAt.Int64(), 0),
+				Address:     event.Address.Hex(),
+				Answer:      answerUpdated.Current.Int64(),
+				RoundID:     answerUpdated.RoundId.Uint64(),
+				BlockNumber: event.BlockNumber,
+			})
+		} else if o.Inputs.OCRVersion == "2" {
+			answerUpdated, err := o.ocrV2Instances[0].ParseEventAnswerUpdated(event)
+			if err != nil {
+				return fmt.Errorf("error parsing EventAnswerUpdated for event: %v, %w", event, err)
+			}
+			sortedFoundEvents = append(sortedFoundEvents, &testreporters.FoundEvent{
+				StartTime:   time.Unix(answerUpdated.UpdatedAt.Int64(), 0),
+				Address:     event.Address.Hex(),
+				Answer:      answerUpdated.Current.Int64(),
+				RoundID:     answerUpdated.RoundId.Uint64(),
+				BlockNumber: event.BlockNumber,
+			})
 		}
-		sortedFoundEvents = append(sortedFoundEvents, &testreporters.FoundEvent{
-			StartTime:   time.Unix(answerUpdated.UpdatedAt.Int64(), 0),
-			Address:     event.Address.Hex(),
-			Answer:      answerUpdated.Current.Int64(),
-			RoundID:     answerUpdated.RoundId.Uint64(),
-			BlockNumber: event.BlockNumber,
-		})
 	}
 
 	// Sort our events by time to make sure they are in order (don't trust RPCs)
@@ -705,6 +820,9 @@ func (o *OCRSoakTest) collectEvents() error {
 // ensureValues ensures that all values needed to run the test are present
 func (o *OCRSoakTest) ensureInputValues() error {
 	inputs := o.Inputs
+	if inputs.OCRVersion != "1" && inputs.OCRVersion != "2" {
+		return fmt.Errorf("OCR version must be 1 or 2, found %s", inputs.OCRVersion)
+	}
 	if inputs.NumberOfContracts <= 0 {
 		return fmt.Errorf("Number of OCR contracts must be greater than 0, found %d", inputs.NumberOfContracts)
 	}
@@ -723,3 +841,39 @@ func (o *OCRSoakTest) ensureInputValues() error {
 	o.Inputs.bigChainlinkNodeFunding = big.NewFloat(inputs.ChainlinkNodeFunding)
 	return nil
 }
+
+// getContractAddressesString returns the addresses of all OCR contracts deployed as a string slice
+func (o *OCRSoakTest) getContractAddressesString() []string {
+	contractAddresses := []string{}
+	if len(o.ocrV1Instances) != 0 {
+		for _, ocrInstance := range o.ocrV1Instances {
+			contractAddresses = append(contractAddresses, ocrInstance.Address())
+		}
+	} else if len(o.ocrV2Instances) != 0 {
+		if len(o.ocrV2Instances) != 0 {
+			for _, ocrInstance := range o.ocrV2Instances {
+				contractAddresses = append(contractAddresses, ocrInstance.Address())
+			}
+		}
+	}
+
+	return contractAddresses
+}
+
+// getContractAddresses returns the addresses of all OCR contracts deployed
+func (o *OCRSoakTest) getContractAddresses() []common.Address {
+	contractAddresses := []common.Address{}
+	if len(o.ocrV1Instances) != 0 {
+		for _, ocrInstance := range o.ocrV1Instances {
+			contractAddresses = append(contractAddresses, common.HexToAddress(ocrInstance.Address()))
+		}
+	} else if len(o.ocrV2Instances) != 0 {
+		if len(o.ocrV2Instances) != 0 {
+			for _, ocrInstance := range o.ocrV2Instances {
+				contractAddresses = append(contractAddresses, common.HexToAddress(ocrInstance.Address()))
+			}
+		}
+	}
+
+	return contractAddresses
+}

From ffbce92d011ef56385b7dbc317ba449b5b309ae8 Mon Sep 17 00:00:00 2001
From: Jordan Krage <jmank88@gmail.com>
Date: Wed, 13 Dec 2023 12:18:35 -0600
Subject: [PATCH 122/130] bump common; use SugaredLogger methods (#11556)

---
 common/client/multi_node.go                   | 17 +++--
 common/client/node_lifecycle.go               | 29 +++++----
 common/headtracker/head_tracker.go            |  8 +--
 common/txmgr/broadcaster.go                   | 18 +++---
 common/txmgr/confirmer.go                     | 23 ++++---
 common/txmgr/resender.go                      |  4 +-
 common/txmgr/txmgr.go                         | 10 +--
 common/txmgr/types/client.go                  |  4 +-
 common/txmgr/types/tx.go                      |  6 +-
 core/chains/evm/client/chain_client.go        |  8 +--
 core/chains/evm/client/client.go              |  8 +--
 core/chains/evm/client/errors.go              |  8 +--
 core/chains/evm/client/helpers_test.go        |  2 +-
 core/chains/evm/client/node.go                | 61 +++++++++---------
 core/chains/evm/client/node_lifecycle.go      | 29 +++++----
 core/chains/evm/client/pool.go                | 12 ++--
 core/chains/evm/client/rpc_client.go          | 63 +++++++++----------
 .../chains/evm/gas/block_history_estimator.go | 16 ++---
 .../evm/gas/rollups/l1_gas_price_oracle.go    |  6 +-
 core/chains/evm/log/helpers_test.go           |  6 +-
 core/chains/evm/log/registrations.go          | 24 +++----
 core/chains/evm/logpoller/log_poller.go       |  8 +--
 core/chains/evm/txmgr/broadcaster_test.go     |  2 +-
 core/chains/evm/txmgr/client.go               |  8 +--
 core/chains/evm/txmgr/evm_tx_store.go         |  6 +-
 core/chains/evm/txmgr/transmitchecker.go      | 10 +--
 core/chains/evm/txmgr/transmitchecker_test.go |  2 +-
 core/scripts/go.mod                           |  2 +-
 core/scripts/go.sum                           |  4 +-
 core/services/pg/q.go                         |  6 +-
 go.mod                                        |  2 +-
 go.sum                                        |  4 +-
 integration-tests/go.mod                      |  2 +-
 integration-tests/go.sum                      |  5 +-
 34 files changed, 203 insertions(+), 220 deletions(-)

diff --git a/common/client/multi_node.go b/common/client/multi_node.go
index dfd6585b642..7d55784e68f 100644
--- a/common/client/multi_node.go
+++ b/common/client/multi_node.go
@@ -86,7 +86,7 @@ type multiNode[
 	sendonlys           []SendOnlyNode[CHAIN_ID, RPC_CLIENT]
 	chainID             CHAIN_ID
 	chainType           config.ChainType
-	lggr                logger.Logger
+	lggr                logger.SugaredLogger
 	selectionMode       string
 	noNewHeadsThreshold time.Duration
 	nodeSelector        NodeSelector[CHAIN_ID, HEAD, RPC_CLIENT]
@@ -118,7 +118,7 @@ func NewMultiNode[
 	HEAD types.Head[BLOCK_HASH],
 	RPC_CLIENT RPC[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD],
 ](
-	l logger.Logger,
+	lggr logger.Logger,
 	selectionMode string,
 	leaseDuration time.Duration,
 	noNewHeadsThreshold time.Duration,
@@ -131,9 +131,6 @@ func NewMultiNode[
 ) MultiNode[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD, RPC_CLIENT] {
 	nodeSelector := newNodeSelector(selectionMode, nodes)
 
-	lggr := logger.Named(l, "MultiNode")
-	lggr = logger.With(lggr, "chainID", chainID.String())
-
 	// Prometheus' default interval is 15s, set this to under 7.5s to avoid
 	// aliasing (see: https://en.wikipedia.org/wiki/Nyquist_frequency)
 	const reportInterval = 6500 * time.Millisecond
@@ -142,7 +139,7 @@ func NewMultiNode[
 		sendonlys:           sendonlys,
 		chainID:             chainID,
 		chainType:           chainType,
-		lggr:                lggr,
+		lggr:                logger.Sugared(lggr).Named("MultiNode").With("chainID", chainID.String()),
 		selectionMode:       selectionMode,
 		noNewHeadsThreshold: noNewHeadsThreshold,
 		nodeSelector:        nodeSelector,
@@ -249,7 +246,7 @@ func (c *multiNode[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OP
 	c.activeNode = c.nodeSelector.Select()
 
 	if c.activeNode == nil {
-		logger.Criticalw(c.lggr, "No live RPC nodes available", "NodeSelectionMode", c.nodeSelector.Name())
+		c.lggr.Criticalw("No live RPC nodes available", "NodeSelectionMode", c.nodeSelector.Name())
 		errmsg := fmt.Errorf("no live nodes available for chain %s", c.chainID.String())
 		c.SvcErrBuffer.Append(errmsg)
 		err = ErroringNodeError
@@ -351,10 +348,10 @@ func (c *multiNode[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OP
 	}
 
 	live := total - dead
-	logger.Tracew(c.lggr, fmt.Sprintf("MultiNode state: %d/%d nodes are alive", live, total), "nodeStates", nodeStates)
+	c.lggr.Tracew(fmt.Sprintf("MultiNode state: %d/%d nodes are alive", live, total), "nodeStates", nodeStates)
 	if total == dead {
 		rerr := fmt.Errorf("no primary nodes available: 0/%d nodes are alive", total)
-		logger.Criticalw(c.lggr, rerr.Error(), "nodeStates", nodeStates)
+		c.lggr.Criticalw(rerr.Error(), "nodeStates", nodeStates)
 		c.SvcErrBuffer.Append(rerr)
 	} else if dead > 0 {
 		c.lggr.Errorw(fmt.Sprintf("At least one primary node is dead: %d/%d nodes are alive", live, total), "nodeStates", nodeStates)
@@ -405,7 +402,7 @@ func (c *multiNode[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OP
 			if err != nil {
 				c.lggr.Debugw("Secondary node BatchCallContext failed", "err", err)
 			} else {
-				logger.Trace(c.lggr, "Secondary node BatchCallContext success")
+				c.lggr.Trace("Secondary node BatchCallContext success")
 			}
 		}(n)
 	}
diff --git a/common/client/node_lifecycle.go b/common/client/node_lifecycle.go
index eda137d5100..af8f27d498d 100644
--- a/common/client/node_lifecycle.go
+++ b/common/client/node_lifecycle.go
@@ -93,9 +93,8 @@ func (n *node[CHAIN_ID, HEAD, RPC]) aliveLoop() {
 	pollFailureThreshold := n.nodePoolCfg.PollFailureThreshold()
 	pollInterval := n.nodePoolCfg.PollInterval()
 
-	lggr := logger.Named(n.lfcLog, "Alive")
-	lggr = logger.With(lggr, "noNewHeadsTimeoutThreshold", noNewHeadsTimeoutThreshold, "pollInterval", pollInterval, "pollFailureThreshold", pollFailureThreshold)
-	logger.Tracew(lggr, "Alive loop starting", "nodeState", n.State())
+	lggr := logger.Sugared(n.lfcLog).Named("Alive").With("noNewHeadsTimeoutThreshold", noNewHeadsTimeoutThreshold, "pollInterval", pollInterval, "pollFailureThreshold", pollFailureThreshold)
+	lggr.Tracew("Alive loop starting", "nodeState", n.State())
 
 	headsC := make(chan HEAD)
 	sub, err := n.rpc.Subscribe(n.nodeCtx, headsC, rpcSubscriptionMethodNewHeads)
@@ -146,7 +145,7 @@ func (n *node[CHAIN_ID, HEAD, RPC]) aliveLoop() {
 		case <-pollCh:
 			var version string
 			promPoolRPCNodePolls.WithLabelValues(n.chainID.String(), n.name).Inc()
-			logger.Tracew(lggr, "Polling for version", "nodeState", n.State(), "pollFailures", pollFailures)
+			lggr.Tracew("Polling for version", "nodeState", n.State(), "pollFailures", pollFailures)
 			ctx, cancel := context.WithTimeout(n.nodeCtx, pollInterval)
 			version, err := n.RPC().ClientVersion(ctx)
 			cancel()
@@ -166,7 +165,7 @@ func (n *node[CHAIN_ID, HEAD, RPC]) aliveLoop() {
 				lggr.Errorw(fmt.Sprintf("RPC endpoint failed to respond to %d consecutive polls", pollFailures), "pollFailures", pollFailures, "nodeState", n.State())
 				if n.nLiveNodes != nil {
 					if l, _, _ := n.nLiveNodes(); l < 2 {
-						logger.Criticalf(lggr, "RPC endpoint failed to respond to polls; %s %s", msgCannotDisable, msgDegradedState)
+						lggr.Criticalf("RPC endpoint failed to respond to polls; %s %s", msgCannotDisable, msgDegradedState)
 						continue
 					}
 				}
@@ -178,7 +177,7 @@ func (n *node[CHAIN_ID, HEAD, RPC]) aliveLoop() {
 				// note: there must be another live node for us to be out of sync
 				lggr.Errorw("RPC endpoint has fallen behind", "blockNumber", num, "totalDifficulty", td, "nodeState", n.State())
 				if liveNodes < 2 {
-					logger.Criticalf(lggr, "RPC endpoint has fallen behind; %s %s", msgCannotDisable, msgDegradedState)
+					lggr.Criticalf("RPC endpoint has fallen behind; %s %s", msgCannotDisable, msgDegradedState)
 					continue
 				}
 				n.declareOutOfSync(n.isOutOfSync)
@@ -191,13 +190,13 @@ func (n *node[CHAIN_ID, HEAD, RPC]) aliveLoop() {
 				return
 			}
 			promPoolRPCNodeNumSeenBlocks.WithLabelValues(n.chainID.String(), n.name).Inc()
-			logger.Tracew(lggr, "Got head", "head", bh)
+			lggr.Tracew("Got head", "head", bh)
 			if bh.BlockNumber() > highestReceivedBlockNumber {
 				promPoolRPCNodeHighestSeenBlock.WithLabelValues(n.chainID.String(), n.name).Set(float64(bh.BlockNumber()))
-				logger.Tracew(lggr, "Got higher block number, resetting timer", "latestReceivedBlockNumber", highestReceivedBlockNumber, "blockNumber", bh.BlockNumber(), "nodeState", n.State())
+				lggr.Tracew("Got higher block number, resetting timer", "latestReceivedBlockNumber", highestReceivedBlockNumber, "blockNumber", bh.BlockNumber(), "nodeState", n.State())
 				highestReceivedBlockNumber = bh.BlockNumber()
 			} else {
-				logger.Tracew(lggr, "Ignoring previously seen block number", "latestReceivedBlockNumber", highestReceivedBlockNumber, "blockNumber", bh.BlockNumber(), "nodeState", n.State())
+				lggr.Tracew("Ignoring previously seen block number", "latestReceivedBlockNumber", highestReceivedBlockNumber, "blockNumber", bh.BlockNumber(), "nodeState", n.State())
 			}
 			if outOfSyncT != nil {
 				outOfSyncT.Reset(noNewHeadsTimeoutThreshold)
@@ -213,7 +212,7 @@ func (n *node[CHAIN_ID, HEAD, RPC]) aliveLoop() {
 			lggr.Errorw(fmt.Sprintf("RPC endpoint detected out of sync; no new heads received for %s (last head received was %v)", noNewHeadsTimeoutThreshold, highestReceivedBlockNumber), "nodeState", n.State(), "latestReceivedBlockNumber", highestReceivedBlockNumber, "noNewHeadsTimeoutThreshold", noNewHeadsTimeoutThreshold)
 			if n.nLiveNodes != nil {
 				if l, _, _ := n.nLiveNodes(); l < 2 {
-					logger.Criticalf(lggr, "RPC endpoint detected out of sync; %s %s", msgCannotDisable, msgDegradedState)
+					lggr.Criticalf("RPC endpoint detected out of sync; %s %s", msgCannotDisable, msgDegradedState)
 					// We don't necessarily want to wait the full timeout to check again, we should
 					// check regularly and log noisily in this state
 					outOfSyncT.Reset(zombieNodeCheckInterval(n.noNewHeadsThreshold))
@@ -279,7 +278,7 @@ func (n *node[CHAIN_ID, HEAD, RPC]) outOfSyncLoop(isOutOfSync func(num int64, td
 
 	outOfSyncAt := time.Now()
 
-	lggr := logger.Named(n.lfcLog, "OutOfSync")
+	lggr := logger.Sugared(logger.Named(n.lfcLog, "OutOfSync"))
 	lggr.Debugw("Trying to revive out-of-sync RPC node", "nodeState", n.State())
 
 	// Need to redial since out-of-sync nodes are automatically disconnected
@@ -296,7 +295,7 @@ func (n *node[CHAIN_ID, HEAD, RPC]) outOfSyncLoop(isOutOfSync func(num int64, td
 		return
 	}
 
-	logger.Tracew(lggr, "Successfully subscribed to heads feed on out-of-sync RPC node", "nodeState", n.State())
+	lggr.Tracew("Successfully subscribed to heads feed on out-of-sync RPC node", "nodeState", n.State())
 
 	ch := make(chan HEAD)
 	sub, err := n.rpc.Subscribe(n.nodeCtx, ch, rpcSubscriptionMethodNewHeads)
@@ -328,7 +327,7 @@ func (n *node[CHAIN_ID, HEAD, RPC]) outOfSyncLoop(isOutOfSync func(num int64, td
 		case <-time.After(zombieNodeCheckInterval(n.noNewHeadsThreshold)):
 			if n.nLiveNodes != nil {
 				if l, _, _ := n.nLiveNodes(); l < 1 {
-					logger.Critical(lggr, "RPC endpoint is still out of sync, but there are no other available nodes. This RPC node will be forcibly moved back into the live pool in a degraded state")
+					lggr.Critical("RPC endpoint is still out of sync, but there are no other available nodes. This RPC node will be forcibly moved back into the live pool in a degraded state")
 					n.declareInSync()
 					return
 				}
@@ -358,7 +357,7 @@ func (n *node[CHAIN_ID, HEAD, RPC]) unreachableLoop() {
 
 	unreachableAt := time.Now()
 
-	lggr := logger.Named(n.lfcLog, "Unreachable")
+	lggr := logger.Sugared(logger.Named(n.lfcLog, "Unreachable"))
 	lggr.Debugw("Trying to revive unreachable RPC node", "nodeState", n.State())
 
 	dialRetryBackoff := iutils.NewRedialBackoff()
@@ -368,7 +367,7 @@ func (n *node[CHAIN_ID, HEAD, RPC]) unreachableLoop() {
 		case <-n.nodeCtx.Done():
 			return
 		case <-time.After(dialRetryBackoff.Duration()):
-			logger.Tracew(lggr, "Trying to re-dial RPC node", "nodeState", n.State())
+			lggr.Tracew("Trying to re-dial RPC node", "nodeState", n.State())
 
 			err := n.rpc.Dial(n.nodeCtx)
 			if err != nil {
diff --git a/common/headtracker/head_tracker.go b/common/headtracker/head_tracker.go
index 373aa5a958f..4cc152fb9fe 100644
--- a/common/headtracker/head_tracker.go
+++ b/common/headtracker/head_tracker.go
@@ -40,7 +40,7 @@ type HeadTracker[
 	BLOCK_HASH types.Hashable,
 ] struct {
 	services.StateMachine
-	log             logger.Logger
+	log             logger.SugaredLogger
 	headBroadcaster types.HeadBroadcaster[HTH, BLOCK_HASH]
 	headSaver       types.HeadSaver[HTH, BLOCK_HASH]
 	mailMon         *mailbox.Monitor
@@ -81,7 +81,7 @@ func NewHeadTracker[
 		chainID:         client.ConfiguredChainID(),
 		config:          config,
 		htConfig:        htConfig,
-		log:             lggr,
+		log:             logger.Sugared(lggr),
 		backfillMB:      mailbox.NewSingle[HTH](),
 		broadcastMB:     mailbox.New[HTH](HeadsBufferSize),
 		chStop:          chStop,
@@ -227,7 +227,7 @@ func (ht *HeadTracker[HTH, S, ID, BLOCK_HASH]) handleNewHead(ctx context.Context
 		prevUnFinalizedHead := prevHead.BlockNumber() - int64(ht.config.FinalityDepth())
 		if head.BlockNumber() < prevUnFinalizedHead {
 			promOldHead.WithLabelValues(ht.chainID.String()).Inc()
-			logger.Criticalf(ht.log, "Got very old block with number %d (highest seen was %d). This is a problem and either means a very deep re-org occurred, one of the RPC nodes has gotten far out of sync, or the chain went backwards in block numbers. This node may not function correctly without manual intervention.", head.BlockNumber(), prevHead.BlockNumber())
+			ht.log.Criticalf("Got very old block with number %d (highest seen was %d). This is a problem and either means a very deep re-org occurred, one of the RPC nodes has gotten far out of sync, or the chain went backwards in block numbers. This node may not function correctly without manual intervention.", head.BlockNumber(), prevHead.BlockNumber())
 			ht.SvcErrBuffer.Append(errors.New("got very old block"))
 		}
 	}
@@ -310,7 +310,7 @@ func (ht *HeadTracker[HTH, S, ID, BLOCK_HASH]) backfill(ctx context.Context, hea
 	}
 	mark := time.Now()
 	fetched := 0
-	l := logger.With(ht.log, "blockNumber", headBlockNumber,
+	l := ht.log.With("blockNumber", headBlockNumber,
 		"n", headBlockNumber-baseHeight,
 		"fromBlockHeight", baseHeight,
 		"toBlockHeight", headBlockNumber-1)
diff --git a/common/txmgr/broadcaster.go b/common/txmgr/broadcaster.go
index dba2b976c33..a62b3df8699 100644
--- a/common/txmgr/broadcaster.go
+++ b/common/txmgr/broadcaster.go
@@ -82,7 +82,7 @@ type TransmitChecker[
 	// is returned. Errors should only be returned if the checker can confirm that a transaction
 	// should not be sent, other errors (for example connection or other unexpected errors) should
 	// be logged and swallowed.
-	Check(ctx context.Context, l logger.Logger, tx txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], a txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error
+	Check(ctx context.Context, l logger.SugaredLogger, tx txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], a txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) error
 }
 
 // Broadcaster monitors txes for transactions that need to
@@ -108,7 +108,7 @@ type Broadcaster[
 	FEE feetypes.Fee,
 ] struct {
 	services.StateMachine
-	lggr    logger.Logger
+	lggr    logger.SugaredLogger
 	txStore txmgrtypes.TransactionStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	client  txmgrtypes.TransactionClient[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	txmgrtypes.TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
@@ -172,7 +172,7 @@ func NewBroadcaster[
 ) *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE] {
 	lggr = logger.Named(lggr, "Broadcaster")
 	b := &Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]{
-		lggr:             lggr,
+		lggr:             logger.Sugared(lggr),
 		txStore:          txStore,
 		client:           client,
 		TxAttemptBuilder: txAttemptBuilder,
@@ -311,7 +311,7 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) getS
 	if err == nil {
 		return seq, nil
 	}
-	logger.Criticalw(eb.lggr, "failed to retrieve next sequence from on-chain for address: ", "address", address.String())
+	eb.lggr.Criticalw("failed to retrieve next sequence from on-chain for address: ", "address", address.String())
 	return seq, err
 
 }
@@ -399,7 +399,7 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Sync
 	localSequence, err := eb.GetNextSequence(ctx, addr)
 	// Address not found in map so skip sync
 	if err != nil {
-		logger.Criticalw(eb.lggr, "Failed to retrieve local next sequence for address", "address", addr.String(), "err", err)
+		eb.lggr.Criticalw("Failed to retrieve local next sequence for address", "address", addr.String(), "err", err)
 		return
 	}
 
@@ -414,7 +414,7 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) Sync
 			newNextSequence, err := eb.sequenceSyncer.Sync(ctx, addr, localSequence)
 			if err != nil {
 				if attempt > 5 {
-					logger.Criticalw(eb.lggr, "Failed to sync with on-chain sequence", "address", addr.String(), "attempt", attempt, "err", err)
+					eb.lggr.Criticalw("Failed to sync with on-chain sequence", "address", addr.String(), "attempt", attempt, "err", err)
 					eb.SvcErrBuffer.Append(err)
 				} else {
 					eb.lggr.Warnw("Failed to sync with on-chain sequence", "address", addr.String(), "attempt", attempt, "err", err)
@@ -537,7 +537,7 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) hand
 		return fmt.Errorf("building transmit checker: %w", err), false
 	}
 
-	lgr := etx.GetLogger(logger.With(eb.lggr, "fee", attempt.TxFee))
+	lgr := etx.GetLogger(eb.lggr.With("fee", attempt.TxFee))
 
 	// If the transmit check does not complete within the timeout, the transaction will be sent
 	// anyway.
@@ -647,14 +647,14 @@ func (eb *Broadcaster[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) hand
 		// If there is only one RPC node, or all RPC nodes have the same
 		// configured cap, this transaction will get stuck and keep repeating
 		// forever until the issue is resolved.
-		logger.Criticalw(lgr, `RPC node rejected this tx as outside Fee Cap`)
+		lgr.Criticalw(`RPC node rejected this tx as outside Fee Cap`)
 		fallthrough
 	default:
 		// Every error that doesn't fall under one of the above categories will be treated as Unknown.
 		fallthrough
 	case client.Unknown:
 		eb.SvcErrBuffer.Append(err)
-		logger.Criticalw(lgr, `Unknown error occurred while handling tx queue in ProcessUnstartedTxs. This chain/RPC client may not be supported. `+
+		lgr.Criticalw(`Unknown error occurred while handling tx queue in ProcessUnstartedTxs. This chain/RPC client may not be supported. `+
 			`Urgent resolution required, Chainlink is currently operating in a degraded state and may miss transactions`, "err", err, "etx", etx, "attempt", attempt)
 		nextSequence, e := eb.client.PendingSequenceAt(ctx, etx.FromAddress)
 		if e != nil {
diff --git a/common/txmgr/confirmer.go b/common/txmgr/confirmer.go
index aabdf45ae32..fbc6ea8a108 100644
--- a/common/txmgr/confirmer.go
+++ b/common/txmgr/confirmer.go
@@ -118,7 +118,7 @@ type Confirmer[
 ] struct {
 	services.StateMachine
 	txStore txmgrtypes.TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]
-	lggr    logger.Logger
+	lggr    logger.SugaredLogger
 	client  txmgrtypes.TxmClient[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]
 	txmgrtypes.TxAttemptBuilder[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]
 	resumeCallback ResumeCallback
@@ -166,7 +166,7 @@ func NewConfirmer[
 	lggr = logger.Named(lggr, "Confirmer")
 	return &Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]{
 		txStore:          txStore,
-		lggr:             lggr,
+		lggr:             logger.Sugared(lggr),
 		client:           client,
 		TxAttemptBuilder: txAttemptBuilder,
 		resumeCallback:   nil,
@@ -520,8 +520,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) bat
 		}
 	}
 
-	lggr := logger.Named(ec.lggr, "BatchFetchReceipts")
-	lggr = logger.With(lggr, "blockNum", blockNum)
+	lggr := ec.lggr.Named("BatchFetchReceipts").With("blockNum", blockNum)
 
 	txReceipts, txErrs, err := ec.client.BatchGetReceipts(ctx, attempts)
 	if err != nil {
@@ -533,9 +532,9 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) bat
 		receipt := txReceipts[i]
 		err := txErrs[i]
 
-		l := logger.Sugared(logger.With(attempt.Tx.GetLogger(lggr), "txHash", attempt.Hash.String(), "txAttemptID", attempt.ID,
+		l := attempt.Tx.GetLogger(lggr).With("txHash", attempt.Hash.String(), "txAttemptID", attempt.ID,
 			"txID", attempt.TxID, "err", err, "sequence", attempt.Tx.Sequence,
-		))
+		)
 
 		if err != nil {
 			l.Error("FetchReceipt failed")
@@ -554,7 +553,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) bat
 			continue
 		}
 
-		l = logger.Sugared(logger.With(l, "blockHash", receipt.GetBlockHash().String(), "status", receipt.GetStatus(), "transactionIndex", receipt.GetTransactionIndex()))
+		l = l.With("blockHash", receipt.GetBlockHash().String(), "status", receipt.GetStatus(), "transactionIndex", receipt.GetTransactionIndex())
 
 		if receipt.IsUnmined() {
 			l.Debug("Got receipt for transaction but it's still in the mempool and not included in a block yet")
@@ -811,7 +810,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) bum
 	return bumpedAttempt, fmt.Errorf("error bumping gas: %w", err)
 }
 
-func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) handleInProgressAttempt(ctx context.Context, lggr logger.Logger, etx txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], attempt txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], blockHeight int64) error {
+func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) handleInProgressAttempt(ctx context.Context, lggr logger.SugaredLogger, etx txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], attempt txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], blockHeight int64) error {
 	if attempt.State != txmgrtypes.TxAttemptInProgress {
 
 		return fmt.Errorf("invariant violation: expected tx_attempt %v to be in_progress, it was %s", attempt.ID, attempt.State)
@@ -833,12 +832,12 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) han
 		}
 		if len(etx.TxAttempts) == 0 {
 			err := errors.New("expected to find at least 1 attempt")
-			logger.Sugared(ec.lggr).AssumptionViolationw(err.Error(), "err", err, "attempt", attempt)
+			ec.lggr.AssumptionViolationw(err.Error(), "err", err, "attempt", attempt)
 			return err
 		}
 		if attempt.ID != etx.TxAttempts[0].ID {
 			err := errors.New("expected highest priced attempt to be the current in_progress attempt")
-			logger.Sugared(ec.lggr).AssumptionViolationw(err.Error(), "err", err, "attempt", attempt, "txAttempts", etx.TxAttempts)
+			ec.lggr.AssumptionViolationw(err.Error(), "err", err, "attempt", attempt, "txAttempts", etx.TxAttempts)
 			return err
 		}
 		replacementAttempt, err := ec.bumpGas(ctx, etx, etx.TxAttempts)
@@ -846,7 +845,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) han
 			return fmt.Errorf("could not bump gas for terminally underpriced transaction: %w", err)
 		}
 		promNumGasBumps.WithLabelValues(ec.chainID.String()).Inc()
-		logger.With(lggr,
+		lggr.With(
 			"sendError", sendError,
 			"maxGasPriceConfig", ec.feeConfig.MaxFeePrice(),
 			"previousAttempt", attempt,
@@ -867,7 +866,7 @@ func (ec *Confirmer[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) han
 		// Should NEVER be fatal this is an invariant violation. The
 		// Broadcaster can never create a TxAttempt that will
 		// fatally error.
-		logger.Criticalw(lggr, "Invariant violation: fatal error while re-attempting transaction",
+		lggr.Criticalw("Invariant violation: fatal error while re-attempting transaction",
 			"err", sendError,
 			"fee", attempt.TxFee,
 			"feeLimit", etx.FeeLimit,
diff --git a/common/txmgr/resender.go b/common/txmgr/resender.go
index 74cf3d1389c..dded59f55d4 100644
--- a/common/txmgr/resender.go
+++ b/common/txmgr/resender.go
@@ -53,7 +53,7 @@ type Resender[
 	interval            time.Duration
 	config              txmgrtypes.ResenderChainConfig
 	txConfig            txmgrtypes.ResenderTransactionsConfig
-	logger              logger.Logger
+	logger              logger.SugaredLogger
 	lastAlertTimestamps map[string]time.Time
 
 	ctx    context.Context
@@ -93,7 +93,7 @@ func NewResender[
 		pollInterval,
 		config,
 		txConfig,
-		logger.Named(lggr, "Resender"),
+		logger.Sugared(logger.Named(lggr, "Resender")),
 		make(map[string]time.Time),
 		ctx,
 		cancel,
diff --git a/common/txmgr/txmgr.go b/common/txmgr/txmgr.go
index e43a16b29ef..36a6a1304ae 100644
--- a/common/txmgr/txmgr.go
+++ b/common/txmgr/txmgr.go
@@ -82,7 +82,7 @@ type Txm[
 	FEE feetypes.Fee,
 ] struct {
 	services.StateMachine
-	logger         logger.Logger
+	logger         logger.SugaredLogger
 	txStore        txmgrtypes.TxStore[ADDR, CHAIN_ID, TX_HASH, BLOCK_HASH, R, SEQ, FEE]
 	config         txmgrtypes.TransactionManagerChainConfig
 	txConfig       txmgrtypes.TransactionManagerTransactionsConfig
@@ -142,7 +142,7 @@ func NewTxm[
 	tracker *Tracker[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE],
 ) *Txm[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE] {
 	b := Txm[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]{
-		logger:           lggr,
+		logger:           logger.Sugared(lggr),
 		txStore:          txStore,
 		config:           cfg,
 		txConfig:         txCfg,
@@ -349,7 +349,7 @@ func (b *Txm[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) runLoop()
 				select {
 				case <-time.After(backoff.Duration()):
 					if err := b.broadcaster.startInternal(ctx); err != nil {
-						logger.Criticalw(b.logger, "Failed to start Broadcaster", "err", err)
+						b.logger.Criticalw("Failed to start Broadcaster", "err", err)
 						b.SvcErrBuffer.Append(err)
 						continue
 					}
@@ -368,7 +368,7 @@ func (b *Txm[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) runLoop()
 				select {
 				case <-time.After(backoff.Duration()):
 					if err := b.confirmer.startInternal(); err != nil {
-						logger.Criticalw(b.logger, "Failed to start Confirmer", "err", err)
+						b.logger.Criticalw("Failed to start Confirmer", "err", err)
 						b.SvcErrBuffer.Append(err)
 						continue
 					}
@@ -433,7 +433,7 @@ func (b *Txm[CHAIN_ID, HEAD, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) runLoop()
 			}
 			enabledAddresses, err := b.keyStore.EnabledAddressesForChain(b.chainID)
 			if err != nil {
-				logger.Criticalf(b.logger, "Failed to reload key states after key change")
+				b.logger.Critical("Failed to reload key states after key change")
 				b.SvcErrBuffer.Append(err)
 				continue
 			}
diff --git a/common/txmgr/types/client.go b/common/txmgr/types/client.go
index b44c41e4176..0db50e97ad3 100644
--- a/common/txmgr/types/client.go
+++ b/common/txmgr/types/client.go
@@ -47,7 +47,7 @@ type TransactionClient[
 		ctx context.Context,
 		attempts []TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE],
 		bathSize int,
-		lggr logger.Logger,
+		lggr logger.SugaredLogger,
 	) (
 		txCodes []client.SendTxReturnCode,
 		txErrs []error,
@@ -58,7 +58,7 @@ type TransactionClient[
 		ctx context.Context,
 		tx Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE],
 		attempt TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE],
-		lggr logger.Logger,
+		lggr logger.SugaredLogger,
 	) (client.SendTxReturnCode, error)
 	SendEmptyTransaction(
 		ctx context.Context,
diff --git a/common/txmgr/types/tx.go b/common/txmgr/types/tx.go
index caac763fc0f..0f5d651ae29 100644
--- a/common/txmgr/types/tx.go
+++ b/common/txmgr/types/tx.go
@@ -254,7 +254,7 @@ func (e *Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) GetMeta() (*TxMeta[A
 }
 
 // GetLogger returns a new logger with metadata fields.
-func (e *Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) GetLogger(lgr logger.Logger) logger.Logger {
+func (e *Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) GetLogger(lgr logger.Logger) logger.SugaredLogger {
 	lgr = logger.With(lgr,
 		"txID", e.ID,
 		"sequence", e.Sequence,
@@ -265,7 +265,7 @@ func (e *Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) GetLogger(lgr logger
 	meta, err := e.GetMeta()
 	if err != nil {
 		lgr.Errorw("failed to get meta of the transaction", "err", err)
-		return lgr
+		return logger.Sugared(lgr)
 	}
 
 	if meta != nil {
@@ -315,7 +315,7 @@ func (e *Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) GetLogger(lgr logger
 		}
 	}
 
-	return lgr
+	return logger.Sugared(lgr)
 }
 
 // GetChecker returns an Tx's transmit checker spec in struct form, unmarshalling it from JSON
diff --git a/core/chains/evm/client/chain_client.go b/core/chains/evm/client/chain_client.go
index 3efc5645e22..255d802720a 100644
--- a/core/chains/evm/client/chain_client.go
+++ b/core/chains/evm/client/chain_client.go
@@ -37,11 +37,11 @@ type chainClient struct {
 		*evmtypes.Head,
 		RPCCLient,
 	]
-	logger logger.Logger
+	logger logger.SugaredLogger
 }
 
 func NewChainClient(
-	logger logger.Logger,
+	lggr logger.Logger,
 	selectionMode string,
 	leaseDuration time.Duration,
 	noNewHeadsThreshold time.Duration,
@@ -64,7 +64,7 @@ func NewChainClient(
 		*evmtypes.Head,
 		RPCCLient,
 	](
-		logger,
+		lggr,
 		selectionMode,
 		leaseDuration,
 		noNewHeadsThreshold,
@@ -77,7 +77,7 @@ func NewChainClient(
 	)
 	return &chainClient{
 		multiNode: multiNode,
-		logger:    logger,
+		logger:    logger.Sugared(lggr),
 	}
 }
 
diff --git a/core/chains/evm/client/client.go b/core/chains/evm/client/client.go
index b85331a62a1..f32ec011445 100644
--- a/core/chains/evm/client/client.go
+++ b/core/chains/evm/client/client.go
@@ -102,7 +102,7 @@ func ContextWithDefaultTimeout() (ctx context.Context, cancel context.CancelFunc
 // client represents an abstract client that manages connections to
 // multiple nodes for a single chain id
 type client struct {
-	logger logger.Logger
+	logger logger.SugaredLogger
 	pool   *Pool
 }
 
@@ -113,10 +113,10 @@ var _ htrktypes.Client[*evmtypes.Head, ethereum.Subscription, *big.Int, common.H
 // Currently only supports one primary
 //
 // Deprecated: use [NewChainClient]
-func NewClientWithNodes(logger logger.Logger, selectionMode string, leaseDuration time.Duration, noNewHeadsThreshold time.Duration, primaryNodes []Node, sendOnlyNodes []SendOnlyNode, chainID *big.Int, chainType config.ChainType) (*client, error) {
-	pool := NewPool(logger, selectionMode, leaseDuration, noNewHeadsThreshold, primaryNodes, sendOnlyNodes, chainID, chainType)
+func NewClientWithNodes(lggr logger.Logger, selectionMode string, leaseDuration time.Duration, noNewHeadsThreshold time.Duration, primaryNodes []Node, sendOnlyNodes []SendOnlyNode, chainID *big.Int, chainType config.ChainType) (*client, error) {
+	pool := NewPool(lggr, selectionMode, leaseDuration, noNewHeadsThreshold, primaryNodes, sendOnlyNodes, chainID, chainType)
 	return &client{
-		logger: logger,
+		logger: logger.Sugared(lggr),
 		pool:   pool,
 	}, nil
 }
diff --git a/core/chains/evm/client/errors.go b/core/chains/evm/client/errors.go
index 143a5f8806f..66cc30f74b4 100644
--- a/core/chains/evm/client/errors.go
+++ b/core/chains/evm/client/errors.go
@@ -413,13 +413,13 @@ func ExtractRPCError(baseErr error) (*JsonError, error) {
 	return &jErr, nil
 }
 
-func ClassifySendError(err error, lggr logger.Logger, tx *types.Transaction, fromAddress common.Address, isL2 bool) (commonclient.SendTxReturnCode, error) {
+func ClassifySendError(err error, lggr logger.SugaredLogger, tx *types.Transaction, fromAddress common.Address, isL2 bool) (commonclient.SendTxReturnCode, error) {
 	sendError := NewSendError(err)
 	if sendError == nil {
 		return commonclient.Successful, err
 	}
 	if sendError.Fatal() {
-		logger.Criticalw(lggr, "Fatal error sending transaction", "err", sendError, "etx", tx)
+		lggr.Criticalw("Fatal error sending transaction", "err", sendError, "etx", tx)
 		// Attempt is thrown away in this case; we don't need it since it never got accepted by a node
 		return commonclient.Fatal, err
 	}
@@ -462,7 +462,7 @@ func ClassifySendError(err error, lggr logger.Logger, tx *types.Transaction, fro
 		return commonclient.Retryable, err
 	}
 	if sendError.IsInsufficientEth() {
-		logger.Criticalw(lggr, fmt.Sprintf("Tx %x with type 0x%d was rejected due to insufficient eth: %s\n"+
+		lggr.Criticalw(fmt.Sprintf("Tx %x with type 0x%d was rejected due to insufficient eth: %s\n"+
 			"ACTION REQUIRED: Chainlink wallet with address 0x%x is OUT OF FUNDS",
 			tx.Hash(), tx.Type(), sendError.Error(), fromAddress,
 		), "err", sendError)
@@ -472,7 +472,7 @@ func ClassifySendError(err error, lggr logger.Logger, tx *types.Transaction, fro
 		return commonclient.Retryable, errors.Wrapf(sendError, "timeout while sending transaction %s", tx.Hash().Hex())
 	}
 	if sendError.IsTxFeeExceedsCap() {
-		logger.Criticalw(lggr, fmt.Sprintf("Sending transaction failed: %s", label.RPCTxFeeCapConfiguredIncorrectlyWarning),
+		lggr.Criticalw(fmt.Sprintf("Sending transaction failed: %s", label.RPCTxFeeCapConfiguredIncorrectlyWarning),
 			"etx", tx,
 			"err", sendError,
 			"id", "RPCTxFeeCapExceeded",
diff --git a/core/chains/evm/client/helpers_test.go b/core/chains/evm/client/helpers_test.go
index 27b335534da..c2f60e13f55 100644
--- a/core/chains/evm/client/helpers_test.go
+++ b/core/chains/evm/client/helpers_test.go
@@ -42,7 +42,7 @@ func NewClientWithTestNode(t *testing.T, nodePoolCfg config.NodePool, noNewHeads
 		return nil, errors.Errorf("ethereum url scheme must be websocket: %s", parsed.String())
 	}
 
-	lggr := logger.Test(t)
+	lggr := logger.Sugared(logger.Test(t))
 	n := NewNode(nodePoolCfg, noNewHeadsThreshold, lggr, *parsed, rpcHTTPURL, "eth-primary-0", id, chainID, 1)
 	n.(*node).setLatestReceived(0, big.NewInt(0))
 	primaries := []Node{n}
diff --git a/core/chains/evm/client/node.go b/core/chains/evm/client/node.go
index a2c8b807ba2..a27321535ed 100644
--- a/core/chains/evm/client/node.go
+++ b/core/chains/evm/client/node.go
@@ -137,7 +137,7 @@ type rawclient struct {
 type node struct {
 	services.StateMachine
 	lfcLog              logger.Logger
-	rpcLog              logger.Logger
+	rpcLog              logger.SugaredLogger
 	name                string
 	id                  int32
 	chainID             *big.Int
@@ -206,7 +206,7 @@ func NewNode(nodeCfg config.NodePool, noNewHeadsThreshold time.Duration, lggr lo
 		"mode", n.getNodeMode(),
 	)
 	n.lfcLog = logger.Named(lggr, "Lifecycle")
-	n.rpcLog = logger.Named(lggr, "RPC")
+	n.rpcLog = logger.Sugared(lggr).Named("RPC")
 	n.stateLatestBlockNumber = -1
 
 	return n
@@ -453,7 +453,7 @@ func (n *node) CallContext(ctx context.Context, result interface{}, method strin
 		return err
 	}
 	defer cancel()
-	lggr := logger.With(n.newRqLggr(),
+	lggr := n.newRqLggr().With(
 		"method", method,
 		"args", args,
 	)
@@ -478,9 +478,9 @@ func (n *node) BatchCallContext(ctx context.Context, b []rpc.BatchElem) error {
 		return err
 	}
 	defer cancel()
-	lggr := logger.With(n.newRqLggr(), "nBatchElems", len(b), "batchElems", b)
+	lggr := n.newRqLggr().With("nBatchElems", len(b), "batchElems", b)
 
-	logger.Trace(lggr, "RPC call: evmclient.Client#BatchCallContext")
+	lggr.Trace("RPC call: evmclient.Client#BatchCallContext")
 	start := time.Now()
 	if http != nil {
 		err = n.wrapHTTP(http.rpc.BatchCallContext(ctx, b))
@@ -500,7 +500,7 @@ func (n *node) EthSubscribe(ctx context.Context, channel chan<- *evmtypes.Head,
 		return nil, err
 	}
 	defer cancel()
-	lggr := logger.With(n.newRqLggr(), "args", args)
+	lggr := n.newRqLggr().With("args", args)
 
 	lggr.Debug("RPC call: evmclient.Client#EthSubscribe")
 	start := time.Now()
@@ -523,7 +523,7 @@ func (n *node) TransactionReceipt(ctx context.Context, txHash common.Hash) (rece
 		return nil, err
 	}
 	defer cancel()
-	lggr := logger.With(n.newRqLggr(), "txHash", txHash)
+	lggr := n.newRqLggr().With("txHash", txHash)
 
 	lggr.Debug("RPC call: evmclient.Client#TransactionReceipt")
 
@@ -550,7 +550,7 @@ func (n *node) TransactionByHash(ctx context.Context, txHash common.Hash) (tx *t
 		return nil, err
 	}
 	defer cancel()
-	lggr := logger.With(n.newRqLggr(), "txHash", txHash)
+	lggr := n.newRqLggr().With("txHash", txHash)
 
 	lggr.Debug("RPC call: evmclient.Client#TransactionByHash")
 
@@ -577,7 +577,7 @@ func (n *node) HeaderByNumber(ctx context.Context, number *big.Int) (header *typ
 		return nil, err
 	}
 	defer cancel()
-	lggr := logger.With(n.newRqLggr(), "number", number)
+	lggr := n.newRqLggr().With("number", number)
 
 	lggr.Debug("RPC call: evmclient.Client#HeaderByNumber")
 	start := time.Now()
@@ -601,7 +601,7 @@ func (n *node) HeaderByHash(ctx context.Context, hash common.Hash) (header *type
 		return nil, err
 	}
 	defer cancel()
-	lggr := logger.With(n.newRqLggr(), "hash", hash)
+	lggr := n.newRqLggr().With("hash", hash)
 
 	lggr.Debug("RPC call: evmclient.Client#HeaderByHash")
 	start := time.Now()
@@ -627,7 +627,7 @@ func (n *node) SendTransaction(ctx context.Context, tx *types.Transaction) error
 		return err
 	}
 	defer cancel()
-	lggr := logger.With(n.newRqLggr(), "tx", tx)
+	lggr := n.newRqLggr().With("tx", tx)
 
 	lggr.Debug("RPC call: evmclient.Client#SendTransaction")
 	start := time.Now()
@@ -650,7 +650,7 @@ func (n *node) PendingNonceAt(ctx context.Context, account common.Address) (nonc
 		return 0, err
 	}
 	defer cancel()
-	lggr := logger.With(n.newRqLggr(), "account", account)
+	lggr := n.newRqLggr().With("account", account)
 
 	lggr.Debug("RPC call: evmclient.Client#PendingNonceAt")
 	start := time.Now()
@@ -679,7 +679,7 @@ func (n *node) NonceAt(ctx context.Context, account common.Address, blockNumber
 		return 0, err
 	}
 	defer cancel()
-	lggr := logger.With(n.newRqLggr(), "account", account, "blockNumber", blockNumber)
+	lggr := n.newRqLggr().With("account", account, "blockNumber", blockNumber)
 
 	lggr.Debug("RPC call: evmclient.Client#NonceAt")
 	start := time.Now()
@@ -705,7 +705,7 @@ func (n *node) PendingCodeAt(ctx context.Context, account common.Address) (code
 		return nil, err
 	}
 	defer cancel()
-	lggr := logger.With(n.newRqLggr(), "account", account)
+	lggr := n.newRqLggr().With("account", account)
 
 	lggr.Debug("RPC call: evmclient.Client#PendingCodeAt")
 	start := time.Now()
@@ -731,7 +731,7 @@ func (n *node) CodeAt(ctx context.Context, account common.Address, blockNumber *
 		return nil, err
 	}
 	defer cancel()
-	lggr := logger.With(n.newRqLggr(), "account", account, "blockNumber", blockNumber)
+	lggr := n.newRqLggr().With("account", account, "blockNumber", blockNumber)
 
 	lggr.Debug("RPC call: evmclient.Client#CodeAt")
 	start := time.Now()
@@ -757,7 +757,7 @@ func (n *node) EstimateGas(ctx context.Context, call ethereum.CallMsg) (gas uint
 		return 0, err
 	}
 	defer cancel()
-	lggr := logger.With(n.newRqLggr(), "call", call)
+	lggr := n.newRqLggr().With("call", call)
 
 	lggr.Debug("RPC call: evmclient.Client#EstimateGas")
 	start := time.Now()
@@ -809,7 +809,7 @@ func (n *node) CallContract(ctx context.Context, msg ethereum.CallMsg, blockNumb
 		return nil, err
 	}
 	defer cancel()
-	lggr := logger.With(n.newRqLggr(), "callMsg", msg, "blockNumber", blockNumber)
+	lggr := n.newRqLggr().With("callMsg", msg, "blockNumber", blockNumber)
 
 	lggr.Debug("RPC call: evmclient.Client#CallContract")
 	start := time.Now()
@@ -836,7 +836,7 @@ func (n *node) BlockByNumber(ctx context.Context, number *big.Int) (b *types.Blo
 		return nil, err
 	}
 	defer cancel()
-	lggr := logger.With(n.newRqLggr(), "number", number)
+	lggr := n.newRqLggr().With("number", number)
 
 	lggr.Debug("RPC call: evmclient.Client#BlockByNumber")
 	start := time.Now()
@@ -862,7 +862,7 @@ func (n *node) BlockByHash(ctx context.Context, hash common.Hash) (b *types.Bloc
 		return nil, err
 	}
 	defer cancel()
-	lggr := logger.With(n.newRqLggr(), "hash", hash)
+	lggr := n.newRqLggr().With("hash", hash)
 
 	lggr.Debug("RPC call: evmclient.Client#BlockByHash")
 	start := time.Now()
@@ -914,7 +914,7 @@ func (n *node) BalanceAt(ctx context.Context, account common.Address, blockNumbe
 		return nil, err
 	}
 	defer cancel()
-	lggr := logger.With(n.newRqLggr(), "account", account.Hex(), "blockNumber", blockNumber)
+	lggr := n.newRqLggr().With("account", account.Hex(), "blockNumber", blockNumber)
 
 	lggr.Debug("RPC call: evmclient.Client#BalanceAt")
 	start := time.Now()
@@ -940,7 +940,7 @@ func (n *node) FilterLogs(ctx context.Context, q ethereum.FilterQuery) (l []type
 		return nil, err
 	}
 	defer cancel()
-	lggr := logger.With(n.newRqLggr(), "q", q)
+	lggr := n.newRqLggr().With("q", q)
 
 	lggr.Debug("RPC call: evmclient.Client#FilterLogs")
 	start := time.Now()
@@ -966,7 +966,7 @@ func (n *node) SubscribeFilterLogs(ctx context.Context, q ethereum.FilterQuery,
 		return nil, err
 	}
 	defer cancel()
-	lggr := logger.With(n.newRqLggr(), "q", q)
+	lggr := n.newRqLggr().With("q", q)
 
 	lggr.Debug("RPC call: evmclient.Client#SubscribeFilterLogs")
 	start := time.Now()
@@ -1011,10 +1011,8 @@ func (n *node) SuggestGasTipCap(ctx context.Context) (tipCap *big.Int, err error
 func (n *node) ChainID() (chainID *big.Int) { return n.chainID }
 
 // newRqLggr generates a new logger with a unique request ID
-func (n *node) newRqLggr() logger.Logger {
-	return logger.With(n.rpcLog,
-		"requestID", uuid.New(),
-	)
+func (n *node) newRqLggr() logger.SugaredLogger {
+	return n.rpcLog.With("requestID", uuid.New())
 }
 
 func (n *node) logResult(
@@ -1025,17 +1023,14 @@ func (n *node) logResult(
 	callName string,
 	results ...interface{},
 ) {
-	lggr = logger.With(lggr, "duration", callDuration, "rpcDomain", rpcDomain, "callName", callName)
+	slggr := logger.Sugared(lggr).With("duration", callDuration, "rpcDomain", rpcDomain, "callName", callName)
 	promEVMPoolRPCNodeCalls.WithLabelValues(n.chainID.String(), n.name).Inc()
 	if err == nil {
 		promEVMPoolRPCNodeCallsSuccess.WithLabelValues(n.chainID.String(), n.name).Inc()
-		logger.Tracew(lggr,
-			fmt.Sprintf("evmclient.Client#%s RPC call success", callName),
-			results...,
-		)
+		slggr.Tracew(fmt.Sprintf("evmclient.Client#%s RPC call success", callName), results...)
 	} else {
 		promEVMPoolRPCNodeCallsFailed.WithLabelValues(n.chainID.String(), n.name).Inc()
-		lggr.Debugw(
+		slggr.Debugw(
 			fmt.Sprintf("evmclient.Client#%s RPC call failure", callName),
 			append(results, "err", err)...,
 		)
@@ -1062,7 +1057,7 @@ func (n *node) wrapHTTP(err error) error {
 	if err != nil {
 		n.rpcLog.Debugw("Call failed", "err", err)
 	} else {
-		logger.Trace(n.rpcLog, "Call succeeded")
+		n.rpcLog.Trace("Call succeeded")
 	}
 	return err
 }
diff --git a/core/chains/evm/client/node_lifecycle.go b/core/chains/evm/client/node_lifecycle.go
index 4e984de00f0..f2232a14935 100644
--- a/core/chains/evm/client/node_lifecycle.go
+++ b/core/chains/evm/client/node_lifecycle.go
@@ -92,9 +92,8 @@ func (n *node) aliveLoop() {
 	pollFailureThreshold := n.nodePoolCfg.PollFailureThreshold()
 	pollInterval := n.nodePoolCfg.PollInterval()
 
-	lggr := logger.Named(n.lfcLog, "Alive")
-	lggr = logger.With(lggr, "noNewHeadsTimeoutThreshold", noNewHeadsTimeoutThreshold, "pollInterval", pollInterval, "pollFailureThreshold", pollFailureThreshold)
-	logger.Tracew(lggr, "Alive loop starting", "nodeState", n.State())
+	lggr := logger.Sugared(n.lfcLog).Named("Alive").With("noNewHeadsTimeoutThreshold", noNewHeadsTimeoutThreshold, "pollInterval", pollInterval, "pollFailureThreshold", pollFailureThreshold)
+	lggr.Tracew("Alive loop starting", "nodeState", n.State())
 
 	headsC := make(chan *evmtypes.Head)
 	sub, err := n.EthSubscribe(n.nodeCtx, headsC, "newHeads")
@@ -143,7 +142,7 @@ func (n *node) aliveLoop() {
 		case <-pollCh:
 			var version string
 			promEVMPoolRPCNodePolls.WithLabelValues(n.chainID.String(), n.name).Inc()
-			logger.Tracew(lggr, "Polling for version", "nodeState", n.State(), "pollFailures", pollFailures)
+			lggr.Tracew("Polling for version", "nodeState", n.State(), "pollFailures", pollFailures)
 			ctx, cancel := context.WithTimeout(n.nodeCtx, pollInterval)
 			ctx, cancel2 := n.makeQueryCtx(ctx)
 			err := n.CallContext(ctx, &version, "web3_clientVersion")
@@ -165,7 +164,7 @@ func (n *node) aliveLoop() {
 				lggr.Errorw(fmt.Sprintf("RPC endpoint failed to respond to %d consecutive polls", pollFailures), "pollFailures", pollFailures, "nodeState", n.State())
 				if n.nLiveNodes != nil {
 					if l, _, _ := n.nLiveNodes(); l < 2 {
-						logger.Criticalf(lggr, "RPC endpoint failed to respond to polls; %s %s", msgCannotDisable, msgDegradedState)
+						lggr.Criticalf("RPC endpoint failed to respond to polls; %s %s", msgCannotDisable, msgDegradedState)
 						continue
 					}
 				}
@@ -177,7 +176,7 @@ func (n *node) aliveLoop() {
 				// note: there must be another live node for us to be out of sync
 				lggr.Errorw("RPC endpoint has fallen behind", "blockNumber", num, "totalDifficulty", td, "nodeState", n.State())
 				if liveNodes < 2 {
-					logger.Criticalf(lggr, "RPC endpoint has fallen behind; %s %s", msgCannotDisable, msgDegradedState)
+					lggr.Criticalf("RPC endpoint has fallen behind; %s %s", msgCannotDisable, msgDegradedState)
 					continue
 				}
 				n.declareOutOfSync(n.isOutOfSync)
@@ -190,13 +189,13 @@ func (n *node) aliveLoop() {
 				return
 			}
 			promEVMPoolRPCNodeNumSeenBlocks.WithLabelValues(n.chainID.String(), n.name).Inc()
-			logger.Tracew(lggr, "Got head", "head", bh)
+			lggr.Tracew("Got head", "head", bh)
 			if bh.Number > highestReceivedBlockNumber {
 				promEVMPoolRPCNodeHighestSeenBlock.WithLabelValues(n.chainID.String(), n.name).Set(float64(bh.Number))
-				logger.Tracew(lggr, "Got higher block number, resetting timer", "latestReceivedBlockNumber", highestReceivedBlockNumber, "blockNumber", bh.Number, "nodeState", n.State())
+				lggr.Tracew("Got higher block number, resetting timer", "latestReceivedBlockNumber", highestReceivedBlockNumber, "blockNumber", bh.Number, "nodeState", n.State())
 				highestReceivedBlockNumber = bh.Number
 			} else {
-				logger.Tracew(lggr, "Ignoring previously seen block number", "latestReceivedBlockNumber", highestReceivedBlockNumber, "blockNumber", bh.Number, "nodeState", n.State())
+				lggr.Tracew("Ignoring previously seen block number", "latestReceivedBlockNumber", highestReceivedBlockNumber, "blockNumber", bh.Number, "nodeState", n.State())
 			}
 			if outOfSyncT != nil {
 				outOfSyncT.Reset(noNewHeadsTimeoutThreshold)
@@ -212,7 +211,7 @@ func (n *node) aliveLoop() {
 			lggr.Errorw(fmt.Sprintf("RPC endpoint detected out of sync; no new heads received for %s (last head received was %v)", noNewHeadsTimeoutThreshold, highestReceivedBlockNumber), "nodeState", n.State(), "latestReceivedBlockNumber", highestReceivedBlockNumber, "noNewHeadsTimeoutThreshold", noNewHeadsTimeoutThreshold)
 			if n.nLiveNodes != nil {
 				if l, _, _ := n.nLiveNodes(); l < 2 {
-					logger.Criticalf(lggr, "RPC endpoint detected out of sync; %s %s", msgCannotDisable, msgDegradedState)
+					lggr.Criticalf("RPC endpoint detected out of sync; %s %s", msgCannotDisable, msgDegradedState)
 					// We don't necessarily want to wait the full timeout to check again, we should
 					// check regularly and log noisily in this state
 					outOfSyncT.Reset(zombieNodeCheckInterval(n.noNewHeadsThreshold))
@@ -278,7 +277,7 @@ func (n *node) outOfSyncLoop(isOutOfSync func(num int64, td *big.Int) bool) {
 
 	outOfSyncAt := time.Now()
 
-	lggr := logger.Named(n.lfcLog, "OutOfSync")
+	lggr := logger.Sugared(logger.Named(n.lfcLog, "OutOfSync"))
 	lggr.Debugw("Trying to revive out-of-sync RPC node", "nodeState", n.State())
 
 	// Need to redial since out-of-sync nodes are automatically disconnected
@@ -295,7 +294,7 @@ func (n *node) outOfSyncLoop(isOutOfSync func(num int64, td *big.Int) bool) {
 		return
 	}
 
-	logger.Tracew(lggr, "Successfully subscribed to heads feed on out-of-sync RPC node", "nodeState", n.State())
+	lggr.Tracew("Successfully subscribed to heads feed on out-of-sync RPC node", "nodeState", n.State())
 
 	ch := make(chan *evmtypes.Head)
 	subCtx, cancel := n.makeQueryCtx(n.nodeCtx)
@@ -330,7 +329,7 @@ func (n *node) outOfSyncLoop(isOutOfSync func(num int64, td *big.Int) bool) {
 		case <-time.After(zombieNodeCheckInterval(n.noNewHeadsThreshold)):
 			if n.nLiveNodes != nil {
 				if l, _, _ := n.nLiveNodes(); l < 1 {
-					logger.Critical(lggr, "RPC endpoint is still out of sync, but there are no other available nodes. This RPC node will be forcibly moved back into the live pool in a degraded state")
+					lggr.Critical("RPC endpoint is still out of sync, but there are no other available nodes. This RPC node will be forcibly moved back into the live pool in a degraded state")
 					n.declareInSync()
 					return
 				}
@@ -360,7 +359,7 @@ func (n *node) unreachableLoop() {
 
 	unreachableAt := time.Now()
 
-	lggr := logger.Named(n.lfcLog, "Unreachable")
+	lggr := logger.Sugared(logger.Named(n.lfcLog, "Unreachable"))
 	lggr.Debugw("Trying to revive unreachable RPC node", "nodeState", n.State())
 
 	dialRetryBackoff := utils.NewRedialBackoff()
@@ -370,7 +369,7 @@ func (n *node) unreachableLoop() {
 		case <-n.nodeCtx.Done():
 			return
 		case <-time.After(dialRetryBackoff.Duration()):
-			logger.Tracew(lggr, "Trying to re-dial RPC node", "nodeState", n.State())
+			lggr.Tracew("Trying to re-dial RPC node", "nodeState", n.State())
 
 			err := n.dial(n.nodeCtx)
 			if err != nil {
diff --git a/core/chains/evm/client/pool.go b/core/chains/evm/client/pool.go
index afe592533c3..b2d5a4847a5 100644
--- a/core/chains/evm/client/pool.go
+++ b/core/chains/evm/client/pool.go
@@ -68,7 +68,7 @@ type Pool struct {
 	sendonlys           []SendOnlyNode
 	chainID             *big.Int
 	chainType           config.ChainType
-	logger              logger.Logger
+	logger              logger.SugaredLogger
 	selectionMode       string
 	noNewHeadsThreshold time.Duration
 	nodeSelector        NodeSelector
@@ -113,7 +113,7 @@ func NewPool(lggr logger.Logger, selectionMode string, leaseDuration time.Durati
 		sendonlys:           sendonlys,
 		chainID:             chainID,
 		chainType:           chainType,
-		logger:              lggr,
+		logger:              logger.Sugared(lggr),
 		selectionMode:       selectionMode,
 		noNewHeadsThreshold: noNewHeadsTreshold,
 		nodeSelector:        nodeSelector,
@@ -272,10 +272,10 @@ func (p *Pool) report() {
 	}
 
 	live := total - dead
-	logger.Tracew(p.logger, fmt.Sprintf("Pool state: %d/%d nodes are alive", live, total), "nodeStates", nodeStates)
+	p.logger.Tracew(fmt.Sprintf("Pool state: %d/%d nodes are alive", live, total), "nodeStates", nodeStates)
 	if total == dead {
 		rerr := fmt.Errorf("no EVM primary nodes available: 0/%d nodes are alive", total)
-		logger.Criticalw(p.logger, rerr.Error(), "nodeStates", nodeStates)
+		p.logger.Criticalw(rerr.Error(), "nodeStates", nodeStates)
 		p.SvcErrBuffer.Append(rerr)
 	} else if dead > 0 {
 		p.logger.Errorw(fmt.Sprintf("At least one EVM primary node is dead: %d/%d nodes are alive", live, total), "nodeStates", nodeStates)
@@ -320,7 +320,7 @@ func (p *Pool) selectNode() (node Node) {
 	p.activeNode = p.nodeSelector.Select()
 
 	if p.activeNode == nil {
-		logger.Criticalw(p.logger, "No live RPC nodes available", "NodeSelectionMode", p.nodeSelector.Name())
+		p.logger.Criticalw("No live RPC nodes available", "NodeSelectionMode", p.nodeSelector.Name())
 		errmsg := fmt.Errorf("no live nodes available for chain %s", p.chainID.String())
 		p.SvcErrBuffer.Append(errmsg)
 		return &erroringNode{errMsg: errmsg.Error()}
@@ -367,7 +367,7 @@ func (p *Pool) BatchCallContextAll(ctx context.Context, b []rpc.BatchElem) error
 			if err != nil {
 				p.logger.Debugw("Secondary node BatchCallContext failed", "err", err)
 			} else {
-				logger.Trace(p.logger, "Secondary node BatchCallContext success")
+				p.logger.Trace("Secondary node BatchCallContext success")
 			}
 		}(n)
 	}
diff --git a/core/chains/evm/client/rpc_client.go b/core/chains/evm/client/rpc_client.go
index 3cc90c4d8d9..627a2833109 100644
--- a/core/chains/evm/client/rpc_client.go
+++ b/core/chains/evm/client/rpc_client.go
@@ -55,7 +55,7 @@ type RPCCLient interface {
 }
 
 type rpcClient struct {
-	rpcLog  logger.Logger
+	rpcLog  logger.SugaredLogger
 	name    string
 	id      int32
 	chainID *big.Int
@@ -106,7 +106,7 @@ func NewRPCClient(
 		"client", r.String(),
 		"evmChainID", chainID,
 	)
-	r.rpcLog = logger.Named(lggr, "RPC")
+	r.rpcLog = logger.Sugared(lggr).Named("RPC")
 
 	return r
 }
@@ -117,9 +117,9 @@ func (r *rpcClient) Dial(callerCtx context.Context) error {
 	defer cancel()
 
 	promEVMPoolRPCNodeDials.WithLabelValues(r.chainID.String(), r.name).Inc()
-	lggr := logger.With(r.rpcLog, "wsuri", r.ws.uri.Redacted())
+	lggr := r.rpcLog.With("wsuri", r.ws.uri.Redacted())
 	if r.http != nil {
-		lggr = logger.With(lggr, "httpuri", r.http.uri.Redacted())
+		lggr = lggr.With("httpuri", r.http.uri.Redacted())
 	}
 	lggr.Debugw("RPC dial: evmclient.Client#dial")
 
@@ -148,7 +148,7 @@ func (r *rpcClient) Dial(callerCtx context.Context) error {
 // It can only return error if the URL is malformed.
 func (r *rpcClient) DialHTTP() error {
 	promEVMPoolRPCNodeDials.WithLabelValues(r.chainID.String(), r.name).Inc()
-	lggr := logger.With(r.rpcLog, "httpuri", r.ws.uri.Redacted())
+	lggr := r.rpcLog.With("httpuri", r.ws.uri.Redacted())
 	lggr.Debugw("RPC dial: evmclient.Client#dial")
 
 	var httprpc *rpc.Client
@@ -206,10 +206,7 @@ func (r *rpcClient) logResult(
 	promEVMPoolRPCNodeCalls.WithLabelValues(r.chainID.String(), r.name).Inc()
 	if err == nil {
 		promEVMPoolRPCNodeCallsSuccess.WithLabelValues(r.chainID.String(), r.name).Inc()
-		logger.Tracew(lggr,
-			fmt.Sprintf("evmclient.Client#%s RPC call success", callName),
-			results...,
-		)
+		logger.Sugared(lggr).Tracew(fmt.Sprintf("evmclient.Client#%s RPC call success", callName), results...)
 	} else {
 		promEVMPoolRPCNodeCallsFailed.WithLabelValues(r.chainID.String(), r.name).Inc()
 		lggr.Debugw(
@@ -299,7 +296,7 @@ func (r *rpcClient) CallContext(ctx context.Context, result interface{}, method
 		return err
 	}
 	defer cancel()
-	lggr := logger.With(r.newRqLggr(),
+	lggr := r.newRqLggr().With(
 		"method", method,
 		"args", args,
 	)
@@ -328,9 +325,9 @@ func (r *rpcClient) BatchCallContext(ctx context.Context, b []any) error {
 		batch[i] = arg.(rpc.BatchElem)
 	}
 	defer cancel()
-	lggr := logger.With(r.newRqLggr(), "nBatchElems", len(b), "batchElems", b)
+	lggr := r.newRqLggr().With("nBatchElems", len(b), "batchElems", b)
 
-	logger.Trace(lggr, "RPC call: evmclient.Client#BatchCallContext")
+	lggr.Trace("RPC call: evmclient.Client#BatchCallContext")
 	start := time.Now()
 	if http != nil {
 		err = r.wrapHTTP(http.rpc.BatchCallContext(ctx, batch))
@@ -350,7 +347,7 @@ func (r *rpcClient) Subscribe(ctx context.Context, channel chan<- *evmtypes.Head
 		return nil, err
 	}
 	defer cancel()
-	lggr := logger.With(r.newRqLggr(), "args", args)
+	lggr := r.newRqLggr().With("args", args)
 
 	lggr.Debug("RPC call: evmclient.Client#EthSubscribe")
 	start := time.Now()
@@ -385,7 +382,7 @@ func (r *rpcClient) TransactionReceiptGeth(ctx context.Context, txHash common.Ha
 		return nil, err
 	}
 	defer cancel()
-	lggr := logger.With(r.newRqLggr(), "txHash", txHash)
+	lggr := r.newRqLggr().With("txHash", txHash)
 
 	lggr.Debug("RPC call: evmclient.Client#TransactionReceipt")
 
@@ -411,7 +408,7 @@ func (r *rpcClient) TransactionByHash(ctx context.Context, txHash common.Hash) (
 		return nil, err
 	}
 	defer cancel()
-	lggr := logger.With(r.newRqLggr(), "txHash", txHash)
+	lggr := r.newRqLggr().With("txHash", txHash)
 
 	lggr.Debug("RPC call: evmclient.Client#TransactionByHash")
 
@@ -438,7 +435,7 @@ func (r *rpcClient) HeaderByNumber(ctx context.Context, number *big.Int) (header
 		return nil, err
 	}
 	defer cancel()
-	lggr := logger.With(r.newRqLggr(), "number", number)
+	lggr := r.newRqLggr().With("number", number)
 
 	lggr.Debug("RPC call: evmclient.Client#HeaderByNumber")
 	start := time.Now()
@@ -462,7 +459,7 @@ func (r *rpcClient) HeaderByHash(ctx context.Context, hash common.Hash) (header
 		return nil, err
 	}
 	defer cancel()
-	lggr := logger.With(r.newRqLggr(), "hash", hash)
+	lggr := r.newRqLggr().With("hash", hash)
 
 	lggr.Debug("RPC call: evmclient.Client#HeaderByHash")
 	start := time.Now()
@@ -515,7 +512,7 @@ func (r *rpcClient) BlockByHashGeth(ctx context.Context, hash common.Hash) (bloc
 		return nil, err
 	}
 	defer cancel()
-	lggr := logger.With(r.newRqLggr(), "hash", hash)
+	lggr := r.newRqLggr().With("hash", hash)
 
 	lggr.Debug("RPC call: evmclient.Client#BlockByHash")
 	start := time.Now()
@@ -541,7 +538,7 @@ func (r *rpcClient) BlockByNumberGeth(ctx context.Context, number *big.Int) (blo
 		return nil, err
 	}
 	defer cancel()
-	lggr := logger.With(r.newRqLggr(), "number", number)
+	lggr := r.newRqLggr().With("number", number)
 
 	lggr.Debug("RPC call: evmclient.Client#BlockByNumber")
 	start := time.Now()
@@ -567,7 +564,7 @@ func (r *rpcClient) SendTransaction(ctx context.Context, tx *types.Transaction)
 		return err
 	}
 	defer cancel()
-	lggr := logger.With(r.newRqLggr(), "tx", tx)
+	lggr := r.newRqLggr().With("tx", tx)
 
 	lggr.Debug("RPC call: evmclient.Client#SendTransaction")
 	start := time.Now()
@@ -607,7 +604,7 @@ func (r *rpcClient) PendingSequenceAt(ctx context.Context, account common.Addres
 		return 0, err
 	}
 	defer cancel()
-	lggr := logger.With(r.newRqLggr(), "account", account)
+	lggr := r.newRqLggr().With("account", account)
 
 	lggr.Debug("RPC call: evmclient.Client#PendingNonceAt")
 	start := time.Now()
@@ -639,7 +636,7 @@ func (r *rpcClient) SequenceAt(ctx context.Context, account common.Address, bloc
 		return 0, err
 	}
 	defer cancel()
-	lggr := logger.With(r.newRqLggr(), "account", account, "blockNumber", blockNumber)
+	lggr := r.newRqLggr().With("account", account, "blockNumber", blockNumber)
 
 	lggr.Debug("RPC call: evmclient.Client#NonceAt")
 	start := time.Now()
@@ -668,7 +665,7 @@ func (r *rpcClient) PendingCodeAt(ctx context.Context, account common.Address) (
 		return nil, err
 	}
 	defer cancel()
-	lggr := logger.With(r.newRqLggr(), "account", account)
+	lggr := r.newRqLggr().With("account", account)
 
 	lggr.Debug("RPC call: evmclient.Client#PendingCodeAt")
 	start := time.Now()
@@ -694,7 +691,7 @@ func (r *rpcClient) CodeAt(ctx context.Context, account common.Address, blockNum
 		return nil, err
 	}
 	defer cancel()
-	lggr := logger.With(r.newRqLggr(), "account", account, "blockNumber", blockNumber)
+	lggr := r.newRqLggr().With("account", account, "blockNumber", blockNumber)
 
 	lggr.Debug("RPC call: evmclient.Client#CodeAt")
 	start := time.Now()
@@ -721,7 +718,7 @@ func (r *rpcClient) EstimateGas(ctx context.Context, c interface{}) (gas uint64,
 	}
 	defer cancel()
 	call := c.(ethereum.CallMsg)
-	lggr := logger.With(r.newRqLggr(), "call", call)
+	lggr := r.newRqLggr().With("call", call)
 
 	lggr.Debug("RPC call: evmclient.Client#EstimateGas")
 	start := time.Now()
@@ -773,7 +770,7 @@ func (r *rpcClient) CallContract(ctx context.Context, msg interface{}, blockNumb
 		return nil, err
 	}
 	defer cancel()
-	lggr := logger.With(r.newRqLggr(), "callMsg", msg, "blockNumber", blockNumber)
+	lggr := r.newRqLggr().With("callMsg", msg, "blockNumber", blockNumber)
 	message := msg.(ethereum.CallMsg)
 
 	lggr.Debug("RPC call: evmclient.Client#CallContract")
@@ -833,7 +830,7 @@ func (r *rpcClient) BalanceAt(ctx context.Context, account common.Address, block
 		return nil, err
 	}
 	defer cancel()
-	lggr := logger.With(r.newRqLggr(), "account", account.Hex(), "blockNumber", blockNumber)
+	lggr := r.newRqLggr().With("account", account.Hex(), "blockNumber", blockNumber)
 
 	lggr.Debug("RPC call: evmclient.Client#BalanceAt")
 	start := time.Now()
@@ -892,7 +889,7 @@ func (r *rpcClient) FilterLogs(ctx context.Context, q ethereum.FilterQuery) (l [
 		return nil, err
 	}
 	defer cancel()
-	lggr := logger.With(r.newRqLggr(), "q", q)
+	lggr := r.newRqLggr().With("q", q)
 
 	lggr.Debug("RPC call: evmclient.Client#FilterLogs")
 	start := time.Now()
@@ -923,7 +920,7 @@ func (r *rpcClient) SubscribeFilterLogs(ctx context.Context, q ethereum.FilterQu
 		return nil, err
 	}
 	defer cancel()
-	lggr := logger.With(r.newRqLggr(), "q", q)
+	lggr := r.newRqLggr().With("q", q)
 
 	lggr.Debug("RPC call: evmclient.Client#SubscribeFilterLogs")
 	start := time.Now()
@@ -983,10 +980,8 @@ func (r *rpcClient) ChainID(ctx context.Context) (chainID *big.Int, err error) {
 }
 
 // newRqLggr generates a new logger with a unique request ID
-func (r *rpcClient) newRqLggr() logger.Logger {
-	return logger.With(r.rpcLog,
-		"requestID", uuid.New(),
-	)
+func (r *rpcClient) newRqLggr() logger.SugaredLogger {
+	return r.rpcLog.With("requestID", uuid.New())
 }
 
 func wrapCallError(err error, tp string) error {
@@ -1009,7 +1004,7 @@ func (r *rpcClient) wrapHTTP(err error) error {
 	if err != nil {
 		r.rpcLog.Debugw("Call failed", "err", err)
 	} else {
-		logger.Trace(r.rpcLog, "Call succeeded")
+		r.rpcLog.Trace("Call succeeded")
 	}
 	return err
 }
diff --git a/core/chains/evm/gas/block_history_estimator.go b/core/chains/evm/gas/block_history_estimator.go
index 844b9e547f2..dc95240fd42 100644
--- a/core/chains/evm/gas/block_history_estimator.go
+++ b/core/chains/evm/gas/block_history_estimator.go
@@ -198,7 +198,7 @@ func (b *BlockHistoryEstimator) getBlocks() []evmtypes.Block {
 // The provided context can be used to terminate Start sequence.
 func (b *BlockHistoryEstimator) Start(ctx context.Context) error {
 	return b.StartOnce("BlockHistoryEstimator", func() error {
-		logger.Trace(b.logger, "Starting")
+		b.logger.Trace("Starting")
 
 		if b.bhConfig.CheckInclusionBlocks() > 0 {
 			b.logger.Infof("Inclusion checking enabled, bumping will be prevented on transactions that have been priced above the %d percentile for %d blocks", b.bhConfig.CheckInclusionPercentile(), b.bhConfig.CheckInclusionBlocks())
@@ -228,7 +228,7 @@ func (b *BlockHistoryEstimator) Start(ctx context.Context) error {
 		b.wg.Add(1)
 		go b.runLoop()
 
-		logger.Trace(b.logger, "Started")
+		b.logger.Trace("Started")
 		return nil
 	})
 }
@@ -291,7 +291,7 @@ func (b *BlockHistoryEstimator) BumpLegacyGas(_ context.Context, originalGasPric
 	if b.bhConfig.CheckInclusionBlocks() > 0 {
 		if err = b.checkConnectivity(attempts); err != nil {
 			if errors.Is(err, commonfee.ErrConnectivity) {
-				logger.Criticalw(b.logger, BumpingHaltedLabel, "err", err)
+				b.logger.Criticalw(BumpingHaltedLabel, "err", err)
 				b.SvcErrBuffer.Append(err)
 				promBlockHistoryEstimatorConnectivityFailureCount.WithLabelValues(b.chainID.String(), "legacy").Inc()
 			}
@@ -467,7 +467,7 @@ func (b *BlockHistoryEstimator) BumpDynamicFee(_ context.Context, originalFee Dy
 	if b.bhConfig.CheckInclusionBlocks() > 0 {
 		if err = b.checkConnectivity(attempts); err != nil {
 			if errors.Is(err, commonfee.ErrConnectivity) {
-				logger.Criticalw(b.logger, BumpingHaltedLabel, "err", err)
+				b.logger.Criticalw(BumpingHaltedLabel, "err", err)
 				b.SvcErrBuffer.Append(err)
 				promBlockHistoryEstimatorConnectivityFailureCount.WithLabelValues(b.chainID.String(), "eip1559").Inc()
 			}
@@ -508,7 +508,7 @@ func (b *BlockHistoryEstimator) FetchBlocksAndRecalculate(ctx context.Context, h
 func (b *BlockHistoryEstimator) Recalculate(head *evmtypes.Head) {
 	percentile := int(b.bhConfig.TransactionPercentile())
 
-	lggr := logger.With(b.logger, "head", head)
+	lggr := b.logger.With("head", head)
 
 	blockHistory := b.getBlocks()
 	if len(blockHistory) == 0 {
@@ -630,9 +630,9 @@ func (b *BlockHistoryEstimator) FetchBlocks(ctx context.Context, head *evmtypes.
 		reqs = append(reqs, req)
 	}
 
-	lggr := logger.With(b.logger, "head", head)
+	lggr := b.logger.With("head", head)
 
-	logger.Tracew(lggr, fmt.Sprintf("Fetching %v blocks (%v in local history)", len(reqs), len(blocks)), "n", len(reqs), "inHistory", len(blocks), "blockNum", head.Number)
+	lggr.Tracew(fmt.Sprintf("Fetching %v blocks (%v in local history)", len(reqs), len(blocks)), "n", len(reqs), "inHistory", len(blocks), "blockNum", head.Number)
 	if err := b.batchFetch(ctx, reqs); err != nil {
 		return err
 	}
@@ -713,7 +713,7 @@ func (b *BlockHistoryEstimator) batchFetch(ctx context.Context, reqs []rpc.Batch
 			j = len(reqs)
 		}
 
-		logger.Tracew(b.logger, fmt.Sprintf("Batch fetching blocks %v thru %v", HexToInt64(reqs[i].Args[0]), HexToInt64(reqs[j-1].Args[0])))
+		b.logger.Tracew(fmt.Sprintf("Batch fetching blocks %v thru %v", HexToInt64(reqs[i].Args[0]), HexToInt64(reqs[j-1].Args[0])))
 
 		err := b.ethClient.BatchCallContext(ctx, reqs[i:j])
 		if errors.Is(err, context.DeadlineExceeded) {
diff --git a/core/chains/evm/gas/rollups/l1_gas_price_oracle.go b/core/chains/evm/gas/rollups/l1_gas_price_oracle.go
index 6a384fa9c54..ce1a50aa320 100644
--- a/core/chains/evm/gas/rollups/l1_gas_price_oracle.go
+++ b/core/chains/evm/gas/rollups/l1_gas_price_oracle.go
@@ -31,7 +31,7 @@ type l1GasPriceOracle struct {
 	services.StateMachine
 	client     ethClient
 	pollPeriod time.Duration
-	logger     logger.Logger
+	logger     logger.SugaredLogger
 	address    string
 	callArgs   string
 
@@ -94,7 +94,7 @@ func NewL1GasPriceOracle(lggr logger.Logger, ethClient ethClient, chainType conf
 	return &l1GasPriceOracle{
 		client:        ethClient,
 		pollPeriod:    PollPeriod,
-		logger:        logger.Named(lggr, fmt.Sprintf("L1GasPriceOracle(%s)", chainType)),
+		logger:        logger.Sugared(logger.Named(lggr, fmt.Sprintf("L1GasPriceOracle(%s)", chainType))),
 		address:       address,
 		callArgs:      callArgs,
 		chInitialised: make(chan struct{}),
@@ -159,7 +159,7 @@ func (o *l1GasPriceOracle) refresh() (t *time.Timer) {
 	}
 
 	if len(b) != 32 { // returns uint256;
-		logger.Criticalf(o.logger, "return data length (%d) different than expected (%d)", len(b), 32)
+		o.logger.Criticalf("return data length (%d) different than expected (%d)", len(b), 32)
 		return
 	}
 	price := new(big.Int).SetBytes(b)
diff --git a/core/chains/evm/log/helpers_test.go b/core/chains/evm/log/helpers_test.go
index 13dfe1ffab6..cea2e361184 100644
--- a/core/chains/evm/log/helpers_test.go
+++ b/core/chains/evm/log/helpers_test.go
@@ -241,7 +241,7 @@ func (rec *received) logsOnBlocks() []logOnBlock {
 
 type simpleLogListener struct {
 	name                string
-	lggr                logger.Logger
+	lggr                logger.SugaredLogger
 	cfg                 pg.QConfig
 	received            *received
 	t                   *testing.T
@@ -266,7 +266,7 @@ func (helper *broadcasterHelper) newLogListenerWithJob(name string) *simpleLogLi
 	var rec received
 	return &simpleLogListener{
 		db:       db,
-		lggr:     logger.Test(t),
+		lggr:     logger.Sugared(logger.Test(t)),
 		cfg:      helper.config.Database(),
 		name:     name,
 		received: &rec,
@@ -282,7 +282,7 @@ func (listener *simpleLogListener) SkipMarkingConsumed(skip bool) {
 func (listener *simpleLogListener) HandleLog(lb log.Broadcast) {
 	listener.received.Lock()
 	defer listener.received.Unlock()
-	logger.Tracef(listener.lggr, "Listener %v HandleLog for block %v %v received at %v %v", listener.name, lb.RawLog().BlockNumber, lb.RawLog().BlockHash, lb.LatestBlockNumber(), lb.LatestBlockHash())
+	listener.lggr.Tracef("Listener %v HandleLog for block %v %v received at %v %v", listener.name, lb.RawLog().BlockNumber, lb.RawLog().BlockHash, lb.LatestBlockNumber(), lb.LatestBlockHash())
 
 	listener.received.logs = append(listener.received.logs, lb.RawLog())
 	listener.received.broadcasts = append(listener.received.broadcasts, lb)
diff --git a/core/chains/evm/log/registrations.go b/core/chains/evm/log/registrations.go
index 73f197a6ab6..346a6776e86 100644
--- a/core/chains/evm/log/registrations.go
+++ b/core/chains/evm/log/registrations.go
@@ -46,7 +46,7 @@ type (
 
 		// handlersByConfs maps numConfirmations => *handler
 		handlersByConfs map[uint32]*handler
-		logger          logger.Logger
+		logger          logger.SugaredLogger
 		evmChainID      big.Int
 
 		// highest 'NumConfirmations' per all listeners, used to decide about deleting older logs if it's higher than EvmFinalityDepth
@@ -57,7 +57,7 @@ type (
 	handler struct {
 		lookupSubs map[common.Address]map[common.Hash]subscribers // contractAddress => logTopic => *subscriber => topicValueFilters
 		evmChainID big.Int
-		logger     logger.Logger
+		logger     logger.SugaredLogger
 	}
 
 	// The Listener responds to log events through HandleLog.
@@ -76,7 +76,7 @@ func newRegistrations(lggr logger.Logger, evmChainID big.Int) *registrations {
 		jobIDAddrs:      make(map[int32]map[common.Address]struct{}),
 		handlersByConfs: make(map[uint32]*handler),
 		evmChainID:      evmChainID,
-		logger:          logger.Named(lggr, "Registrations"),
+		logger:          logger.Sugared(logger.Named(lggr, "Registrations")),
 	}
 }
 
@@ -85,7 +85,7 @@ func (r *registrations) addSubscriber(sub *subscriber) (needsResubscribe bool) {
 		r.logger.Panicw(err.Error(), "err", err, "addr", sub.opts.Contract.Hex(), "jobID", sub.listener.JobID())
 	}
 
-	logger.Tracef(r.logger, "Added subscription %p with job ID %v", sub, sub.listener.JobID())
+	r.logger.Tracef("Added subscription %p with job ID %v", sub, sub.listener.JobID())
 
 	handler, exists := r.handlersByConfs[sub.opts.MinIncomingConfirmations]
 	if !exists {
@@ -142,7 +142,7 @@ func (r *registrations) removeSubscriber(sub *subscriber) (needsResubscribe bool
 	if err := r.checkRemoveSubscriber(sub); err != nil {
 		r.logger.Panicw(err.Error(), "err", err, "addr", sub.opts.Contract.Hex(), "jobID", sub.listener.JobID())
 	}
-	logger.Tracef(r.logger, "Removed subscription %p with job ID %v", sub, sub.listener.JobID())
+	r.logger.Tracef("Removed subscription %p with job ID %v", sub, sub.listener.JobID())
 
 	handlers, exists := r.handlersByConfs[sub.opts.MinIncomingConfirmations]
 	if !exists {
@@ -263,7 +263,7 @@ func filtersContainValues(topicValues []common.Hash, filters [][]Topic) bool {
 	return true
 }
 
-func newHandler(lggr logger.Logger, evmChainID big.Int) *handler {
+func newHandler(lggr logger.SugaredLogger, evmChainID big.Int) *handler {
 	return &handler{
 		lookupSubs: make(map[common.Address]map[common.Hash]subscribers),
 		evmChainID: evmChainID,
@@ -284,7 +284,7 @@ func (r *handler) addSubscriber(sub *subscriber, handlersWithGreaterConfs []*han
 
 	for topic, topicValueFilters := range sub.opts.LogsWithTopics {
 		if _, exists := r.lookupSubs[addr][topic]; !exists {
-			logger.Tracef(r.logger, "No existing sub for addr %s and topic %s at this MinIncomingConfirmations of %v", addr.Hex(), topic.Hex(), sub.opts.MinIncomingConfirmations)
+			r.logger.Tracef("No existing sub for addr %s and topic %s at this MinIncomingConfirmations of %v", addr.Hex(), topic.Hex(), sub.opts.MinIncomingConfirmations)
 			r.lookupSubs[addr][topic] = make(subscribers)
 
 			func() {
@@ -295,11 +295,11 @@ func (r *handler) addSubscriber(sub *subscriber, handlersWithGreaterConfs []*han
 					// again since even the worst case lookback is already covered
 					for _, existingHandler := range handlersWithGreaterConfs {
 						if _, exists := existingHandler.lookupSubs[addr][topic]; exists {
-							logger.Tracef(r.logger, "Sub already exists for addr %s and topic %s at greater than this MinIncomingConfirmations of %v. Resubscribe is not required", addr.Hex(), topic.Hex(), sub.opts.MinIncomingConfirmations)
+							r.logger.Tracef("Sub already exists for addr %s and topic %s at greater than this MinIncomingConfirmations of %v. Resubscribe is not required", addr.Hex(), topic.Hex(), sub.opts.MinIncomingConfirmations)
 							return
 						}
 					}
-					logger.Tracef(r.logger, "No sub exists for addr %s and topic %s at this or greater MinIncomingConfirmations of %v. Resubscribe is required", addr.Hex(), topic.Hex(), sub.opts.MinIncomingConfirmations)
+					r.logger.Tracef("No sub exists for addr %s and topic %s at this or greater MinIncomingConfirmations of %v. Resubscribe is required", addr.Hex(), topic.Hex(), sub.opts.MinIncomingConfirmations)
 					needsResubscribe = true
 				}
 			}()
@@ -332,7 +332,7 @@ func (r *handler) removeSubscriber(sub *subscriber, allHandlers map[uint32]*hand
 
 		// cleanup and resubscribe if necessary
 		if len(topicMap) == 0 {
-			logger.Tracef(r.logger, "No subs left for addr %s and topic %s at this MinIncomingConfirmations of %v", addr.Hex(), topic.Hex(), sub.opts.MinIncomingConfirmations)
+			r.logger.Tracef("No subs left for addr %s and topic %s at this MinIncomingConfirmations of %v", addr.Hex(), topic.Hex(), sub.opts.MinIncomingConfirmations)
 
 			func() {
 				if !needsResubscribe {
@@ -344,12 +344,12 @@ func (r *handler) removeSubscriber(sub *subscriber, allHandlers map[uint32]*hand
 							continue
 						}
 						if _, exists := otherHandler.lookupSubs[addr][topic]; exists {
-							logger.Tracef(r.logger, "Sub still exists for addr %s and topic %s. Resubscribe will not be performed", addr.Hex(), topic.Hex())
+							r.logger.Tracef("Sub still exists for addr %s and topic %s. Resubscribe will not be performed", addr.Hex(), topic.Hex())
 							return
 						}
 					}
 
-					logger.Tracef(r.logger, "No sub exists for addr %s and topic %s. Resubscribe will be performed", addr.Hex(), topic.Hex())
+					r.logger.Tracef("No sub exists for addr %s and topic %s. Resubscribe will be performed", addr.Hex(), topic.Hex())
 					needsResubscribe = true
 				}
 			}()
diff --git a/core/chains/evm/logpoller/log_poller.go b/core/chains/evm/logpoller/log_poller.go
index 991cc8d4309..7bc131afef4 100644
--- a/core/chains/evm/logpoller/log_poller.go
+++ b/core/chains/evm/logpoller/log_poller.go
@@ -98,7 +98,7 @@ type logPoller struct {
 	services.StateMachine
 	ec                       Client
 	orm                      ORM
-	lggr                     logger.Logger
+	lggr                     logger.SugaredLogger
 	pollPeriod               time.Duration // poll period set by block production rate
 	useFinalityTag           bool          // indicates whether logPoller should use chain's finality or pick a fixed depth for finality
 	finalityDepth            int64         // finality depth is taken to mean that block (head - finality) is finalized. If `useFinalityTag` is set to true, this value is ignored, because finalityDepth is fetched from chain
@@ -138,7 +138,7 @@ func NewLogPoller(orm ORM, ec Client, lggr logger.Logger, pollPeriod time.Durati
 		cancel:                   cancel,
 		ec:                       ec,
 		orm:                      orm,
-		lggr:                     logger.Named(lggr, "LogPoller"),
+		lggr:                     logger.Sugared(logger.Named(lggr, "LogPoller")),
 		replayStart:              make(chan int64),
 		replayComplete:           make(chan error),
 		pollPeriod:               pollPeriod,
@@ -666,7 +666,7 @@ func (lp *logPoller) backfill(ctx context.Context, start, end int64) error {
 				}
 			}
 			if batchSize == 1 {
-				logger.Criticalw(lp.lggr, "Too many log results in a single block, failed to retrieve logs! Node may be running in a degraded state.", "err", err, "from", from, "to", to, "LogBackfillBatchSize", lp.backfillBatchSize)
+				lp.lggr.Criticalw("Too many log results in a single block, failed to retrieve logs! Node may be running in a degraded state.", "err", err, "from", from, "to", to, "LogBackfillBatchSize", lp.backfillBatchSize)
 				return err
 			}
 			batchSize /= 2
@@ -921,7 +921,7 @@ func (lp *logPoller) findBlockAfterLCA(ctx context.Context, current *evmtypes.He
 			return nil, err
 		}
 	}
-	logger.Criticalw(lp.lggr, "Reorg greater than finality depth detected", "finalityTag", lp.useFinalityTag, "current", current.Number, "latestFinalized", latestFinalizedBlockNumber)
+	lp.lggr.Criticalw("Reorg greater than finality depth detected", "finalityTag", lp.useFinalityTag, "current", current.Number, "latestFinalized", latestFinalizedBlockNumber)
 	rerr := errors.New("Reorg greater than finality depth")
 	lp.SvcErrBuffer.Append(rerr)
 	return nil, rerr
diff --git a/core/chains/evm/txmgr/broadcaster_test.go b/core/chains/evm/txmgr/broadcaster_test.go
index f676d3d18e2..68a81299bf9 100644
--- a/core/chains/evm/txmgr/broadcaster_test.go
+++ b/core/chains/evm/txmgr/broadcaster_test.go
@@ -2033,7 +2033,7 @@ type testChecker struct {
 
 func (t *testChecker) Check(
 	_ context.Context,
-	_ logger.Logger,
+	_ logger.SugaredLogger,
 	_ txmgr.Tx,
 	_ txmgr.TxAttempt,
 ) error {
diff --git a/core/chains/evm/txmgr/client.go b/core/chains/evm/txmgr/client.go
index d08274f74b6..dc7b62647c0 100644
--- a/core/chains/evm/txmgr/client.go
+++ b/core/chains/evm/txmgr/client.go
@@ -43,7 +43,7 @@ func (c *evmTxmClient) BatchSendTransactions(
 	ctx context.Context,
 	attempts []TxAttempt,
 	batchSize int,
-	lggr logger.Logger,
+	lggr logger.SugaredLogger,
 ) (
 	codes []commonclient.SendTxReturnCode,
 	txErrs []error,
@@ -62,7 +62,7 @@ func (c *evmTxmClient) BatchSendTransactions(
 	if len(reqs) != len(attempts) {
 		lenErr := fmt.Errorf("Returned request data length (%d) != number of tx attempts (%d)", len(reqs), len(attempts))
 		err = errors.Join(err, lenErr)
-		logger.Criticalw(lggr, "Mismatched length", "err", err)
+		lggr.Criticalw("Mismatched length", "err", err)
 		return
 	}
 
@@ -88,10 +88,10 @@ func (c *evmTxmClient) BatchSendTransactions(
 	return
 }
 
-func (c *evmTxmClient) SendTransactionReturnCode(ctx context.Context, etx Tx, attempt TxAttempt, lggr logger.Logger) (commonclient.SendTxReturnCode, error) {
+func (c *evmTxmClient) SendTransactionReturnCode(ctx context.Context, etx Tx, attempt TxAttempt, lggr logger.SugaredLogger) (commonclient.SendTxReturnCode, error) {
 	signedTx, err := GetGethSignedTx(attempt.SignedRawTx)
 	if err != nil {
-		logger.Criticalw(lggr, "Fatal error signing transaction", "err", err, "etx", etx)
+		lggr.Criticalw("Fatal error signing transaction", "err", err, "etx", etx)
 		return commonclient.Fatal, err
 	}
 	return c.client.SendTransactionReturnCode(ctx, signedTx, etx.FromAddress)
diff --git a/core/chains/evm/txmgr/evm_tx_store.go b/core/chains/evm/txmgr/evm_tx_store.go
index bb2a30e51dd..f9014163675 100644
--- a/core/chains/evm/txmgr/evm_tx_store.go
+++ b/core/chains/evm/txmgr/evm_tx_store.go
@@ -75,7 +75,7 @@ type TestEvmTxStore interface {
 
 type evmTxStore struct {
 	q         pg.Q
-	logger    logger.Logger
+	logger    logger.SugaredLogger
 	ctx       context.Context
 	ctxCancel context.CancelFunc
 }
@@ -340,7 +340,7 @@ func NewTxStore(
 	q := pg.NewQ(db, namedLogger, cfg, pg.WithParentCtx(ctx))
 	return &evmTxStore{
 		q:         q,
-		logger:    namedLogger,
+		logger:    logger.Sugared(namedLogger),
 		ctx:       ctx,
 		ctxCancel: cancel,
 	}
@@ -1499,7 +1499,7 @@ GROUP BY e.id
 				txHashesHex[i] = common.BytesToAddress(r.TxHashes[i])
 			}
 
-			logger.Criticalw(o.logger, fmt.Sprintf("eth_tx with ID %v expired without ever getting a receipt for any of our attempts. "+
+			o.logger.Criticalw(fmt.Sprintf("eth_tx with ID %v expired without ever getting a receipt for any of our attempts. "+
 				"Current block height is %v, transaction was broadcast before block height %v. This transaction may not have not been sent and will be marked as fatally errored. "+
 				"This can happen if there is another instance of chainlink running that is using the same private key, or if "+
 				"an external wallet has been used to send a transaction from account %s with nonce %v."+
diff --git a/core/chains/evm/txmgr/transmitchecker.go b/core/chains/evm/txmgr/transmitchecker.go
index 76dfcb9d51c..919fb509fee 100644
--- a/core/chains/evm/txmgr/transmitchecker.go
+++ b/core/chains/evm/txmgr/transmitchecker.go
@@ -110,7 +110,7 @@ type noChecker struct{}
 // Check satisfies the TransmitChecker interface.
 func (noChecker) Check(
 	_ context.Context,
-	_ logger.Logger,
+	_ logger.SugaredLogger,
 	_ Tx,
 	_ TxAttempt,
 ) error {
@@ -125,7 +125,7 @@ type SimulateChecker struct {
 // Check satisfies the TransmitChecker interface.
 func (s *SimulateChecker) Check(
 	ctx context.Context,
-	l logger.Logger,
+	l logger.SugaredLogger,
 	tx Tx,
 	a TxAttempt,
 ) error {
@@ -148,7 +148,7 @@ func (s *SimulateChecker) Check(
 	err := s.Client.CallContext(ctx, &b, "eth_call", callArg, evmclient.ToBlockNumArg(nil))
 	if err != nil {
 		if jErr := evmclient.ExtractRPCErrorOrNil(err); jErr != nil {
-			logger.Criticalw(l, "Transaction reverted during simulation",
+			l.Criticalw("Transaction reverted during simulation",
 				"ethTxAttemptID", a.ID, "txHash", a.Hash, "err", err, "rpcErr", jErr.String(), "returnValue", b.String())
 			return errors.Errorf("transaction reverted during simulation: %s", jErr.String())
 		}
@@ -175,7 +175,7 @@ type VRFV1Checker struct {
 // Check satisfies the TransmitChecker interface.
 func (v *VRFV1Checker) Check(
 	ctx context.Context,
-	l logger.Logger,
+	l logger.SugaredLogger,
 	tx Tx,
 	_ TxAttempt,
 ) error {
@@ -284,7 +284,7 @@ type VRFV2Checker struct {
 // Check satisfies the TransmitChecker interface.
 func (v *VRFV2Checker) Check(
 	ctx context.Context,
-	l logger.Logger,
+	l logger.SugaredLogger,
 	tx Tx,
 	_ TxAttempt,
 ) error {
diff --git a/core/chains/evm/txmgr/transmitchecker_test.go b/core/chains/evm/txmgr/transmitchecker_test.go
index 6dd4edd91c6..d2f668da11b 100644
--- a/core/chains/evm/txmgr/transmitchecker_test.go
+++ b/core/chains/evm/txmgr/transmitchecker_test.go
@@ -106,7 +106,7 @@ func TestFactory(t *testing.T) {
 
 func TestTransmitCheckers(t *testing.T) {
 	client := evmtest.NewEthClientMockWithDefaultChain(t)
-	log := logger.Test(t)
+	log := logger.Sugared(logger.Test(t))
 	ctx := testutils.Context(t)
 
 	t.Run("no checker", func(t *testing.T) {
diff --git a/core/scripts/go.mod b/core/scripts/go.mod
index c5327596272..db71535723e 100644
--- a/core/scripts/go.mod
+++ b/core/scripts/go.mod
@@ -237,7 +237,7 @@ require (
 	github.com/shirou/gopsutil/v3 v3.23.11 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231206181640-faad3f11cfad // indirect
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231213134506-b6c433e6c490 // indirect
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231206164210-03f8b219402e // indirect
 	github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 // indirect
 	github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d // indirect
diff --git a/core/scripts/go.sum b/core/scripts/go.sum
index 28750a076d5..1c48074ea3a 100644
--- a/core/scripts/go.sum
+++ b/core/scripts/go.sum
@@ -1148,8 +1148,8 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
 github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
 github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231206181640-faad3f11cfad h1:ysPjfbCPJuVxxFZa1Ifv8OPE20pzvnEHjJrPDUo4gT0=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231206181640-faad3f11cfad/go.mod h1:IdlfCN9rUs8Q/hrOYe8McNBIwEOHEsi0jilb3Cw77xs=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231213134506-b6c433e6c490 h1:lSYiaiIfAA+5ac45/UD8ciytlNw/S6fnhK7bxFHYI88=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231213134506-b6c433e6c490/go.mod h1:IdlfCN9rUs8Q/hrOYe8McNBIwEOHEsi0jilb3Cw77xs=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231206164210-03f8b219402e h1:xvqffqFec2HkEcUKrCkm4FDJRnn/+gHmvrE/dz3Zlw8=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231206164210-03f8b219402e/go.mod h1:soVgcl4CbfR6hC9UptjuCQhz19HJaFEjwnOpiySkxg0=
 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ=
diff --git a/core/services/pg/q.go b/core/services/pg/q.go
index 050606c7937..e69e16ec48f 100644
--- a/core/services/pg/q.go
+++ b/core/services/pg/q.go
@@ -118,7 +118,7 @@ type Q struct {
 	Queryer
 	ParentCtx    context.Context
 	db           *sqlx.DB
-	logger       logger.Logger
+	logger       logger.SugaredLogger
 	config       QConfig
 	QueryTimeout time.Duration
 }
@@ -130,7 +130,7 @@ func NewQ(db *sqlx.DB, lggr logger.Logger, config QConfig, qopts ...QOpt) (q Q)
 
 	q.db = db
 	// skip two levels since we use internal helpers and also want to point up the stack to the caller of the Q method.
-	q.logger = logger.Helper(lggr, 2)
+	q.logger = logger.Sugared(logger.Helper(lggr, 2))
 	q.config = config
 
 	if q.Queryer == nil {
@@ -356,7 +356,7 @@ func (q *queryLogger) postSqlLog(ctx context.Context, begin time.Time) {
 	kvs := []any{"ms", elapsed.Milliseconds(), "timeout", timeout.Milliseconds(), "percent", strconv.FormatFloat(pct, 'f', 1, 64), "sql", q}
 
 	if elapsed >= timeout {
-		logger.Criticalw(q.logger, "SLOW SQL QUERY", kvs...)
+		q.logger.Criticalw("SLOW SQL QUERY", kvs...)
 	} else if errThreshold := timeout / 5; errThreshold > 0 && elapsed > errThreshold {
 		q.logger.Errorw("SLOW SQL QUERY", kvs...)
 	} else if warnThreshold := timeout / 10; warnThreshold > 0 && elapsed > warnThreshold {
diff --git a/go.mod b/go.mod
index e7b93c40bdb..c71705d9c92 100644
--- a/go.mod
+++ b/go.mod
@@ -65,7 +65,7 @@ require (
 	github.com/shopspring/decimal v1.3.1
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704
 	github.com/smartcontractkit/chainlink-automation v1.0.1
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231206181640-faad3f11cfad
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231213134506-b6c433e6c490
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231206164210-03f8b219402e
 	github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1
 	github.com/smartcontractkit/chainlink-feeds v0.0.0-20231127231053-2232d3a6766d
diff --git a/go.sum b/go.sum
index e9a7f0267ad..b38b7ac2632 100644
--- a/go.sum
+++ b/go.sum
@@ -1134,8 +1134,8 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
 github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
 github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231206181640-faad3f11cfad h1:ysPjfbCPJuVxxFZa1Ifv8OPE20pzvnEHjJrPDUo4gT0=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231206181640-faad3f11cfad/go.mod h1:IdlfCN9rUs8Q/hrOYe8McNBIwEOHEsi0jilb3Cw77xs=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231213134506-b6c433e6c490 h1:lSYiaiIfAA+5ac45/UD8ciytlNw/S6fnhK7bxFHYI88=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231213134506-b6c433e6c490/go.mod h1:IdlfCN9rUs8Q/hrOYe8McNBIwEOHEsi0jilb3Cw77xs=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231206164210-03f8b219402e h1:xvqffqFec2HkEcUKrCkm4FDJRnn/+gHmvrE/dz3Zlw8=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231206164210-03f8b219402e/go.mod h1:soVgcl4CbfR6hC9UptjuCQhz19HJaFEjwnOpiySkxg0=
 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ=
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index 84da65e9a5d..9f0ff1b384c 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/segmentio/ksuid v1.0.4
 	github.com/slack-go/slack v0.12.2
 	github.com/smartcontractkit/chainlink-automation v1.0.1
-	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231206181640-faad3f11cfad
+	github.com/smartcontractkit/chainlink-common v0.1.7-0.20231213134506-b6c433e6c490
 	github.com/smartcontractkit/chainlink-testing-framework v1.22.0
 	github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
 	github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index 854978e3353..f8a9529a4cc 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -1411,7 +1411,6 @@ github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMT
 github.com/shirou/gopsutil/v3 v3.23.11 h1:i3jP9NjCPUz7FiZKxlMnODZkdSIp2gnzfrvsu9CuWEQ=
 github.com/shirou/gopsutil/v3 v3.23.11/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM=
 github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
-github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
 github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
 github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
 github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
@@ -1433,8 +1432,8 @@ github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumv
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
 github.com/smartcontractkit/chainlink-automation v1.0.1 h1:vVjBFq2Zsz21kPy1Pb0wpjF9zrbJX+zjXphDeeR4XZk=
 github.com/smartcontractkit/chainlink-automation v1.0.1/go.mod h1:INSchkV3ntyDdlZKGWA030MPDpp6pbeuiRkRKYFCm2k=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231206181640-faad3f11cfad h1:ysPjfbCPJuVxxFZa1Ifv8OPE20pzvnEHjJrPDUo4gT0=
-github.com/smartcontractkit/chainlink-common v0.1.7-0.20231206181640-faad3f11cfad/go.mod h1:IdlfCN9rUs8Q/hrOYe8McNBIwEOHEsi0jilb3Cw77xs=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231213134506-b6c433e6c490 h1:lSYiaiIfAA+5ac45/UD8ciytlNw/S6fnhK7bxFHYI88=
+github.com/smartcontractkit/chainlink-common v0.1.7-0.20231213134506-b6c433e6c490/go.mod h1:IdlfCN9rUs8Q/hrOYe8McNBIwEOHEsi0jilb3Cw77xs=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231206164210-03f8b219402e h1:xvqffqFec2HkEcUKrCkm4FDJRnn/+gHmvrE/dz3Zlw8=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231206164210-03f8b219402e/go.mod h1:soVgcl4CbfR6hC9UptjuCQhz19HJaFEjwnOpiySkxg0=
 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20231204152908-a6e3fe8ff2a1 h1:xYqRgZO0nMSO8CBCMR0r3WA+LZ4kNL8a6bnbyk/oBtQ=

From 21545357255adbb225a0f71ef18cbf4544c20704 Mon Sep 17 00:00:00 2001
From: Ilja Pavlovs <ilja.pavlovs@gmail.com>
Date: Wed, 13 Dec 2023 21:02:27 +0200
Subject: [PATCH 123/130] =?UTF-8?q?VRF-798:=20fix=20"nonce=20too=20low"=20?=
 =?UTF-8?q?in=20load=20test=20setup=20when=20creating=20a=20subsc=E2=80=A6?=
 =?UTF-8?q?=20(#11560)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* VRF-798: fix "nonce too low" in load test setup when creating a subscription

* VRF-798: fix runtime issue

* VRF-798: PR comments
---
 integration-tests/load/vrfv2/vrfv2_test.go        |  6 ++++++
 .../load/vrfv2plus/vrfv2plus_test.go              | 15 +++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/integration-tests/load/vrfv2/vrfv2_test.go b/integration-tests/load/vrfv2/vrfv2_test.go
index 86f9b8d61f6..ec0f945870d 100644
--- a/integration-tests/load/vrfv2/vrfv2_test.go
+++ b/integration-tests/load/vrfv2/vrfv2_test.go
@@ -115,6 +115,12 @@ func TestVRFV2Performance(t *testing.T) {
 			require.NoError(t, err)
 			consumers, err = vrfv2_actions.DeployVRFV2Consumers(env.ContractDeployer, coordinator, 1)
 			require.NoError(t, err)
+			err = env.EVMClient.WaitForEvents()
+			require.NoError(t, err, vrfv2_actions.ErrWaitTXsComplete)
+			l.Info().
+				Str("Coordinator", cfg.ExistingEnvConfig.CoordinatorAddress).
+				Int("Number of Subs to create", vrfv2Config.NumberOfSubToCreate).
+				Msg("Creating and funding subscriptions, deploying and adding consumers to subs")
 			subIDs, err = vrfv2_actions.CreateFundSubsAndAddConsumers(
 				env,
 				vrfv2Config,
diff --git a/integration-tests/load/vrfv2plus/vrfv2plus_test.go b/integration-tests/load/vrfv2plus/vrfv2plus_test.go
index 6fe0d06e7da..6d298e075f0 100644
--- a/integration-tests/load/vrfv2plus/vrfv2plus_test.go
+++ b/integration-tests/load/vrfv2plus/vrfv2plus_test.go
@@ -8,7 +8,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/kelseyhightower/envconfig"
 	"github.com/rs/zerolog"
@@ -117,6 +116,12 @@ func TestVRFV2PlusPerformance(t *testing.T) {
 			require.NoError(t, err)
 			consumers, err = vrfv2plus.DeployVRFV2PlusConsumers(env.ContractDeployer, coordinator, 1)
 			require.NoError(t, err)
+			err = env.EVMClient.WaitForEvents()
+			require.NoError(t, err, vrfv2plus.ErrWaitTXsComplete)
+			l.Info().
+				Str("Coordinator", cfg.ExistingEnvConfig.CoordinatorAddress).
+				Int("Number of Subs to create", vrfv2PlusConfig.NumberOfSubToCreate).
+				Msg("Creating and funding subscriptions, deploying and adding consumers to subs")
 			subIDs, err = vrfv2plus.CreateFundSubsAndAddConsumers(
 				env,
 				vrfv2PlusConfig,
@@ -308,13 +313,7 @@ func FundNodesIfNeeded(cfg *PerformanceConfig, client blockchain.EVMClient, l ze
 					Str("Should have at least", fundingAtLeast.String()).
 					Str("Funding Amount in ETH", fundingToSendEth.String()).
 					Msg("Funding Node's Sending Key")
-				gasEstimates, err := client.EstimateGas(ethereum.CallMsg{
-					To: &address,
-				})
-				if err != nil {
-					return err
-				}
-				err = client.Fund(sendingKey, fundingToSendEth, gasEstimates)
+				err := actions.FundAddress(client, sendingKey, fundingToSendEth)
 				if err != nil {
 					return err
 				}

From a0ee2d1e665d342cbe20c7bbb53365e6be3aa8b5 Mon Sep 17 00:00:00 2001
From: Makram <makramkd@users.noreply.github.com>
Date: Wed, 13 Dec 2023 22:01:04 +0200
Subject: [PATCH 124/130] feat: add liquidity balancer specs table (#11564)

Add the liquidity balancer specs table. This table will be used to house
the specs for the liquidity balancer job which will be implemented in
ccip rather than core.

The entirety of the spec's content will be in the
`liquidity_balancer_config` field. This is done to minimize future
migrations. This doesn't mean we won't be doing strict checks on the
contents of the config during the validation process.
---
 core/services/job/models.go                   |  8 +++
 .../0213_liquidity_balancer_specs.sql         | 49 +++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 core/store/migrate/migrations/0213_liquidity_balancer_specs.sql

diff --git a/core/services/job/models.go b/core/services/job/models.go
index b21ecc12e72..3c869f76056 100644
--- a/core/services/job/models.go
+++ b/core/services/job/models.go
@@ -152,6 +152,8 @@ type Job struct {
 	GatewaySpecID                 *int32
 	EALSpec                       *EALSpec
 	EALSpecID                     *int32
+	LiquidityBalancerSpec         *LiquidityBalancerSpec
+	LiquidityBalancerSpecID       *int32
 	PipelineSpecID                int32
 	PipelineSpec                  *pipeline.Spec
 	JobSpecErrors                 []SpecError
@@ -793,3 +795,9 @@ type EALSpec struct {
 	// UpdatedAt is the time this job was last updated.
 	UpdatedAt time.Time `toml:"-"`
 }
+
+type LiquidityBalancerSpec struct {
+	ID int32
+
+	LiquidityBalancerConfig string `toml:"liquidityBalancerConfig" db:"liquidity_balancer_config"`
+}
diff --git a/core/store/migrate/migrations/0213_liquidity_balancer_specs.sql b/core/store/migrate/migrations/0213_liquidity_balancer_specs.sql
new file mode 100644
index 00000000000..cd717181f58
--- /dev/null
+++ b/core/store/migrate/migrations/0213_liquidity_balancer_specs.sql
@@ -0,0 +1,49 @@
+-- +goose Up
+CREATE TABLE liquidity_balancer_specs (
+    id BIGSERIAL PRIMARY KEY,
+    liquidity_balancer_config JSONB NOT NULL
+);
+
+ALTER TABLE
+    jobs
+ADD COLUMN
+    liquidity_balancer_spec_id BIGINT REFERENCES liquidity_balancer_specs(id),
+DROP CONSTRAINT chk_only_one_spec,
+ADD CONSTRAINT chk_only_one_spec CHECK (
+    num_nonnulls(
+      ocr_oracle_spec_id, ocr2_oracle_spec_id,
+      direct_request_spec_id, flux_monitor_spec_id,
+      keeper_spec_id, cron_spec_id, webhook_spec_id,
+      vrf_spec_id, blockhash_store_spec_id,
+      block_header_feeder_spec_id, bootstrap_spec_id,
+      gateway_spec_id,
+      legacy_gas_station_server_spec_id,
+      legacy_gas_station_sidecar_spec_id,
+      eal_spec_id,
+      liquidity_balancer_spec_id
+    ) = 1
+);
+
+-- +goose Down
+ALTER TABLE
+    jobs
+DROP CONSTRAINT chk_only_one_spec,
+ADD CONSTRAINT chk_only_one_spec CHECK (
+    num_nonnulls(
+      ocr_oracle_spec_id, ocr2_oracle_spec_id,
+      direct_request_spec_id, flux_monitor_spec_id,
+      keeper_spec_id, cron_spec_id, webhook_spec_id,
+      vrf_spec_id, blockhash_store_spec_id,
+      block_header_feeder_spec_id, bootstrap_spec_id,
+      gateway_spec_id,
+      legacy_gas_station_server_spec_id,
+      legacy_gas_station_sidecar_spec_id,
+      eal_spec_id
+    ) = 1
+);
+ALTER TABLE
+    jobs
+DROP COLUMN
+    liquidity_balancer_spec_id;
+DROP TABLE
+    liquidity_balancer_specs;

From 5b351abd60ee66a454344afc5dd3428ac493d0d9 Mon Sep 17 00:00:00 2001
From: Lei <lei.shi@smartcontract.com>
Date: Wed, 13 Dec 2023 12:07:31 -0800
Subject: [PATCH 125/130] Auto 8087 modular streams (#11489)

* make streams lookup modular

* polish

* address comment to use pointer instead of array/map

* rebase

* get rid of slice

* keep using array and index

* remove duplicate logging

* address err re-declarion lint issues
---
 core/scripts/chaincli/handler/debug.go        | 223 +++++---
 .../handler/mercury_lookup_handler.go         | 536 ------------------
 core/scripts/go.mod                           |   3 +-
 core/scripts/go.sum                           |   2 -
 .../v21/mercury/streams/streams.go            | 105 ++--
 .../v21/mercury/streams/streams_test.go       |  20 +-
 6 files changed, 222 insertions(+), 667 deletions(-)
 delete mode 100644 core/scripts/chaincli/handler/mercury_lookup_handler.go

diff --git a/core/scripts/chaincli/handler/debug.go b/core/scripts/chaincli/handler/debug.go
index 5947337b187..815a0c9a030 100644
--- a/core/scripts/chaincli/handler/debug.go
+++ b/core/scripts/chaincli/handler/debug.go
@@ -18,13 +18,19 @@ import (
 	gethcommon "github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/ethclient"
 
 	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"
 
+	evm21 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury"
+
 	"github.com/smartcontractkit/chainlink/core/scripts/chaincli/config"
 	"github.com/smartcontractkit/chainlink/core/scripts/common"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_utils_2_1"
 	iregistry21 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/i_keeper_registry_master_wrapper_2_1"
+	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/models"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams"
@@ -35,12 +41,7 @@ import (
 const (
 	ConditionTrigger uint8 = iota
 	LogTrigger
-
-	blockNumber            = "blockNumber"
 	expectedTypeAndVersion = "KeeperRegistry 2.1.0"
-	feedIdHex              = "feedIdHex"
-	feedIDs                = "feedIDs"
-	timestamp              = "timestamp"
 )
 
 var packer = encoding.NewAbiPacker()
@@ -51,24 +52,29 @@ func (k *Keeper) Debug(ctx context.Context, args []string) {
 	if len(args) < 1 {
 		failCheckArgs("no upkeepID supplied", nil)
 	}
+
 	// test that we are connected to an archive node
 	_, err := k.client.BalanceAt(ctx, gethcommon.Address{}, big.NewInt(1))
 	if err != nil {
 		failCheckConfig("you are not connected to an archive node; try using infura or alchemy", err)
 	}
+
 	chainIDBig, err := k.client.ChainID(ctx)
 	if err != nil {
 		failUnknown("unable to retrieve chainID from rpc client", err)
 	}
 	chainID := chainIDBig.Int64()
+
+	var triggerCallOpts *bind.CallOpts             // use latest block for conditionals, but use block from tx for log triggers
+	latestCallOpts := &bind.CallOpts{Context: ctx} // always use latest block
+
 	// connect to registry contract
-	latestCallOpts := &bind.CallOpts{Context: ctx}  // always use latest block
-	triggerCallOpts := &bind.CallOpts{Context: ctx} // use latest block for conditionals, but use block from tx for log triggers
 	registryAddress := gethcommon.HexToAddress(k.cfg.RegistryAddress)
 	keeperRegistry21, err := iregistry21.NewIKeeperRegistryMaster(registryAddress, k.client)
 	if err != nil {
 		failUnknown("failed to connect to registry contract", err)
 	}
+
 	// verify contract is correct
 	typeAndVersion, err := keeperRegistry21.TypeAndVersion(latestCallOpts)
 	if err != nil {
@@ -124,17 +130,21 @@ func (k *Keeper) Debug(ctx context.Context, args []string) {
 	var checkResult iregistry21.CheckUpkeep
 	var blockNum uint64
 	var performData []byte
+	var workID [32]byte
+	var trigger ocr2keepers.Trigger
 	upkeepNeeded := false
 	// check upkeep
 	if triggerType == ConditionTrigger {
 		message("upkeep identified as conditional trigger")
-		tmpCheckResult, err := keeperRegistry21.CheckUpkeep0(latestCallOpts, upkeepID)
+		var tmpCheckResult iregistry21.CheckUpkeep0
+		tmpCheckResult, err = keeperRegistry21.CheckUpkeep0(latestCallOpts, upkeepID)
 		if err != nil {
 			failUnknown("failed to check upkeep: ", err)
 		}
 		checkResult = iregistry21.CheckUpkeep(tmpCheckResult)
 		// do tenderly simulation
-		rawCall, err := core.RegistryABI.Pack("checkUpkeep", upkeepID, []byte{})
+		var rawCall []byte
+		rawCall, err = core.RegistryABI.Pack("checkUpkeep", upkeepID, []byte{})
 		if err != nil {
 			failUnknown("failed to pack raw checkUpkeep call", err)
 		}
@@ -146,19 +156,26 @@ func (k *Keeper) Debug(ctx context.Context, args []string) {
 			failCheckArgs("txHash and log index must be supplied to command in order to debug log triggered upkeeps", nil)
 		}
 		txHash := gethcommon.HexToHash(args[1])
-		logIndex, err := strconv.ParseInt(args[2], 10, 64)
+
+		var logIndex int64
+		logIndex, err = strconv.ParseInt(args[2], 10, 64)
 		if err != nil {
 			failCheckArgs("unable to parse log index", err)
 		}
-		// find transaction receipt
-		_, isPending, err := k.client.TransactionByHash(ctx, txHash)
+
+		// check that tx is confirmed
+		var isPending bool
+		_, isPending, err = k.client.TransactionByHash(ctx, txHash)
 		if err != nil {
 			log.Fatal("failed to get tx by hash", err)
 		}
 		if isPending {
 			resolveIneligible(fmt.Sprintf("tx %s is still pending confirmation", txHash))
 		}
-		receipt, err := k.client.TransactionReceipt(ctx, txHash)
+
+		// find transaction receipt
+		var receipt *types.Receipt
+		receipt, err = k.client.TransactionReceipt(ctx, txHash)
 		if err != nil {
 			failCheckArgs("failed to fetch tx receipt", err)
 		}
@@ -176,9 +193,11 @@ func (k *Keeper) Debug(ctx context.Context, args []string) {
 		}
 		// check that tx for this upkeep / tx was not already performed
 		message(fmt.Sprintf("LogTrigger{blockNum: %d, blockHash: %s, txHash: %s, logIndex: %d}", blockNum, receipt.BlockHash.Hex(), txHash, logIndex))
-		workID := mustUpkeepWorkID(upkeepID, blockNum, receipt.BlockHash, txHash, logIndex)
+		trigger = mustAutomationTrigger(txHash, logIndex, blockNum, receipt.BlockHash)
+		workID = mustUpkeepWorkID(upkeepID, trigger)
 		message(fmt.Sprintf("workID computed: %s", hex.EncodeToString(workID[:])))
-		hasKey, err := keeperRegistry21.HasDedupKey(latestCallOpts, workID)
+		var hasKey bool
+		hasKey, err = keeperRegistry21.HasDedupKey(latestCallOpts, workID)
 		if err != nil {
 			failUnknown("failed to check if upkeep was already performed: ", err)
 		}
@@ -186,11 +205,13 @@ func (k *Keeper) Debug(ctx context.Context, args []string) {
 			resolveIneligible("upkeep was already performed")
 		}
 		triggerCallOpts = &bind.CallOpts{Context: ctx, BlockNumber: big.NewInt(receipt.BlockNumber.Int64())}
-		rawTriggerConfig, err := keeperRegistry21.GetUpkeepTriggerConfig(triggerCallOpts, upkeepID)
+		var rawTriggerConfig []byte
+		rawTriggerConfig, err = keeperRegistry21.GetUpkeepTriggerConfig(triggerCallOpts, upkeepID)
 		if err != nil {
 			failUnknown("failed to fetch trigger config for upkeep", err)
 		}
-		triggerConfig, err := packer.UnpackLogTriggerConfig(rawTriggerConfig)
+		var triggerConfig automation_utils_2_1.LogTriggerConfig
+		triggerConfig, err = packer.UnpackLogTriggerConfig(rawTriggerConfig)
 		if err != nil {
 			failUnknown("failed to unpack trigger config", err)
 		}
@@ -200,11 +221,13 @@ func (k *Keeper) Debug(ctx context.Context, args []string) {
 		if !logMatchesTriggerConfig(triggeringEvent, triggerConfig) {
 			resolveIneligible("log does not match trigger config")
 		}
-		header, err := k.client.HeaderByHash(ctx, receipt.BlockHash)
+		var header *types.Header
+		header, err = k.client.HeaderByHash(ctx, receipt.BlockHash)
 		if err != nil {
 			failUnknown("failed to find block", err)
 		}
-		triggerData, err := packTriggerData(triggeringEvent, header.Time)
+		var triggerData []byte
+		triggerData, err = packTriggerData(triggeringEvent, header.Time)
 		if err != nil {
 			failUnknown("failed to pack trigger data", err)
 		}
@@ -213,7 +236,8 @@ func (k *Keeper) Debug(ctx context.Context, args []string) {
 			failUnknown("failed to check upkeep", err)
 		}
 		// do tenderly simulations
-		rawCall, err := core.RegistryABI.Pack("checkUpkeep", upkeepID, triggerData)
+		var rawCall []byte
+		rawCall, err = core.RegistryABI.Pack("checkUpkeep", upkeepID, triggerData)
 		if err != nil {
 			failUnknown("failed to pack raw checkUpkeep call", err)
 		}
@@ -228,73 +252,88 @@ func (k *Keeper) Debug(ctx context.Context, args []string) {
 	if checkResult.UpkeepFailureReason != 0 {
 		message(fmt.Sprintf("checkUpkeep failed with UpkeepFailureReason %d", checkResult.UpkeepFailureReason))
 	}
+
 	if checkResult.UpkeepFailureReason == uint8(encoding.UpkeepFailureReasonTargetCheckReverted) {
-		// TODO use the new streams lookup lib
-		//mc := &models.MercuryCredentials{k.cfg.MercuryLegacyURL, k.cfg.MercuryURL, k.cfg.MercuryID, k.cfg.MercuryKey}
-		//mercuryConfig := evm.NewMercuryConfig(mc, core.StreamsCompatibleABI)
-		//lggr, _ := logger.NewLogger()
-		//blockSub := &blockSubscriber{k.client}
-		//_ = streams.NewStreamsLookup(packer, mercuryConfig, blockSub, keeperRegistry21, k.rpcClient, lggr)
-
-		streamsLookupErr, err := packer.DecodeStreamsLookupRequest(checkResult.PerformData)
+		mc := &models.MercuryCredentials{LegacyURL: k.cfg.MercuryLegacyURL, URL: k.cfg.MercuryURL, Username: k.cfg.MercuryID, Password: k.cfg.MercuryKey}
+		mercuryConfig := evm21.NewMercuryConfig(mc, core.StreamsCompatibleABI)
+		lggr, _ := logger.NewLogger()
+		blockSub := &blockSubscriber{k.client}
+		streams := streams.NewStreamsLookup(packer, mercuryConfig, blockSub, k.rpcClient, keeperRegistry21, lggr)
+
+		var streamsLookupErr *mercury.StreamsLookupError
+		streamsLookupErr, err = packer.DecodeStreamsLookupRequest(checkResult.PerformData)
 		if err == nil {
 			message("upkeep reverted with StreamsLookup")
 			message(fmt.Sprintf("StreamsLookup data: {FeedParamKey: %s, Feeds: %v, TimeParamKey: %s, Time: %d, ExtraData: %s}", streamsLookupErr.FeedParamKey, streamsLookupErr.Feeds, streamsLookupErr.TimeParamKey, streamsLookupErr.Time.Uint64(), hexutil.Encode(streamsLookupErr.ExtraData)))
-			if streamsLookupErr.FeedParamKey == feedIdHex && streamsLookupErr.TimeParamKey == blockNumber {
+
+			streamsLookup := &mercury.StreamsLookup{
+				StreamsLookupError: &mercury.StreamsLookupError{
+					FeedParamKey: streamsLookupErr.FeedParamKey,
+					Feeds:        streamsLookupErr.Feeds,
+					TimeParamKey: streamsLookupErr.TimeParamKey,
+					Time:         streamsLookupErr.Time,
+					ExtraData:    streamsLookupErr.ExtraData,
+				},
+				UpkeepId: upkeepID,
+				Block:    blockNum,
+			}
+
+			if streamsLookup.IsMercuryV02() {
 				message("using mercury lookup v0.2")
-				// handle v0.2
-				cfg, err := keeperRegistry21.GetUpkeepPrivilegeConfig(triggerCallOpts, upkeepID)
+				// check if upkeep is allowed to use mercury v0.2
+				var allowed bool
+				_, _, _, allowed, err = streams.AllowedToUseMercury(latestCallOpts, upkeepID)
 				if err != nil {
-					failUnknown("failed to get upkeep privilege config ", err)
-				}
-				allowed := false
-				if len(cfg) > 0 {
-					var privilegeConfig streams.UpkeepPrivilegeConfig
-					if err := json.Unmarshal(cfg, &privilegeConfig); err != nil {
-						failUnknown("failed to unmarshal privilege config ", err)
-					}
-					allowed = privilegeConfig.MercuryEnabled
+					failUnknown("failed to check if upkeep is allowed to use mercury", err)
 				}
 				if !allowed {
 					resolveIneligible("upkeep reverted with StreamsLookup but is not allowed to access streams")
 				}
-			} else if streamsLookupErr.FeedParamKey != feedIDs || streamsLookupErr.TimeParamKey != timestamp {
+			} else if streamsLookup.IsMercuryV03() {
 				// handle v0.3
-				resolveIneligible("upkeep reverted with StreamsLookup but the configuration is invalid")
-			} else {
 				message("using mercury lookup v0.3")
+			} else {
+				resolveIneligible("upkeep reverted with StreamsLookup but the configuration is invalid")
 			}
-			streamsLookup := &StreamsLookup{streamsLookupErr.FeedParamKey, streamsLookupErr.Feeds, streamsLookupErr.TimeParamKey, streamsLookupErr.Time, streamsLookupErr.ExtraData, upkeepID, blockNum}
 
 			if k.cfg.MercuryLegacyURL == "" || k.cfg.MercuryURL == "" || k.cfg.MercuryID == "" || k.cfg.MercuryKey == "" {
 				failCheckConfig("Mercury configs not set properly, check your MERCURY_LEGACY_URL, MERCURY_URL, MERCURY_ID and MERCURY_KEY", nil)
 			}
-			handler := NewMercuryLookupHandler(&MercuryCredentials{k.cfg.MercuryLegacyURL, k.cfg.MercuryURL, k.cfg.MercuryID, k.cfg.MercuryKey}, k.rpcClient)
-			state, failureReason, values, _, err := handler.doMercuryRequest(ctx, streamsLookup)
-			if failureReason == UpkeepFailureReasonInvalidRevertDataInput {
+
+			// do mercury request
+			automationCheckResult := mustAutomationCheckResult(upkeepID, checkResult, trigger)
+			checkResults := []ocr2keepers.CheckResult{automationCheckResult}
+
+			var values [][]byte
+			values, err = streams.DoMercuryRequest(ctx, streamsLookup, checkResults, 0)
+
+			if automationCheckResult.IneligibilityReason == uint8(mercury.MercuryUpkeepFailureReasonInvalidRevertDataInput) {
 				resolveIneligible("upkeep used invalid revert data")
 			}
-			if state == InvalidMercuryRequest {
+			if automationCheckResult.PipelineExecutionState == uint8(mercury.InvalidMercuryRequest) {
 				resolveIneligible("the mercury request data is invalid")
 			}
 			if err != nil {
 				failCheckConfig("failed to do mercury request ", err)
 			}
-			callbackResult, err := keeperRegistry21.CheckCallback(triggerCallOpts, upkeepID, values, streamsLookup.extraData)
+
+			// do checkCallback
+			err = streams.CheckCallback(ctx, values, streamsLookup, checkResults, 0)
 			if err != nil {
 				failUnknown("failed to execute mercury callback ", err)
 			}
-			if callbackResult.UpkeepFailureReason != 0 {
-				message(fmt.Sprintf("checkCallback failed with UpkeepFailureReason %d", checkResult.UpkeepFailureReason))
+			if automationCheckResult.IneligibilityReason != 0 {
+				message(fmt.Sprintf("checkCallback failed with UpkeepFailureReason %d", automationCheckResult.IneligibilityReason))
 			}
-			upkeepNeeded, performData = callbackResult.UpkeepNeeded, callbackResult.PerformData
-			// do tenderly simulations
-			rawCall, err := core.RegistryABI.Pack("checkCallback", upkeepID, values, streamsLookup.extraData)
+			upkeepNeeded, performData = automationCheckResult.Eligible, automationCheckResult.PerformData
+			// do tenderly simulations for checkCallback
+			var rawCall []byte
+			rawCall, err = core.RegistryABI.Pack("checkCallback", upkeepID, values, streamsLookup.ExtraData)
 			if err != nil {
 				failUnknown("failed to pack raw checkCallback call", err)
 			}
 			addLink("checkCallback simulation", tenderlySimLink(k.cfg, chainID, blockNum, rawCall, registryAddress))
-			rawCall, err = core.StreamsCompatibleABI.Pack("checkCallback", values, streamsLookup.extraData)
+			rawCall, err = core.StreamsCompatibleABI.Pack("checkCallback", values, streamsLookup.ExtraData)
 			if err != nil {
 				failUnknown("failed to pack raw checkCallback (direct) call", err)
 			}
@@ -316,6 +355,39 @@ func (k *Keeper) Debug(ctx context.Context, args []string) {
 	}
 }
 
+func mustAutomationCheckResult(upkeepID *big.Int, checkResult iregistry21.CheckUpkeep, trigger ocr2keepers.Trigger) ocr2keepers.CheckResult {
+	upkeepIdentifier := mustUpkeepIdentifier(upkeepID)
+	checkResult2 := ocr2keepers.CheckResult{
+		Eligible:            checkResult.UpkeepNeeded,
+		IneligibilityReason: checkResult.UpkeepFailureReason,
+		UpkeepID:            upkeepIdentifier,
+		Trigger:             trigger,
+		WorkID:              core.UpkeepWorkID(upkeepIdentifier, trigger),
+		GasAllocated:        0,
+		PerformData:         checkResult.PerformData,
+		FastGasWei:          checkResult.FastGasWei,
+		LinkNative:          checkResult.LinkNative,
+	}
+
+	return checkResult2
+}
+
+type blockSubscriber struct {
+	ethClient *ethclient.Client
+}
+
+func (bs *blockSubscriber) LatestBlock() *ocr2keepers.BlockKey {
+	header, err := bs.ethClient.HeaderByNumber(context.Background(), nil)
+	if err != nil {
+		return nil
+	}
+
+	return &ocr2keepers.BlockKey{
+		Number: ocr2keepers.BlockNumber(header.Number.Uint64()),
+		Hash:   header.Hash(),
+	}
+}
+
 func logMatchesTriggerConfig(log *types.Log, config automation_utils_2_1.LogTriggerConfig) bool {
 	if log.Topics[0] != config.Topic0 {
 		return false
@@ -353,9 +425,27 @@ func packTriggerData(log *types.Log, blockTime uint64) ([]byte, error) {
 	return b, nil
 }
 
-func mustUpkeepWorkID(upkeepID *big.Int, blockNum uint64, blockHash [32]byte, txHash [32]byte, logIndex int64) [32]byte {
-	// TODO - this is a copy of the code in core.UpkeepWorkID
-	// We should refactor that code to be more easily exported ex not rely on Trigger structs
+func mustUpkeepWorkID(upkeepID *big.Int, trigger ocr2keepers.Trigger) [32]byte {
+	upkeepIdentifier := mustUpkeepIdentifier(upkeepID)
+
+	workID := core.UpkeepWorkID(upkeepIdentifier, trigger)
+	workIDBytes, err := hex.DecodeString(workID)
+	if err != nil {
+		failUnknown("failed to decode workID", err)
+	}
+
+	var result [32]byte
+	copy(result[:], workIDBytes[:])
+	return result
+}
+
+func mustUpkeepIdentifier(upkeepID *big.Int) ocr2keepers.UpkeepIdentifier {
+	upkeepIdentifier := &ocr2keepers.UpkeepIdentifier{}
+	upkeepIdentifier.FromBigInt(upkeepID)
+	return *upkeepIdentifier
+}
+
+func mustAutomationTrigger(txHash [32]byte, logIndex int64, blockNum uint64, blockHash [32]byte) ocr2keepers.Trigger {
 	trigger := ocr2keepers.Trigger{
 		LogTriggerExtension: &ocr2keepers.LogTriggerExtension{
 			TxHash:      txHash,
@@ -364,16 +454,7 @@ func mustUpkeepWorkID(upkeepID *big.Int, blockNum uint64, blockHash [32]byte, tx
 			BlockHash:   blockHash,
 		},
 	}
-	upkeepIdentifier := &ocr2keepers.UpkeepIdentifier{}
-	upkeepIdentifier.FromBigInt(upkeepID)
-	workID := core.UpkeepWorkID(*upkeepIdentifier, trigger)
-	workIDBytes, err := hex.DecodeString(workID)
-	if err != nil {
-		failUnknown("failed to decode workID", err)
-	}
-	var result [32]byte
-	copy(result[:], workIDBytes[:])
-	return result
+	return trigger
 }
 
 func message(msg string) {
@@ -385,11 +466,11 @@ func warning(msg string) {
 }
 
 func resolveIneligible(msg string) {
-	exit(fmt.Sprintf("✅ %s: this upkeep is not currently elligible", msg), nil, 0)
+	exit(fmt.Sprintf("✅ %s: this upkeep is not currently eligible", msg), nil, 0)
 }
 
 func resolveEligible() {
-	exit("❌ this upkeep is currently elligible", nil, 0)
+	exit("❌ this upkeep is currently eligible", nil, 0)
 }
 
 func rerun(msg string, err error) {
@@ -490,5 +571,3 @@ func tenderlySimLink(cfg *config.Config, chainID int64, blockNumber uint64, inpu
 	}
 	return common.TenderlySimLink(responseJSON.Simulation.Id)
 }
-
-// TODO - link to performUpkeep tx if exists
diff --git a/core/scripts/chaincli/handler/mercury_lookup_handler.go b/core/scripts/chaincli/handler/mercury_lookup_handler.go
deleted file mode 100644
index 1165d83921d..00000000000
--- a/core/scripts/chaincli/handler/mercury_lookup_handler.go
+++ /dev/null
@@ -1,536 +0,0 @@
-package handler
-
-import (
-	"context"
-	"crypto/hmac"
-	"crypto/sha256"
-	"encoding/hex"
-	"encoding/json"
-	"fmt"
-	"io"
-	"math/big"
-	"net/http"
-	"net/url"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/avast/retry-go"
-	ethabi "github.com/ethereum/go-ethereum/accounts/abi"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/rpc"
-	"github.com/pkg/errors"
-)
-
-// MercuryLookupHandler is responsible for initiating the calls to the Mercury server
-// to determine whether the upkeeps are eligible
-type MercuryLookupHandler struct {
-	credentials *MercuryCredentials
-	httpClient  HttpClient
-	rpcClient   *rpc.Client
-}
-
-func NewMercuryLookupHandler(
-	credentials *MercuryCredentials,
-	rpcClient *rpc.Client,
-) *MercuryLookupHandler {
-	return &MercuryLookupHandler{
-		credentials: credentials,
-		httpClient:  http.DefaultClient,
-		rpcClient:   rpcClient,
-	}
-}
-
-type MercuryVersion string
-
-type StreamsLookup struct {
-	feedParamKey string
-	feeds        []string
-	timeParamKey string
-	time         *big.Int
-	extraData    []byte
-	upkeepId     *big.Int
-	block        uint64
-}
-
-//go:generate mockery --quiet --name HttpClient --output ./mocks/ --case=underscore
-type HttpClient interface {
-	Do(req *http.Request) (*http.Response, error)
-}
-
-type MercuryCredentials struct {
-	LegacyURL string
-	URL       string
-	ClientID  string
-	ClientKey string
-}
-
-func (mc *MercuryCredentials) Validate() bool {
-	return mc.URL != "" && mc.ClientID != "" && mc.ClientKey != ""
-}
-
-type MercuryData struct {
-	Index     int
-	Error     error
-	Retryable bool
-	Bytes     [][]byte
-	State     PipelineExecutionState
-}
-
-// MercuryV02Response represents a JSON structure used by Mercury v0.2
-type MercuryV02Response struct {
-	ChainlinkBlob string `json:"chainlinkBlob"`
-}
-
-// MercuryV03Response represents a JSON structure used by Mercury v0.3
-type MercuryV03Response struct {
-	Reports []MercuryV03Report `json:"reports"`
-}
-
-type MercuryV03Report struct {
-	FeedID                string `json:"feedID"` // feed id in hex encoded
-	ValidFromTimestamp    uint32 `json:"validFromTimestamp"`
-	ObservationsTimestamp uint32 `json:"observationsTimestamp"`
-	FullReport            string `json:"fullReport"` // the actual hex encoded mercury report of this feed, can be sent to verifier
-}
-
-const (
-	// DefaultAllowListExpiration decides how long an upkeep's allow list info will be valid for.
-	DefaultAllowListExpiration = 20 * time.Minute
-	// CleanupInterval decides when the expired items in cache will be deleted.
-	CleanupInterval = 25 * time.Minute
-)
-
-const (
-	ApplicationJson     = "application/json"
-	BlockNumber         = "blockNumber" // valid for v0.2
-	FeedIDs             = "feedIDs"     // valid for v0.3
-	FeedIdHex           = "feedIdHex"   // valid for v0.2
-	HeaderAuthorization = "Authorization"
-	HeaderContentType   = "Content-Type"
-	HeaderTimestamp     = "X-Authorization-Timestamp"
-	HeaderSignature     = "X-Authorization-Signature-SHA256"
-	HeaderUpkeepId      = "X-Authorization-Upkeep-Id"
-	MercuryPathV2       = "/client?"              // only used to access mercury v0.2 server
-	MercuryBatchPathV3  = "/api/v1/reports/bulk?" // only used to access mercury v0.3 server
-	RetryDelay          = 500 * time.Millisecond
-	Timestamp           = "timestamp" // valid for v0.3
-	TotalAttempt        = 3
-	UserId              = "userId"
-)
-
-type UpkeepFailureReason uint8
-type PipelineExecutionState uint8
-
-const (
-	// upkeep failure onchain reasons
-	UpkeepFailureReasonNone                    UpkeepFailureReason = 0
-	UpkeepFailureReasonUpkeepCancelled         UpkeepFailureReason = 1
-	UpkeepFailureReasonUpkeepPaused            UpkeepFailureReason = 2
-	UpkeepFailureReasonTargetCheckReverted     UpkeepFailureReason = 3
-	UpkeepFailureReasonUpkeepNotNeeded         UpkeepFailureReason = 4
-	UpkeepFailureReasonPerformDataExceedsLimit UpkeepFailureReason = 5
-	UpkeepFailureReasonInsufficientBalance     UpkeepFailureReason = 6
-	UpkeepFailureReasonMercuryCallbackReverted UpkeepFailureReason = 7
-	UpkeepFailureReasonRevertDataExceedsLimit  UpkeepFailureReason = 8
-	UpkeepFailureReasonRegistryPaused          UpkeepFailureReason = 9
-	// leaving a gap here for more onchain failure reasons in the future
-	// upkeep failure offchain reasons
-	UpkeepFailureReasonMercuryAccessNotAllowed UpkeepFailureReason = 32
-	UpkeepFailureReasonTxHashNoLongerExists    UpkeepFailureReason = 33
-	UpkeepFailureReasonInvalidRevertDataInput  UpkeepFailureReason = 34
-	UpkeepFailureReasonSimulationFailed        UpkeepFailureReason = 35
-	UpkeepFailureReasonTxHashReorged           UpkeepFailureReason = 36
-
-	// pipeline execution error
-	NoPipelineError        PipelineExecutionState = 0
-	CheckBlockTooOld       PipelineExecutionState = 1
-	CheckBlockInvalid      PipelineExecutionState = 2
-	RpcFlakyFailure        PipelineExecutionState = 3
-	MercuryFlakyFailure    PipelineExecutionState = 4
-	PackUnpackDecodeFailed PipelineExecutionState = 5
-	MercuryUnmarshalError  PipelineExecutionState = 6
-	InvalidMercuryRequest  PipelineExecutionState = 7
-	InvalidMercuryResponse PipelineExecutionState = 8 // this will only happen if Mercury server sends bad responses
-	UpkeepNotAuthorized    PipelineExecutionState = 9
-)
-
-// UpkeepPrivilegeConfig represents the administrative offchain config for each upkeep. It can be set by s_upkeepPrivilegeManager
-// role on the registry. Upkeeps allowed to use Mercury server will have this set to true.
-type UpkeepPrivilegeConfig struct {
-	MercuryEnabled bool `json:"mercuryEnabled"`
-}
-
-// generateHMAC calculates a user HMAC for Mercury server authentication.
-func (mlh *MercuryLookupHandler) generateHMAC(method string, path string, body []byte, clientId string, secret string, ts int64) string {
-	bodyHash := sha256.New()
-	bodyHash.Write(body)
-	hashString := fmt.Sprintf("%s %s %s %s %d",
-		method,
-		path,
-		hex.EncodeToString(bodyHash.Sum(nil)),
-		clientId,
-		ts)
-	signedMessage := hmac.New(sha256.New, []byte(secret))
-	signedMessage.Write([]byte(hashString))
-	userHmac := hex.EncodeToString(signedMessage.Sum(nil))
-	return userHmac
-}
-
-// singleFeedRequest sends a v0.2 Mercury request for a single feed report.
-func (mlh *MercuryLookupHandler) singleFeedRequest(ctx context.Context, ch chan<- MercuryData, index int, ml *StreamsLookup) {
-	q := url.Values{
-		ml.feedParamKey: {ml.feeds[index]},
-		ml.timeParamKey: {ml.time.String()},
-	}
-	mercuryURL := mlh.credentials.LegacyURL
-	reqUrl := fmt.Sprintf("%s%s%s", mercuryURL, MercuryPathV2, q.Encode())
-	// mlh.logger.Debugf("request URL for upkeep %s feed %s: %s", ml.upkeepId.String(), ml.feeds[index], reqUrl)
-
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, reqUrl, nil)
-	if err != nil {
-		ch <- MercuryData{Index: index, Error: err, Retryable: false, State: InvalidMercuryRequest}
-		return
-	}
-
-	ts := time.Now().UTC().UnixMilli()
-	signature := mlh.generateHMAC(http.MethodGet, MercuryPathV2+q.Encode(), []byte{}, mlh.credentials.ClientID, mlh.credentials.ClientKey, ts)
-	req.Header.Set(HeaderContentType, ApplicationJson)
-	req.Header.Set(HeaderAuthorization, mlh.credentials.ClientID)
-	req.Header.Set(HeaderTimestamp, strconv.FormatInt(ts, 10))
-	req.Header.Set(HeaderSignature, signature)
-
-	// in the case of multiple retries here, use the last attempt's data
-	state := NoPipelineError
-	retryable := false
-	sent := false
-	retryErr := retry.Do(
-		func() error {
-			retryable = false
-			resp, err1 := mlh.httpClient.Do(req)
-			if err1 != nil {
-				// mlh.logger.Errorw("StreamsLookup GET request failed", "upkeepID", ml.upkeepId.String(), "time", ml.time.String(), "feed", ml.feeds[index], "error", err1)
-				retryable = true
-				state = MercuryFlakyFailure
-				return err1
-			}
-			defer func(Body io.ReadCloser) {
-				err := Body.Close()
-				if err != nil {
-					_ = "" // placate linter
-					// mlh.logger.Errorf("Encountered error when closing the body of the response in single feed: %s", err)
-				}
-			}(resp.Body)
-
-			body, err1 := io.ReadAll(resp.Body)
-			if err1 != nil {
-				retryable = false
-				state = InvalidMercuryResponse
-				return err1
-			}
-
-			if resp.StatusCode == http.StatusNotFound || resp.StatusCode == http.StatusInternalServerError {
-				// mlh.logger.Errorw("StreamsLookup received retryable status code", "upkeepID", ml.upkeepId.String(), "time", ml.time.String(), "statusCode", resp.StatusCode, "feed", ml.feeds[index])
-				retryable = true
-				state = MercuryFlakyFailure
-				return errors.New(strconv.FormatInt(int64(resp.StatusCode), 10))
-			} else if resp.StatusCode != http.StatusOK {
-				retryable = false
-				state = InvalidMercuryRequest
-				return fmt.Errorf("StreamsLookup upkeep %s block %s received status code %d for feed %s", ml.upkeepId.String(), ml.time.String(), resp.StatusCode, ml.feeds[index])
-			}
-
-			// mlh.logger.Debugf("at block %s upkeep %s received status code %d from mercury v0.2 with BODY=%s", ml.time.String(), ml.upkeepId.String(), resp.StatusCode, hexutil.Encode(body))
-
-			var m MercuryV02Response
-			err1 = json.Unmarshal(body, &m)
-			if err1 != nil {
-				// mlh.logger.Errorw("StreamsLookup failed to unmarshal body to MercuryResponse", "upkeepID", ml.upkeepId.String(), "time", ml.time.String(), "feed", ml.feeds[index], "error", err1)
-				retryable = false
-				state = MercuryUnmarshalError
-				return err1
-			}
-			blobBytes, err1 := hexutil.Decode(m.ChainlinkBlob)
-			if err1 != nil {
-				// mlh.logger.Errorw("StreamsLookup failed to decode chainlinkBlob for feed", "upkeepID", ml.upkeepId.String(), "time", ml.time.String(), "blob", m.ChainlinkBlob, "feed", ml.feeds[index], "error", err1)
-				retryable = false
-				state = InvalidMercuryResponse
-				return err1
-			}
-			ch <- MercuryData{
-				Index:     index,
-				Bytes:     [][]byte{blobBytes},
-				Retryable: false,
-				State:     NoPipelineError,
-			}
-			sent = true
-			return nil
-		},
-		// only retry when the error is 404 Not Found or 500 Internal Server Error
-		retry.RetryIf(func(err error) bool {
-			return err.Error() == fmt.Sprintf("%d", http.StatusNotFound) || err.Error() == fmt.Sprintf("%d", http.StatusInternalServerError)
-		}),
-		retry.Context(ctx),
-		retry.Delay(RetryDelay),
-		retry.Attempts(TotalAttempt))
-
-	if !sent {
-		md := MercuryData{
-			Index:     index,
-			Bytes:     [][]byte{},
-			Retryable: retryable,
-			Error:     fmt.Errorf("failed to request feed for %s: %w", ml.feeds[index], retryErr),
-			State:     state,
-		}
-		ch <- md
-	}
-}
-
-// multiFeedsRequest sends a Mercury v0.3 request for a multi-feed report
-func (mlh *MercuryLookupHandler) multiFeedsRequest(ctx context.Context, ch chan<- MercuryData, ml *StreamsLookup) {
-	params := fmt.Sprintf("%s=%s&%s=%s", FeedIDs, strings.Join(ml.feeds, ","), Timestamp, ml.time.String())
-	reqUrl := fmt.Sprintf("%s%s%s", mlh.credentials.URL, MercuryBatchPathV3, params)
-	// mlh.logger.Debugf("request URL for upkeep %s userId %s: %s", ml.upkeepId.String(), mlh.credentials.ClientID, reqUrl)
-
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, reqUrl, nil)
-	if err != nil {
-		ch <- MercuryData{Index: 0, Error: err, Retryable: false, State: InvalidMercuryRequest}
-		return
-	}
-
-	ts := time.Now().UTC().UnixMilli()
-	signature := mlh.generateHMAC(http.MethodGet, MercuryBatchPathV3+params, []byte{}, mlh.credentials.ClientID, mlh.credentials.ClientKey, ts)
-	req.Header.Set(HeaderContentType, ApplicationJson)
-	// username here is often referred to as user id
-	req.Header.Set(HeaderAuthorization, mlh.credentials.ClientID)
-	req.Header.Set(HeaderTimestamp, strconv.FormatInt(ts, 10))
-	req.Header.Set(HeaderSignature, signature)
-	// mercury will inspect authorization headers above to make sure this user (in automation's context, this node) is eligible to access mercury
-	// and if it has an automation role. it will then look at this upkeep id to check if it has access to all the requested feeds.
-	req.Header.Set(HeaderUpkeepId, ml.upkeepId.String())
-
-	// in the case of multiple retries here, use the last attempt's data
-	state := NoPipelineError
-	retryable := false
-	sent := false
-	retryErr := retry.Do(
-		func() error {
-			retryable = false
-			resp, err1 := mlh.httpClient.Do(req)
-			if err1 != nil {
-				// mlh.logger.Errorw("StreamsLookup GET request fails for multi feed", "upkeepID", ml.upkeepId.String(), "time", ml.time.String(), "error", err1)
-				retryable = true
-				state = MercuryFlakyFailure
-				return err1
-			}
-			defer func(Body io.ReadCloser) {
-				err := Body.Close()
-				if err != nil {
-					_ = "" // placate linter
-					// mlh.logger.Errorf("Encountered error when closing the body of the response in the multi feed: %s", err)
-				}
-			}(resp.Body)
-			body, err1 := io.ReadAll(resp.Body)
-			if err1 != nil {
-				retryable = false
-				state = InvalidMercuryResponse
-				return err1
-			}
-
-			// mlh.logger.Infof("at timestamp %s upkeep %s received status code %d from mercury v0.3", ml.time.String(), ml.upkeepId.String(), resp.StatusCode)
-			if resp.StatusCode == http.StatusUnauthorized {
-				retryable = false
-				state = UpkeepNotAuthorized
-				return fmt.Errorf("at timestamp %s upkeep %s received status code %d from mercury v0.3, most likely this is caused by unauthorized upkeep", ml.time.String(), ml.upkeepId.String(), resp.StatusCode)
-			} else if resp.StatusCode == http.StatusBadRequest {
-				retryable = false
-				state = InvalidMercuryRequest
-				return fmt.Errorf("at timestamp %s upkeep %s received status code %d from mercury v0.3, most likely this is caused by invalid format of timestamp", ml.time.String(), ml.upkeepId.String(), resp.StatusCode)
-			} else if resp.StatusCode == http.StatusInternalServerError {
-				retryable = true
-				state = MercuryFlakyFailure
-				return fmt.Errorf("%d", http.StatusInternalServerError)
-			} else if resp.StatusCode == 420 {
-				// in 0.3, this will happen when missing/malformed query args, missing or bad required headers, non-existent feeds, or no permissions for feeds
-				retryable = false
-				state = InvalidMercuryRequest
-				return fmt.Errorf("at timestamp %s upkeep %s received status code %d from mercury v0.3, most likely this is caused by missing/malformed query args, missing or bad required headers, non-existent feeds, or no permissions for feeds", ml.time.String(), ml.upkeepId.String(), resp.StatusCode)
-			} else if resp.StatusCode != http.StatusOK {
-				retryable = false
-				state = InvalidMercuryRequest
-				return fmt.Errorf("at timestamp %s upkeep %s received status code %d from mercury v0.3", ml.time.String(), ml.upkeepId.String(), resp.StatusCode)
-			}
-
-			var response MercuryV03Response
-			err1 = json.Unmarshal(body, &response)
-			if err1 != nil {
-				// mlh.logger.Errorw("StreamsLookup failed to unmarshal body to MercuryResponse for multi feed", "upkeepID", ml.upkeepId.String(), "time", ml.time.String(), "error", err1)
-				retryable = false
-				state = MercuryUnmarshalError
-				return err1
-			}
-			// in v0.3, if some feeds are not available, the server will only return available feeds, but we need to make sure ALL feeds are retrieved before calling user contract
-			// hence, retry in this case. retry will help when we send a very new timestamp and reports are not yet generated
-			if len(response.Reports) != len(ml.feeds) {
-				// TODO: AUTO-5044: calculate what reports are missing and log a warning
-				retryable = true
-				state = MercuryFlakyFailure
-				return fmt.Errorf("%d", http.StatusNotFound)
-			}
-			var reportBytes [][]byte
-			for _, rsp := range response.Reports {
-				b, err := hexutil.Decode(rsp.FullReport)
-				if err != nil {
-					retryable = false
-					state = InvalidMercuryResponse
-					return err
-				}
-				reportBytes = append(reportBytes, b)
-			}
-			ch <- MercuryData{
-				Index:     0,
-				Bytes:     reportBytes,
-				Retryable: false,
-				State:     NoPipelineError,
-			}
-			sent = true
-			return nil
-		},
-		// only retry when the error is 404 Not Found or 500 Internal Server Error
-		retry.RetryIf(func(err error) bool {
-			return err.Error() == fmt.Sprintf("%d", http.StatusNotFound) || err.Error() == fmt.Sprintf("%d", http.StatusInternalServerError)
-		}),
-		retry.Context(ctx),
-		retry.Delay(RetryDelay),
-		retry.Attempts(TotalAttempt))
-
-	if !sent {
-		md := MercuryData{
-			Index:     0,
-			Bytes:     [][]byte{},
-			Retryable: retryable,
-			Error:     retryErr,
-			State:     state,
-		}
-		ch <- md
-	}
-}
-
-// doMercuryRequest sends requests to Mercury API to retrieve ChainlinkBlob.
-func (mlh *MercuryLookupHandler) doMercuryRequest(ctx context.Context, ml *StreamsLookup) (PipelineExecutionState, UpkeepFailureReason, [][]byte, bool, error) {
-	var isMercuryV03 bool
-	resultLen := len(ml.feeds)
-	ch := make(chan MercuryData, resultLen)
-	if len(ml.feeds) == 0 {
-		return NoPipelineError, UpkeepFailureReasonInvalidRevertDataInput, nil, false, fmt.Errorf("invalid revert data input: feed param key %s, time param key %s, feeds %s", ml.feedParamKey, ml.timeParamKey, ml.feeds)
-	}
-	if ml.feedParamKey == FeedIdHex && ml.timeParamKey == BlockNumber {
-		// only v0.2
-		for i := range ml.feeds {
-			go mlh.singleFeedRequest(ctx, ch, i, ml)
-		}
-	} else if ml.feedParamKey == FeedIDs && ml.timeParamKey == Timestamp {
-		// only v0.3
-		resultLen = 1
-		isMercuryV03 = true
-		ch = make(chan MercuryData, resultLen)
-		go mlh.multiFeedsRequest(ctx, ch, ml)
-	} else {
-		return NoPipelineError, UpkeepFailureReasonInvalidRevertDataInput, nil, false, fmt.Errorf("invalid revert data input: feed param key %s, time param key %s, feeds %s", ml.feedParamKey, ml.timeParamKey, ml.feeds)
-	}
-
-	var reqErr error
-	results := make([][]byte, len(ml.feeds))
-	retryable := true
-	allSuccess := true
-	// in v0.2, use the last execution error as the state, if no execution errors, state will be no error
-	state := NoPipelineError
-	for i := 0; i < resultLen; i++ {
-		m := <-ch
-		if m.Error != nil {
-			if reqErr == nil {
-				reqErr = errors.New(m.Error.Error())
-			} else {
-				reqErr = errors.New(reqErr.Error() + m.Error.Error())
-			}
-			retryable = retryable && m.Retryable
-			allSuccess = false
-			if m.State != NoPipelineError {
-				state = m.State
-			}
-			continue
-		}
-		if isMercuryV03 {
-			results = m.Bytes
-		} else {
-			results[m.Index] = m.Bytes[0]
-		}
-	}
-	// only retry when not all successful AND none are not retryable
-	return state, UpkeepFailureReasonNone, results, retryable && !allSuccess, reqErr
-}
-
-// decodeStreamsLookup decodes the revert error StreamsLookup(string feedParamKey, string[] feeds, string timeParamKey, uint256 time, byte[] extraData)
-// func (mlh *MercuryLookupHandler) decodeStreamsLookup(data []byte) (*StreamsLookup, error) {
-// 	e := mlh.mercuryConfig.Abi.Errors["StreamsLookup"]
-// 	unpack, err := e.Unpack(data)
-// 	if err != nil {
-// 		return nil, fmt.Errorf("unpack error: %w", err)
-// 	}
-// 	errorParameters := unpack.([]interface{})
-
-// 	return &StreamsLookup{
-// 		feedParamKey: *abi.ConvertType(errorParameters[0], new(string)).(*string),
-// 		feeds:        *abi.ConvertType(errorParameters[1], new([]string)).(*[]string),
-// 		timeParamKey: *abi.ConvertType(errorParameters[2], new(string)).(*string),
-// 		time:         *abi.ConvertType(errorParameters[3], new(*big.Int)).(**big.Int),
-// 		extraData:    *abi.ConvertType(errorParameters[4], new([]byte)).(*[]byte),
-// 	}, nil
-// }
-
-// allowedToUseMercury retrieves upkeep's administrative offchain config and decode a mercuryEnabled bool to indicate if
-// this upkeep is allowed to use Mercury service.
-// func (mlh *MercuryLookupHandler) allowedToUseMercury(upkeep models.Upkeep) (bool, error) {
-// 	allowed, ok := mlh.mercuryConfig.AllowListCache.Get(upkeep.Admin.Hex())
-// 	if ok {
-// 		return allowed.(bool), nil
-// 	}
-
-// 	if upkeep.UpkeepPrivilegeConfig == nil {
-// 		return false, fmt.Errorf("the upkeep privilege config was not retrieved for upkeep with ID %s", upkeep.UpkeepID)
-// 	}
-
-// 	if len(upkeep.UpkeepPrivilegeConfig) == 0 {
-// 		return false, fmt.Errorf("the upkeep privilege config is empty")
-// 	}
-
-// 	var a UpkeepPrivilegeConfig
-// 	err := json.Unmarshal(upkeep.UpkeepPrivilegeConfig, &a)
-// 	if err != nil {
-// 		return false, fmt.Errorf("failed to unmarshal privilege config for upkeep ID %s: %v", upkeep.UpkeepID, err)
-// 	}
-
-// 	mlh.mercuryConfig.AllowListCache.Set(upkeep.Admin.Hex(), a.MercuryEnabled, cache.DefaultExpiration)
-// 	return a.MercuryEnabled, nil
-// }
-
-func (mlh *MercuryLookupHandler) CheckCallback(ctx context.Context, values [][]byte, lookup *StreamsLookup, registryABI ethabi.ABI, registryAddress common.Address) (hexutil.Bytes, error) {
-	payload, err := registryABI.Pack("checkCallback", lookup.upkeepId, values, lookup.extraData)
-	if err != nil {
-		return nil, err
-	}
-
-	var theBytes hexutil.Bytes
-	args := map[string]interface{}{
-		"to":   registryAddress.Hex(),
-		"data": hexutil.Bytes(payload),
-	}
-
-	// call checkCallback function at the block which OCR3 has agreed upon
-	err = mlh.rpcClient.CallContext(ctx, &theBytes, "eth_call", args, hexutil.EncodeUint64(lookup.block))
-	if err != nil {
-		return nil, err
-	}
-	return theBytes, nil
-}
diff --git a/core/scripts/go.mod b/core/scripts/go.mod
index db71535723e..895363a53f8 100644
--- a/core/scripts/go.mod
+++ b/core/scripts/go.mod
@@ -6,7 +6,6 @@ go 1.21.3
 replace github.com/smartcontractkit/chainlink/v2 => ../../
 
 require (
-	github.com/avast/retry-go v3.0.0+incompatible
 	github.com/docker/docker v24.0.7+incompatible
 	github.com/docker/go-connections v0.4.0
 	github.com/ethereum/go-ethereum v1.12.0
@@ -18,7 +17,6 @@ require (
 	github.com/montanaflynn/stats v0.7.1
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/pelletier/go-toml/v2 v2.1.1
-	github.com/pkg/errors v0.9.1
 	github.com/shopspring/decimal v1.3.1
 	github.com/smartcontractkit/chainlink-automation v1.0.1
 	github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
@@ -217,6 +215,7 @@ require (
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/pressly/goose/v3 v3.16.0 // indirect
diff --git a/core/scripts/go.sum b/core/scripts/go.sum
index 1c48074ea3a..dcf47d392cc 100644
--- a/core/scripts/go.sum
+++ b/core/scripts/go.sum
@@ -145,8 +145,6 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV
 github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA=
 github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/avast/retry-go v3.0.0+incompatible h1:4SOWQ7Qs+oroOTQOYnAHqelpCO0biHSxpiH9JdtuBj0=
-github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY=
 github.com/avast/retry-go/v4 v4.5.1 h1:AxIx0HGi4VZ3I02jr78j5lZ3M6x1E0Ivxa6b0pUUh7o=
 github.com/avast/retry-go/v4 v4.5.1/go.mod h1:/sipNsvNB3RRuT5iNcb6h73nw3IBmXJ/H3XrCQYSOpc=
 github.com/aws/aws-sdk-go v1.22.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams.go
index 70db40c26bb..d64a9e7ef83 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams.go
@@ -16,7 +16,6 @@ import (
 	"github.com/patrickmn/go-cache"
 
 	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"
-
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
 	iregistry21 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/i_keeper_registry_master_wrapper_2_1"
@@ -131,7 +130,6 @@ func (s *streams) buildResult(ctx context.Context, i int, checkResult ocr2keeper
 	// tried to call mercury
 	lookupLggr.Infof("at block %d upkeep %s trying to DecodeStreamsLookupRequest performData=%s", block, upkeepId, hexutil.Encode(checkResults[i].PerformData))
 	streamsLookupErr, err := s.packer.DecodeStreamsLookupRequest(checkResult.PerformData)
-
 	if err != nil {
 		lookupLggr.Debugf("at block %d upkeep %s DecodeStreamsLookupRequest failed: %v", block, upkeepId, err)
 		// user contract did not revert with StreamsLookup error
@@ -149,7 +147,7 @@ func (s *streams) buildResult(ctx context.Context, i int, checkResult ocr2keeper
 	if streamsLookupResponse.IsMercuryV02() {
 		// check permission on the registry for mercury v0.2
 		opts := s.buildCallOpts(ctx, block)
-		if state, reason, retryable, allowed, err := s.allowedToUseMercury(opts, upkeepId.BigInt()); err != nil {
+		if state, reason, retryable, allowed, err := s.AllowedToUseMercury(opts, upkeepId.BigInt()); err != nil {
 			lookupLggr.Warnf("at block %s upkeep %s failed to query mercury allow list: %s", block, upkeepId, err)
 			checkResults[i].PipelineExecutionState = uint8(state)
 			checkResults[i].IneligibilityReason = uint8(reason)
@@ -178,65 +176,93 @@ func (s *streams) buildResult(ctx context.Context, i int, checkResult ocr2keeper
 func (s *streams) doLookup(ctx context.Context, wg *sync.WaitGroup, lookup *mercury.StreamsLookup, i int, checkResults []ocr2keepers.CheckResult) {
 	defer wg.Done()
 
-	state, reason, values, retryable, retryInterval, err := mercury.NoPipelineError, mercury.MercuryUpkeepFailureReasonInvalidRevertDataInput, [][]byte{}, false, 0*time.Second, fmt.Errorf("invalid revert data input: feed param key %s, time param key %s, feeds %s", lookup.FeedParamKey, lookup.TimeParamKey, lookup.Feeds)
-	pluginRetryKey := generatePluginRetryKey(checkResults[i].WorkID, lookup.Block)
+	values, err := s.DoMercuryRequest(ctx, lookup, checkResults, i)
+	if err != nil {
+		s.lggr.Errorf("at block %d upkeep %s requested time %s DoMercuryRequest err: %s", lookup.Block, lookup.UpkeepId, lookup.Time, err.Error())
+	}
 
-	if lookup.IsMercuryV02() {
-		state, reason, values, retryable, retryInterval, err = s.v02Client.DoRequest(ctx, lookup, pluginRetryKey)
-	} else if lookup.IsMercuryV03() {
-		state, reason, values, retryable, retryInterval, err = s.v03Client.DoRequest(ctx, lookup, pluginRetryKey)
+	if err := s.CheckCallback(ctx, values, lookup, checkResults, i); err != nil {
+		s.lggr.Errorf("at block %d upkeep %s requested time %s CheckCallback err: %s", lookup.Block, lookup.UpkeepId, lookup.Time, err.Error())
 	}
+}
 
+func (s *streams) CheckCallback(ctx context.Context, values [][]byte, lookup *mercury.StreamsLookup, checkResults []ocr2keepers.CheckResult, i int) error {
+	payload, err := s.abi.Pack("checkCallback", lookup.UpkeepId, values, lookup.ExtraData)
 	if err != nil {
-		s.lggr.Errorf("at block %d upkeep %s requested time %s retryable %v retryInterval %s doMercuryRequest: %s", lookup.Block, lookup.UpkeepId, lookup.Time, retryable, retryInterval, err.Error())
-		checkResults[i].Retryable = retryable
-		checkResults[i].RetryInterval = retryInterval
-		checkResults[i].PipelineExecutionState = uint8(state)
-		checkResults[i].IneligibilityReason = uint8(reason)
-		return
+		checkResults[i].Retryable = false
+		checkResults[i].PipelineExecutionState = uint8(mercury.PackUnpackDecodeFailed)
+		return err
 	}
 
-	for j, v := range values {
-		s.lggr.Infof("at block %d upkeep %s requested time %s doMercuryRequest values[%d]: %s", lookup.Block, lookup.UpkeepId, lookup.Time, j, hexutil.Encode(v))
+	var mercuryBytes hexutil.Bytes
+	args := map[string]interface{}{
+		"to":   s.registry.Address().Hex(),
+		"data": hexutil.Bytes(payload),
 	}
 
-	state, retryable, mercuryBytes, err := s.checkCallback(ctx, values, lookup)
-	if err != nil {
-		s.lggr.Errorf("at block %d upkeep %s checkCallback err: %s", lookup.Block, lookup.UpkeepId, err.Error())
-		checkResults[i].Retryable = retryable
-		checkResults[i].PipelineExecutionState = uint8(state)
-		return
+	// call checkCallback function at the block which OCR3 has agreed upon
+	if err = s.client.CallContext(ctx, &mercuryBytes, "eth_call", args, hexutil.EncodeUint64(lookup.Block)); err != nil {
+		checkResults[i].Retryable = true
+		checkResults[i].PipelineExecutionState = uint8(mercury.RpcFlakyFailure)
+		return err
 	}
+
 	s.lggr.Infof("at block %d upkeep %s requested time %s checkCallback mercuryBytes: %s", lookup.Block, lookup.UpkeepId, lookup.Time, hexutil.Encode(mercuryBytes))
 
 	unpackCallBackState, needed, performData, failureReason, _, err := s.packer.UnpackCheckCallbackResult(mercuryBytes)
 	if err != nil {
-		s.lggr.Errorf("at block %d upkeep %s requested time %s UnpackCheckCallbackResult err: %s", lookup.Block, lookup.UpkeepId, lookup.Time, err.Error())
 		checkResults[i].PipelineExecutionState = unpackCallBackState
-		return
+		return err
 	}
 
 	if failureReason == uint8(mercury.MercuryUpkeepFailureReasonMercuryCallbackReverted) {
 		checkResults[i].IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonMercuryCallbackReverted)
 		s.lggr.Debugf("at block %d upkeep %s requested time %s mercury callback reverts", lookup.Block, lookup.UpkeepId, lookup.Time)
-		return
+		return nil
+
 	}
 
 	if !needed {
 		checkResults[i].IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonUpkeepNotNeeded)
 		s.lggr.Debugf("at block %d upkeep %s requested time %s callback reports upkeep not needed", lookup.Block, lookup.UpkeepId, lookup.Time)
-		return
+		return nil
 	}
 
 	checkResults[i].IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonNone)
 	checkResults[i].Eligible = true
 	checkResults[i].PerformData = performData
 	s.lggr.Infof("at block %d upkeep %s requested time %s successful with perform data: %s", lookup.Block, lookup.UpkeepId, lookup.Time, hexutil.Encode(performData))
+
+	return nil
 }
 
-// allowedToUseMercury retrieves upkeep's administrative offchain config and decode a mercuryEnabled bool to indicate if
+func (s *streams) DoMercuryRequest(ctx context.Context, lookup *mercury.StreamsLookup, checkResults []ocr2keepers.CheckResult, i int) ([][]byte, error) {
+	state, reason, values, retryable, retryInterval, err := mercury.NoPipelineError, mercury.MercuryUpkeepFailureReasonInvalidRevertDataInput, [][]byte{}, false, 0*time.Second, fmt.Errorf("invalid revert data input: feed param key %s, time param key %s, feeds %s", lookup.FeedParamKey, lookup.TimeParamKey, lookup.Feeds)
+	pluginRetryKey := generatePluginRetryKey(checkResults[i].WorkID, lookup.Block)
+
+	if lookup.IsMercuryV02() {
+		state, reason, values, retryable, retryInterval, err = s.v02Client.DoRequest(ctx, lookup, pluginRetryKey)
+	} else if lookup.IsMercuryV03() {
+		state, reason, values, retryable, retryInterval, err = s.v03Client.DoRequest(ctx, lookup, pluginRetryKey)
+	}
+
+	if err != nil {
+		checkResults[i].Retryable = retryable
+		checkResults[i].RetryInterval = retryInterval
+		checkResults[i].PipelineExecutionState = uint8(state)
+		checkResults[i].IneligibilityReason = uint8(reason)
+		return nil, err
+	}
+
+	for j, v := range values {
+		s.lggr.Infof("at block %d upkeep %s requested time %s doMercuryRequest values[%d]: %s", lookup.Block, lookup.UpkeepId, lookup.Time, j, hexutil.Encode(v))
+	}
+	return values, nil
+}
+
+// AllowedToUseMercury retrieves upkeep's administrative offchain config and decode a mercuryEnabled bool to indicate if
 // this upkeep is allowed to use Mercury service.
-func (s *streams) allowedToUseMercury(opts *bind.CallOpts, upkeepId *big.Int) (state mercury.MercuryUpkeepState, reason mercury.MercuryUpkeepFailureReason, retryable bool, allow bool, err error) {
+func (s *streams) AllowedToUseMercury(opts *bind.CallOpts, upkeepId *big.Int) (state mercury.MercuryUpkeepState, reason mercury.MercuryUpkeepFailureReason, retryable bool, allow bool, err error) {
 	allowed, ok := s.mercuryConfig.IsUpkeepAllowed(upkeepId.String())
 	if ok {
 		return mercury.NoPipelineError, mercury.MercuryUpkeepFailureReasonNone, false, allowed.(bool), nil
@@ -256,7 +282,6 @@ func (s *streams) allowedToUseMercury(opts *bind.CallOpts, upkeepId *big.Int) (s
 		"data": hexutil.Bytes(payload),
 	}
 
-	// call checkCallback function at the block which OCR3 has agreed upon
 	if err = s.client.CallContext(opts.Context, &resultBytes, "eth_call", args, hexutil.EncodeBig(opts.BlockNumber)); err != nil {
 		return mercury.RpcFlakyFailure, mercury.MercuryUpkeepFailureReasonNone, true, false, fmt.Errorf("failed to get upkeep privilege config: %v", err)
 	}
@@ -282,26 +307,6 @@ func (s *streams) allowedToUseMercury(opts *bind.CallOpts, upkeepId *big.Int) (s
 	return mercury.NoPipelineError, mercury.MercuryUpkeepFailureReasonNone, false, privilegeConfig.MercuryEnabled, nil
 }
 
-func (s *streams) checkCallback(ctx context.Context, values [][]byte, lookup *mercury.StreamsLookup) (mercury.MercuryUpkeepState, bool, hexutil.Bytes, error) {
-	payload, err := s.abi.Pack("checkCallback", lookup.UpkeepId, values, lookup.ExtraData)
-	if err != nil {
-		return mercury.PackUnpackDecodeFailed, false, nil, err
-	}
-
-	var b hexutil.Bytes
-	args := map[string]interface{}{
-		"to":   s.registry.Address().Hex(),
-		"data": hexutil.Bytes(payload),
-	}
-
-	// call checkCallback function at the block which OCR3 has agreed upon
-	if err := s.client.CallContext(ctx, &b, "eth_call", args, hexutil.EncodeUint64(lookup.Block)); err != nil {
-		return mercury.RpcFlakyFailure, true, nil, err
-	}
-
-	return mercury.NoPipelineError, false, b, nil
-}
-
 func (s *streams) buildCallOpts(ctx context.Context, block *big.Int) *bind.CallOpts {
 	opts := bind.CallOpts{
 		Context: ctx,
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams_test.go
index 32041d0f18b..caa3efb974b 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams_test.go
@@ -127,6 +127,7 @@ func TestStreams_CheckCallback(t *testing.T) {
 	tests := []struct {
 		name       string
 		lookup     *mercury.StreamsLookup
+		input      []ocr2keepers.CheckResult
 		values     [][]byte
 		statusCode int
 
@@ -154,6 +155,9 @@ func TestStreams_CheckCallback(t *testing.T) {
 				UpkeepId: upkeepId,
 				Block:    bn,
 			},
+			input: []ocr2keepers.CheckResult{
+				{},
+			},
 			values:       values,
 			statusCode:   http.StatusOK,
 			callbackResp: []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 48, 120, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
@@ -186,6 +190,9 @@ func TestStreams_CheckCallback(t *testing.T) {
 				UpkeepId: upkeepId,
 				Block:    bn,
 			},
+			input: []ocr2keepers.CheckResult{
+				{},
+			},
 			values:       values,
 			statusCode:   http.StatusOK,
 			callbackResp: []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
@@ -217,6 +224,9 @@ func TestStreams_CheckCallback(t *testing.T) {
 				UpkeepId: upkeepId,
 				Block:    bn,
 			},
+			input: []ocr2keepers.CheckResult{
+				{},
+			},
 			values:       values,
 			statusCode:   http.StatusOK,
 			callbackResp: []byte{},
@@ -256,10 +266,10 @@ func TestStreams_CheckCallback(t *testing.T) {
 				}).Once()
 			s.client = client
 
-			state, retryable, _, err := s.checkCallback(testutils.Context(t), tt.values, tt.lookup)
-			tt.wantErr(t, err, fmt.Sprintf("Error asserion failed: %v", tt.name))
-			assert.Equal(t, tt.state, state)
-			assert.Equal(t, tt.retryable, retryable)
+			err = s.CheckCallback(testutils.Context(t), tt.values, tt.lookup, tt.input, 0)
+			tt.wantErr(t, err, fmt.Sprintf("Error assertion failed: %v", tt.name))
+			assert.Equal(t, uint8(tt.state), tt.input[0].PipelineExecutionState)
+			assert.Equal(t, tt.retryable, tt.input[0].Retryable)
 		})
 	}
 }
@@ -435,7 +445,7 @@ func TestStreams_AllowedToUseMercury(t *testing.T) {
 				BlockNumber: big.NewInt(10),
 			}
 
-			state, reason, retryable, allowed, err := s.allowedToUseMercury(opts, upkeepId)
+			state, reason, retryable, allowed, err := s.AllowedToUseMercury(opts, upkeepId)
 			assert.Equal(t, tt.err, err)
 			assert.Equal(t, tt.allowed, allowed)
 			assert.Equal(t, tt.state, state)

From 00e5b579a31225f151dcbc2b6fb23efe828dbb62 Mon Sep 17 00:00:00 2001
From: Adam Hamrick <adam.hamrick@smartcontract.com>
Date: Wed, 13 Dec 2023 16:26:36 -0500
Subject: [PATCH 126/130] Adds MAKE Command for Building Plugin Image (#11567)

---
 integration-tests/Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/integration-tests/Makefile b/integration-tests/Makefile
index fb4bfa74f3e..86a266a996a 100644
--- a/integration-tests/Makefile
+++ b/integration-tests/Makefile
@@ -192,6 +192,12 @@ test_reorg_automation: ## Run the automation reorg tests
 build_docker_image:
 	docker build -f ../core/chainlink.Dockerfile --build-arg COMMIT_SHA=$(git rev-parse HEAD) --build-arg CHAINLINK_USER=chainlink -t $(image):$(tag) ../
 
+# image: the name for the chainlink image being built, example: image=chainlink
+# tag: the tag for the chainlink image being built, example: tag=latest
+# example usage: make build_docker_image image=chainlink tag=latest
+.PHONY: build_plugin_docker_image
+build_docker_image:
+	docker build -f ../plugins/chainlink.Dockerfile --build-arg COMMIT_SHA=$(git rev-parse HEAD) --build-arg CHAINLINK_USER=chainlink -t localhost:5000/chainlink:develop ../
 
 # image: the name for the chainlink image being built, example: image=chainlink
 # tag: the tag for the chainlink image being built, example: tag=latest

From 51623252ed7041d44c405def879a26611769d553 Mon Sep 17 00:00:00 2001
From: Lei <lei.shi@smartcontract.com>
Date: Wed, 13 Dec 2023 14:42:33 -0800
Subject: [PATCH 127/130] Mercury Packer (#11521)

* Refactor encoding.Packer to have Mercury control its own interface and function implementations

* rebase and update
---
 core/scripts/chaincli/handler/debug.go        |  37 ++--
 .../evmregistry/v21/encoding/interface.go     |   7 -
 .../evmregistry/v21/encoding/packer.go        |  48 -----
 .../evmregistry/v21/encoding/packer_test.go   | 186 -----------------
 .../evmregistry/v21/mercury/mercury.go        |  75 ++++++-
 .../evmregistry/v21/mercury/mercury_test.go   | 193 ++++++++++++++++++
 .../v21/mercury/streams/streams.go            |   6 +-
 .../v21/mercury/streams/streams_test.go       |   2 -
 .../ocr2keeper/evmregistry/v21/registry.go    |   3 +-
 9 files changed, 290 insertions(+), 267 deletions(-)

diff --git a/core/scripts/chaincli/handler/debug.go b/core/scripts/chaincli/handler/debug.go
index 815a0c9a030..3e8bd6d597e 100644
--- a/core/scripts/chaincli/handler/debug.go
+++ b/core/scripts/chaincli/handler/debug.go
@@ -23,7 +23,6 @@ import (
 	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"
 
 	evm21 "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury"
 
 	"github.com/smartcontractkit/chainlink/core/scripts/chaincli/config"
 	"github.com/smartcontractkit/chainlink/core/scripts/common"
@@ -33,6 +32,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/models"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams"
 	"github.com/smartcontractkit/chainlink/v2/core/utils"
 	bigmath "github.com/smartcontractkit/chainlink/v2/core/utils/big_math"
@@ -44,6 +44,7 @@ const (
 	expectedTypeAndVersion = "KeeperRegistry 2.1.0"
 )
 
+var mercuryPacker = mercury.NewAbiPacker()
 var packer = encoding.NewAbiPacker()
 
 var links []string
@@ -258,10 +259,10 @@ func (k *Keeper) Debug(ctx context.Context, args []string) {
 		mercuryConfig := evm21.NewMercuryConfig(mc, core.StreamsCompatibleABI)
 		lggr, _ := logger.NewLogger()
 		blockSub := &blockSubscriber{k.client}
-		streams := streams.NewStreamsLookup(packer, mercuryConfig, blockSub, k.rpcClient, keeperRegistry21, lggr)
+		streams := streams.NewStreamsLookup(mercuryConfig, blockSub, k.rpcClient, keeperRegistry21, lggr)
 
 		var streamsLookupErr *mercury.StreamsLookupError
-		streamsLookupErr, err = packer.DecodeStreamsLookupRequest(checkResult.PerformData)
+		streamsLookupErr, err = mercuryPacker.DecodeStreamsLookupRequest(checkResult.PerformData)
 		if err == nil {
 			message("upkeep reverted with StreamsLookup")
 			message(fmt.Sprintf("StreamsLookup data: {FeedParamKey: %s, Feeds: %v, TimeParamKey: %s, Time: %d, ExtraData: %s}", streamsLookupErr.FeedParamKey, streamsLookupErr.Feeds, streamsLookupErr.TimeParamKey, streamsLookupErr.Time.Uint64(), hexutil.Encode(streamsLookupErr.ExtraData)))
@@ -282,7 +283,7 @@ func (k *Keeper) Debug(ctx context.Context, args []string) {
 				message("using mercury lookup v0.2")
 				// check if upkeep is allowed to use mercury v0.2
 				var allowed bool
-				_, _, _, allowed, err = streams.AllowedToUseMercury(latestCallOpts, upkeepID)
+				_, _, _, allowed, err = streams.AllowedToUseMercury(triggerCallOpts, upkeepID)
 				if err != nil {
 					failUnknown("failed to check if upkeep is allowed to use mercury", err)
 				}
@@ -307,10 +308,10 @@ func (k *Keeper) Debug(ctx context.Context, args []string) {
 			var values [][]byte
 			values, err = streams.DoMercuryRequest(ctx, streamsLookup, checkResults, 0)
 
-			if automationCheckResult.IneligibilityReason == uint8(mercury.MercuryUpkeepFailureReasonInvalidRevertDataInput) {
+			if checkResults[0].IneligibilityReason == uint8(mercury.MercuryUpkeepFailureReasonInvalidRevertDataInput) {
 				resolveIneligible("upkeep used invalid revert data")
 			}
-			if automationCheckResult.PipelineExecutionState == uint8(mercury.InvalidMercuryRequest) {
+			if checkResults[0].PipelineExecutionState == uint8(mercury.InvalidMercuryRequest) {
 				resolveIneligible("the mercury request data is invalid")
 			}
 			if err != nil {
@@ -322,10 +323,10 @@ func (k *Keeper) Debug(ctx context.Context, args []string) {
 			if err != nil {
 				failUnknown("failed to execute mercury callback ", err)
 			}
-			if automationCheckResult.IneligibilityReason != 0 {
-				message(fmt.Sprintf("checkCallback failed with UpkeepFailureReason %d", automationCheckResult.IneligibilityReason))
+			if checkResults[0].IneligibilityReason != 0 {
+				message(fmt.Sprintf("checkCallback failed with UpkeepFailureReason %d", checkResults[0].IneligibilityReason))
 			}
-			upkeepNeeded, performData = automationCheckResult.Eligible, automationCheckResult.PerformData
+			upkeepNeeded, performData = checkResults[0].Eligible, checkResults[0].PerformData
 			// do tenderly simulations for checkCallback
 			var rawCall []byte
 			rawCall, err = core.RegistryABI.Pack("checkCallback", upkeepID, values, streamsLookup.ExtraData)
@@ -345,13 +346,23 @@ func (k *Keeper) Debug(ctx context.Context, args []string) {
 	if !upkeepNeeded {
 		resolveIneligible("upkeep is not needed")
 	}
-	// simulate perform ukeep
-	simulateResult, err := keeperRegistry21.SimulatePerformUpkeep(latestCallOpts, upkeepID, performData)
+	// simulate perform upkeep
+	simulateResult, err := keeperRegistry21.SimulatePerformUpkeep(triggerCallOpts, upkeepID, performData)
 	if err != nil {
 		failUnknown("failed to simulate perform upkeep: ", err)
 	}
+
+	// do tenderly simulation
+	rawCall, err := core.RegistryABI.Pack("simulatePerformUpkeep", upkeepID, performData)
+	if err != nil {
+		failUnknown("failed to pack raw simulatePerformUpkeep call", err)
+	}
+	addLink("simulatePerformUpkeep simulation", tenderlySimLink(k.cfg, chainID, blockNum, rawCall, registryAddress))
+
 	if simulateResult.Success {
 		resolveEligible()
+	} else {
+		resolveIneligible("simulate perform upkeep unsuccessful")
 	}
 }
 
@@ -466,11 +477,11 @@ func warning(msg string) {
 }
 
 func resolveIneligible(msg string) {
-	exit(fmt.Sprintf("✅ %s: this upkeep is not currently eligible", msg), nil, 0)
+	exit(fmt.Sprintf("❌ this upkeep is not eligible: %s", msg), nil, 0)
 }
 
 func resolveEligible() {
-	exit("❌ this upkeep is currently eligible", nil, 0)
+	exit("✅ this upkeep is eligible", nil, 0)
 }
 
 func rerun(msg string, err error) {
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/interface.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/interface.go
index 06a3e7b106b..ed3218ea405 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/interface.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/interface.go
@@ -1,13 +1,10 @@
 package encoding
 
 import (
-	"math/big"
-
 	ocr2keepers "github.com/smartcontractkit/chainlink-automation/pkg/v3/types"
 
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_utils_2_1"
 	iregistry21 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/i_keeper_registry_master_wrapper_2_1"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury"
 )
 
 const (
@@ -51,12 +48,8 @@ type UpkeepInfo = iregistry21.KeeperRegistryBase21UpkeepInfo
 
 type Packer interface {
 	UnpackCheckResult(payload ocr2keepers.UpkeepPayload, raw string) (ocr2keepers.CheckResult, error)
-	UnpackCheckCallbackResult(callbackResp []byte) (uint8, bool, []byte, uint8, *big.Int, error)
 	UnpackPerformResult(raw string) (uint8, bool, error)
 	UnpackLogTriggerConfig(raw []byte) (automation_utils_2_1.LogTriggerConfig, error)
 	PackReport(report automation_utils_2_1.KeeperRegistryBase21Report) ([]byte, error)
 	UnpackReport(raw []byte) (automation_utils_2_1.KeeperRegistryBase21Report, error)
-	PackGetUpkeepPrivilegeConfig(upkeepId *big.Int) ([]byte, error)
-	UnpackGetUpkeepPrivilegeConfig(resp []byte) ([]byte, error)
-	DecodeStreamsLookupRequest(data []byte) (*mercury.StreamsLookupError, error)
 }
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/packer.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/packer.go
index 57013a6277a..4a92b4a17ec 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/packer.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/packer.go
@@ -11,7 +11,6 @@ import (
 
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_utils_2_1"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury"
 )
 
 // triggerWrapper is a wrapper for the different trigger types (log and condition triggers).
@@ -67,35 +66,6 @@ func (p *abiPacker) UnpackCheckResult(payload ocr2keepers.UpkeepPayload, raw str
 	return result, nil
 }
 
-func (p *abiPacker) PackGetUpkeepPrivilegeConfig(upkeepId *big.Int) ([]byte, error) {
-	return p.registryABI.Pack("getUpkeepPrivilegeConfig", upkeepId)
-}
-
-func (p *abiPacker) UnpackGetUpkeepPrivilegeConfig(resp []byte) ([]byte, error) {
-	out, err := p.registryABI.Methods["getUpkeepPrivilegeConfig"].Outputs.UnpackValues(resp)
-	if err != nil {
-		return nil, fmt.Errorf("%w: unpack getUpkeepPrivilegeConfig return", err)
-	}
-
-	bts := *abi.ConvertType(out[0], new([]byte)).(*[]byte)
-
-	return bts, nil
-}
-
-func (p *abiPacker) UnpackCheckCallbackResult(callbackResp []byte) (uint8, bool, []byte, uint8, *big.Int, error) {
-	out, err := p.registryABI.Methods["checkCallback"].Outputs.UnpackValues(callbackResp)
-	if err != nil {
-		return PackUnpackDecodeFailed, false, nil, 0, nil, fmt.Errorf("%w: unpack checkUpkeep return: %s", err, hexutil.Encode(callbackResp))
-	}
-
-	upkeepNeeded := *abi.ConvertType(out[0], new(bool)).(*bool)
-	rawPerformData := *abi.ConvertType(out[1], new([]byte)).(*[]byte)
-	failureReason := *abi.ConvertType(out[2], new(uint8)).(*uint8)
-	gasUsed := *abi.ConvertType(out[3], new(*big.Int)).(**big.Int)
-
-	return NoPipelineError, upkeepNeeded, rawPerformData, failureReason, gasUsed, nil
-}
-
 func (p *abiPacker) UnpackPerformResult(raw string) (uint8, bool, error) {
 	b, err := hexutil.Decode(raw)
 	if err != nil {
@@ -163,24 +133,6 @@ func (p *abiPacker) UnpackReport(raw []byte) (automation_utils_2_1.KeeperRegistr
 	return report, nil
 }
 
-// DecodeStreamsLookupRequest decodes the revert error StreamsLookup(string feedParamKey, string[] feeds, string feedParamKey, uint256 time, byte[] extraData)
-func (p *abiPacker) DecodeStreamsLookupRequest(data []byte) (*mercury.StreamsLookupError, error) {
-	e := p.streamsABI.Errors["StreamsLookup"]
-	unpack, err := e.Unpack(data)
-	if err != nil {
-		return nil, fmt.Errorf("unpack error: %w", err)
-	}
-	errorParameters := unpack.([]interface{})
-
-	return &mercury.StreamsLookupError{
-		FeedParamKey: *abi.ConvertType(errorParameters[0], new(string)).(*string),
-		Feeds:        *abi.ConvertType(errorParameters[1], new([]string)).(*[]string),
-		TimeParamKey: *abi.ConvertType(errorParameters[2], new(string)).(*string),
-		Time:         *abi.ConvertType(errorParameters[3], new(*big.Int)).(**big.Int),
-		ExtraData:    *abi.ConvertType(errorParameters[4], new([]byte)).(*[]byte),
-	}, nil
-}
-
 // GetIneligibleCheckResultWithoutPerformData returns an ineligible check result with ineligibility reason and pipeline execution state but without perform data
 func GetIneligibleCheckResultWithoutPerformData(p ocr2keepers.UpkeepPayload, reason uint8, state uint8, retryable bool) ocr2keepers.CheckResult {
 	return ocr2keepers.CheckResult{
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/packer_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/packer_test.go
index 42fcd40d618..71c2755f150 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/packer_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding/packer_test.go
@@ -1,8 +1,6 @@
 package encoding
 
 import (
-	"encoding/json"
-	"errors"
 	"fmt"
 	"math/big"
 	"testing"
@@ -17,7 +15,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_utils_2_1"
 	automation21Utils "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_utils_2_1"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
-	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury"
 )
 
 func TestPacker_PackReport(t *testing.T) {
@@ -231,62 +228,6 @@ func TestPacker_UnpackPerformResult(t *testing.T) {
 	}
 }
 
-func TestPacker_UnpackCheckCallbackResult(t *testing.T) {
-	tests := []struct {
-		Name          string
-		CallbackResp  []byte
-		UpkeepNeeded  bool
-		PerformData   []byte
-		FailureReason uint8
-		GasUsed       *big.Int
-		ErrorString   string
-		State         uint8
-	}{
-		{
-			Name:          "unpack upkeep needed",
-			CallbackResp:  []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 46, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 10, 11, 21, 31, 41, 15, 16, 17, 18, 19, 13, 14, 12, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 120, 111, 101, 122, 90, 54, 44, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-			UpkeepNeeded:  true,
-			PerformData:   []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 10, 11, 21, 31, 41, 15, 16, 17, 18, 19, 13, 14, 12, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 120, 111, 101, 122, 90, 54, 44, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-			FailureReason: uint8(UpkeepFailureReasonNone),
-			GasUsed:       big.NewInt(11796),
-		},
-		{
-			Name:          "unpack upkeep not needed",
-			CallbackResp:  []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 208, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 10, 11, 21, 31, 41, 15, 16, 17, 18, 19, 13, 14, 12, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 120, 111, 101, 122, 90, 54, 44, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-			UpkeepNeeded:  false,
-			PerformData:   []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 10, 11, 21, 31, 41, 15, 16, 17, 18, 19, 13, 14, 12, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 120, 111, 101, 122, 90, 54, 44, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-			FailureReason: uint8(UpkeepFailureReasonUpkeepNotNeeded),
-			GasUsed:       big.NewInt(13008),
-		},
-		{
-			Name:         "unpack malformed data",
-			CallbackResp: []byte{0, 0, 0, 23, 4, 163, 66, 91, 228, 102, 200, 84, 144, 233, 218, 44, 168, 192, 191, 253, 0, 0, 0, 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-			UpkeepNeeded: false,
-			PerformData:  nil,
-			ErrorString:  "abi: improperly encoded boolean value: unpack checkUpkeep return: ",
-			State:        PackUnpackDecodeFailed,
-		},
-	}
-	for _, test := range tests {
-		t.Run(test.Name, func(t *testing.T) {
-			packer := NewAbiPacker()
-
-			state, needed, pd, failureReason, gasUsed, err := packer.UnpackCheckCallbackResult(test.CallbackResp)
-
-			if test.ErrorString != "" {
-				assert.EqualError(t, err, test.ErrorString+hexutil.Encode(test.CallbackResp))
-			} else {
-				assert.Nil(t, err)
-			}
-			assert.Equal(t, test.UpkeepNeeded, needed)
-			assert.Equal(t, test.PerformData, pd)
-			assert.Equal(t, test.FailureReason, failureReason)
-			assert.Equal(t, test.GasUsed, gasUsed)
-			assert.Equal(t, test.State, state)
-		})
-	}
-}
-
 func TestPacker_UnpackLogTriggerConfig(t *testing.T) {
 	tests := []struct {
 		name    string
@@ -349,130 +290,3 @@ func TestPacker_PackReport_UnpackReport(t *testing.T) {
 	expected := "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000002600000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000006400000000000000000000000000000000000000000000000000000000000000c800000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000040102030400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000405060708000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000004050607080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040102030400000000000000000000000000000000000000000000000000000000"
 	assert.Equal(t, hexutil.Encode(res), expected)
 }
-
-func TestPacker_PackGetUpkeepPrivilegeConfig(t *testing.T) {
-	tests := []struct {
-		name     string
-		upkeepId *big.Int
-		raw      []byte
-		errored  bool
-	}{
-		{
-			name: "happy path",
-			upkeepId: func() *big.Int {
-				id, _ := new(big.Int).SetString("52236098515066839510538748191966098678939830769967377496848891145101407612976", 10)
-
-				return id
-			}(),
-			raw: func() []byte {
-				b, _ := hexutil.Decode("0x19d97a94737c9583000000000000000000000001ea8ed6d0617dd5b3b87374020efaf030")
-
-				return b
-			}(),
-			errored: false,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			packer := NewAbiPacker()
-
-			b, err := packer.PackGetUpkeepPrivilegeConfig(test.upkeepId)
-
-			if !test.errored {
-				require.NoError(t, err, "no error expected from packing")
-
-				assert.Equal(t, test.raw, b, "raw bytes for output should match expected")
-			} else {
-				assert.NotNil(t, err, "error expected from packing function")
-			}
-		})
-	}
-}
-
-func TestPacker_UnpackGetUpkeepPrivilegeConfig(t *testing.T) {
-	tests := []struct {
-		name    string
-		raw     []byte
-		errored bool
-	}{
-		{
-			name: "happy path",
-			raw: func() []byte {
-				b, _ := hexutil.Decode("0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000177b226d657263757279456e61626c6564223a747275657d000000000000000000")
-
-				return b
-			}(),
-			errored: false,
-		},
-		{
-			name: "error empty config",
-			raw: func() []byte {
-				b, _ := hexutil.Decode("0x")
-
-				return b
-			}(),
-			errored: true,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			packer := NewAbiPacker()
-
-			b, err := packer.UnpackGetUpkeepPrivilegeConfig(test.raw)
-
-			if !test.errored {
-				require.NoError(t, err, "should unpack bytes from abi encoded value")
-
-				// the actual struct to unmarshal into is not available to this
-				// package so basic json encoding is the limit of the following test
-				var data map[string]interface{}
-				err = json.Unmarshal(b, &data)
-
-				assert.NoError(t, err, "packed data should unmarshal using json encoding")
-				assert.Equal(t, []byte(`{"mercuryEnabled":true}`), b)
-			} else {
-				assert.NotNil(t, err, "error expected from unpack function")
-			}
-		})
-	}
-}
-
-func TestPacker_DecodeStreamsLookupRequest(t *testing.T) {
-	tests := []struct {
-		name     string
-		data     []byte
-		expected *mercury.StreamsLookupError
-		state    uint8
-		err      error
-	}{
-		{
-			name: "success - decode to streams lookup",
-			data: hexutil.MustDecode("0xf055e4a200000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000002400000000000000000000000000000000000000000000000000000000002435eb50000000000000000000000000000000000000000000000000000000000000280000000000000000000000000000000000000000000000000000000000000000966656564496448657800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000423078343535343438326435353533343432643431353234323439353435323535346432643534343535333534346534353534303030303030303030303030303030300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000042307834323534343332643535353334343264343135323432343935343532353534643264353434353533353434653435353430303030303030303030303030303030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b626c6f636b4e756d62657200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000064000000000000000000000000"),
-			expected: &mercury.StreamsLookupError{
-				FeedParamKey: "feedIdHex",
-				Feeds:        []string{"0x4554482d5553442d415242495452554d2d544553544e45540000000000000000", "0x4254432d5553442d415242495452554d2d544553544e45540000000000000000"},
-				TimeParamKey: "blockNumber",
-				Time:         big.NewInt(37969589),
-				ExtraData:    []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 100},
-			},
-		},
-		{
-			name: "failure - unpack error",
-			data: []byte{1, 2, 3, 4},
-			err:  errors.New("unpack error: invalid data for unpacking"),
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			packer := NewAbiPacker()
-			fl, err := packer.DecodeStreamsLookupRequest(tt.data)
-			assert.Equal(t, tt.expected, fl)
-			if tt.err != nil {
-				assert.Equal(t, tt.err.Error(), err.Error())
-			}
-		})
-	}
-}
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/mercury.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/mercury.go
index f9a3c001c66..10e77bf50ce 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/mercury.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/mercury.go
@@ -10,9 +10,13 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/ethereum/go-ethereum/accounts/abi"
+	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/patrickmn/go-cache"
 
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/models"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding"
 )
 
 const (
@@ -68,13 +72,6 @@ type MercuryData struct {
 	State     MercuryUpkeepState
 }
 
-type Packer interface {
-	UnpackCheckCallbackResult(callbackResp []byte) (uint8, bool, []byte, uint8, *big.Int, error)
-	PackGetUpkeepPrivilegeConfig(upkeepId *big.Int) ([]byte, error)
-	UnpackGetUpkeepPrivilegeConfig(resp []byte) ([]byte, error)
-	DecodeStreamsLookupRequest(data []byte) (*StreamsLookupError, error)
-}
-
 type MercuryConfigProvider interface {
 	Credentials() *models.MercuryCredentials
 	IsUpkeepAllowed(string) (interface{}, bool)
@@ -113,6 +110,70 @@ func (l *StreamsLookup) IsMercuryV03() bool {
 	return l.FeedParamKey == FeedIDs
 }
 
+// IsMercuryV03UsingBlockNumber is used to distinguish the batch path. It is used for Mercury V03 only
 func (l *StreamsLookup) IsMercuryV03UsingBlockNumber() bool {
 	return l.TimeParamKey == BlockNumber
 }
+
+type Packer interface {
+	UnpackCheckCallbackResult(callbackResp []byte) (uint8, bool, []byte, uint8, *big.Int, error)
+	PackGetUpkeepPrivilegeConfig(upkeepId *big.Int) ([]byte, error)
+	UnpackGetUpkeepPrivilegeConfig(resp []byte) ([]byte, error)
+	DecodeStreamsLookupRequest(data []byte) (*StreamsLookupError, error)
+}
+
+type abiPacker struct {
+	registryABI abi.ABI
+	streamsABI  abi.ABI
+}
+
+func NewAbiPacker() *abiPacker {
+	return &abiPacker{registryABI: core.RegistryABI, streamsABI: core.StreamsCompatibleABI}
+}
+
+// DecodeStreamsLookupRequest decodes the revert error StreamsLookup(string feedParamKey, string[] feeds, string feedParamKey, uint256 time, byte[] extraData)
+func (p *abiPacker) DecodeStreamsLookupRequest(data []byte) (*StreamsLookupError, error) {
+	e := p.streamsABI.Errors["StreamsLookup"]
+	unpack, err := e.Unpack(data)
+	if err != nil {
+		return nil, fmt.Errorf("unpack error: %w", err)
+	}
+	errorParameters := unpack.([]interface{})
+
+	return &StreamsLookupError{
+		FeedParamKey: *abi.ConvertType(errorParameters[0], new(string)).(*string),
+		Feeds:        *abi.ConvertType(errorParameters[1], new([]string)).(*[]string),
+		TimeParamKey: *abi.ConvertType(errorParameters[2], new(string)).(*string),
+		Time:         *abi.ConvertType(errorParameters[3], new(*big.Int)).(**big.Int),
+		ExtraData:    *abi.ConvertType(errorParameters[4], new([]byte)).(*[]byte),
+	}, nil
+}
+
+func (p *abiPacker) UnpackCheckCallbackResult(callbackResp []byte) (uint8, bool, []byte, uint8, *big.Int, error) {
+	out, err := p.registryABI.Methods["checkCallback"].Outputs.UnpackValues(callbackResp)
+	if err != nil {
+		return encoding.PackUnpackDecodeFailed, false, nil, 0, nil, fmt.Errorf("%w: unpack checkUpkeep return: %s", err, hexutil.Encode(callbackResp))
+	}
+
+	upkeepNeeded := *abi.ConvertType(out[0], new(bool)).(*bool)
+	rawPerformData := *abi.ConvertType(out[1], new([]byte)).(*[]byte)
+	failureReason := *abi.ConvertType(out[2], new(uint8)).(*uint8)
+	gasUsed := *abi.ConvertType(out[3], new(*big.Int)).(**big.Int)
+
+	return encoding.NoPipelineError, upkeepNeeded, rawPerformData, failureReason, gasUsed, nil
+}
+
+func (p *abiPacker) UnpackGetUpkeepPrivilegeConfig(resp []byte) ([]byte, error) {
+	out, err := p.registryABI.Methods["getUpkeepPrivilegeConfig"].Outputs.UnpackValues(resp)
+	if err != nil {
+		return nil, fmt.Errorf("%w: unpack getUpkeepPrivilegeConfig return", err)
+	}
+
+	bts := *abi.ConvertType(out[0], new([]byte)).(*[]byte)
+
+	return bts, nil
+}
+
+func (p *abiPacker) PackGetUpkeepPrivilegeConfig(upkeepId *big.Int) ([]byte, error) {
+	return p.registryABI.Pack("getUpkeepPrivilegeConfig", upkeepId)
+}
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/mercury_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/mercury_test.go
index baa939dbecc..6095e7b9466 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/mercury_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/mercury_test.go
@@ -1,7 +1,17 @@
 package mercury
 
 import (
+	"encoding/json"
+	"errors"
+	"math/big"
 	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/stretchr/testify/assert"
+
+	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/encoding"
 )
 
 func TestGenerateHMACFn(t *testing.T) {
@@ -47,3 +57,186 @@ func TestGenerateHMACFn(t *testing.T) {
 		})
 	}
 }
+
+func TestPacker_DecodeStreamsLookupRequest(t *testing.T) {
+	tests := []struct {
+		name     string
+		data     []byte
+		expected *StreamsLookupError
+		state    uint8
+		err      error
+	}{
+		{
+			name: "success - decode to streams lookup",
+			data: hexutil.MustDecode("0xf055e4a200000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000002400000000000000000000000000000000000000000000000000000000002435eb50000000000000000000000000000000000000000000000000000000000000280000000000000000000000000000000000000000000000000000000000000000966656564496448657800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000423078343535343438326435353533343432643431353234323439353435323535346432643534343535333534346534353534303030303030303030303030303030300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000042307834323534343332643535353334343264343135323432343935343532353534643264353434353533353434653435353430303030303030303030303030303030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b626c6f636b4e756d62657200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000064000000000000000000000000"),
+			expected: &StreamsLookupError{
+				FeedParamKey: "feedIdHex",
+				Feeds:        []string{"0x4554482d5553442d415242495452554d2d544553544e45540000000000000000", "0x4254432d5553442d415242495452554d2d544553544e45540000000000000000"},
+				TimeParamKey: "blockNumber",
+				Time:         big.NewInt(37969589),
+				ExtraData:    []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 100},
+			},
+		},
+		{
+			name: "failure - unpack error",
+			data: []byte{1, 2, 3, 4},
+			err:  errors.New("unpack error: invalid data for unpacking"),
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			packer := NewAbiPacker()
+			fl, err := packer.DecodeStreamsLookupRequest(tt.data)
+			assert.Equal(t, tt.expected, fl)
+			if tt.err != nil {
+				assert.Equal(t, tt.err.Error(), err.Error())
+			}
+		})
+	}
+}
+
+func TestPacker_UnpackGetUpkeepPrivilegeConfig(t *testing.T) {
+	tests := []struct {
+		name    string
+		raw     []byte
+		errored bool
+	}{
+		{
+			name: "happy path",
+			raw: func() []byte {
+				b, _ := hexutil.Decode("0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000177b226d657263757279456e61626c6564223a747275657d000000000000000000")
+
+				return b
+			}(),
+			errored: false,
+		},
+		{
+			name: "error empty config",
+			raw: func() []byte {
+				b, _ := hexutil.Decode("0x")
+
+				return b
+			}(),
+			errored: true,
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			packer := NewAbiPacker()
+
+			b, err := packer.UnpackGetUpkeepPrivilegeConfig(test.raw)
+
+			if !test.errored {
+				require.NoError(t, err, "should unpack bytes from abi encoded value")
+
+				// the actual struct to unmarshal into is not available to this
+				// package so basic json encoding is the limit of the following test
+				var data map[string]interface{}
+				err = json.Unmarshal(b, &data)
+
+				assert.NoError(t, err, "packed data should unmarshal using json encoding")
+				assert.Equal(t, []byte(`{"mercuryEnabled":true}`), b)
+			} else {
+				assert.NotNil(t, err, "error expected from unpack function")
+			}
+		})
+	}
+}
+
+func TestPacker_PackGetUpkeepPrivilegeConfig(t *testing.T) {
+	tests := []struct {
+		name     string
+		upkeepId *big.Int
+		raw      []byte
+		errored  bool
+	}{
+		{
+			name: "happy path",
+			upkeepId: func() *big.Int {
+				id, _ := new(big.Int).SetString("52236098515066839510538748191966098678939830769967377496848891145101407612976", 10)
+
+				return id
+			}(),
+			raw: func() []byte {
+				b, _ := hexutil.Decode("0x19d97a94737c9583000000000000000000000001ea8ed6d0617dd5b3b87374020efaf030")
+
+				return b
+			}(),
+			errored: false,
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			packer := NewAbiPacker()
+
+			b, err := packer.PackGetUpkeepPrivilegeConfig(test.upkeepId)
+
+			if !test.errored {
+				require.NoError(t, err, "no error expected from packing")
+
+				assert.Equal(t, test.raw, b, "raw bytes for output should match expected")
+			} else {
+				assert.NotNil(t, err, "error expected from packing function")
+			}
+		})
+	}
+}
+
+func TestPacker_UnpackCheckCallbackResult(t *testing.T) {
+	tests := []struct {
+		Name          string
+		CallbackResp  []byte
+		UpkeepNeeded  bool
+		PerformData   []byte
+		FailureReason uint8
+		GasUsed       *big.Int
+		ErrorString   string
+		State         uint8
+	}{
+		{
+			Name:          "unpack upkeep needed",
+			CallbackResp:  []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 46, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 10, 11, 21, 31, 41, 15, 16, 17, 18, 19, 13, 14, 12, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 120, 111, 101, 122, 90, 54, 44, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+			UpkeepNeeded:  true,
+			PerformData:   []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 10, 11, 21, 31, 41, 15, 16, 17, 18, 19, 13, 14, 12, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 120, 111, 101, 122, 90, 54, 44, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+			FailureReason: uint8(encoding.UpkeepFailureReasonNone),
+			GasUsed:       big.NewInt(11796),
+		},
+		{
+			Name:          "unpack upkeep not needed",
+			CallbackResp:  []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 208, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 10, 11, 21, 31, 41, 15, 16, 17, 18, 19, 13, 14, 12, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 120, 111, 101, 122, 90, 54, 44, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+			UpkeepNeeded:  false,
+			PerformData:   []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 10, 11, 21, 31, 41, 15, 16, 17, 18, 19, 13, 14, 12, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 120, 111, 101, 122, 90, 54, 44, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+			FailureReason: uint8(encoding.UpkeepFailureReasonUpkeepNotNeeded),
+			GasUsed:       big.NewInt(13008),
+		},
+		{
+			Name:         "unpack malformed data",
+			CallbackResp: []byte{0, 0, 0, 23, 4, 163, 66, 91, 228, 102, 200, 84, 144, 233, 218, 44, 168, 192, 191, 253, 0, 0, 0, 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+			UpkeepNeeded: false,
+			PerformData:  nil,
+			ErrorString:  "abi: improperly encoded boolean value: unpack checkUpkeep return: ",
+			State:        encoding.PackUnpackDecodeFailed,
+		},
+	}
+	for _, test := range tests {
+		t.Run(test.Name, func(t *testing.T) {
+			packer := NewAbiPacker()
+
+			state, needed, pd, failureReason, gasUsed, err := packer.UnpackCheckCallbackResult(test.CallbackResp)
+
+			if test.ErrorString != "" {
+				assert.EqualError(t, err, test.ErrorString+hexutil.Encode(test.CallbackResp))
+			} else {
+				assert.Nil(t, err)
+			}
+			assert.Equal(t, test.UpkeepNeeded, needed)
+			assert.Equal(t, test.PerformData, pd)
+			assert.Equal(t, test.FailureReason, failureReason)
+			assert.Equal(t, test.GasUsed, gasUsed)
+			assert.Equal(t, test.State, state)
+		})
+	}
+}
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams.go
index d64a9e7ef83..e1bb69f33d8 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams.go
@@ -66,7 +66,6 @@ type UpkeepPrivilegeConfig struct {
 }
 
 func NewStreamsLookup(
-	packer mercury.Packer,
 	mercuryConfig mercury.MercuryConfigProvider,
 	blockSubscriber latestBlockProvider,
 	client contextCaller,
@@ -74,6 +73,8 @@ func NewStreamsLookup(
 	lggr logger.Logger) *streams {
 	httpClient := http.DefaultClient
 	threadCtrl := utils.NewThreadControl()
+	packer := mercury.NewAbiPacker()
+
 	return &streams{
 		packer:          packer,
 		mercuryConfig:   mercuryConfig,
@@ -231,7 +232,7 @@ func (s *streams) CheckCallback(ctx context.Context, values [][]byte, lookup *me
 	checkResults[i].IneligibilityReason = uint8(mercury.MercuryUpkeepFailureReasonNone)
 	checkResults[i].Eligible = true
 	checkResults[i].PerformData = performData
-	s.lggr.Infof("at block %d upkeep %s requested time %s successful with perform data: %s", lookup.Block, lookup.UpkeepId, lookup.Time, hexutil.Encode(performData))
+	s.lggr.Infof("at block %d upkeep %s requested time %s CheckCallback successful with perform data: %s", lookup.Block, lookup.UpkeepId, lookup.Time, hexutil.Encode(performData))
 
 	return nil
 }
@@ -288,6 +289,7 @@ func (s *streams) AllowedToUseMercury(opts *bind.CallOpts, upkeepId *big.Int) (s
 
 	var upkeepPrivilegeConfigBytes []byte
 	upkeepPrivilegeConfigBytes, err = s.packer.UnpackGetUpkeepPrivilegeConfig(resultBytes)
+
 	if err != nil {
 		return mercury.PackUnpackDecodeFailed, mercury.MercuryUpkeepFailureReasonNone, false, false, fmt.Errorf("failed to get upkeep privilege config: %v", err)
 	}
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams_test.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams_test.go
index caa3efb974b..54124b7c1a3 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams_test.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mercury/streams/streams_test.go
@@ -102,14 +102,12 @@ func (r *mockRegistry) CheckCallback(opts *bind.CallOpts, id *big.Int, values []
 // setups up a streams object for tests.
 func setupStreams(t *testing.T) *streams {
 	lggr := logger.TestLogger(t)
-	packer := encoding.NewAbiPacker()
 	mercuryConfig := new(MockMercuryConfigProvider)
 	blockSubscriber := new(MockBlockSubscriber)
 	registry := &mockRegistry{}
 	client := evmClientMocks.NewClient(t)
 
 	streams := NewStreamsLookup(
-		packer,
 		mercuryConfig,
 		blockSubscriber,
 		client,
diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/registry.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/registry.go
index bb05b8029fe..39862bb7539 100644
--- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/registry.go
+++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/registry.go
@@ -94,7 +94,6 @@ func NewEvmRegistry(
 		AllowListCache:   cache.New(defaultAllowListExpiration, cleanupInterval),
 		pluginRetryCache: cache.New(defaultPluginRetryExpiration, cleanupInterval),
 	}
-
 	hc := http.DefaultClient
 
 	return &EvmRegistry{
@@ -115,7 +114,7 @@ func NewEvmRegistry(
 		logEventProvider: logEventProvider,
 		bs:               blockSub,
 		finalityDepth:    finalityDepth,
-		streams:          streams.NewStreamsLookup(packer, mercuryConfig, blockSub, client.Client(), registry, lggr),
+		streams:          streams.NewStreamsLookup(mercuryConfig, blockSub, client.Client(), registry, lggr),
 	}
 }
 

From d50b439090aa6f60955d80cd322fa1e7104bffc7 Mon Sep 17 00:00:00 2001
From: Sri Kidambi <1702865+kidambisrinivas@users.noreply.github.com>
Date: Wed, 13 Dec 2023 23:45:38 +0000
Subject: [PATCH 128/130] Introduce job spec flag for custom reverted pipeline
 (#11529)

* Introduce job spec flag for custom reverted pipeline

* Disable the flag for V2+

* Rename file after merge conflict
---
 core/services/job/job_orm_test.go             | 21 +++--
 core/services/job/models.go                   |  3 +
 core/services/job/orm.go                      |  4 +-
 core/services/job/validate.go                 |  1 +
 core/services/vrf/delegate.go                 |  3 +
 .../0214_add_custom_reverts_vrf.sql           |  5 ++
 core/testdata/testspecs/v2_specs.go           |  3 +
 core/web/presenters/job.go                    | 38 ++++----
 core/web/presenters/job_test.go               | 87 +++++++++++++++++++
 core/web/resolver/spec.go                     |  5 ++
 core/web/resolver/spec_test.go                |  3 +
 core/web/schema/type/spec.graphql             |  1 +
 12 files changed, 149 insertions(+), 25 deletions(-)
 create mode 100644 core/store/migrate/migrations/0214_add_custom_reverts_vrf.sql

diff --git a/core/services/job/job_orm_test.go b/core/services/job/job_orm_test.go
index c0622ba8066..768d16ddeb7 100644
--- a/core/services/job/job_orm_test.go
+++ b/core/services/job/job_orm_test.go
@@ -454,6 +454,9 @@ func TestORM_CreateJob_VRFV2(t *testing.T) {
 	var batchFulfillmentEnabled bool
 	require.NoError(t, db.Get(&batchFulfillmentEnabled, `SELECT batch_fulfillment_enabled FROM vrf_specs LIMIT 1`))
 	require.False(t, batchFulfillmentEnabled)
+	var customRevertsPipelineEnabled bool
+	require.NoError(t, db.Get(&customRevertsPipelineEnabled, `SELECT custom_reverts_pipeline_enabled FROM vrf_specs LIMIT 1`))
+	require.False(t, customRevertsPipelineEnabled)
 	var batchFulfillmentGasMultiplier float64
 	require.NoError(t, db.Get(&batchFulfillmentGasMultiplier, `SELECT batch_fulfillment_gas_multiplier FROM vrf_specs LIMIT 1`))
 	require.Equal(t, float64(1.0), batchFulfillmentGasMultiplier)
@@ -514,13 +517,14 @@ func TestORM_CreateJob_VRFV2Plus(t *testing.T) {
 	fromAddresses := []string{cltest.NewEIP55Address().String(), cltest.NewEIP55Address().String()}
 	jb, err := vrfcommon.ValidatedVRFSpec(testspecs.GenerateVRFSpec(
 		testspecs.VRFSpecParams{
-			VRFVersion:          vrfcommon.V2Plus,
-			RequestedConfsDelay: 10,
-			FromAddresses:       fromAddresses,
-			ChunkSize:           25,
-			BackoffInitialDelay: time.Minute,
-			BackoffMaxDelay:     time.Hour,
-			GasLanePrice:        assets.GWei(100),
+			VRFVersion:                   vrfcommon.V2Plus,
+			RequestedConfsDelay:          10,
+			FromAddresses:                fromAddresses,
+			ChunkSize:                    25,
+			BackoffInitialDelay:          time.Minute,
+			BackoffMaxDelay:              time.Hour,
+			GasLanePrice:                 assets.GWei(100),
+			CustomRevertsPipelineEnabled: true,
 		}).
 		Toml())
 	require.NoError(t, err)
@@ -534,6 +538,9 @@ func TestORM_CreateJob_VRFV2Plus(t *testing.T) {
 	var batchFulfillmentEnabled bool
 	require.NoError(t, db.Get(&batchFulfillmentEnabled, `SELECT batch_fulfillment_enabled FROM vrf_specs LIMIT 1`))
 	require.False(t, batchFulfillmentEnabled)
+	var customRevertsPipelineEnabled bool
+	require.NoError(t, db.Get(&customRevertsPipelineEnabled, `SELECT custom_reverts_pipeline_enabled FROM vrf_specs LIMIT 1`))
+	require.True(t, customRevertsPipelineEnabled)
 	var batchFulfillmentGasMultiplier float64
 	require.NoError(t, db.Get(&batchFulfillmentGasMultiplier, `SELECT batch_fulfillment_gas_multiplier FROM vrf_specs LIMIT 1`))
 	require.Equal(t, float64(1.0), batchFulfillmentGasMultiplier)
diff --git a/core/services/job/models.go b/core/services/job/models.go
index 3c869f76056..f60e0a12981 100644
--- a/core/services/job/models.go
+++ b/core/services/job/models.go
@@ -503,6 +503,9 @@ type VRFSpec struct {
 	// for fulfilling requests. If set to true, batchCoordinatorAddress must be set in
 	// the job spec.
 	BatchFulfillmentEnabled bool `toml:"batchFulfillmentEnabled"`
+	// CustomRevertsPipelineEnabled indicates to the vrf job to run the
+	// custom reverted txns pipeline along with VRF listener
+	CustomRevertsPipelineEnabled bool `toml:"customRevertsPipelineEnabled"`
 	// BatchFulfillmentGasMultiplier is used to determine the final gas estimate for the batch
 	// fulfillment.
 	BatchFulfillmentGasMultiplier tomlutils.Float64 `toml:"batchFulfillmentGasMultiplier"`
diff --git a/core/services/job/orm.go b/core/services/job/orm.go
index b2cf2b2af4b..6c5a879ebd0 100644
--- a/core/services/job/orm.go
+++ b/core/services/job/orm.go
@@ -326,14 +326,14 @@ func (o *orm) CreateJob(jb *Job, qopts ...pg.QOpt) error {
 				evm_chain_id, from_addresses, poll_period, requested_confs_delay,
 				request_timeout, chunk_size, batch_coordinator_address, batch_fulfillment_enabled,
 				batch_fulfillment_gas_multiplier, backoff_initial_delay, backoff_max_delay, gas_lane_price,
-                vrf_owner_address,
+                vrf_owner_address, custom_reverts_pipeline_enabled,
 				created_at, updated_at)
 			VALUES (
 				:coordinator_address, :public_key, :min_incoming_confirmations,
 				:evm_chain_id, :from_addresses, :poll_period, :requested_confs_delay,
 				:request_timeout, :chunk_size, :batch_coordinator_address, :batch_fulfillment_enabled,
 				:batch_fulfillment_gas_multiplier, :backoff_initial_delay, :backoff_max_delay, :gas_lane_price,
-			    :vrf_owner_address,
+			    :vrf_owner_address, :custom_reverts_pipeline_enabled,
 				NOW(), NOW())
 			RETURNING id;`
 
diff --git a/core/services/job/validate.go b/core/services/job/validate.go
index 8f559fdb02d..b7a1dca3616 100644
--- a/core/services/job/validate.go
+++ b/core/services/job/validate.go
@@ -63,6 +63,7 @@ func ValidateSpec(ts string) (Type, error) {
 	if jb.Pipeline.RequiresPreInsert() && !jb.Type.SupportsAsync() {
 		return "", errors.Errorf("async=true tasks are not supported for %v", jb.Type)
 	}
+	// spec.CustomRevertsPipelineEnabled == false, default is custom reverted txns pipeline disabled
 
 	if strings.Contains(ts, "<{}>") {
 		return "", errors.Errorf("'<{}>' syntax is not supported. Please use \"{}\" instead")
diff --git a/core/services/vrf/delegate.go b/core/services/vrf/delegate.go
index 03e40614a10..ba28e83bf3f 100644
--- a/core/services/vrf/delegate.go
+++ b/core/services/vrf/delegate.go
@@ -142,6 +142,9 @@ func (d *Delegate) ServicesForSpec(jb job.Job) ([]job.ServiceCtx, error) {
 			if vrfOwner != nil {
 				return nil, errors.New("VRF Owner is not supported for VRF V2 Plus")
 			}
+			if jb.VRFSpec.CustomRevertsPipelineEnabled {
+				return nil, errors.New("Custom Reverted Txns Pipeline is not supported for VRF V2 Plus")
+			}
 
 			// Get the LINKNATIVEFEED address with retries
 			// This is needed because the RPC endpoint may be down so we need to
diff --git a/core/store/migrate/migrations/0214_add_custom_reverts_vrf.sql b/core/store/migrate/migrations/0214_add_custom_reverts_vrf.sql
new file mode 100644
index 00000000000..a2865fce816
--- /dev/null
+++ b/core/store/migrate/migrations/0214_add_custom_reverts_vrf.sql
@@ -0,0 +1,5 @@
+-- +goose Up
+ALTER TABLE vrf_specs ADD COLUMN custom_reverts_pipeline_enabled boolean DEFAULT FALSE NOT NULL;
+
+-- +goose Down
+ALTER TABLE vrf_specs DROP COLUMN custom_reverts_pipeline_enabled;
diff --git a/core/testdata/testspecs/v2_specs.go b/core/testdata/testspecs/v2_specs.go
index 00297ebdb12..e9dd25fa0f7 100644
--- a/core/testdata/testspecs/v2_specs.go
+++ b/core/testdata/testspecs/v2_specs.go
@@ -234,6 +234,7 @@ type VRFSpecParams struct {
 	BatchCoordinatorAddress       string
 	VRFOwnerAddress               string
 	BatchFulfillmentEnabled       bool
+	CustomRevertsPipelineEnabled  bool
 	BatchFulfillmentGasMultiplier float64
 	MinIncomingConfirmations      int
 	FromAddresses                 []string
@@ -403,6 +404,7 @@ evmChainID         =  "%s"
 batchCoordinatorAddress = "%s"
 batchFulfillmentEnabled = %v
 batchFulfillmentGasMultiplier = %s
+customRevertsPipelineEnabled = %v
 minIncomingConfirmations = %d
 requestedConfsDelay = %d
 requestTimeout = "%s"
@@ -419,6 +421,7 @@ observationSource = """
 	toml := fmt.Sprintf(template,
 		jobID, name, coordinatorAddress, params.EVMChainID, batchCoordinatorAddress,
 		params.BatchFulfillmentEnabled, strconv.FormatFloat(batchFulfillmentGasMultiplier, 'f', 2, 64),
+		params.CustomRevertsPipelineEnabled,
 		confirmations, params.RequestedConfsDelay, requestTimeout.String(), publicKey, chunkSize,
 		params.BackoffInitialDelay.String(), params.BackoffMaxDelay.String(), gasLanePrice.String(),
 		pollPeriod.String(), observationSource)
diff --git a/core/web/presenters/job.go b/core/web/presenters/job.go
index a2a9e70c793..e9b63c73615 100644
--- a/core/web/presenters/job.go
+++ b/core/web/presenters/job.go
@@ -267,6 +267,7 @@ func NewCronSpec(spec *job.CronSpec) *CronSpec {
 type VRFSpec struct {
 	BatchCoordinatorAddress       *ethkey.EIP55Address  `json:"batchCoordinatorAddress"`
 	BatchFulfillmentEnabled       bool                  `json:"batchFulfillmentEnabled"`
+	CustomRevertsPipelineEnabled  *bool                 `json:"customRevertsPipelineEnabled,omitempty"`
 	BatchFulfillmentGasMultiplier float64               `json:"batchFulfillmentGasMultiplier"`
 	CoordinatorAddress            ethkey.EIP55Address   `json:"coordinatorAddress"`
 	PublicKey                     secp256k1.PublicKey   `json:"publicKey"`
@@ -281,26 +282,31 @@ type VRFSpec struct {
 	BackoffInitialDelay           models.Duration       `json:"backoffInitialDelay"`
 	BackoffMaxDelay               models.Duration       `json:"backoffMaxDelay"`
 	GasLanePrice                  *assets.Wei           `json:"gasLanePrice"`
-	VRFOwnerAddress               *ethkey.EIP55Address  `json:"vrfOwnerAddress"`
+	RequestedConfsDelay           int64                 `json:"requestedConfsDelay"`
+	VRFOwnerAddress               *ethkey.EIP55Address  `json:"vrfOwnerAddress,omitempty"`
 }
 
 func NewVRFSpec(spec *job.VRFSpec) *VRFSpec {
 	return &VRFSpec{
-		BatchCoordinatorAddress:  spec.BatchCoordinatorAddress,
-		BatchFulfillmentEnabled:  spec.BatchFulfillmentEnabled,
-		CoordinatorAddress:       spec.CoordinatorAddress,
-		PublicKey:                spec.PublicKey,
-		FromAddresses:            spec.FromAddresses,
-		PollPeriod:               models.MustMakeDuration(spec.PollPeriod),
-		MinIncomingConfirmations: spec.MinIncomingConfirmations,
-		CreatedAt:                spec.CreatedAt,
-		UpdatedAt:                spec.UpdatedAt,
-		EVMChainID:               spec.EVMChainID,
-		ChunkSize:                spec.ChunkSize,
-		RequestTimeout:           models.MustMakeDuration(spec.RequestTimeout),
-		BackoffInitialDelay:      models.MustMakeDuration(spec.BackoffInitialDelay),
-		BackoffMaxDelay:          models.MustMakeDuration(spec.BackoffMaxDelay),
-		GasLanePrice:             spec.GasLanePrice,
+		BatchCoordinatorAddress:       spec.BatchCoordinatorAddress,
+		BatchFulfillmentEnabled:       spec.BatchFulfillmentEnabled,
+		BatchFulfillmentGasMultiplier: float64(spec.BatchFulfillmentGasMultiplier),
+		CustomRevertsPipelineEnabled:  &spec.CustomRevertsPipelineEnabled,
+		CoordinatorAddress:            spec.CoordinatorAddress,
+		PublicKey:                     spec.PublicKey,
+		FromAddresses:                 spec.FromAddresses,
+		PollPeriod:                    models.MustMakeDuration(spec.PollPeriod),
+		MinIncomingConfirmations:      spec.MinIncomingConfirmations,
+		CreatedAt:                     spec.CreatedAt,
+		UpdatedAt:                     spec.UpdatedAt,
+		EVMChainID:                    spec.EVMChainID,
+		ChunkSize:                     spec.ChunkSize,
+		RequestTimeout:                models.MustMakeDuration(spec.RequestTimeout),
+		BackoffInitialDelay:           models.MustMakeDuration(spec.BackoffInitialDelay),
+		BackoffMaxDelay:               models.MustMakeDuration(spec.BackoffMaxDelay),
+		GasLanePrice:                  spec.GasLanePrice,
+		RequestedConfsDelay:           spec.RequestedConfsDelay,
+		VRFOwnerAddress:               spec.VRFOwnerAddress,
 	}
 }
 
diff --git a/core/web/presenters/job_test.go b/core/web/presenters/job_test.go
index a5d6db0df18..b782452948b 100644
--- a/core/web/presenters/job_test.go
+++ b/core/web/presenters/job_test.go
@@ -14,11 +14,13 @@ import (
 	"gopkg.in/guregu/null.v4"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/assets"
+	evmassets "github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 	clnull "github.com/smartcontractkit/chainlink/v2/core/null"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
+	"github.com/smartcontractkit/chainlink/v2/core/services/signatures/secp256k1"
 	"github.com/smartcontractkit/chainlink/v2/core/store/models"
 	"github.com/smartcontractkit/chainlink/v2/core/web/presenters"
 )
@@ -58,6 +60,7 @@ func TestJob(t *testing.T) {
 	trustedBlockhashStoreBatchSize := int32(20)
 
 	var specGasLimit uint32 = 1000
+	vrfPubKey, _ := secp256k1.NewPublicKeyFromHex("0xede539e216e3a50e69d1c68aa9cc472085876c4002f6e1e6afee0ea63b50a78b00")
 
 	testCases := []struct {
 		name string
@@ -469,6 +472,90 @@ func TestJob(t *testing.T) {
 				}
 			}`,
 		},
+		{
+			name: "vrf job spec",
+			job: job.Job{
+				ID:            1,
+				Name:          null.StringFrom("vrf_test"),
+				Type:          job.VRF,
+				SchemaVersion: 1,
+				ExternalJobID: uuid.MustParse("0eec7e1d-d0d2-476c-a1a8-72dfb6633f47"),
+				VRFSpec: &job.VRFSpec{
+					BatchCoordinatorAddress:       &contractAddress,
+					BatchFulfillmentEnabled:       true,
+					CustomRevertsPipelineEnabled:  true,
+					MinIncomingConfirmations:      1,
+					CoordinatorAddress:            contractAddress,
+					CreatedAt:                     timestamp,
+					UpdatedAt:                     timestamp,
+					EVMChainID:                    evmChainID,
+					FromAddresses:                 []ethkey.EIP55Address{fromAddress},
+					PublicKey:                     vrfPubKey,
+					RequestedConfsDelay:           10,
+					ChunkSize:                     25,
+					BatchFulfillmentGasMultiplier: 1,
+					GasLanePrice:                  evmassets.GWei(200),
+					VRFOwnerAddress:               nil,
+				},
+				PipelineSpec: &pipeline.Spec{
+					ID:           1,
+					DotDagSource: "",
+				},
+			},
+			want: fmt.Sprintf(`
+			{
+				"data": {
+					"type": "jobs",
+					"id": "1",
+					"attributes": {
+						"name": "vrf_test",
+						"type": "vrf",
+						"schemaVersion": 1,
+						"maxTaskDuration": "0s",
+						"externalJobID": "0eec7e1d-d0d2-476c-a1a8-72dfb6633f47",
+						"directRequestSpec": null,
+						"fluxMonitorSpec": null,
+						"gasLimit": null,
+						"forwardingAllowed": false,
+						"cronSpec": null,
+						"offChainReportingOracleSpec": null,
+						"offChainReporting2OracleSpec": null,
+						"keeperSpec": null,
+						"vrfSpec": {
+							"batchCoordinatorAddress": "%s",
+							"batchFulfillmentEnabled": true,
+							"customRevertsPipelineEnabled":  true,
+							"confirmations":      1,
+							"coordinatorAddress":            "%s",
+							"createdAt":                     "2000-01-01T00:00:00Z",
+							"updatedAt":                     "2000-01-01T00:00:00Z",
+							"evmChainID":                    "42",
+							"fromAddresses":                 ["%s"],
+							"pollPeriod":                    "0s",
+							"publicKey":                     "%s",
+							"requestedConfsDelay":           10,
+							"requestTimeout":                "0s",
+							"chunkSize":                     25,
+							"batchFulfillmentGasMultiplier": 1,
+							"backoffInitialDelay":           "0s",
+							"backoffMaxDelay":               "0s",
+							"gasLanePrice":                  "200 gwei"
+						},
+						"webhookSpec": null,
+						"blockhashStoreSpec": null,
+						"blockHeaderFeederSpec": null,
+						"bootstrapSpec": null,
+						"pipelineSpec": {
+							"id": 1,
+							"jobID": 0,
+							"dotDagSource": ""
+						},
+						"gatewaySpec": null,
+						"errors": []
+					}
+				}
+			}`, contractAddress, contractAddress, fromAddress, vrfPubKey.String()),
+		},
 		{
 			name: "blockhash store spec",
 			job: job.Job{
diff --git a/core/web/resolver/spec.go b/core/web/resolver/spec.go
index 3e93ea38eab..5e8937dbb96 100644
--- a/core/web/resolver/spec.go
+++ b/core/web/resolver/spec.go
@@ -641,6 +641,11 @@ func (r *VRFSpecResolver) BatchFulfillmentGasMultiplier() float64 {
 	return float64(r.spec.BatchFulfillmentGasMultiplier)
 }
 
+// CustomRevertsPipelineEnabled resolves the spec's custom reverts pipeline enabled flag.
+func (r *VRFSpecResolver) CustomRevertsPipelineEnabled() *bool {
+	return &r.spec.CustomRevertsPipelineEnabled
+}
+
 // ChunkSize resolves the spec's chunk size.
 func (r *VRFSpecResolver) ChunkSize() int32 {
 	return int32(r.spec.ChunkSize)
diff --git a/core/web/resolver/spec_test.go b/core/web/resolver/spec_test.go
index 277aac851a6..a4fb9cdb338 100644
--- a/core/web/resolver/spec_test.go
+++ b/core/web/resolver/spec_test.go
@@ -581,6 +581,7 @@ func TestResolver_VRFSpec(t *testing.T) {
 					VRFSpec: &job.VRFSpec{
 						BatchCoordinatorAddress:       &batchCoordinatorAddress,
 						BatchFulfillmentEnabled:       true,
+						CustomRevertsPipelineEnabled:  true,
 						MinIncomingConfirmations:      1,
 						CoordinatorAddress:            coordinatorAddress,
 						CreatedAt:                     f.Timestamp(),
@@ -617,6 +618,7 @@ func TestResolver_VRFSpec(t *testing.T) {
 									batchCoordinatorAddress
 									batchFulfillmentEnabled
 									batchFulfillmentGasMultiplier
+									customRevertsPipelineEnabled
 									chunkSize
 									backoffInitialDelay
 									backoffMaxDelay
@@ -644,6 +646,7 @@ func TestResolver_VRFSpec(t *testing.T) {
 							"batchCoordinatorAddress": "0x0ad9FE7a58216242a8475ca92F222b0640E26B63",
 							"batchFulfillmentEnabled": true,
 							"batchFulfillmentGasMultiplier": 1,
+							"customRevertsPipelineEnabled": true,
 							"chunkSize": 25,
 							"backoffInitialDelay": "1m0s",
 							"backoffMaxDelay": "1h0m0s",
diff --git a/core/web/schema/type/spec.graphql b/core/web/schema/type/spec.graphql
index 81244478637..5e24f7c3fa8 100644
--- a/core/web/schema/type/spec.graphql
+++ b/core/web/schema/type/spec.graphql
@@ -97,6 +97,7 @@ type VRFSpec {
     batchCoordinatorAddress: String
     batchFulfillmentEnabled: Boolean!
     batchFulfillmentGasMultiplier: Float!
+    customRevertsPipelineEnabled: Boolean
     chunkSize: Int!
     backoffInitialDelay: String!
     backoffMaxDelay: String!

From ddf124937fbd472ffc1f820fd761438f4246f69d Mon Sep 17 00:00:00 2001
From: Anindita Ghosh <88458927+AnieeG@users.noreply.github.com>
Date: Wed, 13 Dec 2023 15:47:26 -0800
Subject: [PATCH 129/130] options to include customized pg and chainlink image
 (#11570)

---
 integration-tests/docker/test_env/cl_node.go | 23 ++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/integration-tests/docker/test_env/cl_node.go b/integration-tests/docker/test_env/cl_node.go
index b79bb91c70e..d6ab22957a2 100644
--- a/integration-tests/docker/test_env/cl_node.go
+++ b/integration-tests/docker/test_env/cl_node.go
@@ -25,6 +25,7 @@ import (
 	"github.com/smartcontractkit/chainlink-testing-framework/logging"
 	"github.com/smartcontractkit/chainlink-testing-framework/logstream"
 	"github.com/smartcontractkit/chainlink-testing-framework/utils/testcontext"
+
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
 	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/chaintype"
 
@@ -83,6 +84,28 @@ func WithLogStream(ls *logstream.LogStream) ClNodeOption {
 	}
 }
 
+func WithImage(image string) ClNodeOption {
+	return func(c *ClNode) {
+		c.ContainerImage = image
+	}
+}
+
+func WithVersion(version string) ClNodeOption {
+	return func(c *ClNode) {
+		c.ContainerVersion = version
+	}
+}
+
+func WithPgDBOptions(opts ...test_env.PostgresDbOption) ClNodeOption {
+	return func(c *ClNode) {
+		var err error
+		c.PostgresDb, err = test_env.NewPostgresDb(c.EnvComponent.Networks, opts...)
+		if err != nil {
+			c.t.Fatalf("failed to create postgres db: %v", err)
+		}
+	}
+}
+
 func NewClNode(networks []string, imageName, imageVersion string, nodeConfig *chainlink.Config, opts ...ClNodeOption) (*ClNode, error) {
 	nodeDefaultCName := fmt.Sprintf("%s-%s", "cl-node", uuid.NewString()[0:8])
 	pgDefaultCName := fmt.Sprintf("pg-%s", nodeDefaultCName)

From c223fdff40474c8b129a8b517690f725085aae9a Mon Sep 17 00:00:00 2001
From: Lei <lei.shi@smartcontract.com>
Date: Wed, 13 Dec 2023 17:45:54 -0800
Subject: [PATCH 130/130] add readme (#11535)

---
 core/scripts/chaincli/README.md        | 91 ++++++++++++++++++++++++++
 core/scripts/chaincli/handler/debug.go |  6 +-
 2 files changed, 94 insertions(+), 3 deletions(-)

diff --git a/core/scripts/chaincli/README.md b/core/scripts/chaincli/README.md
index da7aa7cc777..bcf407b684b 100644
--- a/core/scripts/chaincli/README.md
+++ b/core/scripts/chaincli/README.md
@@ -122,3 +122,94 @@ You can use the `grep` and `grepv` flags to filter log lines, e.g. to only show
 ```shell
 ./chaincli keeper logs --grep keepers-plugin
 ```
+
+---
+
+##  ChainCLI Automation Debugging Script
+
+### Context
+
+The debugging script is a tool within ChainCLI designed to facilitate the debugging of upkeeps in Automation v21, covering both conditional and log-based scenarios.
+
+### Configuration
+
+#### Mandatory Fields
+
+Ensure the following fields are provided in your `.env` file:
+
+- `NODE_URL`: Archival node URL
+- `KEEPER_REGISTRY_ADDRESS`: Address of the Keeper Registry contract. Refer to the [Supported Networks](https://docs.chain.link/chainlink-automation/overview/supported-networks#configurations) doc for addresses.
+
+#### Additional Fields (Streams Lookup)
+
+If your targeted upkeep involves streams lookup, include the following information:
+
+- `MERCURY_ID`
+- `MERCURY_KEY`
+- `MERCURY_LEGACY_URL`
+- `MERCURY_URL`
+
+#### Tenderly Integration
+
+For detailed transaction simulation logs, set up Tenderly credentials. Refer to the [Tenderly Documentation](https://docs.tenderly.co/other/platform-access/how-to-generate-api-access-tokens) for creating an API key, account name, and project name.
+
+- `TENDERLY_KEY`
+- `TENDERLY_ACCOUNT_NAME`
+- `TENDERLY_PROJECT_NAME`
+
+### Usage
+
+Execute the following command based on your upkeep type:
+
+- For conditional upkeep:
+
+    ```bash
+    go run main.go keeper debug UPKEEP_ID
+    ```
+
+- For log trigger upkeep:
+
+    ```bash
+    go run main.go keeper debug UPKEEP_ID TX_HASH LOG_INDEX
+    ```
+
+### Checks Performed by the Debugging Script
+
+1. **Fetch and Sanity Check Upkeep:**
+   - Verify upkeep status: active, paused, or canceled
+   - Check upkeep balance
+
+2. **For Conditional Upkeep:**
+   - Check conditional upkeep
+   - Simulate `performUpkeep`
+
+3. **For Log Trigger Upkeep:**
+   - Check if the upkeep has already run for log-trigger-based upkeep
+   - Verify if log matches trigger configuration
+   - Check upkeep
+   - If check result indicates a streams lookup is required (TargetCheckReverted):
+      - Verify if the upkeep is allowed to use Mercury
+      - Execute Mercury request
+      - Execute check callback
+
+   - Simulate `performUpkeep`
+
+### Examples
+- Eligible and log trigger based and using mercury lookup v0.3:
+
+    ```bash
+    go run main.go keeper debug 5591498142036749453487419299781783197030971023186134955311257372668222176389 0xdc6d0e547a5aa85fefa5b0f3a37e3493eafb5aeba8b5f3071ce53c9e9a539e9c 0
+    ```
+
+- Ineligible and conditional upkeep:
+
+    ```bash
+    go run main.go keeper debug 52635131310730056105456985154251306793887717546629785340977553840883117540096
+    ```
+
+- Ineligible and Log does not match trigger config:
+
+    ```bash
+    go run main.go keeper debug 5591498142036749453487419299781783197030971023186134955311257372668222176389 0xc0686ae85d2a7a976ef46df6c613517b9fd46f23340ac583be4e44f5c8b7a186 1
+    ```
+---
\ No newline at end of file
diff --git a/core/scripts/chaincli/handler/debug.go b/core/scripts/chaincli/handler/debug.go
index 3e8bd6d597e..288c7a68b80 100644
--- a/core/scripts/chaincli/handler/debug.go
+++ b/core/scripts/chaincli/handler/debug.go
@@ -111,8 +111,8 @@ func (k *Keeper) Debug(ctx context.Context, args []string) {
 	if (upkeepInfo.Target == gethcommon.Address{}) {
 		failCheckArgs("this upkeep does not exist on this registry", nil)
 	}
-	addLink("upkeep", common.UpkeepLink(chainID, upkeepID))
-	addLink("target", common.ContractExplorerLink(chainID, upkeepInfo.Target))
+	addLink("upkeep link", common.UpkeepLink(chainID, upkeepID))
+	addLink("upkeep contract address", common.ContractExplorerLink(chainID, upkeepInfo.Target))
 	if upkeepInfo.Paused {
 		resolveIneligible("upkeep is paused")
 	}
@@ -180,7 +180,7 @@ func (k *Keeper) Debug(ctx context.Context, args []string) {
 		if err != nil {
 			failCheckArgs("failed to fetch tx receipt", err)
 		}
-		addLink("trigger", common.ExplorerLink(chainID, txHash))
+		addLink("trigger transaction", common.ExplorerLink(chainID, txHash))
 		blockNum = receipt.BlockNumber.Uint64()
 		// find matching log event in tx
 		var triggeringEvent *types.Log